Skip to content

Commit

Permalink
Merge branch 'next' into tech/lockfile-regen
Browse files Browse the repository at this point in the history
# Conflicts:
#	yarn.lock
  • Loading branch information
ndelangen committed Jan 20, 2022
2 parents 55b6fb1 + 35046ac commit 1281fb5
Show file tree
Hide file tree
Showing 58 changed files with 58 additions and 58 deletions.
2 changes: 1 addition & 1 deletion addons/a11y/package.json
Expand Up @@ -81,7 +81,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Accessibility",
Expand Down
2 changes: 1 addition & 1 deletion addons/actions/package.json
Expand Up @@ -79,7 +79,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Actions",
Expand Down
2 changes: 1 addition & 1 deletion addons/backgrounds/package.json
Expand Up @@ -77,7 +77,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Backgrounds",
Expand Down
2 changes: 1 addition & 1 deletion addons/controls/package.json
Expand Up @@ -73,7 +73,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/register.js",
"storybook": {
"displayName": "Controls",
Expand Down
2 changes: 1 addition & 1 deletion addons/docs/package.json
Expand Up @@ -203,7 +203,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Docs",
Expand Down
2 changes: 1 addition & 1 deletion addons/essentials/package.json
Expand Up @@ -93,6 +93,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/index.js"
}
2 changes: 1 addition & 1 deletion addons/interactions/package.json
Expand Up @@ -74,7 +74,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Interactions",
Expand Down
2 changes: 1 addition & 1 deletion addons/jest/package.json
Expand Up @@ -76,7 +76,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Jest",
Expand Down
2 changes: 1 addition & 1 deletion addons/links/package.json
Expand Up @@ -72,7 +72,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Links",
Expand Down
2 changes: 1 addition & 1 deletion addons/measure/package.json
Expand Up @@ -71,7 +71,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Measure",
Expand Down
2 changes: 1 addition & 1 deletion addons/outline/package.json
Expand Up @@ -76,7 +76,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Outline",
Expand Down
2 changes: 1 addition & 1 deletion addons/storyshots/storyshots-core/package.json
Expand Up @@ -151,7 +151,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"storybook": {
"displayName": "Storyshots",
"icon": "https://user-images.githubusercontent.com/263385/101991676-48cdf300-3c7c-11eb-8aa1-944dab6ab29b.png",
Expand Down
2 changes: 1 addition & 1 deletion addons/storyshots/storyshots-puppeteer/package.json
Expand Up @@ -64,5 +64,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d"
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2"
}
2 changes: 1 addition & 1 deletion addons/storysource/package.json
Expand Up @@ -75,7 +75,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Storysource",
Expand Down
2 changes: 1 addition & 1 deletion addons/toolbars/package.json
Expand Up @@ -67,7 +67,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/register.js",
"storybook": {
"displayName": "Toolbars",
Expand Down
2 changes: 1 addition & 1 deletion addons/viewport/package.json
Expand Up @@ -69,7 +69,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/preview.js",
"storybook": {
"displayName": "Viewport",
Expand Down
2 changes: 1 addition & 1 deletion app/angular/package.json
Expand Up @@ -129,5 +129,5 @@
"access": "public"
},
"builders": "dist/ts3.9/builders/builders.json",
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d"
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2"
}
2 changes: 1 addition & 1 deletion app/ember/package.json
Expand Up @@ -66,6 +66,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/client/index.js"
}
2 changes: 1 addition & 1 deletion app/html/package.json
Expand Up @@ -72,6 +72,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/client/index.js"
}
2 changes: 1 addition & 1 deletion app/preact/package.json
Expand Up @@ -75,6 +75,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/client/index.js"
}
2 changes: 1 addition & 1 deletion app/react/package.json
Expand Up @@ -96,6 +96,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/client/index.js"
}
2 changes: 1 addition & 1 deletion app/server/package.json
Expand Up @@ -76,6 +76,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/client/index.js"
}
2 changes: 1 addition & 1 deletion app/svelte/package.json
Expand Up @@ -75,6 +75,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/client/index.js"
}
2 changes: 1 addition & 1 deletion app/vue/package.json
Expand Up @@ -83,6 +83,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/client/index.js"
}
2 changes: 1 addition & 1 deletion app/vue3/package.json
Expand Up @@ -81,6 +81,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/client/index.js"
}
2 changes: 1 addition & 1 deletion app/web-components/package.json
Expand Up @@ -80,6 +80,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/client/index.js"
}
2 changes: 1 addition & 1 deletion docs/versions/next.json
@@ -1 +1 @@
{"version":"6.5.0-alpha.21","info":{"plain":"### Features\n\n* Webpack5: Switch to using `import.meta.webpackHot.accept` ([#17270](https://github.com/storybookjs/storybook/pull/17270))"}}
{"version":"6.5.0-alpha.22","info":{"plain":"### Features\n\n- Svelte: Add CSF3 default render function ([#17276](https://github.com/storybookjs/storybook/pull/17276))\n- CLI: Add `--no-manager-cache` to build-storybook ([#17300](https://github.com/storybookjs/storybook/pull/17300))\n\n### Maintenance\n\n- Build: Upgrade yarn to 3.1.1 ([#17281](https://github.com/storybookjs/storybook/pull/17281))"}}
2 changes: 1 addition & 1 deletion lib/addons/package.json
Expand Up @@ -59,6 +59,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/public_api.js"
}
2 changes: 1 addition & 1 deletion lib/api/package.json
Expand Up @@ -71,6 +71,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/index.js"
}
2 changes: 1 addition & 1 deletion lib/builder-webpack4/package.json
Expand Up @@ -129,6 +129,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/index.js"
}
2 changes: 1 addition & 1 deletion lib/builder-webpack5/package.json
Expand Up @@ -116,6 +116,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/index.js"
}
2 changes: 1 addition & 1 deletion lib/channel-postmessage/package.json
Expand Up @@ -51,6 +51,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/index.js"
}
2 changes: 1 addition & 1 deletion lib/channel-websocket/package.json
Expand Up @@ -49,6 +49,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/index.js"
}
2 changes: 1 addition & 1 deletion lib/channels/package.json
Expand Up @@ -47,6 +47,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/index.js"
}
2 changes: 1 addition & 1 deletion lib/cli-sb/package.json
Expand Up @@ -29,5 +29,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d"
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2"
}
2 changes: 1 addition & 1 deletion lib/cli-storybook/package.json
Expand Up @@ -32,5 +32,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d"
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2"
}
2 changes: 1 addition & 1 deletion lib/cli/package.json
Expand Up @@ -92,5 +92,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d"
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2"
}
2 changes: 1 addition & 1 deletion lib/client-api/package.json
Expand Up @@ -68,6 +68,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/index.js"
}
2 changes: 1 addition & 1 deletion lib/client-logger/package.json
Expand Up @@ -46,6 +46,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/index.js"
}
2 changes: 1 addition & 1 deletion lib/codemod/package.json
Expand Up @@ -62,6 +62,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/index.js"
}
2 changes: 1 addition & 1 deletion lib/components/package.json
Expand Up @@ -77,6 +77,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/index.js"
}
2 changes: 1 addition & 1 deletion lib/core-client/package.json
Expand Up @@ -74,6 +74,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/index.js"
}
2 changes: 1 addition & 1 deletion lib/core-common/package.json
Expand Up @@ -110,6 +110,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/index.js"
}
2 changes: 1 addition & 1 deletion lib/core-events/package.json
Expand Up @@ -45,6 +45,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/index.js"
}
2 changes: 1 addition & 1 deletion lib/core-server/package.json
Expand Up @@ -113,6 +113,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/index.js"
}
2 changes: 1 addition & 1 deletion lib/core/package.json
Expand Up @@ -60,6 +60,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/index.js"
}
2 changes: 1 addition & 1 deletion lib/csf-tools/package.json
Expand Up @@ -65,6 +65,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/index.js"
}
2 changes: 1 addition & 1 deletion lib/instrumenter/package.json
Expand Up @@ -49,6 +49,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/index.js"
}
2 changes: 1 addition & 1 deletion lib/manager-webpack4/package.json
Expand Up @@ -97,6 +97,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "fc1a84084556d61fea8bcaa197f7d85f3a9a107d",
"gitHead": "585e074db08c2e8814c1342214ecf03505e585e2",
"sbmodern": "dist/modern/index.js"
}

0 comments on commit 1281fb5

Please sign in to comment.