@storybook/angular 8.2.0-alpha.8 → 8.2.0-beta.0

package/.eslintrc.js

@@ -5,4 +5,12 @@ module.exports = {
       { prefer: 'no-type-imports', disallowTypeAnnotations: false },
     ],
   },
+  overrides: [
+    {
+      files: ['template/**/*.*'],
+      rules: {
+        'import/no-extraneous-dependencies': 'off',
+      },
+    },
+  ],
 };

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

@@ -1,7 +1,7 @@
 import { BuilderOutput } from '@angular-devkit/architect';
 import { JsonObject } from '@angular-devkit/core';
 import { StylePreprocessorOptions } from '@angular-devkit/build-angular';
-import { CLIOptions } from '@storybook/types';
+import { CLIOptions } from 'storybook/internal/types';
 import { AssetPattern, SourceMapUnion, StyleElement } from '@angular-devkit/build-angular/src/builders/browser/schema';
 export type StorybookBuilderOptions = JsonObject & {
     browserTarget?: string | null;

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

@@ -4,13 +4,13 @@ const architect_1 = require("@angular-devkit/architect");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const find_up_1 = require("find-up");
-const read_pkg_up_1 = require("read-pkg-up");
-const core_common_1 = require("@storybook/core-common");
-const telemetry_1 = require("@storybook/telemetry");
-const core_server_1 = require("@storybook/core-server");
+const fd_package_json_1 = require("fd-package-json");
+const common_1 = require("storybook/internal/common");
+const telemetry_1 = require("storybook/internal/telemetry");
+const core_server_1 = require("storybook/internal/core-server");
 const run_compodoc_1 = require("../utils/run-compodoc");
 const error_handler_1 = require("../utils/error-handler");
-(0, telemetry_1.addToGlobalContext)('cliVersion', core_common_1.versions.storybook);
+(0, telemetry_1.addToGlobalContext)('cliVersion', common_1.versions.storybook);
 const commandBuilder = (options, context) => {
     const builder = (0, rxjs_1.from)(setup(options, context)).pipe((0, operators_1.switchMap)(({ tsConfig }) => {
         const docTSConfig = (0, find_up_1.sync)('tsconfig.doc.json', { cwd: options.configDir });
@@ -19,14 +19,14 @@ const commandBuilder = (options, context) => {
             : (0, rxjs_1.of)({});
         return runCompodoc$.pipe((0, operators_1.mapTo)({ tsConfig }));
     }), (0, operators_1.map)(({ tsConfig }) => {
-        (0, core_common_1.getEnvConfig)(options, {
+        (0, common_1.getEnvConfig)(options, {
             staticDir: 'SBCONFIG_STATIC_DIR',
             outputDir: 'SBCONFIG_OUTPUT_DIR',
             configDir: 'SBCONFIG_CONFIG_DIR',
         });
         const { browserTarget, stylePreprocessorOptions, styles, configDir, docs, loglevel, test, outputDir, quiet, enableProdMode = true, webpackStatsJson, statsJson, debugWebpack, disableTelemetry, assets, previewUrl, sourceMap = false, preserveSymlinks = false, } = options;
         const standaloneOptions = {
-            packageJson: (0, read_pkg_up_1.sync)({ cwd: __dirname }).packageJson,
+            packageJson: (0, fd_package_json_1.findPackageSync)(__dirname),
             configDir,
             ...(docs ? { docs } : {}),
             loglevel,

package/dist/builders/build-storybook/index.spec.js

@@ -36,8 +36,8 @@ const buildMock = {
     buildStaticStandalone: buildStaticStandaloneMock,
     withTelemetry: (name, options, fn) => fn(),
 };
-vitest_1.vi.doMock('@storybook/core-server', () => buildMock);
-vitest_1.vi.doMock('@storybook/core-common', () => ({
+vitest_1.vi.doMock('storybook/internal/core-server', () => buildMock);
+vitest_1.vi.doMock('storybook/internal/common', () => ({
     JsPackageManagerFactory: {
         getPackageManager: () => ({
             runPackageCommand: mockRunScript,

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

@@ -1,7 +1,7 @@
 import { BuilderOutput } from '@angular-devkit/architect';
 import { JsonObject } from '@angular-devkit/core';
 import { StylePreprocessorOptions } from '@angular-devkit/build-angular';
-import { CLIOptions } from '@storybook/types';
+import { CLIOptions } from 'storybook/internal/types';
 import { AssetPattern, SourceMapUnion, StyleElement } from '@angular-devkit/build-angular/src/builders/browser/schema';
 export type StorybookBuilderOptions = JsonObject & {
     browserTarget?: string | null;

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

@@ -4,13 +4,13 @@ const architect_1 = require("@angular-devkit/architect");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const find_up_1 = require("find-up");
-const read_pkg_up_1 = require("read-pkg-up");
-const core_common_1 = require("@storybook/core-common");
-const telemetry_1 = require("@storybook/telemetry");
-const core_server_1 = require("@storybook/core-server");
+const fd_package_json_1 = require("fd-package-json");
+const common_1 = require("storybook/internal/common");
+const telemetry_1 = require("storybook/internal/telemetry");
+const core_server_1 = require("storybook/internal/core-server");
 const run_compodoc_1 = require("../utils/run-compodoc");
 const error_handler_1 = require("../utils/error-handler");
-(0, telemetry_1.addToGlobalContext)('cliVersion', core_common_1.versions.storybook);
+(0, telemetry_1.addToGlobalContext)('cliVersion', common_1.versions.storybook);
 const commandBuilder = (options, context) => {
     const builder = (0, rxjs_1.from)(setup(options, context)).pipe((0, operators_1.switchMap)(({ tsConfig }) => {
         const docTSConfig = (0, find_up_1.sync)('tsconfig.doc.json', { cwd: options.configDir });
@@ -22,7 +22,7 @@ const commandBuilder = (options, context) => {
             : (0, rxjs_1.of)({});
         return runCompodoc$.pipe((0, operators_1.mapTo)({ tsConfig }));
     }), (0, operators_1.map)(({ tsConfig }) => {
-        (0, core_common_1.getEnvConfig)(options, {
+        (0, common_1.getEnvConfig)(options, {
             port: 'SBCONFIG_PORT',
             host: 'SBCONFIG_HOSTNAME',
             staticDir: 'SBCONFIG_STATIC_DIR',
@@ -32,7 +32,7 @@ const commandBuilder = (options, context) => {
         options.port = parseInt(`${options.port}`, 10);
         const { browserTarget, stylePreprocessorOptions, styles, ci, configDir, docs, host, https, port, quiet, enableProdMode = false, smokeTest, sslCa, sslCert, sslKey, disableTelemetry, assets, initialPath, open, debugWebpack, loglevel, webpackStatsJson, statsJson, previewUrl, sourceMap = false, preserveSymlinks = false, } = options;
         const standaloneOptions = {
-            packageJson: (0, read_pkg_up_1.sync)({ cwd: __dirname }).packageJson,
+            packageJson: (0, fd_package_json_1.findPackageSync)(__dirname),
             ci,
             configDir,
             ...(docs ? { docs } : {}),

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

@@ -36,10 +36,10 @@ const buildMock = {
     buildStaticStandalone: buildStaticStandaloneMock,
     withTelemetry: (_, __, fn) => fn(),
 };
-vitest_1.vi.doMock('@storybook/core-server', () => buildMock);
+vitest_1.vi.doMock('storybook/internal/core-server', () => buildMock);
 vitest_1.vi.doMock('find-up', () => ({ sync: () => './storybook/tsconfig.ts' }));
 const mockRunScript = vitest_1.vi.fn();
-vitest_1.vi.mock('@storybook/core-common', () => ({
+vitest_1.vi.mock('storybook/internal/common', () => ({
     getEnvConfig: (options) => options,
     versions: {
         storybook: 'x.x.x',

package/dist/builders/utils/error-handler.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.errorSummary = exports.printErrorDetails = void 0;
-const node_logger_1 = require("@storybook/node-logger");
+const node_logger_1 = require("storybook/internal/node-logger");
 const ts_dedent_1 = require("ts-dedent");
 const printErrorDetails = (error) => {
     // Duplicate code for Standalone error handling

package/dist/builders/utils/run-compodoc.js

@@ -26,7 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.runCompodoc = void 0;
 const rxjs_1 = require("rxjs");
 const path = __importStar(require("path"));
-const core_common_1 = require("@storybook/core-common");
+const common_1 = require("storybook/internal/common");
 const hasTsConfigArg = (args) => args.indexOf('-p') !== -1;
 const hasOutputArg = (args) => args.indexOf('-d') !== -1 || args.indexOf('--output') !== -1;
 // path.relative is necessary to workaround a compodoc issue with
@@ -42,7 +42,7 @@ const runCompodoc = ({ compodocArgs, tsconfig }, context) => {
             ...(hasOutputArg(compodocArgs) ? [] : ['-d', `${context.workspaceRoot || '.'}`]),
             ...compodocArgs,
         ];
-        const packageManager = core_common_1.JsPackageManagerFactory.getPackageManager();
+        const packageManager = common_1.JsPackageManagerFactory.getPackageManager();
         try {
             const stdout = packageManager.runPackageCommandSync('compodoc', finalCompodocArgs, context.workspaceRoot, 'inherit');
             context.logger.info(stdout);

package/dist/builders/utils/run-compodoc.spec.js

@@ -5,7 +5,7 @@ const vitest_1 = require("vitest");
 const operators_1 = require("rxjs/operators");
 const run_compodoc_1 = require("./run-compodoc");
 const mockRunScript = vitest_1.vi.fn();
-vitest_1.vi.mock('@storybook/core-common', () => ({
+vitest_1.vi.mock('storybook/internal/common', () => ({
     JsPackageManagerFactory: {
         getPackageManager: () => ({
             runPackageCommandSync: mockRunScript,

package/dist/builders/utils/standalone-options.d.ts

@@ -1,6 +1,6 @@
 import { BuilderContext } from '@angular-devkit/architect';
 import { AssetPattern, SourceMapUnion, StyleElement, StylePreprocessorOptions } from '@angular-devkit/build-angular/src/builders/browser/schema';
-import { LoadOptions, CLIOptions, BuilderOptions } from '@storybook/types';
+import { LoadOptions, CLIOptions, BuilderOptions } from 'storybook/internal/types';
 export type StandaloneOptions = CLIOptions & LoadOptions & BuilderOptions & {
     mode?: 'static' | 'dev';
     enableProdMode: boolean;

package/dist/client/angular-beta/AbstractRenderer.d.ts

@@ -18,7 +18,6 @@ export declare abstract class AbstractRenderer {
     static resetApplications(domNode?: HTMLElement): void;
     protected previousStoryRenderInfo: Map<HTMLElement, StoryRenderInfo>;
     protected storyProps$: Subject<ICollection | undefined>;
-    constructor();
     protected abstract beforeFullRender(domNode?: HTMLElement): Promise<void>;
     /**
      * Bootstrap main angular module with main component or send only new `props` with storyProps$

package/dist/client/angular-beta/AbstractRenderer.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractRenderer = exports.STORY_UID_ATTRIBUTE = void 0;
-const core_1 = require("@angular/core");
 const platform_browser_1 = require("@angular/platform-browser");
 const rxjs_1 = require("rxjs");
 const telejson_1 = require("telejson");
@@ -18,6 +17,9 @@ const applicationRefs = new Map();
  */
 exports.STORY_UID_ATTRIBUTE = 'data-sb-story-uid';
 class AbstractRenderer {
+    constructor() {
+        this.previousStoryRenderInfo = new Map();
+    }
     /**
      * Wait and destroy the platform
      */
@@ -28,18 +30,6 @@ class AbstractRenderer {
             }
         });
     }
-    constructor() {
-        this.previousStoryRenderInfo = new Map();
-        if (typeof NODE_ENV === 'string' && NODE_ENV !== 'development') {
-            try {
-                // platform should be set after enableProdMode()
-                (0, core_1.enableProdMode)();
-            }
-            catch (e) {
-                console.debug(e);
-            }
-        }
-    }
     /**
      * Bootstrap main angular module with main component or send only new `props` with storyProps$
      *

package/dist/client/angular-beta/ComputesTemplateFromComponent.d.ts

@@ -1,5 +1,5 @@
 import { Type } from '@angular/core';
-import { ArgTypes } from '@storybook/types';
+import { ArgTypes } from 'storybook/internal/types';
 import { ICollection } from '../types';
 /**
  * Converts a component into a template with inputs/outputs present in initial props

package/dist/client/angular-beta/DocsRenderer.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DocsRenderer = void 0;
-const preview_api_1 = require("@storybook/preview-api");
-const core_events_1 = require("@storybook/core-events");
+const preview_api_1 = require("storybook/internal/preview-api");
+const core_events_1 = require("storybook/internal/core-events");
 const StoryUID_1 = require("./utils/StoryUID");
 const AbstractRenderer_1 = require("./AbstractRenderer");
 class DocsRenderer extends AbstractRenderer_1.AbstractRenderer {

package/dist/client/angular-beta/utils/PropertyExtractor.js

@@ -1,7 +1,4 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PropertyExtractor = exports.uniqueArray = exports.REMOVED_MODULES = exports.reflectionCapabilities = void 0;
@@ -9,7 +6,7 @@ const common_1 = require("@angular/common");
 const core_1 = require("@angular/core");
 const platform_browser_1 = require("@angular/platform-browser");
 const animations_1 = require("@angular/platform-browser/animations");
-const ts_dedent_1 = __importDefault(require("ts-dedent"));
+const ts_dedent_1 = require("ts-dedent");
 const NgModulesAnalyzer_1 = require("./NgModulesAnalyzer");
 exports.reflectionCapabilities = new core_1.ɵReflectionCapabilities();
 exports.REMOVED_MODULES = new core_1.InjectionToken('REMOVED_MODULES');
@@ -60,7 +57,7 @@ class PropertyExtractor {
     static warnImportsModuleWithProviders(propertyExtractor) {
         const hasModuleWithProvidersImport = propertyExtractor.imports.some((importedModule) => 'ngModule' in importedModule);
         if (hasModuleWithProvidersImport) {
-            console.warn((0, ts_dedent_1.default)(`
+            console.warn((0, ts_dedent_1.dedent)(`
           Storybook Warning: 
           moduleMetadata property 'imports' contains one or more ModuleWithProviders, likely the result of a 'Module.forRoot()'-style call.
           In Storybook 7.0 we use Angular's new 'bootstrapApplication' API to mount the component to the DOM, which accepts a list of providers to set up application-wide providers.
@@ -91,7 +88,7 @@ exports.PropertyExtractor = PropertyExtractor;
 _a = PropertyExtractor;
 PropertyExtractor.analyzeRestricted = (ngModule) => {
     if (ngModule === platform_browser_1.BrowserModule) {
-        console.warn((0, ts_dedent_1.default) `
+        console.warn((0, ts_dedent_1.dedent) `
           Storybook Warning:
           You have imported the "BrowserModule", which is not necessary anymore. 
           In Storybook v7.0 we are using Angular's new bootstrapApplication API to mount an Angular application to the DOM.
@@ -101,7 +98,7 @@ PropertyExtractor.analyzeRestricted = (ngModule) => {
         return [true];
     }
     if (ngModule === animations_1.BrowserAnimationsModule) {
-        console.warn((0, ts_dedent_1.default) `
+        console.warn((0, ts_dedent_1.dedent) `
           Storybook Warning:
           You have added the "BrowserAnimationsModule" to the list of "imports" in your moduleMetadata definition of your Story.
           In Storybook 7.0 we use Angular's new 'bootstrapApplication' API to mount the component to the DOM, which accepts a list of providers to set up application-wide providers.
@@ -112,7 +109,7 @@ PropertyExtractor.analyzeRestricted = (ngModule) => {
         return [true, (0, animations_1.provideAnimations)()];
     }
     if (ngModule === animations_1.NoopAnimationsModule) {
-        console.warn((0, ts_dedent_1.default) `
+        console.warn((0, ts_dedent_1.dedent) `
           Storybook Warning:
           You have added the "NoopAnimationsModule" to the list of "imports" in your moduleMetadata definition of your Story.
           In Storybook v7.0 we are using Angular's new bootstrapApplication API to mount an Angular application to the DOM, which accepts a list of providers to set up application-wide providers.

package/dist/client/decorateStory.d.ts

@@ -1,4 +1,4 @@
-import { DecoratorFunction, LegacyStoryFn } from '@storybook/types';
+import { DecoratorFunction, LegacyStoryFn } from 'storybook/internal/types';
 import { AngularRenderer } from './types';
 export default function decorateStory(mainStoryFn: LegacyStoryFn<AngularRenderer>, decorators: DecoratorFunction<AngularRenderer>[]): LegacyStoryFn<AngularRenderer>;
 export { decorateStory };

package/dist/client/decorateStory.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.decorateStory = void 0;
-const preview_api_1 = require("@storybook/preview-api");
+const preview_api_1 = require("storybook/internal/preview-api");
 const ComputesTemplateFromComponent_1 = require("./angular-beta/ComputesTemplateFromComponent");
 function decorateStory(mainStoryFn, decorators) {
     const returnDecorators = [cleanArgsDecorator, ...decorators].reduce((previousStoryFn, decorator) => (context) => {

package/dist/client/decorators.d.ts

@@ -1,6 +1,6 @@
 import { Type } from '@angular/core';
 import { ApplicationConfig } from '@angular/platform-browser';
-import { DecoratorFunction, StoryContext } from '@storybook/types';
+import { DecoratorFunction, StoryContext } from 'storybook/internal/types';
 import { ICollection, NgModuleMetadata, AngularRenderer } from './types';
 export declare const moduleMetadata: <TArgs = any>(metadata: Partial<NgModuleMetadata>) => DecoratorFunction<AngularRenderer, TArgs>;
 /**

package/dist/client/decorators.test.js

@@ -28,7 +28,12 @@ const defaultContext = {
     viewMode: 'story',
     abortSignal: undefined,
     canvasElement: undefined,
+    step: undefined,
+    context: undefined,
+    canvas: undefined,
+    mount: undefined,
 };
+defaultContext.context = defaultContext;
 class MockModule {
 }
 class MockModuleTwo {

package/dist/client/docs/compodoc.d.ts

@@ -1,4 +1,4 @@
-import { ArgTypes, SBType } from '@storybook/types';
+import { ArgTypes, SBType } from 'storybook/internal/types';
 import { Class, CompodocJson, Component, Injectable, Method, Pipe, Property, Directive } from './types';
 export declare const isMethod: (methodOrProp: Method | Property) => methodOrProp is Method;
 export declare const setCompodocJson: (compodocJson: CompodocJson) => void;
@@ -7,6 +7,6 @@ export declare const checkValidComponentOrDirective: (component: Component | Dir
 export declare const checkValidCompodocJson: (compodocJson: CompodocJson) => void;
 export declare const findComponentByName: (name: string, compodocJson: CompodocJson) => Class | Injectable | Pipe | Directive | undefined;
 export declare const extractType: (property: Property, defaultValue: any) => SBType;
-export declare const extractArgTypesFromData: (componentData: Class | Directive | Injectable | Pipe) => ArgTypes<import("@storybook/types").Args>;
-export declare const extractArgTypes: (component: Component | Directive) => ArgTypes<import("@storybook/types").Args> | null | undefined;
+export declare const extractArgTypesFromData: (componentData: Class | Directive | Injectable | Pipe) => ArgTypes<import("@storybook/csf").Args>;
+export declare const extractArgTypes: (component: Component | Directive) => ArgTypes<import("@storybook/csf").Args> | null | undefined;
 export declare const extractComponentDescription: (component: Component | Directive) => string | null | undefined;

package/dist/client/docs/compodoc.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractComponentDescription = exports.extractArgTypes = exports.extractArgTypesFromData = exports.extractType = exports.findComponentByName = exports.checkValidCompodocJson = exports.checkValidComponentOrDirective = exports.getCompodocJson = exports.setCompodocJson = exports.isMethod = void 0;
 /* eslint-disable no-underscore-dangle */
 const global_1 = require("@storybook/global");
-const client_logger_1 = require("@storybook/client-logger");
+const client_logger_1 = require("storybook/internal/client-logger");
 const isMethod = (methodOrProp) => {
     return methodOrProp.args !== undefined;
 };

package/dist/client/docs/config.d.ts

@@ -1,4 +1,4 @@
-import { Parameters, DecoratorFunction, ArgTypesEnhancer } from '@storybook/types';
+import { Parameters, DecoratorFunction, ArgTypesEnhancer } from 'storybook/internal/types';
 export declare const parameters: Parameters;
 export declare const decorators: DecoratorFunction[];
 export declare const argTypesEnhancers: ArgTypesEnhancer[];

package/dist/client/docs/config.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.argTypesEnhancers = exports.decorators = exports.parameters = void 0;
-const docs_tools_1 = require("@storybook/docs-tools");
+const docs_tools_1 = require("storybook/internal/docs-tools");
 const compodoc_1 = require("./compodoc");
 const sourceDecorator_1 = require("./sourceDecorator");
 exports.parameters = {

package/dist/client/docs/sourceDecorator.d.ts

@@ -1,4 +1,4 @@
-import { PartialStoryFn } from '@storybook/types';
+import { PartialStoryFn } from 'storybook/internal/types';
 import { StoryContext, AngularRenderer } from '../types';
 export declare const skipSourceRender: (context: StoryContext) => any;
 /**

package/dist/client/docs/sourceDecorator.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sourceDecorator = exports.skipSourceRender = void 0;
-const preview_api_1 = require("@storybook/preview-api");
-const docs_tools_1 = require("@storybook/docs-tools");
+const preview_api_1 = require("storybook/internal/preview-api");
+const docs_tools_1 = require("storybook/internal/docs-tools");
 const renderer_1 = require("../../renderer");
 const skipSourceRender = (context) => {
     const sourceParams = context?.parameters.docs?.source;
@@ -27,12 +27,18 @@ const sourceDecorator = (storyFn, context) => {
     }
     const channel = preview_api_1.addons.getChannel();
     const { props, template, userDefinedTemplate } = story;
-    const { component, argTypes } = context;
+    const { component, argTypes, parameters } = context;
     let toEmit;
     (0, preview_api_1.useEffect)(() => {
         if (toEmit) {
             const { id, unmappedArgs } = context;
-            channel.emit(docs_tools_1.SNIPPET_RENDERED, { id, args: unmappedArgs, source: toEmit, format: 'angular' });
+            const format = parameters?.docs?.source?.format ?? true;
+            channel.emit(docs_tools_1.SNIPPET_RENDERED, {
+                id,
+                args: unmappedArgs,
+                source: toEmit,
+                format: format === true ? 'angular' : format,
+            });
         }
     });
     if (component && !userDefinedTemplate) {

package/dist/client/public-types.d.ts

@@ -1,7 +1,7 @@
-import { AnnotatedStoryFn, Args, ComponentAnnotations, DecoratorFunction, LoaderFunction, StoryAnnotations, StoryContext as GenericStoryContext, StrictArgs, ProjectAnnotations } from '@storybook/types';
+import { AnnotatedStoryFn, Args, ComponentAnnotations, DecoratorFunction, LoaderFunction, StoryAnnotations, StoryContext as GenericStoryContext, StrictArgs, ProjectAnnotations } from 'storybook/internal/types';
 import * as AngularCore from '@angular/core';
 import { AngularRenderer } from './types';
-export type { Args, ArgTypes, Parameters, StrictArgs } from '@storybook/types';
+export type { Args, ArgTypes, Parameters, StrictArgs } from 'storybook/internal/types';
 export type { Parameters as AngularParameters } from './types';
 export type { AngularRenderer };
 /**

package/dist/client/render.d.ts

@@ -1,5 +1,5 @@
 import '@angular/compiler';
-import { RenderContext, ArgsStoryFn } from '@storybook/types';
+import { RenderContext, ArgsStoryFn } from 'storybook/internal/types';
 import { AngularRenderer } from './types';
 import { RendererFactory } from './angular-beta/RendererFactory';
 export declare const rendererFactory: RendererFactory;

package/dist/client/types.d.ts

@@ -1,6 +1,6 @@
 import { Provider } from '@angular/core';
 import { ApplicationConfig } from '@angular/platform-browser';
-import { Parameters as DefaultParameters, StoryContext as DefaultStoryContext, WebRenderer } from '@storybook/types';
+import { Parameters as DefaultParameters, StoryContext as DefaultStoryContext, WebRenderer } from 'storybook/internal/types';
 export interface NgModuleMetadata {
     /**
      * List of components, directives, and pipes that belong to your component.

package/dist/preset.d.ts

@@ -1,4 +1,4 @@
-import { PresetProperty } from '@storybook/types';
+import { PresetProperty } from 'storybook/internal/types';
 export declare const addons: PresetProperty<'addons'>;
 export declare const previewAnnotations: PresetProperty<'previewAnnotations'>;
 export declare const core: PresetProperty<'core'>;

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

@@ -43,7 +43,6 @@ exports.getWebpackConfig = async (baseConfig, { builderOptions, builderContext }
         // Default options
         index: 'noop-index',
         main: 'noop-main',
-        outputPath: 'noop-out',
         // Options provided by user
         ...builderOptions,
         styles: builderOptions.styles
@@ -51,7 +50,7 @@ exports.getWebpackConfig = async (baseConfig, { builderOptions, builderContext }
             .filter((style) => typeof style === 'string' || style.inject !== false),
         outputPath: typeof builderOptions.outputPath === 'string'
             ? builderOptions.outputPath
-            : builderOptions.outputPath?.base,
+            : builderOptions.outputPath?.base ?? 'noop-out',
         // Fixed options
         optimization: false,
         namedChunks: false,

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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.webpackFinal = void 0;
-const node_logger_1 = require("@storybook/node-logger");
-const server_errors_1 = require("@storybook/core-events/server-errors");
+const node_logger_1 = require("storybook/internal/node-logger");
+const server_errors_1 = require("storybook/internal/server-errors");
 const architect_1 = require("@angular-devkit/architect");
 const find_up_1 = require("find-up");
 const core_1 = require("@angular-devkit/core");

package/dist/server/framework-preset-angular-docs.d.ts

@@ -1,2 +1,2 @@
-import { PresetProperty } from '@storybook/types';
+import { PresetProperty } from 'storybook/internal/types';
 export declare const previewAnnotations: PresetProperty<'previewAnnotations'>;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.previewAnnotations = void 0;
-const docs_tools_1 = require("@storybook/docs-tools");
+const docs_tools_1 = require("storybook/internal/docs-tools");
 const previewAnnotations = (entry = [], options) => {
     if (!(0, docs_tools_1.hasDocsOrControls)(options))
         return entry;

package/dist/server/plugins/storybook-normalize-angular-entry-plugin.d.ts

@@ -1,21 +1,7 @@
 /**
- * Angular's webpack plugin @angular-devkit/build-angular/src/webpack/plugins/styles-webpack-plugin.js
- * transforms the original webpackOptions.entry point array into a structure like this:
- *
- * ```js
- * {
- *  main: {
- *    import: [...]
- *  },
- *
- *  styles: {
- *    import: [...]
- *  },
- * }
- * ```
- *
- * Storybook throws an __webpack_require__.nmd is not a function error, when another runtime bundle (styles~runtime.iframe.bundle.js) is loaded.
- * To prevent this error, we have to normalize the entry point to only generate one runtime bundle (main~runtime.iframe.bundle.js).
+ * This plugin is designed to modify the Webpack configuration for Storybook projects that use Angular,
+ * specifically to prevent multiple runtime bundle issues by merging 'main' and 'styles' entry points.
+ * It ensures that only one runtime bundle is generated to avoid '__webpack_require__.nmd is not a function' errors.
  */
 export default class StorybookNormalizeAngularEntryPlugin {
     constructor(options: any);

package/dist/server/plugins/storybook-normalize-angular-entry-plugin.js

@@ -2,42 +2,48 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const PLUGIN_NAME = 'storybook-normalize-angular-entry-plugin';
 /**
- * Angular's webpack plugin @angular-devkit/build-angular/src/webpack/plugins/styles-webpack-plugin.js
- * transforms the original webpackOptions.entry point array into a structure like this:
- *
- * ```js
- * {
- *  main: {
- *    import: [...]
- *  },
- *
- *  styles: {
- *    import: [...]
- *  },
- * }
- * ```
- *
- * Storybook throws an __webpack_require__.nmd is not a function error, when another runtime bundle (styles~runtime.iframe.bundle.js) is loaded.
- * To prevent this error, we have to normalize the entry point to only generate one runtime bundle (main~runtime.iframe.bundle.js).
+ * This plugin is designed to modify the Webpack configuration for Storybook projects that use Angular,
+ * specifically to prevent multiple runtime bundle issues by merging 'main' and 'styles' entry points.
+ * It ensures that only one runtime bundle is generated to avoid '__webpack_require__.nmd is not a function' errors.
  */
 class StorybookNormalizeAngularEntryPlugin {
     constructor(options) {
-        this.options = options;
+        this.options = options; // Store options if future configuration is needed
     }
     apply(compiler) {
         compiler.hooks.environment.tap(PLUGIN_NAME, () => {
-            const webpackOptions = compiler.options;
-            const entry = typeof webpackOptions.entry === 'function' ? webpackOptions.entry() : webpackOptions.entry;
-            webpackOptions.entry = async () => {
-                const entryResult = await entry;
-                if (entryResult.main && entryResult.styles) {
+            // Store the original entry configuration
+            const originalEntry = compiler.options.entry;
+            // Overwrite the entry configuration to normalize it
+            compiler.options.entry = async () => {
+                let entryResult;
+                // Handle the case where the original entry is a function, which could be async
+                if (typeof originalEntry === 'function') {
+                    try {
+                        // Execute the function and await its result, in case it returns a promise
+                        entryResult = await originalEntry();
+                    }
+                    catch (error) {
+                        // Log the error and re-throw it to ensure it's visible and doesn't silently fail
+                        console.error('Failed to execute the entry function:', error);
+                        throw error;
+                    }
+                }
+                else {
+                    // If the original entry is not a function, use it as is
+                    entryResult = originalEntry;
+                }
+                // Merge 'main' and 'styles' entries if both exist
+                if (entryResult && entryResult.main && entryResult.styles) {
+                    // Combine and deduplicate imports from 'main' and 'styles'
                     return {
                         main: {
                             import: Array.from(new Set([...entryResult.main.import, ...entryResult.styles.import])),
                         },
                     };
                 }
-                return entry;
+                // If not both 'main' and 'styles' are present, return the original or resolved entry result
+                return entryResult;
             };
         });
         compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {

package/dist/server/preset-options.d.ts

@@ -1,4 +1,4 @@
-import { Options as CoreOptions } from '@storybook/types';
+import { Options as CoreOptions } from 'storybook/internal/types';
 import { BuilderContext } from '@angular-devkit/architect';
 import { StylePreprocessorOptions } from '@angular-devkit/build-angular';
 import { StyleElement } from '@angular-devkit/build-angular/src/builders/browser/schema';

package/dist/types.d.ts

@@ -1,6 +1,6 @@
 import { StorybookConfig as StorybookConfigBase, TypescriptOptions as TypescriptOptionsReact } from '@storybook/core-webpack';
 import { StorybookConfigWebpack, BuilderOptions, TypescriptOptions as TypescriptOptionsBuilder } from '@storybook/builder-webpack5';
-import { CompatibleString } from '@storybook/types';
+import { CompatibleString } from 'storybook/internal/types';
 type FrameworkName = CompatibleString<'@storybook/angular'>;
 type BuilderName = CompatibleString<'@storybook/builder-webpack5'>;
 export type FrameworkOptions = AngularOptions & {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/angular",
-  "version": "8.2.0-alpha.8",
+  "version": "8.2.0-beta.0",
   "description": "Storybook for Angular: Develop Angular components in isolation with hot reloading.",
   "keywords": [
     "storybook",
@@ -37,25 +37,16 @@
     "prep": "rimraf dist && node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/tsc.ts"
   },
   "dependencies": {
-    "@storybook/builder-webpack5": "8.2.0-alpha.8",
-    "@storybook/client-logger": "8.2.0-alpha.8",
-    "@storybook/core-common": "8.2.0-alpha.8",
-    "@storybook/core-events": "8.2.0-alpha.8",
-    "@storybook/core-server": "8.2.0-alpha.8",
-    "@storybook/core-webpack": "8.2.0-alpha.8",
-    "@storybook/docs-tools": "8.2.0-alpha.8",
+    "@storybook/builder-webpack5": "8.2.0-beta.0",
+    "@storybook/core-webpack": "8.2.0-beta.0",
     "@storybook/global": "^5.0.0",
-    "@storybook/node-logger": "8.2.0-alpha.8",
-    "@storybook/preview-api": "8.2.0-alpha.8",
-    "@storybook/telemetry": "8.2.0-alpha.8",
-    "@storybook/types": "8.2.0-alpha.8",
     "@types/node": "^18.0.0",
     "@types/react": "^18.0.37",
     "@types/react-dom": "^18.0.11",
     "@types/semver": "^7.3.4",
     "@types/webpack-env": "^1.18.0",
+    "fd-package-json": "^1.2.0",
     "find-up": "^5.0.0",
-    "read-pkg-up": "^7.0.1",
     "semver": "^7.3.7",
     "telejson": "^7.2.0",
     "ts-dedent": "^2.0.0",
@@ -98,6 +89,7 @@
     "@angular/platform-browser": ">=15.0.0 < 19.0.0",
     "@angular/platform-browser-dynamic": ">=15.0.0 < 19.0.0",
     "rxjs": "^6.0.0 || ^7.4.0",
+    "storybook": "^8.2.0-beta.0",
     "typescript": "^4.0.0 || ^5.0.0",
     "zone.js": ">= 0.11.1 < 1.0.0"
   },