fix(storybook): revert to previous defaults for Storybook CLI options (…

…#14498)
nrwl · Jan 19, 2023 · 9f0a7f0 · 9f0a7f0 · vercel · Jan 19, 2023
1 parent 6c926d8
commit 9f0a7f0
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 18 deletions.
diff --git a/docs/generated/packages/storybook/executors/build.json b/docs/generated/packages/storybook/executors/build.json
@@ -100,13 +100,11 @@
       },
       "quiet": {
         "type": "boolean",
-        "description": "Suppress verbose build output.",
-        "default": false
+        "description": "Suppress verbose build output."
       },
       "docs": {
         "type": "boolean",
-        "description": "Starts Storybook in documentation mode. Learn more about it : https://storybook.js.org/docs/react/writing-docs/build-documentation#preview-storybooks-documentation.",
-        "default": false
+        "description": "Starts Storybook in documentation mode. Learn more about it : https://storybook.js.org/docs/react/writing-docs/build-documentation#preview-storybooks-documentation."
       }
     },
     "definitions": {

diff --git a/docs/generated/packages/storybook/executors/storybook.json b/docs/generated/packages/storybook/executors/storybook.json
@@ -73,13 +73,11 @@
       },
       "quiet": {
         "type": "boolean",
-        "description": "Suppress verbose build output.",
-        "default": false
+        "description": "Suppress verbose build output."
       },
       "docs": {
         "type": "boolean",
-        "description": "Starts Storybook in documentation mode. Learn more about it : https://storybook.js.org/docs/react/writing-docs/build-documentation#preview-storybooks-documentation.",
-        "default": false
+        "description": "Starts Storybook in documentation mode. Learn more about it : https://storybook.js.org/docs/react/writing-docs/build-documentation#preview-storybooks-documentation."
       },
       "docsMode": {
         "type": "boolean",

diff --git a/packages/storybook/src/executors/build-storybook/schema.json b/packages/storybook/src/executors/build-storybook/schema.json
@@ -77,13 +77,11 @@
     },
     "quiet": {
       "type": "boolean",
-      "description": "Suppress verbose build output.",
-      "default": false
+      "description": "Suppress verbose build output."
     },
     "docs": {
       "type": "boolean",
-      "description": "Starts Storybook in documentation mode. Learn more about it : https://storybook.js.org/docs/react/writing-docs/build-documentation#preview-storybooks-documentation.",
-      "default": false
+      "description": "Starts Storybook in documentation mode. Learn more about it : https://storybook.js.org/docs/react/writing-docs/build-documentation#preview-storybooks-documentation."
     }
   },
   "definitions": {

diff --git a/packages/storybook/src/executors/storybook/schema.json b/packages/storybook/src/executors/storybook/schema.json
@@ -75,13 +75,11 @@
     },
     "quiet": {
       "type": "boolean",
-      "description": "Suppress verbose build output.",
-      "default": false
+      "description": "Suppress verbose build output."
     },
     "docs": {
       "type": "boolean",
-      "description": "Starts Storybook in documentation mode. Learn more about it : https://storybook.js.org/docs/react/writing-docs/build-documentation#preview-storybooks-documentation.",
-      "default": false
+      "description": "Starts Storybook in documentation mode. Learn more about it : https://storybook.js.org/docs/react/writing-docs/build-documentation#preview-storybooks-documentation."
     },
     "docsMode": {
       "type": "boolean",

diff --git a/packages/webpack/src/utils/with-nx.ts b/packages/webpack/src/utils/with-nx.ts
@@ -164,7 +164,7 @@ export function withNx(opts?: { skipTypeChecking?: boolean }) {
       profile: options.statsJson,
       resolve: {
         ...config.resolve,
-        extensions,
+        extensions: [...extensions, ...(config?.resolve?.extensions ?? [])],
         alias: options.fileReplacements.reduce(
           (aliases, replacement) => ({
             ...aliases,
@@ -173,9 +173,10 @@ export function withNx(opts?: { skipTypeChecking?: boolean }) {
           {}
         ),
         plugins: [
+          ...(config.resolve?.plugins ?? []),
           new TsconfigPathsPlugin({
             configFile: options.tsConfig,
-            extensions,
+            extensions: [...extensions, ...(config?.resolve?.extensions ?? [])],
             mainFields,
           }),
         ],
@@ -231,6 +232,7 @@ export function withNx(opts?: { skipTypeChecking?: boolean }) {
         // Enabled for performance
         unsafeCache: true,
         rules: [
+          ...(config?.module?.rules ?? []),
           options.sourceMap && {
             test: /\.js$/,
             enforce: 'pre' as const,