Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/chengcyber/feat-split-workspace…
Browse files Browse the repository at this point in the history
…' into release/rush-pr3481

# Conflicts:
#	apps/rush/package.json
#	build-tests/install-test-workspace/workspace/common/pnpm-lock.yaml
#	common/config/rush/version-policies.json
#	libraries/rush-lib/package.json
#	libraries/rush-sdk/package.json
#	rush-plugins/rush-amazon-s3-build-cache-plugin/package.json
#	rush-plugins/rush-azure-storage-build-cache-plugin/package.json
#	rush-plugins/rush-http-build-cache-plugin/package.json
#	rush-plugins/rush-redis-cobuild-plugin/package.json
#	rush-plugins/rush-serve-plugin/package.json
  • Loading branch information
octogonz committed Oct 10, 2023
2 parents 1a20e1b + 4f72e3c commit 7ef7318
Show file tree
Hide file tree
Showing 1,131 changed files with 16,432 additions and 4,339 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,10 @@ These GitHub repositories provide supplementary resources for Rush Stack:
| [/build-tests/api-extractor-test-02](./build-tests/api-extractor-test-02/) | Building this project is a regression test for api-extractor |
| [/build-tests/api-extractor-test-03](./build-tests/api-extractor-test-03/) | Building this project is a regression test for api-extractor |
| [/build-tests/api-extractor-test-04](./build-tests/api-extractor-test-04/) | Building this project is a regression test for api-extractor |
| [/build-tests/eslint-7-11-test](./build-tests/eslint-7-11-test/) | This project contains a build test to validate ESLint 7.11.0 compatibility with the latest version of @rushstack/eslint-config (and by extension, the ESLint plugin) |
| [/build-tests/eslint-7-7-test](./build-tests/eslint-7-7-test/) | This project contains a build test to validate ESLint 7.7.0 compatibility with the latest version of @rushstack/eslint-config (and by extension, the ESLint plugin) |
| [/build-tests/eslint-7-test](./build-tests/eslint-7-test/) | This project contains a build test to validate ESLint 7 compatibility with the latest version of @rushstack/eslint-config (and by extension, the ESLint plugin) |
| [/build-tests/eslint-8-test](./build-tests/eslint-8-test/) | This project contains a build test to validate ESLint 8 compatibility with the latest version of @rushstack/eslint-config (and by extension, the ESLint plugin) |
| [/build-tests/hashed-folder-copy-plugin-webpack4-test](./build-tests/hashed-folder-copy-plugin-webpack4-test/) | Building this project exercises @rushstack/hashed-folder-copy-plugin with Webpack 4. |
| [/build-tests/hashed-folder-copy-plugin-webpack5-test](./build-tests/hashed-folder-copy-plugin-webpack5-test/) | Building this project exercises @rushstack/hashed-folder-copy-plugin with Webpack 5. NOTE - THIS TEST IS CURRENTLY EXPECTED TO BE BROKEN |
| [/build-tests/heft-copy-files-test](./build-tests/heft-copy-files-test/) | Building this project tests copying files with Heft |
Expand Down Expand Up @@ -174,6 +177,7 @@ These GitHub repositories provide supplementary resources for Rush Stack:
| [/build-tests/rush-redis-cobuild-plugin-integration-test](./build-tests/rush-redis-cobuild-plugin-integration-test/) | Tests connecting to an redis server |
| [/build-tests/set-webpack-public-path-plugin-webpack4-test](./build-tests/set-webpack-public-path-plugin-webpack4-test/) | Building this project tests the set-webpack-public-path-plugin using Webpack 4 |
| [/build-tests/ts-command-line-test](./build-tests/ts-command-line-test/) | Building this project is a regression test for ts-command-line |
| [/eslint/local-eslint-config](./eslint/local-eslint-config/) | An ESLint configuration consumed projects inside the rushstack repo. |
| [/libraries/rush-themed-ui](./libraries/rush-themed-ui/) | Rush Component Library: a set of themed components for rush projects |
| [/libraries/rushell](./libraries/rushell/) | Execute shell commands using a consistent syntax on every platform |
| [/repo-scripts/doc-plugin-rush-stack](./repo-scripts/doc-plugin-rush-stack/) | API Documenter plugin used with the rushstack.io website |
Expand Down
19 changes: 15 additions & 4 deletions apps/api-documenter/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,21 @@
// This is a workaround for https://github.com/eslint/eslint/issues/3458
require('@rushstack/eslint-config/patch/modern-module-resolution');
require('local-node-rig/profiles/default/includes/eslint/patch/modern-module-resolution');
// This is a workaround for https://github.com/microsoft/rushstack/issues/3021
require('local-node-rig/profiles/default/includes/eslint/patch/custom-config-package-names');

