@storybook/angular 6.4.0-rc.0 → 6.4.0-rc.1

package/dist/ts3.4/builders/build-storybook/index.d.ts

@@ -6,7 +6,7 @@ export declare type StorybookBuilderOptions = JsonObject & {
     tsConfig?: string;
     compodoc: boolean;
     compodocArgs: string[];
-} & Pick<CLIOptions, 'staticDir' | 'outputDir' | 'configDir' | 'loglevel' | 'quiet' | 'docs'>;
+} & Pick<CLIOptions, 'outputDir' | 'configDir' | 'loglevel' | 'quiet' | 'docs'>;
 export declare type StorybookBuilderOutput = JsonObject & BuilderOutput & {};
 declare const _default: import("@angular-devkit/architect/src/internal").Builder<StorybookBuilderOptions>;
 export default _default;

package/dist/ts3.4/builders/start-storybook/index.d.ts

@@ -6,7 +6,7 @@ export declare type StorybookBuilderOptions = JsonObject & {
     tsConfig?: string;
     compodoc: boolean;
     compodocArgs: string[];
-} & Pick<CLIOptions, 'port' | 'host' | 'staticDir' | 'configDir' | 'https' | 'sslCa' | 'sslCert' | 'sslKey' | 'smokeTest' | 'ci' | 'quiet' | 'docs'>;
+} & Pick<CLIOptions, 'port' | 'host' | 'configDir' | 'https' | 'sslCa' | 'sslCert' | 'sslKey' | 'smokeTest' | 'ci' | 'quiet' | 'docs'>;
 export declare type StorybookBuilderOutput = JsonObject & BuilderOutput & {};
 declare const _default: import("@angular-devkit/architect/src/internal").Builder<StorybookBuilderOptions>;
 export default _default;

package/dist/ts3.4/server/angular-cli-webpack-12.2.x.d.ts

@@ -0,0 +1 @@
+export function getWebpackConfig(baseConfig: any, { builderOptions, builderContext }: any): Promise<any>;

package/dist/ts3.4/server/angular-cli-webpack-13.x.x.d.ts

@@ -0,0 +1 @@
+export function getWebpackConfig(baseConfig: any, { builderOptions, builderContext }: any): Promise<any>;

package/dist/ts3.4/server/angular-cli-webpack-older.d.ts

@@ -0,0 +1,72 @@
+import webpack from 'webpack';
+import TsconfigPathsPlugin from 'tsconfig-paths-webpack-plugin';
+import { PresetOptions } from './options';
+/**
+ * Old way currently support version lower than 12.2.x
+ */
+export declare function getWebpackConfig(baseConfig: webpack.Configuration, options: PresetOptions): Promise<webpack.Configuration | {
+    entry: any[];
+    module: {
+        rules: webpack.RuleSetRule[];
+        noParse?: RegExp | RegExp[] | ((content: string) => boolean);
+        unknownContextRequest?: string;
+        unknownContextRecursive?: boolean;
+        unknownContextRegExp?: RegExp;
+        unknownContextCritical?: boolean;
+        exprContextRequest?: string;
+        exprContextRegExp?: RegExp;
+        exprContextRecursive?: boolean;
+        exprContextCritical?: boolean;
+        wrappedContextRegExp?: RegExp;
+        wrappedContextRecursive?: boolean;
+        wrappedContextCritical?: boolean;
+        strictExportPresence?: boolean;
+    };
+    plugins: webpack.Plugin[];
+    resolve: {
+        modules: string[];
+        plugins: TsconfigPathsPlugin[];
+        descriptionFiles?: string[];
+        mainFields?: string[] | string[][];
+        aliasFields?: string[] | string[][];
+        mainFiles?: string[];
+        extensions?: string[];
+        enforceExtension?: boolean;
+        alias?: {
+            [key: string]: string;
+        };
+        unsafeCache?: boolean | {};
+        cachePredicate?(data: {
+            path: string;
+            request: string;
+        }): boolean;
+        symlinks?: boolean;
+        cacheWithContext?: boolean;
+        roots?: string[];
+    };
+    resolveLoader: webpack.ResolveLoader;
+    mode?: "development" | "production" | "none";
+    name?: string;
+    context?: string;
+    devtool?: webpack.Options.Devtool;
+    output?: webpack.Output;
+    externals?: string | RegExp | webpack.ExternalsObjectElement | webpack.ExternalsFunctionElement | webpack.ExternalsElement[];
+    target?: "node" | "web" | "webworker" | "async-node" | "node-webkit" | "atom" | "electron" | "electron-renderer" | "electron-preload" | "electron-main" | ((compiler?: any) => void);
+    bail?: boolean;
+    profile?: boolean;
+    cache?: boolean | object;
+    watch?: boolean;
+    watchOptions?: webpack.ICompiler.WatchOptions;
+    node?: false | webpack.Node;
+    amd?: {
+        [moduleName: string]: boolean;
+    };
+    recordsPath?: string;
+    recordsInputPath?: string;
+    recordsOutputPath?: string;
+    stats?: webpack.Stats.ToStringOptions;
+    performance?: false | webpack.Options.Performance;
+    parallelism?: number;
+    optimization?: webpack.Options.Optimization;
+    devServer?: import("webpack-dev-server").Configuration;
+}>;

package/dist/ts3.4/server/framework-preset-angular-cli.d.ts

@@ -1,73 +1,3 @@
 import webpack from 'webpack';
