From ec35fbb061830dcbbe3b5fd150ac3be4ab25cfe6 Mon Sep 17 00:00:00 2001 From: "Joshua A. Horton" Date: Thu, 25 Apr 2024 15:49:59 +0700 Subject: [PATCH 1/2] chore(web): @types/node update - version should match node version Also updates @types/chai, given that chai was updated. No ^5.x yet, though. --- package-lock.json | 52 ++++++++++++++++++++++++++++++----------------- package.json | 3 ++- 2 files changed, 35 insertions(+), 20 deletions(-) diff --git a/package-lock.json b/package-lock.json index 61330e54bb8..299b3ef9c10 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40,7 +40,8 @@ "devDependencies": { "@microsoft/api-documenter": "^7.23.31", "@microsoft/api-extractor": "^7.41.0", - "@types/chai": "^4.3.5", + "@types/chai": "^4.3.14", + "@types/node": "^18.0.0", "@typescript-eslint/eslint-plugin": "^5.59.1", "ajv": "^8.12.0", "ajv-cli": "^5.0.0", @@ -184,11 +185,6 @@ "@types/node": "^18.7.18" } }, - "common/tools/hextobin/node_modules/@types/node": { - "version": "18.11.15", - "dev": true, - "license": "MIT" - }, "common/tools/hextobin/node_modules/commander": { "version": "5.1.0", "license": "MIT", @@ -352,6 +348,12 @@ "typescript": "^4.9.5" } }, + "common/web/gesture-recognizer/node_modules/@types/node": { + "version": "11.15.54", + "resolved": "https://registry.npmjs.org/@types/node/-/node-11.15.54.tgz", + "integrity": "sha512-1RWYiq+5UfozGsU6MwJyFX6BtktcT10XRjvcAQmskCtMcW3tPske88lM/nHv7BQG1w9KBXI1zPGuu5PnNCX14g==", + "dev": true + }, "common/web/input-processor": { "name": "@keymanapp/input-processor", "license": "MIT", @@ -373,6 +375,12 @@ "typescript": "^4.9.5" } }, + "common/web/input-processor/node_modules/@types/node": { + "version": "11.15.54", + "resolved": "https://registry.npmjs.org/@types/node/-/node-11.15.54.tgz", + "integrity": "sha512-1RWYiq+5UfozGsU6MwJyFX6BtktcT10XRjvcAQmskCtMcW3tPske88lM/nHv7BQG1w9KBXI1zPGuu5PnNCX14g==", + "dev": true + }, "common/web/keyboard-processor": { "name": "@keymanapp/keyboard-processor", "license": "MIT", @@ -398,6 +406,11 @@ "typescript": "^4.9.5" } }, + "common/web/keyboard-processor/node_modules/@types/node": { + "version": "11.15.54", + "resolved": "https://registry.npmjs.org/@types/node/-/node-11.15.54.tgz", + "integrity": "sha512-1RWYiq+5UfozGsU6MwJyFX6BtktcT10XRjvcAQmskCtMcW3tPske88lM/nHv7BQG1w9KBXI1zPGuu5PnNCX14g==" + }, "common/web/keyman-version": { "name": "@keymanapp/keyman-version", "license": "MIT", @@ -471,6 +484,11 @@ "typescript": "^4.9.5" } }, + "common/web/recorder/node_modules/@types/node": { + "version": "11.15.54", + "resolved": "https://registry.npmjs.org/@types/node/-/node-11.15.54.tgz", + "integrity": "sha512-1RWYiq+5UfozGsU6MwJyFX6BtktcT10XRjvcAQmskCtMcW3tPske88lM/nHv7BQG1w9KBXI1zPGuu5PnNCX14g==" + }, "common/web/sentry-manager": { "name": "@keymanapp/web-sentry-manager", "license": "MIT", @@ -4150,9 +4168,9 @@ } }, "node_modules/@types/chai": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.5.tgz", - "integrity": "sha512-mEo1sAde+UCE6b2hxn332f1g1E8WfYRu6p5SvTKr2ZKC1f7gFJXk4h5PyGP9Dt6gCaG8y8XhwnXWC6Iy2cmBng==", + "version": "4.3.14", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.14.tgz", + "integrity": "sha512-Wj71sXE4Q4AkGdG9Tvq1u/fquNz9EdG4LIJMwVVII7ashjD/8cf8fyIfJAjRr6YcsXnSE8cOGQPq1gqeR8z+3w==", "dev": true }, "node_modules/@types/component-emitter": { @@ -4255,8 +4273,12 @@ } }, "node_modules/@types/node": { - "version": "11.15.54", - "license": "MIT" + "version": "18.19.31", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.31.tgz", + "integrity": "sha512-ArgCD39YpyyrtFKIqMDvjz79jto5fcI/SVUs2HwB+f0dAzq68yqOdyaSivLiLugSziTpNXLQrVb7RZFmdZzbhA==", + "dependencies": { + "undici-types": "~5.26.4" + } }, "node_modules/@types/qs": { "version": "6.9.7", @@ -12980,14 +13002,6 @@ "ts-node": "^10.9.1", "typescript": "^4.9.5" } - }, - "web/node_modules/@types/node": { - "version": "18.19.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.3.tgz", - "integrity": "sha512-k5fggr14DwAytoA/t8rPrIz++lXK7/DqckthCmoZOKNsEbJkId4Z//BqgApXBUGrGddrigYa1oqheo/7YmW4rg==", - "dependencies": { - "undici-types": "~5.26.4" - } } } } diff --git a/package.json b/package.json index 26122007d94..3eeb952bd46 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,8 @@ "devDependencies": { "@microsoft/api-documenter": "^7.23.31", "@microsoft/api-extractor": "^7.41.0", - "@types/chai": "^4.3.5", + "@types/chai": "^4.3.14", + "@types/node": "^18.0.0", "@typescript-eslint/eslint-plugin": "^5.59.1", "ajv": "^8.12.0", "ajv-cli": "^5.0.0", From 01d0019d869aa8bdc5838e9f3e9679da8b84159b Mon Sep 17 00:00:00 2001 From: "Joshua A. Horton" Date: Fri, 26 Apr 2024 08:09:42 +0700 Subject: [PATCH 2/2] chore(web): removes package.json references to old @npm/types versions --- common/models/templates/package.json | 1 - common/models/wordbreakers/package.json | 5 +- common/predictive-text/package.json | 1 - common/test/resources/package.json | 1 - .../sourcemap-path-remapper/package.json | 2 +- common/web/gesture-recognizer/package.json | 1 - common/web/input-processor/package.json | 1 - common/web/keyboard-processor/package.json | 3 +- common/web/lm-worker/package.json | 1 - common/web/recorder/package.json | 3 +- common/web/utils/package.json | 1 - package-lock.json | 82 +------------------ resources/build/version/package.json | 1 - web/package.json | 1 - 14 files changed, 7 insertions(+), 97 deletions(-) diff --git a/common/models/templates/package.json b/common/models/templates/package.json index 59897a708cc..ec6bc8f7e6e 100644 --- a/common/models/templates/package.json +++ b/common/models/templates/package.json @@ -54,7 +54,6 @@ "@keymanapp/models-types": "*", "@keymanapp/web-utils": "*", "@types/mocha": "^7.0.2", - "@types/node": "^14.0.4", "c8": "^7.12.0", "mocha": "^10.0.0", "mocha-teamcity-reporter": "^4.0.0", diff --git a/common/models/wordbreakers/package.json b/common/models/wordbreakers/package.json index 0c152e763bd..d3dd15493e0 100644 --- a/common/models/wordbreakers/package.json +++ b/common/models/wordbreakers/package.json @@ -57,8 +57,5 @@ "ts-node": "^10.9.1", "typescript": "^4.9.5" }, - "type": "module", - "dependencies": { - "@types/node": "^14.0.3" - } + "type": "module" } diff --git a/common/predictive-text/package.json b/common/predictive-text/package.json index cadb66ec083..fefac1d69e2 100644 --- a/common/predictive-text/package.json +++ b/common/predictive-text/package.json @@ -44,7 +44,6 @@ "devDependencies": { "@keymanapp/models-types": "*", "@keymanapp/resources-gosh": "*", - "@types/node": "^10.17.21", "karma": "^6.4.1", "karma-browserstack-launcher": "^1.6.0", "karma-chai": "^0.1.0", diff --git a/common/test/resources/package.json b/common/test/resources/package.json index b28c4e08e21..9b4ddf1a690 100644 --- a/common/test/resources/package.json +++ b/common/test/resources/package.json @@ -5,7 +5,6 @@ "license": "MIT", "devDependencies": { "@keymanapp/resources-gosh": "*", - "@types/node": "^10.17.21", "typescript": "^4.9.5" } } diff --git a/common/tools/sourcemap-path-remapper/package.json b/common/tools/sourcemap-path-remapper/package.json index 72a7ba83ea2..16b7fdbfb61 100644 --- a/common/tools/sourcemap-path-remapper/package.json +++ b/common/tools/sourcemap-path-remapper/package.json @@ -18,7 +18,7 @@ "homepage": "https://github.com/keymanapp/keyman#readme", "devDependencies": { "@keymanapp/resources-gosh": "*", - "@types/node": "^10.17.21", + "mocha": "^10.0.0", "mocha-teamcity-reporter": "^4.0.0", "sinon": "^7.1.1", "ts-node": "^10.9.1", diff --git a/common/web/gesture-recognizer/package.json b/common/web/gesture-recognizer/package.json index 65bbc7a2272..d00e1c2211a 100644 --- a/common/web/gesture-recognizer/package.json +++ b/common/web/gesture-recognizer/package.json @@ -3,7 +3,6 @@ "description": "The core gesture-recognition engine used by Keyman's Web-based OSKs.", "devDependencies": { "@keymanapp/resources-gosh": "*", - "@types/node": "^11.9.4", "@types/sinon": "^10.0.13", "karma": "^6.4.1", "karma-browserstack-launcher": "^1.6.0", diff --git a/common/web/input-processor/package.json b/common/web/input-processor/package.json index cd274d7c933..8cd1517584b 100644 --- a/common/web/input-processor/package.json +++ b/common/web/input-processor/package.json @@ -19,7 +19,6 @@ "devDependencies": { "@keymanapp/kmc": "*", "@keymanapp/resources-gosh": "*", - "@types/node": "^11.9.4", "mocha": "^10.0.0", "mocha-teamcity-reporter": "^4.0.0", "ts-node": "^10.9.1", diff --git a/common/web/keyboard-processor/package.json b/common/web/keyboard-processor/package.json index ada2f65080a..32e92bfa4ed 100644 --- a/common/web/keyboard-processor/package.json +++ b/common/web/keyboard-processor/package.json @@ -39,8 +39,7 @@ "@keymanapp/common-types": "*", "@keymanapp/models-types": "*", "@keymanapp/keyman-version": "*", - "@keymanapp/web-utils": "*", - "@types/node": "^11.9.4" + "@keymanapp/web-utils": "*" }, "type": "module", "main": "./build/obj/index.js", diff --git a/common/web/lm-worker/package.json b/common/web/lm-worker/package.json index 7d29bbaf3eb..2c7cfe25167 100644 --- a/common/web/lm-worker/package.json +++ b/common/web/lm-worker/package.json @@ -28,7 +28,6 @@ "@keymanapp/common-test-resources": "*", "@keymanapp/models-types": "*", "@keymanapp/resources-gosh": "*", - "@types/node": "^10.17.21", "c8": "^7.12.0", "combine-source-map": "^0.8.0", "karma": "^6.4.1", diff --git a/common/web/recorder/package.json b/common/web/recorder/package.json index 20ff012f595..7dcc696cda0 100644 --- a/common/web/recorder/package.json +++ b/common/web/recorder/package.json @@ -22,8 +22,7 @@ "@keymanapp/keyboard-processor": "*", "@keymanapp/models-types": "*", "@keymanapp/keyman-version": "*", - "@keymanapp/web-utils": "*", - "@types/node": "^11.9.4" + "@keymanapp/web-utils": "*" }, "devDependencies": { "typescript": "^4.9.5" diff --git a/common/web/utils/package.json b/common/web/utils/package.json index 685b88b48cb..1df79b87ef9 100644 --- a/common/web/utils/package.json +++ b/common/web/utils/package.json @@ -26,7 +26,6 @@ "devDependencies": { "@keymanapp/keyman-version": "*", "@keymanapp/resources-gosh": "*", - "@types/node": "^14.0.5", "c8": "^7.12.0", "mocha": "^10.0.0", "mocha-teamcity-reporter": "^4.0.0", diff --git a/package-lock.json b/package-lock.json index 299b3ef9c10..b9fe292a210 100644 --- a/package-lock.json +++ b/package-lock.json @@ -76,18 +76,12 @@ "@keymanapp/models-types": "*", "@keymanapp/web-utils": "*", "@types/mocha": "^7.0.2", - "@types/node": "^14.0.4", "c8": "^7.12.0", "mocha": "^10.0.0", "mocha-teamcity-reporter": "^4.0.0", "typescript": "^4.9.5" } }, - "common/models/templates/node_modules/@types/node": { - "version": "14.18.12", - "dev": true, - "license": "MIT" - }, "common/models/types": { "name": "@keymanapp/models-types", "license": "MIT", @@ -98,9 +92,6 @@ "common/models/wordbreakers": { "name": "@keymanapp/models-wordbreakers", "license": "MIT", - "dependencies": { - "@types/node": "^14.0.3" - }, "devDependencies": { "@keymanapp/models-types": "*", "@keymanapp/resources-gosh": "*", @@ -112,10 +103,6 @@ "typescript": "^4.9.5" } }, - "common/models/wordbreakers/node_modules/@types/node": { - "version": "14.18.12", - "license": "MIT" - }, "common/predictive-text": { "name": "@keymanapp/lexical-model-layer", "license": "MIT", @@ -130,7 +117,6 @@ "devDependencies": { "@keymanapp/models-types": "*", "@keymanapp/resources-gosh": "*", - "@types/node": "^10.17.21", "karma": "^6.4.1", "karma-browserstack-launcher": "^1.6.0", "karma-chai": "^0.1.0", @@ -152,26 +138,14 @@ "typescript": "^4.9.5" } }, - "common/predictive-text/node_modules/@types/node": { - "version": "10.17.60", - "dev": true, - "license": "MIT" - }, "common/test/resources": { "name": "@keymanapp/common-test-resources", "license": "MIT", "devDependencies": { "@keymanapp/resources-gosh": "*", - "@types/node": "^10.17.21", "typescript": "^4.9.5" } }, - "common/test/resources/node_modules/@types/node": { - "version": "10.17.60", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.60.tgz", - "integrity": "sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==", - "dev": true - }, "common/tools/hextobin": { "name": "@keymanapp/hextobin", "license": "MIT", @@ -200,7 +174,7 @@ }, "devDependencies": { "@keymanapp/resources-gosh": "*", - "@types/node": "^10.17.21", + "mocha": "^10.0.0", "mocha-teamcity-reporter": "^4.0.0", "sinon": "^7.1.1", "ts-node": "^10.9.1", @@ -218,11 +192,6 @@ "lodash": "^4.17.15" } }, - "common/tools/sourcemap-path-remapper/node_modules/@types/node": { - "version": "10.17.60", - "dev": true, - "license": "MIT" - }, "common/tools/sourcemap-path-remapper/node_modules/convert-source-map": { "version": "2.0.0", "license": "MIT" @@ -325,7 +294,6 @@ }, "devDependencies": { "@keymanapp/resources-gosh": "*", - "@types/node": "^11.9.4", "@types/sinon": "^10.0.13", "karma": "^6.4.1", "karma-browserstack-launcher": "^1.6.0", @@ -348,12 +316,6 @@ "typescript": "^4.9.5" } }, - "common/web/gesture-recognizer/node_modules/@types/node": { - "version": "11.15.54", - "resolved": "https://registry.npmjs.org/@types/node/-/node-11.15.54.tgz", - "integrity": "sha512-1RWYiq+5UfozGsU6MwJyFX6BtktcT10XRjvcAQmskCtMcW3tPske88lM/nHv7BQG1w9KBXI1zPGuu5PnNCX14g==", - "dev": true - }, "common/web/input-processor": { "name": "@keymanapp/input-processor", "license": "MIT", @@ -368,19 +330,12 @@ "devDependencies": { "@keymanapp/kmc": "*", "@keymanapp/resources-gosh": "*", - "@types/node": "^11.9.4", "mocha": "^10.0.0", "mocha-teamcity-reporter": "^4.0.0", "ts-node": "^10.9.1", "typescript": "^4.9.5" } }, - "common/web/input-processor/node_modules/@types/node": { - "version": "11.15.54", - "resolved": "https://registry.npmjs.org/@types/node/-/node-11.15.54.tgz", - "integrity": "sha512-1RWYiq+5UfozGsU6MwJyFX6BtktcT10XRjvcAQmskCtMcW3tPske88lM/nHv7BQG1w9KBXI1zPGuu5PnNCX14g==", - "dev": true - }, "common/web/keyboard-processor": { "name": "@keymanapp/keyboard-processor", "license": "MIT", @@ -388,8 +343,7 @@ "@keymanapp/common-types": "*", "@keymanapp/keyman-version": "*", "@keymanapp/models-types": "*", - "@keymanapp/web-utils": "*", - "@types/node": "^11.9.4" + "@keymanapp/web-utils": "*" }, "devDependencies": { "@keymanapp/resources-gosh": "*", @@ -406,11 +360,6 @@ "typescript": "^4.9.5" } }, - "common/web/keyboard-processor/node_modules/@types/node": { - "version": "11.15.54", - "resolved": "https://registry.npmjs.org/@types/node/-/node-11.15.54.tgz", - "integrity": "sha512-1RWYiq+5UfozGsU6MwJyFX6BtktcT10XRjvcAQmskCtMcW3tPske88lM/nHv7BQG1w9KBXI1zPGuu5PnNCX14g==" - }, "common/web/keyman-version": { "name": "@keymanapp/keyman-version", "license": "MIT", @@ -441,7 +390,6 @@ "@keymanapp/common-test-resources": "*", "@keymanapp/models-types": "*", "@keymanapp/resources-gosh": "*", - "@types/node": "^10.17.21", "c8": "^7.12.0", "combine-source-map": "^0.8.0", "karma": "^6.4.1", @@ -465,11 +413,6 @@ "typescript": "^4.9.5" } }, - "common/web/lm-worker/node_modules/@types/node": { - "version": "10.17.60", - "dev": true, - "license": "MIT" - }, "common/web/recorder": { "name": "@keymanapp/recorder-core", "license": "MIT", @@ -477,18 +420,12 @@ "@keymanapp/keyboard-processor": "*", "@keymanapp/keyman-version": "*", "@keymanapp/models-types": "*", - "@keymanapp/web-utils": "*", - "@types/node": "^11.9.4" + "@keymanapp/web-utils": "*" }, "devDependencies": { "typescript": "^4.9.5" } }, - "common/web/recorder/node_modules/@types/node": { - "version": "11.15.54", - "resolved": "https://registry.npmjs.org/@types/node/-/node-11.15.54.tgz", - "integrity": "sha512-1RWYiq+5UfozGsU6MwJyFX6BtktcT10XRjvcAQmskCtMcW3tPske88lM/nHv7BQG1w9KBXI1zPGuu5PnNCX14g==" - }, "common/web/sentry-manager": { "name": "@keymanapp/web-sentry-manager", "license": "MIT", @@ -748,18 +685,12 @@ "devDependencies": { "@keymanapp/keyman-version": "*", "@keymanapp/resources-gosh": "*", - "@types/node": "^14.0.5", "c8": "^7.12.0", "mocha": "^10.0.0", "mocha-teamcity-reporter": "^4.0.0", "typescript": "^4.9.5" } }, - "common/web/utils/node_modules/@types/node": { - "version": "14.18.18", - "dev": true, - "license": "MIT" - }, "core/include/ldml": { "name": "@keymanapp/ldml-keyboard-constants", "license": "MIT" @@ -12840,18 +12771,12 @@ "yargs": "^17.7.2" }, "devDependencies": { - "@types/node": "^13.7.0", "@types/semver": "^7.1.0", "@types/yargs": "^17.0.26", "semver": "^7.5.2", "ts-node": "^10.9.1" } }, - "resources/build/version/node_modules/@types/node": { - "version": "13.13.52", - "dev": true, - "license": "MIT" - }, "resources/build/version/node_modules/ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", @@ -12972,7 +12897,6 @@ "@keymanapp/recorder-core": "*", "@keymanapp/tslib": "*", "@keymanapp/web-utils": "*", - "@types/node": "^18.19.3", "core-js": "^3.34.0", "eventemitter3": "^4.0.0", "tslib": "^2.5.2" diff --git a/resources/build/version/package.json b/resources/build/version/package.json index 5d55f9798f4..aa58ec90417 100644 --- a/resources/build/version/package.json +++ b/resources/build/version/package.json @@ -9,7 +9,6 @@ "yargs": "^17.7.2" }, "devDependencies": { - "@types/node": "^13.7.0", "@types/semver": "^7.1.0", "@types/yargs": "^17.0.26", "semver": "^7.5.2", diff --git a/web/package.json b/web/package.json index 6c25b112e77..fe432261f6e 100644 --- a/web/package.json +++ b/web/package.json @@ -120,7 +120,6 @@ "@keymanapp/recorder-core": "*", "@keymanapp/tslib": "*", "@keymanapp/web-utils": "*", - "@types/node": "^18.19.3", "core-js": "^3.34.0", "eventemitter3": "^4.0.0", "tslib": "^2.5.2"