Skip to content

Commit

Permalink
Merge pull request #28286 from storybookjs/norbert/yarn-4-3-sync
Browse files Browse the repository at this point in the history
Build: Use same version of `yarn` everywhere
  • Loading branch information
ndelangen committed Jun 19, 2024
2 parents 08d51e8 + ce10c8b commit 1943ee6
Show file tree
Hide file tree
Showing 24 changed files with 848 additions and 2,583 deletions.
893 changes: 0 additions & 893 deletions .yarn/releases/yarn-4.1.1.cjs

This file was deleted.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ nodeLinker: node-modules

npmPublishAccess: public

yarnPath: .yarn/releases/yarn-4.1.1.cjs
yarnPath: .yarn/releases/yarn-4.3.0.cjs
2 changes: 1 addition & 1 deletion code/.yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ supportedArchitectures:
unsafeHttpWhitelist:
- localhost

yarnPath: ../.yarn/releases/yarn-4.1.1.cjs
yarnPath: ../.yarn/releases/yarn-4.3.0.cjs
# Sometimes you get a "The remote archive doesn't match the expected checksum" error, uncommenting this line will fix it
# checksumBehavior: 'update'
2 changes: 1 addition & 1 deletion scripts/.yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ plugins:
unsafeHttpWhitelist:
- localhost

