Skip to content

Commit 77744c1

Browse files
iclantoniclanton
authored
Clean up cyclic projects (#5184)
* Create a decoupled-local-node-rig project. * fixup! Create a decoupled-local-node-rig project. * Move the local eslint rules over to decoupled-local-node-rig. * fixup! Move the local eslint rules over to decoupled-local-node-rig. * fixup! Create a decoupled-local-node-rig project. * Eliminate a lot of duplication due to cyclic dependencies. * Rush update. * Rush change.
1 parent a425b63 commit 77744c1

File tree

130 files changed

+1090
-1173
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+1090
-1173
lines changed

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ These GitHub repositories provide supplementary resources for Rush Stack:
200200
| [/repo-scripts/doc-plugin-rush-stack](./repo-scripts/doc-plugin-rush-stack/) | API Documenter plugin used with the rushstack.io website |
201201
| [/repo-scripts/generate-api-docs](./repo-scripts/generate-api-docs/) | Used to generate API docs for the rushstack.io website |
202202
| [/repo-scripts/repo-toolbox](./repo-scripts/repo-toolbox/) | Used to execute various operations specific to this repo |
203+
| [/rigs/decoupled-local-node-rig](./rigs/decoupled-local-node-rig/) | A rig package for Node.js projects that build using Heft inside the RushStack repository, but are dependencies of @rushstack/heft-node-rig or local-node-rig. |
203204
| [/rigs/local-node-rig](./rigs/local-node-rig/) | A rig package for Node.js projects that build using Heft inside the RushStack repository. |
204205
| [/rigs/local-web-rig](./rigs/local-web-rig/) | A rig package for Web projects that build using Heft inside the RushStack repository. |
205206
| [/rush-plugins/rush-buildxl-graph-plugin](./rush-plugins/rush-buildxl-graph-plugin/) | Rush plugin for generating a BuildXL graph. |

‎apps/api-extractor/.eslintrc.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
// This is a workaround for https://github.com/eslint/eslint/issues/3458
2-
require('local-eslint-config/patch/modern-module-resolution');
2+
require('decoupled-local-node-rig/profiles/default/includes/eslint/patch/modern-module-resolution');
33
// This is a workaround for https://github.com/microsoft/rushstack/issues/3021
4-
require('local-eslint-config/patch/custom-config-package-names');
4+
require('decoupled-local-node-rig/profiles/default/includes/eslint/patch/custom-config-package-names');
55

66
module.exports = {
7-
extends: ['local-eslint-config/profile/node-trusted-tool', 'local-eslint-config/mixins/friendly-locals'],
7+
extends: [
8+
'decoupled-local-node-rig/profiles/default/includes/eslint/profile/node-trusted-tool',
9+
'decoupled-local-node-rig/profiles/default/includes/eslint/mixins/friendly-locals'
10+
],
811
parserOptions: { tsconfigRootDir: __dirname },
912

1013
overrides: [

‎apps/api-extractor/config/heft.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Optionally specifies another JSON config file that this file extends from. This provides a way for standard
99
* settings to be shared across multiple projects.
1010
*/
11-
"extends": "@rushstack/heft-node-rig/profiles/default/config/heft.json",
11+
"extends": "decoupled-local-node-rig/profiles/default/config/heft.json",
1212

1313
"phasesByName": {
1414
"build": {

‎apps/api-extractor/config/jest.config.json

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
11
{
2-
"extends": "@rushstack/heft-node-rig/profiles/default/config/jest.config.json",
3-
4-
// Enable code coverage for Jest
5-
"collectCoverage": true,
6-
"coverageDirectory": "<rootDir>/coverage",
7-
"coverageReporters": ["cobertura", "html"],
8-
9-
// Use v8 coverage provider to avoid Babel
10-
"coverageProvider": "v8"
2+
"extends": "decoupled-local-node-rig/profiles/default/config/jest.config.json"
113
}

‎apps/api-extractor/config/rig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
// Documentation for this system: https://www.npmjs.com/package/@rushstack/rig-package
44
"$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json",
55

6-
"rigPackageName": "@rushstack/heft-node-rig"
6+
"rigPackageName": "decoupled-local-node-rig"
77
}

‎apps/api-extractor/package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,10 @@
5252
"typescript": "5.8.2"
5353
},
5454
"devDependencies": {
55-
"@rushstack/heft-node-rig": "2.8.0",
55+
"decoupled-local-node-rig": "workspace:*",
5656
"@rushstack/heft": "0.70.0",
57-
"@types/heft-jest": "1.0.1",
5857
"@types/lodash": "4.14.116",
5958
"@types/minimatch": "3.0.5",
60-
"@types/node": "20.17.19",
6159
"@types/resolve": "1.20.2",
6260
"@types/semver": "7.5.0",
6361
"local-eslint-config": "workspace:*"

‎apps/api-extractor/tsconfig.json

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
11
{
2-
"extends": "./node_modules/@rushstack/heft-node-rig/profiles/default/tsconfig-base.json",
3-
4-
"compilerOptions": {
5-
"isolatedModules": true,
6-
"types": ["heft-jest", "node"],
7-
"resolveJsonModule": true
8-
}
2+
"extends": "./node_modules/decoupled-local-node-rig/profiles/default/tsconfig-base.json"
93
}

‎apps/heft/config/jest.config.json

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
11
{
2-
"extends": "@rushstack/heft-node-rig/profiles/default/config/jest.config.json",
3-
4-
// Enable code coverage for Jest
5-
"collectCoverage": true,
6-
"coverageDirectory": "<rootDir>/coverage",
7-
"coverageReporters": ["cobertura", "html"],
8-
9-
// Use v8 coverage provider to avoid Babel
10-
"coverageProvider": "v8"
2+
"extends": "decoupled-local-node-rig/profiles/default/config/jest.config.json"
113
}

‎apps/heft/config/rig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
// Documentation for this system: https://www.npmjs.com/package/@rushstack/rig-package
44
"$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json",
55

6-
"rigPackageName": "@rushstack/heft-node-rig"
6+
"rigPackageName": "decoupled-local-node-rig"
77
}

‎apps/heft/config/rush-project.json

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎apps/heft/package.json

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,9 @@
4949
},
5050
"devDependencies": {
5151
"@microsoft/api-extractor": "workspace:*",
52-
"local-eslint-config": "workspace:*",
5352
"@rushstack/heft": "0.70.0",
54-
"@rushstack/heft-node-rig": "2.8.0",
55-
"@types/heft-jest": "1.0.1",
56-
"@types/node": "20.17.19",
57-
"@types/watchpack": "2.4.0"
53+
"@types/watchpack": "2.4.0",
54+
"decoupled-local-node-rig": "workspace:*",
55+
"local-eslint-config": "workspace:*"
5856
}
5957
}

‎apps/heft/tsconfig.json

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
11
{
2-
"extends": "./node_modules/@rushstack/heft-node-rig/profiles/default/tsconfig-base.json",
3-
4-
"compilerOptions": {
5-
"isolatedModules": true,
6-
"types": ["heft-jest", "node"],
7-
"lib": ["ES2020"],
8-
"resolveJsonModule": true
9-
}
2+
"extends": "./node_modules/decoupled-local-node-rig/profiles/default/tsconfig-base.json"
103
}

‎common/changes/@microsoft/api-extractor-model/clean-up-cyclic-projects_2025-04-04-18-03.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"changes": [
3+
{
4+
"comment": "",
5+
"type": "none",
6+
"packageName": "@microsoft/api-extractor-model"
7+
}
8+
],
9+
"packageName": "@microsoft/api-extractor-model",
10+
"email": "[email protected]"
11+
}

