@storybook/cli 6.5.0-alpha.38 → 6.5.0-alpha.39

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (18) hide show
  1. package/dist/cjs/extract.js +7 -2
  2. package/dist/cjs/frameworks/angular/Header.stories.ts +8 -3
  3. package/dist/cjs/frameworks/angular/Page.stories.ts +12 -10
  4. package/dist/cjs/frameworks/angular/header.component.ts +30 -19
  5. package/dist/cjs/frameworks/angular/page.component.ts +13 -27
  6. package/dist/cjs/generators/baseGenerator.js +1 -1
  7. package/dist/cjs/versions.js +55 -55
  8. package/dist/esm/extract.js +7 -2
  9. package/dist/esm/frameworks/angular/Header.stories.ts +8 -3
  10. package/dist/esm/frameworks/angular/Page.stories.ts +12 -10
  11. package/dist/esm/frameworks/angular/header.component.ts +30 -19
  12. package/dist/esm/frameworks/angular/page.component.ts +13 -27
  13. package/dist/esm/generators/baseGenerator.js +1 -1
  14. package/dist/esm/versions.js +55 -55
  15. package/dist/modern/extract.js +7 -2
  16. package/dist/modern/generators/baseGenerator.js +1 -1
  17. package/dist/modern/versions.js +55 -55
  18. package/package.json +7 -7
