From 50e3d9083cda952cc3f77da48b51be0199e8618c Mon Sep 17 00:00:00 2001 From: Simon Ramzi Date: Thu, 20 Jul 2023 09:39:37 +0100 Subject: [PATCH 1/2] Moved the required dependency updates to the overrides, and removed the usage of `resolutions` in the `package.json` file as we aren't using yarn. --- package-lock.json | 8 +++----- package.json | 9 ++++----- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6cc49cf..342cc23 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,11 +30,9 @@ "prettier": "^1.19.1", "process": "^0.11.10", "size-limit": "^8.1.0", - "tough-cookie": "^4.1.3", "ts-jest": "^26.5.1", "ts-node": "^8.4.1", - "typescript": "^3.6.4", - "word-wrap": "^1.2.4" + "typescript": "^3.6.4" } }, "node_modules/@ampproject/remapping": { @@ -17065,7 +17063,7 @@ "parse5": "6.0.1", "saxes": "^5.0.1", "symbol-tree": "^3.2.4", - "tough-cookie": "^4.0.0", + "tough-cookie": "^4.1.3", "w3c-hr-time": "^1.0.2", "w3c-xmlserializer": "^2.0.0", "webidl-conversions": "^6.1.0", @@ -18161,7 +18159,7 @@ "levn": "~0.3.0", "prelude-ls": "~1.1.2", "type-check": "~0.3.2", - "word-wrap": "~1.2.3" + "word-wrap": "^1.2.4" } }, "ordered-binary": { diff --git a/package.json b/package.json index f21e5ff..c1e4b4b 100644 --- a/package.json +++ b/package.json @@ -44,14 +44,13 @@ "prettier": "^1.19.1", "process": "^0.11.10", "size-limit": "^8.1.0", - "tough-cookie": "^4.1.3", "ts-jest": "^26.5.1", "ts-node": "^8.4.1", - "typescript": "^3.6.4", - "word-wrap": "^1.2.4" + "typescript": "^3.6.4" }, - "resolutions": { - "node-forge": "1.3.0" + "overrides": { + "tough-cookie": "^4.1.3", + "word-wrap": "^1.2.4" }, "lint-staged": { "*.{js,ts,css,md}": [ From 9dca6b4628ee5ebd9f4d19e7f052150a2d9d07dd Mon Sep 17 00:00:00 2001 From: Simon Ramzi Date: Thu, 20 Jul 2023 09:41:17 +0100 Subject: [PATCH 2/2] Gave publish workflow more human-readible names, and updated `actions/setup-node` action to use node 18 as the `overrides` field will be ignored with node 14. This was deemed acceptable as we are publishing using node 18 to github packages. --- .github/workflows/publish.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b66334f..93c0d90 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -13,11 +13,13 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 + - name: Checkout Repository + uses: actions/checkout@v2 + - name: Setup NodeJS + uses: actions/setup-node@v2 with: - node-version: '14.x' - registry-url: 'https://registry.npmjs.org' + node-version: 18 + registry-url: https://registry.npmjs.org - name: Install Dependencies run: npm install - name: Build SDK