Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Core: Change react deps to normal deps #11628

Merged
merged 15 commits into from
Sep 10, 2020
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'next' into tech/no-peer-dep-react
gaetanmaisse committed Sep 9, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit b63401af0653b38106d8b374091813cc5379be96
1 change: 1 addition & 0 deletions addons/docs/package.json
Original file line number Diff line number Diff line change
@@ -119,6 +119,7 @@
"peerDependencies": {
"@babel/core": "^7.0.0-0",
"babel-loader": "^8.0.0",
"sveltedoc-parser": "^3.0.4",
"vue": "^2.6.10",
"vue-docgen-api": "^4.29.1",
"vue-docgen-loader": "^1.5.0",
2 changes: 1 addition & 1 deletion addons/essentials/package.json
Original file line number Diff line number Diff line change
@@ -38,10 +38,10 @@
"@storybook/api": "6.1.0-alpha.4",
"@storybook/node-logger": "6.1.0-alpha.4",
"core-js": "^3.0.1",
"regenerator-runtime": "^0.13.3",
"react": "^16.8.3",
"react-dom": "^16.8.3",
"react-is": "^16.8.0",
"regenerator-runtime": "^0.13.3",
"ts-dedent": "^1.1.1"
},
"devDependencies": {
2 changes: 1 addition & 1 deletion addons/graphql/package.json
Original file line number Diff line number Diff line change
@@ -40,9 +40,9 @@
"graphiql": "^0.17.5",
"graphql": "^15.0.0",
"prop-types": "^15.7.2",
"regenerator-runtime": "^0.13.3",
"react": "^16.8.3",
"react-dom": "^16.8.3",
"regenerator-runtime": "^0.13.3",
"webpack": "^4.43.0"
},
"publishConfig": {
2 changes: 1 addition & 1 deletion addons/knobs/package.json
Original file line number Diff line number Diff line change
@@ -45,8 +45,8 @@
"prop-types": "^15.7.2",
"qs": "^6.6.0",
"react": "^16.8.3",
"react-dom": "^16.8.3",
"react-color": "^2.17.0",
"react-dom": "^16.8.3",
"react-lifecycles-compat": "^3.0.4",
"react-select": "^3.0.8",
"regenerator-runtime": "^0.13.3"
2 changes: 1 addition & 1 deletion addons/links/package.json
Original file line number Diff line number Diff line change
@@ -39,9 +39,9 @@
"global": "^4.3.2",
"prop-types": "^15.7.2",
"qs": "^6.6.0",
"regenerator-runtime": "^0.13.3",
"react": "^16.8.3",
"react-dom": "^16.8.3",
"regenerator-runtime": "^0.13.3",
"ts-dedent": "^1.1.1"
},
"devDependencies": {
4 changes: 2 additions & 2 deletions addons/storyshots/storyshots-core/package.json
Original file line number Diff line number Diff line change
@@ -45,11 +45,11 @@
"global": "^4.3.2",
"jest-specific-snapshot": "^4.0.0",
"pretty-format": "^26.4.0",
"read-pkg-up": "^7.0.0",
"regenerator-runtime": "^0.13.3",
"react": "^16.8.3",
"react-dom": "^16.8.3",
"react-test-renderer": "^16.8.3",
"read-pkg-up": "^7.0.0",
"regenerator-runtime": "^0.13.3",
"ts-dedent": "^1.1.1"
},
"devDependencies": {
8 changes: 4 additions & 4 deletions addons/toolbars/package.json
Original file line number Diff line number Diff line change
@@ -30,10 +30,10 @@
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/addons": "6.1.0-alpha.1",
"@storybook/api": "6.1.0-alpha.1",
"@storybook/client-api": "6.1.0-alpha.1",
"@storybook/components": "6.1.0-alpha.1",
"@storybook/addons": "6.1.0-alpha.4",
"@storybook/api": "6.1.0-alpha.4",
"@storybook/client-api": "6.1.0-alpha.4",
"@storybook/components": "6.1.0-alpha.4",
"core-js": "^3.0.1",
"react": "^16.8.3",
"react-dom": "^16.8.3"
4 changes: 2 additions & 2 deletions addons/viewport/package.json
Original file line number Diff line number Diff line change
@@ -39,9 +39,9 @@
"global": "^4.3.2",
"memoizerific": "^1.11.3",
"prop-types": "^15.7.2",
"regenerator-runtime": "^0.13.3",
"react": "^16.8.3",
"react-dom": "^16.8.3"
"react-dom": "^16.8.3",
"regenerator-runtime": "^0.13.3"
},
"publishConfig": {
"access": "public"
4 changes: 2 additions & 2 deletions app/react/package.json
Original file line number Diff line number Diff line change
@@ -49,12 +49,12 @@
"global": "^4.3.2",
"lodash": "^4.17.15",
"prop-types": "^15.7.2",
"react": "^16.8.3",
"react-dev-utils": "^10.0.0",
"react-docgen-typescript-plugin": "^0.5.2",
"react-dom": "^16.8.3",
"regenerator-runtime": "^0.13.3",
"ts-dedent": "^1.1.1",
"react": "^16.8.3",
"react-dom": "^16.8.3",
"webpack": "^4.43.0"
},
"devDependencies": {
2 changes: 1 addition & 1 deletion lib/api/src/version.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const version = '6.1.0-alpha.1';
export const version = '6.1.0-alpha.4';
106 changes: 53 additions & 53 deletions lib/cli/versions.json
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
{
"@storybook/addon-a11y": "6.1.0-alpha.1",
"@storybook/addon-actions": "6.1.0-alpha.1",
"@storybook/addon-backgrounds": "6.1.0-alpha.1",
"@storybook/addon-controls": "6.1.0-alpha.1",
"@storybook/addon-cssresources": "6.1.0-alpha.1",
"@storybook/addon-design-assets": "6.1.0-alpha.1",
"@storybook/addon-docs": "6.1.0-alpha.1",
"@storybook/addon-essentials": "6.1.0-alpha.1",
"@storybook/addon-events": "6.1.0-alpha.1",
"@storybook/addon-google-analytics": "6.1.0-alpha.1",
"@storybook/addon-graphql": "6.1.0-alpha.1",
"@storybook/addon-jest": "6.1.0-alpha.1",
"@storybook/addon-knobs": "6.1.0-alpha.1",
"@storybook/addon-links": "6.1.0-alpha.1",
"@storybook/addon-queryparams": "6.1.0-alpha.1",
"@storybook/addon-storyshots": "6.1.0-alpha.1",
"@storybook/addon-storyshots-puppeteer": "6.1.0-alpha.1",
"@storybook/addon-storysource": "6.1.0-alpha.1",
"@storybook/addon-toolbars": "6.1.0-alpha.1",
"@storybook/addon-viewport": "6.1.0-alpha.1",
"@storybook/addons": "6.1.0-alpha.1",
"@storybook/angular": "6.1.0-alpha.1",
"@storybook/api": "6.1.0-alpha.1",
"@storybook/aurelia": "6.1.0-alpha.1",
"@storybook/channel-postmessage": "6.1.0-alpha.1",
"@storybook/channel-websocket": "6.1.0-alpha.1",
"@storybook/channels": "6.1.0-alpha.1",
"@storybook/cli": "6.1.0-alpha.1",
"@storybook/client-api": "6.1.0-alpha.1",
"@storybook/client-logger": "6.1.0-alpha.1",
"@storybook/codemod": "6.1.0-alpha.1",
"@storybook/components": "6.1.0-alpha.1",
"@storybook/core": "6.1.0-alpha.1",
"@storybook/core-events": "6.1.0-alpha.1",
"@storybook/ember": "6.1.0-alpha.1",
"@storybook/html": "6.1.0-alpha.1",
"@storybook/marionette": "6.1.0-alpha.1",
"@storybook/marko": "6.1.0-alpha.1",
"@storybook/mithril": "6.1.0-alpha.1",
"@storybook/node-logger": "6.1.0-alpha.1",
"@storybook/postinstall": "6.1.0-alpha.1",
"@storybook/preact": "6.1.0-alpha.1",
"@storybook/rax": "6.1.0-alpha.1",
"@storybook/react": "6.1.0-alpha.1",
"@storybook/riot": "6.1.0-alpha.1",
"@storybook/router": "6.1.0-alpha.1",
"@storybook/server": "6.1.0-alpha.1",
"@storybook/source-loader": "6.1.0-alpha.1",
"@storybook/svelte": "6.1.0-alpha.1",
"@storybook/theming": "6.1.0-alpha.1",
"@storybook/ui": "6.1.0-alpha.1",
"@storybook/vue": "6.1.0-alpha.1",
"@storybook/web-components": "6.1.0-alpha.1"
"@storybook/addon-a11y": "6.1.0-alpha.4",
"@storybook/addon-actions": "6.1.0-alpha.4",
"@storybook/addon-backgrounds": "6.1.0-alpha.4",
"@storybook/addon-controls": "6.1.0-alpha.4",
"@storybook/addon-cssresources": "6.1.0-alpha.4",
"@storybook/addon-design-assets": "6.1.0-alpha.4",
"@storybook/addon-docs": "6.1.0-alpha.4",
"@storybook/addon-essentials": "6.1.0-alpha.4",
"@storybook/addon-events": "6.1.0-alpha.4",
"@storybook/addon-google-analytics": "6.1.0-alpha.4",
"@storybook/addon-graphql": "6.1.0-alpha.4",
"@storybook/addon-jest": "6.1.0-alpha.4",
"@storybook/addon-knobs": "6.1.0-alpha.4",
"@storybook/addon-links": "6.1.0-alpha.4",
"@storybook/addon-queryparams": "6.1.0-alpha.4",
"@storybook/addon-storyshots": "6.1.0-alpha.4",
"@storybook/addon-storyshots-puppeteer": "6.1.0-alpha.4",
"@storybook/addon-storysource": "6.1.0-alpha.4",
"@storybook/addon-toolbars": "6.1.0-alpha.4",
"@storybook/addon-viewport": "6.1.0-alpha.4",
"@storybook/addons": "6.1.0-alpha.4",
"@storybook/angular": "6.1.0-alpha.4",
"@storybook/api": "6.1.0-alpha.4",
"@storybook/aurelia": "6.1.0-alpha.4",
"@storybook/channel-postmessage": "6.1.0-alpha.4",
"@storybook/channel-websocket": "6.1.0-alpha.4",
"@storybook/channels": "6.1.0-alpha.4",
"@storybook/cli": "6.1.0-alpha.4",
"@storybook/client-api": "6.1.0-alpha.4",
"@storybook/client-logger": "6.1.0-alpha.4",
"@storybook/codemod": "6.1.0-alpha.4",
"@storybook/components": "6.1.0-alpha.4",
"@storybook/core": "6.1.0-alpha.4",
"@storybook/core-events": "6.1.0-alpha.4",
"@storybook/ember": "6.1.0-alpha.4",
"@storybook/html": "6.1.0-alpha.4",
"@storybook/marionette": "6.1.0-alpha.4",
"@storybook/marko": "6.1.0-alpha.4",
"@storybook/mithril": "6.1.0-alpha.4",
"@storybook/node-logger": "6.1.0-alpha.4",
"@storybook/postinstall": "6.1.0-alpha.4",
"@storybook/preact": "6.1.0-alpha.4",
"@storybook/rax": "6.1.0-alpha.4",
"@storybook/react": "6.1.0-alpha.4",
"@storybook/riot": "6.1.0-alpha.4",
"@storybook/router": "6.1.0-alpha.4",
"@storybook/server": "6.1.0-alpha.4",
"@storybook/source-loader": "6.1.0-alpha.4",
"@storybook/svelte": "6.1.0-alpha.4",
"@storybook/theming": "6.1.0-alpha.4",
"@storybook/ui": "6.1.0-alpha.4",
"@storybook/vue": "6.1.0-alpha.4",
"@storybook/web-components": "6.1.0-alpha.4"
}
2 changes: 1 addition & 1 deletion lib/core/package.json
Original file line number Diff line number Diff line change
@@ -113,8 +113,8 @@
"qs": "^6.6.0",
"raw-loader": "^4.0.1",
"react": "^16.8.3",
"react-dom": "^16.8.3",
"react-dev-utils": "^10.0.0",
"react-dom": "^16.8.3",
"regenerator-runtime": "^0.13.3",
"resolve-from": "^5.0.0",
"serve-favicon": "^2.5.0",
4 changes: 2 additions & 2 deletions lib/source-loader/package.json
Original file line number Diff line number Diff line change
@@ -38,9 +38,9 @@
"loader-utils": "^2.0.0",
"lodash": "^4.17.15",
"prettier": "~2.0.5",
"regenerator-runtime": "^0.13.3",
"react": "^16.8.3",
"react-dom": "^16.8.3"
"react-dom": "^16.8.3",
"regenerator-runtime": "^0.13.3"
},
"publishConfig": {
"access": "public"
2 changes: 1 addition & 1 deletion lib/theming/package.json
Original file line number Diff line number Diff line change
@@ -38,9 +38,9 @@
"global": "^4.3.2",
"memoizerific": "^1.11.3",
"polished": "^3.4.4",
"resolve-from": "^5.0.0",
"react": "^16.8.3",
"react-dom": "^16.8.3",
"resolve-from": "^5.0.0",
"ts-dedent": "^1.1.1"
},
"publishConfig": {
You are viewing a condensed version of this merge commit. You can view the full changes here.