chore: update to yarn 4

SuperFlyTV · Oct 10, 2024 · 41329af · 41329af
1 parent 994702b
commit 41329af
Show file tree

Hide file tree

Showing 15 changed files with 18,499 additions and 13,293 deletions.
diff --git a/.github/workflows/create-release.yaml b/.github/workflows/create-release.yaml
@@ -26,10 +26,10 @@ jobs:
     needs: create-release
     steps:
       - uses: actions/checkout@v3
-      - name: Use Node.js 18
-        uses: actions/setup-node@v3
+      - name: Use Node.js
+        uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version-file: '.nvmrc'
       - name: restore node_modules
         uses: actions/cache@v3
         with:
@@ -38,7 +38,12 @@ jobs:
           key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
       - name: Prepare Environment
         run: |
-          yarn --ignore-engines --frozen-lockfile --network-timeout 1000000
+          corepack enable
+
+          # try and avoid timeout errors
+          yarn config set httpTimeout 100000
+
+          yarn --immutable
       - name: Build
         run: |
           yarn build
@@ -71,10 +76,10 @@ jobs:
     needs: create-release
     steps:
       - uses: actions/checkout@v3
-      - name: Use Node.js 18
-        uses: actions/setup-node@v3
+      - name: Use Node.js
+        uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version-file: '.nvmrc'
       - name: apt-get update
         run: sudo apt-get update
       - name: Install libasound2-dev
@@ -89,7 +94,12 @@ jobs:
           key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
       - name: Prepare Environment
         run: |
-          yarn --frozen-lockfile --network-timeout 1000000
+          corepack enable
+
+          # try and avoid timeout errors
+          yarn config set httpTimeout 100000
+
+          yarn --immutable
       - name: Build
         run: |
           yarn build
@@ -118,10 +128,10 @@ jobs:
     needs: create-release
     steps:
       - uses: actions/checkout@v3
-      - name: Use Node.js 18
-        uses: actions/setup-node@v3
+      - name: Use Node.js
+        uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version-file: '.nvmrc'
       - name: restore node_modules
         uses: actions/cache@v3
         with:
@@ -130,7 +140,12 @@ jobs:
           key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
       - name: Prepare Environment
         run: |
-          yarn --ignore-engines --frozen-lockfile --network-timeout 1000000
+          corepack enable
+
+          # try and avoid timeout errors
+          yarn config set httpTimeout 100000
+
+          yarn --immutable
       - name: Build
         run: |
           yarn build
@@ -157,10 +172,10 @@ jobs:
     needs: [create-release, build-macos-binary-TSR-bridge]
     steps:
       - uses: actions/checkout@v3
-      - name: Use Node.js 18
-        uses: actions/setup-node@v3
+      - name: Use Node.js
+        uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version-file: '.nvmrc'
       - name: restore node_modules
         uses: actions/cache@v3
         with:
@@ -169,7 +184,12 @@ jobs:
           key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
       - name: Prepare Environment
         run: |
-          yarn --ignore-engines --frozen-lockfile --network-timeout 1000000
+          corepack enable
+
+          # try and avoid timeout errors
+          yarn config set httpTimeout 100000
+
+          yarn --immutable
       - name: Build
         run: |
           yarn build

diff --git a/.github/workflows/node.yaml b/.github/workflows/node.yaml
@@ -15,10 +15,10 @@ jobs:
     timeout-minutes: 15
     steps:
       - uses: actions/checkout@v3
-      - name: Use Node.js 18
-        uses: actions/setup-node@v3
+      - name: Use Node.js
+        uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version-file: '.nvmrc'
       - name: apt-get update
         run: sudo apt-get update
       - name: Install libasound2-dev
@@ -33,7 +33,12 @@ jobs:
           key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
       - name: Prepare Environment
         run: |