-import TsconfigPathsPlugin from 'tsconfig-paths-webpack-plugin';
-import { Options as CoreOptions } from '@storybook/core-common';
-export declare type Options = CoreOptions & {
-    angularBrowserTarget?: string;
-    tsConfig?: string;
-};
-export declare function webpackFinal(baseConfig: webpack.Configuration, options: Options): Promise<webpack.Configuration | {
-    entry: any[];
-    module: {
-        rules: webpack.RuleSetRule[];
-        noParse?: RegExp | RegExp[] | ((content: string) => boolean);
-        unknownContextRequest?: string;
-        unknownContextRecursive?: boolean;
-        unknownContextRegExp?: RegExp;
-        unknownContextCritical?: boolean;
-        exprContextRequest?: string;
-        exprContextRegExp?: RegExp;
-        exprContextRecursive?: boolean;
-        exprContextCritical?: boolean;
-        wrappedContextRegExp?: RegExp;
-        wrappedContextRecursive?: boolean;
-        wrappedContextCritical?: boolean;
-        strictExportPresence?: boolean;
-    };
-    plugins: webpack.Plugin[];
-    resolve: {
-        modules: string[];
-        plugins: TsconfigPathsPlugin[];
-        descriptionFiles?: string[];
-        mainFields?: string[] | string[][];
-        aliasFields?: string[] | string[][];
-        mainFiles?: string[];
-        extensions?: string[];
-        enforceExtension?: boolean;
-        alias?: {
-            [key: string]: string;
-        };
-        unsafeCache?: boolean | {};
-        cachePredicate?(data: {
-            path: string;
-            request: string;
-        }): boolean;
-        symlinks?: boolean;
-        cacheWithContext?: boolean;
-        roots?: string[];
-    };
-    resolveLoader: webpack.ResolveLoader;
-    mode?: "development" | "production" | "none";
-    name?: string;
-    context?: string;
-    devtool?: webpack.Options.Devtool;
-    output?: webpack.Output;
-    externals?: string | RegExp | webpack.ExternalsObjectElement | webpack.ExternalsFunctionElement | webpack.ExternalsElement[];
-    target?: "node" | "web" | "webworker" | "async-node" | "node-webkit" | "atom" | "electron" | "electron-renderer" | "electron-preload" | "electron-main" | ((compiler?: any) => void);
-    bail?: boolean;
-    profile?: boolean;
-    cache?: boolean | object;
-    watch?: boolean;
-    watchOptions?: webpack.ICompiler.WatchOptions;
-    node?: false | webpack.Node;
-    amd?: {
-        [moduleName: string]: boolean;
-    };
-    recordsPath?: string;
-    recordsInputPath?: string;
-    recordsOutputPath?: string;
-    stats?: webpack.Stats.ToStringOptions;
-    performance?: false | webpack.Options.Performance;
-    parallelism?: number;
-    optimization?: webpack.Options.Optimization;
-    devServer?: import("webpack-dev-server").Configuration;
-}>;
+import { PresetOptions } from './options';
+export declare function webpackFinal(baseConfig: webpack.Configuration, options: PresetOptions): Promise<webpack.Configuration>;

package/dist/ts3.4/server/framework-preset-angular-ivy.d.ts

@@ -1,10 +1,10 @@
 import { Configuration } from 'webpack';
-import { Options } from './framework-preset-angular-cli';
+import { PresetOptions } from './options';
 /**
  * Run ngcc for converting modules to ivy format before starting storybook
  * This step is needed in order to support Ivy in storybook
  *
  * Information about Ivy can be found here https://angular.io/guide/ivy
  */
-export declare const runNgcc: () => void;
-export declare const webpack: (webpackConfig: Configuration, options: Options) => Promise<Configuration>;
+export declare const runNgcc: () => Promise<void>;
+export declare const webpack: (webpackConfig: Configuration, options: PresetOptions) => Promise<Configuration>;

package/dist/ts3.4/server/options.d.ts

@@ -1,3 +1,11 @@
-import { LoadOptions } from '@storybook/core-common';
+import { LoadOptions, Options as CoreOptions } from '@storybook/core-common';
+import { BuilderContext } from '@angular-devkit/architect';
+import { JsonObject } from '@angular-devkit/core';
+export declare type PresetOptions = CoreOptions & {
+    angularBrowserTarget?: string | null;
+    angularBuilderOptions?: JsonObject | null;
+    angularBuilderContext?: BuilderContext | null;
+    tsConfig?: string;
+};
 declare const _default: LoadOptions;
 export default _default;

package/dist/ts3.9/builders/build-storybook/index.d.ts

@@ -6,7 +6,7 @@ export declare type StorybookBuilderOptions = JsonObject & {
     tsConfig?: string;
     compodoc: boolean;
     compodocArgs: string[];
-} & Pick<CLIOptions, 'staticDir' | 'outputDir' | 'configDir' | 'loglevel' | 'quiet' | 'docs'>;
+} & Pick<CLIOptions, 'outputDir' | 'configDir' | 'loglevel' | 'quiet' | 'docs'>;
 export declare type StorybookBuilderOutput = JsonObject & BuilderOutput & {};
 declare const _default: import("@angular-devkit/architect/src/internal").Builder<StorybookBuilderOptions>;
 export default _default;

package/dist/ts3.9/builders/build-storybook/index.js

@@ -79,7 +79,8 @@ function commandBuilder(options, context) {
     }), operators_1.map(function (_a) {
         var tsConfig = _a.tsConfig;
         var browserTarget = options.browserTarget, otherOptions = __rest(options, ["browserTarget"]);
-        return __assign(__assign({}, otherOptions), { angularBrowserTarget: browserTarget, tsConfig: tsConfig });
+        var standaloneOptions = __assign(__assign({}, otherOptions), { angularBrowserTarget: browserTarget, angularBuilderContext: context, tsConfig: tsConfig });
+        return standaloneOptions;
     }), operators_1.switchMap(function (standaloneOptions) { return runInstance(__assign(__assign({}, standaloneOptions), { mode: 'static' })); }), operators_1.map(function () {
         return { success: true };
     }));

package/dist/ts3.9/builders/build-storybook/schema.json

@@ -14,13 +14,6 @@
             "type": "string",
             "description": "The full path for the TypeScript configuration file, relative to the current workspace."
         },
-        "staticDir": {
-            "type": "array",
-            "description": "Directory where to load static files from, array of strings.",
-            "items": {
-                "type": "string"
-            }
-        },
         "outputDir": {
             "type": "string",
             "description": "Directory where to store built files.",

package/dist/ts3.9/builders/start-storybook/index.d.ts

@@ -6,7 +6,7 @@ export declare type StorybookBuilderOptions = JsonObject & {
     tsConfig?: string;
     compodoc: boolean;
     compodocArgs: string[];
-} & Pick<CLIOptions, 'port' | 'host' | 'staticDir' | 'configDir' | 'https' | 'sslCa' | 'sslCert' | 'sslKey' | 'smokeTest' | 'ci' | 'quiet' | 'docs'>;
+} & Pick<CLIOptions, 'port' | 'host' | 'configDir' | 'https' | 'sslCa' | 'sslCert' | 'sslKey' | 'smokeTest' | 'ci' | 'quiet' | 'docs'>;
 export declare type StorybookBuilderOutput = JsonObject & BuilderOutput & {};
 declare const _default: import("@angular-devkit/architect/src/internal").Builder<StorybookBuilderOptions>;
 export default _default;

package/dist/ts3.9/builders/start-storybook/index.js

