Merge pull request #24 from rally25rs/upgrade-yarn-modern

Upgrade Yarn to v4.0.2
rally25rs · Dec 6, 2023 · 4db2eea · 4db2eea
2 parents 2ac1a01 + 3227445
commit 4db2eea
Show file tree

Hide file tree

Showing 10 changed files with 6,616 additions and 4,469 deletions.
diff --git a/.github/workflows/client_build.yml b/.github/workflows/client_build.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v4
       - name: Build/Publish Client Docker
         uses: elgohr/Publish-Docker-Github-Action@v5
         with:

diff --git a/.github/workflows/server_build.yml b/.github/workflows/server_build.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v4
       - name: Build/Publish Server Docker
         uses: elgohr/Publish-Docker-Github-Action@v5
         with:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -7,10 +7,10 @@ jobs:
     name: Test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
-      - uses: borales/actions-yarn@v2.0.0
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          cmd: install
-      - uses: borales/actions-yarn@v2.0.0
-        with:
-          cmd: test
+          node-version: 20
+      - run: corepack enable
+      - run: yarn install
+      - run: yarn test
diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1 @@
+nodeLinker: node-modules
diff --git a/README.md b/README.md
@@ -187,7 +187,12 @@ Options:
 
 # Contributing
 
-This project is built as a `yarn` monorepo.
+This project is built as a `yarn` monorepo and uses yarn "modern".
+
+Set up `yarn` by enabling nodejs `corepack` (requires nodejs v16+)
+```
+corepack enable
+```
 
 To install dependencies:
 ```

diff --git a/package.json b/package.json
@@ -6,12 +6,12 @@
   "author": "Jeff Valore (rally25rs)",
   "license": "MIT",
   "private": true,
+  "packageManager": "yarn@4.0.2",
   "workspaces": [
     "packages/*"
   ],
   "scripts": {
-    "test": "yarn workspaces run test",
-    "build": "yarn workspaces run build"
-  },
-  "dependencies": {}
+    "test": "yarn workspaces foreach -A run test",
+    "build": "yarn workspaces foreach -A run build"
+  }
 }
diff --git a/packages/k8s-when-ready-client/package.json b/packages/k8s-when-ready-client/package.json
@@ -5,7 +5,7 @@
   "main": "index.js",
   "author": "Jeff Valore (rally25rs)",
   "license": "MIT",
-  "private": false,
+  "packageManager": "yarn@4.0.2",
   "scripts": {
     "test": "jest",
     "build": "docker build ."

diff --git a/packages/k8s-when-ready-server/package.json b/packages/k8s-when-ready-server/package.json
@@ -5,7 +5,7 @@
   "main": "index.js",
   "author": "Jeff Valore (rally25rs)",
   "license": "MIT",
-  "private": false,
+  "packageManager": "yarn@4.0.2",
   "scripts": {
     "test": "jest",
     "build": "docker build ."
@@ -18,6 +18,8 @@
     "jest": "^24.9.0"
   },
   "jest": {
-    "setupFilesAfterEnv": ["../../jest.setup.js"]
+    "setupFilesAfterEnv": [
+      "../../jest.setup.js"
+    ]
   }
 }