Skip to content

Commit d0e3b31

Browse files
committed
Fix caching for other projects.
1 parent d292b8a commit d0e3b31

File tree

149 files changed

+1005
-213
lines changed

Some content is hidden

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

149 files changed

+1005
-213
lines changed
+9-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
11
{
2-
"extends": "@rushstack/heft-node-rig/profiles/default/config/jest.config.json"
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"
311
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"extends": "@rushstack/heft-node-rig/profiles/default/config/rush-project.json",
3+
4+
"operationSettings": [
5+
{
6+
"operationName": "_phase:build",
7+
"outputFolderNames": [".heft"]
8+
},
9+
{
10+
"operationName": "_phase:test",
11+
"outputFolderNames": ["coverage"]
12+
}
13+
]
14+
}

apps/heft/config/jest.config.json

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
11
{
2-
"extends": "@rushstack/heft-node-rig/profiles/default/config/jest.config.json"
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"
311
}

apps/heft/config/rush-project.json

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"extends": "@rushstack/heft-node-rig/profiles/default/config/rush-project.json",
3+
4+
"operationSettings": [
5+
{
6+
"operationName": "_phase:build",
7+
"outputFolderNames": [".heft"]
8+
},
9+
{
10+
"operationName": "_phase:test",
11+
"outputFolderNames": ["coverage"]
12+
}
13+
]
14+
}

apps/lockfile-explorer-web/config/heft.json

+1-1
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-web-rig/profiles/app/config/heft.json",
11+
"extends": "local-web-rig/profiles/app/config/heft.json",
1212

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

apps/lockfile-explorer-web/config/jest.config.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "@rushstack/heft-web-rig/profiles/app/config/jest.config.json",
2+
"extends": "local-web-rig/profiles/app/config/jest.config.json",
33

44
// Load the initappcontext.js stub when running tests
55
"setupFiles": ["../lib-commonjs/stub/initappcontext.js"]
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json",
33

4-
"rigPackageName": "@rushstack/heft-web-rig",
4+
"rigPackageName": "local-web-rig",
55
"rigProfile": "app"
66
}

apps/lockfile-explorer-web/package.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,9 @@
2323
},
2424
"devDependencies": {
2525
"@rushstack/eslint-config": "workspace:*",
26-
"@rushstack/heft-web-rig": "workspace:*",
2726
"@rushstack/heft": "workspace:*",
28-
"@types/heft-jest": "1.0.1",
2927
"@types/react-dom": "16.9.14",
3028
"@types/react": "16.14.23",
31-
"@types/webpack-env": "1.18.0"
29+
"local-web-rig": "workspace:*"
3230
}
3331
}
+1-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
11
{
2-
"extends": "./node_modules/@rushstack/heft-web-rig/profiles/app/tsconfig-base.json",
3-
"compilerOptions": {
4-
"types": ["heft-jest", "webpack-env"],
5-
"target": "es2017",
6-
"lib": ["es2017", "scripthost", "es2015.collection", "es2015.promise", "es2015.iterable", "dom"]
7-
}
2+
"extends": "./node_modules/local-web-rig/profiles/app/tsconfig-base.json"
83
}

apps/lockfile-explorer-web/webpack.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
const path = require('path');
4-
const createWebpackConfig = require('@rushstack/heft-web-rig/profiles/app/webpack-base.config');
4+
const createWebpackConfig = require('local-web-rig/profiles/app/webpack-base.config');
55

