Skip to content

Commit f95f5c1

Browse files
committed
fix: use rig.json
1 parent aafc7ba commit f95f5c1

File tree

18 files changed

+79
-31
lines changed

18 files changed

+79
-31
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// This is a workaround for https://github.com/eslint/eslint/issues/3458
2+
require('@rushstack/eslint-config/patch/modern-module-resolution');
3+
4+
module.exports = {
5+
extends: ['@rushstack/eslint-config/profile/node'],
6+
parserOptions: { tsconfigRootDir: __dirname }
7+
};

build-tests-subspace/rush-lib-test/config/heft.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/heft/v0/heft.schema.json",
33

4-
// TODO: Add comments
4+
"extends": "local-node-rig/profiles/default/config/heft.json",
5+
56
"phasesByName": {
67
"build": {
78
"cleanFiles": [{ "includeGlobs": ["lib", "dist"] }],
@@ -11,6 +12,12 @@
1112
"taskPlugin": {
1213
"pluginPackage": "@rushstack/heft-typescript-plugin"
1314
}
15+
},
16+
"lint": {
17+
"taskDependencies": ["typescript"],
18+
"taskPlugin": {
19+
"pluginPackage": "@rushstack/heft-lint-plugin"
20+
}
1421
}
1522
}
1623
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
// The "rig.json" file directs tools to look for their config files in an external package.
3+
// Documentation for this system: https://www.npmjs.com/package/@rushstack/rig-package
4+
"$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json",
5+
6+
"rigPackageName": "local-node-rig"
7+
}

build-tests-subspace/rush-lib-test/config/rush-project.json

-8
This file was deleted.

build-tests-subspace/rush-lib-test/package.json

+6
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@
1414
"@rushstack/terminal": "workspace:*"
1515
},
1616
"devDependencies": {
17+
"local-node-rig": "workspace:*",
18+
"@rushstack/eslint-config": "workspace:*",
1719
"@rushstack/heft": "workspace:*",
20+
"@rushstack/heft-lint-plugin": "workspace:*",
1821
"@rushstack/heft-typescript-plugin": "workspace:*",
1922
"@types/node": "18.17.15",
2023
"typescript": "~5.3.3"
@@ -29,6 +32,9 @@
2932
"@rushstack/heft": {
3033
"injected": true
3134
},
35+
"@rushstack/heft-lint-plugin": {
36+
"injected": true
37+
},
3238
"@rushstack/heft-typescript-plugin": {
3339
"injected": true
3440
}

build-tests-subspace/rush-lib-test/src/start.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ console.log('rush-lib-test loading Rush configuration...');
77
// instead of the normal .d.ts rollup
88
import { RushConfiguration } from '@microsoft/rush-lib/lib/';
99

10-
const config = RushConfiguration.loadFromDefaultLocation();
10+
const config: RushConfiguration = RushConfiguration.loadFromDefaultLocation();
1111
console.log(config.commonFolder);
1212

1313
console.log('Calling an internal API...');
@@ -16,7 +16,7 @@ console.log('Calling an internal API...');
1616
import { VersionMismatchFinder } from '@microsoft/rush-lib/lib/logic/versionMismatch/VersionMismatchFinder';
1717
import { ConsoleTerminalProvider, Terminal } from '@rushstack/terminal';
1818

19-
const terminal = new Terminal(new ConsoleTerminalProvider());
19+
const terminal: Terminal = new Terminal(new ConsoleTerminalProvider());
2020
VersionMismatchFinder.ensureConsistentVersions(config, terminal);
2121

2222
console.log(new ConsoleTerminalProvider().supportsColor);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// This is a workaround for https://github.com/eslint/eslint/issues/3458
2+
require('@rushstack/eslint-config/patch/modern-module-resolution');
3+
4+
module.exports = {
5+
extends: ['@rushstack/eslint-config/profile/node'],
6+
parserOptions: { tsconfigRootDir: __dirname }
7+
};

build-tests-subspace/rush-sdk-test/config/heft.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/heft/v0/heft.schema.json",
33

4-
// TODO: Add comments
4+
"extends": "local-node-rig/profiles/default/config/heft.json",
5+
56
"phasesByName": {
67
"build": {
78
"cleanFiles": [{ "includeGlobs": ["lib", "dist"] }],
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
// The "rig.json" file directs tools to look for their config files in an external package.
3+
// Documentation for this system: https://www.npmjs.com/package/@rushstack/rig-package
4+
"$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json",
5+
6+
"rigPackageName": "local-node-rig"
7+
}

build-tests-subspace/rush-sdk-test/config/rush-project.json

-8
This file was deleted.

build-tests-subspace/rush-sdk-test/package.json

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
"@rushstack/rush-sdk": "workspace:*"
1414
},
1515
"devDependencies": {
16+
"local-node-rig": "workspace:*",
17+
"@rushstack/eslint-config": "workspace:*",
1618
"@rushstack/heft": "workspace:*",
1719
"@rushstack/heft-lint-plugin": "workspace:*",
1820
"@rushstack/heft-typescript-plugin": "workspace:*",

build-tests-subspace/rush-sdk-test/src/start.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ console.log('rush-sdk-test loading Rush configuration...');
77
// instead of the normal .d.ts rollup
88
import { RushConfiguration } from '@rushstack/rush-sdk/lib/';
99

10-
const config = RushConfiguration.loadFromDefaultLocation();
10+
const config: RushConfiguration = RushConfiguration.loadFromDefaultLocation();
1111
console.log(config.commonFolder);
1212

1313
console.log('Calling an internal API...');

build-tests-subspace/typescript-newest-test/config/heft.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/heft/v0/heft.schema.json",
33

4-
// TODO: Add comments
4+
"extends": "local-node-rig/profiles/default/config/heft.json",
5+
56
"phasesByName": {
67
"build": {
78
"cleanFiles": [{ "includeGlobs": ["lib", "dist"] }],
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
// The "rig.json" file directs tools to look for their config files in an external package.
3+
// Documentation for this system: https://www.npmjs.com/package/@rushstack/rig-package
4+
"$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json",
5+
6+
"rigPackageName": "local-node-rig"
7+
}

build-tests-subspace/typescript-newest-test/config/rush-project.json

-8
This file was deleted.

build-tests-subspace/typescript-newest-test/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"_phase:build": "heft run --only build -- --clean"
1111
},
1212
"devDependencies": {
13+
"local-node-rig": "workspace:*",
1314
"@rushstack/eslint-config": "workspace:*",
1415
"@rushstack/heft": "workspace:*",
1516
"@rushstack/heft-lint-plugin": "workspace:*",

build-tests-subspace/typescript-v4-test/config/heft.json

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/heft/v0/heft.schema.json",
33

4-
// TODO: Add comments
54
"phasesByName": {
65
"build": {
76
"cleanFiles": [{ "includeGlobs": ["dist", "lib", "temp"] }],

common/config/rush/pnpm-lock.yaml

+20
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)