From 2c9d2450f1ab1dab2f5adc8e5f772c564381872e Mon Sep 17 00:00:00 2001 From: Anna Bocharova Date: Sat, 7 Oct 2023 01:53:00 +0200 Subject: [PATCH] Replacing `ts-node` with `swc-node/register` (#1210) Closes #1170 It seems that `ts-node` is abandoned by its maintainers, so I'm going to replace it by `swc-node/register` the same way I did for `merge-sx`. --- .github/workflows/node.js.yml | 4 +- .npmignore | 2 +- SECURITY.md | 2 +- example/example.swagger.yaml | 1 - example/generate-client.ts | 7 +- example/generate-open-api-schema.ts | 5 +- jest.config.json | 12 +++ jest.config.ts | 16 ---- package.json | 18 ++-- tests/helpers.ts | 2 +- tests/system/client.spec.ts | 2 +- tests/system/example.spec.ts | 2 +- tools/esm-test.ts | 11 ++- tools/integration-test.ts | 8 +- tools/license.ts | 3 +- tsconfig.json | 5 +- yarn.lock | 135 +++++++++------------------- 17 files changed, 95 insertions(+), 140 deletions(-) create mode 100644 jest.config.json delete mode 100644 jest.config.ts diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 788027e46..a41a71a33 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [18.0.0, 18.x, 20.1.0, 20.x] + node-version: [18.0.0, 18.6.0, 18.x, 20.1.0, 20.x] # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ steps: - name: Get yarn cache dir @@ -51,6 +51,8 @@ jobs: - name: Integration test run: yarn test:int - name: ESM test + # see https://github.com/RobinTail/express-zod-api/pull/1210#issuecomment-1751489201 + if: matrix.node-version != '18.0.0' run: yarn test:esm finish: needs: build diff --git a/.npmignore b/.npmignore index 6469673fc..23cbe966a 100644 --- a/.npmignore +++ b/.npmignore @@ -4,7 +4,7 @@ tsconfig.build.json tsconfig.esm.json example .husky -jest.config.ts +jest.config.json tests .idea yarn-error.log diff --git a/SECURITY.md b/SECURITY.md index 56f4fa09e..af1a1cf89 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,6 +23,6 @@ Found a vulnerability or other security issue? Please urgently inform me privately by -[email](https://github.com/RobinTail/express-zod-api/blob/master/package.json#L133). +[email](https://github.com/RobinTail/express-zod-api/blob/master/package.json#L135). I will try to fix it as soon as possible. diff --git a/example/example.swagger.yaml b/example/example.swagger.yaml index 559c85431..b22ecceab 100644 --- a/example/example.swagger.yaml +++ b/example/example.swagger.yaml @@ -429,4 +429,3 @@ tags: description: Everything about the files processing servers: - url: https://example.com - diff --git a/example/generate-client.ts b/example/generate-client.ts index d9979f0dc..fd3373826 100644 --- a/example/generate-client.ts +++ b/example/generate-client.ts @@ -1,4 +1,9 @@ +import { writeFileSync } from "node:fs"; import { Integration } from "../src"; import { routing } from "./routing"; -console.log(new Integration({ routing }).print()); +writeFileSync( + "example/example.client.ts", + new Integration({ routing }).print(), + "utf-8", +); diff --git a/example/generate-open-api-schema.ts b/example/generate-open-api-schema.ts index 31082aedf..e992a7e22 100644 --- a/example/generate-open-api-schema.ts +++ b/example/generate-open-api-schema.ts @@ -1,9 +1,11 @@ +import { writeFileSync } from "node:fs"; import { Documentation } from "../src"; import { config } from "./config"; import { routing } from "./routing"; import manifest from "../package.json"; -console.log( +writeFileSync( + "example/example.swagger.yaml", new Documentation({ routing, config, @@ -11,4 +13,5 @@ console.log( title: "Example API", serverUrl: "https://example.com", }).getSpecAsYaml(), + "utf-8", ); diff --git a/jest.config.json b/jest.config.json new file mode 100644 index 000000000..e753a9a4a --- /dev/null +++ b/jest.config.json @@ -0,0 +1,12 @@ +{ + "transform": { + "^.+\\.ts$": "@swc/jest" + }, + "testEnvironment": "node", + "verbose": true, + "forceExit": true, + "collectCoverage": true, + "collectCoverageFrom": ["src/**"], + "coverageReporters": ["json-summary", "text", "html", "lcov"], + "testTimeout": 10000 +} diff --git a/jest.config.ts b/jest.config.ts deleted file mode 100644 index 33412b144..000000000 --- a/jest.config.ts +++ /dev/null @@ -1,16 +0,0 @@ -import type { Config } from "@jest/types"; - -const config: Config.InitialOptions = { - transform: { - "^.+\\.ts$": "@swc/jest", - }, - testEnvironment: "node", - verbose: true, - forceExit: true, - collectCoverage: true, - collectCoverageFrom: ["src/**"], - coverageReporters: ["json-summary", "text", "html", "lcov"], - testTimeout: 10000, -}; - -export default config; diff --git a/package.json b/package.json index 502033b0f..898ae1f80 100644 --- a/package.json +++ b/package.json @@ -4,16 +4,17 @@ "description": "A Typescript library to help you get an API server up and running with I/O schema validation and custom middlewares in minutes.", "license": "MIT", "scripts": { - "start": "ts-node example/index.ts", + "start": "yarn tsnode example/index.ts", "build": "yarn build:compile && yarn build:tests && yarn build:assets", "build:compile": "tsup && attw --pack", "build:tests": "yarn build:int && yarn build:esm", - "build:int": "ts-node tools/integration-test.ts && yarn install --cwd ./tests/integration", - "build:esm": "ts-node tools/esm-test.ts && yarn install --cwd ./tests/esm", + "build:int": "yarn tsnode tools/integration-test.ts && yarn install --cwd ./tests/integration", + "build:esm": "yarn tsnode tools/esm-test.ts && yarn install --cwd ./tests/esm", "build:assets": "yarn build:swagger && yarn build:client && yarn build:license", - "build:swagger": "ts-node example/generate-open-api-schema.ts > example/example.swagger.yaml", - "build:client": "ts-node example/generate-client.ts > example/example.client.ts && yarn prettier example/example.client.ts --write", - "build:license": "ts-node tools/license.ts > ./LICENSE", + "build:swagger": "yarn tsnode example/generate-open-api-schema.ts", + "build:client": "yarn tsnode example/generate-client.ts && yarn prettier example/example.client.ts --write", + "build:license": "yarn tsnode tools/license.ts", + "build:logo": "yarn tsnode tools/startup-logo.ts", "test": "yarn test:types && yarn test:jest && yarn test:badge", "test:int": "jest ./tests/integration", "test:esm": "jest ./tests/esm", @@ -23,6 +24,7 @@ "test:badge": "make-coverage-badge --output-path ./coverage.svg", "lint": "eslint src example tests tools && yarn prettier *.md --check", "mdfix": "prettier *.md --write", + "tsnode": "node -r @swc-node/register", "precommit": "yarn build && yarn lint && yarn test && git add example/example.swagger.yaml example/example.client.ts ./LICENSE ./coverage.svg", "prepublishOnly": "yarn build && yarn lint && yarn test", "postversion": "git push && git push --tags", @@ -81,7 +83,8 @@ }, "devDependencies": { "@arethetypeswrong/cli": "^0.11.0", - "@swc/core": "^1.3.82", + "@swc-node/register": "^1.6.8", + "@swc/core": "^1.3.92", "@swc/jest": "^0.2.29", "@tsconfig/node18": "^18.2.1", "@types/cors": "^2.8.14", @@ -112,7 +115,6 @@ "mockdate": "^3.0.5", "prettier": "3.0.3", "strip-ansi": "^6.0.1", - "ts-node": "^10.9.1", "tsd": "^0.29.0", "tsup": "^7.2.0", "typescript": "^5.2.2", diff --git a/tests/helpers.ts b/tests/helpers.ts index 974655ee4..6df4020fc 100644 --- a/tests/helpers.ts +++ b/tests/helpers.ts @@ -1,4 +1,4 @@ -import jestConfig from "../jest.config"; +import jestConfig from "../jest.config.json"; import { z } from "zod"; import { SchemaHandler, walkSchema } from "../src/schema-walker"; diff --git a/tests/system/client.spec.ts b/tests/system/client.spec.ts index 985966725..cc7110e7e 100644 --- a/tests/system/client.spec.ts +++ b/tests/system/client.spec.ts @@ -16,7 +16,7 @@ describe("Example", () => { }; beforeAll(() => { - example = spawn("ts-node", ["example/index.ts"]); + example = spawn("node", ["-r", "@swc-node/register", "example/index.ts"]); example.stdout.on("data", listener); }); diff --git a/tests/system/example.spec.ts b/tests/system/example.spec.ts index 6bc9dc948..9f2d7080a 100644 --- a/tests/system/example.spec.ts +++ b/tests/system/example.spec.ts @@ -13,7 +13,7 @@ describe("Example", () => { }; beforeAll(() => { - example = spawn("ts-node", ["example/index.ts"]); + example = spawn("node", ["-r", "@swc-node/register", "example/index.ts"]); example.stdout.on("data", listener); }); diff --git a/tools/esm-test.ts b/tools/esm-test.ts index c9c4c6751..7e4a49c1e 100644 --- a/tools/esm-test.ts +++ b/tools/esm-test.ts @@ -5,22 +5,21 @@ import { getTSConfigBase } from "./tsconfig-base"; const tsconfigBase = getTSConfigBase(); -// @todo revert "start" to "ts-node-esm quick-start.ts" when the ts-node issue fixed -// @link https://github.com/TypeStrong/ts-node/issues/1997 const packageJson = ` { "name": "express-zod-api-esm-test", "version": "1.0.0", "scripts": { - "launch": "node --no-warnings=ExperimentalWarning --loader ts-node/esm", - "postinstall": "yarn launch fix-package.ts", - "start": "yarn launch quick-start.ts" + "tsnode": "node --loader @swc-node/register/esm", + "postinstall": "yarn tsnode fix-package.ts", + "start": "yarn tsnode quick-start.ts" }, "type": "module", "dependencies": { "@tsconfig/node${tsconfigBase}": "latest", "express-zod-api": "../../dist", - "ts-node": "10.9.1", + "@swc/core": "1.3.92", + "@swc-node/register": "1.6.8", "typescript": "5.2.2", "@types/node": "*" } diff --git a/tools/integration-test.ts b/tools/integration-test.ts index a416bbbb3..5b693ea7d 100644 --- a/tools/integration-test.ts +++ b/tools/integration-test.ts @@ -9,13 +9,15 @@ const packageJson = ` "name": "express-zod-api-integration-test", "version": "1.0.0", "scripts": { - "postinstall": "ts-node fix-package.ts", - "start": "ts-node quick-start.ts" + "tsnode": "node -r @swc-node/register", + "postinstall": "yarn tsnode fix-package.ts", + "start": "yarn tsnode quick-start.ts" }, "dependencies": { "@tsconfig/node${tsconfigBase}": "latest", "express-zod-api": "../../dist", - "ts-node": "10.9.1", + "@swc/core": "1.3.92", + "@swc-node/register": "1.6.8", "typescript": "5.2.2", "@types/node": "*" } diff --git a/tools/license.ts b/tools/license.ts index 5b6c3c19f..da7ad7b7d 100644 --- a/tools/license.ts +++ b/tools/license.ts @@ -1,3 +1,4 @@ +import { writeFileSync } from "node:fs"; import manifest from "../package.json"; const ownLicense = ` @@ -24,4 +25,4 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. `; -console.log(ownLicense.trim()); +writeFileSync("LICENSE", ownLicense.trimStart(), "utf-8"); diff --git a/tsconfig.json b/tsconfig.json index 01cbabadf..576f75805 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -6,8 +6,5 @@ "strictNullChecks": true, "resolveJsonModule": true }, - "exclude": ["tests/integration", "tests/esm"], - "ts-node": { - "swc": false - } + "exclude": ["tests/integration", "tests/esm"] } diff --git a/yarn.lock b/yarn.lock index 2b1901438..5826a60e0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -338,13 +338,6 @@ resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== -"@cspotcode/source-map-support@^0.8.0": - version "0.8.1" - resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1" - integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw== - dependencies: - "@jridgewell/trace-mapping" "0.3.9" - "@dabh/diagnostics@^2.0.2": version "2.0.3" resolved "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.3.tgz#7f7e97ee9a725dffc7808d93668cc984e1dc477a" @@ -750,7 +743,7 @@ "@jridgewell/sourcemap-codec" "^1.4.10" "@jridgewell/trace-mapping" "^0.3.9" -"@jridgewell/resolve-uri@^3.0.3", "@jridgewell/resolve-uri@^3.1.0": +"@jridgewell/resolve-uri@^3.1.0": version "3.1.1" resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721" integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA== @@ -765,14 +758,6 @@ resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== -"@jridgewell/trace-mapping@0.3.9": - version "0.3.9" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9" - integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ== - dependencies: - "@jridgewell/resolve-uri" "^3.0.3" - "@jridgewell/sourcemap-codec" "^1.4.10" - "@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.9": version "0.3.19" resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz#f8a3249862f91be48d3127c3cfe992f79b4b8811" @@ -833,6 +818,31 @@ dependencies: "@sinonjs/commons" "^3.0.0" +"@swc-node/core@^1.10.6": + version "1.10.6" + resolved "https://registry.yarnpkg.com/@swc-node/core/-/core-1.10.6.tgz#5c2af68bd4c9c8f5d91178a724af341a4402f5b6" + integrity sha512-lDIi/rPosmKIknWzvs2/Fi9zWRtbkx8OJ9pQaevhsoGzJSal8Pd315k1W5AIrnknfdAB4HqRN12fk6AhqnrEEw== + +"@swc-node/register@^1.6.8": + version "1.6.8" + resolved "https://registry.yarnpkg.com/@swc-node/register/-/register-1.6.8.tgz#4e2402b42ae5b538d5041e0c4d86d9c3c8d5b323" + integrity sha512-74ijy7J9CWr1Z88yO+ykXphV29giCrSpANQPQRooE0bObpkTO1g4RzQovIfbIaniBiGDDVsYwDoQ3FIrCE8HcQ== + dependencies: + "@swc-node/core" "^1.10.6" + "@swc-node/sourcemap-support" "^0.3.0" + colorette "^2.0.19" + debug "^4.3.4" + pirates "^4.0.5" + tslib "^2.5.0" + +"@swc-node/sourcemap-support@^0.3.0": + version "0.3.0" + resolved "https://registry.yarnpkg.com/@swc-node/sourcemap-support/-/sourcemap-support-0.3.0.tgz#e8a0d139bd3e8db39635f63fde43dbe6c39237cc" + integrity sha512-gqBJSmJMWomZFxlppaKea7NeAqFrDrrS0RMt24No92M3nJWcyI9YKGEQKl+EyJqZ5gh6w1s0cTklMHMzRwA1NA== + dependencies: + source-map-support "^0.5.21" + tslib "^2.5.0" + "@swc/core-darwin-arm64@1.3.92": version "1.3.92" resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.92.tgz#0498d3584cf877e39107c94705c38fa4a8c04789" @@ -883,7 +893,7 @@ resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.92.tgz#4ba542875fc690b579232721ccec7873e139646a" integrity sha512-41bE66ddr9o/Fi1FBh0sHdaKdENPTuDpv1IFHxSg0dJyM/jX8LbkjnpdInYXHBxhcLVAPraVRrNsC4SaoPw2Pg== -"@swc/core@^1.3.82": +"@swc/core@^1.3.92": version "1.3.92" resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.3.92.tgz#f51808cdb6cbb90b0877b9a51806eea9a70eafca" integrity sha512-vx0vUrf4YTEw59njOJ46Ha5i0cZTMYdRHQ7KXU29efN1MxcmJH2RajWLPlvQarOP1ab9iv9cApD7SMchDyx2vA== @@ -920,26 +930,6 @@ resolved "https://registry.yarnpkg.com/@swc/types/-/types-0.1.5.tgz#043b731d4f56a79b4897a3de1af35e75d56bc63a" integrity sha512-myfUej5naTBWnqOCc/MdVOLVjXUXtIA+NpDrDBKJtLLg2shUjBu3cZmB/85RyitKc55+lUUyl7oRfLOvkr2hsw== -"@tsconfig/node10@^1.0.7": - version "1.0.9" - resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2" - integrity sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA== - -"@tsconfig/node12@^1.0.7": - version "1.0.11" - resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d" - integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag== - -"@tsconfig/node14@^1.0.0": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1" - integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow== - -"@tsconfig/node16@^1.0.2": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9" - integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA== - "@tsconfig/node18@^18.2.1": version "18.2.2" resolved "https://registry.yarnpkg.com/@tsconfig/node18/-/node18-18.2.2.tgz#81fb16ecff0d400b1cbadbf76713b50f331029ce" @@ -1313,12 +1303,7 @@ acorn-jsx@^5.3.2: resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== -acorn-walk@^8.1.1: - version "8.2.0" - resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" - integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== - -acorn@^8.4.1, acorn@^8.9.0: +acorn@^8.9.0: version "8.10.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5" integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw== @@ -1394,11 +1379,6 @@ anymatch@^3.0.3, anymatch@~3.1.2: normalize-path "^3.0.0" picomatch "^2.0.4" -arg@^4.1.0: - version "4.1.3" - resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" - integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== - argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" @@ -1861,6 +1841,11 @@ color@^3.1.3: color-convert "^1.9.3" color-string "^1.6.0" +colorette@^2.0.19: + version "2.0.20" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a" + integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w== + colorspace@1.1.x: version "1.1.4" resolved "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.4.tgz#8d442d1186152f60453bf8070cd66eb364e59243" @@ -1964,11 +1949,6 @@ create-jest@^29.7.0: jest-util "^29.7.0" prompts "^2.0.1" -create-require@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" - integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== - cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" @@ -2093,11 +2073,6 @@ diff-sequences@^29.6.3: resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.6.3.tgz#4deaf894d11407c51efc8418012f9e70b84ea921" integrity sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q== -diff@^4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" - integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== - dir-glob@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" @@ -3873,11 +3848,6 @@ make-dir@^4.0.0: dependencies: semver "^7.5.3" -make-error@^1.1.1: - version "1.3.6" - resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" - integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== - makeerror@1.0.12: version "1.0.12" resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a" @@ -4366,7 +4336,7 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1: resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== -pirates@^4.0.1, pirates@^4.0.4: +pirates@^4.0.1, pirates@^4.0.4, pirates@^4.0.5: version "4.0.6" resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9" integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg== @@ -4782,6 +4752,14 @@ source-map-support@0.5.13: buffer-from "^1.0.0" source-map "^0.6.0" +source-map-support@^0.5.21: + version "0.5.21" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" + integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + source-map@0.8.0-beta.0: version "0.8.0-beta.0" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.8.0-beta.0.tgz#d4c1bb42c3f7ee925f005927ba10709e0d1d1f11" @@ -5089,25 +5067,6 @@ ts-interface-checker@^0.1.9: resolved "https://registry.yarnpkg.com/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz#784fd3d679722bc103b1b4b8030bcddb5db2a699" integrity sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA== -ts-node@^10.9.1: - version "10.9.1" - resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b" - integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw== - dependencies: - "@cspotcode/source-map-support" "^0.8.0" - "@tsconfig/node10" "^1.0.7" - "@tsconfig/node12" "^1.0.7" - "@tsconfig/node14" "^1.0.0" - "@tsconfig/node16" "^1.0.2" - acorn "^8.4.1" - acorn-walk "^8.1.1" - arg "^4.1.0" - create-require "^1.1.0" - diff "^4.0.1" - make-error "^1.1.1" - v8-compile-cache-lib "^3.0.1" - yn "3.1.1" - ts-toolbelt@^9.6.0: version "9.6.0" resolved "https://registry.yarnpkg.com/ts-toolbelt/-/ts-toolbelt-9.6.0.tgz#50a25426cfed500d4a09bd1b3afb6f28879edfd5" @@ -5307,11 +5266,6 @@ utils-merge@1.0.1: resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA== -v8-compile-cache-lib@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf" - integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg== - v8-to-istanbul@^9.0.1: version "9.1.3" resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.1.3.tgz#ea456604101cd18005ac2cae3cdd1aa058a6306b" @@ -5495,11 +5449,6 @@ yargs@^17.3.1: y18n "^5.0.5" yargs-parser "^21.1.1" -yn@3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" - integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== - yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"