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

Build: Upgrade to Yarn 3 #15682

Merged
merged 5 commits into from Jul 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions .yarn/plugins/@yarnpkg/plugin-typescript.cjs

Large diffs are not rendered by default.

711 changes: 360 additions & 351 deletions .yarn/releases/yarn-sources.cjs

Large diffs are not rendered by default.

10 changes: 0 additions & 10 deletions examples/web-components-kitchen-sink/.yarnrc.yml
@@ -1,12 +1,2 @@
enableGlobalCache: true

# FIXME: Hack to make the CI happy; to remove as soon as we are using `workspace:*` in our deps instead of pin versions
enableImmutableInstalls: false

nodeLinker: node-modules

plugins:
- path: ../../.yarn/plugins/@yarnpkg/plugin-typescript.cjs
spec: "@yarnpkg/plugin-typescript"

yarnPath: ../../.yarn/releases/yarn-sources.cjs
4 changes: 2 additions & 2 deletions examples/web-components-kitchen-sink/package.json
Expand Up @@ -26,7 +26,6 @@
"@storybook/addons": "portal:../../lib/addons",
"@storybook/api": "portal:../../lib/api",
"@storybook/builder-webpack4": "portal:../../lib/builder-webpack4",
"@storybook/builder-webpack5": "portal:../../lib/builder-webpack5",
"@storybook/channel-postmessage": "portal:../../lib/channel-postmessage",
"@storybook/channel-websocket": "portal:../../lib/channel-websocket",
"@storybook/channels": "portal:../../lib/channels",
Expand All @@ -41,14 +40,15 @@
"@storybook/core-server": "portal:../../lib/core-server",
"@storybook/csf-tools": "portal:../../lib/csf-tools",
"@storybook/manager-webpack4": "portal:../../lib/manager-webpack4",
"@storybook/manager-webpack5": "portal:../../lib/manager-webpack5",
"@storybook/node-logger": "portal:../../lib/node-logger",
"@storybook/postinstall": "portal:../../lib/postinstall",
"@storybook/router": "portal:../../lib/router",
"@storybook/source-loader": "portal:../../lib/source-loader",
"@storybook/theming": "portal:../../lib/theming",
"@storybook/ui": "portal:../../lib/ui",
"@storybook/web-components": "portal:../../app/web-components",
"babel-plugin-macros": "3.1.0",
"fork-ts-checker-webpack-plugin": "6.2.13",
Comment on lines +50 to +51
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 had to set fixed versions because there are some incompatible versions range due to our webpack 4 & 5 mix in the monorepo (should be cleaned in SB 7)

"typescript": "4.2.4"
},
"dependencies": {
Expand Down
3,355 changes: 1,570 additions & 1,785 deletions examples/web-components-kitchen-sink/yarn.lock

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions lib/ui/package.json
Expand Up @@ -50,7 +50,6 @@
"@storybook/router": "6.4.0-alpha.22",
"@storybook/semver": "^7.3.2",
"@storybook/theming": "6.4.0-alpha.22",
"@types/markdown-to-jsx": "^6.11.3",
"copy-to-clipboard": "^3.3.1",
"core-js": "^3.8.2",
"core-js-pure": "^3.8.2",
Expand All @@ -59,7 +58,7 @@
"fuse.js": "^3.6.1",
"global": "^4.4.0",
"lodash": "^4.17.20",
"markdown-to-jsx": "^6.11.4",
"markdown-to-jsx": "^7.1.3",
"memoizerific": "^1.11.3",
"polished": "^4.0.5",
"qs": "^6.10.0",
Expand Down