‎common/changes/@microsoft/api-extractor/clean-up-cyclic-projects_2025-04-04-18-03.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"changes": [
3+
{
4+
"comment": "",
5+
"type": "none",
6+
"packageName": "@microsoft/api-extractor"
7+
}
8+
],
9+
"packageName": "@microsoft/api-extractor",
10+
"email": "[email protected]"
11+
}

‎common/changes/@rushstack/eslint-patch/clean-up-cyclic-projects_2025-04-04-18-03.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"changes": [
3+
{
4+
"comment": "",
5+
"type": "none",
6+
"packageName": "@rushstack/eslint-patch"
7+
}
8+
],
9+
"packageName": "@rushstack/eslint-patch",
10+
"email": "[email protected]"
11+
}

‎common/changes/@rushstack/eslint-plugin-packlets/clean-up-cyclic-projects_2025-04-04-18-03.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"changes": [
3+
{
4+
"comment": "",
5+
"type": "none",
6+
"packageName": "@rushstack/eslint-plugin-packlets"
7+
}
8+
],
9+
"packageName": "@rushstack/eslint-plugin-packlets",
10+
"email": "[email protected]"
11+
}

‎common/changes/@rushstack/eslint-plugin-security/clean-up-cyclic-projects_2025-04-04-18-03.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"changes": [
3+
{
4+
"comment": "",
5+
"type": "none",
6+
"packageName": "@rushstack/eslint-plugin-security"
7+
}
8+
],
9+
"packageName": "@rushstack/eslint-plugin-security",
10+
"email": "[email protected]"
11+
}