yarnPath: ../.yarn/releases/yarn-4.1.1.cjs
yarnPath: ../.yarn/releases/yarn-4.3.0.cjs
installStatePath: '../.yarn/scripts-install-state.gz'
# Sometimes you get a "The remote archive doesn't match the expected checksum" error, uncommenting this line will fix it
# checksumBehavior: 'update'
3 changes: 3 additions & 0 deletions test-storybooks/ember-cli/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
nodeLinker: node-modules
enableImmutableInstalls: false
yarnPath: ../../.yarn/releases/yarn-4.3.0.cjs
173 changes: 91 additions & 82 deletions test-storybooks/ember-cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ember-example",
"version": "7.2.0-alpha.0",
"version": "0.0.0",
"private": true,
"scripts": {
"--build-storybook": "yarn storybook-prebuild && NODE_OPTIONS=\"--preserve-symlinks --preserve-symlinks-main\" storybook build",
Expand All @@ -11,75 +11,84 @@
"storybook:dev": "yarn dev & NODE_OPTIONS=\"--preserve-symlinks --preserve-symlinks-main\" storybook dev -p 9009"
},
"resolutions": {
"@storybook/addon-a11y": "portal:../../code/addons/a11y",
"@storybook/addon-actions": "portal:../../code/addons/actions",
"@storybook/addon-backgrounds": "portal:../../code/addons/backgrounds",
"@storybook/addon-controls": "portal:../../code/addons/controls",
"@storybook/addon-docs": "portal:../../code/addons/docs",
"@storybook/addon-essentials": "portal:../../code/addons/essentials",
"@storybook/addon-highlight": "portal:../../code/addons/highlight",
"@storybook/addon-interactions": "portal:../../code/addons/interactions",
"@storybook/addon-jest": "portal:../../code/addons/jest",
"@storybook/addon-links": "portal:../../code/addons/links",
"@storybook/addon-measure": "portal:../../code/addons/measure",
"@storybook/addon-outline": "portal:../../code/addons/outline",
"@storybook/addon-storysource": "portal:../../code/addons/storysource",
"@storybook/addon-toolbars": "portal:../../code/addons/toolbars",
"@storybook/addon-viewport": "portal:../../code/addons/viewport",
"@storybook/angular": "portal:../../code/frameworks/angular",
"@storybook/blocks": "portal:../../code/lib/blocks",
"@storybook/builder-manager": "portal:../../code/builders/builder-manager",
"@storybook/builder-vite": "portal:../../code/builders/builder-vite",
"@storybook/builder-webpack5": "portal:../../code/builders/builder-webpack5",
"@storybook/channels": "portal:../../code/lib/channels",
"@storybook/cli": "portal:../../code/lib/cli",
"@storybook/client-logger": "portal:../../code/lib/client-logger",
"@storybook/codemod": "portal:../../code/lib/codemod",
"@storybook/components": "portal:../../code/lib/components",
"@storybook/core-common": "portal:../../code/lib/core-common",
"@storybook/core-events": "portal:../../code/lib/core-events",
"@storybook/core-server": "portal:../../code/lib/core-server",
"@storybook/core-webpack": "portal:../../code/lib/core-webpack",
"@storybook/csf-tools": "portal:../../code/lib/csf-tools",
"@storybook/docs-tools": "portal:../../code/lib/docs-tools",
"@storybook/ember": "portal:../../code/frameworks/ember",
"@storybook/html": "portal:../../code/renderers/html",
"@storybook/html-webpack5": "portal:../../code/frameworks/html-webpack5",
"@storybook/instrumenter": "portal:../../code/lib/instrumenter",
"@storybook/manager": "portal:../../code/ui/manager",
"@storybook/nextjs": "portal:../../code/frameworks/nextjs",
"@storybook/node-logger": "portal:../../code/lib/node-logger",
"@storybook/preact": "portal:../../code/renderers/preact",
"@storybook/preact-webpack5": "portal:../../code/frameworks/preact-webpack5",
"@storybook/preset-html-webpack": "portal:../../code/presets/html-webpack",
"@storybook/preset-preact-webpack": "portal:../../code/presets/preact-webpack",
"@storybook/preset-react-webpack": "portal:../../code/presets/react-webpack",
"@storybook/preset-server-webpack": "portal:../../code/presets/server-webpack",
"@storybook/preset-svelte-webpack": "portal:../../code/presets/svelte-webpack",
"@storybook/preset-vue3-webpack": "portal:../../code/presets/vue3-webpack",
"@storybook/preset-web-components-webpack": "portal:../../code/presets/web-components-webpack",
"@storybook/react": "portal:../../code/renderers/react",
"@storybook/react-vite": "portal:../../code/frameworks/react-vite",
"@storybook/react-webpack5": "portal:../../code/frameworks/react-webpack5",
"@storybook/router": "portal:../../code/lib/router",
"@storybook/server": "portal:../../code/renderers/server",
"@storybook/server-webpack5": "portal:../../code/frameworks/server-webpack5",
"@storybook/source-loader": "portal:../../code/lib/source-loader",
"@storybook/svelte": "portal:../../code/renderers/svelte",
"@storybook/svelte-vite": "portal:../../code/frameworks/svelte-vite",
"@storybook/svelte-webpack5": "portal:../../code/frameworks/svelte-webpack5",
"@storybook/telemetry": "portal:../../code/lib/telemetry",
"@storybook/theming": "portal:../../code/lib/theming",
"@storybook/vue": "portal:../../code/renderers/vue",
"@storybook/vue-vite": "portal:../../code/frameworks/vue-vite",
"@storybook/vue3": "portal:../../code/renderers/vue3",
"@storybook/vue3-vite": "portal:../../code/frameworks/vue3-vite",
"@storybook/vue3-webpack5": "portal:../../code/frameworks/vue3-webpack5",
"@storybook/web-components": "portal:../../code/renderers/web-components",
"@storybook/web-components-vite": "portal:../../code/frameworks/web-components-vite",
"@storybook/web-components-webpack5": "portal:../../code/frameworks/web-components-webpack5",
"sb": "portal:../../code/lib/cli-sb",
"storybook": "portal:../../code/lib/cli-storybook"
"@storybook/addon-a11y": "file:../../code/addons/a11y",
"@storybook/addon-actions": "file:../../code/addons/actions",
"@storybook/addon-backgrounds": "file:../../code/addons/backgrounds",
"@storybook/addon-controls": "file:../../code/addons/controls",
"@storybook/addon-docs": "file:../../code/addons/docs",
"@storybook/addon-essentials": "file:../../code/addons/essentials",
"@storybook/addon-highlight": "file:../../code/addons/highlight",
"@storybook/addon-interactions": "file:../../code/addons/interactions",
"@storybook/addon-jest": "file:../../code/addons/jest",
"@storybook/addon-links": "file:../../code/addons/links",
"@storybook/addon-mgx-gfm": "file:../../code/addons/mgx-gfm",
"@storybook/addon-measure": "file:../../code/addons/measure",
"@storybook/addon-outline": "file:../../code/addons/outline",
"@storybook/addon-storysource": "file:../../code/addons/storysource",
"@storybook/addon-themes": "file:../../code/addons/themes",
"@storybook/addon-toolbars": "file:../../code/addons/toolbars",
"@storybook/addon-viewport": "file:../../code/addons/viewport",
"@storybook/angular": "file:../../code/frameworks/angular",
"@storybook/blocks": "file:../../code/ui/blocks",
"@storybook/builder-manager": "file:../../code/builders/builder-manager",
"@storybook/builder-vite": "file:../../code/builders/builder-vite",
"@storybook/builder-webpack5": "file:../../code/builders/builder-webpack5",
"@storybook/channels": "file:../../code/lib/channels",
"@storybook/cli": "file:../../code/lib/cli",
"@storybook/client-logger": "file:../../code/lib/client-logger",
"@storybook/codemod": "file:../../code/lib/codemod",
"@storybook/components": "file:../../code/ui/components",
"@storybook/core-common": "file:../../code/lib/core-common",
"@storybook/core-events": "file:../../code/lib/core-events",
"@storybook/core-server": "file:../../code/lib/core-server",
"@storybook/core-webpack": "file:../../code/lib/core-webpack",
"@storybook/csf-plugin": "file:../../code/lib/csf-plugin",
"@storybook/csf-tools": "file:../../code/lib/csf-tools",
"@storybook/docs-tools": "file:../../code/lib/docs-tools",
"@storybook/ember": "file:../../code/frameworks/ember",
"@storybook/html": "file:../../code/renderers/html",
"@storybook/html-webpack5": "file:../../code/frameworks/html-webpack5",
"@storybook/instrumenter": "file:../../code/lib/instrumenter",
"@storybook/manager": "file:../../code/ui/manager",
"@storybook/manager-api": "file:../../code/lib/manager-api",
"@storybook/nextjs": "file:../../code/frameworks/nextjs",
"@storybook/node-logger": "file:../../code/lib/node-logger",
"@storybook/preact": "file:../../code/renderers/preact",
"@storybook/preact-vite": "file:../../code/frameworks/preact-vite",
"@storybook/preact-webpack5": "file:../../code/frameworks/preact-webpack5",
"@storybook/preset-create-react-app": "file:../../code/presets/create-react-app",
"@storybook/preset-html-webpack": "file:../../code/presets/html-webpack",
"@storybook/preset-preact-webpack": "file:../../code/presets/preact-webpack",
"@storybook/preset-react-webpack": "file:../../code/presets/react-webpack",
"@storybook/preset-server-webpack": "file:../../code/presets/server-webpack",
"@storybook/preset-svelte-webpack": "file:../../code/presets/svelte-webpack",
"@storybook/preset-vue3-webpack": "file:../../code/presets/vue3-webpack",
"@storybook/preview": "file:../../code/lib/preview",
"@storybook/preview-api": "file:../../code/lib/preview-api",
"@storybook/react": "file:../../code/renderers/react",
"@storybook/react-dom-shim": "file:../../code/lib/react-dom-shim",
"@storybook/react-vite": "file:../../code/frameworks/react-vite",
"@storybook/react-webpack5": "file:../../code/frameworks/react-webpack5",
"@storybook/router": "file:../../code/lib/router",
"@storybook/server": "file:../../code/renderers/server",
"@storybook/server-webpack5": "file:../../code/frameworks/server-webpack5",
"@storybook/source-loader": "file:../../code/lib/source-loader",
"@storybook/svelte": "file:../../code/renderers/svelte",
"@storybook/svelte-vite": "file:../../code/frameworks/svelte-vite",
"@storybook/svelte-webpack5": "file:../../code/frameworks/svelte-webpack5",
"@storybook/sveltekit": "file:../../code/frameworks/sveltekit",
"@storybook/telemetry": "file:../../code/lib/telemetry",
"@storybook/test": "file:../../code/lib/test",
"@storybook/theming": "file:../../code/lib/theming",
"@storybook/types": "file:../../code/lib/types",
"@storybook/vue3": "file:../../code/renderers/vue3",
"@storybook/vue3-vite": "file:../../code/frameworks/vue3-vite",
"@storybook/vue3-webpack5": "file:../../code/frameworks/vue3-webpack5",
"@storybook/web-components": "file:../../code/renderers/web-components",
"@storybook/web-components-vite": "file:../../code/frameworks/web-components-vite",
"@storybook/web-components-webpack5": "file:../../code/frameworks/web-components-webpack5",
"sb": "file:../../code/lib/cli-sb",
"storybook": "file:../../code/lib/cli-storybook"
},
"dependencies": {
"ember-named-blocks-polyfill": "^0.2.3",
Expand All @@ -88,18 +97,18 @@
"devDependencies": {
"@babel/core": "^7.22.0",
"@ember/optional-features": "^2.0.0",
"@storybook/addon-a11y": "7.2.0-alpha.0",
"@storybook/addon-actions": "7.2.0-alpha.0",
"@storybook/addon-backgrounds": "7.2.0-alpha.0",
"@storybook/addon-controls": "7.2.0-alpha.0",
"@storybook/addon-docs": "7.2.0-alpha.0",
"@storybook/addon-highlight": "7.2.0-alpha.0",
"@storybook/addon-links": "7.2.0-alpha.0",
"@storybook/addon-storysource": "7.2.0-alpha.0",
"@storybook/addon-viewport": "7.2.0-alpha.0",
"@storybook/ember": "7.2.0-alpha.0",
"@storybook/addon-a11y": "*",
"@storybook/addon-actions": "*",
"@storybook/addon-backgrounds": "*",
"@storybook/addon-controls": "*",
"@storybook/addon-docs": "*",
"@storybook/addon-highlight": "*",
"@storybook/addon-links": "*",
"@storybook/addon-storysource": "*",
"@storybook/addon-viewport": "*",
"@storybook/ember": "*",
"@storybook/ember-cli-storybook": "^0.2.1",
"@storybook/source-loader": "7.2.0-alpha.0",
"@storybook/source-loader": "*",
"babel-loader": "^8.2.5",
"broccoli-asset-rev": "^3.0.0",
"browserify-zlib": "^0.2.0",
Expand All @@ -119,7 +128,7 @@
"loader.js": "^4.7.0",
"os-browserify": "^0.3.0",
"shx": "^0.3.2",
"storybook": "7.2.0-alpha.0",
"storybook": "*",
"stream-browserify": "^3.0.0",
"vm-browserify": "^1.1.2",
"webpack": "5",
Expand Down
3 changes: 3 additions & 0 deletions test-storybooks/external-docs/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
nodeLinker: node-modules
enableImmutableInstalls: false
yarnPath: ../../.yarn/releases/yarn-4.3.0.cjs
Loading

0 comments on commit 1943ee6

Please sign in to comment.