@storybook/angular 6.5.0-alpha.29 → 6.5.0-alpha.32

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 });
 }

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

@@ -5,17 +5,6 @@
  *
  * It uses code block of angular cli to extract parts of webpack configuration
  */
-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 __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]; } });
@@ -44,53 +33,19 @@ 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.extractAngularCliWebpackConfig = void 0;
-var path_1 = __importDefault(require("path"));
-var core_1 = require("@angular-devkit/core");
-var node_1 = require("@angular-devkit/core/node");
-var module_is_available_1 = require("./utils/module-is-available");
-var normalize_asset_patterns_1 = require("./utils/normalize-asset-patterns");
-var normalize_optimization_1 = require("./utils/normalize-optimization");
-var importAngularCliWebpackConfigGenerator = function () {
-    var angularWebpackConfig;
+const path_1 = __importDefault(require("path"));
+const core_1 = require("@angular-devkit/core");
+const node_1 = require("@angular-devkit/core/node");
+const module_is_available_1 = require("./utils/module-is-available");
+const normalize_asset_patterns_1 = require("./utils/normalize-asset-patterns");
+const normalize_optimization_1 = require("./utils/normalize-optimization");
+const importAngularCliWebpackConfigGenerator = () => {
+    let angularWebpackConfig;
     // First we look for webpack config according to directory structure of Angular 11
     if (module_is_available_1.moduleIsAvailable('@angular-devkit/build-angular/src/webpack/configs')) {
         // eslint-disable-next-line global-require
@@ -109,7 +64,7 @@ var importAngularCliWebpackConfigGenerator = function () {
         getStylesConfig: angularWebpackConfig.getStylesConfig,
     };
 };
-var importAngularCliReadTsconfigUtil = function () {
+const importAngularCliReadTsconfigUtil = () => {
     // First we look for webpack config according to directory structure of Angular 11
     if (module_is_available_1.moduleIsAvailable('@angular-devkit/build-angular/src/utils/read-tsconfig')) {
         // eslint-disable-next-line global-require
@@ -122,92 +77,76 @@ var importAngularCliReadTsconfigUtil = function () {
     }
     throw new Error('ReadTsconfig not found in "@angular-devkit/build-angular"');
 };
-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:
-                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(', ') + "\"");
-                }
-                workspaceRootNormalized = core_1.normalize(dirToSearch);
-                projectRootNormalized = core_1.resolve(workspaceRootNormalized, core_1.normalize(project.root || ''));
-                sourceRootNormalized = project.sourceRoot
-                    ? core_1.resolve(workspaceRootNormalized, core_1.normalize(project.sourceRoot))
-                    : undefined;
-                tsConfigPath = path_1.default.resolve(core_1.getSystemPath(workspaceRootNormalized), projectBuildOptions.tsConfig);
-                tsConfig = importAngularCliReadTsconfigUtil().readTsconfig(tsConfigPath);
-                return [4 /*yield*/, Promise.resolve().then(function () { return __importStar(require('typescript')); })];
-            case 1:
-                ts = _a.sent();
-                scriptTarget = tsConfig.options.target || ts.ScriptTarget.ES5;
-                buildOptions = __assign(__assign({ 
-                    // Default options
-                    budgets: [], fileReplacements: [], main: '', outputPath: 'dist/storybook-angular', scripts: [], sourceMap: {}, styles: [], lazyModules: [] }, projectBuildOptions), { assets: normalize_asset_patterns_1.normalizeAssetPatterns(projectBuildOptions.assets || [], workspaceRootNormalized, projectRootNormalized, sourceRootNormalized), optimization: normalize_optimization_1.normalizeOptimization(projectBuildOptions.optimization), 
-                    // Forced options
-                    statsJson: false, forkTypeChecker: false });
-                return [2 /*return*/, {
-                        root: core_1.getSystemPath(workspaceRootNormalized),
-                        // The dependency of `@angular-devkit/build-angular` to `@angular-devkit/core` is not exactly the same version as the one for storybook (node modules of node modules ^^)
-                        logger: node_1.createConsoleLogger(),
-                        projectRoot: core_1.getSystemPath(projectRootNormalized),
-                        sourceRoot: sourceRootNormalized ? core_1.getSystemPath(sourceRootNormalized) : undefined,
-                        buildOptions: buildOptions,
-                        tsConfig: tsConfig,
-                        tsConfigPath: tsConfigPath,
-                        scriptTarget: scriptTarget,
-                    }];
+const buildWebpackConfigOptions = (dirToSearch, project, target, confName) => __awaiter(void 0, void 0, void 0, function* () {
+    let 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];
+    }
+    const projectBuildOptions = Object.assign(Object.assign({}, target.options), conf);
+    const requiredOptions = ['tsConfig'];
+    if (!requiredOptions.every((key) => !!projectBuildOptions[key])) {
+        throw new Error(`Missing required options in project target. Check "${requiredOptions.join(', ')}"`);
+    }
+    const workspaceRootNormalized = core_1.normalize(dirToSearch);
+    const projectRootNormalized = core_1.resolve(workspaceRootNormalized, core_1.normalize(project.root || ''));
+    const sourceRootNormalized = project.sourceRoot
+        ? core_1.resolve(workspaceRootNormalized, core_1.normalize(project.sourceRoot))
+        : undefined;
+    const tsConfigPath = path_1.default.resolve(core_1.getSystemPath(workspaceRootNormalized), projectBuildOptions.tsConfig);
+    const tsConfig = importAngularCliReadTsconfigUtil().readTsconfig(tsConfigPath);
+    const ts = yield Promise.resolve().then(() => __importStar(require('typescript')));
+    const scriptTarget = tsConfig.options.target || ts.ScriptTarget.ES5;
+    const buildOptions = Object.assign(Object.assign({ 
+        // Default options
+        budgets: [], fileReplacements: [], main: '', outputPath: 'dist/storybook-angular', scripts: [], sourceMap: {}, styles: [], lazyModules: [] }, projectBuildOptions), { assets: normalize_asset_patterns_1.normalizeAssetPatterns(projectBuildOptions.assets || [], workspaceRootNormalized, projectRootNormalized, sourceRootNormalized), optimization: normalize_optimization_1.normalizeOptimization(projectBuildOptions.optimization), 
+        // Forced options
+        statsJson: false, forkTypeChecker: false });
+    return {
+        root: core_1.getSystemPath(workspaceRootNormalized),
+        // The dependency of `@angular-devkit/build-angular` to `@angular-devkit/core` is not exactly the same version as the one for storybook (node modules of node modules ^^)
+        logger: node_1.createConsoleLogger(),
+        projectRoot: core_1.getSystemPath(projectRootNormalized),
+        sourceRoot: sourceRootNormalized ? core_1.getSystemPath(sourceRootNormalized) : undefined,
+        buildOptions,
+        tsConfig,
+        tsConfigPath,
+        scriptTarget,
+    };
+});
 /**
  * Uses angular cli to extract webpack configuration.
  * The `AngularCliWebpackConfig` type lists the parts used by storybook
  */
 function extractAngularCliWebpackConfig(dirToSearch, project, target, confName) {
     var _a;
-    return __awaiter(this, void 0, void 0, function () {
-        var _b, getCommonConfig, getStylesConfig, webpackConfigOptions, cliCommonConfig, cliStyleConfig;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0:
-                    _b = importAngularCliWebpackConfigGenerator(), getCommonConfig = _b.getCommonConfig, getStylesConfig = _b.getStylesConfig;
-                    return [4 /*yield*/, buildWebpackConfigOptions(dirToSearch, project, target, confName)];
-                case 1:
-                    webpackConfigOptions = _c.sent();
-                    cliCommonConfig = getCommonConfig(webpackConfigOptions);
-                    cliStyleConfig = getStylesConfig(webpackConfigOptions);
-                    return [2 /*return*/, {
-                            cliCommonWebpackConfig: {
-                                plugins: cliCommonConfig.plugins,
-                                resolve: {
-                                    modules: (_a = cliCommonConfig.resolve) === null || _a === void 0 ? void 0 : _a.modules,
-                                },
-                                resolveLoader: cliCommonConfig.resolveLoader,
-                            },
-                            cliStyleWebpackConfig: {
-                                entry: cliStyleConfig.entry,
-                                module: {
-                                    rules: __spreadArrays(cliStyleConfig.module.rules),
-                                },
-                                plugins: cliStyleConfig.plugins,
-                            },
-                            tsConfigPath: webpackConfigOptions.tsConfigPath,
-                        }];
-            }
-        });
+    return __awaiter(this, void 0, void 0, function* () {
+        const { getCommonConfig, getStylesConfig } = importAngularCliWebpackConfigGenerator();
+        const webpackConfigOptions = yield buildWebpackConfigOptions(dirToSearch, project, target, confName);
+        const cliCommonConfig = getCommonConfig(webpackConfigOptions);
+        const cliStyleConfig = getStylesConfig(webpackConfigOptions);
+        return {
+            cliCommonWebpackConfig: {
+                plugins: cliCommonConfig.plugins,
+                resolve: {
+                    modules: (_a = cliCommonConfig.resolve) === null || _a === void 0 ? void 0 : _a.modules,
+                },
+                resolveLoader: cliCommonConfig.resolveLoader,
+            },
+            cliStyleWebpackConfig: {
+                entry: cliStyleConfig.entry,
+                module: {
+                    rules: [...cliStyleConfig.module.rules],
+                },
+                plugins: cliStyleConfig.plugins,
+            },
+            tsConfigPath: webpackConfigOptions.tsConfigPath,
+        };
     });
 }
 exports.extractAngularCliWebpackConfig = extractAngularCliWebpackConfig;

