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

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,127 @@ 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) {
     return __awaiter(this, void 0, void 0, function () {
-        var dirToSearch, workspaceConfig, error_1, project, target, browserTarget, fondProject, angularCliWebpackConfig, error_2;
+        var angularCliVersion, webpackGetterByVersions, webpackGetter;
+        var _this = this;
         return __generator(this, function (_a) {
             switch (_a.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('@angular/cli')); }).then(function (m) { return semver_1.default.coerce(m.VERSION.full); })];
                 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)];
+                    angularCliVersion = _a.sent();
+                    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;
+    return __awaiter(this, void 0, void 0, function () {
+        var browserTargetOptions, browserTarget, builderOptions;
+        return __generator(this, function (_c) {
+            switch (_c.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 = _c.sent();
+                    _c.label = 2;
+                case 2:
+                    builderOptions = __assign(__assign(__assign({}, browserTargetOptions), options.angularBuilderOptions), { tsConfig: (_b = (_a = options.tsConfig) !== null && _a !== void 0 ? _a : find_up_1.sync('tsconfig.json', { cwd: options.configDir })) !== null && _b !== void 0 ? _b : browserTargetOptions.tsConfig });
+                    node_logger_1.logger.info("=> Using angular project with \"tsConfig:" + builderOptions.tsConfig + "\"");
+                    return [2 /*return*/, builderOptions];
+            }
+        });
+    });
 }

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

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

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

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

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

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

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

@@ -4,9 +4,5 @@ var read_pkg_up_1 = require("read-pkg-up");
 exports.default = {
     packageJson: read_pkg_up_1.sync({ cwd: __dirname }).packageJson,
     framework: 'angular',
-    frameworkPresets: [
-        require.resolve('./framework-preset-angular'),
-        require.resolve('./framework-preset-angular-cli'),
-        require.resolve('./framework-preset-angular-ivy'),
-    ],
+    frameworkPresets: [require.resolve('./preset')],
 };

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

@@ -0,0 +1,3 @@
+import type { StorybookConfig } from '@storybook/core-common';
+export declare const config: StorybookConfig['config'];
+export declare const addons: StorybookConfig['addons'];

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

@@ -0,0 +1,21 @@
+"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.addons = [
+    require.resolve('./framework-preset-angular'),
+    require.resolve('./framework-preset-angular-cli'),
+    require.resolve('./framework-preset-angular-ivy'),
+];

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

@@ -1,2 +1,2 @@
-import { Configuration, RuleSetRule } from 'webpack';
+import type { Configuration, RuleSetRule } from 'webpack';
 export declare const filterOutStylingRules: (config: Configuration) => RuleSetRule[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/angular",
-  "version": "6.4.0-beta.8",
+  "version": "6.4.0-rc.10",
   "description": "Storybook for Angular: Develop Angular Components in isolation with Hot Reloading.",
   "keywords": [
     "storybook"
@@ -45,17 +45,19 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.4.0-beta.8",
-    "@storybook/api": "6.4.0-beta.8",
-    "@storybook/core": "6.4.0-beta.8",
-    "@storybook/core-common": "6.4.0-beta.8",
-    "@storybook/core-events": "6.4.0-beta.8",
-    "@storybook/csf": "0.0.2--canary.6aca495.0",
-    "@storybook/node-logger": "6.4.0-beta.8",
-    "@storybook/store": "6.4.0-beta.8",
+    "@storybook/addons": "6.4.0-rc.10",
+    "@storybook/api": "6.4.0-rc.10",
+    "@storybook/core": "6.4.0-rc.10",
+    "@storybook/core-common": "6.4.0-rc.10",
+    "@storybook/core-events": "6.4.0-rc.10",
+    "@storybook/csf": "0.0.2--canary.87bc651.0",
+    "@storybook/node-logger": "6.4.0-rc.10",
+    "@storybook/semver": "^7.3.2",
+    "@storybook/store": "6.4.0-rc.10",
     "@types/webpack-env": "^1.16.0",
     "autoprefixer": "^9.8.6",
     "core-js": "^3.8.2",
+    "find-up": "^5.0.0",
     "fork-ts-checker-webpack-plugin": "^4.1.6",
     "global": "^4.4.0",
     "postcss": "^7.0.36",
@@ -78,6 +80,7 @@
     "@angular-devkit/architect": "~0.1102.0",
     "@angular-devkit/build-angular": "~0.1102.13",
     "@angular-devkit/core": "^11.2.13",
+    "@angular/cli": "^11.2.14",
     "@angular/common": "^11.2.14",
     "@angular/compiler": "^11.2.14",
     "@angular/compiler-cli": "^11.2.14",
@@ -96,8 +99,9 @@
   },
   "peerDependencies": {
     "@angular-devkit/architect": ">=0.8.9",
-    "@angular-devkit/build-angular": ">=0.8.9",
+    "@angular-devkit/build-angular": ">=0.8.9 || >= 12.0.0",
     "@angular-devkit/core": "^0.6.1 || >=7.0.0",
+    "@angular/cli": ">=6.0.0",
     "@angular/common": ">=6.0.0",
     "@angular/compiler": ">=6.0.0",
     "@angular/compiler-cli": ">=6.0.0",
@@ -109,11 +113,14 @@
     "@babel/core": "*",
     "@nrwl/workspace": ">=11.1.0",
     "@webcomponents/custom-elements": ">=1.4.3",
-    "rxjs": "^6.0.0",
+    "rxjs": "^6.0.0 || ^7.4.0",
     "typescript": "^3.4.0 || >=4.0.0",
     "zone.js": "^0.8.29 || ^0.9.0 || ^0.10.0 || ^0.11.0"
   },
   "peerDependenciesMeta": {
+    "@angular/cli": {
+      "optional": true
+    },
     "@angular/elements": {
       "optional": true
     },
@@ -131,5 +138,5 @@
     "access": "public"
   },
   "builders": "dist/ts3.9/builders/builders.json",
-  "gitHead": "7f1ecb08225a3f146f9d6013a89e2a6d4d3dcd11"
+  "gitHead": "5ae60fc639dfd19becda5dcf42f4e42e6f88b02f"
 }

package/preset.js

@@ -1,7 +1 @@
-function config(entry = []) {
-  return [...entry, require.resolve('./dist/esm/client/preview/config')];
-}
-
-module.exports = {
-  config,
-};
+module.exports = require('./dist/ts3.9/server/preset');

package/standalone.d.ts

@@ -1,4 +1,7 @@
 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 &
@@ -6,6 +9,11 @@ export type StandaloneOptions = Partial<
     BuilderOptions & {
       mode?: 'static' | 'dev';
       angularBrowserTarget?: string | null;
+      angularBuilderOptions?: JsonObject & {
+        styles?: ExtraEntryPoint[];
+        stylePreprocessorOptions?: StylePreprocessorOptions;
+      };
+      angularBuilderContext?: BuilderContext | null;
       tsConfig?: string;
     }
 >;

package/types-7-0.d.ts

@@ -0,0 +1 @@
+export * from './dist/ts3.9/client/preview/types-7-0.d';