@storybook/angular 7.1.0-alpha.32 → 7.1.0-alpha.34

package/dist/builders/start-storybook/index.d.ts

@@ -11,7 +11,7 @@ export type StorybookBuilderOptions = JsonObject & {
     styles?: StyleElement[];
     stylePreprocessorOptions?: StylePreprocessorOptions;
     assets?: AssetPattern[];
-} & Pick<CLIOptions, 'port' | 'host' | 'configDir' | 'https' | 'sslCa' | 'sslCert' | 'sslKey' | 'smokeTest' | 'ci' | 'quiet' | 'disableTelemetry' | 'open' | 'docs'>;
+} & Pick<CLIOptions, 'port' | 'host' | 'configDir' | 'https' | 'sslCa' | 'sslCert' | 'sslKey' | 'smokeTest' | 'ci' | 'quiet' | 'disableTelemetry' | 'initialPath' | 'open' | 'docs'>;
 export type StorybookBuilderOutput = JsonObject & BuilderOutput & {};
 declare const _default: import("@angular-devkit/architect/src/internal").Builder<JsonObject & {
     browserTarget?: string | null | undefined;
@@ -21,5 +21,5 @@ declare const _default: import("@angular-devkit/architect/src/internal").Builder
     styles?: StyleElement[] | undefined;
     stylePreprocessorOptions?: StylePreprocessorOptions | undefined;
     assets?: AssetPattern[] | undefined;
-} & Pick<CLIOptions, "docs" | "configDir" | "quiet" | "disableTelemetry" | "port" | "host" | "https" | "sslCa" | "sslCert" | "sslKey" | "smokeTest" | "open" | "ci">>;
+} & Pick<CLIOptions, "docs" | "configDir" | "quiet" | "disableTelemetry" | "port" | "host" | "initialPath" | "https" | "sslCa" | "sslCert" | "sslKey" | "smokeTest" | "open" | "ci">>;
 export default _default;

package/dist/builders/start-storybook/index.js

@@ -30,7 +30,7 @@ const commandBuilder = (options, context) => {
         });
         // eslint-disable-next-line no-param-reassign
         options.port = parseInt(`${options.port}`, 10);
-        const { browserTarget, stylePreprocessorOptions, styles, ci, configDir, docs, host, https, port, quiet, smokeTest, sslCa, sslCert, sslKey, disableTelemetry, assets, open, } = options;
+        const { browserTarget, stylePreprocessorOptions, styles, ci, configDir, docs, host, https, port, quiet, smokeTest, sslCa, sslCert, sslKey, disableTelemetry, assets, initialPath, open, } = options;
         const standaloneOptions = {
             packageJson: (0, read_pkg_up_1.sync)({ cwd: __dirname }).packageJson,
             ci,
@@ -53,6 +53,7 @@ const commandBuilder = (options, context) => {
                 ...(assets ? { assets } : {}),
             },
             tsConfig,
+            initialPath,
             open,
         };
         return standaloneOptions;

package/dist/builders/start-storybook/schema.json

@@ -114,6 +114,10 @@
             "items": {
                 "$ref": "#/definitions/assetPattern"
             }
+        },
+        "initialPath": {
+            "type": "string",
+            "description": "URL path to be appended when visiting Storybook for the first time"
         }
     },
     "additionalProperties": false,

package/dist/server/angular-cli-webpack.js

@@ -1,10 +1,32 @@
 "use strict";
+/* eslint-disable global-require */
 // Private angular devkit stuff
 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');
 const { default: StorybookNormalizeAngularEntryPlugin, } = require('./plugins/storybook-normalize-angular-entry-plugin');
+const getAngularWebpackUtils = () => {
+    try {
+        // Angular < 16.1.0
+        const { getCommonConfig, getStylesConfig, getDevServerConfig, getTypeScriptConfig, } = require('@angular-devkit/build-angular/src/webpack/configs');
+        return {
+            getCommonConfig,
+            getStylesConfig,
+            getDevServerConfig,
+            getTypeScriptConfig,
+        };
+    }
+    catch (e) {
+        // Angular > 16.1.0
+        const { getCommonConfig, getStylesConfig, getDevServerConfig, getTypeScriptConfig, } = require('@angular-devkit/build-angular/src/tools/webpack/configs');
+        return {
+            getCommonConfig,
+            getStylesConfig,
+            getDevServerConfig,
+            getTypeScriptConfig,
+        };
+    }
+};
 /**
  * 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.
@@ -17,6 +39,7 @@ exports.getWebpackConfig = async (baseConfig, { builderOptions, builderContext }
     /**
      * Get angular-cli Webpack config
      */
