Migrate from Yarn Classic to Yarn Berry

Kocal · Kocal · commit 18c55bec2a33 · 2024-09-28T18:10:42.000+02:00
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,4 @@
+/.yarn/**            linguist-vendored
+/.yarn/releases/*    binary
+/.yarn/plugins/**/*  binary
+/.pnp.*              binary linguist-generated
diff --git a/.github/workflows/test-turbo.yml b/.github/workflows/test-turbo.yml
@@ -62,6 +62,8 @@ jobs:
             - name: Checkout
               uses: actions/checkout@v4
 
+            - run: corepack enable
+
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:
@@ -75,7 +77,7 @@ jobs:
 
             - name: Get yarn cache directory path
               id: yarn-cache-dir-path
-              run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
+              run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
 
             - uses: actions/cache@v4
               id: yarn-cache
@@ -87,7 +89,7 @@ jobs:
 
             - name: Install JavaScript dependencies
               working-directory: src/Turbo/tests/app
-              run: yarn install
+              run: touch yarn.lock && yarn install --mode update-lockfile
 
             - name: Build JavaScript
               working-directory: src/Turbo/tests/app
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -16,17 +16,18 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v4
+            - run: corepack enable
             - name: Get yarn cache directory path
               id: yarn-cache-dir-path
-              run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
+              run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
             - uses: actions/cache@v4
               id: yarn-cache
               with:
                   path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
                   key: ${{ runner.os }}-yarn-${{ hashFiles('**/package.json') }}
                   restore-keys: |
                       ${{ runner.os }}-yarn-
-            - run: yarn --frozen-lockfile
+            - run: yarn --immutable
             - run: yarn check-lint
             - run: yarn check-format
 
@@ -35,17 +36,18 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v4
+            - run: corepack enable
             - name: Get yarn cache directory path
               id: yarn-cache-dir-path
-              run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
+              run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
             - uses: actions/cache@v4
               id: yarn-cache
               with:
                   path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
                   key: ${{ runner.os }}-yarn-${{ hashFiles('**/package.json') }}
                   restore-keys: |
                       ${{ runner.os }}-yarn-
-            - run: yarn --frozen-lockfile && yarn build
+            - run: yarn --immutable && yarn build
             - name: Check if js dist files are current
               id: changes
               run: |
@@ -132,9 +134,10 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v4
+            - run: corepack enable
             - name: Get yarn cache directory path
               id: yarn-cache-dir-path
-              run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
+              run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
             - uses: actions/cache@v4
               id: yarn-cache
               with:
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,16 @@
-.doctor-rst.cache
-.php-cs-fixer.cache
+# https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
+.yarn/*
+!.yarn/cache
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
 node_modules
 yarn-error.log
+
+.doctor-rst.cache
+.php-cs-fixer.cache
 /composer.lock
 /vendor
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1 @@
+nodeLinker: node-modules
diff --git a/bin/run-vitest-all.sh b/bin/run-vitest-all.sh
@@ -11,7 +11,7 @@ fi
 
 runTestSuite() {
     echo -e "Running tests for $workspace...\n"
-    yarn workspace $workspace run vitest --run || { all_tests_passed=false; }
+    yarn workspace $workspace run -T vitest --run || { all_tests_passed=false; }
 }
 
 processWorkspace() {
@@ -48,19 +48,21 @@ processWorkspace() {
     fi
 }
 
-# Get all workspace names
-workspaces_info=$(yarn -s workspaces info)
-
 # Iterate over each workspace using process substitution
 while IFS= read -r workspace_info; do
     # Split the workspace_info into workspace and location
-    workspace=$(echo "$workspace_info" | awk '{print $1}')
-    location=$(echo "$workspace_info" | awk '{print $2}')
+    workspace=$(echo "$workspace_info" | jq -r '.name')
+    location=$(echo "$workspace_info" | jq -r '.location')
+    
+    # Skip the root workspace
+    if [ $workspace == "null" ]; then
+        continue
+    fi
 
     # Call the function to process the workspace
     processWorkspace "$workspace" "$location"
 
-done < <(echo "$workspaces_info" | jq -r 'to_entries[0:] | .[] | "\(.key) \(.value.location)"')
+done < <(yarn workspaces list --json)
 
 # Check the flag at the end and exit with code 1 if any test failed
 if [ "$all_tests_passed" = false ]; then
diff --git a/biome.json b/biome.json
@@ -13,7 +13,7 @@
             "src/*/src/Bridge/*/assets/src/**",
             "src/*/src/Bridge/*/assets/test/**"
         ],
-        "ignore": ["**/composer.json", "**/vendor", "**/node_modules"]
+        "ignore": ["**/composer.json", "**/vendor", "**/package.json", "**/node_modules"]
     },
     "linter": {
         "rules": {
diff --git a/package.json b/package.json
@@ -1,6 +1,10 @@
 {
     "private": true,
-    "workspaces": ["src/*/assets", "src/*/src/Bridge/*/assets"],
+    "packageManager": "yarn@4.5.0",
+    "workspaces": [
+        "src/*/assets",
+        "src/*/src/Bridge/*/assets"
+    ],
     "scripts": {
         "build": "node bin/build_javascript.js && node bin/build_styles.js",
         "test": "bin/run-vitest-all.sh",
@@ -28,12 +32,11 @@
         "vitest": "^2.1.1"
     },
     "resolutions": {
-        "@swup/prettier-config": "link:node_modules/.cache/null",
-        "@swup/browserslist-config": "link:node_modules/.cache/null",
-        "microbundle": "link:node_modules/.cache/null",
-        "prettier": "link:node_modules/.cache/null",
-        "shelljs": "link:node_modules/.cache/null",
-        "shelljs-live": "link:node_modules/.cache/null"
-    },
-    "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
+        "@swup/plugin/@swup/prettier-config": "link:node_modules/.cache/null",
+        "@swup/plugin/@swup/browserslist-config": "link:node_modules/.cache/null",
+        "@swup/plugin/microbundle": "link:node_modules/.cache/null",
+        "@swup/plugin/prettier": "link:node_modules/.cache/null",
+        "@swup/plugin/shelljs": "link:node_modules/.cache/null",
+        "@swup/plugin/shelljs-live": "link:node_modules/.cache/null"
+    }
 }
diff --git a/src/Cropperjs/assets/package.json b/src/Cropperjs/assets/package.json
@@ -27,11 +27,11 @@
         }
     },
     "peerDependencies": {
-        "cropperjs": "^1.5.9",
-        "@hotwired/stimulus": "^3.0.0"
+        "@hotwired/stimulus": "^3.0.0",
+        "cropperjs": "^1.5.9"
     },
     "devDependencies": {
-        "cropperjs": "^1.5.9",
-        "@hotwired/stimulus": "^3.0.0"
+        "@hotwired/stimulus": "^3.0.0",
+        "cropperjs": "^1.5.9"
     }
 }
