From 70c2ffcb44a3cda6b48cdf3ccea798b91f3ddd7e Mon Sep 17 00:00:00 2001 From: Dan Date: Mon, 6 Jan 2025 10:36:14 -0600 Subject: [PATCH 1/2] Make development install compatible with npm --- package.json | 21 ++++----- pnpm-lock.yaml | 125 +++++++++++++++++++++++++------------------------ 2 files changed, 73 insertions(+), 73 deletions(-) diff --git a/package.json b/package.json index 1d7ea9b0..a2cf8105 100644 --- a/package.json +++ b/package.json @@ -60,15 +60,6 @@ "typescript": "~4.9.5", "which": "^5.0.0" }, - "pnpm": { - "overrides": { - "typescript": "~4.9.5", - "node-gyp": "10.0.1" - }, - "patchedDependencies": { - "electron-mocha": "patches/electron-mocha.patch" - } - }, "engines": { "node": ">= 10", "pnpm": ">= 9" @@ -113,15 +104,15 @@ "format.prettier": "prettier -l --cache --cache-location ./.cache/prettier --write .", "format.clang-format": "clang-format -i -style=file ./src/*.cc ./src/*.h ./src/util/*.h", "lint-test.eslint": "eslint ./**/*.{ts,tsx,js,jsx,cjs,mjs,json,yaml} --no-error-on-unmatched-pattern --cache --cache-location ./.cache/eslint/", - "lint.eslint": "pnpm run lint-test.eslint --fix", + "lint.eslint": "run-s 'lint-test.eslint --fix'", "lint.tsc": "tsc --noEmit -p ./src/tsconfig.json", "lint.tsc-test": "tsc --noEmit -p ./test/tsconfig.json", "lint.clang-tidy": "git ls-files --exclude-standard | grep -E '\\.(cpp|hpp|c|cc|cxx|hxx|h|ixx)$' | xargs -n 1 -P $(nproc) clang-tidy", "lint": "run-p lint.tsc-test lint.tsc lint.eslint format", "lint-test": "run-s lint-test.eslint", "bench": "node --expose-gc test/bench", - "prepare": "pnpm run build.js", - "bump": "pnpx npm-check-updates -u -x typescript,eslint,chai,@types/chai && pnpx typesync" + "prepare": "run-s build.js", + "bump": "npx npm-check-updates -u -x typescript,eslint,chai,@types/chai && npx typesync" }, "cmake-ts": { "nodeAPI": "node-addon-api", @@ -239,5 +230,9 @@ "napi" ], "license": "MIT AND MPL-2.0", - "author": "Amin Yahyaabadi , Rolf Timmermans " + "author": "Amin Yahyaabadi , Rolf Timmermans ", + "overrides": { + "typescript": "~4.9.5", + "node-gyp": "10.0.1" + } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 64728bea..80f5f6da 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,15 +4,6 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false -overrides: - typescript: ~4.9.5 - node-gyp: 10.0.1 - -patchedDependencies: - electron-mocha: - hash: c4pa7rsg6atg3nmsnc7zhtvcny - path: patches/electron-mocha.patch - importers: .: @@ -74,7 +65,7 @@ importers: version: 33.2.1 electron-mocha: specifier: ^13.0.1 - version: 13.0.1(patch_hash=c4pa7rsg6atg3nmsnc7zhtvcny) + version: 13.0.1 eslint: specifier: ^8.57.1 version: 8.57.1 @@ -3293,7 +3284,7 @@ packages: resolution: {integrity: sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==} engines: {node: '>=16'} peerDependencies: - typescript: ~4.9.5 + typescript: '>=4.2.0' ts-node@10.9.2: resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==} @@ -3302,7 +3293,7 @@ packages: '@swc/core': '>=1.2.50' '@swc/wasm': '>=1.2.50' '@types/node': '*' - typescript: ~4.9.5 + typescript: '>=2.7' peerDependenciesMeta: '@swc/core': optional: true @@ -3322,7 +3313,7 @@ packages: resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} engines: {node: '>= 6'} peerDependencies: - typescript: ~4.9.5 + typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta' tunnel-agent@0.6.0: resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==} @@ -3383,13 +3374,23 @@ packages: engines: {node: '>= 18'} hasBin: true peerDependencies: - typescript: ~4.9.5 + typescript: 5.0.x || 5.1.x || 5.2.x || 5.3.x || 5.4.x || 5.5.x || 5.6.x || 5.7.x typescript@4.9.5: resolution: {integrity: sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==} engines: {node: '>=4.2.0'} hasBin: true + typescript@5.7.2: + resolution: {integrity: sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==} + engines: {node: '>=14.17'} + hasBin: true + + typescript@5.8.0-dev.20250106: + resolution: {integrity: sha512-o7wnxO5cYLyfc7QIUC5XqIhONzvtHj4pKEF3S1lxXh/3zDnAScSaSUzRKyKIRXuTXDgYuaWKhew4jrBRmVAK1Q==} + engines: {node: '>=14.17'} + hasBin: true + uc.micro@2.1.0: resolution: {integrity: sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==} @@ -4025,34 +4026,34 @@ snapshots: '@types/node': 22.10.2 optional: true - '@typescript-eslint/eslint-plugin@7.13.0(@typescript-eslint/parser@7.13.0(eslint@8.57.1)(typescript@4.9.5))(eslint@8.57.1)(typescript@4.9.5)': + '@typescript-eslint/eslint-plugin@7.13.0(@typescript-eslint/parser@7.13.0(eslint@8.57.1)(typescript@4.9.5))(eslint@8.57.1)(typescript@5.7.2)': dependencies: '@eslint-community/regexpp': 4.11.1 - '@typescript-eslint/parser': 7.13.0(eslint@8.57.1)(typescript@4.9.5) + '@typescript-eslint/parser': 7.13.0(eslint@8.57.1)(typescript@5.7.2) '@typescript-eslint/scope-manager': 7.13.0 - '@typescript-eslint/type-utils': 7.13.0(eslint@8.57.1)(typescript@4.9.5) - '@typescript-eslint/utils': 7.13.0(eslint@8.57.1)(typescript@4.9.5) + '@typescript-eslint/type-utils': 7.13.0(eslint@8.57.1)(typescript@5.7.2) + '@typescript-eslint/utils': 7.13.0(eslint@8.57.1)(typescript@5.7.2) '@typescript-eslint/visitor-keys': 7.13.0 eslint: 8.57.1 graphemer: 1.4.0 ignore: 5.3.2 natural-compare: 1.4.0 - ts-api-utils: 1.3.0(typescript@4.9.5) + ts-api-utils: 1.3.0(typescript@5.7.2) optionalDependencies: - typescript: 4.9.5 + typescript: 5.7.2 transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@7.13.0(eslint@8.57.1)(typescript@4.9.5)': + '@typescript-eslint/parser@7.13.0(eslint@8.57.1)(typescript@5.7.2)': dependencies: '@typescript-eslint/scope-manager': 7.13.0 '@typescript-eslint/types': 7.13.0 - '@typescript-eslint/typescript-estree': 7.13.0(typescript@4.9.5) + '@typescript-eslint/typescript-estree': 7.13.0(typescript@5.7.2) '@typescript-eslint/visitor-keys': 7.13.0 debug: 4.3.7(supports-color@8.1.1) eslint: 8.57.1 optionalDependencies: - typescript: 4.9.5 + typescript: 5.7.2 transitivePeerDependencies: - supports-color @@ -4071,15 +4072,15 @@ snapshots: '@typescript-eslint/types': 8.8.0 '@typescript-eslint/visitor-keys': 8.8.0 - '@typescript-eslint/type-utils@7.13.0(eslint@8.57.1)(typescript@4.9.5)': + '@typescript-eslint/type-utils@7.13.0(eslint@8.57.1)(typescript@5.7.2)': dependencies: - '@typescript-eslint/typescript-estree': 7.13.0(typescript@4.9.5) - '@typescript-eslint/utils': 7.13.0(eslint@8.57.1)(typescript@4.9.5) + '@typescript-eslint/typescript-estree': 7.13.0(typescript@5.7.2) + '@typescript-eslint/utils': 7.13.0(eslint@8.57.1)(typescript@5.7.2) debug: 4.3.7(supports-color@8.1.1) eslint: 8.57.1 - ts-api-utils: 1.3.0(typescript@4.9.5) + ts-api-utils: 1.3.0(typescript@5.7.2) optionalDependencies: - typescript: 4.9.5 + typescript: 5.7.2 transitivePeerDependencies: - supports-color @@ -4089,7 +4090,7 @@ snapshots: '@typescript-eslint/types@8.8.0': {} - '@typescript-eslint/typescript-estree@5.62.0(typescript@4.9.5)': + '@typescript-eslint/typescript-estree@5.62.0(typescript@5.7.2)': dependencies: '@typescript-eslint/types': 5.62.0 '@typescript-eslint/visitor-keys': 5.62.0 @@ -4097,13 +4098,13 @@ snapshots: globby: 11.1.0 is-glob: 4.0.3 semver: 7.6.3 - tsutils: 3.21.0(typescript@4.9.5) + tsutils: 3.21.0(typescript@5.7.2) optionalDependencies: - typescript: 4.9.5 + typescript: 5.7.2 transitivePeerDependencies: - supports-color - '@typescript-eslint/typescript-estree@7.13.0(typescript@4.9.5)': + '@typescript-eslint/typescript-estree@7.13.0(typescript@5.7.2)': dependencies: '@typescript-eslint/types': 7.13.0 '@typescript-eslint/visitor-keys': 7.13.0 @@ -4112,13 +4113,13 @@ snapshots: is-glob: 4.0.3 minimatch: 9.0.5 semver: 7.6.3 - ts-api-utils: 1.3.0(typescript@4.9.5) + ts-api-utils: 1.3.0(typescript@5.7.2) optionalDependencies: - typescript: 4.9.5 + typescript: 5.7.2 transitivePeerDependencies: - supports-color - '@typescript-eslint/typescript-estree@8.8.0(typescript@4.9.5)': + '@typescript-eslint/typescript-estree@8.8.0(typescript@5.7.2)': dependencies: '@typescript-eslint/types': 8.8.0 '@typescript-eslint/visitor-keys': 8.8.0 @@ -4127,29 +4128,29 @@ snapshots: is-glob: 4.0.3 minimatch: 9.0.5 semver: 7.6.3 - ts-api-utils: 1.3.0(typescript@4.9.5) + ts-api-utils: 1.3.0(typescript@5.7.2) optionalDependencies: - typescript: 4.9.5 + typescript: 5.7.2 transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@7.13.0(eslint@8.57.1)(typescript@4.9.5)': + '@typescript-eslint/utils@7.13.0(eslint@8.57.1)(typescript@5.7.2)': dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.1) '@typescript-eslint/scope-manager': 7.13.0 '@typescript-eslint/types': 7.13.0 - '@typescript-eslint/typescript-estree': 7.13.0(typescript@4.9.5) + '@typescript-eslint/typescript-estree': 7.13.0(typescript@5.7.2) eslint: 8.57.1 transitivePeerDependencies: - supports-color - typescript - '@typescript-eslint/utils@8.8.0(eslint@8.57.1)(typescript@4.9.5)': + '@typescript-eslint/utils@8.8.0(eslint@8.57.1)(typescript@5.7.2)': dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.1) '@typescript-eslint/scope-manager': 8.8.0 '@typescript-eslint/types': 8.8.0 - '@typescript-eslint/typescript-estree': 8.8.0(typescript@4.9.5) + '@typescript-eslint/typescript-estree': 8.8.0(typescript@5.7.2) eslint: 8.57.1 transitivePeerDependencies: - supports-color @@ -4317,12 +4318,12 @@ snapshots: ast-types-flow@0.0.8: optional: true - astro-eslint-parser@0.17.0(typescript@4.9.5): + astro-eslint-parser@0.17.0(typescript@5.7.2): dependencies: '@astrojs/compiler': 2.10.3 '@typescript-eslint/scope-manager': 5.62.0 '@typescript-eslint/types': 5.62.0 - '@typescript-eslint/typescript-estree': 5.62.0(typescript@4.9.5) + '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.7.2) astrojs-compiler-sync: 0.3.5(@astrojs/compiler@2.10.3) debug: 4.3.7(supports-color@8.1.1) entities: 4.5.0 @@ -4922,7 +4923,7 @@ snapshots: dependencies: semver: 7.6.3 shelljs: 0.8.5 - typescript: 4.9.5 + typescript: 5.8.0-dev.20250106 duplexer2@0.1.4: dependencies: @@ -4935,7 +4936,7 @@ snapshots: jsbn: 0.1.1 safer-buffer: 2.1.2 - electron-mocha@13.0.1(patch_hash=c4pa7rsg6atg3nmsnc7zhtvcny): + electron-mocha@13.0.1: dependencies: ansi-colors: 4.1.3 electron-window: 0.8.1 @@ -5129,12 +5130,12 @@ snapshots: '@babel/eslint-parser': 7.25.7(@babel/core@7.25.7)(eslint@8.57.1) '@babel/plugin-syntax-flow': 7.25.7(@babel/core@7.25.7) '@babel/plugin-syntax-jsx': 7.25.7(@babel/core@7.25.7) - '@typescript-eslint/eslint-plugin': 7.13.0(@typescript-eslint/parser@7.13.0(eslint@8.57.1)(typescript@4.9.5))(eslint@8.57.1)(typescript@4.9.5) - '@typescript-eslint/parser': 7.13.0(eslint@8.57.1)(typescript@4.9.5) + '@typescript-eslint/eslint-plugin': 7.13.0(@typescript-eslint/parser@7.13.0(eslint@8.57.1)(typescript@4.9.5))(eslint@8.57.1)(typescript@5.7.2) + '@typescript-eslint/parser': 7.13.0(eslint@8.57.1)(typescript@5.7.2) anymatch: 3.1.3 eslint: 8.57.1 eslint-config-prettier: 9.1.0(eslint@8.57.1) - eslint-plugin-astro: 0.34.0(eslint@8.57.1)(typescript@4.9.5) + eslint-plugin-astro: 0.34.0(eslint@8.57.1)(typescript@5.7.2) eslint-plugin-html: 8.1.2 eslint-plugin-import: 2.30.0(@typescript-eslint/parser@7.13.0(eslint@8.57.1)(typescript@4.9.5))(eslint@8.57.1) eslint-plugin-json: 3.1.0 @@ -5142,14 +5143,14 @@ snapshots: eslint-plugin-only-warn: '@aminya/eslint-plugin-only-warn@1.2.2' eslint-plugin-optimize-regex: 1.2.1 eslint-plugin-react: 7.37.1(eslint@8.57.1) - eslint-plugin-solid: 0.14.3(eslint@8.57.1)(typescript@4.9.5) + eslint-plugin-solid: 0.14.3(eslint@8.57.1)(typescript@5.7.2) eslint-plugin-yaml: 0.5.0 globify-gitignore: 1.0.3 make-synchronous: 0.1.1 prettier: 3.3.2 read-pkg-up: 7.0.1 semver: 7.6.3 - typescript: 4.9.5 + typescript: 5.7.2 optionalDependencies: coffeescript: 1.12.7 eslint-plugin-coffee: 0.1.15(@typescript-eslint/parser@7.13.0(eslint@8.57.1)(typescript@4.9.5))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.1))(eslint@8.57.1) @@ -5175,18 +5176,18 @@ snapshots: dependencies: debug: 3.2.7 optionalDependencies: - '@typescript-eslint/parser': 7.13.0(eslint@8.57.1)(typescript@4.9.5) + '@typescript-eslint/parser': 7.13.0(eslint@8.57.1)(typescript@5.7.2) eslint: 8.57.1 eslint-import-resolver-node: 0.3.9 transitivePeerDependencies: - supports-color - eslint-plugin-astro@0.34.0(eslint@8.57.1)(typescript@4.9.5): + eslint-plugin-astro@0.34.0(eslint@8.57.1)(typescript@5.7.2): dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.1) '@jridgewell/sourcemap-codec': 1.5.0 '@typescript-eslint/types': 5.62.0 - astro-eslint-parser: 0.17.0(typescript@4.9.5) + astro-eslint-parser: 0.17.0(typescript@5.7.2) eslint: 8.57.1 eslint-compat-utils: 0.5.1(eslint@8.57.1) globals: 13.24.0 @@ -5255,7 +5256,7 @@ snapshots: semver: 6.3.1 tsconfig-paths: 3.15.0 optionalDependencies: - '@typescript-eslint/parser': 7.13.0(eslint@8.57.1)(typescript@4.9.5) + '@typescript-eslint/parser': 7.13.0(eslint@8.57.1)(typescript@5.7.2) transitivePeerDependencies: - eslint-import-resolver-typescript - eslint-import-resolver-webpack @@ -5367,9 +5368,9 @@ snapshots: string.prototype.matchall: 4.0.11 string.prototype.repeat: 1.0.0 - eslint-plugin-solid@0.14.3(eslint@8.57.1)(typescript@4.9.5): + eslint-plugin-solid@0.14.3(eslint@8.57.1)(typescript@5.7.2): dependencies: - '@typescript-eslint/utils': 8.8.0(eslint@8.57.1)(typescript@4.9.5) + '@typescript-eslint/utils': 8.8.0(eslint@8.57.1)(typescript@5.7.2) eslint: 8.57.1 estraverse: 5.3.0 is-html: 2.0.0 @@ -7343,9 +7344,9 @@ snapshots: triple-beam@1.4.1: {} - ts-api-utils@1.3.0(typescript@4.9.5): + ts-api-utils@1.3.0(typescript@5.7.2): dependencies: - typescript: 4.9.5 + typescript: 5.7.2 ts-node@10.9.2(@types/node@22.10.2)(typescript@4.9.5): dependencies: @@ -7376,10 +7377,10 @@ snapshots: tslib@2.7.0: {} - tsutils@3.21.0(typescript@4.9.5): + tsutils@3.21.0(typescript@5.7.2): dependencies: tslib: 1.14.1 - typescript: 4.9.5 + typescript: 5.7.2 tunnel-agent@0.6.0: dependencies: @@ -7456,6 +7457,10 @@ snapshots: typescript@4.9.5: {} + typescript@5.7.2: {} + + typescript@5.8.0-dev.20250106: {} + uc.micro@2.1.0: {} uglify-js@3.19.3: {} From e9b2284d3b520ad94bdfa44d7ac95dba89acfc0e Mon Sep 17 00:00:00 2001 From: Dan Rose Date: Mon, 6 Jan 2025 12:48:04 -0600 Subject: [PATCH 2/2] Restore pnpm.overrides, since pnpm does not respect overrides --- package.json | 18 +++++--- pnpm-lock.yaml | 116 ++++++++++++++++++++++--------------------------- 2 files changed, 65 insertions(+), 69 deletions(-) diff --git a/package.json b/package.json index 3c82eb9e..b8e8fcbf 100644 --- a/package.json +++ b/package.json @@ -70,6 +70,16 @@ "node": ">= 10", "pnpm": ">= 9" }, + "overrides": { + "typescript": "~4.9.5", + "node-gyp": "10.0.1" + }, + "pnpm": { + "overrides": { + "typescript": "~4.9.5", + "node-gyp": "10.0.1" + } + }, "files": [ "CHANGELOG.md", "LICENSE.txt", @@ -239,9 +249,5 @@ "napi" ], "license": "MIT AND MPL-2.0", - "author": "Amin Yahyaabadi , Rolf Timmermans ", - "overrides": { - "typescript": "~4.9.5", - "node-gyp": "10.0.1" - } -} + "author": "Amin Yahyaabadi , Rolf Timmermans " +} \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7911b43b..3f1f1ba4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,6 +4,10 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false +overrides: + typescript: ~4.9.5 + node-gyp: 10.0.1 + importers: .: @@ -3306,7 +3310,7 @@ packages: resolution: {integrity: sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==} engines: {node: '>=16'} peerDependencies: - typescript: '>=4.2.0' + typescript: ~4.9.5 ts-node@10.9.2: resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==} @@ -3315,7 +3319,7 @@ packages: '@swc/core': '>=1.2.50' '@swc/wasm': '>=1.2.50' '@types/node': '*' - typescript: '>=2.7' + typescript: ~4.9.5 peerDependenciesMeta: '@swc/core': optional: true @@ -3335,7 +3339,7 @@ packages: resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} engines: {node: '>= 6'} peerDependencies: - typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta' + typescript: ~4.9.5 tunnel-agent@0.6.0: resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==} @@ -3421,23 +3425,13 @@ packages: engines: {node: '>= 18'} hasBin: true peerDependencies: - typescript: 5.0.x || 5.1.x || 5.2.x || 5.3.x || 5.4.x || 5.5.x || 5.6.x || 5.7.x + typescript: ~4.9.5 typescript@4.9.5: resolution: {integrity: sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==} engines: {node: '>=4.2.0'} hasBin: true - typescript@5.7.2: - resolution: {integrity: sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==} - engines: {node: '>=14.17'} - hasBin: true - - typescript@5.8.0-dev.20250106: - resolution: {integrity: sha512-o7wnxO5cYLyfc7QIUC5XqIhONzvtHj4pKEF3S1lxXh/3zDnAScSaSUzRKyKIRXuTXDgYuaWKhew4jrBRmVAK1Q==} - engines: {node: '>=14.17'} - hasBin: true - uc.micro@2.1.0: resolution: {integrity: sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==} @@ -4073,34 +4067,34 @@ snapshots: '@types/node': 22.10.2 optional: true - '@typescript-eslint/eslint-plugin@7.13.0(@typescript-eslint/parser@7.13.0(eslint@8.57.1)(typescript@4.9.5))(eslint@8.57.1)(typescript@5.7.2)': + '@typescript-eslint/eslint-plugin@7.13.0(@typescript-eslint/parser@7.13.0(eslint@8.57.1)(typescript@4.9.5))(eslint@8.57.1)(typescript@4.9.5)': dependencies: '@eslint-community/regexpp': 4.11.1 - '@typescript-eslint/parser': 7.13.0(eslint@8.57.1)(typescript@5.7.2) + '@typescript-eslint/parser': 7.13.0(eslint@8.57.1)(typescript@4.9.5) '@typescript-eslint/scope-manager': 7.13.0 - '@typescript-eslint/type-utils': 7.13.0(eslint@8.57.1)(typescript@5.7.2) - '@typescript-eslint/utils': 7.13.0(eslint@8.57.1)(typescript@5.7.2) + '@typescript-eslint/type-utils': 7.13.0(eslint@8.57.1)(typescript@4.9.5) + '@typescript-eslint/utils': 7.13.0(eslint@8.57.1)(typescript@4.9.5) '@typescript-eslint/visitor-keys': 7.13.0 eslint: 8.57.1 graphemer: 1.4.0 ignore: 5.3.2 natural-compare: 1.4.0 - ts-api-utils: 1.3.0(typescript@5.7.2) + ts-api-utils: 1.3.0(typescript@4.9.5) optionalDependencies: - typescript: 5.7.2 + typescript: 4.9.5 transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@7.13.0(eslint@8.57.1)(typescript@5.7.2)': + '@typescript-eslint/parser@7.13.0(eslint@8.57.1)(typescript@4.9.5)': dependencies: '@typescript-eslint/scope-manager': 7.13.0 '@typescript-eslint/types': 7.13.0 - '@typescript-eslint/typescript-estree': 7.13.0(typescript@5.7.2) + '@typescript-eslint/typescript-estree': 7.13.0(typescript@4.9.5) '@typescript-eslint/visitor-keys': 7.13.0 debug: 4.3.7(supports-color@8.1.1) eslint: 8.57.1 optionalDependencies: - typescript: 5.7.2 + typescript: 4.9.5 transitivePeerDependencies: - supports-color @@ -4119,15 +4113,15 @@ snapshots: '@typescript-eslint/types': 8.8.0 '@typescript-eslint/visitor-keys': 8.8.0 - '@typescript-eslint/type-utils@7.13.0(eslint@8.57.1)(typescript@5.7.2)': + '@typescript-eslint/type-utils@7.13.0(eslint@8.57.1)(typescript@4.9.5)': dependencies: - '@typescript-eslint/typescript-estree': 7.13.0(typescript@5.7.2) - '@typescript-eslint/utils': 7.13.0(eslint@8.57.1)(typescript@5.7.2) + '@typescript-eslint/typescript-estree': 7.13.0(typescript@4.9.5) + '@typescript-eslint/utils': 7.13.0(eslint@8.57.1)(typescript@4.9.5) debug: 4.3.7(supports-color@8.1.1) eslint: 8.57.1 - ts-api-utils: 1.3.0(typescript@5.7.2) + ts-api-utils: 1.3.0(typescript@4.9.5) optionalDependencies: - typescript: 5.7.2 + typescript: 4.9.5 transitivePeerDependencies: - supports-color @@ -4137,7 +4131,7 @@ snapshots: '@typescript-eslint/types@8.8.0': {} - '@typescript-eslint/typescript-estree@5.62.0(typescript@5.7.2)': + '@typescript-eslint/typescript-estree@5.62.0(typescript@4.9.5)': dependencies: '@typescript-eslint/types': 5.62.0 '@typescript-eslint/visitor-keys': 5.62.0 @@ -4145,13 +4139,13 @@ snapshots: globby: 11.1.0 is-glob: 4.0.3 semver: 7.6.3 - tsutils: 3.21.0(typescript@5.7.2) + tsutils: 3.21.0(typescript@4.9.5) optionalDependencies: - typescript: 5.7.2 + typescript: 4.9.5 transitivePeerDependencies: - supports-color - '@typescript-eslint/typescript-estree@7.13.0(typescript@5.7.2)': + '@typescript-eslint/typescript-estree@7.13.0(typescript@4.9.5)': dependencies: '@typescript-eslint/types': 7.13.0 '@typescript-eslint/visitor-keys': 7.13.0 @@ -4160,13 +4154,13 @@ snapshots: is-glob: 4.0.3 minimatch: 9.0.5 semver: 7.6.3 - ts-api-utils: 1.3.0(typescript@5.7.2) + ts-api-utils: 1.3.0(typescript@4.9.5) optionalDependencies: - typescript: 5.7.2 + typescript: 4.9.5 transitivePeerDependencies: - supports-color - '@typescript-eslint/typescript-estree@8.8.0(typescript@5.7.2)': + '@typescript-eslint/typescript-estree@8.8.0(typescript@4.9.5)': dependencies: '@typescript-eslint/types': 8.8.0 '@typescript-eslint/visitor-keys': 8.8.0 @@ -4175,29 +4169,29 @@ snapshots: is-glob: 4.0.3 minimatch: 9.0.5 semver: 7.6.3 - ts-api-utils: 1.3.0(typescript@5.7.2) + ts-api-utils: 1.3.0(typescript@4.9.5) optionalDependencies: - typescript: 5.7.2 + typescript: 4.9.5 transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@7.13.0(eslint@8.57.1)(typescript@5.7.2)': + '@typescript-eslint/utils@7.13.0(eslint@8.57.1)(typescript@4.9.5)': dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.1) '@typescript-eslint/scope-manager': 7.13.0 '@typescript-eslint/types': 7.13.0 - '@typescript-eslint/typescript-estree': 7.13.0(typescript@5.7.2) + '@typescript-eslint/typescript-estree': 7.13.0(typescript@4.9.5) eslint: 8.57.1 transitivePeerDependencies: - supports-color - typescript - '@typescript-eslint/utils@8.8.0(eslint@8.57.1)(typescript@5.7.2)': + '@typescript-eslint/utils@8.8.0(eslint@8.57.1)(typescript@4.9.5)': dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.1) '@typescript-eslint/scope-manager': 8.8.0 '@typescript-eslint/types': 8.8.0 - '@typescript-eslint/typescript-estree': 8.8.0(typescript@5.7.2) + '@typescript-eslint/typescript-estree': 8.8.0(typescript@4.9.5) eslint: 8.57.1 transitivePeerDependencies: - supports-color @@ -4365,12 +4359,12 @@ snapshots: ast-types-flow@0.0.8: optional: true - astro-eslint-parser@0.17.0(typescript@5.7.2): + astro-eslint-parser@0.17.0(typescript@4.9.5): dependencies: '@astrojs/compiler': 2.10.3 '@typescript-eslint/scope-manager': 5.62.0 '@typescript-eslint/types': 5.62.0 - '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.7.2) + '@typescript-eslint/typescript-estree': 5.62.0(typescript@4.9.5) astrojs-compiler-sync: 0.3.5(@astrojs/compiler@2.10.3) debug: 4.3.7(supports-color@8.1.1) entities: 4.5.0 @@ -4970,7 +4964,7 @@ snapshots: dependencies: semver: 7.6.3 shelljs: 0.8.5 - typescript: 5.8.0-dev.20250106 + typescript: 4.9.5 duplexer2@0.1.4: dependencies: @@ -5177,12 +5171,12 @@ snapshots: '@babel/eslint-parser': 7.25.7(@babel/core@7.25.7)(eslint@8.57.1) '@babel/plugin-syntax-flow': 7.25.7(@babel/core@7.25.7) '@babel/plugin-syntax-jsx': 7.25.7(@babel/core@7.25.7) - '@typescript-eslint/eslint-plugin': 7.13.0(@typescript-eslint/parser@7.13.0(eslint@8.57.1)(typescript@4.9.5))(eslint@8.57.1)(typescript@5.7.2) - '@typescript-eslint/parser': 7.13.0(eslint@8.57.1)(typescript@5.7.2) + '@typescript-eslint/eslint-plugin': 7.13.0(@typescript-eslint/parser@7.13.0(eslint@8.57.1)(typescript@4.9.5))(eslint@8.57.1)(typescript@4.9.5) + '@typescript-eslint/parser': 7.13.0(eslint@8.57.1)(typescript@4.9.5) anymatch: 3.1.3 eslint: 8.57.1 eslint-config-prettier: 9.1.0(eslint@8.57.1) - eslint-plugin-astro: 0.34.0(eslint@8.57.1)(typescript@5.7.2) + eslint-plugin-astro: 0.34.0(eslint@8.57.1)(typescript@4.9.5) eslint-plugin-html: 8.1.2 eslint-plugin-import: 2.30.0(@typescript-eslint/parser@7.13.0(eslint@8.57.1)(typescript@4.9.5))(eslint@8.57.1) eslint-plugin-json: 3.1.0 @@ -5190,14 +5184,14 @@ snapshots: eslint-plugin-only-warn: '@aminya/eslint-plugin-only-warn@1.2.2' eslint-plugin-optimize-regex: 1.2.1 eslint-plugin-react: 7.37.1(eslint@8.57.1) - eslint-plugin-solid: 0.14.3(eslint@8.57.1)(typescript@5.7.2) + eslint-plugin-solid: 0.14.3(eslint@8.57.1)(typescript@4.9.5) eslint-plugin-yaml: 0.5.0 globify-gitignore: 1.0.3 make-synchronous: 0.1.1 prettier: 3.3.2 read-pkg-up: 7.0.1 semver: 7.6.3 - typescript: 5.7.2 + typescript: 4.9.5 optionalDependencies: coffeescript: 1.12.7 eslint-plugin-coffee: 0.1.15(@typescript-eslint/parser@7.13.0(eslint@8.57.1)(typescript@4.9.5))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.1))(eslint@8.57.1) @@ -5223,18 +5217,18 @@ snapshots: dependencies: debug: 3.2.7 optionalDependencies: - '@typescript-eslint/parser': 7.13.0(eslint@8.57.1)(typescript@5.7.2) + '@typescript-eslint/parser': 7.13.0(eslint@8.57.1)(typescript@4.9.5) eslint: 8.57.1 eslint-import-resolver-node: 0.3.9 transitivePeerDependencies: - supports-color - eslint-plugin-astro@0.34.0(eslint@8.57.1)(typescript@5.7.2): + eslint-plugin-astro@0.34.0(eslint@8.57.1)(typescript@4.9.5): dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.1) '@jridgewell/sourcemap-codec': 1.5.0 '@typescript-eslint/types': 5.62.0 - astro-eslint-parser: 0.17.0(typescript@5.7.2) + astro-eslint-parser: 0.17.0(typescript@4.9.5) eslint: 8.57.1 eslint-compat-utils: 0.5.1(eslint@8.57.1) globals: 13.24.0 @@ -5303,7 +5297,7 @@ snapshots: semver: 6.3.1 tsconfig-paths: 3.15.0 optionalDependencies: - '@typescript-eslint/parser': 7.13.0(eslint@8.57.1)(typescript@5.7.2) + '@typescript-eslint/parser': 7.13.0(eslint@8.57.1)(typescript@4.9.5) transitivePeerDependencies: - eslint-import-resolver-typescript - eslint-import-resolver-webpack @@ -5415,9 +5409,9 @@ snapshots: string.prototype.matchall: 4.0.11 string.prototype.repeat: 1.0.0 - eslint-plugin-solid@0.14.3(eslint@8.57.1)(typescript@5.7.2): + eslint-plugin-solid@0.14.3(eslint@8.57.1)(typescript@4.9.5): dependencies: - '@typescript-eslint/utils': 8.8.0(eslint@8.57.1)(typescript@5.7.2) + '@typescript-eslint/utils': 8.8.0(eslint@8.57.1)(typescript@4.9.5) eslint: 8.57.1 estraverse: 5.3.0 is-html: 2.0.0 @@ -7393,9 +7387,9 @@ snapshots: triple-beam@1.4.1: {} - ts-api-utils@1.3.0(typescript@5.7.2): + ts-api-utils@1.3.0(typescript@4.9.5): dependencies: - typescript: 5.7.2 + typescript: 4.9.5 ts-node@10.9.2(@types/node@22.10.2)(typescript@4.9.5): dependencies: @@ -7426,10 +7420,10 @@ snapshots: tslib@2.7.0: {} - tsutils@3.21.0(typescript@5.7.2): + tsutils@3.21.0(typescript@4.9.5): dependencies: tslib: 1.14.1 - typescript: 5.7.2 + typescript: 4.9.5 tunnel-agent@0.6.0: dependencies: @@ -7526,10 +7520,6 @@ snapshots: typescript@4.9.5: {} - typescript@5.7.2: {} - - typescript@5.8.0-dev.20250106: {} - uc.micro@2.1.0: {} uglify-js@3.19.3: {}