package/dist/cjs/extract.js CHANGED
@@ -24,8 +24,13 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
24
24
  const read = async url => {
25
25
  const browser = await usePuppeteerBrowser();
26
26
  const page = await browser.newPage();
27
- await page.goto(url);
28
- await page.waitForFunction('window.__STORYBOOK_STORY_STORE__ && window.__STORYBOOK_STORY_STORE__.extract && window.__STORYBOOK_STORY_STORE__.extract()');
27
+ await page.goto(url); // we don't know whether we are running against a new or old storybook
28
+ // FIXME: add tests for both
29
+
30
+ await page.waitForFunction(`
31
+ (window.__STORYBOOK_PREVIEW__ && window.__STORYBOOK_PREVIEW__.extract && window.__STORYBOOK_PREVIEW__.extract()) ||
32
+ (window.__STORYBOOK_STORY_STORE__ && window.__STORYBOOK_STORY_STORE__.extract && window.__STORYBOOK_STORY_STORE__.extract())
33
+ `);
29
34
  const data = JSON.parse(await page.evaluate(async () => {
30
35
  // eslint-disable-next-line no-undef
31
36
  return JSON.stringify(window.__STORYBOOK_STORY_STORE__.getStoriesJsonData(), null, 2);
package/dist/cjs/frameworks/angular/Header.stories.ts CHANGED
@@ -1,7 +1,6 @@
1
1
  import { moduleMetadata } from '@storybook/angular';
2
2
  import { CommonModule } from '@angular/common';
3
- // also exported from '@storybook/angular' if you can deal with breaking changes in 6.1
4
- import { Story, Meta } from '@storybook/angular/types-6-0';
3
+ import type { Story, Meta } from '@storybook/angular';
5
4
 
6
5
  import Button from './button.component';
7
6
  import Header from './header.component';
@@ -15,6 +14,10 @@ export default {
15
14
  imports: [CommonModule],
16
15
  }),
17
16
  ],
17
+ parameters: {
18
+ // More on Story layout: https://storybook.js.org/docs/angular/configure/story-layout
19
+ layout: 'fullscreen',
20
+ },
18
21
  } as Meta;
19
22
 
20
23
  const Template: Story<Header> = (args: Header) => ({
@@ -23,7 +26,9 @@ const Template: Story<Header> = (args: Header) => ({
23
26
 
24
27
  export const LoggedIn = Template.bind({});
25
28
  LoggedIn.args = {
26
- user: {},
29
+ user: {
30
+ name: 'Jane Doe',
31
+ },
27
32
  };
28
33
 
29
34
  export const LoggedOut = Template.bind({});
package/dist/cjs/frameworks/angular/Page.stories.ts CHANGED
@@ -1,15 +1,18 @@
1
1
  import { moduleMetadata, Story, Meta } from '@storybook/angular';
2
+ import { within, userEvent } from '@storybook/testing-library';
2
3
  import { CommonModule } from '@angular/common';
3
4
 
4
5
  import Button from './button.component';
5
6
  import Header from './header.component';
6
7
  import Page from './page.component';
7
8
 
8
- import * as HeaderStories from './Header.stories';
9
-
10
9
  export default {
11
10
  title: 'Example/Page',
12
11
  component: Page,
12
+ parameters: {
13
+ // More on Story layout: https://storybook.js.org/docs/angular/configure/story-layout
14
+ layout: 'fullscreen',
15
+ },
13
16
  decorators: [
14
17
  moduleMetadata({
15
18
  declarations: [Button, Header],
@@ -22,13 +25,12 @@ const Template: Story<Page> = (args: Page) => ({
22
25
  props: args,
23
26
  });
24
27
 
25
- export const LoggedIn = Template.bind({});
26
- LoggedIn.args = {
27
- // More on composing args: https://storybook.js.org/docs/angular/writing-stories/args#args-composition
28
- ...HeaderStories.LoggedIn.args,
29
- };
30
-
31
28
  export const LoggedOut = Template.bind({});
32
- LoggedOut.args = {
33
- ...HeaderStories.LoggedOut.args,
29
+
30
+ // More on interaction testing: https://storybook.js.org/docs/angular/writing-tests/interaction-testing
31
+ export const LoggedIn = Template.bind({});
32
+ LoggedIn.play = async ({ canvasElement }) => {
33
+ const canvas = within(canvasElement);
34
+ const loginButton = await canvas.getByRole('button', { name: /Log in/i });
35
+ await userEvent.click(loginButton);
34
36
  };
package/dist/cjs/frameworks/angular/header.component.ts CHANGED
@@ -25,25 +25,36 @@ import { User } from './User';
25
25
  <h1>Acme</h1>
26
26
  </div>
27
27
  <div>
28
- <storybook-button
29
- *ngIf="user"
30
- size="small"
31
- (onClick)="onLogout.emit($event)"
32
- label="Log out"
33
- ></storybook-button>
34
- <storybook-button
35
- *ngIf="!user"
36
- size="small"
37
- (onClick)="onLogin.emit($event)"
38
- label="Log in"
39
- ></storybook-button>
40
- <storybook-button
41
- *ngIf="!user"
42
- primary
43
- size="small"
44
- (onClick)="onCreateAccount.emit($event)"
45
- label="Sign up"
46
- ></storybook-button>
28
+ <div *ngIf="user">
29
+ <span class="welcome">
30
+ Welcome, <b>{{ user.name }}</b
31
+ >!
32
+ </span>
33
+ <storybook-button
34
+ *ngIf="user"
35
+ size="small"
36
+ (onClick)="onLogout.emit($event)"
37
+ label="Log out"
38
+ ></storybook-button>
39
+ </div>
40
+ <div *ngIf="!user">
41
+ <storybook-button
42
+ *ngIf="!user"
43
+ size="small"
44
+ class="margin-left"
45
+ (onClick)="onLogin.emit($event)"
46
+ label="Log in"
47
+ ></storybook-button>
48
+ <storybook-button
49
+ *ngIf="!user"
50
+ primary
51
+ size="small"
52
+ primary="true"
53
+ class="margin-left"
54
+ (onClick)="onCreateAccount.emit($event)"
55
+ label="Sign up"
56
+ ></storybook-button>
57
+ </div>
47
58
  </div>
48
59
  </div>
49
60
  </header>`,
package/dist/cjs/frameworks/angular/page.component.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { Component, Input, Output, EventEmitter } from '@angular/core';
1
+ import { Component } from '@angular/core';
2
2
  import { User } from './User';
3
3
 
4
4
  @Component({
@@ -6,9 +6,9 @@ import { User } from './User';
6
6
  template: `<article>
7
7
  <storybook-header
8
8
  [user]="user"
9
- (onLogout)="onLogout.emit($event)"
10
- (onLogin)="onLogin.emit($event)"
11
- (onCreateAccount)="onCreateAccount.emit($event)"
9
+ (onLogout)="doLogout()"
10
+ (onLogin)="doLogin()"
11
+ (onCreateAccount)="doCreateAccount()"
12
12
  ></storybook-header>
13
13
  <section>
14
14
  <h2>Pages in Storybook</h2>
@@ -61,31 +61,17 @@ import { User } from './User';
61
61
  styleUrls: ['./page.css'],
62
62
  })
63
63
  export default class PageComponent {
64
- @Input()
65
64
  user: User | null = null;
66
65
 
67
- @Output()
68
- onLogin = new EventEmitter<Event>();
66
+ doLogout() {
67
+ this.user = null;
68
+ }
69
69
 
70
- @Output()
71
- onLogout = new EventEmitter<Event>();
70
+ doLogin() {
71
+ this.user = { name: 'Jane Doe' };
72
+ }
72
73
 
73
- @Output()
74
- onCreateAccount = new EventEmitter<Event>();
74
+ doCreateAccount() {
75
+ this.user = { name: 'Jane Doe' };
76
+ }
75
77
  }
76
-
77
- // export const Page = ({ user, onLogin, onLogout, onCreateAccount }) => (
78
- // <article>
79
- // <Header user={user} onLogin={onLogin} onLogout={onLogout} onCreateAccount={onCreateAccount} />
80
-
81
- // );
82
- // Page.propTypes = {
83
- // user: PropTypes.shape({}),
84
- // onLogin: PropTypes.func.isRequired,
85
- // onLogout: PropTypes.func.isRequired,
86
- // onCreateAccount: PropTypes.func.isRequired,
87
- // };
88
-
89
- // Page.defaultProps = {
90
- // user: null,
91
- // };
package/dist/cjs/generators/baseGenerator.js CHANGED
@@ -51,7 +51,7 @@ const builderDependencies = builder => {
51
51
 
52
52
  const stripVersions = addons => addons.map(addon => (0, _jsPackageManager.getPackageDetails)(addon)[0]);
53
53
 
54
- const hasInteractiveStories = framework => ['react'].includes(framework);
54
+ const hasInteractiveStories = framework => ['react', 'angular'].includes(framework);
55
55
 
56
56
  async function baseGenerator(packageManager, npmOptions, {
57
57
  language,
package/dist/cjs/versions.js CHANGED
@@ -6,60 +6,60 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.default = void 0;
7
7
  // auto generated file, do not edit
8
8
  var _default = {
9
- "@storybook/addon-a11y": "6.5.0-alpha.38",
10
- "@storybook/addon-actions": "6.5.0-alpha.38",
11
- "@storybook/addon-backgrounds": "6.5.0-alpha.38",
12
- "@storybook/addon-controls": "6.5.0-alpha.38",
13
- "@storybook/addon-docs": "6.5.0-alpha.38",
14
- "@storybook/addon-essentials": "6.5.0-alpha.38",
15
- "@storybook/addon-interactions": "6.5.0-alpha.38",
16
- "@storybook/addon-jest": "6.5.0-alpha.38",
17
- "@storybook/addon-links": "6.5.0-alpha.38",
18
- "@storybook/addon-measure": "6.5.0-alpha.38",
19
- "@storybook/addon-outline": "6.5.0-alpha.38",
20
- "@storybook/addon-storyshots": "6.5.0-alpha.38",
21
- "@storybook/addon-storyshots-puppeteer": "6.5.0-alpha.38",
22
- "@storybook/addon-storysource": "6.5.0-alpha.38",
23
- "@storybook/addon-toolbars": "6.5.0-alpha.38",
24
- "@storybook/addon-viewport": "6.5.0-alpha.38",
25
- "@storybook/addons": "6.5.0-alpha.38",
26
- "@storybook/angular": "6.5.0-alpha.38",
27
- "@storybook/api": "6.5.0-alpha.38",
28
- "@storybook/builder-webpack4": "6.5.0-alpha.38",
29
- "@storybook/builder-webpack5": "6.5.0-alpha.38",
30
- "@storybook/channel-postmessage": "6.5.0-alpha.38",
31
- "@storybook/channel-websocket": "6.5.0-alpha.38",
32
- "@storybook/channels": "6.5.0-alpha.38",
33
- "@storybook/cli": "6.5.0-alpha.38",
34
- "@storybook/client-api": "6.5.0-alpha.38",
35
- "@storybook/client-logger": "6.5.0-alpha.38",
36
- "@storybook/codemod": "6.5.0-alpha.38",
37
- "@storybook/components": "6.5.0-alpha.38",
38
- "@storybook/core": "6.5.0-alpha.38",
39
- "@storybook/core-client": "6.5.0-alpha.38",
40
- "@storybook/core-common": "6.5.0-alpha.38",
41
- "@storybook/core-events": "6.5.0-alpha.38",
42
- "@storybook/core-server": "6.5.0-alpha.38",
43
- "@storybook/csf-tools": "6.5.0-alpha.38",
44
- "@storybook/ember": "6.5.0-alpha.38",
45
- "@storybook/html": "6.5.0-alpha.38",
46
- "@storybook/instrumenter": "6.5.0-alpha.38",
47
- "@storybook/manager-webpack4": "6.5.0-alpha.38",
48
- "@storybook/manager-webpack5": "6.5.0-alpha.38",
49
- "@storybook/node-logger": "6.5.0-alpha.38",
50
- "@storybook/postinstall": "6.5.0-alpha.38",
51
- "@storybook/preact": "6.5.0-alpha.38",
52
- "@storybook/preview-web": "6.5.0-alpha.38",
53
- "@storybook/react": "6.5.0-alpha.38",
54
- "@storybook/router": "6.5.0-alpha.38",
55
- "@storybook/server": "6.5.0-alpha.38",
56
- "@storybook/source-loader": "6.5.0-alpha.38",
57
- "@storybook/store": "6.5.0-alpha.38",
58
- "@storybook/svelte": "6.5.0-alpha.38",
59
- "@storybook/theming": "6.5.0-alpha.38",
60
- "@storybook/ui": "6.5.0-alpha.38",
61
- "@storybook/vue": "6.5.0-alpha.38",
62
- "@storybook/vue3": "6.5.0-alpha.38",
63
- "@storybook/web-components": "6.5.0-alpha.38"
9
+ "@storybook/addon-a11y": "6.5.0-alpha.39",
10
+ "@storybook/addon-actions": "6.5.0-alpha.39",
11
+ "@storybook/addon-backgrounds": "6.5.0-alpha.39",
12
+ "@storybook/addon-controls": "6.5.0-alpha.39",
13
+ "@storybook/addon-docs": "6.5.0-alpha.39",
14
+ "@storybook/addon-essentials": "6.5.0-alpha.39",
15
+ "@storybook/addon-interactions": "6.5.0-alpha.39",
16
+ "@storybook/addon-jest": "6.5.0-alpha.39",
17
+ "@storybook/addon-links": "6.5.0-alpha.39",
18
+ "@storybook/addon-measure": "6.5.0-alpha.39",
19
+ "@storybook/addon-outline": "6.5.0-alpha.39",
20
+ "@storybook/addon-storyshots": "6.5.0-alpha.39",
21
+ "@storybook/addon-storyshots-puppeteer": "6.5.0-alpha.39",
22
+ "@storybook/addon-storysource": "6.5.0-alpha.39",
23
+ "@storybook/addon-toolbars": "6.5.0-alpha.39",
24
+ "@storybook/addon-viewport": "6.5.0-alpha.39",
25
+ "@storybook/addons": "6.5.0-alpha.39",
26
+ "@storybook/angular": "6.5.0-alpha.39",
27
+ "@storybook/api": "6.5.0-alpha.39",
28
+ "@storybook/builder-webpack4": "6.5.0-alpha.39",
29
+ "@storybook/builder-webpack5": "6.5.0-alpha.39",
30
+ "@storybook/channel-postmessage": "6.5.0-alpha.39",
31
+ "@storybook/channel-websocket": "6.5.0-alpha.39",
32
+ "@storybook/channels": "6.5.0-alpha.39",
33
+ "@storybook/cli": "6.5.0-alpha.39",
34
+ "@storybook/client-api": "6.5.0-alpha.39",
35
+ "@storybook/client-logger": "6.5.0-alpha.39",
36
+ "@storybook/codemod": "6.5.0-alpha.39",
37
+ "@storybook/components": "6.5.0-alpha.39",
38
+ "@storybook/core": "6.5.0-alpha.39",
39
+ "@storybook/core-client": "6.5.0-alpha.39",
40
+ "@storybook/core-common": "6.5.0-alpha.39",
41
+ "@storybook/core-events": "6.5.0-alpha.39",
42
+ "@storybook/core-server": "6.5.0-alpha.39",
43
+ "@storybook/csf-tools": "6.5.0-alpha.39",
44
+ "@storybook/ember": "6.5.0-alpha.39",
45
+ "@storybook/html": "6.5.0-alpha.39",
46
+ "@storybook/instrumenter": "6.5.0-alpha.39",
47
+ "@storybook/manager-webpack4": "6.5.0-alpha.39",
48
+ "@storybook/manager-webpack5": "6.5.0-alpha.39",
49
+ "@storybook/node-logger": "6.5.0-alpha.39",
50
+ "@storybook/postinstall": "6.5.0-alpha.39",
51
+ "@storybook/preact": "6.5.0-alpha.39",
52
+ "@storybook/preview-web": "6.5.0-alpha.39",
53
+ "@storybook/react": "6.5.0-alpha.39",
54
+ "@storybook/router": "6.5.0-alpha.39",
55
+ "@storybook/server": "6.5.0-alpha.39",
56
+ "@storybook/source-loader": "6.5.0-alpha.39",
57
+ "@storybook/store": "6.5.0-alpha.39",
58
+ "@storybook/svelte": "6.5.0-alpha.39",
59
+ "@storybook/theming": "6.5.0-alpha.39",
60
+ "@storybook/ui": "6.5.0-alpha.39",
61
+ "@storybook/vue": "6.5.0-alpha.39",
62
+ "@storybook/vue3": "6.5.0-alpha.39",
63
+ "@storybook/web-components": "6.5.0-alpha.39"
64
64
  };
65
65
  exports.default = _default;
package/dist/esm/extract.js CHANGED
@@ -24,8 +24,13 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
24
24
  const read = async url => {
25
25
  const browser = await usePuppeteerBrowser();
26
26
  const page = await browser.newPage();
27
- await page.goto(url);
28
- await page.waitForFunction('window.__STORYBOOK_STORY_STORE__ && window.__STORYBOOK_STORY_STORE__.extract && window.__STORYBOOK_STORY_STORE__.extract()');
27
+ await page.goto(url); // we don't know whether we are running against a new or old storybook
28
+ // FIXME: add tests for both
29
+
30
+ await page.waitForFunction(`
31
+ (window.__STORYBOOK_PREVIEW__ && window.__STORYBOOK_PREVIEW__.extract && window.__STORYBOOK_PREVIEW__.extract()) ||
32
+ (window.__STORYBOOK_STORY_STORE__ && window.__STORYBOOK_STORY_STORE__.extract && window.__STORYBOOK_STORY_STORE__.extract())
33
+ `);
29
34
  const data = JSON.parse(await page.evaluate(async () => {
30
35
  // eslint-disable-next-line no-undef
31
36
  return JSON.stringify(window.__STORYBOOK_STORY_STORE__.getStoriesJsonData(), null, 2);
package/dist/esm/frameworks/angular/Header.stories.ts CHANGED
@@ -1,7 +1,6 @@
1
1
  import { moduleMetadata } from '@storybook/angular';
2
2
  import { CommonModule } from '@angular/common';
3
- // also exported from '@storybook/angular' if you can deal with breaking changes in 6.1
4
- import { Story, Meta } from '@storybook/angular/types-6-0';
3
+ import type { Story, Meta } from '@storybook/angular';
5
4
 
6
5
  import Button from './button.component';
7
6
  import Header from './header.component';
@@ -15,6 +14,10 @@ export default {
15
14
  imports: [CommonModule],
16
15
  }),
17
16
  ],
17
+ parameters: {
18
+ // More on Story layout: https://storybook.js.org/docs/angular/configure/story-layout
19
+ layout: 'fullscreen',
20
+ },
18
21
  } as Meta;
19
22
 
20
23
  const Template: Story<Header> = (args: Header) => ({
@@ -23,7 +26,9 @@ const Template: Story<Header> = (args: Header) => ({
23
26
 
24
27
  export const LoggedIn = Template.bind({});
25
28
  LoggedIn.args = {
26
- user: {},
29
+ user: {
30
+ name: 'Jane Doe',
31
+ },
27
32
  };
28
33
 
29
34
  export const LoggedOut = Template.bind({});
package/dist/esm/frameworks/angular/Page.stories.ts CHANGED
@@ -1,15 +1,18 @@
1
1
  import { moduleMetadata, Story, Meta } from '@storybook/angular';
2
+ import { within, userEvent } from '@storybook/testing-library';
2
3
  import { CommonModule } from '@angular/common';
3
4
 
4
5
  import Button from './button.component';
5
6
  import Header from './header.component';
6
7
  import Page from './page.component';
7
8
 
8
- import * as HeaderStories from './Header.stories';
9
-
10
9
  export default {
11
10
  title: 'Example/Page',
12
11
  component: Page,
12
+ parameters: {
13
+ // More on Story layout: https://storybook.js.org/docs/angular/configure/story-layout
14
+ layout: 'fullscreen',
15
+ },
13
16
  decorators: [
14
17
  moduleMetadata({
15
18
  declarations: [Button, Header],
@@ -22,13 +25,12 @@ const Template: Story<Page> = (args: Page) => ({
22
25
  props: args,
23
26
  });
24
27
 
25
- export const LoggedIn = Template.bind({});
26
- LoggedIn.args = {
27
- // More on composing args: https://storybook.js.org/docs/angular/writing-stories/args#args-composition
28
- ...HeaderStories.LoggedIn.args,
29
- };
30
-
31
28
  export const LoggedOut = Template.bind({});
32
- LoggedOut.args = {
33
- ...HeaderStories.LoggedOut.args,
29
+
30
+ // More on interaction testing: https://storybook.js.org/docs/angular/writing-tests/interaction-testing
31
+ export const LoggedIn = Template.bind({});
32
+ LoggedIn.play = async ({ canvasElement }) => {
33
+ const canvas = within(canvasElement);
34
+ const loginButton = await canvas.getByRole('button', { name: /Log in/i });
35
+ await userEvent.click(loginButton);
34
36
  };
package/dist/esm/frameworks/angular/header.component.ts CHANGED
@@ -25,25 +25,36 @@ import { User } from './User';
25
25
  <h1>Acme</h1>
26
26
  </div>
27
27
  <div>
28
- <storybook-button
29
- *ngIf="user"
30
- size="small"
31
- (onClick)="onLogout.emit($event)"
32
- label="Log out"
33
- ></storybook-button>
34
- <storybook-button
35
- *ngIf="!user"
36
- size="small"
37
- (onClick)="onLogin.emit($event)"
38
- label="Log in"
39
- ></storybook-button>
40
- <storybook-button
41
- *ngIf="!user"
42
- primary
43
- size="small"
44
- (onClick)="onCreateAccount.emit($event)"
45
- label="Sign up"
46
- ></storybook-button>
28
+ <div *ngIf="user">
29
+ <span class="welcome">
30
+ Welcome, <b>{{ user.name }}</b
31
+ >!
32
+ </span>
33
+ <storybook-button
34
+ *ngIf="user"
35
+ size="small"
36
+ (onClick)="onLogout.emit($event)"
37
+ label="Log out"
38
+ ></storybook-button>
39
+ </div>
40
+ <div *ngIf="!user">
41
+ <storybook-button
42
+ *ngIf="!user"
43
+ size="small"
44
+ class="margin-left"
45
+ (onClick)="onLogin.emit($event)"
46
+ label="Log in"
47
+ ></storybook-button>
48
+ <storybook-button
49
+ *ngIf="!user"
50
+ primary
51
+ size="small"
52
+ primary="true"
53
+ class="margin-left"
54
+ (onClick)="onCreateAccount.emit($event)"
55
+ label="Sign up"
56
+ ></storybook-button>
57
+ </div>
47
58
  </div>
48
59
  </div>
49
60
  </header>`,
package/dist/esm/frameworks/angular/page.component.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { Component, Input, Output, EventEmitter } from '@angular/core';
1
+ import { Component } from '@angular/core';
2
2
  import { User } from './User';
3
3
 
4
4
  @Component({
@@ -6,9 +6,9 @@ import { User } from './User';
6
6
  template: `<article>
7
7
  <storybook-header
8
8
  [user]="user"
9
- (onLogout)="onLogout.emit($event)"
10
- (onLogin)="onLogin.emit($event)"
11
- (onCreateAccount)="onCreateAccount.emit($event)"
9
+ (onLogout)="doLogout()"
10
+ (onLogin)="doLogin()"
11
+ (onCreateAccount)="doCreateAccount()"
12
12
  ></storybook-header>
13
13
  <section>
14
14
  <h2>Pages in Storybook</h2>
@@ -61,31 +61,17 @@ import { User } from './User';
61
61
  styleUrls: ['./page.css'],
62
62
  })
63
63
  export default class PageComponent {
64
- @Input()
65
64
  user: User | null = null;
66
65
 
67
- @Output()
68
- onLogin = new EventEmitter<Event>();
66
+ doLogout() {
67
+ this.user = null;
68
+ }
69
69
 
70
- @Output()
71
- onLogout = new EventEmitter<Event>();
70
+ doLogin() {
71
+ this.user = { name: 'Jane Doe' };
72
+ }
72
73
 
73
- @Output()
74
- onCreateAccount = new EventEmitter<Event>();
74
+ doCreateAccount() {
75
+ this.user = { name: 'Jane Doe' };
76
+ }
75
77
  }
76
-
77
- // export const Page = ({ user, onLogin, onLogout, onCreateAccount }) => (
78
- // <article>
79
- // <Header user={user} onLogin={onLogin} onLogout={onLogout} onCreateAccount={onCreateAccount} />
80
-
81
- // );
82
- // Page.propTypes = {
83
- // user: PropTypes.shape({}),
84
- // onLogin: PropTypes.func.isRequired,
85
- // onLogout: PropTypes.func.isRequired,
86
- // onCreateAccount: PropTypes.func.isRequired,
87
- // };
88
-
89
- // Page.defaultProps = {
90
- // user: null,
91
- // };
package/dist/esm/generators/baseGenerator.js CHANGED
@@ -51,7 +51,7 @@ const builderDependencies = builder => {
51
51
 
52
52
  const stripVersions = addons => addons.map(addon => (0, _jsPackageManager.getPackageDetails)(addon)[0]);
53
53
 
54
- const hasInteractiveStories = framework => ['react'].includes(framework);
54
+ const hasInteractiveStories = framework => ['react', 'angular'].includes(framework);
55
55
 
56
56
  async function baseGenerator(packageManager, npmOptions, {
57
57
  language,
package/dist/esm/versions.js CHANGED
@@ -6,60 +6,60 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.default = void 0;
7
7
  // auto generated file, do not edit
8
8
  var _default = {
9
- "@storybook/addon-a11y": "6.5.0-alpha.38",
10
- "@storybook/addon-actions": "6.5.0-alpha.38",
11
- "@storybook/addon-backgrounds": "6.5.0-alpha.38",
12
- "@storybook/addon-controls": "6.5.0-alpha.38",
13
- "@storybook/addon-docs": "6.5.0-alpha.38",
14
- "@storybook/addon-essentials": "6.5.0-alpha.38",
15
- "@storybook/addon-interactions": "6.5.0-alpha.38",
16
- "@storybook/addon-jest": "6.5.0-alpha.38",
17
- "@storybook/addon-links": "6.5.0-alpha.38",
18
- "@storybook/addon-measure": "6.5.0-alpha.38",
19
- "@storybook/addon-outline": "6.5.0-alpha.38",
20
- "@storybook/addon-storyshots": "6.5.0-alpha.38",
21
- "@storybook/addon-storyshots-puppeteer": "6.5.0-alpha.38",
22
- "@storybook/addon-storysource": "6.5.0-alpha.38",
23
- "@storybook/addon-toolbars": "6.5.0-alpha.38",
24
- "@storybook/addon-viewport": "6.5.0-alpha.38",
25
- "@storybook/addons": "6.5.0-alpha.38",
26
- "@storybook/angular": "6.5.0-alpha.38",
27
- "@storybook/api": "6.5.0-alpha.38",
28
- "@storybook/builder-webpack4": "6.5.0-alpha.38",
29
- "@storybook/builder-webpack5": "6.5.0-alpha.38",
30
- "@storybook/channel-postmessage": "6.5.0-alpha.38",
31
- "@storybook/channel-websocket": "6.5.0-alpha.38",
32
- "@storybook/channels": "6.5.0-alpha.38",
33
- "@storybook/cli": "6.5.0-alpha.38",
34
- "@storybook/client-api": "6.5.0-alpha.38",
35
- "@storybook/client-logger": "6.5.0-alpha.38",
36
- "@storybook/codemod": "6.5.0-alpha.38",
37
- "@storybook/components": "6.5.0-alpha.38",
38
- "@storybook/core": "6.5.0-alpha.38",
39
- "@storybook/core-client": "6.5.0-alpha.38",
40
- "@storybook/core-common": "6.5.0-alpha.38",
41
- "@storybook/core-events": "6.5.0-alpha.38",
42
- "@storybook/core-server": "6.5.0-alpha.38",
43
- "@storybook/csf-tools": "6.5.0-alpha.38",
44
- "@storybook/ember": "6.5.0-alpha.38",
45
- "@storybook/html": "6.5.0-alpha.38",
46
- "@storybook/instrumenter": "6.5.0-alpha.38",
47
- "@storybook/manager-webpack4": "6.5.0-alpha.38",
48
- "@storybook/manager-webpack5": "6.5.0-alpha.38",
49
- "@storybook/node-logger": "6.5.0-alpha.38",
50
- "@storybook/postinstall": "6.5.0-alpha.38",
51
- "@storybook/preact": "6.5.0-alpha.38",
52
- "@storybook/preview-web": "6.5.0-alpha.38",
53
- "@storybook/react": "6.5.0-alpha.38",
54
- "@storybook/router": "6.5.0-alpha.38",
55
- "@storybook/server": "6.5.0-alpha.38",
56
- "@storybook/source-loader": "6.5.0-alpha.38",
57
- "@storybook/store": "6.5.0-alpha.38",
58
- "@storybook/svelte": "6.5.0-alpha.38",
59
- "@storybook/theming": "6.5.0-alpha.38",
60
- "@storybook/ui": "6.5.0-alpha.38",
61
- "@storybook/vue": "6.5.0-alpha.38",
62
- "@storybook/vue3": "6.5.0-alpha.38",
63
- "@storybook/web-components": "6.5.0-alpha.38"
9
+ "@storybook/addon-a11y": "6.5.0-alpha.39",
10
+ "@storybook/addon-actions": "6.5.0-alpha.39",
11
+ "@storybook/addon-backgrounds": "6.5.0-alpha.39",
12
+ "@storybook/addon-controls": "6.5.0-alpha.39",
13
+ "@storybook/addon-docs": "6.5.0-alpha.39",
14
+ "@storybook/addon-essentials": "6.5.0-alpha.39",
15
+ "@storybook/addon-interactions": "6.5.0-alpha.39",
16
+ "@storybook/addon-jest": "6.5.0-alpha.39",
17
+ "@storybook/addon-links": "6.5.0-alpha.39",
18
+ "@storybook/addon-measure": "6.5.0-alpha.39",
19
+ "@storybook/addon-outline": "6.5.0-alpha.39",
20
+ "@storybook/addon-storyshots": "6.5.0-alpha.39",
21
+ "@storybook/addon-storyshots-puppeteer": "6.5.0-alpha.39",
22
+ "@storybook/addon-storysource": "6.5.0-alpha.39",
23
+ "@storybook/addon-toolbars": "6.5.0-alpha.39",
24
+ "@storybook/addon-viewport": "6.5.0-alpha.39",
25
+ "@storybook/addons": "6.5.0-alpha.39",
26
+ "@storybook/angular": "6.5.0-alpha.39",
27
+ "@storybook/api": "6.5.0-alpha.39",
28
+ "@storybook/builder-webpack4": "6.5.0-alpha.39",
29
+ "@storybook/builder-webpack5": "6.5.0-alpha.39",
30
+ "@storybook/channel-postmessage": "6.5.0-alpha.39",
31
+ "@storybook/channel-websocket": "6.5.0-alpha.39",
32
+ "@storybook/channels": "6.5.0-alpha.39",
33
+ "@storybook/cli": "6.5.0-alpha.39",
34
+ "@storybook/client-api": "6.5.0-alpha.39",
35
+ "@storybook/client-logger": "6.5.0-alpha.39",
36
+ "@storybook/codemod": "6.5.0-alpha.39",
37
+ "@storybook/components": "6.5.0-alpha.39",
38
+ "@storybook/core": "6.5.0-alpha.39",
39
+ "@storybook/core-client": "6.5.0-alpha.39",
40
+ "@storybook/core-common": "6.5.0-alpha.39",
41
+ "@storybook/core-events": "6.5.0-alpha.39",
42
+ "@storybook/core-server": "6.5.0-alpha.39",
43
+ "@storybook/csf-tools": "6.5.0-alpha.39",
44
+ "@storybook/ember": "6.5.0-alpha.39",
45
+ "@storybook/html": "6.5.0-alpha.39",
46
+ "@storybook/instrumenter": "6.5.0-alpha.39",
47
+ "@storybook/manager-webpack4": "6.5.0-alpha.39",
48
+ "@storybook/manager-webpack5": "6.5.0-alpha.39",
49
+ "@storybook/node-logger": "6.5.0-alpha.39",
50
+ "@storybook/postinstall": "6.5.0-alpha.39",
51
+ "@storybook/preact": "6.5.0-alpha.39",
52
+ "@storybook/preview-web": "6.5.0-alpha.39",
53
+ "@storybook/react": "6.5.0-alpha.39",
54
+ "@storybook/router": "6.5.0-alpha.39",
55
+ "@storybook/server": "6.5.0-alpha.39",
56
+ "@storybook/source-loader": "6.5.0-alpha.39",
57
+ "@storybook/store": "6.5.0-alpha.39",
58
+ "@storybook/svelte": "6.5.0-alpha.39",
59
+ "@storybook/theming": "6.5.0-alpha.39",
60
+ "@storybook/ui": "6.5.0-alpha.39",
61
+ "@storybook/vue": "6.5.0-alpha.39",
62
+ "@storybook/vue3": "6.5.0-alpha.39",
63
+ "@storybook/web-components": "6.5.0-alpha.39"
64
64
  };
65
65
  exports.default = _default;
package/dist/modern/extract.js CHANGED
@@ -24,8 +24,13 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
24
24
  const read = async url => {
25
25
  const browser = await usePuppeteerBrowser();
26
26
  const page = await browser.newPage();
27
- await page.goto(url);
28
- await page.waitForFunction('window.__STORYBOOK_STORY_STORE__ && window.__STORYBOOK_STORY_STORE__.extract && window.__STORYBOOK_STORY_STORE__.extract()');
27
+ await page.goto(url); // we don't know whether we are running against a new or old storybook
28
+ // FIXME: add tests for both
29
+
30
+ await page.waitForFunction(`
31
+ (window.__STORYBOOK_PREVIEW__ && window.__STORYBOOK_PREVIEW__.extract && window.__STORYBOOK_PREVIEW__.extract()) ||
32
+ (window.__STORYBOOK_STORY_STORE__ && window.__STORYBOOK_STORY_STORE__.extract && window.__STORYBOOK_STORY_STORE__.extract())
33
+ `);
29
34
  const data = JSON.parse(await page.evaluate(async () => {
30
35
  // eslint-disable-next-line no-undef
31
36
  return JSON.stringify(window.__STORYBOOK_STORY_STORE__.getStoriesJsonData(), null, 2);
package/dist/modern/generators/baseGenerator.js CHANGED
@@ -51,7 +51,7 @@ const builderDependencies = builder => {
51
51
 
52
52
  const stripVersions = addons => addons.map(addon => (0, _jsPackageManager.getPackageDetails)(addon)[0]);
53
53
 
54
- const hasInteractiveStories = framework => ['react'].includes(framework);
54
+ const hasInteractiveStories = framework => ['react', 'angular'].includes(framework);
55
55
 
56
56
  async function baseGenerator(packageManager, npmOptions, {
57
57
  language,
package/dist/modern/versions.js CHANGED
@@ -6,60 +6,60 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.default = void 0;
7
7
  // auto generated file, do not edit
8
8
  var _default = {
9
- "@storybook/addon-a11y": "6.5.0-alpha.38",
10
- "@storybook/addon-actions": "6.5.0-alpha.38",
11
- "@storybook/addon-backgrounds": "6.5.0-alpha.38",
12
- "@storybook/addon-controls": "6.5.0-alpha.38",
13
- "@storybook/addon-docs": "6.5.0-alpha.38",
14
- "@storybook/addon-essentials": "6.5.0-alpha.38",
15
- "@storybook/addon-interactions": "6.5.0-alpha.38",
16
- "@storybook/addon-jest": "6.5.0-alpha.38",
17
- "@storybook/addon-links": "6.5.0-alpha.38",
18
- "@storybook/addon-measure": "6.5.0-alpha.38",
19
- "@storybook/addon-outline": "6.5.0-alpha.38",
20
- "@storybook/addon-storyshots": "6.5.0-alpha.38",
21
- "@storybook/addon-storyshots-puppeteer": "6.5.0-alpha.38",
22
- "@storybook/addon-storysource": "6.5.0-alpha.38",
23
- "@storybook/addon-toolbars": "6.5.0-alpha.38",
24
- "@storybook/addon-viewport": "6.5.0-alpha.38",
25
- "@storybook/addons": "6.5.0-alpha.38",
26
- "@storybook/angular": "6.5.0-alpha.38",
27
- "@storybook/api": "6.5.0-alpha.38",
28
- "@storybook/builder-webpack4": "6.5.0-alpha.38",
29
- "@storybook/builder-webpack5": "6.5.0-alpha.38",
30
- "@storybook/channel-postmessage": "6.5.0-alpha.38",
31
- "@storybook/channel-websocket": "6.5.0-alpha.38",
32
- "@storybook/channels": "6.5.0-alpha.38",
33
- "@storybook/cli": "6.5.0-alpha.38",
34
- "@storybook/client-api": "6.5.0-alpha.38",
35
- "@storybook/client-logger": "6.5.0-alpha.38",
36
- "@storybook/codemod": "6.5.0-alpha.38",
37
- "@storybook/components": "6.5.0-alpha.38",
38
- "@storybook/core": "6.5.0-alpha.38",
39
- "@storybook/core-client": "6.5.0-alpha.38",
40
- "@storybook/core-common": "6.5.0-alpha.38",
41
- "@storybook/core-events": "6.5.0-alpha.38",
42
- "@storybook/core-server": "6.5.0-alpha.38",
43
- "@storybook/csf-tools": "6.5.0-alpha.38",
44
- "@storybook/ember": "6.5.0-alpha.38",
45
- "@storybook/html": "6.5.0-alpha.38",
46
- "@storybook/instrumenter": "6.5.0-alpha.38",
47
- "@storybook/manager-webpack4": "6.5.0-alpha.38",
48
- "@storybook/manager-webpack5": "6.5.0-alpha.38",
49
- "@storybook/node-logger": "6.5.0-alpha.38",
50
- "@storybook/postinstall": "6.5.0-alpha.38",
51
- "@storybook/preact": "6.5.0-alpha.38",
52
- "@storybook/preview-web": "6.5.0-alpha.38",
53
- "@storybook/react": "6.5.0-alpha.38",
54
- "@storybook/router": "6.5.0-alpha.38",
55
- "@storybook/server": "6.5.0-alpha.38",
56
- "@storybook/source-loader": "6.5.0-alpha.38",
57
- "@storybook/store": "6.5.0-alpha.38",
58
- "@storybook/svelte": "6.5.0-alpha.38",
59
- "@storybook/theming": "6.5.0-alpha.38",
60
- "@storybook/ui": "6.5.0-alpha.38",
61
- "@storybook/vue": "6.5.0-alpha.38",
62
- "@storybook/vue3": "6.5.0-alpha.38",
63
- "@storybook/web-components": "6.5.0-alpha.38"
9
+ "@storybook/addon-a11y": "6.5.0-alpha.39",
10
+ "@storybook/addon-actions": "6.5.0-alpha.39",
11
+ "@storybook/addon-backgrounds": "6.5.0-alpha.39",
12
+ "@storybook/addon-controls": "6.5.0-alpha.39",
13
+ "@storybook/addon-docs": "6.5.0-alpha.39",
14
+ "@storybook/addon-essentials": "6.5.0-alpha.39",
15
+ "@storybook/addon-interactions": "6.5.0-alpha.39",
16
+ "@storybook/addon-jest": "6.5.0-alpha.39",
17
+ "@storybook/addon-links": "6.5.0-alpha.39",
18
+ "@storybook/addon-measure": "6.5.0-alpha.39",
19
+ "@storybook/addon-outline": "6.5.0-alpha.39",
20
+ "@storybook/addon-storyshots": "6.5.0-alpha.39",
21
+ "@storybook/addon-storyshots-puppeteer": "6.5.0-alpha.39",
22
+ "@storybook/addon-storysource": "6.5.0-alpha.39",
23
+ "@storybook/addon-toolbars": "6.5.0-alpha.39",
24
+ "@storybook/addon-viewport": "6.5.0-alpha.39",
25
+ "@storybook/addons": "6.5.0-alpha.39",
26
+ "@storybook/angular": "6.5.0-alpha.39",
27
+ "@storybook/api": "6.5.0-alpha.39",
28
+ "@storybook/builder-webpack4": "6.5.0-alpha.39",
29
+ "@storybook/builder-webpack5": "6.5.0-alpha.39",
30
+ "@storybook/channel-postmessage": "6.5.0-alpha.39",
31
+ "@storybook/channel-websocket": "6.5.0-alpha.39",
32
+ "@storybook/channels": "6.5.0-alpha.39",
33
+ "@storybook/cli": "6.5.0-alpha.39",
34
+ "@storybook/client-api": "6.5.0-alpha.39",
35
+ "@storybook/client-logger": "6.5.0-alpha.39",
36
+ "@storybook/codemod": "6.5.0-alpha.39",
37
+ "@storybook/components": "6.5.0-alpha.39",
38
+ "@storybook/core": "6.5.0-alpha.39",
39
+ "@storybook/core-client": "6.5.0-alpha.39",
40
+ "@storybook/core-common": "6.5.0-alpha.39",
41
+ "@storybook/core-events": "6.5.0-alpha.39",
42
+ "@storybook/core-server": "6.5.0-alpha.39",
43
+ "@storybook/csf-tools": "6.5.0-alpha.39",
44
+ "@storybook/ember": "6.5.0-alpha.39",
45
+ "@storybook/html": "6.5.0-alpha.39",
46
+ "@storybook/instrumenter": "6.5.0-alpha.39",
47
+ "@storybook/manager-webpack4": "6.5.0-alpha.39",
48
+ "@storybook/manager-webpack5": "6.5.0-alpha.39",
49
+ "@storybook/node-logger": "6.5.0-alpha.39",
50
+ "@storybook/postinstall": "6.5.0-alpha.39",
51
+ "@storybook/preact": "6.5.0-alpha.39",
52
+ "@storybook/preview-web": "6.5.0-alpha.39",
53
+ "@storybook/react": "6.5.0-alpha.39",
54
+ "@storybook/router": "6.5.0-alpha.39",
55
+ "@storybook/server": "6.5.0-alpha.39",
56
+ "@storybook/source-loader": "6.5.0-alpha.39",
57
+ "@storybook/store": "6.5.0-alpha.39",
58
+ "@storybook/svelte": "6.5.0-alpha.39",
59
+ "@storybook/theming": "6.5.0-alpha.39",
60
+ "@storybook/ui": "6.5.0-alpha.39",
61
+ "@storybook/vue": "6.5.0-alpha.39",
62
+ "@storybook/vue3": "6.5.0-alpha.39",
63
+ "@storybook/web-components": "6.5.0-alpha.39"
64
64
  };
65
65
  exports.default = _default;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@storybook/cli",
3
- "version": "6.5.0-alpha.38",
3
+ "version": "6.5.0-alpha.39",
4
4
  "description": "Storybook's CLI - easiest method of adding storybook to your projects",
5
5
  "keywords": [
6
6
  "cli",
@@ -47,10 +47,10 @@
47
47
  "dependencies": {
48
48
  "@babel/core": "^7.12.10",
49
49
  "@babel/preset-env": "^7.12.11",
50
- "@storybook/codemod": "6.5.0-alpha.38",
51
- "@storybook/core-common": "6.5.0-alpha.38",
52
- "@storybook/csf-tools": "6.5.0-alpha.38",
53
- "@storybook/node-logger": "6.5.0-alpha.38",
50
+ "@storybook/codemod": "6.5.0-alpha.39",
51
+ "@storybook/core-common": "6.5.0-alpha.39",
52
+ "@storybook/csf-tools": "6.5.0-alpha.39",
53
+ "@storybook/node-logger": "6.5.0-alpha.39",
54
54
  "@storybook/semver": "^7.3.2",
55
55
  "boxen": "^5.1.2",
56
56
  "chalk": "^4.1.0",
@@ -75,7 +75,7 @@
75
75
  "update-notifier": "^5.0.1"
76
76
  },
77
77
  "devDependencies": {
78
- "@storybook/client-api": "6.5.0-alpha.38",
78
+ "@storybook/client-api": "6.5.0-alpha.39",
79
79
  "@types/cross-spawn": "^6.0.2",
80
80
  "@types/prompts": "^2.0.9",
81
81
  "@types/puppeteer-core": "^2.1.0",
@@ -91,5 +91,5 @@
91
91
  "publishConfig": {
92
92
  "access": "public"
93
93
  },
94
- "gitHead": "b0dd637a70b6b24fbd3b8d9f9df7299511f6ba62"
94
+ "gitHead": "9b5d9b1f46a31a9881fe71a153a9b810e8203a93"
95
95
  }