module.exports = {
extends: [
'@rushstack/eslint-config/profile/node-trusted-tool',
'@rushstack/eslint-config/mixins/friendly-locals'
'local-node-rig/profiles/default/includes/eslint/profile/node-trusted-tool',
'local-node-rig/profiles/default/includes/eslint/mixins/friendly-locals'
],
parserOptions: { tsconfigRootDir: __dirname }
parserOptions: { tsconfigRootDir: __dirname },

overrides: [
{
files: ['*.ts', '*.tsx'],
rules: {
'no-console': 'off'
}
}
]
};
121 changes: 121 additions & 0 deletions apps/api-documenter/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,127 @@
{
"name": "@microsoft/api-documenter",
"entries": [
{
"version": "7.23.9",
"tag": "@microsoft/api-documenter_v7.23.9",
"date": "Sun, 01 Oct 2023 02:56:29 GMT",
"comments": {
"dependency": [
{
"comment": "Updating dependency \"@rushstack/heft\" to `0.62.3`"
}
]
}
},
{
"version": "7.23.8",
"tag": "@microsoft/api-documenter_v7.23.8",
"date": "Sat, 30 Sep 2023 00:20:51 GMT",
"comments": {
"patch": [
{
"comment": "Add notes for @alpha items when encountered. Mimics the existing behavior for @beta items."
}
],
"dependency": [
{
"comment": "Updating dependency \"@rushstack/heft\" to `0.62.2`"
}
]
}
},
{
"version": "7.23.7",
"tag": "@microsoft/api-documenter_v7.23.7",
"date": "Thu, 28 Sep 2023 20:53:17 GMT",
"comments": {
"dependency": [
{
"comment": "Updating dependency \"@microsoft/api-extractor-model\" to `7.28.2`"
},
{
"comment": "Updating dependency \"@rushstack/node-core-library\" to `3.61.0`"
},
{
"comment": "Updating dependency \"@rushstack/heft\" to `0.62.1`"
}
]
}
},
{
"version": "7.23.6",
"tag": "@microsoft/api-documenter_v7.23.6",
"date": "Wed, 27 Sep 2023 00:21:38 GMT",
"comments": {
"dependency": [
{
"comment": "Updating dependency \"@rushstack/heft\" to `0.62.0`"
}
]
}
},
{
"version": "7.23.5",
"tag": "@microsoft/api-documenter_v7.23.5",
"date": "Tue, 26 Sep 2023 21:02:30 GMT",
"comments": {
"dependency": [
{
"comment": "Updating dependency \"@rushstack/heft\" to `0.61.3`"
}
]
}
},
{
"version": "7.23.4",
"tag": "@microsoft/api-documenter_v7.23.4",
"date": "Tue, 26 Sep 2023 09:30:33 GMT",
"comments": {
"patch": [
{
"comment": "Update type-only imports to include the type modifier."
}
],
"dependency": [
{
"comment": "Updating dependency \"@microsoft/api-extractor-model\" to `7.28.1`"
},
{
"comment": "Updating dependency \"@rushstack/node-core-library\" to `3.60.1`"
},
{
"comment": "Updating dependency \"@rushstack/ts-command-line\" to `4.16.1`"
},
{
"comment": "Updating dependency \"@rushstack/heft\" to `0.61.2`"
}
]
}
},
{
"version": "7.23.3",
"tag": "@microsoft/api-documenter_v7.23.3",
"date": "Mon, 25 Sep 2023 23:38:28 GMT",
"comments": {
"dependency": [
{
"comment": "Updating dependency \"@rushstack/heft\" to `0.61.1`"
}
]
}
},
{
"version": "7.23.2",
"tag": "@microsoft/api-documenter_v7.23.2",
"date": "Fri, 22 Sep 2023 00:05:50 GMT",
"comments": {
"dependency": [
{
"comment": "Updating dependency \"@rushstack/heft\" to `0.61.0`"
}
]
}
},
{
"version": "7.23.1",
"tag": "@microsoft/api-documenter_v7.23.1",
Expand Down
46 changes: 45 additions & 1 deletion apps/api-documenter/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,50 @@
# Change Log - @microsoft/api-documenter

This log was last generated on Tue, 19 Sep 2023 15:21:51 GMT and should not be manually modified.
This log was last generated on Sun, 01 Oct 2023 02:56:29 GMT and should not be manually modified.

## 7.23.9
Sun, 01 Oct 2023 02:56:29 GMT

_Version update only_

## 7.23.8
Sat, 30 Sep 2023 00:20:51 GMT

### Patches

- Add notes for @alpha items when encountered. Mimics the existing behavior for @beta items.

## 7.23.7
Thu, 28 Sep 2023 20:53:17 GMT

_Version update only_

## 7.23.6
Wed, 27 Sep 2023 00:21:38 GMT

_Version update only_

## 7.23.5
Tue, 26 Sep 2023 21:02:30 GMT

_Version update only_

## 7.23.4
Tue, 26 Sep 2023 09:30:33 GMT

### Patches

- Update type-only imports to include the type modifier.

## 7.23.3
Mon, 25 Sep 2023 23:38:28 GMT

_Version update only_

## 7.23.2
Fri, 22 Sep 2023 00:05:50 GMT

_Version update only_

## 7.23.1
Tue, 19 Sep 2023 15:21:51 GMT
Expand Down
3 changes: 1 addition & 2 deletions apps/api-documenter/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@microsoft/api-documenter",
"version": "7.23.1",
"version": "7.23.9",
"description": "Read JSON files from api-extractor, generate documentation pages",
"repository": {
"type": "git",
Expand Down Expand Up @@ -29,7 +29,6 @@
"resolve": "~1.22.1"
},
"devDependencies": {
"@rushstack/eslint-config": "workspace:*",
"@rushstack/heft": "workspace:*",
"local-node-rig": "workspace:*",
"@types/js-yaml": "3.12.1",
Expand Down
8 changes: 4 additions & 4 deletions apps/api-documenter/src/cli/BaseAction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@
// See LICENSE in the project root for license information.

import * as path from 'path';
import * as tsdoc from '@microsoft/tsdoc';
import type * as tsdoc from '@microsoft/tsdoc';
import colors from 'colors/safe';

import {
CommandLineAction,
CommandLineStringParameter,
type CommandLineStringParameter,
type ICommandLineActionOptions
} from '@rushstack/ts-command-line';
import { FileSystem } from '@rushstack/node-core-library';
import {
ApiModel,
ApiItem,
type ApiItem,
ApiItemContainerMixin,
ApiDocumentedItem,
IResolveDeclarationReferenceResult
type IResolveDeclarationReferenceResult
} from '@microsoft/api-extractor-model';

export interface IBuildApiModelResult {
Expand Down
2 changes: 1 addition & 1 deletion apps/api-documenter/src/cli/GenerateAction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import * as path from 'path';

import { ApiDocumenterCommandLine } from './ApiDocumenterCommandLine';
import type { ApiDocumenterCommandLine } from './ApiDocumenterCommandLine';
import { BaseAction } from './BaseAction';
import { DocumenterConfig } from '../documenters/DocumenterConfig';
import { ExperimentalYamlDocumenter } from '../documenters/ExperimentalYamlDocumenter';
Expand Down
2 changes: 1 addition & 1 deletion apps/api-documenter/src/cli/MarkdownAction.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
// See LICENSE in the project root for license information.

import { ApiDocumenterCommandLine } from './ApiDocumenterCommandLine';
import type { ApiDocumenterCommandLine } from './ApiDocumenterCommandLine';
import { BaseAction } from './BaseAction';
import { MarkdownDocumenter } from '../documenters/MarkdownDocumenter';

Expand Down
4 changes: 2 additions & 2 deletions apps/api-documenter/src/cli/YamlAction.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
// See LICENSE in the project root for license information.

import { CommandLineFlagParameter, CommandLineChoiceParameter } from '@rushstack/ts-command-line';
import type { CommandLineFlagParameter, CommandLineChoiceParameter } from '@rushstack/ts-command-line';

import { ApiDocumenterCommandLine } from './ApiDocumenterCommandLine';
import type { ApiDocumenterCommandLine } from './ApiDocumenterCommandLine';
import { BaseAction } from './BaseAction';

import { YamlDocumenter } from '../documenters/YamlDocumenter';
Expand Down
2 changes: 1 addition & 1 deletion apps/api-documenter/src/documenters/DocumenterConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import * as path from 'path';
import { JsonSchema, JsonFile, NewlineKind } from '@rushstack/node-core-library';
import { IConfigFile } from './IConfigFile';
import type { IConfigFile } from './IConfigFile';
import apiDocumenterSchema from '../schemas/api-documenter.schema.json';

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
// See LICENSE in the project root for license information.

import { DocComment, DocInlineTag } from '@microsoft/tsdoc';
import { ApiModel, ApiItem, ApiItemKind, ApiDocumentedItem } from '@microsoft/api-extractor-model';
import { type DocComment, DocInlineTag } from '@microsoft/tsdoc';
import { type ApiModel, type ApiItem, ApiItemKind, ApiDocumentedItem } from '@microsoft/api-extractor-model';

import { IConfigTableOfContents } from './IConfigFile';
import { IYamlTocItem, IYamlTocFile } from '../yaml/IYamlTocFile';
import type { IConfigTableOfContents } from './IConfigFile';
import type { IYamlTocItem, IYamlTocFile } from '../yaml/IYamlTocFile';
import { YamlDocumenter } from './YamlDocumenter';
import { DocumenterConfig } from './DocumenterConfig';
import type { DocumenterConfig } from './DocumenterConfig';

/**
* EXPERIMENTAL - This documenter is a prototype of a new config file driven mode of operation for
Expand Down
2 changes: 1 addition & 1 deletion apps/api-documenter/src/documenters/IConfigFile.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
// See LICENSE in the project root for license information.

import { IYamlTocFile } from '../yaml/IYamlTocFile';
import type { IYamlTocFile } from '../yaml/IYamlTocFile';

/**
* Typescript interface describing the config schema for toc.yml file format.
Expand Down
Loading

0 comments on commit 7ef7318

Please sign in to comment.