Skip to content

Commit

Permalink
Merge branch 'next' into tech/prebundle-wip
Browse files Browse the repository at this point in the history
# Conflicts:
#	lib/theming/package.json
#	yarn.lock
  • Loading branch information
ndelangen committed Jan 31, 2022
2 parents 4607ea6 + f6ea1a4 commit be09c8f
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
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Accessibility",
Expand Down
2 changes: 1 addition & 1 deletion addons/actions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Actions",
Expand Down
2 changes: 1 addition & 1 deletion addons/backgrounds/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Backgrounds",
Expand Down
2 changes: 1 addition & 1 deletion addons/controls/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/register.js",
"storybook": {
"displayName": "Controls",
Expand Down
2 changes: 1 addition & 1 deletion addons/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Docs",
Expand Down
2 changes: 1 addition & 1 deletion addons/essentials/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/index.js"
}
2 changes: 1 addition & 1 deletion addons/interactions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Interactions",
Expand Down
2 changes: 1 addition & 1 deletion addons/jest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Jest",
Expand Down
2 changes: 1 addition & 1 deletion addons/links/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Links",
Expand Down
2 changes: 1 addition & 1 deletion addons/measure/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Measure",
Expand Down
2 changes: 1 addition & 1 deletion addons/outline/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Outline",
Expand Down
2 changes: 1 addition & 1 deletion addons/storyshots/storyshots-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"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
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615"
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662"
}
2 changes: 1 addition & 1 deletion addons/storysource/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Storysource",
Expand Down
2 changes: 1 addition & 1 deletion addons/toolbars/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/register.js",
"storybook": {
"displayName": "Toolbars",
Expand Down
2 changes: 1 addition & 1 deletion addons/viewport/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/preview.js",
"storybook": {
"displayName": "Viewport",
Expand Down
2 changes: 1 addition & 1 deletion app/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -129,5 +129,5 @@
"access": "public"
},
"builders": "dist/ts3.9/builders/builders.json",
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615"
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662"
}
2 changes: 1 addition & 1 deletion app/ember/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/client/index.js"
}
2 changes: 1 addition & 1 deletion app/html/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/client/index.js"
}
2 changes: 1 addition & 1 deletion app/preact/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/client/index.js"
}
2 changes: 1 addition & 1 deletion app/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/client/index.js"
}
2 changes: 1 addition & 1 deletion app/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/client/index.js"
}
2 changes: 1 addition & 1 deletion app/svelte/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/client/index.js"
}
2 changes: 1 addition & 1 deletion app/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/client/index.js"
}
2 changes: 1 addition & 1 deletion app/vue3/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/client/index.js"
}
2 changes: 1 addition & 1 deletion app/web-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/client/index.js"
}
2 changes: 1 addition & 1 deletion docs/versions/next.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"version":"6.5.0-alpha.29","info":{"plain":"### Bug Fixes\n\n* Revert \"Angular: Retrieve version from core package\" ([#17372](https://github.com/storybookjs/storybook/pull/17372))"}}
{"version":"6.5.0-alpha.30","info":{"plain":"### Maintenance\n\n* Build: Enforce stricter types ([#17368](https://github.com/storybookjs/storybook/pull/17368))"}}
2 changes: 1 addition & 1 deletion lib/addons/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/public_api.js"
}
2 changes: 1 addition & 1 deletion lib/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/index.js"
}
2 changes: 1 addition & 1 deletion lib/builder-webpack4/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/index.js"
}
2 changes: 1 addition & 1 deletion lib/builder-webpack5/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/index.js"
}
2 changes: 1 addition & 1 deletion lib/channel-postmessage/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/index.js"
}
2 changes: 1 addition & 1 deletion lib/channel-websocket/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/index.js"
}
2 changes: 1 addition & 1 deletion lib/channels/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/index.js"
}
2 changes: 1 addition & 1 deletion lib/cli-sb/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615"
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662"
}
2 changes: 1 addition & 1 deletion lib/cli-storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615"
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662"
}
2 changes: 1 addition & 1 deletion lib/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,5 +91,5 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615"
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662"
}
2 changes: 1 addition & 1 deletion lib/client-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/index.js"
}
2 changes: 1 addition & 1 deletion lib/client-logger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/index.js"
}
2 changes: 1 addition & 1 deletion lib/codemod/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/index.js"
}
2 changes: 1 addition & 1 deletion lib/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/index.js"
}
2 changes: 1 addition & 1 deletion lib/core-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/index.js"
}
2 changes: 1 addition & 1 deletion lib/core-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/index.js"
}
2 changes: 1 addition & 1 deletion lib/core-events/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/index.js"
}
2 changes: 1 addition & 1 deletion lib/core-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/index.js"
}
2 changes: 1 addition & 1 deletion lib/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/index.js"
}
2 changes: 1 addition & 1 deletion lib/csf-tools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/index.js"
}
2 changes: 1 addition & 1 deletion lib/instrumenter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/index.js"
}
2 changes: 1 addition & 1 deletion lib/manager-webpack4/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,6 @@
"publishConfig": {
"access": "public"
},
"gitHead": "a8c2388d04deb833ac39c40f27b0585c47456615",
"gitHead": "4dc5ec5956f3a8cfb07e3c4b3442fb3f6ac95662",
"sbmodern": "dist/modern/index.js"
}
Loading

0 comments on commit be09c8f

Please sign in to comment.