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

package/dist/ts3.9/server/framework-preset-angular.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 __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]; } });
@@ -38,116 +27,74 @@ 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.webpack = void 0;
-var path_1 = __importDefault(require("path"));
-var semver_1 = __importDefault(require("@storybook/semver"));
-var webpack_1 = require("webpack");
-var autoprefixer_1 = __importDefault(require("autoprefixer"));
-var ts_config_1 = __importDefault(require("./ts_config"));
-var create_fork_ts_checker_plugin_1 = __importDefault(require("./create-fork-ts-checker-plugin"));
-function webpack(config, _a) {
-    var configDir = _a.configDir, angularBuilderContext = _a.angularBuilderContext;
-    return __awaiter(this, void 0, void 0, function () {
-        var angularCliVersion, error_1, tsLoaderOptions;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    _b.trys.push([0, 2, , 3]);
-                    return [4 /*yield*/, Promise.resolve().then(function () { return __importStar(require('@angular/cli')); }).then(function (m) {
-                            return semver_1.default.coerce(m.VERSION.full);
-                        })];
-                case 1:
-                    angularCliVersion = _b.sent();
-                    if ((semver_1.default.satisfies(angularCliVersion, '12.2.x') && angularBuilderContext) ||
-                        semver_1.default.satisfies(angularCliVersion, '>=13.0.0')) {
-                        return [2 /*return*/, config];
-                    }
-                    return [3 /*break*/, 3];
-                case 2:
-                    error_1 = _b.sent();
-                    return [3 /*break*/, 3];
-                case 3:
-                    tsLoaderOptions = ts_config_1.default(configDir);
-                    return [2 /*return*/, __assign(__assign({}, config), { module: __assign(__assign({}, config.module), { rules: __spreadArrays(config.module.rules, [
-                                    {
-                                        test: /\.tsx?$/,
-                                        use: [
-                                            {
-                                                loader: require.resolve('ts-loader'),
-                                                options: tsLoaderOptions,
-                                            },
-                                            { loader: path_1.default.resolve(__dirname, 'ngx-template-loader') },
-                                        ],
-                                    },
-                                    {
-                                        test: /[/\\]@angular[/\\]core[/\\].+\.js$/,
-                                        parser: { system: true },
-                                    },
-                                    {
-                                        test: /\.html$/,
-                                        loader: require.resolve('raw-loader'),
-                                        exclude: /\.async\.html$/,
-                                    },
-                                    {
-                                        test: /\.s(c|a)ss$/,
-                                        use: [
-                                            { loader: require.resolve('raw-loader') },
-                                            {
-                                                loader: require.resolve('postcss-loader'),
-                                                options: {
-                                                    postcssOptions: {
-                                                        plugins: [autoprefixer_1.default()],
-                                                    },
-                                                },
-                                            },
-                                            { loader: require.resolve('sass-loader') },
-                                        ],
-                                    },
-                                ]) }), resolve: __assign({}, config.resolve), plugins: __spreadArrays(config.plugins, [
-                                // See https://github.com/angular/angular/issues/11580#issuecomment-401127742
-                                new webpack_1.ContextReplacementPlugin(/@angular(\\|\/)core(\\|\/)(fesm5|bundles)/, path_1.default.resolve(__dirname, '..')),
-                                create_fork_ts_checker_plugin_1.default(tsLoaderOptions),
-                            ]) })];
+const path_1 = __importDefault(require("path"));
+const semver_1 = __importDefault(require("@storybook/semver"));
+const webpack_1 = require("webpack");
+const autoprefixer_1 = __importDefault(require("autoprefixer"));
+const ts_config_1 = __importDefault(require("./ts_config"));
+const create_fork_ts_checker_plugin_1 = __importDefault(require("./create-fork-ts-checker-plugin"));
+function webpack(config, { configDir, angularBuilderContext }) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            // Disable all this webpack stuff if we use angular-cli >= 12
+            // Angular cli is in charge of doing all the necessary for angular. If there is any additional configuration to add, it must be done in the preset angular-cli versioned.
+            const angularCliVersion = yield Promise.resolve().then(() => __importStar(require('@angular/cli'))).then((m) => semver_1.default.coerce(m.VERSION.full));
+            if ((semver_1.default.satisfies(angularCliVersion, '12.2.x') && angularBuilderContext) ||
+                semver_1.default.satisfies(angularCliVersion, '>=13.0.0')) {
+                return config;
             }
-        });
+        }
+        catch (error) {
+            // do nothing, continue
+        }
+        const tsLoaderOptions = ts_config_1.default(configDir);
+        return Object.assign(Object.assign({}, config), { module: Object.assign(Object.assign({}, config.module), { rules: [
+                    ...config.module.rules,
+                    {
+                        test: /\.tsx?$/,
+                        use: [
+                            {
+                                loader: require.resolve('ts-loader'),
+                                options: tsLoaderOptions,
+                            },
+                            { loader: path_1.default.resolve(__dirname, 'ngx-template-loader') },
+                        ],
+                    },
+                    {
+                        test: /[/\\]@angular[/\\]core[/\\].+\.js$/,
+                        parser: { system: true },
+                    },
+                    {
+                        test: /\.html$/,
+                        loader: require.resolve('raw-loader'),
+                        exclude: /\.async\.html$/,
+                    },
+                    {
+                        test: /\.s(c|a)ss$/,
+                        use: [
+                            { loader: require.resolve('raw-loader') },
+                            {
+                                loader: require.resolve('postcss-loader'),
+                                options: {
+                                    postcssOptions: {
+                                        plugins: [autoprefixer_1.default()],
+                                    },
+                                },
+                            },
+                            { loader: require.resolve('sass-loader') },
+                        ],
+                    },
+                ] }), resolve: Object.assign({}, config.resolve), plugins: [
+                ...config.plugins,
+                // See https://github.com/angular/angular/issues/11580#issuecomment-401127742
+                new webpack_1.ContextReplacementPlugin(/@angular(\\|\/)core(\\|\/)(fesm5|bundles)/, path_1.default.resolve(__dirname, '..')),
+                create_fork_ts_checker_plugin_1.default(tsLoaderOptions),
+            ] });
     });
 }
 exports.webpack = webpack;

