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

nrwl · Jan 19, 2023 · bd76586 · bd76586
1 parent d5b12db
commit bd76586
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 73 deletions.
diff --git a/docs/generated/manifests/menus.json b/docs/generated/manifests/menus.json
@@ -5920,31 +5920,6 @@
             "isExternal": false,
             "disableCollapsible": false
           },
-          {
-            "id": "executors",
-            "path": "/packages/storybook/executors",
-            "name": "executors",
-            "children": [
-              {
-                "id": "storybook",
-                "path": "/packages/storybook/executors/storybook",
-                "name": "storybook",
-                "children": [],
-                "isExternal": false,
-                "disableCollapsible": false
-              },
-              {
-                "id": "build",
-                "path": "/packages/storybook/executors/build",
-                "name": "build",
-                "children": [],
-                "isExternal": false,
-                "disableCollapsible": false
-              }
-            ],
-            "isExternal": false,
-            "disableCollapsible": false
-          },
           {
             "id": "generators",
             "path": "/packages/storybook/generators",

diff --git a/docs/generated/manifests/packages.json b/docs/generated/manifests/packages.json
@@ -2536,26 +2536,7 @@
     },
     "root": "/packages/storybook",
     "source": "/packages/storybook/src",
-    "executors": {
-      "/packages/storybook/executors/storybook": {
-        "description": "Serve Storybook.",
-        "file": "generated/packages/storybook/executors/storybook.json",
-        "hidden": false,
-        "name": "storybook",
-        "originalFilePath": "/packages/storybook/src/executors/storybook/schema.json",
-        "path": "/packages/storybook/executors/storybook",
-        "type": "executor"
-      },
-      "/packages/storybook/executors/build": {
-        "description": "Build Storybook.",
-        "file": "generated/packages/storybook/executors/build.json",
-        "hidden": false,
-        "name": "build",
-        "originalFilePath": "/packages/storybook/src/executors/build-storybook/schema.json",
-        "path": "/packages/storybook/executors/build",
-        "type": "executor"
-      }
-    },
+    "executors": {},
     "generators": {
       "/packages/storybook/generators/init": {
         "description": "Add Storybook configuration to the workspace.",

diff --git a/docs/generated/packages-metadata.json b/docs/generated/packages-metadata.json
@@ -2507,26 +2507,7 @@
         "originalFilePath": "shared/packages/storybook/custom-builder-configs"
       }
     ],
-    "executors": [
-      {
-        "description": "Serve Storybook.",
-        "file": "generated/packages/storybook/executors/storybook.json",
-        "hidden": false,
-        "name": "storybook",
-        "originalFilePath": "/packages/storybook/src/executors/storybook/schema.json",
-        "path": "storybook/executors/storybook",
-        "type": "executor"
-      },
-      {
-        "description": "Build Storybook.",
-        "file": "generated/packages/storybook/executors/build.json",
-        "hidden": false,
-        "name": "build",
-        "originalFilePath": "/packages/storybook/src/executors/build-storybook/schema.json",
-        "path": "storybook/executors/build",
-        "type": "executor"
-      }
-    ],
+    "executors": [],
     "generators": [
       {
         "description": "Add Storybook configuration to the workspace.",

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
@@ -76,12 +76,10 @@
     "quiet": {
       "type": "boolean",
       "description": "Suppress verbose build output.",
-      "default": false
     },
     "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
     },
     "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,