@@ -79,7 +79,8 @@ function commandBuilder(options, context) {
     }), operators_1.map(function (_a) {
         var tsConfig = _a.tsConfig;
         var browserTarget = options.browserTarget, otherOptions = __rest(options, ["browserTarget"]);
-        return __assign(__assign({}, otherOptions), { angularBrowserTarget: browserTarget, tsConfig: tsConfig });
+        var standaloneOptions = __assign(__assign({}, otherOptions), { angularBrowserTarget: browserTarget, angularBuilderContext: context, tsConfig: tsConfig });
+        return standaloneOptions;
     }), operators_1.switchMap(function (standaloneOptions) { return runInstance(standaloneOptions); }), operators_1.map(function () {
         return { success: true };
     }));

package/dist/ts3.9/builders/start-storybook/schema.json

@@ -24,13 +24,6 @@
             "description": "Host to listen on.",
             "default": "localhost"
         },
-        "staticDir": {
-            "type": "array",
-            "description": "Directory where to load static files from, array of strings.",
-            "items": {
-                "type": "string"
-            }
-        },
         "configDir": {
             "type": "string",
             "description": "Directory where to load Storybook configurations from.",
@@ -87,13 +80,5 @@
             }
         }
     },
-    "additionalProperties": false,
-    "oneOf": [
-        {
-            "required": ["browserTarget"]
-        },
-        {
-            "required": ["tsConfig"]
-        }
-    ]
+    "additionalProperties": false
 }

package/dist/ts3.9/server/angular-cli-webpack-12.2.x.d.ts

@@ -0,0 +1 @@
+export function getWebpackConfig(baseConfig: any, { builderOptions, builderContext }: any): Promise<any>;

package/dist/ts3.9/server/angular-cli-webpack-12.2.x.js

@@ -0,0 +1,93 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __spreadArrays = (this && this.__spreadArrays) || function () {
+    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
+    for (var r = Array(s), k = 0, i = 0; i < il; i++)
+        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
+            r[k] = a[j];
+    return r;
+};
+// Private angular devkit stuff
+var generateI18nBrowserWebpackConfigFromContext = require('@angular-devkit/build-angular/src/utils/webpack-browser-config').generateI18nBrowserWebpackConfigFromContext;
+var _a = require('@angular-devkit/build-angular/src/webpack/configs'), getCommonConfig = _a.getCommonConfig, getStylesConfig = _a.getStylesConfig, getTypeScriptConfig = _a.getTypeScriptConfig;
+var filterOutStylingRules = require('./utils/filter-out-styling-rules').filterOutStylingRules;
+/**
+ * Extract webpack config from angular-cli 12.2.x
+ * ⚠️ This file is in JavaScript to not use TypeScript. Because current storybook TypeScript version is not compatible with Angular CLI.
+ * FIXME: Try another way with TypeScript on future storybook version (7 maybe 🤞)
+ *
+ * @param {*} baseConfig Previous webpack config from storybook
+ * @param {*} options { builderOptions, builderContext }
+ */
+exports.getWebpackConfig = function (baseConfig, _a) {
+    var builderOptions = _a.builderOptions, builderContext = _a.builderContext;
+    return __awaiter(void 0, void 0, void 0, function () {
+        var cliConfig, entry, rulesExcludingStyles, module, plugins, resolve;
+        var _b, _c, _d;
+        return __generator(this, function (_e) {
+            switch (_e.label) {
+                case 0: return [4 /*yield*/, generateI18nBrowserWebpackConfigFromContext(__assign(__assign({ 
+                        // Default options
+                        index: 'noop-index', main: 'noop-main', outputPath: 'noop-out' }, builderOptions), { 
+                        // Fixed options
+                        optimization: false, namedChunks: false, progress: false, buildOptimizer: false, aot: false }), builderContext, function (wco) { return [getCommonConfig(wco), getStylesConfig(wco), getTypeScriptConfig(wco)]; })];
+                case 1:
+                    cliConfig = (_e.sent()).config;
+                    entry = __spreadArrays(baseConfig.entry, ((_b = cliConfig.entry.styles) !== null && _b !== void 0 ? _b : []), ((_c = cliConfig.entry.polyfills) !== null && _c !== void 0 ? _c : []));
+                    rulesExcludingStyles = filterOutStylingRules(baseConfig);
+                    module = __assign(__assign({}, baseConfig.module), { rules: __spreadArrays(cliConfig.module.rules, rulesExcludingStyles) });
+                    plugins = __spreadArrays(((_d = cliConfig.plugins) !== null && _d !== void 0 ? _d : []), baseConfig.plugins);
+                    resolve = __assign(__assign({}, baseConfig.resolve), { modules: Array.from(new Set(__spreadArrays(baseConfig.resolve.modules, cliConfig.resolve.modules))) });
+                    return [2 /*return*/, __assign(__assign({}, baseConfig), { entry: entry,
+                            module: module,
+                            plugins: plugins,
+                            resolve: resolve, resolveLoader: cliConfig.resolveLoader })];
+            }
+        });
+    });
+};

package/dist/ts3.9/server/angular-cli-webpack-13.x.x.d.ts

@@ -0,0 +1 @@
+export function getWebpackConfig(baseConfig: any, { builderOptions, builderContext }: any): Promise<any>;

package/dist/ts3.9/server/angular-cli-webpack-13.x.x.js