package/dist/ts3.9/server/angular-read-workspace.js

@@ -8,85 +8,51 @@ 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 };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findAngularProjectTarget = exports.getDefaultProjectName = exports.readAngularWorkspaceConfig = void 0;
-var node_1 = require("@angular-devkit/core/node");
-var core_1 = require("@angular-devkit/core");
+const node_1 = require("@angular-devkit/core/node");
+const core_1 = require("@angular-devkit/core");
 /**
  * Returns the workspace definition
  *
  * - Either from NX if it is present
  * - Either from `@angular-devkit/core` -> https://github.com/angular/angular-cli/tree/master/packages/angular_devkit/core
  */
-exports.readAngularWorkspaceConfig = function (dirToSearch) { return __awaiter(void 0, void 0, void 0, function () {
-    var host, nxWorkspace_1;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                host = core_1.workspaces.createWorkspaceHost(new node_1.NodeJsSyncHost());
-                try {
-                    /**
-                     * Apologies for the following line
-                     * If there's a better way to do it, let's do it
-                     */
-                    /* eslint-disable global-require */
-                    // catch if nx.json does not exist
-                    require('@nrwl/workspace').readNxJson();
-                    nxWorkspace_1 = require('@nrwl/workspace').readWorkspaceConfig({
-                        format: 'angularCli',
-                        path: dirToSearch,
-                    });
-                    // Use the workspace version of nx when angular looks for the angular.json file
-                    host.readFile = function (path) {
-                        if (typeof path === 'string' && path.endsWith('angular.json')) {
-                            return Promise.resolve(JSON.stringify(nxWorkspace_1));
-                        }
-                        return host.readFile(path);
-                    };
-                    host.isFile = function (path) {
-                        if (typeof path === 'string' && path.endsWith('angular.json')) {
-                            return Promise.resolve(true);
-                        }
-                        return host.isFile(path);
-                    };
-                }
-                catch (e) {
-                    // Ignore if the client does not use NX
-                }
-                return [4 /*yield*/, core_1.workspaces.readWorkspace(dirToSearch, host)];
-            case 1: return [2 /*return*/, (_a.sent()).workspace];
-        }
-    });
-}); };
-exports.getDefaultProjectName = function (workspace) {
-    var environmentProjectName = process.env.STORYBOOK_ANGULAR_PROJECT;
+exports.readAngularWorkspaceConfig = (dirToSearch) => __awaiter(void 0, void 0, void 0, function* () {
+    const host = core_1.workspaces.createWorkspaceHost(new node_1.NodeJsSyncHost());
+    try {
+        /**
+         * Apologies for the following line
+         * If there's a better way to do it, let's do it
+         */
+        /* eslint-disable global-require */
+        // catch if nx.json does not exist
+        require('@nrwl/workspace').readNxJson();
+        const nxWorkspace = require('@nrwl/workspace').readWorkspaceConfig({
+            format: 'angularCli',
+            path: dirToSearch,
+        });
+        // Use the workspace version of nx when angular looks for the angular.json file
+        host.readFile = (path) => {
+            if (typeof path === 'string' && path.endsWith('angular.json')) {
+                return Promise.resolve(JSON.stringify(nxWorkspace));
+            }
+            return host.readFile(path);
+        };
+        host.isFile = (path) => {
+            if (typeof path === 'string' && path.endsWith('angular.json')) {
+                return Promise.resolve(true);
+            }
+            return host.isFile(path);
+        };
+    }
+    catch (e) {
+        // Ignore if the client does not use NX
+    }
+    return (yield core_1.workspaces.readWorkspace(dirToSearch, host)).workspace;
+});
+exports.getDefaultProjectName = (workspace) => {
+    const environmentProjectName = process.env.STORYBOOK_ANGULAR_PROJECT;
     if (environmentProjectName) {
         return environmentProjectName;
     }
@@ -96,23 +62,23 @@ exports.getDefaultProjectName = function (workspace) {
     if (workspace.extensions.defaultProject) {
         return workspace.extensions.defaultProject;
     }
-    var firstProjectName = workspace.projects.keys().next().value;
+    const firstProjectName = workspace.projects.keys().next().value;
     if (firstProjectName) {
         return firstProjectName;
     }
     throw new Error('No angular projects found');
 };
-exports.findAngularProjectTarget = function (workspace, projectName, targetName) {
+exports.findAngularProjectTarget = (workspace, projectName, targetName) => {
     if (!workspace.projects || !Object.keys(workspace.projects).length) {
         throw new Error('No angular projects found');
     }
-    var project = workspace.projects.get(projectName);
+    const project = workspace.projects.get(projectName);
     if (!project) {
-        throw new Error("\"" + projectName + "\" project is not found in angular.json");
+        throw new Error(`"${projectName}" project is not found in angular.json`);
     }
     if (!project.targets.has(targetName)) {
-        throw new Error("\"" + targetName + "\" target is not found in \"" + projectName + "\" project");
+        throw new Error(`"${targetName}" target is not found in "${projectName}" project`);
     }
-    var target = project.targets.get(targetName);
-    return { project: project, target: target };
+    const target = project.targets.get(targetName);
+    return { project, target };
 };