diff --git a/src/Swup/assets/package.json b/src/Swup/assets/package.json
@@ -24,19 +24,19 @@
         }
     },
     "peerDependencies": {
+        "@hotwired/stimulus": "^3.0.0",
+        "@swup/debug-plugin": "^3.0",
         "@swup/fade-theme": "^1.0",
-        "@swup/slide-theme": "^1.0",
         "@swup/forms-plugin": "^2.0",
-        "@swup/debug-plugin": "^3.0",
-        "swup": "^3.0",
-        "@hotwired/stimulus": "^3.0.0"
+        "@swup/slide-theme": "^1.0",
+        "swup": "^3.0"
     },
     "devDependencies": {
+        "@hotwired/stimulus": "^3.0.0",
+        "@swup/debug-plugin": "^3.0",
         "@swup/fade-theme": "^1.0",
-        "@swup/slide-theme": "^1.0",
         "@swup/forms-plugin": "^2.0",
-        "@swup/debug-plugin": "^3.0",
-        "swup": "^3.0",
-        "@hotwired/stimulus": "^3.0.0"
+        "@swup/slide-theme": "^1.0",
+        "swup": "^3.0"
     }
 }
diff --git a/src/Turbo/assets/package.json b/src/Turbo/assets/package.json
@@ -26,11 +26,11 @@
         }
     },
     "peerDependencies": {
-        "@hotwired/turbo": "^7.1.1 || ^8.0",
-        "@hotwired/stimulus": "^3.0.0"
+        "@hotwired/stimulus": "^3.0.0",
+        "@hotwired/turbo": "^7.1.1 || ^8.0"
     },
     "devDependencies": {
-        "@hotwired/turbo": "^7.1.0 || ^8.0",
-        "@hotwired/stimulus": "^3.0.0"
+        "@hotwired/stimulus": "^3.0.0",
+        "@hotwired/turbo": "^7.1.0 || ^8.0"
     }
 }
diff --git a/src/Turbo/tests/app/package.json b/src/Turbo/tests/app/package.json
@@ -1,4 +1,5 @@
 {
+    "packageManager": "yarn@4.5.0",
     "devDependencies": {
         "@babel/core": "^7.20.12",
         "@babel/preset-env": "^7.20.2",
diff --git a/src/Typed/assets/package.json b/src/Typed/assets/package.json
@@ -21,11 +21,11 @@
         }
     },
     "peerDependencies": {
-        "typed.js": "^2.0",
-        "@hotwired/stimulus": "^3.0.0"
+        "@hotwired/stimulus": "^3.0.0",
+        "typed.js": "^2.0"
     },
     "devDependencies": {
-        "typed.js": "^2.0",
-        "@hotwired/stimulus": "^3.0.0"
+        "@hotwired/stimulus": "^3.0.0",
+        "typed.js": "^2.0"
     }
 }
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,11 @@`
`27`	`27`	`}`
`28`	`28`	`},`
`29`	`29`	`"peerDependencies": {`
`30`		`- "cropperjs": "^1.5.9",`
`31`		`- "@hotwired/stimulus": "^3.0.0"`
	`30`	`+ "@hotwired/stimulus": "^3.0.0",`
	`31`	`+ "cropperjs": "^1.5.9"`
`32`	`32`	`},`
`33`	`33`	`"devDependencies": {`
`34`		`- "cropperjs": "^1.5.9",`
`35`		`- "@hotwired/stimulus": "^3.0.0"`
	`34`	`+ "@hotwired/stimulus": "^3.0.0",`
	`35`	`+ "cropperjs": "^1.5.9"`
`36`	`36`	`}`
`37`	`37`	`}`