@@ -0,0 +1,93 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __spreadArrays = (this && this.__spreadArrays) || function () {
+    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
+    for (var r = Array(s), k = 0, i = 0; i < il; i++)
+        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
+            r[k] = a[j];
+    return r;
+};
+// Private angular devkit stuff
+var generateI18nBrowserWebpackConfigFromContext = require('@angular-devkit/build-angular/src/utils/webpack-browser-config').generateI18nBrowserWebpackConfigFromContext;
+var _a = require('@angular-devkit/build-angular/src/webpack/configs'), getCommonConfig = _a.getCommonConfig, getStylesConfig = _a.getStylesConfig, getTypescriptWorkerPlugin = _a.getTypescriptWorkerPlugin;
+var filterOutStylingRules = require('./utils/filter-out-styling-rules').filterOutStylingRules;
+/**
+ * Extract webpack config from angular-cli 13.x.x
+ * ⚠️ This file is in JavaScript to not use TypeScript. Because current storybook TypeScript version is not compatible with Angular CLI.
+ * FIXME: Try another way with TypeScript on future storybook version (7 maybe 🤞)
+ *
+ * @param {*} baseConfig Previous webpack config from storybook
+ * @param {*} options { builderOptions, builderContext }
+ */
+exports.getWebpackConfig = function (baseConfig, _a) {
+    var builderOptions = _a.builderOptions, builderContext = _a.builderContext;
+    return __awaiter(void 0, void 0, void 0, function () {
+        var cliConfig, entry, rulesExcludingStyles, module, plugins, resolve;
+        var _b, _c, _d;
+        return __generator(this, function (_e) {
+            switch (_e.label) {
+                case 0: return [4 /*yield*/, generateI18nBrowserWebpackConfigFromContext(__assign(__assign({ 
+                        // Default options
+                        index: 'noop-index', main: 'noop-main', outputPath: 'noop-out' }, builderOptions), { 
+                        // Fixed options
+                        optimization: false, namedChunks: false, progress: false, buildOptimizer: false, aot: false }), builderContext, function (wco) { return [getCommonConfig(wco), getStylesConfig(wco), getTypescriptWorkerPlugin(wco)]; })];
+                case 1:
+                    cliConfig = (_e.sent()).config;
+                    entry = __spreadArrays(baseConfig.entry, ((_b = cliConfig.entry.styles) !== null && _b !== void 0 ? _b : []), ((_c = cliConfig.entry.polyfills) !== null && _c !== void 0 ? _c : []));
+                    rulesExcludingStyles = filterOutStylingRules(baseConfig);
+                    module = __assign(__assign({}, baseConfig.module), { rules: __spreadArrays(cliConfig.module.rules, rulesExcludingStyles) });
+                    plugins = __spreadArrays(((_d = cliConfig.plugins) !== null && _d !== void 0 ? _d : []), baseConfig.plugins);
+                    resolve = __assign(__assign({}, baseConfig.resolve), { modules: Array.from(new Set(__spreadArrays(baseConfig.resolve.modules, cliConfig.resolve.modules))) });
+                    return [2 /*return*/, __assign(__assign({}, baseConfig), { entry: entry,
+                            module: module,
+                            plugins: plugins,
+                            resolve: resolve, resolveLoader: cliConfig.resolveLoader })];
+            }
+        });
+    });
+};

package/dist/ts3.9/server/angular-cli-webpack-older.d.ts

@@ -0,0 +1,72 @@
+import webpack from 'webpack';
+import TsconfigPathsPlugin from 'tsconfig-paths-webpack-plugin';
+import { PresetOptions } from './options';
+/**
+ * Old way currently support version lower than 12.2.x
+ */
+export declare function getWebpackConfig(baseConfig: webpack.Configuration, options: PresetOptions): Promise<webpack.Configuration | {
+    entry: any[];
+    module: {
+        rules: webpack.RuleSetRule[];
+        noParse?: RegExp | RegExp[] | ((content: string) => boolean);
+        unknownContextRequest?: string;
+        unknownContextRecursive?: boolean;
+        unknownContextRegExp?: RegExp;
+        unknownContextCritical?: boolean;
+        exprContextRequest?: string;
+        exprContextRegExp?: RegExp;
+        exprContextRecursive?: boolean;
+        exprContextCritical?: boolean;
+        wrappedContextRegExp?: RegExp;
+        wrappedContextRecursive?: boolean;
+        wrappedContextCritical?: boolean;
+        strictExportPresence?: boolean;
+    };
+    plugins: webpack.Plugin[];
+    resolve: {
+        modules: string[];
+        plugins: TsconfigPathsPlugin[];
+        descriptionFiles?: string[];
+        mainFields?: string[] | string[][];
+        aliasFields?: string[] | string[][];
+        mainFiles?: string[];
+        extensions?: string[];
+        enforceExtension?: boolean;
+        alias?: {
+            [key: string]: string;
+        };
+        unsafeCache?: boolean | {};
+        cachePredicate?(data: {
+            path: string;
+            request: string;
+        }): boolean;
+        symlinks?: boolean;
+        cacheWithContext?: boolean;
+        roots?: string[];
+    };
+    resolveLoader: webpack.ResolveLoader;
+    mode?: "development" | "production" | "none";
+    name?: string;
+    context?: string;
+    devtool?: webpack.Options.Devtool;
+    output?: webpack.Output;
+    externals?: string | RegExp | webpack.ExternalsObjectElement | webpack.ExternalsFunctionElement | webpack.ExternalsElement[];
+    target?: "node" | "web" | "webworker" | "async-node" | "node-webkit" | "atom" | "electron" | "electron-renderer" | "electron-preload" | "electron-main" | ((compiler?: any) => void);
+    bail?: boolean;
+    profile?: boolean;
+    cache?: boolean | object;
+    watch?: boolean;
+    watchOptions?: webpack.ICompiler.WatchOptions;
+    node?: false | webpack.Node;
+    amd?: {
+        [moduleName: string]: boolean;
+    };
+    recordsPath?: string;
+    recordsInputPath?: string;
+    recordsOutputPath?: string;
+    stats?: webpack.Stats.ToStringOptions;
+    performance?: false | webpack.Options.Performance;
+    parallelism?: number;
+    optimization?: webpack.Options.Optimization;
+    devServer?: import("webpack-dev-server").Configuration;
+}>;

package/dist/ts3.9/server/angular-cli-webpack-older.js