‎common/changes/@rushstack/eslint-plugin/clean-up-cyclic-projects_2025-04-04-18-03.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"changes": [
3+
{
4+
"comment": "",
5+
"type": "none",
6+
"packageName": "@rushstack/eslint-plugin"
7+
}
8+
],
9+
"packageName": "@rushstack/eslint-plugin",
10+
"email": "[email protected]"
11+
}

‎common/changes/@rushstack/heft-config-file/clean-up-cyclic-projects_2025-04-04-18-03.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"changes": [
3+
{
4+
"comment": "",
5+
"type": "none",
6+
"packageName": "@rushstack/heft-config-file"
7+
}
8+
],
9+
"packageName": "@rushstack/heft-config-file",
10+
"email": "[email protected]"
11+
}

‎common/changes/@rushstack/heft/clean-up-cyclic-projects_2025-04-04-18-03.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"changes": [
3+
{
4+
"comment": "",
5+
"type": "none",
6+
"packageName": "@rushstack/heft"
7+
}
8+
],
9+
"packageName": "@rushstack/heft",
10+
"email": "[email protected]"
11+
}

‎common/changes/@rushstack/node-core-library/clean-up-cyclic-projects_2025-04-04-18-03.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"changes": [
3+
{
4+
"comment": "",
5+
"type": "none",
6+
"packageName": "@rushstack/node-core-library"
7+
}
8+
],
9+
"packageName": "@rushstack/node-core-library",
10+
"email": "[email protected]"
11+
}

‎common/changes/@rushstack/operation-graph/clean-up-cyclic-projects_2025-04-04-18-03.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"changes": [
3+
{
4+
"comment": "",
5+
"type": "none",
6+
"packageName": "@rushstack/operation-graph"
7+
}
8+
],
9+
"packageName": "@rushstack/operation-graph",
10+
"email": "[email protected]"
11+
}

‎common/changes/@rushstack/rig-package/clean-up-cyclic-projects_2025-04-04-18-03.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"changes": [
3+
{
4+
"comment": "",
5+
"type": "none",
6+
"packageName": "@rushstack/rig-package"
7+
}
8+
],
9+
"packageName": "@rushstack/rig-package",
10+
"email": "[email protected]"
11+
}

‎common/changes/@rushstack/terminal/clean-up-cyclic-projects_2025-04-04-18-03.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"changes": [
3+
{
4+
"comment": "",
5+
"type": "none",
6+
"packageName": "@rushstack/terminal"
7+
}
8+
],
9+
"packageName": "@rushstack/terminal",
10+
"email": "[email protected]"
11+
}

‎common/changes/@rushstack/tree-pattern/clean-up-cyclic-projects_2025-04-04-18-03.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"changes": [
3+
{
4+
"comment": "",
5+
"type": "none",
6+
"packageName": "@rushstack/tree-pattern"
7+
}
8+
],
9+
"packageName": "@rushstack/tree-pattern",
10+
"email": "[email protected]"
11+
}

‎common/changes/@rushstack/ts-command-line/clean-up-cyclic-projects_2025-04-04-18-03.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"changes": [
3+
{
4+
"comment": "",
5+
"type": "none",
6+
"packageName": "@rushstack/ts-command-line"
7+
}
8+
],
9+
"packageName": "@rushstack/ts-command-line",
10+
"email": "[email protected]"
11+
}

‎common/config/rush/nonbrowser-approved-packages.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -502,6 +502,10 @@
502502
"name": "decache",
503503
"allowedCategories": [ "libraries" ]
504504
},
505+
{
506+
"name": "decoupled-local-node-rig",
507+
"allowedCategories": [ "libraries" ]
508+
},
505509
{
506510
"name": "diff",
507511
"allowedCategories": [ "libraries" ]

0 commit comments

Comments
 (0)