+    const { getCommonConfig, getStylesConfig, getDevServerConfig, getTypeScriptConfig } = getAngularWebpackUtils();
     const { config: cliConfig } = await generateI18nBrowserWebpackConfigFromContext({
         // Default options
         index: 'noop-index',

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

@@ -24,7 +24,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.webpack = exports.runNgcc = void 0;
-const core_1 = require("@angular/core");
 const path = __importStar(require("path"));
 /**
  * Source : https://github.com/angular/angular-cli/blob/ebccb5de4a455af813c5e82483db6af20666bdbd/packages/angular_devkit/build_angular/src/utils/load-esm.ts#L23
@@ -69,9 +68,10 @@ const runNgcc = async () => {
 };
 exports.runNgcc = runNgcc;
 const webpack = async (webpackConfig, options) => {
+    const { VERSION } = await loadEsmModule('@angular/core');
     const framework = await options.presets.apply('framework');
     const angularOptions = (typeof framework === 'object' ? framework.options : {});
-    const isAngular16OrNewer = parseInt(core_1.VERSION.major, 10) >= 16;
+    const isAngular16OrNewer = parseInt(VERSION.major, 10) >= 16;
     // Default to true, if undefined
     if (angularOptions.enableIvy === false) {
         return webpackConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/angular",
-  "version": "7.1.0-alpha.32",
+  "version": "7.1.0-alpha.34",
   "description": "Storybook for Angular: Develop Angular components in isolation with hot reloading.",
   "keywords": [
     "storybook",
@@ -36,20 +36,20 @@
     "prep": "../../../scripts/prepare/tsc.ts"
   },
   "dependencies": {
-    "@storybook/builder-webpack5": "7.1.0-alpha.32",
-    "@storybook/cli": "7.1.0-alpha.32",
-    "@storybook/client-logger": "7.1.0-alpha.32",
-    "@storybook/core-common": "7.1.0-alpha.32",
-    "@storybook/core-events": "7.1.0-alpha.32",
-    "@storybook/core-server": "7.1.0-alpha.32",
-    "@storybook/core-webpack": "7.1.0-alpha.32",
-    "@storybook/docs-tools": "7.1.0-alpha.32",
+    "@storybook/builder-webpack5": "7.1.0-alpha.34",
+    "@storybook/cli": "7.1.0-alpha.34",
+    "@storybook/client-logger": "7.1.0-alpha.34",
+    "@storybook/core-common": "7.1.0-alpha.34",
+    "@storybook/core-events": "7.1.0-alpha.34",
+    "@storybook/core-server": "7.1.0-alpha.34",
+    "@storybook/core-webpack": "7.1.0-alpha.34",
+    "@storybook/docs-tools": "7.1.0-alpha.34",
     "@storybook/global": "^5.0.0",
-    "@storybook/manager-api": "7.1.0-alpha.32",
-    "@storybook/node-logger": "7.1.0-alpha.32",
-    "@storybook/preview-api": "7.1.0-alpha.32",
-    "@storybook/telemetry": "7.1.0-alpha.32",
-    "@storybook/types": "7.1.0-alpha.32",
+    "@storybook/manager-api": "7.1.0-alpha.34",
+    "@storybook/node-logger": "7.1.0-alpha.34",
+    "@storybook/preview-api": "7.1.0-alpha.34",
+    "@storybook/telemetry": "7.1.0-alpha.34",
+    "@storybook/types": "7.1.0-alpha.34",
     "@types/node": "^16.0.0",
     "@types/react": "^16.14.34",
     "@types/react-dom": "^16.9.14",

package/src/server/angular-cli-webpack.js

@@ -1,19 +1,48 @@
+/* eslint-disable global-require */
 // Private angular devkit stuff
 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');
 const {
   default: StorybookNormalizeAngularEntryPlugin,
 } = require('./plugins/storybook-normalize-angular-entry-plugin');
 
+const getAngularWebpackUtils = () => {
+  try {
+    // Angular < 16.1.0
+    const {
+      getCommonConfig,
+      getStylesConfig,
+      getDevServerConfig,
+      getTypeScriptConfig,
+    } = require('@angular-devkit/build-angular/src/webpack/configs');
+
+    return {
+      getCommonConfig,
+      getStylesConfig,
+      getDevServerConfig,
+      getTypeScriptConfig,
+    };
+  } catch (e) {
+    // Angular > 16.1.0
+    const {
+      getCommonConfig,
+      getStylesConfig,
+      getDevServerConfig,
+      getTypeScriptConfig,
+    } = require('@angular-devkit/build-angular/src/tools/webpack/configs');
+
+    return {
+      getCommonConfig,
+      getStylesConfig,
+      getDevServerConfig,
+      getTypeScriptConfig,
+    };
+  }
+};
+
 /**
  * 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.
@@ -26,6 +55,8 @@ exports.getWebpackConfig = async (baseConfig, { builderOptions, builderContext }
   /**
    * Get angular-cli Webpack config
    */
+  const { getCommonConfig, getStylesConfig, getDevServerConfig, getTypeScriptConfig } =
+    getAngularWebpackUtils();
   const { config: cliConfig } = await generateI18nBrowserWebpackConfigFromContext(
     {
       // Default options