Merge pull request #160 from nrkno/chore/update-yarn

chore: update to yarn 4 & Node 18
nrkno · Mar 21, 2024 · 5836f20 · 5836f20
2 parents dd720ac + 8d29f0c
commit 5836f20
Show file tree

Hide file tree

Showing 34 changed files with 13,672 additions and 9,127 deletions.
diff --git a/.github/workflows/build-windows.yaml b/.github/workflows/build-windows.yaml
@@ -21,15 +21,17 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '16'
+          node-version: '18'
+
+      - name: Enable Corepack
+        run: corepack enable
 
       - name: Run build
         env:
           CI: true
           PKG_CACHE_PATH: ${{ runner.temp }}
         run: |
           # try and avoid timeout errors
-          yarn config set network-timeout 100000 -g
 
           yarn do:build-win32:ci
 

diff --git a/.github/workflows/lint-and-test.yaml b/.github/workflows/lint-and-test.yaml
@@ -18,10 +18,15 @@ jobs:
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v4
+
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '16'
+          node-version: '18'
+
+      - name: Enable Corepack
+        run: corepack enable
+
       - name: Cache node_modules
         uses: actions/cache@v4
         with:
@@ -30,7 +35,6 @@ jobs:
 
       - name: Prepare Environment
         run: |
-          yarn config set network-timeout 100000 -g
           yarn
         env:
           CI: true
@@ -50,25 +54,29 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node_version: ['16']
+        node_version: ['18', '20']
         os: [ubuntu-latest, windows-latest] # [windows-latest, macOS-latest]
     timeout-minutes: 10
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v4
+
       - name: Use Node.js ${{ matrix.node_version }}
         uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node_version }}
+
       - name: Cache node_modules
         uses: actions/cache@v4
         with:
           path: '**/node_modules'
           key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
 
+      - name: Enable Corepack
+        run: corepack enable
+
       - name: Prepare Environment
         run: |
-          yarn config set network-timeout 100000 -g
           yarn
           yarn build
         env:

diff --git a/.github/workflows/publish-prerelease.yaml b/.github/workflows/publish-prerelease.yaml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node_version: ['16']
+        node_version: ['18']
         os: [ubuntu-latest, windows-latest] # [windows-latest, macOS-latest]
     timeout-minutes: 10
     steps:
@@ -24,7 +24,6 @@ jobs:
 
       - name: Prepare Environment
         run: |
-          yarn config set network-timeout 100000 -g
           yarn
           yarn build
         env:
@@ -50,7 +49,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 18
       - name: Check release is desired
         id: do-publish
         run: |
@@ -66,7 +65,6 @@ jobs:
       - name: Prepare Environment
         if: ${{ steps.do-publish.outputs.publish }}
         run: |
-          yarn config set network-timeout 100000 -g
           yarn
         env:
           CI: true

diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,14 @@ node_modules
 .pnp
 .pnp.js
 
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
 # testing
 coverage
 

