From 01d0e1bd8a4d59650cdf30d6986b59395f84bf94 Mon Sep 17 00:00:00 2001 From: Ryan Murphy Date: Mon, 7 Oct 2024 18:06:54 -0700 Subject: [PATCH 1/7] Update CI dependencies, modernize node matrix --- .github/workflows/ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1141e87..b8bd682 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,14 +14,15 @@ jobs: strategy: matrix: - node-version: [12.x, 14.x] + node-version: [18, 20, 22] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} + cache: npm - run: npm install - run: npm run lint - run: npm test From 40b160847e1a0e1ac01756c1666370ce2109972e Mon Sep 17 00:00:00 2001 From: Ryan Murphy Date: Mon, 7 Oct 2024 18:08:28 -0700 Subject: [PATCH 2/7] Allow CI to run on all pushes --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b8bd682..71bf33f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,8 +2,6 @@ name: CI on: push: - branches: - - master pull_request: branches: - master From 2efd5fd5426d11238a32005572b5ccda974e8134 Mon Sep 17 00:00:00 2001 From: Ryan Murphy Date: Mon, 7 Oct 2024 18:17:41 -0700 Subject: [PATCH 3/7] Just do it on every push for now --- .github/workflows/ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 71bf33f..6e363b1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,9 +2,6 @@ name: CI on: push: - pull_request: - branches: - - master jobs: build: From e4a9cccd04461fdbe3fc3bb4b3c942ab0ccc3b93 Mon Sep 17 00:00:00 2001 From: Ryan Murphy Date: Mon, 7 Oct 2024 18:22:06 -0700 Subject: [PATCH 4/7] Bump Node .tool-versions to v22.9.0 --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index b61294d..966f7af 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -nodejs 15.4.0 +nodejs 22.9.0 From 9f86b0f6af8e429274ac0bf6ed2284ceb2a691cb Mon Sep 17 00:00:00 2001 From: Ryan Murphy Date: Mon, 7 Oct 2024 18:23:52 -0700 Subject: [PATCH 5/7] Allow package-lock.json to update --- package-lock.json | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index e47edb6..4bba6fa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1650,7 +1650,6 @@ "jest-resolve": "^26.6.2", "jest-util": "^26.6.2", "jest-worker": "^26.6.2", - "node-notifier": "^8.0.0", "slash": "^3.0.0", "source-map": "^0.6.0", "string-length": "^4.0.1", @@ -3546,8 +3545,7 @@ "esprima": "^4.0.1", "estraverse": "^5.2.0", "esutils": "^2.0.2", - "optionator": "^0.8.1", - "source-map": "~0.6.1" + "optionator": "^0.8.1" }, "bin": { "escodegen": "bin/escodegen.js", @@ -5896,7 +5894,6 @@ "@types/node": "*", "anymatch": "^3.0.3", "fb-watchman": "^2.0.0", - "fsevents": "^2.1.2", "graceful-fs": "^4.2.4", "jest-regex-util": "^26.0.0", "jest-serializer": "^26.6.2", @@ -8628,9 +8625,6 @@ "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.35.1.tgz", "integrity": "sha512-q5KxEyWpprAIcainhVy6HfRttD9kutQpHbeqDTWnqAFNJotiojetK6uqmcydNMymBEtC4I8bCYR+J3mTMqeaUA==", "dev": true, - "dependencies": { - "fsevents": "~2.1.2" - }, "bin": { "rollup": "dist/bin/rollup" }, From fa42c594e462007b384884d6ba4ace297961cce5 Mon Sep 17 00:00:00 2001 From: Ryan Murphy Date: Mon, 7 Oct 2024 18:26:33 -0700 Subject: [PATCH 6/7] Bump engines to 18 in package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d9c13ff..c17af13 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ } }, "engines": { - "node": ">=12" + "node": ">=18" }, "dependencies": { "lib-font": "^2.4.2" From d08aa067c4e8575f9ee2338f51a6b70af728d4eb Mon Sep 17 00:00:00 2001 From: Ryan Murphy Date: Mon, 7 Oct 2024 18:27:23 -0700 Subject: [PATCH 7/7] Use npm ci instead --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6e363b1..e1c1234 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,6 +18,6 @@ jobs: with: node-version: ${{ matrix.node-version }} cache: npm - - run: npm install + - run: npm ci - run: npm run lint - run: npm test