Migrate from Yarn Classic to Yarn Berry

Author: Kocal

.gitattributes

@@ -0,0 +1,4 @@
+/.yarn/**            linguist-vendored
+/.yarn/releases/*    binary
+/.yarn/plugins/**/*  binary
+/.pnp.*              binary linguist-generated

.github/workflows/test.yaml

@@ -26,7 +26,7 @@ jobs:
                   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
 
@@ -45,7 +45,7 @@ jobs:
                   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: |

.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

.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

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

package.json

@@ -1,6 +1,10 @@
 {
     "private": true,
-    "workspaces": ["src/*/assets", "src/*/src/Bridge/*/assets"],
+    "packageManager": "[email protected]",
+    "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": "[email protected]+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"
+    }
 }

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"
     }
 }

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"
     }
 }

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"
     }
 }

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"
     }
 }