package/dist/ts3.9/server/index.js

@@ -3,6 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var server_1 = require("@storybook/core/server");
-var options_1 = __importDefault(require("./options"));
+const server_1 = require("@storybook/core/server");
+const options_1 = __importDefault(require("./options"));
 server_1.buildDev(options_1.default);

package/dist/ts3.9/server/ngx-template-loader/index.js

@@ -9,38 +9,38 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 // using: regex, capture groups, and capture group variables.
-var templateUrlRegex = /templateUrl\s*:(\s*['"`](.*?)['"`]\s*([,}]))/gm;
-var stylesRegex = /styleUrls *:(\s*\[[^\]]*?\])/g;
-var stringRegex = /(['`"])((?:[^\\]\\\1|.)*?)\1/g;
-var replaceStringsWithRequires = function (string) {
-    return string.replace(stringRegex, function (match, quote, url) {
-        var newUrl = url;
+const templateUrlRegex = /templateUrl\s*:(\s*['"`](.*?)['"`]\s*([,}]))/gm;
+const stylesRegex = /styleUrls *:(\s*\[[^\]]*?\])/g;
+const stringRegex = /(['`"])((?:[^\\]\\\1|.)*?)\1/g;
+const replaceStringsWithRequires = (string) => {
+    return string.replace(stringRegex, (match, quote, url) => {
+        let newUrl = url;
         if (url.charAt(0) !== '.') {
-            newUrl = "./" + url;
+            newUrl = `./${url}`;
         }
-        var requireString = "(require('" + newUrl + "').default || require('" + newUrl + "'))";
+        const requireString = `(require('${newUrl}').default || require('${newUrl}'))`;
         // without the length check an empty style file will throw
         // "Expected 'styles' to be an array of strings"
-        return requireString + ".length ? " + requireString + " : ''";
+        return `${requireString}.length ? ${requireString} : ''`;
     });
 };
 function default_1(source) {
-    var styleProperty = 'styles';
-    var templateProperty = 'template';
+    const styleProperty = 'styles';
+    const templateProperty = 'template';
     return source
-        .replace(templateUrlRegex, function (_, templateUrlString) {
+        .replace(templateUrlRegex, (_, templateUrlString) => {
         // replace: templateUrl: './path/to/template.html'
         // with: template: require('./path/to/template.html')
         // or: templateUrl: require('./path/to/template.html')
         // if `keepUrl` query parameter is set to true.
-        return templateProperty + ":" + replaceStringsWithRequires(templateUrlString);
+        return `${templateProperty}:${replaceStringsWithRequires(templateUrlString)}`;
     })
-        .replace(stylesRegex, function (_, styleUrlsString) {
+        .replace(stylesRegex, (_, styleUrlsString) => {
         // replace: stylesUrl: ['./foo.css', "./baz.css", "./index.component.css"]
         // with: styles: [require('./foo.css'), require("./baz.css"), require("./index.component.css")]
         // or: styleUrls: [require('./foo.css'), require("./baz.css"), require("./index.component.css")]
         // if `keepUrl` query parameter is set to true.
-        return styleProperty + ":" + replaceStringsWithRequires(styleUrlsString);
+        return `${styleProperty}:${replaceStringsWithRequires(styleUrlsString)}`;
     });
 }
 exports.default = default_1;

package/dist/ts3.9/server/options.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var read_pkg_up_1 = require("read-pkg-up");
+const read_pkg_up_1 = require("read-pkg-up");
 exports.default = {
     packageJson: read_pkg_up_1.sync({ cwd: __dirname }).packageJson,
     framework: 'angular',

package/dist/ts3.9/server/preset.js

@@ -1,19 +1,10 @@
 "use strict";
-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;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addons = exports.config = void 0;
-exports.config = function (entries) {
-    if (entries === void 0) { entries = []; }
-    return __spreadArrays(entries, [
-        require.resolve('../client/preview/config'),
-    ]);
-};
+exports.config = (entries = []) => [
+    ...entries,
+    require.resolve('../client/preview/config'),
+];
 exports.addons = [
     require.resolve('./framework-preset-angular'),
     require.resolve('./framework-preset-angular-cli'),

package/dist/ts3.9/server/ts_config.js

@@ -3,9 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var fs_1 = __importDefault(require("fs"));
-var path_1 = __importDefault(require("path"));
-var node_logger_1 = require("@storybook/node-logger");
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const node_logger_1 = require("@storybook/node-logger");
 function resolveTsConfig(tsConfigPath) {
     if (fs_1.default.existsSync(tsConfigPath)) {
         node_logger_1.logger.info('=> Found custom tsconfig.json');
@@ -14,13 +14,13 @@ function resolveTsConfig(tsConfigPath) {
     return undefined;
 }
 function default_1(configDir) {
-    var tsLoaderOptions = {
+    const tsLoaderOptions = {
         transpileOnly: true,
         compilerOptions: {
             emitDecoratorMetadata: true,
         },
     };
-    var configFilePath = resolveTsConfig(path_1.default.resolve(configDir, 'tsconfig.json'));
+    const configFilePath = resolveTsConfig(path_1.default.resolve(configDir, 'tsconfig.json'));
     if (configFilePath)
         tsLoaderOptions.configFile = configFilePath;
     return tsLoaderOptions;

package/dist/ts3.9/server/utils/filter-out-styling-rules.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.filterOutStylingRules = void 0;
-var isStylingRule = function (rule) {
-    var test = rule.test;
+const isStylingRule = (rule) => {
+    const { test } = rule;
     if (!test) {
         return false;
     }
@@ -11,6 +11,6 @@ var isStylingRule = function (rule) {
     }
     return test.test('.css') || test.test('.scss') || test.test('.sass');
 };
-exports.filterOutStylingRules = function (config) {
-    return config.module.rules.filter(function (rule) { return !isStylingRule(rule); });
+exports.filterOutStylingRules = (config) => {
+    return config.module.rules.filter((rule) => !isStylingRule(rule));
 };

package/dist/ts3.9/server/utils/module-is-available.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.moduleIsAvailable = void 0;
-exports.moduleIsAvailable = function (moduleName) {
+exports.moduleIsAvailable = (moduleName) => {
     try {
         require.resolve(moduleName);
         return true;

package/dist/ts3.9/server/utils/normalize-asset-patterns.js

@@ -1,17 +1,4 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeAssetPatterns = exports.MissingAssetSourceRootException = void 0;
 /**
@@ -20,35 +7,33 @@ exports.normalizeAssetPatterns = exports.MissingAssetSourceRootException = void
  *
  * It is not possible to use the original because arguments have changed between version 6.1.* and 11.*.* of angular-cli
  */
-var fs_1 = require("fs");
-var core_1 = require("@angular-devkit/core");
-var MissingAssetSourceRootException = /** @class */ (function (_super) {
-    __extends(MissingAssetSourceRootException, _super);
-    function MissingAssetSourceRootException(path) {
-        return _super.call(this, "The " + path + " asset path must start with the project source root.") || this;
+const fs_1 = require("fs");
+const core_1 = require("@angular-devkit/core");
+class MissingAssetSourceRootException extends core_1.BaseException {
+    constructor(path) {
+        super(`The ${path} asset path must start with the project source root.`);
     }
-    return MissingAssetSourceRootException;
-}(core_1.BaseException));
+}
 exports.MissingAssetSourceRootException = MissingAssetSourceRootException;
 function normalizeAssetPatterns(assetPatterns, root, projectRoot, maybeSourceRoot) {
     // When sourceRoot is not available, we default to ${projectRoot}/src.
-    var sourceRoot = maybeSourceRoot || core_1.join(projectRoot, 'src');
-    var resolvedSourceRoot = core_1.resolve(root, sourceRoot);
+    const sourceRoot = maybeSourceRoot || core_1.join(projectRoot, 'src');
+    const resolvedSourceRoot = core_1.resolve(root, sourceRoot);
     if (assetPatterns.length === 0) {
         return [];
     }
-    return assetPatterns.map(function (assetPattern) {
+    return assetPatterns.map((assetPattern) => {
         // Normalize string asset patterns to objects.
         if (typeof assetPattern === 'string') {
-            var assetPath = core_1.normalize(assetPattern);
-            var resolvedAssetPath = core_1.resolve(root, assetPath);
+            const assetPath = core_1.normalize(assetPattern);
+            const resolvedAssetPath = core_1.resolve(root, assetPath);
             // Check if the string asset is within sourceRoot.
             if (!resolvedAssetPath.startsWith(resolvedSourceRoot)) {
                 throw new MissingAssetSourceRootException(assetPattern);
             }
-            var glob = void 0;
-            var input = void 0;
-            var isDirectory = false;
+            let glob;
+            let input;
+            let isDirectory = false;
             try {
                 isDirectory = fs_1.statSync(core_1.getSystemPath(resolvedAssetPath)).isDirectory();
             }
@@ -68,9 +53,9 @@ function normalizeAssetPatterns(assetPatterns, root, projectRoot, maybeSourceRoo
                 input = core_1.dirname(assetPath);
             }
             // Output directory for both is the relative path from source root to input.
-            var output = core_1.relative(resolvedSourceRoot, core_1.resolve(root, input));
+            const output = core_1.relative(resolvedSourceRoot, core_1.resolve(root, input));
             // Return the asset pattern in object format.
-            return { glob: glob, input: input, output: output };
+            return { glob, input, output };
         }
         // It's already an AssetPatternObject, no need to convert.
         return assetPattern;

package/dist/ts3.9/server/utils/normalize-optimization.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptimization = void 0;
-var module_is_available_1 = require("./module-is-available");
-var importAngularCliNormalizeOptimization = function () {
+const module_is_available_1 = require("./module-is-available");
+const importAngularCliNormalizeOptimization = () => {
     // First we look for webpack config according to directory structure of Angular
     // present since the version 7.2.0
     if (module_is_available_1.moduleIsAvailable('@angular-devkit/build-angular/src/utils/normalize-optimization')) {
@@ -11,7 +11,7 @@ var importAngularCliNormalizeOptimization = function () {
     }
     return undefined;
 };
-exports.normalizeOptimization = function (options) {
+exports.normalizeOptimization = (options) => {
     if (importAngularCliNormalizeOptimization()) {
         return importAngularCliNormalizeOptimization().normalizeOptimization(options);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/angular",
-  "version": "6.5.0-alpha.29",
+  "version": "6.5.0-alpha.32",
   "description": "Storybook for Angular: Develop Angular Components in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
@@ -45,15 +45,15 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.5.0-alpha.29",
-    "@storybook/api": "6.5.0-alpha.29",
-    "@storybook/core": "6.5.0-alpha.29",
-    "@storybook/core-common": "6.5.0-alpha.29",
-    "@storybook/core-events": "6.5.0-alpha.29",
+    "@storybook/addons": "6.5.0-alpha.32",
+    "@storybook/api": "6.5.0-alpha.32",
+    "@storybook/core": "6.5.0-alpha.32",
+    "@storybook/core-common": "6.5.0-alpha.32",
+    "@storybook/core-events": "6.5.0-alpha.32",
     "@storybook/csf": "0.0.2--canary.87bc651.0",
-    "@storybook/node-logger": "6.5.0-alpha.29",
+    "@storybook/node-logger": "6.5.0-alpha.32",
     "@storybook/semver": "^7.3.2",
-    "@storybook/store": "6.5.0-alpha.29",
+    "@storybook/store": "6.5.0-alpha.32",
     "@types/node": "^14.14.20 || ^16.0.0",
     "@types/webpack-env": "^1.16.0",
     "autoprefixer": "^9.8.6",
@@ -129,5 +129,5 @@
     "access": "public"
   },
   "builders": "dist/ts3.9/builders/builders.json",
-  "gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615"
+  "gitHead": "efd7c324921bb08899caa75f707574d758e61dc2"
 }

package/standalone.d.ts

@@ -1,7 +1,5 @@
 import { CLIOptions, LoadOptions, BuilderOptions } from '@storybook/core-common';
 import { BuilderContext } from '@angular-devkit/architect';
-import { JsonValue } from '@angular-devkit/core';
-import { JsonSchema } from '@angular-devkit/core/src/json/schema';
 
 export type StandaloneOptions = Partial<
   CLIOptions &
@@ -9,9 +7,9 @@ export type StandaloneOptions = Partial<
     BuilderOptions & {
       mode?: 'static' | 'dev';
       angularBrowserTarget?: string | null;
-      angularBuilderOptions?: JsonObject & {
-        styles?: ExtraEntryPoint[];
-        stylePreprocessorOptions?: StylePreprocessorOptions;
+      angularBuilderOptions?: Record<string, any> & {
+        styles?: any[];
+        stylePreprocessorOptions?: any;
       };
       angularBuilderContext?: BuilderContext | null;
       tsConfig?: string;