Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ These GitHub repositories provide supplementary resources for Rush Stack:
| [/repo-scripts/doc-plugin-rush-stack](./repo-scripts/doc-plugin-rush-stack/) | API Documenter plugin used with the rushstack.io website |
| [/repo-scripts/generate-api-docs](./repo-scripts/generate-api-docs/) | Used to generate API docs for the rushstack.io website |
| [/repo-scripts/repo-toolbox](./repo-scripts/repo-toolbox/) | Used to execute various operations specific to this repo |
| [/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. |
| [/rigs/local-node-rig](./rigs/local-node-rig/) | A rig package for Node.js projects that build using Heft inside the RushStack repository. |
| [/rigs/local-web-rig](./rigs/local-web-rig/) | A rig package for Web projects that build using Heft inside the RushStack repository. |
| [/rush-plugins/rush-buildxl-graph-plugin](./rush-plugins/rush-buildxl-graph-plugin/) | Rush plugin for generating a BuildXL graph. |
Expand Down
9 changes: 6 additions & 3 deletions apps/api-extractor/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
// This is a workaround for https://github.com/eslint/eslint/issues/3458
require('local-eslint-config/patch/modern-module-resolution');
require('decoupled-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-eslint-config/patch/custom-config-package-names');
require('decoupled-local-node-rig/profiles/default/includes/eslint/patch/custom-config-package-names');

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

overrides: [
Expand Down
2 changes: 1 addition & 1 deletion apps/api-extractor/config/heft.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* Optionally specifies another JSON config file that this file extends from. This provides a way for standard
* settings to be shared across multiple projects.
*/
"extends": "@rushstack/heft-node-rig/profiles/default/config/heft.json",
"extends": "decoupled-local-node-rig/profiles/default/config/heft.json",

"phasesByName": {
"build": {
Expand Down
10 changes: 1 addition & 9 deletions apps/api-extractor/config/jest.config.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
{
"extends": "@rushstack/heft-node-rig/profiles/default/config/jest.config.json",

// Enable code coverage for Jest
"collectCoverage": true,
"coverageDirectory": "<rootDir>/coverage",
"coverageReporters": ["cobertura", "html"],

// Use v8 coverage provider to avoid Babel
"coverageProvider": "v8"
"extends": "decoupled-local-node-rig/profiles/default/config/jest.config.json"
}
2 changes: 1 addition & 1 deletion apps/api-extractor/config/rig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
// Documentation for this system: https://www.npmjs.com/package/@rushstack/rig-package
"$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json",

"rigPackageName": "@rushstack/heft-node-rig"
"rigPackageName": "decoupled-local-node-rig"
}
4 changes: 1 addition & 3 deletions apps/api-extractor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,10 @@
"typescript": "5.8.2"
},
"devDependencies": {
"@rushstack/heft-node-rig": "2.8.0",
"decoupled-local-node-rig": "workspace:*",
"@rushstack/heft": "0.70.0",
"@types/heft-jest": "1.0.1",
"@types/lodash": "4.14.116",
"@types/minimatch": "3.0.5",
"@types/node": "20.17.19",
"@types/resolve": "1.20.2",
"@types/semver": "7.5.0",
"local-eslint-config": "workspace:*"
Expand Down
8 changes: 1 addition & 7 deletions apps/api-extractor/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
{
"extends": "./node_modules/@rushstack/heft-node-rig/profiles/default/tsconfig-base.json",

"compilerOptions": {
"isolatedModules": true,
"types": ["heft-jest", "node"],
"resolveJsonModule": true
}
"extends": "./node_modules/decoupled-local-node-rig/profiles/default/tsconfig-base.json"
}
10 changes: 1 addition & 9 deletions apps/heft/config/jest.config.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
{
"extends": "@rushstack/heft-node-rig/profiles/default/config/jest.config.json",

// Enable code coverage for Jest
"collectCoverage": true,
"coverageDirectory": "<rootDir>/coverage",
"coverageReporters": ["cobertura", "html"],

// Use v8 coverage provider to avoid Babel
"coverageProvider": "v8"
"extends": "decoupled-local-node-rig/profiles/default/config/jest.config.json"
}
2 changes: 1 addition & 1 deletion apps/heft/config/rig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
// Documentation for this system: https://www.npmjs.com/package/@rushstack/rig-package
"$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json",

"rigPackageName": "@rushstack/heft-node-rig"
"rigPackageName": "decoupled-local-node-rig"
}
14 changes: 0 additions & 14 deletions apps/heft/config/rush-project.json

This file was deleted.

8 changes: 3 additions & 5 deletions apps/heft/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,9 @@
},
"devDependencies": {
"@microsoft/api-extractor": "workspace:*",
"local-eslint-config": "workspace:*",
"@rushstack/heft": "0.70.0",
"@rushstack/heft-node-rig": "2.8.0",
"@types/heft-jest": "1.0.1",
"@types/node": "20.17.19",
"@types/watchpack": "2.4.0"
"@types/watchpack": "2.4.0",
"decoupled-local-node-rig": "workspace:*",
"local-eslint-config": "workspace:*"
}
}
9 changes: 1 addition & 8 deletions apps/heft/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
{
"extends": "./node_modules/@rushstack/heft-node-rig/profiles/default/tsconfig-base.json",

"compilerOptions": {
"isolatedModules": true,
"types": ["heft-jest", "node"],
"lib": ["ES2020"],
"resolveJsonModule": true
}
"extends": "./node_modules/decoupled-local-node-rig/profiles/default/tsconfig-base.json"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "",
"type": "none",
"packageName": "@microsoft/api-extractor-model"
}
],
"packageName": "@microsoft/api-extractor-model",
"email": "iclanton@users.noreply.github.com"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "",
"type": "none",
"packageName": "@microsoft/api-extractor"
}
],
"packageName": "@microsoft/api-extractor",
"email": "iclanton@users.noreply.github.com"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "",
"type": "none",
"packageName": "@rushstack/eslint-patch"
}
],
"packageName": "@rushstack/eslint-patch",
"email": "iclanton@users.noreply.github.com"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "",
"type": "none",
"packageName": "@rushstack/eslint-plugin-packlets"
}
],
"packageName": "@rushstack/eslint-plugin-packlets",
"email": "iclanton@users.noreply.github.com"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "",
"type": "none",
"packageName": "@rushstack/eslint-plugin-security"
}
],
"packageName": "@rushstack/eslint-plugin-security",
"email": "iclanton@users.noreply.github.com"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "",
"type": "none",
"packageName": "@rushstack/eslint-plugin"
}
],
"packageName": "@rushstack/eslint-plugin",
"email": "iclanton@users.noreply.github.com"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "",
"type": "none",
"packageName": "@rushstack/heft-config-file"
}
],
"packageName": "@rushstack/heft-config-file",
"email": "iclanton@users.noreply.github.com"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "",
"type": "none",
"packageName": "@rushstack/heft"
}
],
"packageName": "@rushstack/heft",
"email": "iclanton@users.noreply.github.com"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "",
"type": "none",
"packageName": "@rushstack/node-core-library"
}
],
"packageName": "@rushstack/node-core-library",
"email": "iclanton@users.noreply.github.com"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "",
"type": "none",
"packageName": "@rushstack/operation-graph"
}
],
"packageName": "@rushstack/operation-graph",
"email": "iclanton@users.noreply.github.com"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "",
"type": "none",
"packageName": "@rushstack/rig-package"
}
],
"packageName": "@rushstack/rig-package",
"email": "iclanton@users.noreply.github.com"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "",
"type": "none",
"packageName": "@rushstack/terminal"
}
],
"packageName": "@rushstack/terminal",
"email": "iclanton@users.noreply.github.com"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "",
"type": "none",
"packageName": "@rushstack/tree-pattern"
}
],
"packageName": "@rushstack/tree-pattern",
"email": "iclanton@users.noreply.github.com"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"comment": "",
"type": "none",
"packageName": "@rushstack/ts-command-line"
}
],
"packageName": "@rushstack/ts-command-line",
"email": "iclanton@users.noreply.github.com"
}
4 changes: 4 additions & 0 deletions common/config/rush/nonbrowser-approved-packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,10 @@
"name": "decache",
"allowedCategories": [ "libraries" ]
},
{
"name": "decoupled-local-node-rig",
"allowedCategories": [ "libraries" ]
},
{
"name": "diff",
"allowedCategories": [ "libraries" ]
Expand Down
Loading