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.

Sign up for GitHub

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

Jump to bottom

Core: Add Yarn 2 compatibility #9667

Merged
merged 5 commits into from
Feb 4, 2020
Merged

Core: Add Yarn 2 compatibility #9667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8b4fe4f
feat(core): create a function to resolve path of a file/dir in storyb…
gaetanmaisse Jan 28, 2020
b46444e
refactor(core): avoid duplication of code used to get path of files/d…
gaetanmaisse Jan 28, 2020
8af8666
feat(core): move webpack default output from `storybook/core` own pac…
gaetanmaisse Jan 28, 2020
782bf45
feat(core): update webpack config to handle Yarn PnP mode out of the box
gaetanmaisse Jan 28, 2020
a978bd2
chore: add missing or fix implicit transitive peerDependencies
gaetanmaisse Jan 30, 2020
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
4 changes: 4 additions & 0 deletions addons/a11y/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@
"@types/react-redux": "^7.0.6",
"@types/webpack-env": "^1.15.1"
},
"peerDependencies": {
"react-dom": "*",
"regenerator-runtime": "*"
},
"publishConfig": {
"access": "public"
},
Expand Down
4 changes: 4 additions & 0 deletions addons/actions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@
"@types/uuid": "^3.4.7",
"@types/webpack-env": "^1.15.1"
},
"peerDependencies": {
"react-dom": "*",
"regenerator-runtime": "*"
},
"publishConfig": {
"access": "public"
},
Expand Down
4 changes: 4 additions & 0 deletions addons/backgrounds/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@
"@types/util-deprecate": "^1.0.0",
"@types/webpack-env": "^1.15.1"
},
"peerDependencies": {
"react-dom": "*",
"regenerator-runtime": "*"
},
"publishConfig": {
"access": "public"
},
Expand Down
4 changes: 4 additions & 0 deletions addons/centered/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,9 @@
"preact": "*",
"react": "*"
},
"peerDependencies": {
"react-dom": "*",
"regenerator-runtime": "*"
},
"gitHead": "4b9d901add9452525135caae98ae5f78dd8da9ff"
}
15 changes: 14 additions & 1 deletion addons/contexts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,20 @@
"qs": "*",
"rax": "*",
"react": "*",
"vue": "*"
"vue": "*",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gaetanmaisse this PR somehow got removed: #7675

Do you think I should reapply that first before this PR? Would it change this part of this PR?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can keep it as it is and as it will be with this PR, from my point of view it's more semantically correct to have preact, rax and vue listed as peerDep as we are importing them in the source code of addon-context (in addons/contexts/preview/framework). Adding the peerDependenciesMeta info will prevent any npm/yarn warning about missing dep which was the main point of #7625 and #7625 (comment).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK cool

