diff --git a/.circleci/config.yml b/.circleci/config.yml index 0e221025c..58baa4d92 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,7 +21,7 @@ defaults: only: /^v.*/ node-versions: &node-versions - &node-maintenance-lts "16.20" - - &node-active-lts "18.20" + - &node-active-lts "18.18" - &node-current "20.17" pkg-cache-path: &pkg-cache-path /tmp/pkg-node-binaries ldid-version: &ldid-version 2.1.5-procursus7 # https://github.com/ProcursusTeam/ldid diff --git a/package.json b/package.json index 3d2b8508a..b6fc15369 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ }, "license": "Apache-2.0", "engines": { - "node": "^12.20 || >= 14.13" + "node": "^16.20 || ^18.18 || >= 20.17" }, "scripts": { "preclean": "yarn workspaces foreach run preclean", @@ -78,6 +78,9 @@ "@semantic-release/git" ] }, + "resolutions": { + "jsep": "1.4.0" + }, "devDependencies": { "@commitlint/cli": "^14.1.0", "@commitlint/config-conventional": "^12.1.4", @@ -125,7 +128,7 @@ "semantic-release": "^19.0.5", "ts-jest": "^29.2.5", "ts-node": "^10.8.2", - "typescript": "^4.4.4" + "typescript": "4.4.4" }, "lint-staged": { "*.{ts,js}": [ diff --git a/packages/cli/package.json b/packages/cli/package.json index bb48f046d..be125cd24 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -8,7 +8,7 @@ "spectral": "./dist/index.js" }, "engines": { - "node": "^12.20 || >= 14.13" + "node": "^16.20 || ^18.18 || >= 20.17" }, "license": "Apache-2.0", "main": "dist/index.js", @@ -58,7 +58,7 @@ "@types/es-aggregate-error": "^1.0.2", "@types/xml2js": "^0.4.9", "@types/yargs": "^17.0.8", - "@yao-pkg/pkg": "^5.11.1", + "@yao-pkg/pkg": "5.11.0", "es-aggregate-error": "^1.0.7", "nock": "^13.5.4", "xml2js": "^0.5.0" diff --git a/packages/core/package.json b/packages/core/package.json index e81f50c44..22fe2e8cd 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -31,7 +31,7 @@ } }, "engines": { - "node": "^12.20 || >= 14.13" + "node": "^16.20 || ^18.18 || >= 20.17" }, "dependencies": { "@stoplight/better-ajv-errors": "1.0.3", @@ -53,7 +53,7 @@ "minimatch": "3.1.2", "nimma": "0.2.3", "pony-cause": "^1.0.0", - "simple-eval": "1.0.0", + "simple-eval": "1.0.1", "tslib": "^2.3.0" }, "devDependencies": { diff --git a/packages/formats/package.json b/packages/formats/package.json index e25c4136a..7eb111128 100644 --- a/packages/formats/package.json +++ b/packages/formats/package.json @@ -16,7 +16,7 @@ ], "types": "dist/index.d.ts", "engines": { - "node": ">=12" + "node": "^16.20 || ^18.18 || >= 20.17" }, "dependencies": { "@stoplight/json": "^3.17.0", diff --git a/packages/formatters/package.json b/packages/formatters/package.json index feff31eda..0dea5df09 100644 --- a/packages/formatters/package.json +++ b/packages/formatters/package.json @@ -5,7 +5,7 @@ "bugs": "https://github.com/stoplightio/spectral/issues", "author": "Stoplight ", "engines": { - "node": "^12.20 || >=14.13" + "node": "^16.20 || ^18.18 || >= 20.17" }, "license": "Apache-2.0", "files": [ @@ -50,7 +50,7 @@ }, "devDependencies": { "ast-types": "^0.14.2", - "astring": "^1.8.4", + "astring": "^1.9.0", "eol": "0.9.1", "node-html-parser": "^4.1.5", "xml2js": "^0.5.0" diff --git a/packages/functions/package.json b/packages/functions/package.json index 10ae26e85..754a318d7 100644 --- a/packages/functions/package.json +++ b/packages/functions/package.json @@ -16,7 +16,7 @@ ], "types": "dist/index.d.ts", "engines": { - "node": ">=12" + "node": "^16.20 || ^18.18 || >= 20.17" }, "dependencies": { "@stoplight/better-ajv-errors": "1.0.3", diff --git a/packages/parsers/package.json b/packages/parsers/package.json index 06db88a7b..1f1ee4777 100644 --- a/packages/parsers/package.json +++ b/packages/parsers/package.json @@ -5,7 +5,7 @@ "bugs": "https://github.com/stoplightio/spectral/issues", "author": "Stoplight ", "engines": { - "node": "^12.20 || >=14.13" + "node": "^16.20 || ^18.18 || >= 20.17" }, "license": "Apache-2.0", "main": "dist/index.js", diff --git a/packages/ref-resolver/package.json b/packages/ref-resolver/package.json index 69d87e54c..cb2d0f95e 100644 --- a/packages/ref-resolver/package.json +++ b/packages/ref-resolver/package.json @@ -5,7 +5,7 @@ "bugs": "https://github.com/stoplightio/spectral/issues", "author": "Stoplight ", "engines": { - "node": ">=12" + "node": "^16.20 || ^18.18 || >= 20.17" }, "license": "Apache-2.0", "main": "dist/index.js", diff --git a/packages/ruleset-bundler/package.json b/packages/ruleset-bundler/package.json index 00f3b1d55..4b2dc63be 100644 --- a/packages/ruleset-bundler/package.json +++ b/packages/ruleset-bundler/package.json @@ -5,7 +5,7 @@ "bugs": "https://github.com/stoplightio/spectral/issues", "author": "Stoplight ", "engines": { - "node": "^12.20 || >= 14.13" + "node": "^16.20 || ^18.18 || >= 20.17" }, "license": "Apache-2.0", "main": "dist/index.js", diff --git a/packages/ruleset-migrator/package.json b/packages/ruleset-migrator/package.json index 742c8294e..152b4985a 100644 --- a/packages/ruleset-migrator/package.json +++ b/packages/ruleset-migrator/package.json @@ -5,7 +5,7 @@ "bugs": "https://github.com/stoplightio/spectral/issues", "author": "Stoplight ", "engines": { - "node": ">=12" + "node": "^16.20 || ^18.18 || >= 20.17" }, "license": "Apache-2.0", "main": "dist/index.js", @@ -31,7 +31,7 @@ "@types/node": "*", "ajv": "^8.17.1", "ast-types": "0.14.2", - "astring": "^1.7.5", + "astring": "^1.9.0", "reserved": "0.1.2", "tslib": "^2.3.1", "validate-npm-package-name": "3.0.0" diff --git a/packages/rulesets/package.json b/packages/rulesets/package.json index adf25b1a6..e998ded50 100644 --- a/packages/rulesets/package.json +++ b/packages/rulesets/package.json @@ -5,7 +5,7 @@ "bugs": "https://github.com/stoplightio/spectral/issues", "author": "Stoplight ", "engines": { - "node": ">=12" + "node": "^16.20 || ^18.18 || >= 20.17" }, "license": "Apache-2.0", "main": "dist/index.js", diff --git a/packages/runtime/package.json b/packages/runtime/package.json index 84c89131d..a7c46c2f0 100644 --- a/packages/runtime/package.json +++ b/packages/runtime/package.json @@ -5,7 +5,7 @@ "bugs": "https://github.com/stoplightio/spectral/issues", "author": "Stoplight ", "engines": { - "node": ">=12" + "node": "^16.20 || ^18.18 || >= 20.17" }, "license": "Apache-2.0", "main": "dist/index.js", diff --git a/packages/runtime/src/reader.ts b/packages/runtime/src/reader.ts index 521d97d78..2244b0b87 100644 --- a/packages/runtime/src/reader.ts +++ b/packages/runtime/src/reader.ts @@ -29,7 +29,7 @@ export async function readFile(name: string, opts: IReadOptions): Promise { controller.abort(); }, opts.timeout); - requestOpts.signal = controller.signal; + requestOpts.signal = controller.signal as AbortSignal; } response = await request(name, requestOpts); diff --git a/yarn.lock b/yarn.lock index 70bf101bc..781462832 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2936,7 +2936,7 @@ __metadata: "@types/es-aggregate-error": ^1.0.2 "@types/xml2js": ^0.4.9 "@types/yargs": ^17.0.8 - "@yao-pkg/pkg": ^5.11.1 + "@yao-pkg/pkg": 5.11.0 chalk: 4.1.2 es-aggregate-error: ^1.0.7 fast-glob: ~3.2.12 @@ -2982,7 +2982,7 @@ __metadata: nimma: 0.2.3 nock: ^13.5.4 pony-cause: ^1.0.0 - simple-eval: 1.0.0 + simple-eval: 1.0.1 treeify: ^1.1.0 tslib: ^2.3.0 languageName: unknown @@ -3009,7 +3009,7 @@ __metadata: "@stoplight/types": ^13.15.0 "@types/markdown-escape": ^1.1.3 ast-types: ^0.14.2 - astring: ^1.8.4 + astring: ^1.9.0 chalk: 4.1.2 cliui: 7.0.4 eol: 0.9.1 @@ -3109,7 +3109,7 @@ __metadata: "@types/node": "*" ajv: ^8.17.1 ast-types: 0.14.2 - astring: ^1.7.5 + astring: ^1.9.0 fetch-mock: ^9.11.0 json-schema-to-typescript: ^10.1.5 memfs: ^3.3.0 @@ -3617,12 +3617,12 @@ __metadata: linkType: hard "@types/node-fetch@npm:^2.5.12": - version: 2.5.12 - resolution: "@types/node-fetch@npm:2.5.12" + version: 2.6.12 + resolution: "@types/node-fetch@npm:2.6.12" dependencies: "@types/node": "*" - form-data: ^3.0.0 - checksum: ad63c85ba6a9477b8e057ec8682257738130d98e8ece4e31141789bd99df9d9147985cc8bc0cb5c8983ed5aa6bb95d46df23d1e055f4ad5cf8b82fc69cf626c7 + form-data: ^4.0.0 + checksum: 9647e68f9a125a090220c38d77b3c8e669c488658ae7506f1b4f9568214beba087624b1705bba1dc76649a65281ce3fd5b400e15266cbef8088027fb88777557 languageName: node linkType: hard @@ -3937,9 +3937,9 @@ __metadata: languageName: node linkType: hard -"@yao-pkg/pkg@npm:^5.11.1": - version: 5.11.1 - resolution: "@yao-pkg/pkg@npm:5.11.1" +"@yao-pkg/pkg@npm:5.11.0": + version: 5.11.0 + resolution: "@yao-pkg/pkg@npm:5.11.0" dependencies: "@babel/generator": 7.23.0 "@babel/parser": 7.23.0 @@ -3957,7 +3957,7 @@ __metadata: stream-meter: ^1.0.4 bin: pkg: lib-es5/bin.js - checksum: aba36e68411953169f7bf29229f7e18835b671fa25ff12c72d899e6a18b33f2e8edc40f762cad1ef3e331ccbea4dceb807a6adf7d3dcfeb4b09a6819054c9a92 + checksum: 3317f9cc9899f45a2f7a7aa6317bfb6574ce25015e3a90398ddc59f7800ccc36754d093a5636a5ca50dbae024930d28e98b3d1f50664aea83f2d1c48de700046 languageName: node linkType: hard @@ -4401,16 +4401,7 @@ __metadata: languageName: node linkType: hard -"astring@npm:^1.7.5, astring@npm:^1.8.4": - version: 1.8.4 - resolution: "astring@npm:1.8.4" - bin: - astring: bin/astring - checksum: bc0b98087350c4a0c8a510d491d648cf8b299ec904629d5e0f5ae8d2ccc515cd27475327bb9729c7e92f4a4873adcd05cef15379d0f6f7293f1320319f0d24f0 - languageName: node - linkType: hard - -"astring@npm:^1.8.1": +"astring@npm:^1.8.1, astring@npm:^1.9.0": version: 1.9.0 resolution: "astring@npm:1.9.0" bin: @@ -7126,14 +7117,14 @@ __metadata: languageName: node linkType: hard -"form-data@npm:^3.0.0": - version: 3.0.0 - resolution: "form-data@npm:3.0.0" +"form-data@npm:^4.0.0": + version: 4.0.1 + resolution: "form-data@npm:4.0.1" dependencies: asynckit: ^0.4.0 combined-stream: ^1.0.8 mime-types: ^2.1.12 - checksum: 60ec3fe7e23154949ab6fef31baedf5afbfb8d6441ea8d19b211b43a5d0448be2918c9bba6218cade56a7cbd43f670d6e75f41f626f8d397d56bf8c60f4a829d + checksum: ccee458cd5baf234d6b57f349fe9cc5f9a2ea8fd1af5ecda501a18fd1572a6dd3bf08a49f00568afd995b6a65af34cb8dec083cf9d582c4e621836499498dd84 languageName: node linkType: hard @@ -9080,17 +9071,10 @@ __metadata: languageName: node linkType: hard -"jsep@npm:^1.1.2": - version: 1.3.6 - resolution: "jsep@npm:1.3.6" - checksum: e166a8fa453878e0b64cc82025db13bb6d4835b36de892373722f7cecd9cdaed05dc61db090a0d84426783ff0aab419d1719801b2014796beb873030a3c8b12a - languageName: node - linkType: hard - -"jsep@npm:^1.2.0, jsep@npm:^1.3.9": - version: 1.3.9 - resolution: "jsep@npm:1.3.9" - checksum: d1f3e2cc00209f67a989b73c2a89d2ccbea908d950ec959e2448c6449b134c6367b47eef4e1292767cb490f0b5b72e7309080b93ee4c7398684df2514dbd33a3 +"jsep@npm:1.4.0": + version: 1.4.0 + resolution: "jsep@npm:1.4.0" + checksum: 8e7af5ecb91483b227092b87a3e85b5df3e848dbe6f201b19efcb18047567530d21dfeecb0978e09d1f66554fcfaed84176819eeacdfc86f61dc05c40c18f824 languageName: node linkType: hard @@ -11446,14 +11430,14 @@ __metadata: languageName: node linkType: hard -"picomatch@npm:^2.0.4, picomatch@npm:^2.2.1, picomatch@npm:^2.2.2, picomatch@npm:^2.2.3": +"picomatch@npm:^2.0.4, picomatch@npm:^2.2.1, picomatch@npm:^2.2.3": version: 2.3.0 resolution: "picomatch@npm:2.3.0" checksum: 16818720ea7c5872b6af110760dee856c8e4cd79aed1c7a006d076b1cc09eff3ae41ca5019966694c33fbd2e1cc6ea617ab10e4adac6df06556168f13be3fca2 languageName: node linkType: hard -"picomatch@npm:^2.3.1": +"picomatch@npm:^2.2.2, picomatch@npm:^2.3.1": version: 2.3.1 resolution: "picomatch@npm:2.3.1" checksum: 050c865ce81119c4822c45d3c84f1ced46f93a0126febae20737bd05ca20589c564d6e9226977df859ed5e03dc73f02584a2b0faad36e896936238238b0446cf @@ -12311,7 +12295,7 @@ __metadata: semantic-release: ^19.0.5 ts-jest: ^29.2.5 ts-node: ^10.8.2 - typescript: ^4.4.4 + typescript: 4.4.4 languageName: unknown linkType: soft @@ -12621,12 +12605,12 @@ __metadata: languageName: node linkType: hard -"simple-eval@npm:1.0.0": - version: 1.0.0 - resolution: "simple-eval@npm:1.0.0" +"simple-eval@npm:1.0.1": + version: 1.0.1 + resolution: "simple-eval@npm:1.0.1" dependencies: - jsep: ^1.1.2 - checksum: 0f0719ae3a84d4b9c19366dc03065b1fe9638c982ed3e9d44ba541d25e3454e99419e3239034974fd6c5074b79c119419168b8f343fef4da6d7e35227cfd1f87 + jsep: ^1.3.6 + checksum: 280207cfe4538c500f6b41e4d88576cf250337b0042bec8f9f5cf025b3a70e07974e522edd01e69d378767dd73068765d4f46ad55db5c94943c8f3585bff95af languageName: node linkType: hard @@ -13689,7 +13673,7 @@ __metadata: languageName: node linkType: hard -"typescript@npm:^4.4.3, typescript@npm:^4.4.4": +"typescript@npm:4.4.4, typescript@npm:^4.4.3": version: 4.4.4 resolution: "typescript@npm:4.4.4" bin: @@ -13699,7 +13683,7 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@^4.4.3#~builtin, typescript@patch:typescript@^4.4.4#~builtin": +"typescript@patch:typescript@4.4.4#~builtin, typescript@patch:typescript@^4.4.3#~builtin": version: 4.4.4 resolution: "typescript@patch:typescript@npm%3A4.4.4#~builtin::version=4.4.4&hash=bbeadb" bin: