Skip to content

Commit

Permalink
Merge branch 'future/minimize-webpack-deps' into future/modern-esm
Browse files Browse the repository at this point in the history 
# Conflicts:
#	addons/a11y/package.json
#	addons/actions/package.json
#	addons/backgrounds/package.json
#	addons/controls/package.json
#	addons/docs/package.json
#	addons/essentials/package.json
#	addons/interactions/package.json
#	addons/jest/package.json
#	addons/links/package.json
#	addons/measure/package.json
#	addons/outline/package.json
#	addons/storyshots/storyshots-core/package.json
#	addons/storysource/package.json
#	addons/toolbars/package.json
#	addons/viewport/package.json
#	app/ember/package.json
#	app/html/package.json
#	app/preact/package.json
#	app/react/package.json
#	app/server/package.json
#	app/svelte/package.json
#	app/vue/package.json
#	app/vue3/package.json
#	app/web-components/package.json
#	examples/cra-kitchen-sink/package.json
#	examples/cra-react15/package.json
#	examples/cra-ts-essentials/package.json
#	examples/cra-ts-kitchen-sink/package.json
#	examples/ember-cli/package.json
#	examples/external-docs/package.json
#	examples/official-storybook/package.json
#	examples/react-ts/package.json
#	examples/vue-3-cli/package.json
#	examples/vue-cli/package.json
#	examples/web-components-kitchen-sink/package.json
#	examples/web-components-kitchen-sink/yarn.lock
#	lib/addons/package.json
#	lib/api/package.json
#	lib/builder-webpack4/package.json
#	lib/builder-webpack5/package.json
#	lib/channel-postmessage/package.json
#	lib/channel-websocket/package.json
#	lib/channels/package.json
#	lib/cli/src/versions.ts
#	lib/client-api/package.json
#	lib/client-logger/package.json
#	lib/codemod/package.json
#	lib/components/package.json
#	lib/core-client/package.json
#	lib/core-common/package.json
#	lib/core-events/package.json
#	lib/core-server/package.json
#	lib/csf-tools/package.json
#	lib/docs-tools/package.json
#	lib/instrumenter/package.json
#	lib/manager-webpack4/package.json
#	lib/manager-webpack5/package.json
#	lib/node-logger/package.json
#	lib/postinstall/package.json
#	lib/preview-web/package.json
#	lib/router/package.json
#	lib/source-loader/package.json
#	lib/store/package.json
#	lib/theming/package.json
#	lib/ui/package.json
#	presets/react-webpack/package.json
#	yarn.lock
  • Loading branch information
@ndelangen
ndelangen committed Apr 28, 2022
2 parents 4494797 + af8b482 commit f2f9e39
Show file tree
Hide file tree
Showing 150 changed files with 3,920 additions and 2,169 deletions.
16 changes: 16 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
## 6.5.0-beta.1 (April 28, 2022)

### Features

