Merge branch 'main' into enelson/package-update

microsoft · Feb 1, 2023 · 38b5098 · 38b5098
2 parents b717c25 + 93f8791
commit 38b5098
Show file tree

Hide file tree

Showing 31 changed files with 1,165 additions and 520 deletions.
diff --git a/build-tests-samples/heft-storybook-react-tutorial-storykit/package.json b/build-tests-samples/heft-storybook-react-tutorial-storykit/package.json
@@ -11,7 +11,7 @@
     "_phase:build": ""
   },
   "devDependencies": {
-    "@babel/core": "~7.17.0",
+    "@babel/core": "~7.20.0",
     "@storybook/addon-actions": "~6.4.18",
     "@storybook/addon-essentials": "~6.4.18",
     "@storybook/addon-links": "~6.4.18",

diff --git a/build-tests-samples/heft-storybook-react-tutorial/config/heft.json b/build-tests-samples/heft-storybook-react-tutorial/config/heft.json
@@ -55,7 +55,9 @@
       "plugin": "@rushstack/heft-storybook-plugin",
       "options": {
         "storykitPackageName": "heft-storybook-react-tutorial-storykit",
-        "startupModulePath": "@storybook/react/bin/index.js"
+        "startupModulePath": "@storybook/react/bin/index.js",
+        "staticBuildModulePath": "@storybook/react/bin/build.js",
+        "staticBuildOutputFolder": "static-build-dir"
       }
     }
   ]

diff --git a/build-tests-samples/heft-storybook-react-tutorial/package.json b/build-tests-samples/heft-storybook-react-tutorial/package.json
@@ -7,6 +7,7 @@
     "build": "heft build --clean",
     "start": "heft start",
     "storybook": "heft start --storybook",
+    "build-storybook": "heft build --storybook",
     "_phase:build": "heft build --clean",
     "_phase:test": "heft test --no-build"
   },
@@ -16,12 +17,15 @@
     "tslib": "~2.3.1"
   },
   "devDependencies": {
+    "@babel/core": "~7.20.0",
     "@rushstack/eslint-config": "workspace:*",
     "@rushstack/heft-jest-plugin": "workspace:*",
     "@rushstack/heft-storybook-plugin": "workspace:*",
     "@rushstack/heft-webpack4-plugin": "workspace:*",
     "@rushstack/heft": "workspace:*",
+    "@storybook/react": "~6.4.18",
     "@types/heft-jest": "1.0.1",
+    "@types/node": "14.18.36",
     "@types/react-dom": "16.9.14",
     "@types/react": "16.14.23",
     "@types/webpack-env": "1.18.0",

diff --git a/build-tests/heft-sass-test/config/sass.json b/build-tests/heft-sass-test/config/sass.json
@@ -1,4 +1,5 @@
 {
   "cssOutputFolders": ["lib"],
+  "preserveSCSSExtension": true,
   "secondaryGeneratedTsFolders": ["lib"]
 }
diff --git a/build-tests/heft-sass-test/webpack.config.js b/build-tests/heft-sass-test/webpack.config.js
@@ -18,7 +18,7 @@ function createWebpackConfig({ production }) {
     module: {
       rules: [
         {
-          test: /\.css$/,
+          test: /\.s?css$/,
           exclude: /node_modules/,
           use: [
             // Creates `style` nodes from JS strings

diff --git a/build-tests/install-test-workspace/workspace/common/pnpm-lock.yaml b/build-tests/install-test-workspace/workspace/common/pnpm-lock.yaml
diff --git a/...k/heft-storybook-plugin/user-rongqizhou-SupportStorybookStaticBuild_2022-12-14-10-01.json b/...k/heft-storybook-plugin/user-rongqizhou-SupportStorybookStaticBuild_2022-12-14-10-01.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@rushstack/heft-storybook-plugin",
+      "comment": "Add support for storybook static build",
+      "type": "minor"
+    }
+  ],
+  "packageName": "@rushstack/heft-storybook-plugin"
+}