-          yarn --ignore-engines --frozen-lockfile --network-timeout 1000000
+          corepack enable
+
+          # try and avoid timeout errors
+          yarn config set httpTimeout 100000
+
+          yarn --immutable
       - name: Typecheck
         run: yarn build
       - name: Lint
@@ -49,10 +54,10 @@ jobs:
     continue-on-error: true
     steps:
       - uses: actions/checkout@v3
-      - name: Use Node.js 18
-        uses: actions/setup-node@v3
+      - name: Use Node.js
+        uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version-file: '.nvmrc'
       - name: restore node_modules
         uses: actions/cache@v3
         with:
@@ -61,7 +66,12 @@ jobs:
           key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
       - name: Prepare Environment
         run: |
-          yarn --ignore-engines --frozen-lockfile --network-timeout 1000000
+          corepack enable
+
+          # try and avoid timeout errors
+          yarn config set httpTimeout 100000
+
+          yarn --immutable
       - name: Build
         run: |
           yarn build
@@ -71,10 +81,10 @@ jobs:
     continue-on-error: true
     steps:
       - uses: actions/checkout@v3
-      - name: Use Node.js 18
-        uses: actions/setup-node@v3
+      - name: Use Node.js
+        uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version-file: '.nvmrc'
       - name: restore node_modules
         uses: actions/cache@v3
         with:
@@ -83,7 +93,12 @@ jobs:
           key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
       - name: Prepare Environment
         run: |
-          yarn --ignore-engines --frozen-lockfile --network-timeout 1000000
+          corepack enable
+
+          # try and avoid timeout errors
+          yarn config set httpTimeout 100000
+
+          yarn --immutable
       - name: Build
         run: |
           yarn build
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,8 @@ dist
 # env vars
 /.env
 
+/.yarn
+
 # misc
 .DS_Store
 .env.local

diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-yarn lerna run --concurrency 1 --stream precommit --since HEAD --exclude-dependents
+yarn lint-staged
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1 @@
+nodeLinker: node-modules
diff --git a/apps/app/package.json b/apps/app/package.json
@@ -11,12 +11,11 @@
 		"build": "rimraf ./dist && tsc && webpack",
 		"build:electron": "tsc -p tsconfig.electron.json",
 		"build:binary": "electron-builder",
-		"start": "yarn build && electron dist/main.js",
+		"start": "run build && electron dist/main.js",
 		"react:dev": "webpack serve --mode=development",
 		"electron:dev": "nodemon",
 		"dev": "concurrently --kill-others \"yarn react:dev\" \"yarn electron:dev\"",
 		"test": "jest",
-		"precommit": "lint-staged",
 		"lint:raw": "eslint --ext .ts --ext .js --ext .tsx --ext .jsx --ignore-pattern dist"
 	},
 	"repository": {

diff --git a/apps/tsr-bridge/package.json b/apps/tsr-bridge/package.json
@@ -14,7 +14,6 @@
 		"react:dev": "webpack serve --mode=development",
 		"electron:dev": "nodemon",
 		"dev": "concurrently --kill-others \"yarn react:dev\" \"yarn electron:dev\"",
-		"precommit": "lint-staged",
 		"lint:raw": "eslint --ext .ts --ext .js --ext .tsx --ext .jsx --ignore-pattern dist"
 	},
 	"repository": {

diff --git a/package.json b/package.json
@@ -21,15 +21,15 @@
 		"prepare": "husky install",
 		"lerna": "lerna",
 		"lint": "lerna exec -- eslint . --ext .js,.jsx,.ts,.tsx",
-		"lintfix": "yarn lint --fix",
+		"lintfix": "run lint --fix",
 		"lint:changed": "lerna exec --since head --include-dependents -- eslint . --ext .js,.jsx,.ts,.tsx",
 		"build": "lerna run build",
 		"build:binary": "lerna run build:binary",
 		"build:shared": "lerna run build --stream --scope=@shared/*",
 		"build:shared:changed": "lerna run build --stream --scope=@shared/* --since head --exclude-dependents --stream",
-		"start": "yarn && yarn build:shared && yarn dev:electron",
-		"start:all": "yarn build:shared && lerna run dev --stream",
-		"start:bridge": "yarn build:shared && yarn dev:bridge",
+		"start": "yarn && run build:shared && run dev:electron",
+		"start:all": "run build:shared && lerna run dev --stream",
+		"start:bridge": "run build:shared && run dev:bridge",
 		"dev:electron": "lerna run dev --stream --scope=superconductor",
 		"dev:bridge": "lerna run dev --stream --scope=tsr-bridge",
 		"test": "lerna run test",
@@ -52,11 +52,12 @@
 		"eslint-plugin-react-hooks": "^4.6.0",
 		"jest": "^29.5.0",
 		"lerna": "^6.0.3",
+		"lint-staged": "^15.2.10",
 		"nexe": "^4.0.0-rc.1",
 		"rimraf": "^3.0.2",
 		"ts-jest": "^29.0.5",
 		"typescript": "^4.9.5"
 	},
 	"prettier": "@sofie-automation/code-standard-preset/.prettierrc.json",