- Toolbars: Add dynamicTitle option ([#17789](https://github.com/storybookjs/storybook/pull/17789))
- Angular: Add webpackStatsJson to angular-builder ([#18001](https://github.com/storybookjs/storybook/pull/18001))
- CLI/Vue: add interactions to vue cli template ([#18021](https://github.com/storybookjs/storybook/pull/18021))
- CLI/HTML: Add interactions to cli template ([#18014](https://github.com/storybookjs/storybook/pull/18014))

### Bug Fixes

- CSF: Re-apply TArgs to render type ([#18075](https://github.com/storybookjs/storybook/pull/18075))
- CLI: await generators for proper install ([#18053](https://github.com/storybookjs/storybook/pull/18053))
- Core: Fix story index for CSF default exports as TS vars ([#18054](https://github.com/storybookjs/storybook/pull/18054))
- Core: Fix single-story hoisting regression for auto-title changes ([#18052](https://github.com/storybookjs/storybook/pull/18052))

## 6.5.0-beta.0 (April 24, 2022)

### Features
Expand Down
14 changes: 14 additions & 0 deletions MIGRATION.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
- [From version 6.5.x to 7.0.0](#from-version-65x-to-700)
- [Breaking changes](#breaking-changes)
- [Framework field mandatory](#framework-field-mandatory)
- [frameworkOptions renamed](#frameworkoptions-renamed)
- [From version 6.4.x to 6.5.0](#from-version-64x-to-650)
- [React18 new root API](#react18-new-root-api)
- [Deprecated register.js](#deprecated-registerjs)
Expand Down Expand Up @@ -209,6 +210,19 @@

In 6.4 we introduced a new `main.js` field called [`framework`](#mainjs-framework-field). Starting in 7.0, this field is mandatory.

#### frameworkOptions renamed

In 7.0, the `main.js` fields `reactOptions` and `angularOptions` have been renamed. They are now options on the `framework` field:

```js
module.exports = {
framework: {
name: '@storybook/react',
options: { fastRefresh: true };
}
}
```

## From version 6.4.x to 6.5.0

### React18 new root API
Expand Down
20 changes: 10 additions & 10 deletions addons/a11y/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-a11y",
"version": "6.5.0-beta.0",
"version": "6.5.0-beta.1",
"description": "Test component compliance with web accessibility standards",
"keywords": [
"a11y",
Expand Down Expand Up @@ -45,14 +45,14 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.5.0-beta.0",
"@storybook/api": "6.5.0-beta.0",
"@storybook/channels": "6.5.0-beta.0",
"@storybook/client-logger": "6.5.0-beta.0",
"@storybook/components": "6.5.0-beta.0",
"@storybook/core-events": "6.5.0-beta.0",
"@storybook/csf": "0.0.2--canary.7c6c115.0",
"@storybook/theming": "6.5.0-beta.0",
"@storybook/addons": "6.5.0-beta.1",
"@storybook/api": "6.5.0-beta.1",
"@storybook/channels": "6.5.0-beta.1",
"@storybook/client-logger": "6.5.0-beta.1",
"@storybook/components": "6.5.0-beta.1",
"@storybook/core-events": "6.5.0-beta.1",
"@storybook/csf": "0.0.2--canary.4566f4d.1",
"@storybook/theming": "6.5.0-beta.1",
"axe-core": "^4.2.0",
"core-js": "^3.8.2",
"global": "^4.4.0",
Expand Down Expand Up @@ -80,7 +80,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "b2e85f3599c043815b18bbfc5ca563bf1c6e4add",
"gitHead": "85bcae3041a0664d7c0ee4756241e29ad1063a9a",
"storybook": {
"displayName": "Accessibility",
"icon": "https://user-images.githubusercontent.com/263385/101991665-47042f80-3c7c-11eb-8f00-64b5a18f498a.png",
Expand Down
18 changes: 9 additions & 9 deletions addons/actions/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-actions",
"version": "6.5.0-beta.0",
"version": "6.5.0-beta.1",
"description": "Get UI feedback when an action is performed on an interactive element",
"keywords": [
"storybook",
Expand Down Expand Up @@ -41,13 +41,13 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.5.0-beta.0",
"@storybook/api": "6.5.0-beta.0",
"@storybook/client-logger": "6.5.0-beta.0",
"@storybook/components": "6.5.0-beta.0",
"@storybook/core-events": "6.5.0-beta.0",
"@storybook/csf": "0.0.2--canary.7c6c115.0",
"@storybook/theming": "6.5.0-beta.0",
"@storybook/addons": "6.5.0-beta.1",
"@storybook/api": "6.5.0-beta.1",
"@storybook/client-logger": "6.5.0-beta.1",
"@storybook/components": "6.5.0-beta.1",
"@storybook/core-events": "6.5.0-beta.1",
"@storybook/csf": "0.0.2--canary.4566f4d.1",
"@storybook/theming": "6.5.0-beta.1",
"core-js": "^3.8.2",
"fast-deep-equal": "^3.1.3",
"global": "^4.4.0",
Expand Down Expand Up @@ -79,7 +79,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "b2e85f3599c043815b18bbfc5ca563bf1c6e4add",
"gitHead": "85bcae3041a0664d7c0ee4756241e29ad1063a9a",
"storybook": {
"displayName": "Actions",
"unsupportedFrameworks": [
Expand Down
18 changes: 9 additions & 9 deletions addons/backgrounds/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-backgrounds",
"version": "6.5.0-beta.0",
"version": "6.5.0-beta.1",
"description": "Switch backgrounds to view components in different settings",
"keywords": [
"addon",
Expand Down Expand Up @@ -45,13 +45,13 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.5.0-beta.0",
"@storybook/api": "6.5.0-beta.0",
"@storybook/client-logger": "6.5.0-beta.0",
"@storybook/components": "6.5.0-beta.0",
"@storybook/core-events": "6.5.0-beta.0",
"@storybook/csf": "0.0.2--canary.7c6c115.0",
"@storybook/theming": "6.5.0-beta.0",
"@storybook/addons": "6.5.0-beta.1",
"@storybook/api": "6.5.0-beta.1",
"@storybook/client-logger": "6.5.0-beta.1",
"@storybook/components": "6.5.0-beta.1",
"@storybook/core-events": "6.5.0-beta.1",
"@storybook/csf": "0.0.2--canary.4566f4d.1",
"@storybook/theming": "6.5.0-beta.1",
"core-js": "^3.8.2",
"global": "^4.4.0",
"memoizerific": "^1.11.3",
Expand All @@ -74,7 +74,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "b2e85f3599c043815b18bbfc5ca563bf1c6e4add",
"gitHead": "85bcae3041a0664d7c0ee4756241e29ad1063a9a",
"storybook": {
"displayName": "Backgrounds",
"icon": "https://user-images.githubusercontent.com/263385/101991667-479cc600-3c7c-11eb-96d3-410e936252e7.png",
Expand Down
22 changes: 11 additions & 11 deletions addons/controls/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-controls",
"version": "6.5.0-beta.0",
"version": "6.5.0-beta.1",
"description": "Interact with component inputs dynamically in the Storybook UI",
"keywords": [
"addon",
Expand Down Expand Up @@ -45,15 +45,15 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.5.0-beta.0",
"@storybook/api": "6.5.0-beta.0",
"@storybook/client-logger": "6.5.0-beta.0",
"@storybook/components": "6.5.0-beta.0",
"@storybook/core-common": "6.5.0-beta.0",
"@storybook/csf": "0.0.2--canary.7c6c115.0",
"@storybook/node-logger": "6.5.0-beta.0",
"@storybook/store": "6.5.0-beta.0",
"@storybook/theming": "6.5.0-beta.0",
"@storybook/addons": "6.5.0-beta.1",
"@storybook/api": "6.5.0-beta.1",
"@storybook/client-logger": "6.5.0-beta.1",
"@storybook/components": "6.5.0-beta.1",
"@storybook/core-common": "6.5.0-beta.1",
"@storybook/csf": "0.0.2--canary.4566f4d.1",
"@storybook/node-logger": "6.5.0-beta.1",
"@storybook/store": "6.5.0-beta.1",
"@storybook/theming": "6.5.0-beta.1",
"core-js": "^3.8.2",
"lodash": "^4.17.21",
"ts-dedent": "^2.0.0"
Expand All @@ -73,7 +73,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "b2e85f3599c043815b18bbfc5ca563bf1c6e4add",
"gitHead": "85bcae3041a0664d7c0ee4756241e29ad1063a9a",
"storybook": {
"displayName": "Controls",
"icon": "https://user-images.githubusercontent.com/263385/101991669-479cc600-3c7c-11eb-93d9-38b67e8371f2.png",
Expand Down
30 changes: 15 additions & 15 deletions addons/docs/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-docs",
"version": "6.5.0-beta.0",
"version": "6.5.0-beta.1",
"description": "Document component usage and properties in Markdown",
"keywords": [
"addon",
Expand Down Expand Up @@ -59,20 +59,20 @@
"@babel/preset-env": "^7.12.11",
"@jest/transform": "^26.6.2",
"@mdx-js/react": "^1.6.22",
"@storybook/addons": "6.5.0-beta.0",
"@storybook/api": "6.5.0-beta.0",
"@storybook/components": "6.5.0-beta.0",
"@storybook/core-common": "6.5.0-beta.0",
"@storybook/core-events": "6.5.0-beta.0",
"@storybook/csf": "0.0.2--canary.7c6c115.0",
"@storybook/docs-tools": "6.5.0-beta.0",
"@storybook/addons": "6.5.0-beta.1",
"@storybook/api": "6.5.0-beta.1",
"@storybook/components": "6.5.0-beta.1",
"@storybook/core-common": "6.5.0-beta.1",
"@storybook/core-events": "6.5.0-beta.1",
"@storybook/csf": "0.0.2--canary.4566f4d.1",
"@storybook/docs-tools": "6.5.0-beta.1",
"@storybook/mdx1-csf": "canary",
"@storybook/node-logger": "6.5.0-beta.0",
"@storybook/postinstall": "6.5.0-beta.0",
"@storybook/preview-web": "6.5.0-beta.0",
"@storybook/source-loader": "6.5.0-beta.0",
"@storybook/store": "6.5.0-beta.0",
"@storybook/theming": "6.5.0-beta.0",
"@storybook/node-logger": "6.5.0-beta.1",
"@storybook/postinstall": "6.5.0-beta.1",
"@storybook/preview-web": "6.5.0-beta.1",
"@storybook/source-loader": "6.5.0-beta.1",
"@storybook/store": "6.5.0-beta.1",
"@storybook/theming": "6.5.0-beta.1",
"babel-loader": "^8.2.5",
"core-js": "^3.8.2",
"fast-deep-equal": "^3.1.3",
Expand Down Expand Up @@ -108,7 +108,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "b2e85f3599c043815b18bbfc5ca563bf1c6e4add",
"gitHead": "85bcae3041a0664d7c0ee4756241e29ad1063a9a",
"storybook": {
"displayName": "Docs",
"icon": "https://user-images.githubusercontent.com/263385/101991672-48355c80-3c7c-11eb-82d9-95fa12438f64.png",
Expand Down
30 changes: 15 additions & 15 deletions addons/essentials/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-essentials",
"version": "6.5.0-beta.0",
"version": "6.5.0-beta.1",
"description": "Curated addons to bring out the best of Storybook",
"keywords": [
"addon",
Expand Down Expand Up @@ -39,25 +39,25 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addon-actions": "6.5.0-beta.0",
"@storybook/addon-backgrounds": "6.5.0-beta.0",
"@storybook/addon-controls": "6.5.0-beta.0",
"@storybook/addon-docs": "6.5.0-beta.0",
"@storybook/addon-measure": "6.5.0-beta.0",
"@storybook/addon-outline": "6.5.0-beta.0",
"@storybook/addon-toolbars": "6.5.0-beta.0",
"@storybook/addon-viewport": "6.5.0-beta.0",
"@storybook/addons": "6.5.0-beta.0",
"@storybook/api": "6.5.0-beta.0",
"@storybook/core-common": "6.5.0-beta.0",
"@storybook/node-logger": "6.5.0-beta.0",
"@storybook/addon-actions": "6.5.0-beta.1",
"@storybook/addon-backgrounds": "6.5.0-beta.1",
"@storybook/addon-controls": "6.5.0-beta.1",
"@storybook/addon-docs": "6.5.0-beta.1",
"@storybook/addon-measure": "6.5.0-beta.1",
"@storybook/addon-outline": "6.5.0-beta.1",
"@storybook/addon-toolbars": "6.5.0-beta.1",
"@storybook/addon-viewport": "6.5.0-beta.1",
"@storybook/addons": "6.5.0-beta.1",
"@storybook/api": "6.5.0-beta.1",
"@storybook/core-common": "6.5.0-beta.1",
"@storybook/node-logger": "6.5.0-beta.1",
"core-js": "^3.8.2",
"regenerator-runtime": "^0.13.7",
"ts-dedent": "^2.0.0"
},
"devDependencies": {
"@babel/core": "^7.12.10",
"@storybook/vue": "6.5.0-beta.0",
"@storybook/vue": "6.5.0-beta.1",
"@types/jest": "^26.0.16"
},
"peerDependencies": {
Expand Down Expand Up @@ -104,5 +104,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "b2e85f3599c043815b18bbfc5ca563bf1c6e4add"
"gitHead": "85bcae3041a0664d7c0ee4756241e29ad1063a9a"
}
22 changes: 11 additions & 11 deletions addons/interactions/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-interactions",
"version": "6.5.0-beta.0",
"version": "6.5.0-beta.1",
"description": "Automate, test and debug user interactions",
"keywords": [
"storybook-addons",
Expand Down Expand Up @@ -42,15 +42,15 @@
},
"dependencies": {
"@devtools-ds/object-inspector": "^1.1.2",
"@storybook/addons": "6.5.0-beta.0",
"@storybook/api": "6.5.0-beta.0",
"@storybook/client-logger": "6.5.0-beta.0",
"@storybook/components": "6.5.0-beta.0",
"@storybook/core-common": "6.5.0-beta.0",
"@storybook/core-events": "6.5.0-beta.0",
"@storybook/csf": "0.0.2--canary.7c6c115.0",
"@storybook/instrumenter": "6.5.0-beta.0",
"@storybook/theming": "6.5.0-beta.0",
"@storybook/addons": "6.5.0-beta.1",
"@storybook/api": "6.5.0-beta.1",
"@storybook/client-logger": "6.5.0-beta.1",
"@storybook/components": "6.5.0-beta.1",
"@storybook/core-common": "6.5.0-beta.1",
"@storybook/core-events": "6.5.0-beta.1",
"@storybook/csf": "0.0.2--canary.4566f4d.1",
"@storybook/instrumenter": "6.5.0-beta.1",
"@storybook/theming": "6.5.0-beta.1",
"core-js": "^3.8.2",
"global": "^4.4.0",
"jest-mock": "^27.0.6",
Expand All @@ -77,7 +77,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "b2e85f3599c043815b18bbfc5ca563bf1c6e4add",
"gitHead": "85bcae3041a0664d7c0ee4756241e29ad1063a9a",
"storybook": {
"displayName": "Interactions",
"unsupportedFrameworks": [
Expand Down
16 changes: 8 additions & 8 deletions addons/jest/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@storybook/addon-jest",
"version": "6.5.0-beta.0",
"version": "6.5.0-beta.1",
"description": "React storybook addon that show component jest report",
"keywords": [
"addon",
Expand Down Expand Up @@ -47,12 +47,12 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.5.0-beta.0",
"@storybook/api": "6.5.0-beta.0",
"@storybook/client-logger": "6.5.0-beta.0",
"@storybook/components": "6.5.0-beta.0",
"@storybook/core-events": "6.5.0-beta.0",
"@storybook/theming": "6.5.0-beta.0",
"@storybook/addons": "6.5.0-beta.1",
"@storybook/api": "6.5.0-beta.1",
"@storybook/client-logger": "6.5.0-beta.1",
"@storybook/components": "6.5.0-beta.1",
"@storybook/core-events": "6.5.0-beta.1",
"@storybook/theming": "6.5.0-beta.1",
"core-js": "^3.8.2",
"global": "^4.4.0",
"react-sizeme": "^3.0.1",
Expand All @@ -74,7 +74,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "b2e85f3599c043815b18bbfc5ca563bf1c6e4add",
"gitHead": "85bcae3041a0664d7c0ee4756241e29ad1063a9a",
"storybook": {
"displayName": "Jest",
"icon": "https://pbs.twimg.com/profile_images/821713465245102080/mMtKIMax_400x400.jpg",
Expand Down
Loading

0 comments on commit f2f9e39

Please sign in to comment.