@@ -0,0 +1,156 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __spreadArrays = (this && this.__spreadArrays) || function () {
+    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
+    for (var r = Array(s), k = 0, i = 0; i < il; i++)
+        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
+            r[k] = a[j];
+    return r;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getWebpackConfig = void 0;
+var node_logger_1 = require("@storybook/node-logger");
+var tsconfig_paths_webpack_plugin_1 = __importDefault(require("tsconfig-paths-webpack-plugin"));
+var architect_1 = require("@angular-devkit/architect");
+var angular_read_workspace_1 = require("./angular-read-workspace");
+var angular_devkit_build_webpack_1 = require("./angular-devkit-build-webpack");
+var filter_out_styling_rules_1 = require("./utils/filter-out-styling-rules");
+/**
+ * Old way currently support version lower than 12.2.x
+ */
+function getWebpackConfig(baseConfig, options) {
+    return __awaiter(this, void 0, void 0, function () {
+        var dirToSearch, workspaceConfig, error_1, project, target, confName, browserTarget, fondProject, angularCliWebpackConfig, error_2;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    dirToSearch = process.cwd();
+                    _a.label = 1;
+                case 1:
+                    _a.trys.push([1, 3, , 4]);
+                    return [4 /*yield*/, angular_read_workspace_1.readAngularWorkspaceConfig(dirToSearch)];
+                case 2:
+                    workspaceConfig = _a.sent();
+                    return [3 /*break*/, 4];
+                case 3:
+                    error_1 = _a.sent();
+                    node_logger_1.logger.error("=> Could not find angular workspace config (angular.json) on this path \"" + dirToSearch + "\"");
+                    node_logger_1.logger.info("=> Fail to load angular-cli config. Using base config");
+                    return [2 /*return*/, baseConfig];
+                case 4:
+                    try {
+                        // Default behavior when `angularBrowserTarget` are not explicitly defined to null
+                        if (options.angularBrowserTarget !== null) {
+                            browserTarget = options.angularBrowserTarget
+                                ? architect_1.targetFromTargetString(options.angularBrowserTarget)
+                                : {
+                                    configuration: undefined,
+                                    project: angular_read_workspace_1.getDefaultProjectName(workspaceConfig),
+                                    target: 'build',
+                                };
+                            fondProject = angular_read_workspace_1.findAngularProjectTarget(workspaceConfig, browserTarget.project, browserTarget.target);
+                            project = fondProject.project;
+                            target = fondProject.target;
+                            confName = browserTarget.configuration;
+                            node_logger_1.logger.info("=> Using angular project \"" + browserTarget.project + ":" + browserTarget.target + (confName ? ":" + confName : '') + "\" for configuring Storybook");
+                        }
+                        // Start storybook when only tsConfig is provided.
+                        if (options.angularBrowserTarget === null && options.tsConfig) {
+                            node_logger_1.logger.info("=> Using default angular project with \"tsConfig:" + options.tsConfig + "\"");
+                            project = { root: '', extensions: {}, targets: undefined };
+                            target = { builder: '', options: { tsConfig: options.tsConfig } };
+                        }
+                    }
+                    catch (error) {
+                        node_logger_1.logger.error("=> Could not find angular project: " + error.message);
+                        node_logger_1.logger.info("=> Fail to load angular-cli config. Using base config");
+                        return [2 /*return*/, baseConfig];
+                    }
+                    _a.label = 5;
+                case 5:
+                    _a.trys.push([5, 7, , 8]);
+                    return [4 /*yield*/, angular_devkit_build_webpack_1.extractAngularCliWebpackConfig(dirToSearch, project, target, confName)];
+                case 6:
+                    angularCliWebpackConfig = _a.sent();
+                    node_logger_1.logger.info("=> Using angular-cli webpack config");
+                    return [3 /*break*/, 8];
+                case 7:
+                    error_2 = _a.sent();
+                    node_logger_1.logger.error("=> Could not get angular cli webpack config");
+                    throw error_2;
+                case 8: return [2 /*return*/, mergeAngularCliWebpackConfig(angularCliWebpackConfig, baseConfig)];
+            }
+        });
+    });
+}
+exports.getWebpackConfig = getWebpackConfig;
+function mergeAngularCliWebpackConfig(_a, baseConfig) {
+    var cliCommonWebpackConfig = _a.cliCommonWebpackConfig, cliStyleWebpackConfig = _a.cliStyleWebpackConfig, tsConfigPath = _a.tsConfigPath;
+    // Don't use storybooks styling rules because we have to use rules created by @angular-devkit/build-angular
+    // because @angular-devkit/build-angular created rules have include/exclude for global style files.
+    var rulesExcludingStyles = filter_out_styling_rules_1.filterOutStylingRules(baseConfig);
+    // styleWebpackConfig.entry adds global style files to the webpack context
+    var entry = __spreadArrays(baseConfig.entry, Object.values(cliStyleWebpackConfig.entry).reduce(function (acc, item) { return acc.concat(item); }, []));
+    var module = __assign(__assign({}, baseConfig.module), { rules: __spreadArrays(cliStyleWebpackConfig.module.rules, rulesExcludingStyles) });
+    // We use cliCommonConfig plugins to serve static assets files.
+    var plugins = __spreadArrays(cliStyleWebpackConfig.plugins, cliCommonWebpackConfig.plugins, baseConfig.plugins);
+    var resolve = __assign(__assign({}, baseConfig.resolve), { modules: Array.from(new Set(__spreadArrays(baseConfig.resolve.modules, cliCommonWebpackConfig.resolve.modules))), plugins: [
+            new tsconfig_paths_webpack_plugin_1.default({
+                configFile: tsConfigPath,
+                mainFields: ['browser', 'module', 'main'],
+            }),
+        ] });
+    return __assign(__assign({}, baseConfig), { entry: entry,
+        module: module,
+        plugins: plugins,
+        resolve: resolve, resolveLoader: cliCommonWebpackConfig.resolveLoader });
+}

package/dist/ts3.9/server/framework-preset-angular-cli.d.ts

@@ -1,73 +1,3 @@
 import webpack from 'webpack';
-import TsconfigPathsPlugin from 'tsconfig-paths-webpack-plugin';
-import { Options as CoreOptions } from '@storybook/core-common';
-export declare type Options = CoreOptions & {
-    angularBrowserTarget?: string;
-    tsConfig?: string;
-};
-export declare function webpackFinal(baseConfig: webpack.Configuration, options: Options): Promise<webpack.Configuration | {
-    entry: any[];
-    module: {
-        rules: webpack.RuleSetRule[];
-        noParse?: RegExp | RegExp[] | ((content: string) => boolean);
-        unknownContextRequest?: string;
-        unknownContextRecursive?: boolean;
-        unknownContextRegExp?: RegExp;
-        unknownContextCritical?: boolean;
-        exprContextRequest?: string;
-        exprContextRegExp?: RegExp;
-        exprContextRecursive?: boolean;
-        exprContextCritical?: boolean;
-        wrappedContextRegExp?: RegExp;
-        wrappedContextRecursive?: boolean;
-        wrappedContextCritical?: boolean;
-        strictExportPresence?: boolean;
-    };
-    plugins: webpack.Plugin[];
-    resolve: {
-        modules: string[];
-        plugins: TsconfigPathsPlugin[];
-        descriptionFiles?: string[];
-        mainFields?: string[] | string[][];
-        aliasFields?: string[] | string[][];
-        mainFiles?: string[];
-        extensions?: string[];
-        enforceExtension?: boolean;
-        alias?: {
-            [key: string]: string;
-        };
-        unsafeCache?: boolean | {};
-        cachePredicate?(data: {
-            path: string;
-            request: string;
-        }): boolean;
-        symlinks?: boolean;
-        cacheWithContext?: boolean;
-        roots?: string[];
-    };
-    resolveLoader: webpack.ResolveLoader;
-    mode?: "development" | "production" | "none";
-    name?: string;
-    context?: string;
-    devtool?: webpack.Options.Devtool;
-    output?: webpack.Output;
-    externals?: string | RegExp | webpack.ExternalsObjectElement | webpack.ExternalsFunctionElement | webpack.ExternalsElement[];
-    target?: "node" | "web" | "webworker" | "async-node" | "node-webkit" | "atom" | "electron" | "electron-renderer" | "electron-preload" | "electron-main" | ((compiler?: any) => void);
-    bail?: boolean;
-    profile?: boolean;
-    cache?: boolean | object;
-    watch?: boolean;
-    watchOptions?: webpack.ICompiler.WatchOptions;
-    node?: false | webpack.Node;
-    amd?: {
-        [moduleName: string]: boolean;
-    };
-    recordsPath?: string;
-    recordsInputPath?: string;
-    recordsOutputPath?: string;
-    stats?: webpack.Stats.ToStringOptions;
-    performance?: false | webpack.Options.Performance;
-    parallelism?: number;
-    optimization?: webpack.Options.Optimization;
-    devServer?: import("webpack-dev-server").Configuration;
-}>;
+import { PresetOptions } from './options';
+export declare function webpackFinal(baseConfig: webpack.Configuration, options: PresetOptions): Promise<webpack.Configuration>;

