Skip to content

Commit 39ec31f

Browse files
authored
Merge pull request microsoft#3204 from microsoft/octogonz/heft-web-rig-revamp
[heft-web-rig] Add an "app" profile, upgrade to Webpack 5, implement new CSS rules
2 parents fe5df23 + 55ef407 commit 39ec31f

File tree

105 files changed

+6037
-4063
lines changed

Some content is hidden

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

105 files changed

+6037
-4063
lines changed

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ These GitHub repositories provide supplementary resources for Rush Stack:
9191
| [/build-tests-samples/heft-node-rig-tutorial](./build-tests-samples/heft-node-rig-tutorial/) | (Copy of sample project) Building this project is a regression test for Heft |
9292
| [/build-tests-samples/heft-storybook-react-tutorial](./build-tests-samples/heft-storybook-react-tutorial/) | (Copy of sample project) Building this project is a regression test for Heft |
9393
| [/build-tests-samples/heft-storybook-react-tutorial-storykit](./build-tests-samples/heft-storybook-react-tutorial-storykit/) | Storybook build dependencies for heft-storybook-react-tutorial |
94+
| [/build-tests-samples/heft-web-rig-app-tutorial](./build-tests-samples/heft-web-rig-app-tutorial/) | (Copy of sample project) Building this project is a regression test for Heft |
95+
| [/build-tests-samples/heft-web-rig-library-tutorial](./build-tests-samples/heft-web-rig-library-tutorial/) | (Copy of sample project) Building this project is a regression test for Heft |
9496
| [/build-tests-samples/heft-webpack-basic-tutorial](./build-tests-samples/heft-webpack-basic-tutorial/) | (Copy of sample project) Building this project is a regression test for Heft |
9597
| [/build-tests-samples/packlets-tutorial](./build-tests-samples/packlets-tutorial/) | (Copy of sample project) Building this project is a regression test for @rushstack/eslint-plugin-packlets |
9698
| [/build-tests/api-documenter-test](./build-tests/api-documenter-test/) | Building this project is a regression test for api-documenter |
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
## Important
22

3-
If you change the Heft schemas, be sure to update the example files under **src/templates**.
3+
If you change the Heft schemas, be sure to update the example files under **schemas/templates**.
44
The templates are used as a reference when updating the website documentation.

build-tests-samples/heft-storybook-react-tutorial-storykit/package.json

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,26 @@
1111
"_phase:build": ""
1212
},
1313
"devDependencies": {
14-
"@babel/core": "^7.14.8",
15-
"@storybook/addon-actions": "~6.3.6",
16-
"@storybook/addon-essentials": "~6.3.6",
17-
"@storybook/addon-links": "~6.3.6",
18-
"@storybook/cli": "~6.3.6",
19-
"@storybook/components": "~6.3.0",
20-
"@storybook/core-events": "~6.3.0",
21-
"@storybook/react": "~6.3.6",
22-
"@storybook/theming": "~6.3.0",
14+
"@babel/core": "~7.17.0",
15+
"@storybook/addon-actions": "~6.4.18",
16+
"@storybook/addon-essentials": "~6.4.18",
17+
"@storybook/addon-links": "~6.4.18",
18+
"@storybook/cli": "~6.4.18",
19+
"@storybook/components": "~6.4.18",
20+
"@storybook/core-events": "~6.4.18",
21+
"@storybook/react": "~6.4.18",
22+
"@storybook/theming": "~6.4.18",
2323
"@types/heft-jest": "1.0.1",
24-
"@types/react-dom": "16.9.8",
25-
"@types/react": "16.9.45",
24+
"@types/react-dom": "16.9.14",
25+
"@types/react": "16.14.23",
2626
"@types/webpack-env": "1.13.0",
27-
"babel-loader": "^8.2.2",
28-
"css-loader": "~4.2.1",
27+
"babel-loader": "~8.2.3",
28+
"css-loader": "~5.2.7",
2929
"jest": "~27.4.2",
3030
"react-dom": "~16.13.1",
3131
"react": "~16.13.1",
32-
"style-loader": "~1.2.1",
32+
"style-loader": "~2.0.0",
33+
"terser-webpack-plugin": "~3.0.8",
3334
"typescript": "~4.5.2",
3435
"webpack": "~4.44.2"
3536
}

build-tests-samples/heft-storybook-react-tutorial/config/heft.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
/**
4141
* The path to the plugin package.
4242
*/
43-
"plugin": "@rushstack/heft-webpack5-plugin"
43+
"plugin": "@rushstack/heft-webpack4-plugin"
4444

4545
/**
4646
* An optional object that provides additional settings that may be defined by the plugin.

build-tests-samples/heft-storybook-react-tutorial/package.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,28 @@
66
"scripts": {
77
"build": "heft build --clean",
88
"start": "heft start",
9+
"storybook": "heft start --storybook",
910
"_phase:build": "heft build --clean",
1011
"_phase:test": "heft test --no-build"
1112
},
1213
"devDependencies": {
1314
"@rushstack/eslint-config": "workspace:*",
1415
"@rushstack/heft-jest-plugin": "workspace:*",
1516
"@rushstack/heft-storybook-plugin": "workspace:*",
16-
"@rushstack/heft-webpack5-plugin": "workspace:*",
17+
"@rushstack/heft-webpack4-plugin": "workspace:*",
1718
"@rushstack/heft": "workspace:*",
1819
"@types/heft-jest": "1.0.1",
19-
"@types/react-dom": "16.9.8",
20-
"@types/react": "16.9.45",
20+
"@types/react-dom": "16.9.14",
21+
"@types/react": "16.14.23",
2122
"@types/webpack-env": "1.13.0",
22-
"css-loader": "~4.2.1",
23+
"css-loader": "~5.2.7",
2324
"eslint": "~8.7.0",
2425
"heft-storybook-react-tutorial-storykit": "workspace:*",
25-
"html-webpack-plugin": "~5.5.0",
26+
"html-webpack-plugin": "~4.5.2",
2627
"react-dom": "~16.13.1",
2728
"react": "~16.13.1",
28-
"source-map-loader": "~1.1.2",
29-
"style-loader": "~1.2.1",
29+
"source-map-loader": "~1.1.3",
30+
"style-loader": "~2.0.0",
3031
"typescript": "~4.5.2",
3132
"webpack": "~4.44.2"
3233
}
Lines changed: 7 additions & 0 deletions
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/web-app', '@rushstack/eslint-config/mixins/react'],
6+
parserOptions: { tsconfigRootDir: __dirname }
7+
};

0 commit comments

Comments
 (0)