66
module.exports = function createConfig(env, argv) {
77
return createWebpackConfig({
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
11
{
2-
"extends": "@rushstack/heft-jest-plugin/includes/jest-shared.config.json"
2+
"extends": "@rushstack/heft-jest-plugin/includes/jest-shared.config.json",
3+
4+
// These additional properties exist for caching purposes in the rushstack repo
5+
6+
// Enable code coverage for Jest
7+
"collectCoverage": true,
8+
"coverageDirectory": "<rootDir>/coverage",
9+
"coverageReporters": ["cobertura", "html"],
10+
11+
// Use v8 coverage provider to avoid Babel
12+
"coverageProvider": "v8"
313
}
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
1+
// This file exists for caching purposes in the rushstack repo
12
{
23
"$schema": "https://developer.microsoft.com/json-schemas/rush/v5/rush-project.schema.json",
34

45
"operationSettings": [
56
{
6-
"operationName": "build",
7-
"outputFolderNames": ["lib", "dist"]
7+
"operationName": "_phase:build",
8+
"outputFolderNames": [".heft", "lib", "dist"]
9+
},
10+
{
11+
"operationName": "_phase:test",
12+
"outputFolderNames": ["coverage"]
813
}
914
]
1015
}
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,22 @@
11
{
22
"extends": "@rushstack/heft-jest-plugin/includes/jest-shared.config.json",
3-
"collectCoverage": true,
3+
44
"coverageThreshold": {
55
"global": {
66
"branches": 50,
77
"functions": 50,
88
"lines": 50,
99
"statements": 50
1010
}
11-
}
11+
},
12+
13+
// These additional properties exist for caching purposes in the rushstack repo
14+
15+
// Enable code coverage for Jest
16+
"collectCoverage": true,
17+
"coverageDirectory": "<rootDir>/coverage",
18+
"coverageReporters": ["cobertura", "html"],
19+
20+
// Use v8 coverage provider to avoid Babel
21+
"coverageProvider": "v8"
1222
}
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
1+
// This file exists for caching purposes in the rushstack repo
12
{
23
"$schema": "https://developer.microsoft.com/json-schemas/rush/v5/rush-project.schema.json",
34

45
"operationSettings": [
56
{
6-
"operationName": "build",
7-
"outputFolderNames": ["lib", "dist"]
7+
"operationName": "_phase:build",
8+
"outputFolderNames": [".heft", "lib", "dist"]
9+
},
10+
{
11+
"operationName": "_phase:test",
12+
"outputFolderNames": ["coverage"]
813
}
914
]
1015
}
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
11
{
2-
"extends": "@rushstack/heft-node-rig/profiles/default/config/jest.config.json"
2+
"extends": "@rushstack/heft-node-rig/profiles/default/config/jest.config.json",
3+
4+
// These additional properties exist for caching purposes in the rushstack repo
5+
6+
// Enable code coverage for Jest
7+
"collectCoverage": true,
8+
"coverageDirectory": "<rootDir>/coverage",
9+
"coverageReporters": ["cobertura", "html"],
10+
11+
// Use v8 coverage provider to avoid Babel
12+
"coverageProvider": "v8"
313
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// This file exists for caching purposes in the rushstack repo
2+
{
3+
"extends": "@rushstack/heft-node-rig/profiles/default/config/rush-project.json",
4+
5+
"operationSettings": [
6+
{
7+
"operationName": "_phase:build",
8+
"outputFolderNames": [".heft", "release"]
9+
},
10+
{
11+
"operationName": "_phase:test",
12+
"outputFolderNames": ["coverage"]
13+
}
14+
]
15+
}
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
11
{
2-
"extends": "@rushstack/heft-jest-plugin/includes/jest-shared.config.json"
2+
"extends": "@rushstack/heft-jest-plugin/includes/jest-shared.config.json",
3+
4+
// These additional properties exist for caching purposes in the rushstack repo
5+
6+
// Enable code coverage for Jest
7+
"collectCoverage": true,
8+
"coverageDirectory": "<rootDir>/coverage",
9+
"coverageReporters": ["cobertura", "html"],
10+
11+
// Use v8 coverage provider to avoid Babel
12+
"coverageProvider": "v8"
313
}
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
1+
// This file exists for caching purposes in the rushstack repo
12
{
23
"$schema": "https://developer.microsoft.com/json-schemas/rush/v5/rush-project.schema.json",
34

45
"operationSettings": [
56
{
6-
"operationName": "build",
7-
"outputFolderNames": ["lib", "dist"]
7+
"operationName": "_phase:build",
8+
"outputFolderNames": [".heft", "lib", "dist"]
9+
},
10+
{
11+
"operationName": "_phase:test",
12+
"outputFolderNames": ["coverage"]
813
}
914
]
1015
}
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
11
{
2-
"extends": "@rushstack/heft-jest-plugin/includes/jest-web.config.json"
2+
"extends": "@rushstack/heft-jest-plugin/includes/jest-web.config.json",
3+
4+
// These additional properties exist for caching purposes in the rushstack repo
5+
6+
// Enable code coverage for Jest
7+
"collectCoverage": true,
8+
"coverageDirectory": "<rootDir>/coverage",
9+
"coverageReporters": ["cobertura", "html"],
10+
11+
// Use v8 coverage provider to avoid Babel
12+
"coverageProvider": "v8"
313
}
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
1+
// This file exists for caching purposes in the rushstack repo
12
{
23
"$schema": "https://developer.microsoft.com/json-schemas/rush/v5/rush-project.schema.json",
34

45
"operationSettings": [
56
{
6-
"operationName": "build",
7-
"outputFolderNames": ["lib", "dist"]
7+
"operationName": "_phase:build",
8+
"outputFolderNames": [".heft", "lib", "dist"]
9+
},
10+
{
11+
"operationName": "_phase:test",
12+
"outputFolderNames": ["coverage"]
813
}
914
]
1015
}
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
11
{
2-
"extends": "@rushstack/heft-web-rig/profiles/library/config/jest.config.json"
2+
"extends": "@rushstack/heft-web-rig/profiles/app/config/jest.config.json",
3+
4+
// These additional properties exist for caching purposes in the rushstack repo
5+
6+
// Enable code coverage for Jest
7+
"collectCoverage": true,
8+
"coverageDirectory": "<rootDir>/coverage",
9+
"coverageReporters": ["cobertura", "html"],
10+
11+
// Use v8 coverage provider to avoid Babel
12+
"coverageProvider": "v8"
313
}

build-tests-samples/heft-web-rig-app-tutorial/config/rig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json",
33

44
"rigPackageName": "@rushstack/heft-web-rig",
5-
"rigProfile": "library"
5+
"rigProfile": "app"
66
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// This file exists for caching purposes in the rushstack repo
2+
{
3+
"extends": "@rushstack/heft-web-rig/profiles/app/config/rush-project.json",
4+
5+
"operationSettings": [
6+
{
7+
"operationName": "_phase:build",
8+
"outputFolderNames": [".heft", "release"]
9+
},
10+
{
11+
"operationName": "_phase:test",
12+
"outputFolderNames": ["coverage"]
13+
}
14+
]
15+
}
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
11
{
2-
"extends": "@rushstack/heft-web-rig/profiles/library/config/jest.config.json"
2+
"extends": "@rushstack/heft-web-rig/profiles/library/config/jest.config.json",
3+
4+
// These additional properties exist for caching purposes in the rushstack repo
5+
6+
// Enable code coverage for Jest
7+
"collectCoverage": true,
8+
"coverageDirectory": "<rootDir>/coverage",
9+
"coverageReporters": ["cobertura", "html"],
10+
11+
// Use v8 coverage provider to avoid Babel
12+
"coverageProvider": "v8"
313
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// This file exists for caching purposes in the rushstack repo
2+
{
3+
"extends": "@rushstack/heft-web-rig/profiles/library/config/rush-project.json",
4+
5+
"operationSettings": [
6+
{
7+
"operationName": "_phase:build",
8+
"outputFolderNames": [".heft", "release"]
9+
},
10+
{
11+
"operationName": "_phase:test",
12+
"outputFolderNames": ["coverage"]
13+
}
14+
]
15+
}

build-tests-samples/heft-webpack-basic-tutorial/config/jest.config.json

+11-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,15 @@
1212
"!lib-commonjs/**/__tests__/**",
1313
"!lib-commonjs/**/__fixtures__/**",
1414
"!lib-commonjs/**/__mocks__/**"
15-
]
15+
],
16+
17+
// These additional properties exist for caching purposes in the rushstack repo
18+
19+
// Enable code coverage for Jest
20+
"collectCoverage": true,
21+
"coverageDirectory": "<rootDir>/coverage",
22+
"coverageReporters": ["cobertura", "html"],
23+
24+
// Use v8 coverage provider to avoid Babel
25+
"coverageProvider": "v8"
1626
}
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
1+
// This file exists for caching purposes in the rushstack repo
12
{
23
"$schema": "https://developer.microsoft.com/json-schemas/rush/v5/rush-project.schema.json",
34

45
"operationSettings": [
56
{
6-
"operationName": "build",
7-
"outputFolderNames": ["lib", "dist"]
7+
"operationName": "_phase:build",
8+
"outputFolderNames": [".heft", "lib", "dist"]
9+
},
10+
{
11+
"operationName": "_phase:test",
12+
"outputFolderNames": ["coverage"]
813
}
914
]
1015
}

0 commit comments

Comments
 (0)