package/dist/ts3.9/server/framework-preset-angular-cli.js

@@ -10,6 +10,25 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -46,114 +65,129 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __spreadArrays = (this && this.__spreadArrays) || function () {
-    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
-    for (var r = Array(s), k = 0, i = 0; i < il; i++)
-        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
-            r[k] = a[j];
-    return r;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.webpackFinal = void 0;
 var node_logger_1 = require("@storybook/node-logger");
-var tsconfig_paths_webpack_plugin_1 = __importDefault(require("tsconfig-paths-webpack-plugin"));
 var architect_1 = require("@angular-devkit/architect");
-var angular_read_workspace_1 = require("./angular-read-workspace");
-var angular_devkit_build_webpack_1 = require("./angular-devkit-build-webpack");
+var find_up_1 = require("find-up");
+var semver_1 = __importDefault(require("@storybook/semver"));
+var core_1 = require("@angular-devkit/core");
 var module_is_available_1 = require("./utils/module-is-available");
-var filter_out_styling_rules_1 = require("./utils/filter-out-styling-rules");
+var angular_cli_webpack_12_2_x_1 = require("./angular-cli-webpack-12.2.x");
+var angular_cli_webpack_13_x_x_1 = require("./angular-cli-webpack-13.x.x");
+var angular_cli_webpack_older_1 = require("./angular-cli-webpack-older");
 function webpackFinal(baseConfig, options) {
+    var _a;
     return __awaiter(this, void 0, void 0, function () {
-        var dirToSearch, workspaceConfig, error_1, project, target, confName, browserTarget, fondProject, angularCliWebpackConfig, error_2;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        var packageJson, angularCliVersion, webpackGetterByVersions, webpackGetter;
+        var _this = this;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
-                    dirToSearch = process.cwd();
                     if (!module_is_available_1.moduleIsAvailable('@angular-devkit/build-angular')) {
                         node_logger_1.logger.info('=> Using base config because "@angular-devkit/build-angular" is not installed');
                         return [2 /*return*/, baseConfig];
                     }
-                    node_logger_1.logger.info('=> Loading angular-cli config');
-                    _a.label = 1;
+                    return [4 /*yield*/, Promise.resolve().then(function () { return __importStar(require(find_up_1.sync('package.json', { cwd: options.configDir }))); })];
                 case 1:
-                    _a.trys.push([1, 3, , 4]);
-                    return [4 /*yield*/, angular_read_workspace_1.readAngularWorkspaceConfig(dirToSearch)];
-                case 2:
-                    workspaceConfig = _a.sent();
-                    return [3 /*break*/, 4];
-                case 3:
-                    error_1 = _a.sent();
-                    node_logger_1.logger.error("=> Could not find angular workspace config (angular.json) on this path \"" + dirToSearch + "\"");
-                    node_logger_1.logger.info("=> Fail to load angular-cli config. Using base config");
-                    return [2 /*return*/, baseConfig];
-                case 4:
-                    try {
-                        // Default behavior when `angularBrowserTarget` are not explicitly defined to null
-                        if (options.angularBrowserTarget !== null) {
-                            browserTarget = options.angularBrowserTarget
-                                ? architect_1.targetFromTargetString(options.angularBrowserTarget)
-                                : {
-                                    configuration: undefined,
-                                    project: angular_read_workspace_1.getDefaultProjectName(workspaceConfig),
-                                    target: 'build',
-                                };
-                            fondProject = angular_read_workspace_1.findAngularProjectTarget(workspaceConfig, browserTarget.project, browserTarget.target);
-                            project = fondProject.project;
-                            target = fondProject.target;
-                            confName = browserTarget.configuration;
-                            node_logger_1.logger.info("=> Using angular project \"" + browserTarget.project + ":" + browserTarget.target + (confName ? ":" + confName : '') + "\" for configuring Storybook");
-                        }
-                        // Start storybook when only tsConfig is provided.
-                        if (options.angularBrowserTarget === null && options.tsConfig) {
-                            node_logger_1.logger.info("=> Using default angular project with \"tsConfig:" + options.tsConfig + "\"");
-                            project = { root: '', extensions: {}, targets: undefined };
-                            target = { builder: '', options: { tsConfig: options.tsConfig } };
-                        }
-                    }
-                    catch (error) {
-                        node_logger_1.logger.error("=> Could not find angular project: " + error.message);
-                        node_logger_1.logger.info("=> Fail to load angular-cli config. Using base config");
-                        return [2 /*return*/, baseConfig];
-                    }
-                    _a.label = 5;
-                case 5:
-                    _a.trys.push([5, 7, , 8]);
-                    return [4 /*yield*/, angular_devkit_build_webpack_1.extractAngularCliWebpackConfig(dirToSearch, project, target, confName)];
-                case 6:
-                    angularCliWebpackConfig = _a.sent();
-                    node_logger_1.logger.info("=> Using angular-cli webpack config");
-                    return [3 /*break*/, 8];
-                case 7:
-                    error_2 = _a.sent();
-                    node_logger_1.logger.error("=> Could not get angular cli webpack config");
-                    throw error_2;
-                case 8: return [2 /*return*/, mergeAngularCliWebpackConfig(angularCliWebpackConfig, baseConfig)];
+                    packageJson = _b.sent();
+                    angularCliVersion = (_a = semver_1.default.coerce(packageJson.devDependencies['@angular/cli'])) === null || _a === void 0 ? void 0 : _a.version;
+                    webpackGetterByVersions = [
+                        {
+                            info: '=> Loading angular-cli config for angular >= 13.0.0',
+                            condition: semver_1.default.satisfies(angularCliVersion, '>=13.0.0'),
+                            getWebpackConfig: function (_baseConfig, _options) { return __awaiter(_this, void 0, void 0, function () {
+                                var builderContext, builderOptions;
+                                return __generator(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0:
+                                            builderContext = getBuilderContext(_options);
+                                            return [4 /*yield*/, getBuilderOptions(_options, builderContext)];
+                                        case 1:
+                                            builderOptions = _a.sent();
+                                            return [2 /*return*/, angular_cli_webpack_13_x_x_1.getWebpackConfig(_baseConfig, {
+                                                    builderOptions: builderOptions,
+                                                    builderContext: builderContext,
+                                                })];
+                                    }
+                                });
+                            }); },
+                        },
+                        {
+                            info: '=> Loading angular-cli config for angular 12.2.x',
+                            condition: semver_1.default.satisfies(angularCliVersion, '12.2.x') && options.angularBuilderContext,
+                            getWebpackConfig: function (_baseConfig, _options) { return __awaiter(_this, void 0, void 0, function () {
+                                var builderContext, builderOptions;
+                                return __generator(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0:
+                                            builderContext = getBuilderContext(_options);
+                                            return [4 /*yield*/, getBuilderOptions(_options, builderContext)];
+                                        case 1:
+                                            builderOptions = _a.sent();
+                                            return [2 /*return*/, angular_cli_webpack_12_2_x_1.getWebpackConfig(_baseConfig, {
+                                                    builderOptions: builderOptions,
+                                                    builderContext: builderContext,
+                                                })];
+                                    }
+                                });
+                            }); },
+                        },
+                        {
+                            info: '=> Loading angular-cli config for angular lower than 12.2.0',
+                            condition: true,
+                            getWebpackConfig: angular_cli_webpack_older_1.getWebpackConfig,
+                        },
+                    ];
+                    webpackGetter = webpackGetterByVersions.find(function (wg) { return wg.condition; });
+                    node_logger_1.logger.info(webpackGetter.info);
+                    return [2 /*return*/, Promise.resolve(webpackGetter.getWebpackConfig(baseConfig, options))];
             }
         });
     });
 }
 exports.webpackFinal = webpackFinal;
