@storybook/angular 6.5.0-alpha.3 → 6.5.0-alpha.30

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

@@ -1,14 +1,3 @@
-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) {
@@ -18,45 +7,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
-var filterOutStylingRules = require('./utils/filter-out-styling-rules').filterOutStylingRules;
+const { generateI18nBrowserWebpackConfigFromContext, } = require('@angular-devkit/build-angular/src/utils/webpack-browser-config');
+const { getCommonConfig, getStylesConfig, getDevServerConfig, getTypeScriptConfig, } = require('@angular-devkit/build-angular/src/webpack/configs');
+const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
+const { filterOutStylingRules } = require('./utils/filter-out-styling-rules');
 /**
  * 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.
@@ -65,35 +20,41 @@ var filterOutStylingRules = require('./utils/filter-out-styling-rules').filterOu
  * @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))), plugins: [
-                            new TsconfigPathsPlugin({
-                                configFile: builderOptions.tsConfig,
-                                mainFields: ['browser', 'module', 'main'],
-                            }),
-                        ] });
-                    return [2 /*return*/, __assign(__assign({}, baseConfig), { entry: entry,
-                            module: module,
-                            plugins: plugins,
-                            resolve: resolve, resolveLoader: cliConfig.resolveLoader })];
-            }
-        });
-    });
-};
+exports.getWebpackConfig = (baseConfig, { builderOptions, builderContext }) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b, _c;
+    /**
+     * Get angular-cli Webpack config
+     */
+    const { config: cliConfig } = yield generateI18nBrowserWebpackConfigFromContext(Object.assign(Object.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, (wco) => [
+        getCommonConfig(wco),
+        getStylesConfig(wco),
+        getTypeScriptConfig ? getTypeScriptConfig(wco) : getDevServerConfig(wco),
+    ]);
+    /**
+     * Merge baseConfig Webpack with angular-cli Webpack
+     */
+    const entry = [
+        ...baseConfig.entry,
+        ...((_a = cliConfig.entry.styles) !== null && _a !== void 0 ? _a : []),
+        ...((_b = cliConfig.entry.polyfills) !== null && _b !== void 0 ? _b : []),
+    ];
+    // 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.
+    const rulesExcludingStyles = filterOutStylingRules(baseConfig);
+    const module = Object.assign(Object.assign({}, baseConfig.module), { rules: [...cliConfig.module.rules, ...rulesExcludingStyles] });
+    const plugins = [...((_c = cliConfig.plugins) !== null && _c !== void 0 ? _c : []), ...baseConfig.plugins];
+    const resolve = Object.assign(Object.assign({}, baseConfig.resolve), { modules: Array.from(new Set([...baseConfig.resolve.modules, ...cliConfig.resolve.modules])), plugins: [
+            new TsconfigPathsPlugin({
+                configFile: builderOptions.tsConfig,
+                mainFields: ['browser', 'module', 'main'],
+            }),
+        ] });
+    return Object.assign(Object.assign({}, baseConfig), { entry,
+        module,
+        plugins,
+        resolve, resolveLoader: cliConfig.resolveLoader });
+});

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

@@ -48,7 +48,7 @@ export declare function getWebpackConfig(baseConfig: webpack.Configuration, opti
     mode?: "development" | "production" | "none";
     name?: string;
     context?: string;
-    devtool?: webpack.Options.Devtool;
+    devtool?: string | boolean;
     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);
@@ -68,5 +68,6 @@ export declare function getWebpackConfig(baseConfig: webpack.Configuration, opti
     performance?: false | webpack.Options.Performance;
     parallelism?: number;
     optimization?: webpack.Options.Optimization;
+    infrastructureLogging?: webpack.Options.InfrastructureLogging;
     devServer?: import("webpack-dev-server").Configuration;
 }>;

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

@@ -1,15 +1,4 @@
 "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) {
@@ -19,138 +8,103 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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");
+const node_logger_1 = require("@storybook/node-logger");
+const tsconfig_paths_webpack_plugin_1 = __importDefault(require("tsconfig-paths-webpack-plugin"));
+const architect_1 = require("@angular-devkit/architect");
+const angular_read_workspace_1 = require("./angular-read-workspace");
+const angular_devkit_build_webpack_1 = require("./angular-devkit-build-webpack");
+const 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)];
+    return __awaiter(this, void 0, void 0, function* () {
+        const dirToSearch = process.cwd();
+        // Read angular workspace
+        let workspaceConfig;
+        try {
+            workspaceConfig = yield angular_read_workspace_1.readAngularWorkspaceConfig(dirToSearch);
+        }
+        catch (error) {
+            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 baseConfig;
+        }
+        // Find angular project target
+        let project;
+        let target;
+        let confName;
+        try {
+            // Default behavior when `angularBrowserTarget` are not explicitly defined to null
+            if (options.angularBrowserTarget !== null) {
+                const browserTarget = options.angularBrowserTarget
+                    ? architect_1.targetFromTargetString(options.angularBrowserTarget)
+                    : {
+                        configuration: undefined,
+                        project: angular_read_workspace_1.getDefaultProjectName(workspaceConfig),
+                        target: 'build',
+                    };
+                const 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 baseConfig;
+        }
+        // Use angular-cli to get some webpack config
+        let angularCliWebpackConfig;
+        try {
+            angularCliWebpackConfig = yield angular_devkit_build_webpack_1.extractAngularCliWebpackConfig(dirToSearch, project, target, confName);
+            node_logger_1.logger.info(`=> Using angular-cli webpack config`);
+        }
+        catch (error) {
+            node_logger_1.logger.error(`=> Could not get angular cli webpack config`);
+            throw error;
+        }
+        return mergeAngularCliWebpackConfig(angularCliWebpackConfig, baseConfig);
     });
 }
 exports.getWebpackConfig = getWebpackConfig;
-function mergeAngularCliWebpackConfig(_a, baseConfig) {
-    var cliCommonWebpackConfig = _a.cliCommonWebpackConfig, cliStyleWebpackConfig = _a.cliStyleWebpackConfig, tsConfigPath = _a.tsConfigPath;
+function mergeAngularCliWebpackConfig({ cliCommonWebpackConfig, cliStyleWebpackConfig, tsConfigPath }, baseConfig) {
     // 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);
+    const 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) });
+    const entry = [
+        ...baseConfig.entry,
+        ...Object.values(cliStyleWebpackConfig.entry).reduce((acc, item) => acc.concat(item), []),
+    ];
+    const module = Object.assign(Object.assign({}, baseConfig.module), { rules: [...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: [
+    const plugins = [
+        ...cliStyleWebpackConfig.plugins,
+        ...cliCommonWebpackConfig.plugins,
+        ...baseConfig.plugins,
+    ];
+    const resolve = Object.assign(Object.assign({}, baseConfig.resolve), { modules: Array.from(new Set([...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 });
+    return Object.assign(Object.assign({}, baseConfig), { entry,
+        module,
+        plugins,
+        resolve, resolveLoader: cliCommonWebpackConfig.resolveLoader });
 }