Skip to content

Commit

Permalink
Upgrade yarn from version 1.22.21 to 3.4.1
Browse files Browse the repository at this point in the history
We’re running into a problem with the string-width dependency. A comment
from this GitHub issue suggests upgrading yarn to version 3.

storybookjs/storybook#22431
  • Loading branch information
tuzz committed Jan 18, 2024
1 parent 6f20db3 commit 25b060a
Show file tree
Hide file tree
Showing 10 changed files with 37,638 additions and 26,664 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
scope: '@RaspberryPiFoundation'

- name: Install code
run: yarn install --frozen-lock-file
run: yarn install --immutable
env:
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand All @@ -50,7 +50,7 @@ jobs:
scope: '@RaspberryPiFoundation'

- name: Install code
run: yarn install --frozen-lock-file
run: yarn install --immutable
env:
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
scope: '@RaspberryPiFoundation'

- name: Install code
run: yarn install --frozen-lock-file
run: yarn install --immutable
env:
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ jobs:
scope: '@RaspberryPiFoundation'

- name: Install code
run: yarn install --frozen-lock-file
run: yarn install --immutable
env:
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,7 @@ node_modules
npm-debug.log*
yarn-debug.log*
yarn-error.log*
.yarn/cache
.yarn/install-state.gz

.vscode/settings.json
873 changes: 873 additions & 0 deletions .yarn/releases/yarn-3.4.1.cjs

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.4.1.cjs

checksumBehavior: "update"
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

- Minor copy changes to HTML add file modal
- Toggle errors sent via apiCallHandler off (#890)
- Upgrade yarn to 3.4.1 to workaround a string-width issue

## [0.21.1] - 2024-01-11

Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"scripts": {
"start": "node scripts/start.js",
"build": "node scripts/build.js",
"build:dev": "yarn install --force && yarn run build-storybook && node scripts/build.js",
"build:dev": "yarn install --check-cache && yarn run build-storybook && node scripts/build.js",
"build-storybook": "cd ./storybook && yarn install && yarn run build-storybook -- -o ../public/storybook --loglevel warn",
"lint": "eslint \"src/**/*.{js,jsx,json}\"",
"lint:fix": "eslint --fix \"src/**/*.{js,jsx,json}\"",
Expand Down Expand Up @@ -246,5 +246,6 @@
"jest-watch-typeahead/testname"
],
"resetMocks": true
}
},
"packageManager": "[email protected]"
}
10 changes: 5 additions & 5 deletions storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
"@storybook/addon-actions": "6.5.10",
"@storybook/addon-essentials": "6.5.10",
"@storybook/addon-interactions": "6.5.10",
"@storybook/builder-webpack4": "6.5.10",
"@storybook/manager-webpack4": "6.5.10",
"@storybook/mdx2-csf": "0.0.3",
"@storybook/preset-scss": "^1.0.3",
"@storybook/react": "6.5.10",
"@storybook/blocks": "^7.5.3",
"@storybook/builder-webpack4": "6.5.10",
"@storybook/channels": "^7.5.3",
"@storybook/components": "^7.5.3",
"@storybook/core-events": "^7.5.3",
"@storybook/manager-webpack4": "6.5.10",
"@storybook/mdx2-csf": "0.0.3",
"@storybook/preset-scss": "^1.0.3",
"@storybook/preview-api": "^7.5.3",
"@storybook/react": "6.5.10",
"@storybook/theming": "^7.5.3",
"css-loader": "^5.2.6",
"i18next": "^23.7.6",
Expand Down
28,922 changes: 16,774 additions & 12,148 deletions storybook/yarn.lock

Large diffs are not rendered by default.

34,476 changes: 19,971 additions & 14,505 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit 25b060a

Please sign in to comment.