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

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,11 @@
-import { LoadOptions } from '@storybook/core-common';
+import { LoadOptions, Options as CoreOptions } from '@storybook/core-common';
+import { BuilderContext } from '@angular-devkit/architect';
+import { JsonObject } from '@angular-devkit/core';
+export declare type PresetOptions = CoreOptions & {
+    angularBrowserTarget?: string | null;
+    angularBuilderOptions?: JsonObject | null;
+    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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/angular",
-  "version": "6.4.0-beta.8",
+  "version": "6.4.0-rc.2",
   "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.2",
+    "@storybook/api": "6.4.0-rc.2",
+    "@storybook/core": "6.4.0-rc.2",
+    "@storybook/core-common": "6.4.0-rc.2",
+    "@storybook/core-events": "6.4.0-rc.2",
+    "@storybook/csf": "0.0.2--canary.87bc651.0",
+    "@storybook/node-logger": "6.4.0-rc.2",
+    "@storybook/semver": "^7.3.2",
+    "@storybook/store": "6.4.0-rc.2",
     "@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",
@@ -131,5 +133,5 @@
     "access": "public"
   },
   "builders": "dist/ts3.9/builders/builders.json",
-  "gitHead": "7f1ecb08225a3f146f9d6013a89e2a6d4d3dcd11"
+  "gitHead": "16be10b522569b4b55c684e1556b91b300009bf4"
 }

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,6 @@
 import { CLIOptions, LoadOptions, BuilderOptions } from '@storybook/core-common';
+import { BuilderContext } from '@angular-devkit/architect';
+import { JsonObject } from '@angular-devkit/core';
 
 export type StandaloneOptions = Partial<
   CLIOptions &
@@ -6,6 +8,8 @@ export type StandaloneOptions = Partial<
     BuilderOptions & {
       mode?: 'static' | 'dev';
       angularBrowserTarget?: string | null;
+      angularBuilderOptions?: JsonObject;
+      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';