From ec4035fdc4fa466a19533d381a4cc709ecc6431d Mon Sep 17 00:00:00 2001 From: Ryuichi Sai Date: Tue, 18 Jul 2023 19:40:04 -0500 Subject: [PATCH 1/4] Pump word-wrap to 1.2.4 --- package-lock.json | 15 ++++++++------- package.json | 4 +++- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5a8cbf4..2c53692 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,7 +36,8 @@ "tough-cookie": "^4.1.3", "ts-jest": "^26.5.6", "ts-node": "^10.9.1", - "typescript": "^4.9.5" + "typescript": "^4.9.5", + "word-wrap": "^1.2.4" } }, "node_modules/@apidevtools/json-schema-ref-parser": { @@ -7804,9 +7805,9 @@ "dev": true }, "node_modules/word-wrap": { - "version": "1.2.3", - "resolved": "https://adzerkps.jfrog.io/artifactory/api/npm/npm/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "version": "1.2.4", + "resolved": "https://adzerkps.jfrog.io/artifactory/api/npm/npm/word-wrap/-/word-wrap-1.2.4.tgz", + "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==", "dev": true, "engines": { "node": ">=0.10.0" @@ -14311,9 +14312,9 @@ "dev": true }, "word-wrap": { - "version": "1.2.3", - "resolved": "https://adzerkps.jfrog.io/artifactory/api/npm/npm/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "version": "1.2.4", + "resolved": "https://adzerkps.jfrog.io/artifactory/api/npm/npm/word-wrap/-/word-wrap-1.2.4.tgz", + "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==", "dev": true }, "wrap-ansi": { diff --git a/package.json b/package.json index aa680dc..9664db6 100644 --- a/package.json +++ b/package.json @@ -31,9 +31,11 @@ "jest": "^26.1.0", "lint-staged": "^13.2.2", "prettier": "^2.8.8", + "tough-cookie": "^4.1.3", "ts-jest": "^26.5.6", "ts-node": "^10.9.1", - "typescript": "^4.9.5" + "typescript": "^4.9.5", + "word-wrap": "^1.2.4" }, "husky": { "hooks": { From 92fb4a5d20461e6e3e897ad5890c59d2664261c0 Mon Sep 17 00:00:00 2001 From: Simon Ramzi Date: Thu, 20 Jul 2023 10:05:58 +0100 Subject: [PATCH 2/4] Moved the bumped dependencies to the `overrides` section of the `package.json`. --- package-lock.json | 8 +++----- package.json | 8 +++++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2c53692..61f1c48 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33,11 +33,9 @@ "jest": "^26.1.0", "lint-staged": "^13.2.2", "prettier": "^2.8.8", - "tough-cookie": "^4.1.3", "ts-jest": "^26.5.6", "ts-node": "^10.9.1", - "typescript": "^4.9.5", - "word-wrap": "^1.2.4" + "typescript": "^4.9.5" } }, "node_modules/@apidevtools/json-schema-ref-parser": { @@ -12113,7 +12111,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", @@ -12841,7 +12839,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" } }, "p-each-series": { diff --git a/package.json b/package.json index 9664db6..2c7a922 100644 --- a/package.json +++ b/package.json @@ -31,10 +31,12 @@ "jest": "^26.1.0", "lint-staged": "^13.2.2", "prettier": "^2.8.8", - "tough-cookie": "^4.1.3", "ts-jest": "^26.5.6", "ts-node": "^10.9.1", - "typescript": "^4.9.5", + "typescript": "^4.9.5" + }, + "overrides": { + "tough-cookie": "^4.1.3", "word-wrap": "^1.2.4" }, "husky": { @@ -65,4 +67,4 @@ "publishConfig": { "access": "public" } -} +} \ No newline at end of file From e08db0b0ae6085298de5b2f18c4d92e73d5f3c1c Mon Sep 17 00:00:00 2001 From: Simon Ramzi Date: Thu, 20 Jul 2023 10:07:36 +0100 Subject: [PATCH 3/4] Updated the node version to 18 so that overrides are respected, and to make it consistent with the nodejs workflow. --- .github/workflows/publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f0d4c24..b027fd1 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -16,8 +16,8 @@ jobs: - uses: actions/checkout@v2 - 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 From a8f4e9de31492a6c3507bf31450940700da6e07f Mon Sep 17 00:00:00 2001 From: Simon Ramzi Date: Thu, 20 Jul 2023 10:08:45 +0100 Subject: [PATCH 4/4] Added more human-readible names to some of the `publish.yml` workflow stages. --- .github/workflows/publish.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b027fd1..b9c3ec4 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -13,8 +13,10 @@ 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: 18 registry-url: https://registry.npmjs.org