From 7ef6e33f7f1f3ea3ccf4f124a3d3cad2e5b57cfe Mon Sep 17 00:00:00 2001 From: Ian Clanton-Thuon Date: Sun, 27 Sep 2020 15:54:27 -0700 Subject: [PATCH] Convert Node projects to build with the Node rig. --- .../config/copy-static-assets.json | 24 ------ apps/api-documenter/config/heft.json | 12 --- apps/api-documenter/config/rig.json | 5 ++ apps/api-documenter/package.json | 4 +- apps/api-documenter/tsconfig.json | 2 +- apps/rundown/config/heft.json | 12 --- apps/rundown/config/rig.json | 5 ++ apps/rundown/package.json | 4 +- apps/rundown/tsconfig.json | 2 +- apps/rush-lib/config/copy-static-assets.json | 26 ------ apps/rush-lib/config/heft.json | 12 --- apps/rush-lib/config/rig.json | 5 ++ apps/rush-lib/package.json | 4 +- apps/rush-lib/tsconfig.json | 2 +- apps/rush/config/heft.json | 12 --- apps/rush/config/rig.json | 5 ++ apps/rush/package.json | 4 +- apps/rush/tsconfig.json | 2 +- .../rush/browser-approved-packages.json | 4 + .../rush/nonbrowser-approved-packages.json | 4 + common/config/rush/pnpm-lock.yaml | 80 ++++++++++--------- common/config/rush/repo-state.json | 2 +- .../config/heft.json | 12 --- .../debug-certificate-manager/config/rig.json | 5 ++ .../debug-certificate-manager/package.json | 4 +- .../debug-certificate-manager/tsconfig.json | 3 +- libraries/package-deps-hash/config/heft.json | 12 --- libraries/package-deps-hash/config/rig.json | 5 ++ libraries/package-deps-hash/package.json | 4 +- libraries/package-deps-hash/tsconfig.json | 2 +- libraries/rushell/config/heft.json | 12 --- libraries/rushell/config/rig.json | 5 ++ libraries/rushell/package.json | 4 +- libraries/rushell/tsconfig.json | 2 +- libraries/stream-collator/config/heft.json | 12 --- libraries/stream-collator/config/rig.json | 5 ++ libraries/stream-collator/package.json | 4 +- libraries/stream-collator/tsconfig.json | 2 +- libraries/terminal/config/heft.json | 12 --- libraries/terminal/config/rig.json | 5 ++ libraries/terminal/package.json | 4 +- libraries/terminal/tsconfig.json | 3 +- libraries/typings-generator/config/heft.json | 12 --- libraries/typings-generator/config/rig.json | 5 ++ libraries/typings-generator/package.json | 4 +- libraries/typings-generator/tsconfig.json | 2 +- .../doc-plugin-rush-stack/config/heft.json | 12 --- .../doc-plugin-rush-stack/config/rig.json | 5 ++ .../doc-plugin-rush-stack/package.json | 4 +- .../doc-plugin-rush-stack/tsconfig.json | 3 +- repo-scripts/repo-toolbox/config/heft.json | 12 --- repo-scripts/repo-toolbox/config/rig.json | 5 ++ repo-scripts/repo-toolbox/package.json | 4 +- repo-scripts/repo-toolbox/tsconfig.json | 3 +- .../config/heft.json | 12 --- .../loader-load-themed-styles/config/rig.json | 5 ++ .../loader-load-themed-styles/package.json | 4 +- .../loader-load-themed-styles/tsconfig.json | 2 +- webpack/loader-raw-script/config/heft.json | 12 --- webpack/loader-raw-script/config/rig.json | 5 ++ webpack/loader-raw-script/package.json | 4 +- webpack/loader-raw-script/tsconfig.json | 2 +- .../config/copy-static-assets.json | 26 ------ webpack/localization-plugin/config/heft.json | 12 --- webpack/localization-plugin/config/rig.json | 5 ++ webpack/localization-plugin/package.json | 4 +- webpack/localization-plugin/tsconfig.json | 2 +- .../module-minifier-plugin/config/heft.json | 12 --- .../module-minifier-plugin/config/rig.json | 5 ++ webpack/module-minifier-plugin/package.json | 4 +- webpack/module-minifier-plugin/tsconfig.json | 2 +- .../config/heft.json | 12 --- .../config/rig.json | 5 ++ .../package.json | 4 +- .../tsconfig.json | 2 +- 75 files changed, 189 insertions(+), 372 deletions(-) delete mode 100644 apps/api-documenter/config/copy-static-assets.json delete mode 100644 apps/api-documenter/config/heft.json create mode 100644 apps/api-documenter/config/rig.json delete mode 100644 apps/rundown/config/heft.json create mode 100644 apps/rundown/config/rig.json delete mode 100644 apps/rush-lib/config/copy-static-assets.json delete mode 100644 apps/rush-lib/config/heft.json create mode 100644 apps/rush-lib/config/rig.json delete mode 100644 apps/rush/config/heft.json create mode 100644 apps/rush/config/rig.json delete mode 100644 libraries/debug-certificate-manager/config/heft.json create mode 100644 libraries/debug-certificate-manager/config/rig.json delete mode 100644 libraries/package-deps-hash/config/heft.json create mode 100644 libraries/package-deps-hash/config/rig.json delete mode 100644 libraries/rushell/config/heft.json create mode 100644 libraries/rushell/config/rig.json delete mode 100644 libraries/stream-collator/config/heft.json create mode 100644 libraries/stream-collator/config/rig.json delete mode 100644 libraries/terminal/config/heft.json create mode 100644 libraries/terminal/config/rig.json delete mode 100644 libraries/typings-generator/config/heft.json create mode 100644 libraries/typings-generator/config/rig.json delete mode 100644 repo-scripts/doc-plugin-rush-stack/config/heft.json create mode 100644 repo-scripts/doc-plugin-rush-stack/config/rig.json delete mode 100644 repo-scripts/repo-toolbox/config/heft.json create mode 100644 repo-scripts/repo-toolbox/config/rig.json delete mode 100644 webpack/loader-load-themed-styles/config/heft.json create mode 100644 webpack/loader-load-themed-styles/config/rig.json delete mode 100644 webpack/loader-raw-script/config/heft.json create mode 100644 webpack/loader-raw-script/config/rig.json delete mode 100644 webpack/localization-plugin/config/copy-static-assets.json delete mode 100644 webpack/localization-plugin/config/heft.json create mode 100644 webpack/localization-plugin/config/rig.json delete mode 100644 webpack/module-minifier-plugin/config/heft.json create mode 100644 webpack/module-minifier-plugin/config/rig.json delete mode 100644 webpack/set-webpack-public-path-plugin/config/heft.json create mode 100644 webpack/set-webpack-public-path-plugin/config/rig.json diff --git a/apps/api-documenter/config/copy-static-assets.json b/apps/api-documenter/config/copy-static-assets.json deleted file mode 100644 index db3d8c59274..00000000000 --- a/apps/api-documenter/config/copy-static-assets.json +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Configures the "copy-static-assets" task for Heft. - */ -{ - "$schema": "https://developer.microsoft.com/json-schemas/heft/copy-static-assets.schema.json", - - /** - * File extensions that should be copied from the src folder to the destination folder(s). - */ - "fileExtensions": [".schema.json"], - - /** - * Glob patterns that should be explicitly included. - */ - "includeGlobs": ["schemas/*.json"] - - /** - * Glob patterns that should be explicitly excluded. This takes precedence over globs listed - * in "includeGlobs" and files that match the file extensions provided in "fileExtensions". - */ - // "excludeGlobs": [ - // "some/path/*.css" - // ] -} diff --git a/apps/api-documenter/config/heft.json b/apps/api-documenter/config/heft.json deleted file mode 100644 index 6ac774b7772..00000000000 --- a/apps/api-documenter/config/heft.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "$schema": "https://developer.microsoft.com/json-schemas/heft/heft.schema.json", - - "eventActions": [ - { - "actionKind": "deleteGlobs", - "heftEvent": "clean", - "actionId": "defaultClean", - "globsToDelete": ["dist", "lib", "temp"] - } - ] -} diff --git a/apps/api-documenter/config/rig.json b/apps/api-documenter/config/rig.json new file mode 100644 index 00000000000..58032e098f0 --- /dev/null +++ b/apps/api-documenter/config/rig.json @@ -0,0 +1,5 @@ +{ + "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json", + + "rigPackageName": "@rushstack/heft-node-rig" +} diff --git a/apps/api-documenter/package.json b/apps/api-documenter/package.json index e725e951dcf..3efdfe2792b 100644 --- a/apps/api-documenter/package.json +++ b/apps/api-documenter/package.json @@ -26,13 +26,13 @@ "resolve": "~1.17.0" }, "devDependencies": { - "@microsoft/rush-stack-compiler-3.5": "workspace:*", "@rushstack/eslint-config": "workspace:*", "@rushstack/heft": "workspace:*", "@types/heft-jest": "1.0.1", "@types/js-yaml": "3.12.1", "@types/node": "10.17.13", "@types/resolve": "1.17.1", - "jest": "~25.4.0" + "jest": "~25.4.0", + "@rushstack/heft-node-rig": "workspace:*" } } diff --git a/apps/api-documenter/tsconfig.json b/apps/api-documenter/tsconfig.json index 58f62df6548..ca8ff43fb1f 100644 --- a/apps/api-documenter/tsconfig.json +++ b/apps/api-documenter/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./node_modules/@microsoft/rush-stack-compiler-3.5/includes/tsconfig-node.json", + "extends": "./node_modules/@rushstack/heft-node-rig/profiles/default/tsconfig-base.json", "compilerOptions": { "types": ["heft-jest"] } diff --git a/apps/rundown/config/heft.json b/apps/rundown/config/heft.json deleted file mode 100644 index 6ac774b7772..00000000000 --- a/apps/rundown/config/heft.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "$schema": "https://developer.microsoft.com/json-schemas/heft/heft.schema.json", - - "eventActions": [ - { - "actionKind": "deleteGlobs", - "heftEvent": "clean", - "actionId": "defaultClean", - "globsToDelete": ["dist", "lib", "temp"] - } - ] -} diff --git a/apps/rundown/config/rig.json b/apps/rundown/config/rig.json new file mode 100644 index 00000000000..58032e098f0 --- /dev/null +++ b/apps/rundown/config/rig.json @@ -0,0 +1,5 @@ +{ + "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json", + + "rigPackageName": "@rushstack/heft-node-rig" +} diff --git a/apps/rundown/package.json b/apps/rundown/package.json index 0e74ead2959..9d5048cdab8 100644 --- a/apps/rundown/package.json +++ b/apps/rundown/package.json @@ -24,10 +24,10 @@ "string-argv": "~0.3.1" }, "devDependencies": { - "@microsoft/rush-stack-compiler-3.5": "workspace:*", "@rushstack/eslint-config": "workspace:*", "@rushstack/heft": "workspace:*", "@types/heft-jest": "1.0.1", - "@types/node": "10.17.13" + "@types/node": "10.17.13", + "@rushstack/heft-node-rig": "workspace:*" } } diff --git a/apps/rundown/tsconfig.json b/apps/rundown/tsconfig.json index c390c469ad1..22f94ca28b5 100644 --- a/apps/rundown/tsconfig.json +++ b/apps/rundown/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./node_modules/@microsoft/rush-stack-compiler-3.5/includes/tsconfig-node.json", + "extends": "./node_modules/@rushstack/heft-node-rig/profiles/default/tsconfig-base.json", "compilerOptions": { "types": ["heft-jest", "node"] } diff --git a/apps/rush-lib/config/copy-static-assets.json b/apps/rush-lib/config/copy-static-assets.json deleted file mode 100644 index 37c407c3ec4..00000000000 --- a/apps/rush-lib/config/copy-static-assets.json +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Configures the "copy-static-assets" task for Heft. - */ -{ - "$schema": "https://developer.microsoft.com/json-schemas/heft/copy-static-assets.schema.json", - - /** - * File extensions that should be copied from the src folder to the destination folder(s). - */ - "fileExtensions": [".schema.json"] - - /** - * Glob patterns that should be explicitly included. - */ - // "includeGlobs": [ - // "some/path/*.js" - // ], - - /** - * Glob patterns that should be explicitly excluded. This takes precedence over globs listed - * in "includeGlobs" and files that match the file extensions provided in "fileExtensions". - */ - // "excludeGlobs": [ - // "some/path/*.css" - // ] -} diff --git a/apps/rush-lib/config/heft.json b/apps/rush-lib/config/heft.json deleted file mode 100644 index 6ac774b7772..00000000000 --- a/apps/rush-lib/config/heft.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "$schema": "https://developer.microsoft.com/json-schemas/heft/heft.schema.json", - - "eventActions": [ - { - "actionKind": "deleteGlobs", - "heftEvent": "clean", - "actionId": "defaultClean", - "globsToDelete": ["dist", "lib", "temp"] - } - ] -} diff --git a/apps/rush-lib/config/rig.json b/apps/rush-lib/config/rig.json new file mode 100644 index 00000000000..58032e098f0 --- /dev/null +++ b/apps/rush-lib/config/rig.json @@ -0,0 +1,5 @@ +{ + "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json", + + "rigPackageName": "@rushstack/heft-node-rig" +} diff --git a/apps/rush-lib/package.json b/apps/rush-lib/package.json index 47e8ed86802..98d55f91851 100644 --- a/apps/rush-lib/package.json +++ b/apps/rush-lib/package.json @@ -52,7 +52,6 @@ "jszip": "~3.5.0" }, "devDependencies": { - "@microsoft/rush-stack-compiler-3.5": "workspace:*", "@rushstack/eslint-config": "workspace:*", "@rushstack/heft": "workspace:*", "@types/glob": "7.1.1", @@ -73,6 +72,7 @@ "@types/tar": "4.0.3", "@types/wordwrap": "1.0.0", "@types/z-schema": "3.16.31", - "jest": "~25.4.0" + "jest": "~25.4.0", + "@rushstack/heft-node-rig": "workspace:*" } } diff --git a/apps/rush-lib/tsconfig.json b/apps/rush-lib/tsconfig.json index c390c469ad1..22f94ca28b5 100644 --- a/apps/rush-lib/tsconfig.json +++ b/apps/rush-lib/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./node_modules/@microsoft/rush-stack-compiler-3.5/includes/tsconfig-node.json", + "extends": "./node_modules/@rushstack/heft-node-rig/profiles/default/tsconfig-base.json", "compilerOptions": { "types": ["heft-jest", "node"] } diff --git a/apps/rush/config/heft.json b/apps/rush/config/heft.json deleted file mode 100644 index 6ac774b7772..00000000000 --- a/apps/rush/config/heft.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "$schema": "https://developer.microsoft.com/json-schemas/heft/heft.schema.json", - - "eventActions": [ - { - "actionKind": "deleteGlobs", - "heftEvent": "clean", - "actionId": "defaultClean", - "globsToDelete": ["dist", "lib", "temp"] - } - ] -} diff --git a/apps/rush/config/rig.json b/apps/rush/config/rig.json new file mode 100644 index 00000000000..58032e098f0 --- /dev/null +++ b/apps/rush/config/rig.json @@ -0,0 +1,5 @@ +{ + "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json", + + "rigPackageName": "@rushstack/heft-node-rig" +} diff --git a/apps/rush/package.json b/apps/rush/package.json index 580043bf9c0..db10b08692d 100644 --- a/apps/rush/package.json +++ b/apps/rush/package.json @@ -37,7 +37,6 @@ "semver": "~7.3.0" }, "devDependencies": { - "@microsoft/rush-stack-compiler-3.5": "workspace:*", "@rushstack/eslint-config": "workspace:*", "@rushstack/heft": "workspace:*", "@types/heft-jest": "1.0.1", @@ -45,6 +44,7 @@ "@types/semver": "~7.3.1", "@types/sinon": "1.16.34", "chai": "~3.5.0", - "sinon": "~1.17.3" + "sinon": "~1.17.3", + "@rushstack/heft-node-rig": "workspace:*" } } diff --git a/apps/rush/tsconfig.json b/apps/rush/tsconfig.json index c390c469ad1..22f94ca28b5 100644 --- a/apps/rush/tsconfig.json +++ b/apps/rush/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./node_modules/@microsoft/rush-stack-compiler-3.5/includes/tsconfig-node.json", + "extends": "./node_modules/@rushstack/heft-node-rig/profiles/default/tsconfig-base.json", "compilerOptions": { "types": ["heft-jest", "node"] } diff --git a/common/config/rush/browser-approved-packages.json b/common/config/rush/browser-approved-packages.json index 5e3f614e8b6..2f4890b6ad2 100644 --- a/common/config/rush/browser-approved-packages.json +++ b/common/config/rush/browser-approved-packages.json @@ -2,6 +2,10 @@ { "$schema": "https://developer.microsoft.com/json-schemas/rush/v5/approved-packages.schema.json", "packages": [ + { + "name": "@rushstack/heft-node-rig", + "allowedCategories": [ "libraries" ] + }, { "name": "react", "allowedCategories": [ "tests" ] diff --git a/common/config/rush/nonbrowser-approved-packages.json b/common/config/rush/nonbrowser-approved-packages.json index df2b8dd9df0..d9786ceabf9 100644 --- a/common/config/rush/nonbrowser-approved-packages.json +++ b/common/config/rush/nonbrowser-approved-packages.json @@ -186,6 +186,10 @@ "name": "@rushstack/heft-config-file", "allowedCategories": [ "libraries" ] }, + { + "name": "@rushstack/heft-node-rig", + "allowedCategories": [ "libraries" ] + }, { "name": "@rushstack/localization-plugin", "allowedCategories": [ "tests" ] diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index cec63f6d611..4b0a8077c89 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -11,9 +11,9 @@ importers: js-yaml: 3.13.1 resolve: 1.17.0 devDependencies: - '@microsoft/rush-stack-compiler-3.5': 'link:../../stack/rush-stack-compiler-3.5' '@rushstack/eslint-config': 'link:../../stack/eslint-config' '@rushstack/heft': 'link:../heft' + '@rushstack/heft-node-rig': 'link:../../rigs/heft-node-rig' '@types/heft-jest': 1.0.1 '@types/js-yaml': 3.12.1 '@types/node': 10.17.13 @@ -21,10 +21,10 @@ importers: jest: 25.4.0 specifiers: '@microsoft/api-extractor-model': 'workspace:*' - '@microsoft/rush-stack-compiler-3.5': 'workspace:*' '@microsoft/tsdoc': 0.12.19 '@rushstack/eslint-config': 'workspace:*' '@rushstack/heft': 'workspace:*' + '@rushstack/heft-node-rig': 'workspace:*' '@rushstack/node-core-library': 'workspace:*' '@rushstack/ts-command-line': 'workspace:*' '@types/heft-jest': 1.0.1 @@ -169,15 +169,15 @@ importers: '@rushstack/ts-command-line': 'link:../../libraries/ts-command-line' string-argv: 0.3.1 devDependencies: - '@microsoft/rush-stack-compiler-3.5': 'link:../../stack/rush-stack-compiler-3.5' '@rushstack/eslint-config': 'link:../../stack/eslint-config' '@rushstack/heft': 'link:../heft' + '@rushstack/heft-node-rig': 'link:../../rigs/heft-node-rig' '@types/heft-jest': 1.0.1 '@types/node': 10.17.13 specifiers: - '@microsoft/rush-stack-compiler-3.5': 'workspace:*' '@rushstack/eslint-config': 'workspace:*' '@rushstack/heft': 'workspace:*' + '@rushstack/heft-node-rig': 'workspace:*' '@rushstack/node-core-library': 'workspace:*' '@rushstack/ts-command-line': 'workspace:*' '@types/heft-jest': 1.0.1 @@ -190,9 +190,9 @@ importers: colors: 1.2.5 semver: 7.3.2 devDependencies: - '@microsoft/rush-stack-compiler-3.5': 'link:../../stack/rush-stack-compiler-3.5' '@rushstack/eslint-config': 'link:../../stack/eslint-config' '@rushstack/heft': 'link:../heft' + '@rushstack/heft-node-rig': 'link:../../rigs/heft-node-rig' '@types/heft-jest': 1.0.1 '@types/node': 10.17.13 '@types/semver': 7.3.4 @@ -201,9 +201,9 @@ importers: sinon: 1.17.7 specifiers: '@microsoft/rush-lib': 'workspace:*' - '@microsoft/rush-stack-compiler-3.5': 'workspace:*' '@rushstack/eslint-config': 'workspace:*' '@rushstack/heft': 'workspace:*' + '@rushstack/heft-node-rig': 'workspace:*' '@rushstack/node-core-library': 'workspace:*' '@types/heft-jest': 1.0.1 '@types/node': 10.17.13 @@ -248,9 +248,9 @@ importers: wordwrap: 1.0.0 z-schema: 3.18.4 devDependencies: - '@microsoft/rush-stack-compiler-3.5': 'link:../../stack/rush-stack-compiler-3.5' '@rushstack/eslint-config': 'link:../../stack/eslint-config' '@rushstack/heft': 'link:../heft' + '@rushstack/heft-node-rig': 'link:../../rigs/heft-node-rig' '@types/glob': 7.1.1 '@types/heft-jest': 1.0.1 '@types/inquirer': 0.0.43 @@ -271,10 +271,10 @@ importers: '@types/z-schema': 3.16.31 jest: 25.4.0 specifiers: - '@microsoft/rush-stack-compiler-3.5': 'workspace:*' '@pnpm/link-bins': ~5.3.7 '@rushstack/eslint-config': 'workspace:*' '@rushstack/heft': 'workspace:*' + '@rushstack/heft-node-rig': 'workspace:*' '@rushstack/node-core-library': 'workspace:*' '@rushstack/package-deps-hash': 'workspace:*' '@rushstack/stream-collator': 'workspace:*' @@ -1315,16 +1315,16 @@ importers: node-forge: 0.7.6 sudo: 1.0.3 devDependencies: - '@microsoft/rush-stack-compiler-3.5': 'link:../../stack/rush-stack-compiler-3.5' '@rushstack/eslint-config': 'link:../../stack/eslint-config' '@rushstack/heft': 'link:../../apps/heft' + '@rushstack/heft-node-rig': 'link:../../rigs/heft-node-rig' '@types/heft-jest': 1.0.1 '@types/node': 10.17.13 '@types/node-forge': 0.9.1 specifiers: - '@microsoft/rush-stack-compiler-3.5': 'workspace:*' '@rushstack/eslint-config': 'workspace:*' '@rushstack/heft': 'workspace:*' + '@rushstack/heft-node-rig': 'workspace:*' '@rushstack/node-core-library': 'workspace:*' '@types/heft-jest': 1.0.1 '@types/node': 10.17.13 @@ -1354,15 +1354,15 @@ importers: jsonpath-plus: ~4.0.0 ../../libraries/load-themed-styles: devDependencies: - '@microsoft/rush-stack-compiler-3.5': 'link:../../stack/rush-stack-compiler-3.5' '@rushstack/eslint-config': 'link:../../stack/eslint-config' '@rushstack/heft': 'link:../../apps/heft' + '@rushstack/heft-node-rig': 'link:../../rigs/heft-node-rig' '@types/heft-jest': 1.0.1 '@types/webpack-env': 1.13.0 specifiers: - '@microsoft/rush-stack-compiler-3.5': 'workspace:*' '@rushstack/eslint-config': 'workspace:*' '@rushstack/heft': 'workspace:*' + '@rushstack/heft-node-rig': 'workspace:*' '@types/heft-jest': 1.0.1 '@types/webpack-env': 1.13.0 ../../libraries/node-core-library: @@ -1411,15 +1411,15 @@ importers: dependencies: '@rushstack/node-core-library': 'link:../node-core-library' devDependencies: - '@microsoft/rush-stack-compiler-3.5': 'link:../../stack/rush-stack-compiler-3.5' '@rushstack/eslint-config': 'link:../../stack/eslint-config' '@rushstack/heft': 'link:../../apps/heft' + '@rushstack/heft-node-rig': 'link:../../rigs/heft-node-rig' '@types/heft-jest': 1.0.1 '@types/node': 10.17.13 specifiers: - '@microsoft/rush-stack-compiler-3.5': 'workspace:*' '@rushstack/eslint-config': 'workspace:*' '@rushstack/heft': 'workspace:*' + '@rushstack/heft-node-rig': 'workspace:*' '@rushstack/node-core-library': 'workspace:*' '@types/heft-jest': 1.0.1 '@types/node': 10.17.13 @@ -1449,17 +1449,17 @@ importers: dependencies: '@rushstack/node-core-library': 'link:../node-core-library' devDependencies: - '@microsoft/rush-stack-compiler-3.5': 'link:../../stack/rush-stack-compiler-3.5' '@rushstack/eslint-config': 'link:../../stack/eslint-config' '@rushstack/heft': 'link:../../apps/heft' + '@rushstack/heft-node-rig': 'link:../../rigs/heft-node-rig' '@types/heft-jest': 1.0.1 '@types/node': 10.17.13 jest: 25.4.0 ts-jest: 25.1.0_jest@25.4.0 specifiers: - '@microsoft/rush-stack-compiler-3.5': 'workspace:*' '@rushstack/eslint-config': 'workspace:*' '@rushstack/heft': 'workspace:*' + '@rushstack/heft-node-rig': 'workspace:*' '@rushstack/node-core-library': 'workspace:*' '@types/heft-jest': 1.0.1 '@types/node': 10.17.13 @@ -1470,15 +1470,15 @@ importers: '@rushstack/node-core-library': 'link:../node-core-library' '@rushstack/terminal': 'link:../terminal' devDependencies: - '@microsoft/rush-stack-compiler-3.5': 'link:../../stack/rush-stack-compiler-3.5' '@rushstack/eslint-config': 'link:../../stack/eslint-config' '@rushstack/heft': 'link:../../apps/heft' + '@rushstack/heft-node-rig': 'link:../../rigs/heft-node-rig' '@types/heft-jest': 1.0.1 '@types/node': 10.17.13 specifiers: - '@microsoft/rush-stack-compiler-3.5': 'workspace:*' '@rushstack/eslint-config': 'workspace:*' '@rushstack/heft': 'workspace:*' + '@rushstack/heft-node-rig': 'workspace:*' '@rushstack/node-core-library': 'workspace:*' '@rushstack/terminal': 'workspace:*' '@types/heft-jest': 1.0.1 @@ -1488,15 +1488,15 @@ importers: '@rushstack/node-core-library': 'link:../node-core-library' '@types/node': 10.17.13 devDependencies: - '@microsoft/rush-stack-compiler-3.5': 'link:../../stack/rush-stack-compiler-3.5' '@rushstack/eslint-config': 'link:../../stack/eslint-config' '@rushstack/heft': 'link:../../apps/heft' + '@rushstack/heft-node-rig': 'link:../../rigs/heft-node-rig' '@types/heft-jest': 1.0.1 colors: 1.2.5 specifiers: - '@microsoft/rush-stack-compiler-3.5': 'workspace:*' '@rushstack/eslint-config': 'workspace:*' '@rushstack/heft': 'workspace:*' + '@rushstack/heft-node-rig': 'workspace:*' '@rushstack/node-core-library': 'workspace:*' '@types/heft-jest': 1.0.1 '@types/node': 10.17.13 @@ -1546,15 +1546,15 @@ importers: glob: 7.0.6 devDependencies: '@microsoft/node-library-build': 'link:../../core-build/node-library-build' - '@microsoft/rush-stack-compiler-3.5': 'link:../../stack/rush-stack-compiler-3.5' '@rushstack/eslint-config': 'link:../../stack/eslint-config' '@rushstack/heft': 'link:../../apps/heft' + '@rushstack/heft-node-rig': 'link:../../rigs/heft-node-rig' '@types/glob': 7.1.1 specifiers: '@microsoft/node-library-build': 'workspace:*' - '@microsoft/rush-stack-compiler-3.5': 'workspace:*' '@rushstack/eslint-config': 'workspace:*' '@rushstack/heft': 'workspace:*' + '@rushstack/heft-node-rig': 'workspace:*' '@rushstack/node-core-library': 'workspace:*' '@types/glob': 7.1.1 '@types/node': 10.17.13 @@ -1568,18 +1568,18 @@ importers: '@rushstack/node-core-library': 'link:../../libraries/node-core-library' js-yaml: 3.13.1 devDependencies: - '@microsoft/rush-stack-compiler-3.5': 'link:../../stack/rush-stack-compiler-3.5' '@rushstack/eslint-config': 'link:../../stack/eslint-config' '@rushstack/heft': 'link:../../apps/heft' + '@rushstack/heft-node-rig': 'link:../../rigs/heft-node-rig' '@types/js-yaml': 3.12.1 '@types/node': 10.17.13 specifiers: '@microsoft/api-documenter': 'workspace:*' '@microsoft/api-extractor-model': 'workspace:*' - '@microsoft/rush-stack-compiler-3.5': 'workspace:*' '@microsoft/tsdoc': 0.12.19 '@rushstack/eslint-config': 'workspace:*' '@rushstack/heft': 'workspace:*' + '@rushstack/heft-node-rig': 'workspace:*' '@rushstack/node-core-library': 'workspace:*' '@types/js-yaml': 3.12.1 '@types/node': 10.17.13 @@ -1599,18 +1599,25 @@ importers: '@rushstack/node-core-library': 'link:../../libraries/node-core-library' '@rushstack/ts-command-line': 'link:../../libraries/ts-command-line' devDependencies: - '@microsoft/rush-stack-compiler-3.5': 'link:../../stack/rush-stack-compiler-3.5' '@rushstack/eslint-config': 'link:../../stack/eslint-config' '@rushstack/heft': 'link:../../apps/heft' + '@rushstack/heft-node-rig': 'link:../../rigs/heft-node-rig' '@types/node': 10.17.13 specifiers: '@microsoft/rush-lib': 'workspace:*' - '@microsoft/rush-stack-compiler-3.5': 'workspace:*' '@rushstack/eslint-config': 'workspace:*' '@rushstack/heft': 'workspace:*' + '@rushstack/heft-node-rig': 'workspace:*' '@rushstack/node-core-library': 'workspace:*' '@rushstack/ts-command-line': 'workspace:*' '@types/node': 10.17.13 + ../../rigs/heft-node-rig: + dependencies: + eslint: 7.2.0 + typescript: 3.5.3 + specifiers: + eslint: ~7.2.0 + typescript: ~3.5.3 ../../stack/eslint-config: dependencies: '@rushstack/eslint-patch': 'link:../eslint-patch' @@ -2111,18 +2118,18 @@ importers: '@microsoft/load-themed-styles': 'link:../../libraries/load-themed-styles' loader-utils: 1.1.0 devDependencies: - '@microsoft/rush-stack-compiler-3.5': 'link:../../stack/rush-stack-compiler-3.5' '@rushstack/eslint-config': 'link:../../stack/eslint-config' '@rushstack/heft': 'link:../../apps/heft' + '@rushstack/heft-node-rig': 'link:../../rigs/heft-node-rig' '@types/heft-jest': 1.0.1 '@types/loader-utils': 1.1.3 '@types/node': 10.17.13 '@types/webpack': 4.39.8 specifiers: '@microsoft/load-themed-styles': 'workspace:*' - '@microsoft/rush-stack-compiler-3.5': 'workspace:*' '@rushstack/eslint-config': 'workspace:*' '@rushstack/heft': 'workspace:*' + '@rushstack/heft-node-rig': 'workspace:*' '@types/heft-jest': 1.0.1 '@types/loader-utils': 1.1.3 '@types/node': 10.17.13 @@ -2132,15 +2139,15 @@ importers: dependencies: loader-utils: 1.1.0 devDependencies: - '@microsoft/rush-stack-compiler-3.5': 'link:../../stack/rush-stack-compiler-3.5' '@rushstack/eslint-config': 'link:../../stack/eslint-config' '@rushstack/heft': 'link:../../apps/heft' + '@rushstack/heft-node-rig': 'link:../../rigs/heft-node-rig' '@types/heft-jest': 1.0.1 '@types/node': 10.17.13 specifiers: - '@microsoft/rush-stack-compiler-3.5': 'workspace:*' '@rushstack/eslint-config': 'workspace:*' '@rushstack/heft': 'workspace:*' + '@rushstack/heft-node-rig': 'workspace:*' '@types/heft-jest': 1.0.1 '@types/node': 10.17.13 loader-utils: ~1.1.0 @@ -2156,9 +2163,9 @@ importers: pseudolocale: 1.1.0 xmldoc: 1.1.2 devDependencies: - '@microsoft/rush-stack-compiler-3.5': 'link:../../stack/rush-stack-compiler-3.5' '@rushstack/eslint-config': 'link:../../stack/eslint-config' '@rushstack/heft': 'link:../../apps/heft' + '@rushstack/heft-node-rig': 'link:../../rigs/heft-node-rig' '@rushstack/set-webpack-public-path-plugin': 'link:../set-webpack-public-path-plugin' '@types/loader-utils': 1.1.3 '@types/lodash': 4.14.116 @@ -2166,9 +2173,9 @@ importers: '@types/xmldoc': 1.1.4 webpack: 4.31.0_webpack@4.31.0 specifiers: - '@microsoft/rush-stack-compiler-3.5': 'workspace:*' '@rushstack/eslint-config': 'workspace:*' '@rushstack/heft': 'workspace:*' + '@rushstack/heft-node-rig': 'workspace:*' '@rushstack/node-core-library': 'workspace:*' '@rushstack/set-webpack-public-path-plugin': 'workspace:*' '@rushstack/typings-generator': 'workspace:*' @@ -2192,17 +2199,17 @@ importers: tapable: 1.1.3 terser: 4.7.0 devDependencies: - '@microsoft/rush-stack-compiler-3.5': 'link:../../stack/rush-stack-compiler-3.5' '@rushstack/eslint-config': 'link:../../stack/eslint-config' '@rushstack/heft': 'link:../../apps/heft' + '@rushstack/heft-node-rig': 'link:../../rigs/heft-node-rig' '@types/heft-jest': 1.0.1 '@types/webpack': 4.39.8 webpack: 4.31.0_webpack@4.31.0 webpack-sources: 1.4.3 specifiers: - '@microsoft/rush-stack-compiler-3.5': 'workspace:*' '@rushstack/eslint-config': 'workspace:*' '@rushstack/heft': 'workspace:*' + '@rushstack/heft-node-rig': 'workspace:*' '@types/heft-jest': 1.0.1 '@types/node': 10.17.13 '@types/tapable': 1.0.5 @@ -2217,9 +2224,9 @@ importers: lodash: 4.17.20 uglify-js: 3.0.28 devDependencies: - '@microsoft/rush-stack-compiler-3.5': 'link:../../stack/rush-stack-compiler-3.5' '@rushstack/eslint-config': 'link:../../stack/eslint-config' '@rushstack/heft': 'link:../../apps/heft' + '@rushstack/heft-node-rig': 'link:../../rigs/heft-node-rig' '@types/heft-jest': 1.0.1 '@types/lodash': 4.14.116 '@types/node': 10.17.13 @@ -2227,9 +2234,9 @@ importers: '@types/uglify-js': 2.6.29 '@types/webpack': 4.39.8 specifiers: - '@microsoft/rush-stack-compiler-3.5': 'workspace:*' '@rushstack/eslint-config': 'workspace:*' '@rushstack/heft': 'workspace:*' + '@rushstack/heft-node-rig': 'workspace:*' '@types/heft-jest': 1.0.1 '@types/lodash': 4.14.116 '@types/node': 10.17.13 @@ -14417,3 +14424,4 @@ packages: commander: 2.20.3 resolution: integrity: sha512-DUOKC/IhbkdLKKiV89gw9DUauTV8U/8yJl1sjf6MtDmzevLKOF2duNJ495S3MFVjqZarr+qNGCPbkg4mu4PpLw== +registry: '' diff --git a/common/config/rush/repo-state.json b/common/config/rush/repo-state.json index 8e96b78a20a..446ee2033d8 100644 --- a/common/config/rush/repo-state.json +++ b/common/config/rush/repo-state.json @@ -1,5 +1,5 @@ // DO NOT MODIFY THIS FILE. It is generated and used by Rush. { - "pnpmShrinkwrapHash": "e2cd1b3e52187f768daab4d05bd91c4274767d53", + "pnpmShrinkwrapHash": "2f3d60f06de4294bcf188eb0c909546260bcce14", "preferredVersionsHash": "334ea62b6a2798dcf80917b79555983377e7435e" } diff --git a/libraries/debug-certificate-manager/config/heft.json b/libraries/debug-certificate-manager/config/heft.json deleted file mode 100644 index 6ac774b7772..00000000000 --- a/libraries/debug-certificate-manager/config/heft.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "$schema": "https://developer.microsoft.com/json-schemas/heft/heft.schema.json", - - "eventActions": [ - { - "actionKind": "deleteGlobs", - "heftEvent": "clean", - "actionId": "defaultClean", - "globsToDelete": ["dist", "lib", "temp"] - } - ] -} diff --git a/libraries/debug-certificate-manager/config/rig.json b/libraries/debug-certificate-manager/config/rig.json new file mode 100644 index 00000000000..58032e098f0 --- /dev/null +++ b/libraries/debug-certificate-manager/config/rig.json @@ -0,0 +1,5 @@ +{ + "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json", + + "rigPackageName": "@rushstack/heft-node-rig" +} diff --git a/libraries/debug-certificate-manager/package.json b/libraries/debug-certificate-manager/package.json index ab68a0b8f24..011c1e6c82e 100644 --- a/libraries/debug-certificate-manager/package.json +++ b/libraries/debug-certificate-manager/package.json @@ -18,11 +18,11 @@ "sudo": "~1.0.3" }, "devDependencies": { - "@microsoft/rush-stack-compiler-3.5": "workspace:*", "@rushstack/eslint-config": "workspace:*", "@rushstack/heft": "workspace:*", "@types/heft-jest": "1.0.1", "@types/node": "10.17.13", - "@types/node-forge": "0.9.1" + "@types/node-forge": "0.9.1", + "@rushstack/heft-node-rig": "workspace:*" } } diff --git a/libraries/debug-certificate-manager/tsconfig.json b/libraries/debug-certificate-manager/tsconfig.json index 07d008b280c..22f94ca28b5 100644 --- a/libraries/debug-certificate-manager/tsconfig.json +++ b/libraries/debug-certificate-manager/tsconfig.json @@ -1,6 +1,5 @@ { - "extends": "./node_modules/@microsoft/rush-stack-compiler-3.5/includes/tsconfig-node.json", - + "extends": "./node_modules/@rushstack/heft-node-rig/profiles/default/tsconfig-base.json", "compilerOptions": { "types": ["heft-jest", "node"] } diff --git a/libraries/package-deps-hash/config/heft.json b/libraries/package-deps-hash/config/heft.json deleted file mode 100644 index 6ac774b7772..00000000000 --- a/libraries/package-deps-hash/config/heft.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "$schema": "https://developer.microsoft.com/json-schemas/heft/heft.schema.json", - - "eventActions": [ - { - "actionKind": "deleteGlobs", - "heftEvent": "clean", - "actionId": "defaultClean", - "globsToDelete": ["dist", "lib", "temp"] - } - ] -} diff --git a/libraries/package-deps-hash/config/rig.json b/libraries/package-deps-hash/config/rig.json new file mode 100644 index 00000000000..58032e098f0 --- /dev/null +++ b/libraries/package-deps-hash/config/rig.json @@ -0,0 +1,5 @@ +{ + "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json", + + "rigPackageName": "@rushstack/heft-node-rig" +} diff --git a/libraries/package-deps-hash/package.json b/libraries/package-deps-hash/package.json index 1ab7b2f31a4..db50b7b0427 100644 --- a/libraries/package-deps-hash/package.json +++ b/libraries/package-deps-hash/package.json @@ -13,12 +13,12 @@ "build": "heft test --clean" }, "devDependencies": { - "@microsoft/rush-stack-compiler-3.5": "workspace:*", "@rushstack/node-core-library": "workspace:*", "@rushstack/eslint-config": "workspace:*", "@rushstack/heft": "workspace:*", "@types/heft-jest": "1.0.1", - "@types/node": "10.17.13" + "@types/node": "10.17.13", + "@rushstack/heft-node-rig": "workspace:*" }, "dependencies": { "@rushstack/node-core-library": "workspace:*" diff --git a/libraries/package-deps-hash/tsconfig.json b/libraries/package-deps-hash/tsconfig.json index c390c469ad1..22f94ca28b5 100644 --- a/libraries/package-deps-hash/tsconfig.json +++ b/libraries/package-deps-hash/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./node_modules/@microsoft/rush-stack-compiler-3.5/includes/tsconfig-node.json", + "extends": "./node_modules/@rushstack/heft-node-rig/profiles/default/tsconfig-base.json", "compilerOptions": { "types": ["heft-jest", "node"] } diff --git a/libraries/rushell/config/heft.json b/libraries/rushell/config/heft.json deleted file mode 100644 index 6ac774b7772..00000000000 --- a/libraries/rushell/config/heft.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "$schema": "https://developer.microsoft.com/json-schemas/heft/heft.schema.json", - - "eventActions": [ - { - "actionKind": "deleteGlobs", - "heftEvent": "clean", - "actionId": "defaultClean", - "globsToDelete": ["dist", "lib", "temp"] - } - ] -} diff --git a/libraries/rushell/config/rig.json b/libraries/rushell/config/rig.json new file mode 100644 index 00000000000..58032e098f0 --- /dev/null +++ b/libraries/rushell/config/rig.json @@ -0,0 +1,5 @@ +{ + "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json", + + "rigPackageName": "@rushstack/heft-node-rig" +} diff --git a/libraries/rushell/package.json b/libraries/rushell/package.json index 21d783ee654..c0870a93e8c 100644 --- a/libraries/rushell/package.json +++ b/libraries/rushell/package.json @@ -17,13 +17,13 @@ "@rushstack/node-core-library": "workspace:*" }, "devDependencies": { - "@microsoft/rush-stack-compiler-3.5": "workspace:*", "@rushstack/eslint-config": "workspace:*", "@rushstack/heft": "workspace:*", "@types/heft-jest": "1.0.1", "@types/node": "10.17.13", "jest": "~25.4.0", - "ts-jest": "~25.1.0" + "ts-jest": "~25.1.0", + "@rushstack/heft-node-rig": "workspace:*" }, "jest": { "moduleFileExtensions": [ diff --git a/libraries/rushell/tsconfig.json b/libraries/rushell/tsconfig.json index c390c469ad1..22f94ca28b5 100644 --- a/libraries/rushell/tsconfig.json +++ b/libraries/rushell/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./node_modules/@microsoft/rush-stack-compiler-3.5/includes/tsconfig-node.json", + "extends": "./node_modules/@rushstack/heft-node-rig/profiles/default/tsconfig-base.json", "compilerOptions": { "types": ["heft-jest", "node"] } diff --git a/libraries/stream-collator/config/heft.json b/libraries/stream-collator/config/heft.json deleted file mode 100644 index 6ac774b7772..00000000000 --- a/libraries/stream-collator/config/heft.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "$schema": "https://developer.microsoft.com/json-schemas/heft/heft.schema.json", - - "eventActions": [ - { - "actionKind": "deleteGlobs", - "heftEvent": "clean", - "actionId": "defaultClean", - "globsToDelete": ["dist", "lib", "temp"] - } - ] -} diff --git a/libraries/stream-collator/config/rig.json b/libraries/stream-collator/config/rig.json new file mode 100644 index 00000000000..58032e098f0 --- /dev/null +++ b/libraries/stream-collator/config/rig.json @@ -0,0 +1,5 @@ +{ + "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json", + + "rigPackageName": "@rushstack/heft-node-rig" +} diff --git a/libraries/stream-collator/package.json b/libraries/stream-collator/package.json index 50bf4e23cad..925f147e1ee 100644 --- a/libraries/stream-collator/package.json +++ b/libraries/stream-collator/package.json @@ -17,10 +17,10 @@ "@rushstack/terminal": "workspace:*" }, "devDependencies": { - "@microsoft/rush-stack-compiler-3.5": "workspace:*", "@types/heft-jest": "1.0.1", "@types/node": "10.17.13", "@rushstack/eslint-config": "workspace:*", - "@rushstack/heft": "workspace:*" + "@rushstack/heft": "workspace:*", + "@rushstack/heft-node-rig": "workspace:*" } } diff --git a/libraries/stream-collator/tsconfig.json b/libraries/stream-collator/tsconfig.json index 4719d21716b..07427e9e721 100644 --- a/libraries/stream-collator/tsconfig.json +++ b/libraries/stream-collator/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./node_modules/@microsoft/rush-stack-compiler-3.5/includes/tsconfig-node.json", + "extends": "./node_modules/@rushstack/heft-node-rig/profiles/default/tsconfig-base.json", "compilerOptions": { "strictNullChecks": false, "types": ["heft-jest", "node"] diff --git a/libraries/terminal/config/heft.json b/libraries/terminal/config/heft.json deleted file mode 100644 index 6ac774b7772..00000000000 --- a/libraries/terminal/config/heft.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "$schema": "https://developer.microsoft.com/json-schemas/heft/heft.schema.json", - - "eventActions": [ - { - "actionKind": "deleteGlobs", - "heftEvent": "clean", - "actionId": "defaultClean", - "globsToDelete": ["dist", "lib", "temp"] - } - ] -} diff --git a/libraries/terminal/config/rig.json b/libraries/terminal/config/rig.json new file mode 100644 index 00000000000..58032e098f0 --- /dev/null +++ b/libraries/terminal/config/rig.json @@ -0,0 +1,5 @@ +{ + "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json", + + "rigPackageName": "@rushstack/heft-node-rig" +} diff --git a/libraries/terminal/package.json b/libraries/terminal/package.json index e6867796ca2..fc448a0be6d 100644 --- a/libraries/terminal/package.json +++ b/libraries/terminal/package.json @@ -16,10 +16,10 @@ "@types/node": "10.17.13" }, "devDependencies": { - "@microsoft/rush-stack-compiler-3.5": "workspace:*", "@rushstack/eslint-config": "workspace:*", "@rushstack/heft": "workspace:*", "@types/heft-jest": "1.0.1", - "colors": "~1.2.1" + "colors": "~1.2.1", + "@rushstack/heft-node-rig": "workspace:*" } } diff --git a/libraries/terminal/tsconfig.json b/libraries/terminal/tsconfig.json index 07d008b280c..22f94ca28b5 100644 --- a/libraries/terminal/tsconfig.json +++ b/libraries/terminal/tsconfig.json @@ -1,6 +1,5 @@ { - "extends": "./node_modules/@microsoft/rush-stack-compiler-3.5/includes/tsconfig-node.json", - + "extends": "./node_modules/@rushstack/heft-node-rig/profiles/default/tsconfig-base.json", "compilerOptions": { "types": ["heft-jest", "node"] } diff --git a/libraries/typings-generator/config/heft.json b/libraries/typings-generator/config/heft.json deleted file mode 100644 index 6ac774b7772..00000000000 --- a/libraries/typings-generator/config/heft.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "$schema": "https://developer.microsoft.com/json-schemas/heft/heft.schema.json", - - "eventActions": [ - { - "actionKind": "deleteGlobs", - "heftEvent": "clean", - "actionId": "defaultClean", - "globsToDelete": ["dist", "lib", "temp"] - } - ] -} diff --git a/libraries/typings-generator/config/rig.json b/libraries/typings-generator/config/rig.json new file mode 100644 index 00000000000..58032e098f0 --- /dev/null +++ b/libraries/typings-generator/config/rig.json @@ -0,0 +1,5 @@ +{ + "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json", + + "rigPackageName": "@rushstack/heft-node-rig" +} diff --git a/libraries/typings-generator/package.json b/libraries/typings-generator/package.json index 969795d1def..bf5e85a896d 100644 --- a/libraries/typings-generator/package.json +++ b/libraries/typings-generator/package.json @@ -24,10 +24,10 @@ "chokidar": "~3.4.0" }, "devDependencies": { - "@microsoft/rush-stack-compiler-3.5": "workspace:*", "@microsoft/node-library-build": "workspace:*", "@rushstack/eslint-config": "workspace:*", "@rushstack/heft": "workspace:*", - "@types/glob": "7.1.1" + "@types/glob": "7.1.1", + "@rushstack/heft-node-rig": "workspace:*" } } diff --git a/libraries/typings-generator/tsconfig.json b/libraries/typings-generator/tsconfig.json index b1abb9e5b4a..a114c3448ed 100644 --- a/libraries/typings-generator/tsconfig.json +++ b/libraries/typings-generator/tsconfig.json @@ -1,3 +1,3 @@ { - "extends": "./node_modules/@microsoft/rush-stack-compiler-3.5/includes/tsconfig-node.json" + "extends": "./node_modules/@rushstack/heft-node-rig/profiles/default/tsconfig-base.json" } diff --git a/repo-scripts/doc-plugin-rush-stack/config/heft.json b/repo-scripts/doc-plugin-rush-stack/config/heft.json deleted file mode 100644 index 6ac774b7772..00000000000 --- a/repo-scripts/doc-plugin-rush-stack/config/heft.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "$schema": "https://developer.microsoft.com/json-schemas/heft/heft.schema.json", - - "eventActions": [ - { - "actionKind": "deleteGlobs", - "heftEvent": "clean", - "actionId": "defaultClean", - "globsToDelete": ["dist", "lib", "temp"] - } - ] -} diff --git a/repo-scripts/doc-plugin-rush-stack/config/rig.json b/repo-scripts/doc-plugin-rush-stack/config/rig.json new file mode 100644 index 00000000000..58032e098f0 --- /dev/null +++ b/repo-scripts/doc-plugin-rush-stack/config/rig.json @@ -0,0 +1,5 @@ +{ + "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json", + + "rigPackageName": "@rushstack/heft-node-rig" +} diff --git a/repo-scripts/doc-plugin-rush-stack/package.json b/repo-scripts/doc-plugin-rush-stack/package.json index bb79298d3a2..7a1e6bd2157 100644 --- a/repo-scripts/doc-plugin-rush-stack/package.json +++ b/repo-scripts/doc-plugin-rush-stack/package.json @@ -17,10 +17,10 @@ "js-yaml": "~3.13.1" }, "devDependencies": { - "@microsoft/rush-stack-compiler-3.5": "workspace:*", "@rushstack/eslint-config": "workspace:*", "@rushstack/heft": "workspace:*", "@types/js-yaml": "3.12.1", - "@types/node": "10.17.13" + "@types/node": "10.17.13", + "@rushstack/heft-node-rig": "workspace:*" } } diff --git a/repo-scripts/doc-plugin-rush-stack/tsconfig.json b/repo-scripts/doc-plugin-rush-stack/tsconfig.json index 51c71c4bdec..c67fe4658e6 100644 --- a/repo-scripts/doc-plugin-rush-stack/tsconfig.json +++ b/repo-scripts/doc-plugin-rush-stack/tsconfig.json @@ -1,6 +1,5 @@ { - "extends": "./node_modules/@microsoft/rush-stack-compiler-3.5/includes/tsconfig-node.json", - + "extends": "./node_modules/@rushstack/heft-node-rig/profiles/default/tsconfig-base.json", "compilerOptions": { "types": ["node"] } diff --git a/repo-scripts/repo-toolbox/config/heft.json b/repo-scripts/repo-toolbox/config/heft.json deleted file mode 100644 index 6ac774b7772..00000000000 --- a/repo-scripts/repo-toolbox/config/heft.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "$schema": "https://developer.microsoft.com/json-schemas/heft/heft.schema.json", - - "eventActions": [ - { - "actionKind": "deleteGlobs", - "heftEvent": "clean", - "actionId": "defaultClean", - "globsToDelete": ["dist", "lib", "temp"] - } - ] -} diff --git a/repo-scripts/repo-toolbox/config/rig.json b/repo-scripts/repo-toolbox/config/rig.json new file mode 100644 index 00000000000..58032e098f0 --- /dev/null +++ b/repo-scripts/repo-toolbox/config/rig.json @@ -0,0 +1,5 @@ +{ + "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json", + + "rigPackageName": "@rushstack/heft-node-rig" +} diff --git a/repo-scripts/repo-toolbox/package.json b/repo-scripts/repo-toolbox/package.json index 8361a92a6ad..039cb60b26e 100644 --- a/repo-scripts/repo-toolbox/package.json +++ b/repo-scripts/repo-toolbox/package.json @@ -14,9 +14,9 @@ "@rushstack/ts-command-line": "workspace:*" }, "devDependencies": { - "@microsoft/rush-stack-compiler-3.5": "workspace:*", "@rushstack/eslint-config": "workspace:*", "@rushstack/heft": "workspace:*", - "@types/node": "10.17.13" + "@types/node": "10.17.13", + "@rushstack/heft-node-rig": "workspace:*" } } diff --git a/repo-scripts/repo-toolbox/tsconfig.json b/repo-scripts/repo-toolbox/tsconfig.json index 51c71c4bdec..c67fe4658e6 100644 --- a/repo-scripts/repo-toolbox/tsconfig.json +++ b/repo-scripts/repo-toolbox/tsconfig.json @@ -1,6 +1,5 @@ { - "extends": "./node_modules/@microsoft/rush-stack-compiler-3.5/includes/tsconfig-node.json", - + "extends": "./node_modules/@rushstack/heft-node-rig/profiles/default/tsconfig-base.json", "compilerOptions": { "types": ["node"] } diff --git a/webpack/loader-load-themed-styles/config/heft.json b/webpack/loader-load-themed-styles/config/heft.json deleted file mode 100644 index 6ac774b7772..00000000000 --- a/webpack/loader-load-themed-styles/config/heft.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "$schema": "https://developer.microsoft.com/json-schemas/heft/heft.schema.json", - - "eventActions": [ - { - "actionKind": "deleteGlobs", - "heftEvent": "clean", - "actionId": "defaultClean", - "globsToDelete": ["dist", "lib", "temp"] - } - ] -} diff --git a/webpack/loader-load-themed-styles/config/rig.json b/webpack/loader-load-themed-styles/config/rig.json new file mode 100644 index 00000000000..58032e098f0 --- /dev/null +++ b/webpack/loader-load-themed-styles/config/rig.json @@ -0,0 +1,5 @@ +{ + "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json", + + "rigPackageName": "@rushstack/heft-node-rig" +} diff --git a/webpack/loader-load-themed-styles/package.json b/webpack/loader-load-themed-styles/package.json index 62e59bb45f6..f59bdbc3715 100644 --- a/webpack/loader-load-themed-styles/package.json +++ b/webpack/loader-load-themed-styles/package.json @@ -17,12 +17,12 @@ "loader-utils": "~1.1.0" }, "devDependencies": { - "@microsoft/rush-stack-compiler-3.5": "workspace:*", "@rushstack/eslint-config": "workspace:*", "@rushstack/heft": "workspace:*", "@types/loader-utils": "1.1.3", "@types/heft-jest": "1.0.1", "@types/node": "10.17.13", - "@types/webpack": "4.39.8" + "@types/webpack": "4.39.8", + "@rushstack/heft-node-rig": "workspace:*" } } diff --git a/webpack/loader-load-themed-styles/tsconfig.json b/webpack/loader-load-themed-styles/tsconfig.json index c390c469ad1..22f94ca28b5 100644 --- a/webpack/loader-load-themed-styles/tsconfig.json +++ b/webpack/loader-load-themed-styles/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./node_modules/@microsoft/rush-stack-compiler-3.5/includes/tsconfig-node.json", + "extends": "./node_modules/@rushstack/heft-node-rig/profiles/default/tsconfig-base.json", "compilerOptions": { "types": ["heft-jest", "node"] } diff --git a/webpack/loader-raw-script/config/heft.json b/webpack/loader-raw-script/config/heft.json deleted file mode 100644 index 6ac774b7772..00000000000 --- a/webpack/loader-raw-script/config/heft.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "$schema": "https://developer.microsoft.com/json-schemas/heft/heft.schema.json", - - "eventActions": [ - { - "actionKind": "deleteGlobs", - "heftEvent": "clean", - "actionId": "defaultClean", - "globsToDelete": ["dist", "lib", "temp"] - } - ] -} diff --git a/webpack/loader-raw-script/config/rig.json b/webpack/loader-raw-script/config/rig.json new file mode 100644 index 00000000000..58032e098f0 --- /dev/null +++ b/webpack/loader-raw-script/config/rig.json @@ -0,0 +1,5 @@ +{ + "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json", + + "rigPackageName": "@rushstack/heft-node-rig" +} diff --git a/webpack/loader-raw-script/package.json b/webpack/loader-raw-script/package.json index 230b5ef5a98..58611f01979 100644 --- a/webpack/loader-raw-script/package.json +++ b/webpack/loader-raw-script/package.json @@ -16,10 +16,10 @@ "loader-utils": "~1.1.0" }, "devDependencies": { - "@microsoft/rush-stack-compiler-3.5": "workspace:*", "@rushstack/eslint-config": "workspace:*", "@rushstack/heft": "workspace:*", "@types/heft-jest": "1.0.1", - "@types/node": "10.17.13" + "@types/node": "10.17.13", + "@rushstack/heft-node-rig": "workspace:*" } } diff --git a/webpack/loader-raw-script/tsconfig.json b/webpack/loader-raw-script/tsconfig.json index c390c469ad1..22f94ca28b5 100644 --- a/webpack/loader-raw-script/tsconfig.json +++ b/webpack/loader-raw-script/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./node_modules/@microsoft/rush-stack-compiler-3.5/includes/tsconfig-node.json", + "extends": "./node_modules/@rushstack/heft-node-rig/profiles/default/tsconfig-base.json", "compilerOptions": { "types": ["heft-jest", "node"] } diff --git a/webpack/localization-plugin/config/copy-static-assets.json b/webpack/localization-plugin/config/copy-static-assets.json deleted file mode 100644 index 37c407c3ec4..00000000000 --- a/webpack/localization-plugin/config/copy-static-assets.json +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Configures the "copy-static-assets" task for Heft. - */ -{ - "$schema": "https://developer.microsoft.com/json-schemas/heft/copy-static-assets.schema.json", - - /** - * File extensions that should be copied from the src folder to the destination folder(s). - */ - "fileExtensions": [".schema.json"] - - /** - * Glob patterns that should be explicitly included. - */ - // "includeGlobs": [ - // "some/path/*.js" - // ], - - /** - * Glob patterns that should be explicitly excluded. This takes precedence over globs listed - * in "includeGlobs" and files that match the file extensions provided in "fileExtensions". - */ - // "excludeGlobs": [ - // "some/path/*.css" - // ] -} diff --git a/webpack/localization-plugin/config/heft.json b/webpack/localization-plugin/config/heft.json deleted file mode 100644 index 6ac774b7772..00000000000 --- a/webpack/localization-plugin/config/heft.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "$schema": "https://developer.microsoft.com/json-schemas/heft/heft.schema.json", - - "eventActions": [ - { - "actionKind": "deleteGlobs", - "heftEvent": "clean", - "actionId": "defaultClean", - "globsToDelete": ["dist", "lib", "temp"] - } - ] -} diff --git a/webpack/localization-plugin/config/rig.json b/webpack/localization-plugin/config/rig.json new file mode 100644 index 00000000000..58032e098f0 --- /dev/null +++ b/webpack/localization-plugin/config/rig.json @@ -0,0 +1,5 @@ +{ + "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json", + + "rigPackageName": "@rushstack/heft-node-rig" +} diff --git a/webpack/localization-plugin/package.json b/webpack/localization-plugin/package.json index 12e96c7720d..35fcb664453 100644 --- a/webpack/localization-plugin/package.json +++ b/webpack/localization-plugin/package.json @@ -38,13 +38,13 @@ }, "devDependencies": { "@types/webpack": "4.39.8", - "@microsoft/rush-stack-compiler-3.5": "workspace:*", "@rushstack/set-webpack-public-path-plugin": "workspace:*", "@rushstack/eslint-config": "workspace:*", "@rushstack/heft": "workspace:*", "@types/loader-utils": "1.1.3", "@types/lodash": "4.14.116", "@types/xmldoc": "1.1.4", - "webpack": "~4.31.0" + "webpack": "~4.31.0", + "@rushstack/heft-node-rig": "workspace:*" } } diff --git a/webpack/localization-plugin/tsconfig.json b/webpack/localization-plugin/tsconfig.json index b1abb9e5b4a..a114c3448ed 100644 --- a/webpack/localization-plugin/tsconfig.json +++ b/webpack/localization-plugin/tsconfig.json @@ -1,3 +1,3 @@ { - "extends": "./node_modules/@microsoft/rush-stack-compiler-3.5/includes/tsconfig-node.json" + "extends": "./node_modules/@rushstack/heft-node-rig/profiles/default/tsconfig-base.json" } diff --git a/webpack/module-minifier-plugin/config/heft.json b/webpack/module-minifier-plugin/config/heft.json deleted file mode 100644 index 6ac774b7772..00000000000 --- a/webpack/module-minifier-plugin/config/heft.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "$schema": "https://developer.microsoft.com/json-schemas/heft/heft.schema.json", - - "eventActions": [ - { - "actionKind": "deleteGlobs", - "heftEvent": "clean", - "actionId": "defaultClean", - "globsToDelete": ["dist", "lib", "temp"] - } - ] -} diff --git a/webpack/module-minifier-plugin/config/rig.json b/webpack/module-minifier-plugin/config/rig.json new file mode 100644 index 00000000000..58032e098f0 --- /dev/null +++ b/webpack/module-minifier-plugin/config/rig.json @@ -0,0 +1,5 @@ +{ + "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json", + + "rigPackageName": "@rushstack/heft-node-rig" +} diff --git a/webpack/module-minifier-plugin/package.json b/webpack/module-minifier-plugin/package.json index c7060c8f881..9fef52f8c3f 100644 --- a/webpack/module-minifier-plugin/package.json +++ b/webpack/module-minifier-plugin/package.json @@ -33,13 +33,13 @@ "terser": "4.7.0" }, "devDependencies": { - "@microsoft/rush-stack-compiler-3.5": "workspace:*", "@rushstack/eslint-config": "workspace:*", "@rushstack/heft": "workspace:*", "@types/heft-jest": "1.0.1", "@types/webpack": "4.39.8", "webpack": "~4.31.0", - "webpack-sources": "~1.4.3" + "webpack-sources": "~1.4.3", + "@rushstack/heft-node-rig": "workspace:*" }, "sideEffects": [ "./lib/terser/Base54", diff --git a/webpack/module-minifier-plugin/tsconfig.json b/webpack/module-minifier-plugin/tsconfig.json index 0abef667e41..86e3ef4a1a0 100644 --- a/webpack/module-minifier-plugin/tsconfig.json +++ b/webpack/module-minifier-plugin/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./node_modules/@microsoft/rush-stack-compiler-3.5/includes/tsconfig-node.json", + "extends": "./node_modules/@rushstack/heft-node-rig/profiles/default/tsconfig-base.json", "compilerOptions": { "target": "ESNext", "types": ["heft-jest", "node"] diff --git a/webpack/set-webpack-public-path-plugin/config/heft.json b/webpack/set-webpack-public-path-plugin/config/heft.json deleted file mode 100644 index 6ac774b7772..00000000000 --- a/webpack/set-webpack-public-path-plugin/config/heft.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "$schema": "https://developer.microsoft.com/json-schemas/heft/heft.schema.json", - - "eventActions": [ - { - "actionKind": "deleteGlobs", - "heftEvent": "clean", - "actionId": "defaultClean", - "globsToDelete": ["dist", "lib", "temp"] - } - ] -} diff --git a/webpack/set-webpack-public-path-plugin/config/rig.json b/webpack/set-webpack-public-path-plugin/config/rig.json new file mode 100644 index 00000000000..58032e098f0 --- /dev/null +++ b/webpack/set-webpack-public-path-plugin/config/rig.json @@ -0,0 +1,5 @@ +{ + "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json", + + "rigPackageName": "@rushstack/heft-node-rig" +} diff --git a/webpack/set-webpack-public-path-plugin/package.json b/webpack/set-webpack-public-path-plugin/package.json index 419343a0f19..9fa62a745e1 100644 --- a/webpack/set-webpack-public-path-plugin/package.json +++ b/webpack/set-webpack-public-path-plugin/package.json @@ -25,7 +25,6 @@ } }, "devDependencies": { - "@microsoft/rush-stack-compiler-3.5": "workspace:*", "@rushstack/eslint-config": "workspace:*", "@rushstack/heft": "workspace:*", "@types/lodash": "4.14.116", @@ -33,6 +32,7 @@ "@types/node": "10.17.13", "@types/tapable": "1.0.5", "@types/uglify-js": "2.6.29", - "@types/webpack": "4.39.8" + "@types/webpack": "4.39.8", + "@rushstack/heft-node-rig": "workspace:*" } } diff --git a/webpack/set-webpack-public-path-plugin/tsconfig.json b/webpack/set-webpack-public-path-plugin/tsconfig.json index b1abb9e5b4a..a114c3448ed 100644 --- a/webpack/set-webpack-public-path-plugin/tsconfig.json +++ b/webpack/set-webpack-public-path-plugin/tsconfig.json @@ -1,3 +1,3 @@ { - "extends": "./node_modules/@microsoft/rush-stack-compiler-3.5/includes/tsconfig-node.json" + "extends": "./node_modules/@rushstack/heft-node-rig/profiles/default/tsconfig-base.json" }