@storybook/angular 7.0.0-alpha.6 → 7.0.0-alpha.61

package/dist/{types/server → server}/angular-read-workspace.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findAngularProjectTarget = exports.getDefaultProjectName = exports.readAngularWorkspaceConfig = void 0;
+/* eslint-disable global-require */
 const node_1 = require("@angular-devkit/core/node");
 const core_1 = require("@angular-devkit/core");
 /**
@@ -16,7 +17,6 @@ const readAngularWorkspaceConfig = async (dirToSearch) => {
          * 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({

package/dist/{types/server → server}/framework-preset-angular-cli.d.ts

@@ -1,3 +1,3 @@
 import webpack from 'webpack';
-import type { PresetOptions } from './preset-options';
+import { PresetOptions } from './preset-options';
 export declare function webpackFinal(baseConfig: webpack.Configuration, options: PresetOptions): Promise<webpack.Configuration>;

package/dist/{types/server → server}/framework-preset-angular-cli.js

@@ -30,13 +30,11 @@ exports.webpackFinal = void 0;
 const node_logger_1 = require("@storybook/node-logger");
 const architect_1 = require("@angular-devkit/architect");
 const find_up_1 = require("find-up");
-const semver_1 = __importDefault(require("@storybook/semver"));
-const ts_dedent_1 = __importDefault(require("ts-dedent"));
+const semver_1 = __importDefault(require("semver"));
+const ts_dedent_1 = require("ts-dedent");
 const core_1 = require("@angular-devkit/core");
+const angular_cli_webpack_1 = require("./angular-cli-webpack");
 const module_is_available_1 = require("./utils/module-is-available");
-const angular_cli_webpack_12_2_x_1 = require("./angular-cli-webpack-12.2.x");
-const angular_cli_webpack_13_x_x_1 = require("./angular-cli-webpack-13.x.x");
-const angular_cli_webpack_older_1 = require("./angular-cli-webpack-older");
 const angular_read_workspace_1 = require("./angular-read-workspace");
 async function webpackFinal(baseConfig, options) {
     if (!(0, module_is_available_1.moduleIsAvailable)('@angular-devkit/build-angular')) {
@@ -55,7 +53,7 @@ async function webpackFinal(baseConfig, options) {
                 const builderContext = getBuilderContext(_options);
                 const builderOptions = await getBuilderOptions(_options, builderContext);
                 const legacyDefaultOptions = await getLegacyDefaultBuildOptions(_options);
-                return (0, angular_cli_webpack_13_x_x_1.getWebpackConfig)(_baseConfig, {
+                return (0, angular_cli_webpack_1.getWebpackConfig)(_baseConfig, {
                     builderOptions: {
                         watch: options.configType === 'DEVELOPMENT',
                         ...legacyDefaultOptions,
@@ -65,23 +63,6 @@ async function webpackFinal(baseConfig, options) {
                 });
             },
         },
-        {
-            info: '=> Loading angular-cli config for angular 12.2.x',
-            condition: semver_1.default.satisfies(angularCliVersion, '12.2.x') && options.angularBuilderContext,
-            getWebpackConfig: async (_baseConfig, _options) => {
-                const builderContext = getBuilderContext(_options);
-                const builderOptions = await getBuilderOptions(_options, builderContext);
-                return (0, angular_cli_webpack_12_2_x_1.getWebpackConfig)(_baseConfig, {
-                    builderOptions,
-                    builderContext,
-                });
-            },
-        },
-        {
-            info: '=> Loading angular-cli config for angular lower than 12.2.0',
-            condition: true,
-            getWebpackConfig: angular_cli_webpack_older_1.getWebpackConfig,
-        },
     ];
     const webpackGetter = webpackGetterByVersions.find((wg) => wg.condition);
     node_logger_1.logger.info(webpackGetter.info);
@@ -139,7 +120,7 @@ async function getLegacyDefaultBuildOptions(options) {
         // Not use legacy way with builder (`angularBrowserTarget` is defined or null with builder and undefined without)
         return {};
     }
-    node_logger_1.logger.warn((0, ts_dedent_1.default) `Your Storybook startup uses a solution that will not be supported in version 7.0. 
+    node_logger_1.logger.warn((0, ts_dedent_1.dedent) `Your Storybook startup uses a solution that will not be supported in version 7.0. 
             You must use angular builder to have an explicit configuration on the project used in angular.json
             Read more at:
             - https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#sb-angular-builder)

package/dist/server/framework-preset-angular-cli.test.d.ts

@@ -0,0 +1 @@
+export {};