@storybook/angular 6.4.0-beta.8 → 6.4.0-rc.2

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/angular-devkit-build-webpack.d.ts

@@ -27,4 +27,4 @@ export declare type AngularCliWebpackConfig = {
  * Uses angular cli to extract webpack configuration.
  * The `AngularCliWebpackConfig` type lists the parts used by storybook
  */
-export declare function extractAngularCliWebpackConfig(dirToSearch: string, project: workspaces.ProjectDefinition, target: workspaces.TargetDefinition): Promise<AngularCliWebpackConfig>;
+export declare function extractAngularCliWebpackConfig(dirToSearch: string, project: workspaces.ProjectDefinition, target: workspaces.TargetDefinition, confName?: string): Promise<AngularCliWebpackConfig>;

package/dist/ts3.9/server/angular-devkit-build-webpack.js

@@ -122,12 +122,22 @@ var importAngularCliReadTsconfigUtil = function () {
     }
     throw new Error('ReadTsconfig not found in "@angular-devkit/build-angular"');
 };
-var buildWebpackConfigOptions = function (dirToSearch, project, target) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, projectBuildOptions, requiredOptions, workspaceRootNormalized, projectRootNormalized, sourceRootNormalized, tsConfigPath, tsConfig, ts, scriptTarget, buildOptions;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+var buildWebpackConfigOptions = function (dirToSearch, project, target, confName) { return __awaiter(void 0, void 0, void 0, function () {
+    var conf, projectBuildOptions, requiredOptions, workspaceRootNormalized, projectRootNormalized, sourceRootNormalized, tsConfigPath, tsConfig, ts, scriptTarget, buildOptions;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
             case 0:
-                _a = target.options, projectBuildOptions = _a === void 0 ? {} : _a;
+                conf = {};
+                if (confName) {
+                    if (!target.configurations) {
+                        throw new Error('Missing "configurations" section in project target');
+                    }
+                    if (!target.configurations[confName]) {
+                        throw new Error("Missing required configuration in project target. Check \"" + confName + "\"");
+                    }
+                    conf = target.configurations[confName];
+                }
+                projectBuildOptions = __assign(__assign({}, target.options), conf);
                 requiredOptions = ['tsConfig'];
                 if (!requiredOptions.every(function (key) { return !!projectBuildOptions[key]; })) {
                     throw new Error("Missing required options in project target. Check \"" + requiredOptions.join(', ') + "\"");
@@ -141,7 +151,7 @@ var buildWebpackConfigOptions = function (dirToSearch, project, target) { return
                 tsConfig = importAngularCliReadTsconfigUtil().readTsconfig(tsConfigPath);
                 return [4 /*yield*/, Promise.resolve().then(function () { return __importStar(require('typescript')); })];
             case 1:
-                ts = _b.sent();
+                ts = _a.sent();
                 scriptTarget = tsConfig.options.target || ts.ScriptTarget.ES5;
                 buildOptions = __assign(__assign({ 
                     // Default options
@@ -166,7 +176,7 @@ var buildWebpackConfigOptions = function (dirToSearch, project, target) { return
  * Uses angular cli to extract webpack configuration.
  * The `AngularCliWebpackConfig` type lists the parts used by storybook
  */
-function extractAngularCliWebpackConfig(dirToSearch, project, target) {
+function extractAngularCliWebpackConfig(dirToSearch, project, target, confName) {
     var _a;
     return __awaiter(this, void 0, void 0, function () {
         var _b, getCommonConfig, getStylesConfig, webpackConfigOptions, cliCommonConfig, cliStyleConfig;
@@ -174,7 +184,7 @@ function extractAngularCliWebpackConfig(dirToSearch, project, target) {
             switch (_c.label) {
                 case 0:
                     _b = importAngularCliWebpackConfigGenerator(), getCommonConfig = _b.getCommonConfig, getStylesConfig = _b.getStylesConfig;
-                    return [4 /*yield*/, buildWebpackConfigOptions(dirToSearch, project, target)];
+                    return [4 /*yield*/, buildWebpackConfigOptions(dirToSearch, project, target, confName)];
                 case 1:
                     webpackConfigOptions = _c.sent();
                     cliCommonConfig = getCommonConfig(webpackConfigOptions);

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,113 +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, 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;
-                            node_logger_1.logger.info("=> Using angular project \"" + browserTarget.project + ":" + browserTarget.target + "\" 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)];
-                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>;