Merge branch 'next' into larsrickert/improve-vue-source-code

storybookjs · Jun 9, 2024 · 06d0fdb · 06d0fdb
2 parents 304f13e + b64489c
commit 06d0fdb
Show file tree

Hide file tree

Showing 16 changed files with 416 additions and 6 deletions.
diff --git a/code/addons/docs/docs/recipes.md b/code/addons/docs/docs/recipes.md
@@ -269,8 +269,8 @@ export const parameters = {
       transform: (src, storyContext) => {
         const match = SOURCE_REGEX.exec(src);
         return match ? match[1] : src;
-      }
-    }
+      },
+    },
   },
 };
 ```

diff --git a/code/frameworks/angular/src/server/angular-cli-webpack.js b/code/frameworks/angular/src/server/angular-cli-webpack.js
@@ -68,6 +68,10 @@ exports.getWebpackConfig = async (baseConfig, { builderOptions, builderContext }
       styles: builderOptions.styles
         ?.map((style) => (typeof style === 'string' ? style : style.input))
         .filter((style) => typeof style === 'string' || style.inject !== false),
+      outputPath:
+        typeof builderOptions.outputPath === 'string'
+          ? builderOptions.outputPath
+          : builderOptions.outputPath?.base,
 
       // Fixed options
       optimization: false,

diff --git a/code/lib/core-server/package.json b/code/lib/core-server/package.json
@@ -96,6 +96,7 @@
     "telejson": "^7.2.0",
     "tiny-invariant": "^1.3.1",
     "ts-dedent": "^2.0.0",
+    "tsconfig-paths": "^4.2.0",
     "util": "^0.12.4",
     "util-deprecate": "^1.0.2",
     "watchpack": "^2.2.0",
-Original file line number
+Diff line change
@@ Expand Up / @@ -269,8 +269,8 @@ export const parameters = { @@
           transform: (src, storyContext) => {
             const match = SOURCE_REGEX.exec(src);
             return match ? match[1] : src;
-          }
-        }
+          },
+        },
       },
     };
     ```
@@ Expand Down @@