diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index 12f405123c..1f78634a3c 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -48,7 +48,7 @@ jobs: key: ${{ runner.os }}-fe-build-${{ hashFiles('**/yarn.lock') }} - name: Install dependencies if: steps.node-modules-cache.outputs.cache-hit != 'true' - run: make yarn-install + run: make frontend-install - name: build run: make frontend lint: @@ -72,7 +72,7 @@ jobs: key: ${{ runner.os }}-${{ steps.setup-node.outputs.node-version }}-node-modules-${{ hashFiles('**/yarn.lock') }} - name: Install dependencies if: steps.node-modules-cache.outputs.cache-hit != 'true' - run: make yarn-install + run: make frontend-install - name: Compile packages run: yarn run compile:dev working-directory: ${{ env.FRONTEND_DIR }} @@ -135,7 +135,7 @@ jobs: ${{ runner.os }}-go-build- - name: Install dependencies if: steps.node-modules-cache.outputs.cache-hit != 'true' - run: make yarn-install + run: make frontend-install - name: Compile packages run: yarn run compile:dev working-directory: ${{ env.FRONTEND_DIR }} @@ -169,7 +169,7 @@ jobs: key: ${{ runner.os }}-${{ steps.setup-node.outputs.node-version }}-node-modules-${{ hashFiles('**/yarn.lock') }} - name: Install dependencies if: steps.node-modules-cache.outputs.cache-hit != 'true' - run: make yarn-install + run: make frontend-install - name: Compile packages run: yarn run compile:dev working-directory: ${{ env.FRONTEND_DIR }} @@ -199,7 +199,7 @@ jobs: key: ${{ runner.os }}-${{ steps.setup-node.outputs.node-version }}-node-modules-${{ hashFiles('**/yarn.lock') }} - name: Install dependencies if: steps.node-modules-cache.outputs.cache-hit != 'true' - run: make yarn-install + run: make frontend-install - name: Set Publish Auth run: yarn config set npmAuthToken $NODE_AUTH_TOKEN working-directory: ${{ env.FRONTEND_DIR }} diff --git a/docs/_website/package.json b/docs/_website/package.json index bd2122e5dd..c0746518a5 100644 --- a/docs/_website/package.json +++ b/docs/_website/package.json @@ -57,7 +57,7 @@ }, "engines": { "node": ">=18 <19", - "yarn": "^4.3.1" + "yarn": "^4.5.0" }, - "packageManager": "yarn@4.3.1" + "packageManager": "yarn@4.5.0" } diff --git a/examples/amiibo/frontend/workflows/amiibo/package.json b/examples/amiibo/frontend/workflows/amiibo/package.json index 10d2a39e5c..819b8a3fd4 100644 --- a/examples/amiibo/frontend/workflows/amiibo/package.json +++ b/examples/amiibo/frontend/workflows/amiibo/package.json @@ -33,6 +33,6 @@ }, "engines": { "node": ">=18 <19", - "yarn": "^4.3.1" + "yarn": "^4.5.0" } } diff --git a/frontend/.yarnrc.yml b/frontend/.yarnrc.yml index b027275640..611fffe002 100644 --- a/frontend/.yarnrc.yml +++ b/frontend/.yarnrc.yml @@ -11,4 +11,4 @@ packageExtensions: dependencies: react-dev-utils: ^12.0.1 -yarnPath: .yarn/releases/yarn-4.3.1.js +yarnPath: .yarn/releases/yarn-4.5.0.js diff --git a/frontend/api/package.json b/frontend/api/package.json index 534960ac35..9bc9a433a0 100644 --- a/frontend/api/package.json +++ b/frontend/api/package.json @@ -14,8 +14,8 @@ }, "engines": { "node": ">=18 <19", - "yarn": "^4.3.1" + "yarn": "^4.5.0" }, - "packageManager": "yarn@4.3.1", + "packageManager": "yarn@4.5.0", "stableVersion": "3.0.0-beta" } diff --git a/frontend/package.json b/frontend/package.json index d35c7c57d1..232cb1b7cd 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -119,8 +119,8 @@ }, "engines": { "node": ">=18 <19", - "yarn": "^4.3.1" + "yarn": "^4.5.0" }, - "packageManager": "yarn@4.3.1", + "packageManager": "yarn@4.5.0", "stableVersion": "3.0.0-beta" } diff --git a/frontend/packages/app/package.json b/frontend/packages/app/package.json index 46fd613faa..0b85403899 100644 --- a/frontend/packages/app/package.json +++ b/frontend/packages/app/package.json @@ -33,9 +33,9 @@ }, "engines": { "node": ">=18 <19", - "yarn": "^4.3.1" + "yarn": "^4.5.0" }, - "packageManager": "yarn@4.3.1", + "packageManager": "yarn@4.5.0", "proxy": "http://localhost:8080", "stableVersion": "3.0.0-beta" } diff --git a/frontend/packages/core/package.json b/frontend/packages/core/package.json index 68c21c0534..6feaacf75d 100644 --- a/frontend/packages/core/package.json +++ b/frontend/packages/core/package.json @@ -72,8 +72,8 @@ }, "engines": { "node": ">=18 <19", - "yarn": "^4.3.1" + "yarn": "^4.5.0" }, - "packageManager": "yarn@4.3.1", + "packageManager": "yarn@4.5.0", "stableVersion": "3.0.0-beta" } diff --git a/frontend/packages/data-layout/package.json b/frontend/packages/data-layout/package.json index afc07a082f..a8782c2697 100644 --- a/frontend/packages/data-layout/package.json +++ b/frontend/packages/data-layout/package.json @@ -40,8 +40,8 @@ }, "engines": { "node": ">=18 <19", - "yarn": "^4.3.1" + "yarn": "^4.5.0" }, - "packageManager": "yarn@4.3.1", + "packageManager": "yarn@4.5.0", "stableVersion": "3.0.0-beta" } diff --git a/frontend/packages/tools/package.json b/frontend/packages/tools/package.json index aeb2509c6b..b9d07df955 100644 --- a/frontend/packages/tools/package.json +++ b/frontend/packages/tools/package.json @@ -81,8 +81,8 @@ }, "engines": { "node": ">=18 <19", - "yarn": "^4.3.1" + "yarn": "^4.5.0" }, - "packageManager": "yarn@4.3.1", + "packageManager": "yarn@4.5.0", "stableVersion": "3.0.0-beta" } diff --git a/frontend/packages/wizard/package.json b/frontend/packages/wizard/package.json index 3cedb38a9b..37e235a8ac 100644 --- a/frontend/packages/wizard/package.json +++ b/frontend/packages/wizard/package.json @@ -42,8 +42,8 @@ }, "engines": { "node": ">=18 <19", - "yarn": "^4.3.1" + "yarn": "^4.5.0" }, - "packageManager": "yarn@4.3.1", + "packageManager": "yarn@4.5.0", "stableVersion": "3.0.0-beta" } diff --git a/frontend/workflows/audit/package.json b/frontend/workflows/audit/package.json index 731cb11c5c..9da36a6017 100644 --- a/frontend/workflows/audit/package.json +++ b/frontend/workflows/audit/package.json @@ -37,8 +37,8 @@ }, "engines": { "node": ">=18 <19", - "yarn": "^4.3.1" + "yarn": "^4.5.0" }, - "packageManager": "yarn@4.3.1", + "packageManager": "yarn@4.5.0", "stableVersion": "3.0.0-beta" } diff --git a/frontend/workflows/dynamodb/package.json b/frontend/workflows/dynamodb/package.json index 2bbbaebdba..baaffb28f1 100644 --- a/frontend/workflows/dynamodb/package.json +++ b/frontend/workflows/dynamodb/package.json @@ -40,8 +40,8 @@ }, "engines": { "node": ">=18 <19", - "yarn": "^4.3.1" + "yarn": "^4.5.0" }, - "packageManager": "yarn@4.3.1", + "packageManager": "yarn@4.5.0", "stableVersion": "3.0.0-beta" } diff --git a/frontend/workflows/ec2/package.json b/frontend/workflows/ec2/package.json index 1d90a7f1b1..3f9931a0dc 100644 --- a/frontend/workflows/ec2/package.json +++ b/frontend/workflows/ec2/package.json @@ -41,8 +41,8 @@ }, "engines": { "node": ">=18 <19", - "yarn": "^4.3.1" + "yarn": "^4.5.0" }, - "packageManager": "yarn@4.3.1", + "packageManager": "yarn@4.5.0", "stableVersion": "3.0.0-beta" } diff --git a/frontend/workflows/envoy/package.json b/frontend/workflows/envoy/package.json index 65a2291506..ebee449d02 100644 --- a/frontend/workflows/envoy/package.json +++ b/frontend/workflows/envoy/package.json @@ -44,8 +44,8 @@ }, "engines": { "node": ">=18 <19", - "yarn": "^4.3.1" + "yarn": "^4.5.0" }, - "packageManager": "yarn@4.3.1", + "packageManager": "yarn@4.5.0", "stableVersion": "3.0.0-beta" } diff --git a/frontend/workflows/experimentation/package.json b/frontend/workflows/experimentation/package.json index a64dd413f6..7c0ba1d4cd 100644 --- a/frontend/workflows/experimentation/package.json +++ b/frontend/workflows/experimentation/package.json @@ -39,8 +39,8 @@ }, "engines": { "node": ">=18 <19", - "yarn": "^4.3.1" + "yarn": "^4.5.0" }, - "packageManager": "yarn@4.3.1", + "packageManager": "yarn@4.5.0", "stableVersion": "3.0.0-beta" } diff --git a/frontend/workflows/k8s/package.json b/frontend/workflows/k8s/package.json index 998365af67..80a7bf3582 100644 --- a/frontend/workflows/k8s/package.json +++ b/frontend/workflows/k8s/package.json @@ -45,8 +45,8 @@ }, "engines": { "node": ">=18 <19", - "yarn": "^4.3.1" + "yarn": "^4.5.0" }, - "packageManager": "yarn@4.3.1", + "packageManager": "yarn@4.5.0", "stableVersion": "3.0.0-beta" } diff --git a/frontend/workflows/kinesis/package.json b/frontend/workflows/kinesis/package.json index c055e732fa..89472c7671 100644 --- a/frontend/workflows/kinesis/package.json +++ b/frontend/workflows/kinesis/package.json @@ -42,8 +42,8 @@ }, "engines": { "node": ">=18 <19", - "yarn": "^4.3.1" + "yarn": "^4.5.0" }, - "packageManager": "yarn@4.3.1", + "packageManager": "yarn@4.5.0", "stableVersion": "3.0.0-beta" } diff --git a/frontend/workflows/projectCatalog/package.json b/frontend/workflows/projectCatalog/package.json index 97f29f54b0..1d207d093c 100644 --- a/frontend/workflows/projectCatalog/package.json +++ b/frontend/workflows/projectCatalog/package.json @@ -46,8 +46,8 @@ }, "engines": { "node": ">=18 <19", - "yarn": "^4.3.1" + "yarn": "^4.5.0" }, - "packageManager": "yarn@4.3.1", + "packageManager": "yarn@4.5.0", "stableVersion": "3.0.0-beta" } diff --git a/frontend/workflows/projectSelector/package.json b/frontend/workflows/projectSelector/package.json index 58dbc22f7e..75aa3e0b58 100644 --- a/frontend/workflows/projectSelector/package.json +++ b/frontend/workflows/projectSelector/package.json @@ -35,8 +35,8 @@ }, "engines": { "node": ">=18 <19", - "yarn": "^4.3.1" + "yarn": "^4.5.0" }, - "packageManager": "yarn@4.3.1", + "packageManager": "yarn@4.5.0", "stableVersion": "3.0.0-beta" } diff --git a/frontend/workflows/redisexperimentation/package.json b/frontend/workflows/redisexperimentation/package.json index 510ba205f9..d6dfcea72a 100644 --- a/frontend/workflows/redisexperimentation/package.json +++ b/frontend/workflows/redisexperimentation/package.json @@ -39,8 +39,8 @@ }, "engines": { "node": ">=18 <19", - "yarn": "^4.3.1" + "yarn": "^4.5.0" }, - "packageManager": "yarn@4.3.1", + "packageManager": "yarn@4.5.0", "stableVersion": "3.0.0-beta" } diff --git a/frontend/workflows/serverexperimentation/package.json b/frontend/workflows/serverexperimentation/package.json index df96a3084d..737fcc89cb 100644 --- a/frontend/workflows/serverexperimentation/package.json +++ b/frontend/workflows/serverexperimentation/package.json @@ -39,8 +39,8 @@ }, "engines": { "node": ">=18 <19", - "yarn": "^4.3.1" + "yarn": "^4.5.0" }, - "packageManager": "yarn@4.3.1", + "packageManager": "yarn@4.5.0", "stableVersion": "3.0.0-beta" } diff --git a/frontend/workflows/sourcecontrol/package.json b/frontend/workflows/sourcecontrol/package.json index 94871eaeb9..ee7401f5a6 100644 --- a/frontend/workflows/sourcecontrol/package.json +++ b/frontend/workflows/sourcecontrol/package.json @@ -43,8 +43,8 @@ }, "engines": { "node": ">=18 <19", - "yarn": "^4.3.1" + "yarn": "^4.5.0" }, - "packageManager": "yarn@4.3.1", + "packageManager": "yarn@4.5.0", "stableVersion": "3.0.0-beta" } diff --git a/tools/install-yarn.sh b/tools/install-yarn.sh index 827157e65d..5328179a6a 100755 --- a/tools/install-yarn.sh +++ b/tools/install-yarn.sh @@ -1,6 +1,6 @@ #!/bin/bash -YARN_VERSION="4.3.1" +YARN_VERSION="4.5.0" ROOT_DIR="$PWD" ROOT_DEST_DIR="${ROOT_DIR}/frontend" diff --git a/tools/preflight-checks.sh b/tools/preflight-checks.sh index 09aa095eac..e54587d332 100755 --- a/tools/preflight-checks.sh +++ b/tools/preflight-checks.sh @@ -7,7 +7,7 @@ did_checks_pass=true # Minimum versions MIN_GO_VERSION="1.17" MIN_NODE_VERSION="18.0.0" -MIN_YARN_VERSION="4.3.1" +MIN_YARN_VERSION="4.5.0" SCRIPT_ROOT="$(realpath "$(dirname "${BASH_SOURCE[0]}")/..")" REPO_ROOT="${SCRIPT_ROOT}" diff --git a/tools/scaffolding/scaffold/args.go b/tools/scaffolding/scaffold/args.go index 5e15339313..4ac747959d 100644 --- a/tools/scaffolding/scaffold/args.go +++ b/tools/scaffolding/scaffold/args.go @@ -4,7 +4,7 @@ import ( "flag" ) -const yarnInstallVersion = "4.3.1" +const yarnInstallVersion = "4.5.0" type Args struct { Internal bool @@ -22,7 +22,7 @@ func ParseArgs() *Args { flag.StringVar(&f.GoPin, "p", "main", "sha or other github ref to version of tools used in scaffolding") flag.StringVar(&f.Org, "o", "lyft", "overrides the github organization (for use in fork testing)") flag.StringVar(&f.TemplateOverwrite, "templates", "", "directory to use for template overwrites") - flag.StringVar(&f.YarnPin, "y", "4.3.1", "version of yarn to use") + flag.StringVar(&f.YarnPin, "y", yarnInstallVersion, "version of yarn to use") flag.Parse() return f } diff --git a/tools/scaffolding/templates/frontend/workflow/internal/package.json b/tools/scaffolding/templates/frontend/workflow/internal/package.json index da1513c80c..9d383b0f9c 100644 --- a/tools/scaffolding/templates/frontend/workflow/internal/package.json +++ b/tools/scaffolding/templates/frontend/workflow/internal/package.json @@ -37,8 +37,8 @@ }, "engines": { "node": ">=18 <19", - "yarn": "^4.3.1" + "yarn": "^4.5.0" }, - "packageManager": "yarn@4.3.1", + "packageManager": "yarn@4.5.0", "stableVersion": "1.0.0-beta" } diff --git a/tools/scaffolding/templates/gateway/Makefile b/tools/scaffolding/templates/gateway/Makefile index fd20bd2360..95bc82f116 100644 --- a/tools/scaffolding/templates/gateway/Makefile +++ b/tools/scaffolding/templates/gateway/Makefile @@ -35,11 +35,11 @@ backend-with-assets: frontend cd backend && go run $(PRIMARY_MODULE_DIR)/cmd/assets/generate.go ../frontend/build && go build -tags withAssets -o ../build/clutch -ldflags="-X main.version=$(VERSION)" .PHONY: frontend -frontend: yarn-install +frontend: frontend-install $(YARN) --cwd frontend build -.PHONY: yarn-install -yarn-install: yarn-ensure +.PHONY: frontend-install +frontend-install : yarn-ensure ifneq ("$(wildcard frontend/yarn.lock)","") $(YARN) --cwd frontend install --immutable else @@ -51,5 +51,5 @@ yarn-ensure: @$(SHELL) $(TOOLS_MODULE_DIR)/install-yarn.sh .PHONY: frontend-dev # Start the frontend in development mode. -frontend-dev: yarn-ensure yarn-install +frontend-dev: yarn-ensure frontend-install $(YARN) --cwd frontend start diff --git a/tools/scaffolding/templates/gateway/frontend/.yarnrc.yml b/tools/scaffolding/templates/gateway/frontend/.yarnrc.yml index b859d1e953..9374e8de61 100644 --- a/tools/scaffolding/templates/gateway/frontend/.yarnrc.yml +++ b/tools/scaffolding/templates/gateway/frontend/.yarnrc.yml @@ -1,3 +1,5 @@ +# @format + enableColors: true networkConcurrency: "1," @@ -6,4 +8,4 @@ nodeLinker: node-modules npmRegistryServer: "https://registry.yarnpkg.com/" -yarnPath: .yarn/releases/yarn-4.3.1.js +yarnPath: .yarn/releases/yarn-4.5.0.js diff --git a/tools/scaffolding/templates/gateway/frontend/package.json b/tools/scaffolding/templates/gateway/frontend/package.json index ff57345101..e774737e45 100644 --- a/tools/scaffolding/templates/gateway/frontend/package.json +++ b/tools/scaffolding/templates/gateway/frontend/package.json @@ -52,7 +52,7 @@ }, "engines": { "node": ">=18 <19", - "yarn": "^4.3.1" + "yarn": "^4.5.0" }, - "packageManager": "yarn@4.3.1" + "packageManager": "yarn@4.5.0" } diff --git a/tools/scaffolding/templates/gateway/frontend/workflows/echo/package.json b/tools/scaffolding/templates/gateway/frontend/workflows/echo/package.json index c8c05949d0..557f2e399a 100644 --- a/tools/scaffolding/templates/gateway/frontend/workflows/echo/package.json +++ b/tools/scaffolding/templates/gateway/frontend/workflows/echo/package.json @@ -36,7 +36,7 @@ }, "engines": { "node": ">=18 <19", - "yarn": "^4.3.1" + "yarn": "^4.5.0" }, - "packageManager": "yarn@4.3.1" + "packageManager": "yarn@4.5.0" }