diff --git a/.yarn/releases/yarn-4.1.1.cjs b/.yarn/releases/yarn-4.1.1.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1,9 @@
+compressionLevel: mixed
+
+enableGlobalCache: false
+
+httpTimeout: 100000
+
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-4.1.1.cjs
diff --git a/apps/_boilerplate/app/package.json b/apps/_boilerplate/app/package.json
@@ -4,7 +4,7 @@
     "description": "Boilerplace",
     "private": true,
     "scripts": {
-        "build": "yarn rimraf dist && yarn build:main",
+        "build": "run -T rimraf dist && yarn build:main",
         "build:main": "tsc -p tsconfig.json",
         "build-win32": "mkdir deploy & node ../../../scripts/build-win32.mjs boilerplate.exe && node ../../../scripts/copy-natives.js win32-x64",
         "__test": "jest",
@@ -15,7 +15,7 @@
     },
     "prettier": "@sofie-automation/code-standard-preset/.prettierrc.json",
     "engines": {
-        "node": ">=14.18.0"
+        "node": ">=18"
     },
     "lint-staged": {
         "*.{js,css,json,md,scss}": [

diff --git a/apps/_boilerplate/packages/generic/package.json b/apps/_boilerplate/packages/generic/package.json
@@ -5,13 +5,13 @@
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "scripts": {
-        "build": "yarn rimraf dist && yarn build:main",
+        "build": "run -T rimraf dist && yarn build:main",
         "build:main": "tsc -p tsconfig.json",
         "__test": "jest"
     },
     "prettier": "@sofie-automation/code-standard-preset/.prettierrc.json",
     "engines": {
-        "node": ">=14.18.0"
+        "node": ">=18"
     },
     "lint-staged": {
         "*.{js,css,json,md,scss}": [

diff --git a/apps/appcontainer-node/app/package.json b/apps/appcontainer-node/app/package.json
@@ -4,7 +4,7 @@
     "description": "AppContainer-Node.js",
     "private": true,
     "scripts": {
-        "build": "yarn rimraf dist && yarn build:main",
+        "build": "run -T rimraf dist && yarn build:main",
         "build:main": "tsc -p tsconfig.json",
         "build-win32": "mkdir deploy & node ../../../scripts/build-win32.mjs appContainer-node.exe && node ../../../scripts/copy-natives.js win32-x64",
         "__test": "jest",
@@ -15,7 +15,7 @@
     },
     "prettier": "@sofie-automation/code-standard-preset/.prettierrc.json",
     "engines": {
-        "node": ">=14.18.0"
+        "node": ">=18"
     },
     "lint-staged": {
         "*.{js,css,json,md,scss}": [

diff --git a/apps/appcontainer-node/packages/generic/package.json b/apps/appcontainer-node/packages/generic/package.json
@@ -5,7 +5,7 @@
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "scripts": {
-        "build": "yarn rimraf dist && yarn build:main",
+        "build": "run -T rimraf dist && yarn build:main",
         "build:main": "tsc -p tsconfig.json",
         "__test": "jest"
     },
@@ -22,7 +22,7 @@
     },
     "prettier": "@sofie-automation/code-standard-preset/.prettierrc.json",
     "engines": {
-        "node": ">=14.18.0"
+        "node": ">=18"
     },
     "lint-staged": {
         "*.{js,css,json,md,scss}": [

diff --git a/apps/http-server/app/Dockerfile b/apps/http-server/app/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16-alpine as builder
+FROM node:18-alpine as builder
 
 # Note: Build this from the root directory:
 # cd package-manager
@@ -38,7 +38,7 @@ RUN rm -r scripts
 
 
 # Create deploy-image:
-FROM node:16-alpine
+FROM node:18-alpine
 
 COPY --from=builder /src /src
 

diff --git a/apps/http-server/app/package.json b/apps/http-server/app/package.json
@@ -4,7 +4,7 @@
     "description": "Upload to and serve proxies of packages",
     "private": true,
     "scripts": {
-        "build": "yarn rimraf dist && yarn build:main",
+        "build": "run -T rimraf dist && yarn build:main",
         "build:main": "tsc -p tsconfig.json",
         "build-win32": "mkdir deploy & node ../../../scripts/build-win32.mjs http-server.exe && node ../../../scripts/copy-natives.js win32-x64",
         "__test": "jest",
@@ -15,7 +15,7 @@
     },
     "prettier": "@sofie-automation/code-standard-preset/.prettierrc.json",
     "engines": {
-        "node": ">=14.18.0"
+        "node": ">=18"
     },
     "lint-staged": {
         "*.{js,css,json,md,scss}": [

diff --git a/apps/http-server/packages/generic/package.json b/apps/http-server/packages/generic/package.json
@@ -5,7 +5,7 @@
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "scripts": {
-        "build": "yarn rimraf dist && yarn build:main",
+        "build": "run -T rimraf dist && yarn build:main",
         "build:main": "tsc -p tsconfig.json",
         "__test": "jest"
     },
@@ -39,7 +39,7 @@
     },
     "prettier": "@sofie-automation/code-standard-preset/.prettierrc.json",
     "engines": {
-        "node": ">=14.18.0"
+        "node": ">=18"
     },
     "lint-staged": {
         "*.{js,css,json,md,scss}": [

diff --git a/apps/package-manager/app/package.json b/apps/package-manager/app/package.json
@@ -3,7 +3,7 @@
     "version": "1.50.0",
     "private": true,
     "scripts": {
-        "build": "yarn rimraf dist && yarn build:main",
+        "build": "run -T rimraf dist && yarn build:main",
         "build:main": "tsc -p tsconfig.json",
         "build-win32": "mkdir deploy & node ../../../scripts/build-win32.mjs package-manager.exe && node ../../../scripts/copy-natives.js win32-x64",
         "__test": "jest",
@@ -14,7 +14,7 @@
     },
     "prettier": "@sofie-automation/code-standard-preset/.prettierrc.json",
     "engines": {
-        "node": ">=14.18.0"
+        "node": ">=18"
     },
     "lint-staged": {
         "*.{js,css,json,md,scss}": [

diff --git a/apps/package-manager/packages/generic/package.json b/apps/package-manager/packages/generic/package.json
@@ -5,7 +5,7 @@
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "scripts": {
-        "build": "yarn rimraf dist && yarn build:main",
+        "build": "run -T rimraf dist && yarn build:main",
         "build:main": "tsc -p tsconfig.json",
         "test": "jest"
     },
@@ -30,7 +30,7 @@
     },
     "prettier": "@sofie-automation/code-standard-preset/.prettierrc.json",
     "engines": {
-        "node": ">=14.18.0"
+        "node": ">=18"
     },
     "lint-staged": {
         "*.{js,css,json,md,scss}": [

diff --git a/apps/quantel-http-transformer-proxy/app/Dockerfile b/apps/quantel-http-transformer-proxy/app/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16-alpine as builder
+FROM node:18-alpine as builder
 
 # Note: Build this from the root directory:
 # cd package-manager
@@ -38,7 +38,7 @@ RUN rm -r scripts
 
 
 # Create deploy-image:
-FROM node:16-alpine
+FROM node:18-alpine
 
 COPY --from=builder /src /src
 

diff --git a/apps/quantel-http-transformer-proxy/app/package.json b/apps/quantel-http-transformer-proxy/app/package.json
@@ -4,7 +4,7 @@
     "description": "Proxy for a Quantel HTTP Transformer",
     "private": true,
     "scripts": {
-        "build": "yarn rimraf dist && yarn build:main",
+        "build": "run -T rimraf dist && yarn build:main",
         "build:main": "tsc -p tsconfig.json",
         "build-win32": "mkdir deploy & node ../../../scripts/build-win32.mjs quantel-http-transformer-proxy.exe && node ../../../scripts/copy-natives.js win32-x64",
         "start": "node dist/index.js"
@@ -14,7 +14,7 @@
     },
     "prettier": "@sofie-automation/code-standard-preset/.prettierrc.json",
     "engines": {
-        "node": ">=14.18.0"
+        "node": ">=18"
     },
     "lint-staged": {
         "*.{js,css,json,md,scss}": [

diff --git a/apps/quantel-http-transformer-proxy/packages/generic/package.json b/apps/quantel-http-transformer-proxy/packages/generic/package.json
@@ -5,7 +5,7 @@
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "scripts": {
-        "build": "yarn rimraf dist && yarn build:main",
+        "build": "run -T rimraf dist && yarn build:main",
         "build:main": "tsc -p tsconfig.json",
         "__test": "jest"
     },
@@ -43,7 +43,7 @@
     },
     "prettier": "@sofie-automation/code-standard-preset/.prettierrc.json",
     "engines": {
-        "node": ">=14.18.0"
+        "node": ">=18"
     },
     "lint-staged": {
         "*.{js,css,json,md,scss}": [

diff --git a/apps/single-app/app/expectedPackages.json b/apps/single-app/app/expectedPackages.json
@@ -76,10 +76,10 @@
     "expectedPackages": [
         {
             "type": "media_file",
-            "_id": "test9902",
+            "_id": "test",
             "contentVersionHash": "abc1234",
             "content": {
-                "filePath": "test2.mxf"
+                "filePath": "amb.mp4"
             },
             "version": {},
             "sources": [
@@ -88,7 +88,7 @@
                     "accessors": {
                         "local": {
                             "type": "local_folder",
-                            "filePath": "test2.mxf"
+                            "filePath": "amb.mp4"
                         }
                     }
                 }
@@ -101,7 +101,7 @@
                 "previewPackageSettings": null,
                 "thumbnailContainerId": "thumbnails0_local",
                 "thumbnailPackageSettings": {
-                    "path": "test2.png"
+                    "path": "thumbnail.png"
                 },
                 "loudnessPackageSettings": {
                     "channelSpec": [

diff --git a/apps/single-app/app/package.json b/apps/single-app/app/package.json
@@ -4,7 +4,7 @@
     "description": "Package Manager, http-proxy etc.. all in one application",
     "private": true,
     "scripts": {
-        "build": "yarn rimraf dist && yarn build:main",
+        "build": "run -T rimraf dist && yarn build:main",
         "build:main": "tsc -p tsconfig.json",
         "build-win32": "mkdir deploy & node ../../../scripts/build-win32.mjs package-manager-single-app.exe && node ../../../scripts/copy-natives.js win32-x64",
         "__test": "jest",
@@ -22,7 +22,7 @@
     },
     "prettier": "@sofie-automation/code-standard-preset/.prettierrc.json",
     "engines": {
-        "node": ">=14.18.0"
+        "node": ">=18"
     },
     "lint-staged": {
         "*.{js,css,json,md,scss}": [