"react-dom": "*",
"regenerator-runtime": "*"
},
"peerDependenciesMeta": {
"preact": {
"optional": true
},
"rax": {
"optional": true
},
"vue": {
"optional": true
}
},
"publishConfig": {
"access": "public"
Expand Down
4 changes: 3 additions & 1 deletion addons/cssresources/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@
"@types/webpack-env": "^1.15.1"
},
"peerDependencies": {
"react": "*"
"react": "*",
"react-dom": "*",
"regenerator-runtime": "*"
},
"publishConfig": {
"access": "public"
Expand Down
4 changes: 4 additions & 0 deletions addons/design-assets/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@
"ts-dedent": "^1.1.1",
"use-image": "^1.0.3"
},
"peerDependencies": {
"react-dom": "*",
"regenerator-runtime": "*"
},
"publishConfig": {
"access": "public"
},
Expand Down
7 changes: 5 additions & 2 deletions addons/docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,12 @@
"jest-specific-snapshot": "^2.0.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0",
"babel-loader": "^8.0.0",
"react": "^16.8.0",
"react-is": "^16.8.0"
"react": "^16.9.0",
"react-is": "^16.8.0",
"react-dom": "*",
"regenerator-runtime": "*"
},
"publishConfig": {
"access": "public"
Expand Down
4 changes: 3 additions & 1 deletion addons/essentials/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@
"peerDependencies": {
"babel-loader": "^8.0.0",
"react": "^16.8.0",
"react-is": "^16.8.0"
"react-dom": "*",
"react-is": "^16.8.0",
"regenerator-runtime": "*"
},
"publishConfig": {
"access": "public"
Expand Down
4 changes: 3 additions & 1 deletion addons/events/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@
"@types/webpack-env": "^1.15.1"
},
"peerDependencies": {
"react": "*"
"react": "*",
"react-dom": "*",
"regenerator-runtime": "*"
},
"publishConfig": {
"access": "public"
Expand Down
4 changes: 4 additions & 0 deletions addons/google-analytics/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
"global": "^4.3.2",
"react-ga": "^2.5.7"
},
"peerDependencies": {
"react-dom": "*",
"regenerator-runtime": "*"
},
"publishConfig": {
"access": "public"
},
Expand Down
4 changes: 3 additions & 1 deletion addons/graphql/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@
"prop-types": "^15.7.2"
},
"peerDependencies": {
"react": "*"
"react": "*",
"react-dom": "*",
"regenerator-runtime": "*"
},
"publishConfig": {
"access": "public"
Expand Down
4 changes: 3 additions & 1 deletion addons/jest/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@
"@types/webpack-env": "^1.15.1"
},
"peerDependencies": {
"react": "*"
"react": "*",
"react-dom": "*",
"regenerator-runtime": "*"
},
"publishConfig": {
"access": "public"
Expand Down
4 changes: 3 additions & 1 deletion addons/knobs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@
"@types/webpack-env": "^1.15.1"
},
"peerDependencies": {
"react": "*"
"react": "*",
"react-dom": "*",
"regenerator-runtime": "*"
},
"publishConfig": {
"access": "public"
Expand Down
4 changes: 3 additions & 1 deletion addons/links/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@
"@types/webpack-env": "^1.15.1"
},
"peerDependencies": {
"react": "*"
"react": "*",
"react-dom": "*",
"regenerator-runtime": "*"
},
"publishConfig": {
"access": "public"
Expand Down
4 changes: 3 additions & 1 deletion addons/options/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@
"@types/webpack-env": "^1.15.1"
},
"peerDependencies": {
"react": "*"
"react": "*",
"react-dom": "*",
"regenerator-runtime": "*"
},
"publishConfig": {
"access": "public"
Expand Down
4 changes: 4 additions & 0 deletions addons/queryparams/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@
"devDependencies": {
"@types/webpack-env": "^1.15.1"
},
"peerDependencies": {
"react-dom": "*",
"regenerator-runtime": "*"
},
"publishConfig": {
"access": "public"
},
Expand Down
4 changes: 4 additions & 0 deletions addons/storyshots/storyshots-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@
"jest-emotion": "^10.0.17",
"react": "^16.8.3"
},
"peerDependencies": {
"react-dom": "*",
"regenerator-runtime": "*"
},
"publishConfig": {
"access": "public"
},
Expand Down
3 changes: 2 additions & 1 deletion addons/storysource/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@
},
"peerDependencies": {
"@storybook/source-loader": "*",
"react": "*"
"react": "*",
"react-dom": "*"
},
"publishConfig": {
"access": "public"
Expand Down
4 changes: 3 additions & 1 deletion addons/viewport/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@
"@types/util-deprecate": "^1.0.0"
},
"peerDependencies": {
"react": "*"
"react": "*",
"react-dom": "*",
"regenerator-runtime": "*"
},
"publishConfig": {
"access": "public"
Expand Down
3 changes: 3 additions & 0 deletions app/angular/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,11 @@
"@angular/forms": ">=6.0.0",
"@angular/platform-browser": ">=6.0.0",
"@angular/platform-browser-dynamic": ">=6.0.0",
"@babel/core": "*",
"autoprefixer": "^8.1.0",
"babel-loader": "^7.0.0 || ^8.0.0",
"react": "*",
"react-dom": "*",
"rxjs": "^6.0.0",
"typescript": "^3.4.0",
"webpack": "^4.32.0",
Expand Down
5 changes: 4 additions & 1 deletion app/ember/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,12 @@
"ts-dedent": "^1.1.1"
},
"peerDependencies": {
"@babel/core": "*",
"babel-loader": "^7.0.0 || ^8.0.0",
"babel-plugin-ember-modules-api-polyfill": "^2.12.0",
"ember-source": "^3.16.0"
"ember-source": "^3.16.0",
"react": "*",
"react-dom": "*"
},
"engines": {
"node": ">=8.0.0"
Expand Down
5 changes: 4 additions & 1 deletion app/html/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@
"ts-dedent": "^1.1.1"
},
"peerDependencies": {
"babel-loader": "^7.0.0 || ^8.0.0"
"@babel/core": "*",
"babel-loader": "^7.0.0 || ^8.0.0",
"react": "*",
"react-dom": "*"
},
"engines": {
"node": ">=8.0.0"
Expand Down
97 changes: 51 additions & 46 deletions app/marionette/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,48 +1,53 @@
{
"name": "@storybook/marionette",
"version": "6.0.0-alpha.4",
"description": "Storybook for Marionette: Develop Marionette.js component in isolation with Hot Reloading.",
"keywords": [
"storybook"
],
"homepage": "https://github.com/storybookjs/storybook/tree/master/app/marionette",
"bugs": {
"url": "https://github.com/storybookjs/storybook/issues"
},
"repository": {
"type": "git",
"url": "https://github.com/storybookjs/storybook.git",
"directory": "app/marionette"
},
"license": "MIT",
"main": "dist/client/index.js",
"bin": {
"build-storybook": "./bin/build.js",
"start-storybook": "./bin/index.js",
"storybook-server": "./bin/index.js"
},
"scripts": {
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/core": "6.0.0-alpha.4",
"common-tags": "^1.8.0",
"core-js": "^3.0.1",
"global": "^4.3.2",
"html-loader": "^0.5.5",
"regenerator-runtime": "^0.12.1"
},
"devDependencies": {
"backbone.marionette": "*"
},
"peerDependencies": {
"babel-loader": "^7.0.0 || ^8.0.0",
"backbone.marionette": "*"
},
"engines": {
"node": ">=8.0.0"
},
"publishConfig": {
"access": "public"
}
"name": "@storybook/marionette",
"version": "6.0.0-alpha.4",
"description": "Storybook for Marionette: Develop Marionette.js component in isolation with Hot Reloading.",
"keywords": [
"storybook"
],
"homepage": "https://github.com/storybookjs/storybook/tree/master/app/marionette",
"bugs": {
"url": "https://github.com/storybookjs/storybook/issues"
},
"repository": {
"type": "git",
"url": "https://github.com/storybookjs/storybook.git",
"directory": "app/marionette"
},
"license": "MIT",
"main": "dist/client/index.js",
"bin": {
"build-storybook": "./bin/build.js",
"start-storybook": "./bin/index.js",
"storybook-server": "./bin/index.js"
},
"scripts": {
"prepare": "node ../../scripts/prepare.js"
},
"dependencies": {
"@storybook/core": "6.0.0-alpha.4",
"common-tags": "^1.8.0",
"core-js": "^3.0.1",
"global": "^4.3.2",
"html-loader": "^0.5.5",
"regenerator-runtime": "^0.12.1"
},
"devDependencies": {
"backbone.marionette": "*"
},
"peerDependencies": {
"@babel/core": "*",
"babel-loader": "^7.0.0 || ^8.0.0",
"backbone": "*",
"backbone.marionette": "*",
"react": "*",
"react-dom": "*",
"underscore": "*"
},
"engines": {
"node": ">=8.0.0"
},
"publishConfig": {
"access": "public"
}
}
6 changes: 5 additions & 1 deletion app/marko/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,12 @@
"ts-dedent": "^1.1.1"
},
"peerDependencies": {
"@babel/core": "*",
"babel-loader": "^7.0.0 || ^8.0.0",
"marko": "^4.15.2"
"marko": "^4.15.2",
"react": "*",
"react-dom": "*",
"webpack": "^4"
},
"engines": {
"node": ">=8.0.0"
Expand Down
5 changes: 4 additions & 1 deletion app/mithril/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,11 @@
"mithril": "^1.1.6"
},
"peerDependencies": {
"@babel/core": "*",
"babel-loader": "^7.0.0 || ^8.0.0",
"mithril": "^1.1.6"
"mithril": "^1.1.6",
"react": "*",
"react-dom": "*"
},
"engines": {
"node": ">=8.0.0"
Expand Down
Loading