@storybook/angular 7.0.0-alpha.7 → 7.0.0-beta.0

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

@@ -1,2 +1,2 @@
-import { StorybookConfig } from '@storybook/core-common';
+import { StorybookConfig } from '@storybook/types';
 export declare const previewAnnotations: StorybookConfig['previewAnnotations'];

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

@@ -9,6 +9,6 @@ const docs_tools_1 = require("@storybook/docs-tools");
 const previewAnnotations = (entry = [], options) => {
     if (!(0, docs_tools_1.hasDocsOrControls)(options))
         return entry;
-    return [...entry, path_1.default.join(__dirname, '../../../dist/types/client/docs/config')];
+    return [...entry, path_1.default.join(__dirname, '../../dist/client/docs/config')];
 };
 exports.previewAnnotations = previewAnnotations;

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

@@ -1,5 +1,5 @@
 import { Configuration } from 'webpack';
-import type { PresetOptions } from './preset-options';
+import { PresetOptions } from './preset-options';
 /**
  * Run ngcc for converting modules to ivy format before starting storybook
  * This step is needed in order to support Ivy in storybook

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

@@ -39,7 +39,7 @@ const path = __importStar(require("path"));
  * @returns A Promise that resolves to the dynamically imported module.
  */
 function loadEsmModule(modulePath) {
-    // eslint-disable-next-line no-new-func
+    // eslint-disable-next-line @typescript-eslint/no-implied-eval
     return new Function('modulePath', `return import(modulePath);`)(modulePath);
 }
 /**
@@ -73,7 +73,9 @@ const webpack = async (webpackConfig, options) => {
     if (angularOptions.enableIvy === false) {
         return webpackConfig;
     }
-    (0, exports.runNgcc)();
+    if (angularOptions.enableNgcc !== false) {
+        (0, exports.runNgcc)();
+    }
     return {
         ...webpackConfig,
         resolve: {

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

@@ -0,0 +1,25 @@
+/**
+ * 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).
+ */
+export default class StorybookNormalizeAngularEntryPlugin {
+    constructor(options: any);
+    options: any;
+    apply(compiler: any): void;
+    compilation: any;
+}

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

@@ -0,0 +1,46 @@
+"use strict";
+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).
+ */
+class StorybookNormalizeAngularEntryPlugin {
+    constructor(options) {
+        this.options = options;
+    }
+    apply(compiler) {
+        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) {
+                return {
+                    main: {
+                        import: Array.from(new Set([...entryResult.main.import, ...entryResult.styles.import])),
+                    },
+                };
+            }
+            return entry;
+        };
+        compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
+            this.compilation = compilation;
+        });
+    }
+}
+exports.default = StorybookNormalizeAngularEntryPlugin;

package/dist/{types/server → server}/preset-options.d.ts

@@ -1,7 +1,7 @@
-import type { Options as CoreOptions } from '@storybook/core-common';
+import { Options as CoreOptions } from '@storybook/types';
 import { BuilderContext } from '@angular-devkit/architect';
 import { ExtraEntryPoint, StylePreprocessorOptions } from '@angular-devkit/build-angular';
