Merge branch 'next' into document-addon-kit-bundling

storybookjs · Nov 9, 2023 · 7bf9819 · 7bf9819
2 parents 7229e7e + 4ace97f
commit 7bf9819
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/code/builders/builder-webpack5/src/preview/iframe-webpack.config.ts b/code/builders/builder-webpack5/src/preview/iframe-webpack.config.ts
@@ -300,6 +300,8 @@ export default async (
       shouldCheckTs ? new ForkTsCheckerWebpackPlugin(tsCheckOptions) : null,
     ].filter(Boolean),
     module: {
+      // Disable warning for dynamic requires
+      unknownContextCritical: false,
       rules: [
         {
           test: /\.stories\.([tj])sx?$|(stories|story)\.mdx$/,

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