-	"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
+	"packageManager": "yarn@4.5.0"
 }
diff --git a/shared/packages/api/package.json b/shared/packages/api/package.json
@@ -25,7 +25,6 @@
 	"scripts": {
 		"build": "rimraf dist && yarn build:main",
 		"build:main": "tsc -p tsconfig.json",
-		"precommit": "lint-staged",
 		"lint:raw": "eslint --ext .ts --ext .js --ext .tsx --ext .jsx --ignore-pattern dist"
 	},
 	"bugs": {

diff --git a/shared/packages/lib/package.json b/shared/packages/lib/package.json
@@ -25,7 +25,6 @@
 	"scripts": {
 		"build": "rimraf dist && yarn build:main",
 		"build:main": "tsc -p tsconfig.json",
-		"precommit": "lint-staged",
 		"lint:raw": "eslint --ext .ts --ext .js --ext .tsx --ext .jsx --ignore-pattern dist"
 	},
 	"bugs": {

diff --git a/shared/packages/models/package.json b/shared/packages/models/package.json
@@ -25,7 +25,6 @@
 	"scripts": {
 		"build": "rimraf dist && yarn build:main",
 		"build:main": "tsc -p tsconfig.json",
-		"precommit": "lint-staged",
 		"lint:raw": "eslint --ext .ts --ext .js --ext .tsx --ext .jsx --ignore-pattern dist"
 	},
 	"dependencies": {

diff --git a/shared/packages/peripherals/package.json b/shared/packages/peripherals/package.json
@@ -25,7 +25,6 @@
 	"scripts": {
 		"build": "rimraf dist && yarn build:main",
 		"build:main": "tsc -p tsconfig.json",
-		"precommit": "lint-staged",
 		"lint:raw": "eslint --ext .ts --ext .js --ext .tsx --ext .jsx --ignore-pattern dist"
 	},
 	"bugs": {

diff --git a/shared/packages/server-lib/package.json b/shared/packages/server-lib/package.json
@@ -25,7 +25,6 @@
 	"scripts": {
 		"build": "rimraf dist && yarn build:main",
 		"build:main": "tsc -p tsconfig.json",
-		"precommit": "lint-staged",
 		"lint:raw": "eslint --ext .ts --ext .js --ext .tsx --ext .jsx --ignore-pattern dist"
 	},
 	"bugs": {

diff --git a/shared/packages/tsr-bridge/package.json b/shared/packages/tsr-bridge/package.json
@@ -25,7 +25,6 @@
 	"scripts": {
 		"build": "rimraf dist && yarn build:main",
 		"build:main": "tsc -p tsconfig.json",
-		"precommit": "lint-staged",
 		"lint:raw": "eslint --ext .ts --ext .js --ext .tsx --ext .jsx --ignore-pattern dist"
 	},
 	"bugs": {