-export declare type PresetOptions = CoreOptions & {
+export type PresetOptions = CoreOptions & {
     angularBrowserTarget?: string | null;
     angularBuilderOptions?: {
         styles?: ExtraEntryPoint[];

package/dist/{types/server → server}/utils/filter-out-styling-rules.d.ts

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

package/dist/{types/server → server}/utils/normalize-asset-patterns.d.ts

@@ -1,4 +1,4 @@
-import { BaseException, Path } from '@angular-devkit/core';
+import { Path, BaseException } from '@angular-devkit/core';
 import { AssetPattern } from '@angular-devkit/build-angular';
 import { AssetPatternClass } from '@angular-devkit/build-angular/src/builders/browser/schema';
 export declare class MissingAssetSourceRootException extends BaseException {

package/dist/types.d.ts

@@ -0,0 +1,29 @@
+import { StorybookConfig as StorybookConfigBase, TypescriptOptions as TypescriptOptionsReact } from '@storybook/core-webpack';
+import { StorybookConfigWebpack, BuilderOptions, TypescriptOptions as TypescriptOptionsBuilder } from '@storybook/builder-webpack5';
+type FrameworkName = '@storybook/angular';
+type BuilderName = '@storybook/builder-webpack5';
+export type FrameworkOptions = AngularOptions & {
+    builder?: BuilderOptions;
+};
+type StorybookConfigFramework = {
+    framework: FrameworkName | {
+        name: FrameworkName;
+        options: FrameworkOptions;
+    };
+    core?: StorybookConfigBase['core'] & {
+        builder?: BuilderName | {
+            name: BuilderName;
+            options: BuilderOptions;
+        };
+    };
+    typescript?: Partial<TypescriptOptionsBuilder & TypescriptOptionsReact> & StorybookConfigBase['typescript'];
+};
+/**
+ * The interface for Storybook configuration in `main.ts` files.
+ */
+export type StorybookConfig = Omit<StorybookConfigBase, keyof StorybookConfigWebpack | keyof StorybookConfigFramework> & StorybookConfigWebpack & StorybookConfigFramework;
+export interface AngularOptions {
+    enableIvy?: boolean;
+    enableNgcc?: boolean;
+}
+export {};

package/jest.config.js

@@ -1,5 +1,12 @@
+const path = require('path');
+
 module.exports = {
+  displayName: __dirname.split(path.sep).slice(-2).join(path.posix.sep),
   preset: 'jest-preset-angular',
   setupFilesAfterEnv: ['<rootDir>/setup-jest.ts'],
-  transformIgnorePatterns: ['^.+\\.js$'],
+  transformIgnorePatterns: ['/node_modules/(?!@angular|rxjs|nanoid|uuid)'],
+  snapshotFormat: {
+    escapeString: true,
+    printBasicPrototype: true,
+  },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/angular",
-  "version": "7.0.0-alpha.7",
+  "version": "7.0.0-beta.0",
   "description": "Storybook for Angular: Develop Angular components in isolation with hot reloading.",
   "keywords": [
     "storybook",
@@ -20,52 +20,44 @@
     "url": "https://opencollective.com/storybook"
   },
   "license": "MIT",
-  "main": "dist/types/index.js",
-  "module": "dist/types/index.js",
-  "types": "dist/types/index.d.ts",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "files": [
     "dist/**/*",
+    "template/**/*",
     "README.md",
     "*.js",
     "*.d.ts"
   ],
   "scripts": {
-    "prepare": "node ../../scripts/prepare.js"
+    "check": "../../../scripts/node_modules/.bin/tsc",
+    "prep": "rimraf dist && ../../../scripts/node_modules/.bin/tsc --project tsconfig.build.json && echo \"Preventing passing flags to tsc\""
   },
   "dependencies": {
-    "@storybook/addons": "7.0.0-alpha.7",
-    "@storybook/api": "7.0.0-alpha.7",
-    "@storybook/builder-webpack5": "7.0.0-alpha.7",
-    "@storybook/client-logger": "7.0.0-alpha.7",
-    "@storybook/core-client": "7.0.0-alpha.7",
-    "@storybook/core-common": "7.0.0-alpha.7",
-    "@storybook/core-events": "7.0.0-alpha.7",
-    "@storybook/core-server": "7.0.0-alpha.7",
-    "@storybook/csf": "0.0.2--canary.4566f4d.1",
-    "@storybook/docs-tools": "7.0.0-alpha.7",
-    "@storybook/node-logger": "7.0.0-alpha.7",
-    "@storybook/semver": "^7.3.2",
-    "@storybook/store": "7.0.0-alpha.7",
-    "@types/node": "^14.14.20 || ^16.0.0",
-    "@types/react": "^16.14.23",
+    "@storybook/builder-webpack5": "7.0.0-beta.0",
+    "@storybook/client-logger": "7.0.0-beta.0",
+    "@storybook/core-client": "7.0.0-beta.0",
+    "@storybook/core-common": "7.0.0-beta.0",
+    "@storybook/core-events": "7.0.0-beta.0",
+    "@storybook/core-server": "7.0.0-beta.0",
+    "@storybook/core-webpack": "7.0.0-beta.0",
+    "@storybook/docs-tools": "7.0.0-beta.0",
+    "@storybook/manager-api": "7.0.0-beta.0",
+    "@storybook/node-logger": "7.0.0-beta.0",
+    "@storybook/preview-api": "7.0.0-beta.0",
+    "@storybook/types": "7.0.0-beta.0",
+    "@types/node": "^16.0.0",
+    "@types/react": "^16.14.34",
     "@types/react-dom": "^16.9.14",
-    "autoprefixer": "^9.8.6",
+    "@types/semver": "^7.3.4",
+    "@types/webpack-env": "^1.18.0",
     "core-js": "^3.8.2",
     "find-up": "^5.0.0",
-    "fork-ts-checker-webpack-plugin": "^7.2.6",
     "global": "^4.4.0",
-    "nanoid": "^3.1.23",
-    "p-limit": "^3.1.0",
-    "postcss": "^7.0.36",
-    "postcss-loader": "^6.2.1",
-    "raw-loader": "^4.0.2",
-    "react": "^16.14.0",
-    "react-dom": "^16.14.0",
     "read-pkg-up": "^7.0.1",
-    "sass-loader": "^12.6.0",
-    "telejson": "^6.0.8",
+    "semver": "^7.3.7",
+    "telejson": "^7.0.3",
     "ts-dedent": "^2.0.0",
-    "ts-loader": "^9.2.8",
     "tsconfig-paths-webpack-plugin": "^3.5.2",
     "util-deprecate": "^1.0.2",
     "webpack": "5"
@@ -79,38 +71,41 @@
     "@angular/compiler": "^13.3.6",
     "@angular/compiler-cli": "^13.3.6",
     "@angular/core": "^13.3.6",
-    "@angular/elements": "^13.3.6",
     "@angular/forms": "^13.3.6",
     "@angular/platform-browser": "^13.3.6",
     "@angular/platform-browser-dynamic": "^13.3.6",
-    "@nrwl/workspace": "^14.1.4",
-    "@types/autoprefixer": "^9.7.2",
+    "@nrwl/workspace": "14.6.1",
+    "@types/rimraf": "^3.0.2",
     "@types/tmp": "^0.2.3",
     "cross-spawn": "^7.0.3",
-    "jest": "^27.5.1",
+    "jest": "^29.3.1",
     "jest-preset-angular": "^12.0.0",
-    "jest-specific-snapshot": "^5.0.0",
+    "jest-specific-snapshot": "^7.0.0",
+    "rimraf": "^3.0.2",
     "tmp": "^0.2.1",
-    "typescript": "~4.6.3",
-    "webpack": "5"
+    "typescript": "~4.9.3",
+    "webpack": "5",
+    "zone.js": "^0.12.0"
   },
   "peerDependencies": {
-    "@angular-devkit/architect": ">=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",
-    "@angular/core": ">=6.0.0",
-    "@angular/forms": ">=6.0.0",
-    "@angular/platform-browser": ">=6.0.0",
-    "@angular/platform-browser-dynamic": ">=6.0.0",
+    "@angular-devkit/architect": ">=0.1300.0",
+    "@angular-devkit/build-angular": ">=13.0.0",
+    "@angular-devkit/core": ">=13.0.0",
+    "@angular/cli": ">=13.0.0",
+    "@angular/common": ">=13.0.0",
+    "@angular/compiler": ">=13.0.0",
+    "@angular/compiler-cli": ">=13.0.0",
+    "@angular/core": ">=13.0.0",
+    "@angular/forms": ">=13.0.0",
+    "@angular/platform-browser": ">=13.0.0",
+    "@angular/platform-browser-dynamic": ">=13.0.0",
     "@babel/core": "*",
-    "@nrwl/workspace": ">=11.1.0",
+    "@nrwl/workspace": "14.6.1",
+    "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+    "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0",
     "rxjs": "^6.0.0 || ^7.4.0",
     "typescript": "^4.0.0",
-    "zone.js": "^0.8.29 || ^0.9.0 || ^0.10.0 || ^0.11.0"
+    "zone.js": "^0.8.29 || >= 0.9.0 < 1.0.0"
   },
   "peerDependenciesMeta": {
     "@angular/cli": {
@@ -126,6 +121,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "builders": "dist/types/builders/builders.json",
-  "gitHead": "d334cabd251cd0ed8b845a87707dc84f007d4074"
+  "builders": "dist/builders/builders.json",
+  "gitHead": "2e4ddde6a0a291266d91fe6a5ecda767bf119e70"
 }

package/preset.js

@@ -1 +1 @@
-module.exports = require('./dist/types/preset');
+module.exports = require('./dist/preset');

package/renderer.d.ts

@@ -1 +1 @@
-export * from './dist/types/renderer.d';
+export * from './dist/renderer.d';

package/renderer.js

@@ -1 +1 @@
-module.exports = require('./dist/types/renderer');
+module.exports = require('./dist/renderer');

package/template/cli/.eslintrc.json

@@ -0,0 +1,5 @@
+{
+  "rules": {
+    "@typescript-eslint/consistent-type-imports": ["error", { "disallowTypeAnnotations": false }]
+  }
+}

package/template/cli/Button.stories.ts

@@ -0,0 +1,51 @@
+import type { Meta, StoryObj } from '@storybook/angular';
+import Button from './button.component';
+
+// More on how to set up stories at: https://storybook.js.org/docs/7.0/angular/writing-stories/introduction
+const meta: Meta<Button> = {
+  title: 'Example/Button',
+  component: Button,
+  tags: ['docsPage'],
+  render: (args: Button) => ({
+    props: {
+      backgroundColor: null,
+      ...args,
+    },
+  }),
+  argTypes: {
+    backgroundColor: {
+      control: 'color',
+    },
+  },
+};
+
+export default meta;
+type Story = StoryObj<Button>;
+
+// More on writing stories with args: https://storybook.js.org/docs/7.0/angular/writing-stories/args
+export const Primary: Story = {
+  args: {
+    primary: true,
+    label: 'Button',
+  },
+};
+
+export const Secondary: Story = {
+  args: {
+    label: 'Button',
+  },
+};
+
+export const Large: Story = {
+  args: {
+    size: 'large',
+    label: 'Button',
+  },
+};
+
+export const Small: Story = {
+  args: {
+    size: 'small',
+    label: 'Button',
+  },
+};

package/template/cli/Header.stories.ts

@@ -0,0 +1,37 @@
+import { moduleMetadata } from '@storybook/angular';
+import type { Meta, StoryObj } from '@storybook/angular';
+import { CommonModule } from '@angular/common';
+
+import Button from './button.component';
+import Header from './header.component';
+
+const meta: Meta<Header> = {
+  title: 'Example/Header',
+  component: Header,
+  // This component will have an automatically generated docsPage entry: https://storybook.js.org/docs/7.0/angular/writing-docs/docs-page
+  tags: ['docsPage'],
+  render: (args) => ({ props: args }),
+  decorators: [
+    moduleMetadata({
+      declarations: [Button],
+      imports: [CommonModule],
+    }),
+  ],
+  parameters: {
+    // More on how to position stories at: https://storybook.js.org/docs/7.0/angular/configure/story-layout
+    layout: 'fullscreen',
+  },
+};
+
+export default meta;
+type Story = StoryObj<Header>;
+
+export const LoggedIn: Story = {
+  args: {
+    user: {
+      name: 'Jane Doe',
+    },
+  },
+};
+
+export const LoggedOut: Story = {};

package/template/cli/Page.stories.ts

@@ -0,0 +1,46 @@
+import type { Meta, StoryObj } from '@storybook/angular';
+import { moduleMetadata } from '@storybook/angular';
+import { within, userEvent } from '@storybook/testing-library';
+import { CommonModule } from '@angular/common';
+
+import Button from './button.component';
+import Header from './header.component';
+import Page from './page.component';
+
+const meta: Meta<Page> = {
+  title: 'Example/Page',
+  component: Page,
+  parameters: {
+    // More on how to position stories at: https://storybook.js.org/docs/7.0/angular/configure/story-layout
+    layout: 'fullscreen',
+  },
+  decorators: [
+    moduleMetadata({
+      declarations: [Button, Header],
+      imports: [CommonModule],
+    }),
+  ],
+};
+
+export default meta;
+type Story = StoryObj<Page>;
+
+export const LoggedOut: Story = {
+  render: (args: Page) => ({
+    props: args,
+  }),
+};
+
+// More on interaction testing: https://storybook.js.org/docs/7.0/angular/writing-tests/interaction-testing
+export const LoggedIn: Story = {
+  render: (args: Page) => ({
+    props: args,
+  }),
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+    const loginButton = await canvas.getByRole('button', {
+      name: /Log in/i,
+    });
+    await userEvent.click(loginButton);
+  },
+};

package/template/cli/User.ts

@@ -0,0 +1,2 @@
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface User {}

package/template/cli/button.component.ts

@@ -0,0 +1,53 @@
+import { Component, Input, Output, EventEmitter } from '@angular/core';
+
+@Component({
+  selector: 'storybook-button',
+  template: ` <button
+    type="button"
+    (click)="onClick.emit($event)"
+    [ngClass]="classes"
+    [ngStyle]="{ 'background-color': backgroundColor }"
+  >
+    {{ label }}
+  </button>`,
+  styleUrls: ['./button.css'],
+})
+export default class ButtonComponent {
+  /**
+   * Is this the principal call to action on the page?
+   */
+  @Input()
+  primary = false;
+
+  /**
+   * What background color to use
+   */
+  @Input()
+  backgroundColor?: string;
+
+  /**
+   * How large should the button be?
+   */
+  @Input()
+  size: 'small' | 'medium' | 'large' = 'medium';
+
+  /**
+   * Button contents
+   *
+   * @required
+   */
+  @Input()
+  label = 'Button';
+
+  /**
+   * Optional click handler
+   */
+  @Output()
+  onClick = new EventEmitter<Event>();
+
+  public get classes(): string[] {
+    const mode = this.primary ? 'storybook-button--primary' : 'storybook-button--secondary';
+
+    return ['storybook-button', `storybook-button--${this.size}`, mode];
+  }
+}

package/template/cli/header.component.ts

@@ -0,0 +1,75 @@
+import { Component, Input, Output, EventEmitter } from '@angular/core';
+import type { User } from './User';
+
+@Component({
+  selector: 'storybook-header',
+  template: `<header>
+    <div class="wrapper">
+      <div>
+        <svg width="32" height="32" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+          <g fill="none" fillRule="evenodd">
+            <path
+              d="M10 0h12a10 10 0 0110 10v12a10 10 0 01-10 10H10A10 10 0 010 22V10A10 10 0 0110 0z"
+              fill="#FFF"
+            />
+            <path
+              d="M5.3 10.6l10.4 6v11.1l-10.4-6v-11zm11.4-6.2l9.7 5.5-9.7 5.6V4.4z"
+              fill="#555AB9"
+            />
+            <path
+              d="M27.2 10.6v11.2l-10.5 6V16.5l10.5-6zM15.7 4.4v11L6 10l9.7-5.5z"
+              fill="#91BAF8"
+            />
+          </g>
+        </svg>
+        <h1>Acme</h1>
+      </div>
+      <div>
+        <div *ngIf="user">
+          <span class="welcome">
+            Welcome, <b>{{ user.name }}</b
+            >!
+          </span>
+          <storybook-button
+            *ngIf="user"
+            size="small"
+            (onClick)="onLogout.emit($event)"
+            label="Log out"
+          ></storybook-button>
+        </div>
+        <div *ngIf="!user">
+          <storybook-button
+            *ngIf="!user"
+            size="small"
+            class="margin-left"
+            (onClick)="onLogin.emit($event)"
+            label="Log in"
+          ></storybook-button>
+          <storybook-button
+            *ngIf="!user"
+            primary
+            size="small"
+            primary="true"
+            class="margin-left"
+            (onClick)="onCreateAccount.emit($event)"
+            label="Sign up"
+          ></storybook-button>
+        </div>
+      </div>
+    </div>
+  </header>`,
+  styleUrls: ['./header.css'],
+})
+export default class HeaderComponent {
+  @Input()
+  user: User | null = null;
+
+  @Output()
+  onLogin = new EventEmitter<Event>();
+
+  @Output()
+  onLogout = new EventEmitter<Event>();
+
+  @Output()
+  onCreateAccount = new EventEmitter<Event>();
+}