-function mergeAngularCliWebpackConfig(_a, baseConfig) {
-    var cliCommonWebpackConfig = _a.cliCommonWebpackConfig, cliStyleWebpackConfig = _a.cliStyleWebpackConfig, tsConfigPath = _a.tsConfigPath;
-    // Don't use storybooks styling rules because we have to use rules created by @angular-devkit/build-angular
-    // because @angular-devkit/build-angular created rules have include/exclude for global style files.
-    var rulesExcludingStyles = filter_out_styling_rules_1.filterOutStylingRules(baseConfig);
-    // styleWebpackConfig.entry adds global style files to the webpack context
-    var entry = __spreadArrays(baseConfig.entry, Object.values(cliStyleWebpackConfig.entry).reduce(function (acc, item) { return acc.concat(item); }, []));
-    var module = __assign(__assign({}, baseConfig.module), { rules: __spreadArrays(cliStyleWebpackConfig.module.rules, rulesExcludingStyles) });
-    // We use cliCommonConfig plugins to serve static assets files.
-    var plugins = __spreadArrays(cliStyleWebpackConfig.plugins, cliCommonWebpackConfig.plugins, baseConfig.plugins);
-    var resolve = __assign(__assign({}, baseConfig.resolve), { modules: Array.from(new Set(__spreadArrays(baseConfig.resolve.modules, cliCommonWebpackConfig.resolve.modules))), plugins: [
-            new tsconfig_paths_webpack_plugin_1.default({
-                configFile: tsConfigPath,
-                mainFields: ['browser', 'module', 'main'],
-            }),
-        ] });
-    return __assign(__assign({}, baseConfig), { entry: entry,
-        module: module,
-        plugins: plugins,
-        resolve: resolve, resolveLoader: cliCommonWebpackConfig.resolveLoader });
+/**
+ * Get Builder Context
+ * If storybook is not start by angular builder create dumb BuilderContext
+ */
+function getBuilderContext(options) {
+    var _a;
+    return ((_a = options.angularBuilderContext) !== null && _a !== void 0 ? _a : {
+        target: { project: 'noop-project', builder: '', options: {} },
+        workspaceRoot: process.cwd(),
+        getProjectMetadata: function () { return ({}); },
+        getTargetOptions: function () { return ({}); },
+        logger: new core_1.logging.Logger('Storybook'),
+    });
+}
+/**
+ * Get builder options
+ * Merge target options from browser target and from storybook options
+ */
+function getBuilderOptions(options, builderContext) {
+    var _a, _b, _c, _d;
+    return __awaiter(this, void 0, void 0, function () {
+        var browserTargetOptions, browserTarget, builderOptions;
+        return __generator(this, function (_e) {
+            switch (_e.label) {
+                case 0:
+                    browserTargetOptions = {};
+                    if (!options.angularBrowserTarget) return [3 /*break*/, 2];
+                    browserTarget = architect_1.targetFromTargetString(options.angularBrowserTarget);
+                    node_logger_1.logger.info("=> Using angular browser target options from \"" + browserTarget.project + ":" + browserTarget.target + (browserTarget.configuration ? ":" + browserTarget.configuration : '') + "\"");
+                    return [4 /*yield*/, builderContext.getTargetOptions(browserTarget)];
+                case 1:
+                    browserTargetOptions = _e.sent();
+                    _e.label = 2;
+                case 2:
+                    builderOptions = __assign(__assign(__assign({}, browserTargetOptions), options.angularBuilderOptions), { tsConfig: (_d = (_c = (_a = options.tsConfig) !== null && _a !== void 0 ? _a : (_b = options.angularBuilderOptions) === null || _b === void 0 ? void 0 : _b.tsConfig) !== null && _c !== void 0 ? _c : browserTargetOptions.tsConfig) !== null && _d !== void 0 ? _d : find_up_1.sync('tsconfig.json', { cwd: options.configDir }) });
+                    node_logger_1.logger.info("=> Using angular project with \"tsConfig:" + builderOptions.tsConfig + "\"");
+                    return [2 /*return*/, builderOptions];
+            }
+        });
+    });
 }

package/dist/ts3.9/server/framework-preset-angular-ivy.d.ts

@@ -1,10 +1,10 @@
 import { Configuration } from 'webpack';
-import { Options } from './framework-preset-angular-cli';
+import { PresetOptions } from './options';
 /**
  * Run ngcc for converting modules to ivy format before starting storybook
  * This step is needed in order to support Ivy in storybook
  *
  * Information about Ivy can be found here https://angular.io/guide/ivy
  */
-export declare const runNgcc: () => void;
-export declare const webpack: (webpackConfig: Configuration, options: Options) => Promise<Configuration>;
+export declare const runNgcc: () => Promise<void>;
+export declare const webpack: (webpackConfig: Configuration, options: PresetOptions) => Promise<Configuration>;

package/dist/ts3.9/server/framework-preset-angular-ivy.js

@@ -67,24 +67,59 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.webpack = exports.runNgcc = void 0;
-var ngcc_1 = require("@angular/compiler-cli/ngcc");
 var path = __importStar(require("path"));
+/**
+ * Source : https://github.com/angular/angular-cli/blob/ebccb5de4a455af813c5e82483db6af20666bdbd/packages/angular_devkit/build_angular/src/utils/load-esm.ts#L23
+ * This uses a dynamic import to load a module which may be ESM.
+ * CommonJS code can load ESM code via a dynamic import. Unfortunately, TypeScript
+ * will currently, unconditionally downlevel dynamic import into a require call.
+ * require calls cannot load ESM code and will result in a runtime error. To workaround
+ * this, a Function constructor is used to prevent TypeScript from changing the dynamic import.
+ * Once TypeScript provides support for keeping the dynamic import this workaround can
+ * be dropped.
+ *
+ * @param modulePath The path of the module to load.
+ * @returns A Promise that resolves to the dynamically imported module.
+ */
+function loadEsmModule(modulePath) {
+    // eslint-disable-next-line no-new-func
+    return new Function('modulePath', "return import(modulePath);")(modulePath);
+}
 /**
  * Run ngcc for converting modules to ivy format before starting storybook
  * This step is needed in order to support Ivy in storybook
  *
  * Information about Ivy can be found here https://angular.io/guide/ivy
  */
-exports.runNgcc = function () {
-    ngcc_1.process({
-        // should be async: true but does not work due to
-        // https://github.com/storybookjs/storybook/pull/11157/files#r615413803
-        async: false,
-        basePath: path.join(process.cwd(), 'node_modules'),
-        createNewEntryPointFormats: true,
-        compileAllFormats: false,
+exports.runNgcc = function () { return __awaiter(void 0, void 0, void 0, function () {
+    var ngcc, error_1;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                _a.trys.push([0, 2, , 4]);
+                return [4 /*yield*/, Promise.resolve().then(function () { return __importStar(require('@angular/compiler-cli/ngcc')); })];
+            case 1:
+                ngcc = _a.sent();
+                return [3 /*break*/, 4];
+            case 2:
+                error_1 = _a.sent();
+                return [4 /*yield*/, loadEsmModule('@angular/compiler-cli/ngcc')];
+            case 3:
+                ngcc = _a.sent();
+                return [3 /*break*/, 4];
+            case 4:
+                ngcc.process({
+                    // should be async: true but does not work due to
+                    // https://github.com/storybookjs/storybook/pull/11157/files#r615413803
+                    async: false,
+                    basePath: path.join(process.cwd(), 'node_modules'),
+                    createNewEntryPointFormats: true,
+                    compileAllFormats: false,
+                });
+                return [2 /*return*/];
+        }
     });
-};
+}); };
 exports.webpack = function (webpackConfig, options) { return __awaiter(void 0, void 0, void 0, function () {
     var angularOptions;
     return __generator(this, function (_a) {

package/dist/ts3.9/server/options.d.ts

@@ -1,3 +1,11 @@
-import { LoadOptions } from '@storybook/core-common';
+import { LoadOptions, Options as CoreOptions } from '@storybook/core-common';
+import { BuilderContext } from '@angular-devkit/architect';
+import { JsonObject } from '@angular-devkit/core';
+export declare type PresetOptions = CoreOptions & {
+    angularBrowserTarget?: string | null;
+    angularBuilderOptions?: JsonObject | null;
+    angularBuilderContext?: BuilderContext | null;
+    tsConfig?: string;
+};
 declare const _default: LoadOptions;
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/angular",
-  "version": "6.4.0-rc.0",
+  "version": "6.4.0-rc.1",
   "description": "Storybook for Angular: Develop Angular Components in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
@@ -45,17 +45,19 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.4.0-rc.0",
-    "@storybook/api": "6.4.0-rc.0",
-    "@storybook/core": "6.4.0-rc.0",
-    "@storybook/core-common": "6.4.0-rc.0",
-    "@storybook/core-events": "6.4.0-rc.0",
+    "@storybook/addons": "6.4.0-rc.1",
+    "@storybook/api": "6.4.0-rc.1",
+    "@storybook/core": "6.4.0-rc.1",
+    "@storybook/core-common": "6.4.0-rc.1",
+    "@storybook/core-events": "6.4.0-rc.1",
     "@storybook/csf": "0.0.2--canary.87bc651.0",
-    "@storybook/node-logger": "6.4.0-rc.0",
-    "@storybook/store": "6.4.0-rc.0",
+    "@storybook/node-logger": "6.4.0-rc.1",
+    "@storybook/semver": "^7.3.2",
+    "@storybook/store": "6.4.0-rc.1",
     "@types/webpack-env": "^1.16.0",
     "autoprefixer": "^9.8.6",
     "core-js": "^3.8.2",
+    "find-up": "^5.0.0",
     "fork-ts-checker-webpack-plugin": "^4.1.6",
     "global": "^4.4.0",
     "postcss": "^7.0.36",
@@ -131,5 +133,5 @@
     "access": "public"
   },
   "builders": "dist/ts3.9/builders/builders.json",
-  "gitHead": "812e75b32c7fe222b872961a83c05cc8ece36a36"
+  "gitHead": "0d79fcc7dd9f8d949c2644aefb54e77a3f932db4"
 }

package/standalone.d.ts

@@ -1,4 +1,6 @@
 import { CLIOptions, LoadOptions, BuilderOptions } from '@storybook/core-common';
+import { BuilderContext } from '@angular-devkit/architect';
+import { JsonObject } from '@angular-devkit/core';
 
 export type StandaloneOptions = Partial<
   CLIOptions &
@@ -6,6 +8,8 @@ export type StandaloneOptions = Partial<
     BuilderOptions & {
       mode?: 'static' | 'dev';
       angularBrowserTarget?: string | null;
+      angularBuilderOptions?: JsonObject;
+      angularBuilderContext?: BuilderContext | null;
       tsConfig?: string;
     }
 >;