From 074348f6fe890670f9fa734217efff32dd9d74b4 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Sat, 14 Sep 2024 10:33:00 +0200 Subject: [PATCH 01/69] chore: migrate unit test on vitest --- package.json | 16 +- .../cli-core/{.eslintrc.js => .eslintrc.cjs} | 0 packages/cli-core/.npmignore | 7 +- packages/cli-core/jest.config.js | 18 - packages/cli-core/package.json | 24 +- packages/cli-core/src/CliCore.spec.ts | 11 +- .../PackageManagersModule.spec.ts | 33 +- .../supports/BunManager.spec.ts | 5 +- .../supports/NpmManager.spec.ts | 5 +- .../supports/PNpmManager.spec.ts | 5 +- .../supports/YarnBerryManager.spec.ts | 11 +- .../supports/YarnManager.spec.ts | 5 +- .../src/services/CliHttpClient.spec.ts | 4 +- .../cli-core/src/services/CliPlugins.spec.ts | 3 +- .../src/services/CliProxyAgent.spec.ts | 11 +- .../src/services/CliRunScript.spec.ts | 3 +- .../src/services/NpmRegistryClient.spec.ts | 7 +- .../src/services/ProjectPackageJson.spec.ts | 7 +- .../cli-core/src/services/Renderer.spec.ts | 25 +- .../src/utils/getCommandMetadata.spec.ts | 2 +- .../cli-core/src/utils/hbs/switch.spec.ts | 6 +- .../integrations/command.integration.spec.ts | 6 +- packages/cli-core/tsconfig.cjs.json | 28 + packages/cli-core/tsconfig.esm.json | 14 +- packages/cli-core/tsconfig.json | 40 +- packages/cli-core/tsconfig.spec.json | 29 + packages/cli-core/vitest.config.mts | 21 + tools/eslint/package.json | 1 - tools/jest/install.js | 34 - tools/jest/jest.config.js | 59 - tools/jest/jest.config.template.js | 14 - tools/jest/package.json | 14 - tools/typescript/.npmignore.template | 8 + tools/typescript/index.js | 190 +- tools/typescript/package.json | 5 - tools/{jest => typescript}/swc.node.json | 0 tools/typescript/tsconfig.node.json | 7 +- tools/typescript/tsconfig.template.cjs.json | 28 + tools/typescript/tsconfig.template.esm.json | 9 +- tools/typescript/tsconfig.template.json | 25 +- tools/typescript/tsconfig.template.spec.json | 14 + tools/vitest/index.js | 40 + tools/vitest/package.json | 17 + tools/vitest/plugins/resolveWorkspaceFiles.js | 10 + tools/vitest/presets/alias.js | 63 + tools/vitest/presets/index.js | 43 + tools/vitest/templates/vitest.config.mts | 21 + tools/vitest/tsconfig.json | 6 + tsconfig.json | 30 +- yarn.lock | 1723 ++++++++++++++--- 50 files changed, 2048 insertions(+), 659 deletions(-) rename packages/cli-core/{.eslintrc.js => .eslintrc.cjs} (100%) delete mode 100644 packages/cli-core/jest.config.js create mode 100644 packages/cli-core/tsconfig.cjs.json create mode 100644 packages/cli-core/tsconfig.spec.json create mode 100644 packages/cli-core/vitest.config.mts delete mode 100644 tools/jest/install.js delete mode 100644 tools/jest/jest.config.js delete mode 100644 tools/jest/jest.config.template.js delete mode 100644 tools/jest/package.json create mode 100644 tools/typescript/.npmignore.template rename tools/{jest => typescript}/swc.node.json (100%) create mode 100644 tools/typescript/tsconfig.template.cjs.json create mode 100644 tools/typescript/tsconfig.template.spec.json create mode 100644 tools/vitest/index.js create mode 100644 tools/vitest/package.json create mode 100644 tools/vitest/plugins/resolveWorkspaceFiles.js create mode 100644 tools/vitest/presets/alias.js create mode 100644 tools/vitest/presets/index.js create mode 100644 tools/vitest/templates/vitest.config.mts create mode 100644 tools/vitest/tsconfig.json diff --git a/package.json b/package.json index 5a29e81f1..f56de5c44 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "build": "monorepo build --verbose", "build:references": "node ./tools/typescript", "build:eslint": "node ./tools/eslint", - "build:jest": "node ./tools/jest/install.js", + "build:vitest": "node ./tools/vitest/install.js", "sync:packages": "monorepo sync packages", "docs:serve": "yarn api:build && yarn vuepress:serve", "docs:build": "yarn api:build && yarn vuepress:build", @@ -78,31 +78,27 @@ "devDependencies": { "@commitlint/cli": "^17.0.3", "@commitlint/config-conventional": "^17.0.3", - "@swc/core": "^1.3.61", - "@swc/helpers": "^0.5.1", - "@swc/jest": "^0.2.26", + "@swc/core": "1.7.26", + "@swc/helpers": "0.5.13", "@tsed/markdown-it-symbols": "3.20.4", "@tsed/monorepo-utils": "2.3.5", "@tsed/ts-doc": "^4.1.0", - "@types/jest": "28.1.7", "@types/node": "18.7.8", "@typescript-eslint/eslint-plugin": "^5.33.1", "@typescript-eslint/parser": "^5.33.1", + "@vitest/coverage-v8": "^2.1.1", "concurrently": "7.6.0", "coveralls": "3.1.1", "cross-env": "7.0.3", "entities": "1.1.2", "eslint": "8.22.0", "eslint-config-prettier": "8.5.0", - "eslint-plugin-jest": "27.1.6", "eslint-plugin-mocha": "10.1.0", "eslint-plugin-prettier": "4.2.1", "eslint-plugin-workspaces": "0.8.0", "gflow": "^5.1.2", "husky": "8.0.1", "is-ci": "3.0.1", - "jest": "29.5.0", - "jest-coverage-thresholds-bumper": "1.1.0", "lint-staged": "13.0.3", "markdown-it": "13.0.1", "prettier": "2.7.1", @@ -113,7 +109,9 @@ "ts-jest": "28.0.8", "ts-node": "10.9.1", "tsconfig-paths": "4.1.2", - "typescript": "4.9.5" + "typescript": "4.9.5", + "unplugin-swc": "^1.5.1", + "vitest": "2.1.1" }, "directories": { "packages": "packages", diff --git a/packages/cli-core/.eslintrc.js b/packages/cli-core/.eslintrc.cjs similarity index 100% rename from packages/cli-core/.eslintrc.js rename to packages/cli-core/.eslintrc.cjs diff --git a/packages/cli-core/.npmignore b/packages/cli-core/.npmignore index e31ebe418..672ed7652 100644 --- a/packages/cli-core/.npmignore +++ b/packages/cli-core/.npmignore @@ -1,5 +1,8 @@ src test -tsconfig.compile.json +coverage tsconfig.json -jest.config.js +tsconfig.*.json +__mock__ +*.spec.js +*.tsbuildinfo diff --git a/packages/cli-core/jest.config.js b/packages/cli-core/jest.config.js deleted file mode 100644 index 0aa7dcfb9..000000000 --- a/packages/cli-core/jest.config.js +++ /dev/null @@ -1,18 +0,0 @@ -// For a detailed explanation regarding each configuration property, visit: -// https://jestjs.io/docs/en/configuration.html - -module.exports = { - ...require("@tsed/jest-config"), - roots: ["/src", "/test"], - moduleNameMapper: { - "@tsed/cli-core": "/src/index.ts" - }, - coverageThreshold: { - global: { - statements: 73.23, - branches: 70.12, - functions: 51.97, - lines: 73.23 - } - }, -}; diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index 254498ae0..34760e977 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -1,23 +1,27 @@ { "name": "@tsed/cli-core", - "version": "5.2.10", "description": "Build your CLI with TypeScript and Decorators", + "type": "commonjs", + "version": "5.2.10", "source": "./src/index.ts", "main": "./lib/cjs/index.js", "module": "./lib/esm/index.js", "typings": "./lib/types/index.d.ts", "exports": { - "types": "./lib/types/index.d.ts", - "import": "./lib/esm/index.js", - "require": "./lib/cjs/index.js", - "default": "./lib/esm/index.js" + ".": { + "types": "./lib/types/index.d.ts", + "import": "./lib/esm/index.js", + "require": "./lib/cjs/index.js", + "default": "./lib/esm/index.js" + } }, "scripts": { "build": "yarn build:ts", - "build:ts": "tsc --build tsconfig.json && tsc --build tsconfig.esm.json", + "build:ts": "tsc --build tsconfig.json", "lint": "eslint '**/*.{ts,js}'", "lint:fix": "eslint '**/*.{ts,js}' --fix", - "test": "cross-env NODE_ENV=test yarn jest --max-workers=2 --passWithNoTests && jest-coverage-thresholds-bumper" + "test": "vitest run", + "test:ci": "vitest run --coverage.thresholds.autoUpdate=true" }, "keywords": [ "cli", @@ -68,8 +72,7 @@ }, "devDependencies": { "@tsed/eslint": "5.2.10", - "@tsed/jest-config": "5.2.10", - "@tsed/typescript": "5.2.10", + "@tsed/typescript": "workspace:*", "@types/axios": "0.14.0", "@types/commander": "2.12.2", "@types/consolidate": "0.14.1", @@ -87,7 +90,8 @@ "cross-env": "7.0.3", "deps": "^1.0.0", "eslint": "8.22.0", - "jest": "29.5.0" + "typescript": "4.9.5", + "vitest": "2.1.1" }, "peerDependencies": { "@tsed/core": ">=7.14.2", diff --git a/packages/cli-core/src/CliCore.spec.ts b/packages/cli-core/src/CliCore.spec.ts index 76e79a527..71b9e23f3 100644 --- a/packages/cli-core/src/CliCore.spec.ts +++ b/packages/cli-core/src/CliCore.spec.ts @@ -3,11 +3,12 @@ import {CliService} from "./services"; import {normalizePath} from "@tsed/normalize-path"; import execa from "execa"; -jest.mock("./utils/loadPlugins"); -jest.mock("execa"); +vi.mock("./utils/loadPlugins"); +vi.mock("execa"); + describe("CliCore", () => { beforeEach(() => { - (execa as any as jest.Mock).mockReturnValue({}); + vi.mocked(execa as any).mockReturnValue({}); }); describe("getProjectRoot()", () => { it("should return project root (-r)", () => { @@ -42,9 +43,9 @@ describe("CliCore", () => { describe("bootstrap()", () => { beforeEach(() => { - jest.spyOn(CliService.prototype, "parseArgs").mockResolvedValue(undefined); + vi.spyOn(CliService.prototype, "parseArgs").mockResolvedValue(undefined); }); - afterEach(() => jest.resetAllMocks()); + afterEach(() => vi.resetAllMocks()); it("should bootstrap CLI with process.argv", async () => { await CliCore.bootstrap({}); diff --git a/packages/cli-core/src/packageManagers/PackageManagersModule.spec.ts b/packages/cli-core/src/packageManagers/PackageManagersModule.spec.ts index c5e6dec4a..588d4ac0c 100644 --- a/packages/cli-core/src/packageManagers/PackageManagersModule.spec.ts +++ b/packages/cli-core/src/packageManagers/PackageManagersModule.spec.ts @@ -1,3 +1,4 @@ +// @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; import {PackageManagersModule} from "./PackageManagersModule"; import {YarnManager} from "./supports/YarnManager"; @@ -13,18 +14,18 @@ async function getModuleFixture() { has() { return true; }, - add: jest.fn().mockReturnValue({ - pipe: jest.fn() + add: vi.fn().mockReturnValue({ + pipe: vi.fn() }), - addDev: jest.fn().mockReturnValue({ - pipe: jest.fn() + addDev: vi.fn().mockReturnValue({ + pipe: vi.fn() }), - install: jest.fn().mockReturnValue({ - pipe: jest.fn() + install: vi.fn().mockReturnValue({ + pipe: vi.fn() }), - init: jest.fn(), - runScript: jest.fn().mockReturnValue({ - pipe: jest.fn() + init: vi.fn(), + runScript: vi.fn().mockReturnValue({ + pipe: vi.fn() }) }; @@ -33,16 +34,16 @@ async function getModuleFixture() { has() { return true; }, - add: jest.fn(), - addDev: jest.fn(), - install: jest.fn(), - runScript: jest.fn() + add: vi.fn(), + addDev: vi.fn(), + install: vi.fn(), + runScript: vi.fn() }; const cliFs = { - exists: jest.fn().mockReturnValue(true), - writeFileSync: jest.fn(), - readJsonSync: jest.fn().mockReturnValue({ + exists: vi.fn().mockReturnValue(true), + writeFileSync: vi.fn(), + readJsonSync: vi.fn().mockReturnValue({ scripts: {}, dependencies: {}, devDependencies: {} diff --git a/packages/cli-core/src/packageManagers/supports/BunManager.spec.ts b/packages/cli-core/src/packageManagers/supports/BunManager.spec.ts index e42c567c9..bdefa8a36 100644 --- a/packages/cli-core/src/packageManagers/supports/BunManager.spec.ts +++ b/packages/cli-core/src/packageManagers/supports/BunManager.spec.ts @@ -1,11 +1,12 @@ +// @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; import {CliExeca} from "../../services"; import {BunManager} from "./BunManager"; async function getManagerFixture() { const cliExeca = { - runSync: jest.fn(), - run: jest.fn() + runSync: vi.fn(), + run: vi.fn() }; const manager = await CliPlatformTest.invoke(BunManager, [ { diff --git a/packages/cli-core/src/packageManagers/supports/NpmManager.spec.ts b/packages/cli-core/src/packageManagers/supports/NpmManager.spec.ts index a686977a9..b6150e09d 100644 --- a/packages/cli-core/src/packageManagers/supports/NpmManager.spec.ts +++ b/packages/cli-core/src/packageManagers/supports/NpmManager.spec.ts @@ -1,11 +1,12 @@ +// @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; import {NpmManager} from "./NpmManager"; import {CliExeca} from "../../services"; async function getManagerFixture() { const cliExeca = { - runSync: jest.fn(), - run: jest.fn() + runSync: vi.fn(), + run: vi.fn() }; const manager = await CliPlatformTest.invoke(NpmManager, [ { diff --git a/packages/cli-core/src/packageManagers/supports/PNpmManager.spec.ts b/packages/cli-core/src/packageManagers/supports/PNpmManager.spec.ts index 0a83cee6e..d02a626d7 100644 --- a/packages/cli-core/src/packageManagers/supports/PNpmManager.spec.ts +++ b/packages/cli-core/src/packageManagers/supports/PNpmManager.spec.ts @@ -1,11 +1,12 @@ +// @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; import {PNpmManager} from "./PNpmManager"; import {CliExeca} from "../../services"; async function getManagerFixture() { const cliExeca = { - runSync: jest.fn(), - run: jest.fn() + runSync: vi.fn(), + run: vi.fn() }; const [manager] = await Promise.all([ CliPlatformTest.invoke(PNpmManager, [ diff --git a/packages/cli-core/src/packageManagers/supports/YarnBerryManager.spec.ts b/packages/cli-core/src/packageManagers/supports/YarnBerryManager.spec.ts index f2b357eb6..7287a32f8 100644 --- a/packages/cli-core/src/packageManagers/supports/YarnBerryManager.spec.ts +++ b/packages/cli-core/src/packageManagers/supports/YarnBerryManager.spec.ts @@ -1,15 +1,16 @@ +// @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; import {YarnBerryManager} from "./YarnBerryManager"; import {CliExeca, CliYaml} from "../../services"; async function getManagerFixture() { const cliExeca = { - runSync: jest.fn(), - run: jest.fn() + runSync: vi.fn(), + run: vi.fn() }; const cliYaml = { - read: jest.fn(), - write: jest.fn() + read: vi.fn(), + write: vi.fn() }; const manager = await CliPlatformTest.invoke(YarnBerryManager, [ { @@ -53,7 +54,7 @@ describe("YarnBerryManager", () => { it("should init project", async () => { const {cliExeca, cliYaml, manager} = await getManagerFixture(); - jest.spyOn(manager, "install").mockResolvedValue([] as never); + vi.spyOn(manager, "install").mockResolvedValue([] as never); await manager.init({ cwd: "cwd" diff --git a/packages/cli-core/src/packageManagers/supports/YarnManager.spec.ts b/packages/cli-core/src/packageManagers/supports/YarnManager.spec.ts index 679ec7ef7..3188f7d98 100644 --- a/packages/cli-core/src/packageManagers/supports/YarnManager.spec.ts +++ b/packages/cli-core/src/packageManagers/supports/YarnManager.spec.ts @@ -1,11 +1,12 @@ +// @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; import {YarnManager} from "./YarnManager"; import {CliExeca} from "../../services"; async function getManagerFixture() { const cliExeca = { - runSync: jest.fn(), - run: jest.fn() + runSync: vi.fn(), + run: vi.fn() }; const manager = await CliPlatformTest.invoke(YarnManager, [ { diff --git a/packages/cli-core/src/services/CliHttpClient.spec.ts b/packages/cli-core/src/services/CliHttpClient.spec.ts index d283f1428..9e1d9a2a0 100644 --- a/packages/cli-core/src/services/CliHttpClient.spec.ts +++ b/packages/cli-core/src/services/CliHttpClient.spec.ts @@ -3,7 +3,7 @@ import {DITest} from "@tsed/di"; import {CliHttpClient} from "./CliHttpClient"; import {CliProxyAgent} from "./CliProxyAgent"; -jest.mock("axios"); +vi.mock("axios"); describe("CliHttpClient", () => { beforeEach(() => DITest.create()); afterEach(() => DITest.reset()); @@ -11,7 +11,7 @@ describe("CliHttpClient", () => { describe("$afterInit()", () => { it("should call $afterInit method", async () => { const cliProxyAgent = { - resolveProxySettings: jest.fn() + resolveProxySettings: vi.fn() }; const client = await DITest.invoke(CliHttpClient, [ { diff --git a/packages/cli-core/src/services/CliPlugins.spec.ts b/packages/cli-core/src/services/CliPlugins.spec.ts index a58303d83..3d9dd4422 100644 --- a/packages/cli-core/src/services/CliPlugins.spec.ts +++ b/packages/cli-core/src/services/CliPlugins.spec.ts @@ -1,3 +1,4 @@ +// @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; import {CliPlugins} from "./CliPlugins"; import {NpmRegistryClient} from "./NpmRegistryClient"; @@ -32,7 +33,7 @@ describe("CliPlugins", () => { } ]; const npmClient = { - search: jest.fn().mockReturnValue(Promise.resolve(response)) + search: vi.fn().mockReturnValue(Promise.resolve(response)) }; const cliPlugins = await CliPlatformTest.invoke(CliPlugins, [ diff --git a/packages/cli-core/src/services/CliProxyAgent.spec.ts b/packages/cli-core/src/services/CliProxyAgent.spec.ts index 88c748663..3ee330e6a 100644 --- a/packages/cli-core/src/services/CliProxyAgent.spec.ts +++ b/packages/cli-core/src/services/CliProxyAgent.spec.ts @@ -1,3 +1,4 @@ +// @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; import tunnel from "tunnel"; import {CliProxyAgent} from "./CliProxyAgent"; @@ -5,7 +6,7 @@ import {CliConfiguration} from "./CliConfiguration"; import {CliExeca} from "./CliExeca"; import "../index"; -jest.mock("tunnel"); +vi.mock("tunnel"); describe("CliPlugins", () => { beforeEach(() => @@ -49,7 +50,7 @@ describe("CliPlugins", () => { describe("from npm config", () => { it("should get proxy url from (proxy)", async () => { const cliExeca = { - getAsync: jest.fn().mockImplementation((p: string, args: string[]) => { + getAsync: vi.fn().mockImplementation((p: string, args: string[]) => { if (args.includes("proxy")) { return Promise.resolve("https://login:password@host:3000"); } @@ -82,7 +83,7 @@ describe("CliPlugins", () => { }); it("should get proxy url from (http-proxy)", async () => { const cliExeca = { - getAsync: jest.fn().mockImplementation((p: string, args: string[]) => { + getAsync: vi.fn().mockImplementation((p: string, args: string[]) => { if (args.includes("http-proxy")) { return Promise.resolve("https://login:password@host:3000"); } @@ -115,7 +116,7 @@ describe("CliPlugins", () => { }); it("should get proxy url from (https-proxy)", async () => { const cliExeca = { - getAsync: jest.fn().mockImplementation((p: string, args: string[]) => { + getAsync: vi.fn().mockImplementation((p: string, args: string[]) => { if (args.includes("https-proxy")) { return Promise.resolve("https://login:password@host:3000"); } @@ -148,7 +149,7 @@ describe("CliPlugins", () => { }); it("should get proxy url from (https-proxy) without credentials", async () => { const cliExeca = { - getAsync: jest.fn().mockImplementation((p: string, args: string[]) => { + getAsync: vi.fn().mockImplementation((p: string, args: string[]) => { if (args.includes("https-proxy")) { return Promise.resolve("https://host:3000"); } diff --git a/packages/cli-core/src/services/CliRunScript.spec.ts b/packages/cli-core/src/services/CliRunScript.spec.ts index 4a6379f7b..dd742c87f 100644 --- a/packages/cli-core/src/services/CliRunScript.spec.ts +++ b/packages/cli-core/src/services/CliRunScript.spec.ts @@ -1,10 +1,11 @@ +// @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore import runScript from "@npmcli/run-script"; import {CliRunScript} from "./CliRunScript"; -jest.mock("@npmcli/run-script"); +vi.mock("@npmcli/run-script"); describe("CliRunScript", () => { beforeEach(() => CliPlatformTest.create()); diff --git a/packages/cli-core/src/services/NpmRegistryClient.spec.ts b/packages/cli-core/src/services/NpmRegistryClient.spec.ts index 2d9982233..44619e48c 100644 --- a/packages/cli-core/src/services/NpmRegistryClient.spec.ts +++ b/packages/cli-core/src/services/NpmRegistryClient.spec.ts @@ -1,3 +1,4 @@ +// @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; import {CliHttpClient} from "./CliHttpClient"; import {NpmRegistryClient} from "./NpmRegistryClient"; @@ -10,7 +11,7 @@ describe("NpmRegistryClient", () => { it("should search packages", async () => { // GIVEN const httpClient = { - get: jest.fn().mockReturnValue(Promise.resolve({objects: "response"})) + get: vi.fn().mockReturnValue(Promise.resolve({objects: "response"})) }; const npmRegistryClient = await CliPlatformTest.invoke(NpmRegistryClient, [ @@ -43,7 +44,7 @@ describe("NpmRegistryClient", () => { it("should search packages with some options", async () => { // GIVEN const httpClient = { - get: jest.fn().mockReturnValue(Promise.resolve({objects: "response"})) + get: vi.fn().mockReturnValue(Promise.resolve({objects: "response"})) }; const npmRegistryClient = await CliPlatformTest.invoke(NpmRegistryClient, [ @@ -84,7 +85,7 @@ describe("NpmRegistryClient", () => { it("should get package info", async () => { // GIVEN const httpClient = { - get: jest.fn().mockRejectedValueOnce(new Error("Not found")).mockResolvedValueOnce("response") + get: vi.fn().mockRejectedValueOnce(new Error("Not found")).mockResolvedValueOnce("response") }; const npmRegistryClient: NpmRegistryClient = await CliPlatformTest.invoke(NpmRegistryClient, [ diff --git a/packages/cli-core/src/services/ProjectPackageJson.spec.ts b/packages/cli-core/src/services/ProjectPackageJson.spec.ts index 8eade1fb1..58a4a6113 100644 --- a/packages/cli-core/src/services/ProjectPackageJson.spec.ts +++ b/packages/cli-core/src/services/ProjectPackageJson.spec.ts @@ -1,3 +1,4 @@ +// @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; import {join, resolve} from "path"; import {ProjectPackageJson} from "./ProjectPackageJson"; @@ -8,9 +9,9 @@ const dir = __dirname; async function getProjectPackageJsonFixture() { const cliFs = { - writeFileSync: jest.fn(), - exists: jest.fn().mockReturnValue(false), - readJsonSync: jest.fn().mockReturnValue({ + writeFileSync: vi.fn(), + exists: vi.fn().mockReturnValue(false), + readJsonSync: vi.fn().mockReturnValue({ scripts: {}, dependencies: {}, devDependencies: {} diff --git a/packages/cli-core/src/services/Renderer.spec.ts b/packages/cli-core/src/services/Renderer.spec.ts index 16e12f5ed..054929948 100644 --- a/packages/cli-core/src/services/Renderer.spec.ts +++ b/packages/cli-core/src/services/Renderer.spec.ts @@ -1,3 +1,4 @@ +// @ts-ignore import {FakeCliFs, normalizePath} from "@tsed/cli-testing"; import Consolidate from "consolidate"; import globby from "globby"; @@ -5,18 +6,18 @@ import handlebars from "handlebars"; import {TEMPLATE_DIR} from "../../../cli-plugin-jest/src/utils/templateDir"; import {RootRendererService, SrcRendererService} from "./Renderer"; -jest.mock("consolidate"); -jest.mock("globby"); -jest.mock("handlebars"); +vi.mock("consolidate"); +vi.mock("globby"); +vi.mock("handlebars"); describe("Renderer", () => { afterEach(() => { FakeCliFs.entries.clear(); - (globby as any as jest.SpyInstance).mockResolvedValue(["_partials/one.hbs", "_partials/two.hbs"]); + vi.mocked(globby as any).mockResolvedValue(["_partials/one.hbs", "_partials/two.hbs"]); }); describe("relativeFrom()", () => { - it("should return the revalite path from", () => { + it("should return the valid path from", () => { const service = new SrcRendererService(); // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore @@ -33,7 +34,7 @@ describe("Renderer", () => { }); describe("render()", () => { it("should render a file from given option (baseDir)", async () => { - (globby as any as jest.SpyInstance).mockResolvedValue(["_partials/one.hbs", "_partials/two.hbs"]); + vi.mocked(globby as any).mockResolvedValue(["_partials/one.hbs", "_partials/two.hbs"]); const service = new RootRendererService(); const path = "/init/myfile.ts.hbs"; @@ -66,7 +67,7 @@ describe("Renderer", () => { }); it("should render a file from given option (TEMPLATE_DIR)", async () => { const service = new RootRendererService(); - const path = "/init/jest.config.js.hbs"; + const path = "/init/vi.config.js.hbs"; const data = {}; const options = { baseDir: "/init", @@ -92,12 +93,12 @@ describe("Renderer", () => { await service.render(path, data, options); - expect(Consolidate.handlebars).toHaveBeenCalledWith(normalizePath(`${TEMPLATE_DIR}/init/jest.config.js.hbs`), {}); - expect(FakeCliFs.getKeys()).toEqual(["/home", "/home/jest.config.js"]); + expect(Consolidate.handlebars).toHaveBeenCalledWith(normalizePath(`${TEMPLATE_DIR}/init/vi.config.js.hbs`), {}); + expect(FakeCliFs.getKeys()).toEqual(["/home", "/home/vi.config.js"]); }); it("should render a file from given option (TEMPLATE_DIR - without baseDir)", async () => { const service = new RootRendererService(); - const path = "/jest.config.js.hbs"; + const path = "/vi.config.js.hbs"; const data = {}; const options = { templateDir: `${TEMPLATE_DIR}/init` @@ -122,8 +123,8 @@ describe("Renderer", () => { await service.render(path, data, options); - expect(Consolidate.handlebars).toHaveBeenCalledWith(normalizePath(`${TEMPLATE_DIR}/init/jest.config.js.hbs`), {}); - expect(FakeCliFs.getKeys()).toEqual(["/home", "/home/jest.config.js"]); + expect(Consolidate.handlebars).toHaveBeenCalledWith(normalizePath(`${TEMPLATE_DIR}/init/vi.config.js.hbs`), {}); + expect(FakeCliFs.getKeys()).toEqual(["/home", "/home/vi.config.js"]); }); it("should render a file from given option (baseDir with deep directory)", async () => { const service = new RootRendererService(); diff --git a/packages/cli-core/src/utils/getCommandMetadata.spec.ts b/packages/cli-core/src/utils/getCommandMetadata.spec.ts index 7f4182de4..a69bd40fa 100644 --- a/packages/cli-core/src/utils/getCommandMetadata.spec.ts +++ b/packages/cli-core/src/utils/getCommandMetadata.spec.ts @@ -1,5 +1,5 @@ -import {Command} from "../.."; import {getCommandMetadata} from "./getCommandMetadata"; +import {Command} from "../decorators"; @Command({ name: "name", diff --git a/packages/cli-core/src/utils/hbs/switch.spec.ts b/packages/cli-core/src/utils/hbs/switch.spec.ts index 2ebe668a5..f615aabf6 100644 --- a/packages/cli-core/src/utils/hbs/switch.spec.ts +++ b/packages/cli-core/src/utils/hbs/switch.spec.ts @@ -3,7 +3,7 @@ import {helpers} from "./switch"; describe("switch", () => { it("should use switch statement", () => { const options = { - fn: jest.fn() + fn: vi.fn() }; const ctx = {}; @@ -15,7 +15,7 @@ describe("switch", () => { it("should use case statement", () => { const options = { - fn: jest.fn() + fn: vi.fn() }; const ctx = {switch_value: 1}; @@ -26,7 +26,7 @@ describe("switch", () => { it("should use case statement (false)", () => { const options = { - fn: jest.fn() + fn: vi.fn() }; const ctx = {switch_value: 0}; diff --git a/packages/cli-core/test/integrations/command.integration.spec.ts b/packages/cli-core/test/integrations/command.integration.spec.ts index 06cc5a398..0d583ece3 100644 --- a/packages/cli-core/test/integrations/command.integration.spec.ts +++ b/packages/cli-core/test/integrations/command.integration.spec.ts @@ -1,11 +1,11 @@ import {CliCore, Command, CommandProvider, Tasks} from "../../src"; import execa from "execa"; -jest.mock("execa") +vi.mock("execa") describe("Command", () => { beforeEach(() => { - (execa as any as jest.Mock).mockReturnValue({}) + (execa as any as vi.Mock).mockReturnValue({}) }) it("should exec a command with expected parsed argument", async () => { @Command({ @@ -30,7 +30,7 @@ describe("Command", () => { } } - jest.spyOn(TestCommand.prototype, "$exec").mockResolvedValue([]) + vi.spyOn(TestCommand.prototype, "$exec").mockResolvedValue([]) await CliCore.bootstrap({ name: "tsed", diff --git a/packages/cli-core/tsconfig.cjs.json b/packages/cli-core/tsconfig.cjs.json new file mode 100644 index 000000000..7f23b116d --- /dev/null +++ b/packages/cli-core/tsconfig.cjs.json @@ -0,0 +1,28 @@ +{ + "extends": "@tsed/typescript/tsconfig.node.json", + "compilerOptions": { + "baseUrl": ".", + "module": "commonjs", + "moduleResolution": "Node16", + "rootDir": "src", + "outDir": "./lib/cjs", + "declaration": true, + "declarationDir": "./lib/types", + "composite": true, + "noEmit": false + }, + "include": ["src", "src/**/*.json"], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage", + "spec", + "**/*.benchmark.ts", + "**/*.spec.ts", + "keys", + "**/__mock__/**", + "webpack.config.js" + ] +} diff --git a/packages/cli-core/tsconfig.esm.json b/packages/cli-core/tsconfig.esm.json index e87f8c42b..ce32a9e07 100644 --- a/packages/cli-core/tsconfig.esm.json +++ b/packages/cli-core/tsconfig.esm.json @@ -2,18 +2,16 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ES2020", + "module": "ESNext", + "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", + "declarationDir": "./lib/types-esm", "declaration": true, - "declarationDir": "./lib/types", "composite": true, "noEmit": false }, - "include": [ - "src", - "src/**/*.json" - ], + "include": ["src", "src/**/*.json"], "exclude": [ "node_modules", "test", @@ -24,9 +22,7 @@ "**/*.benchmark.ts", "**/*.spec.ts", "keys", - "jest.config.js", "**/__mock__/**", "webpack.config.js" - ], - "references": [] + ] } diff --git a/packages/cli-core/tsconfig.json b/packages/cli-core/tsconfig.json index 11535f3c4..d2f0c1fcd 100644 --- a/packages/cli-core/tsconfig.json +++ b/packages/cli-core/tsconfig.json @@ -2,32 +2,18 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "commonjs", - "moduleResolution": "node", - "rootDir": "src", - "outDir": "./lib/cjs", - "declaration": true, - "declarationDir": "./lib/types", - "composite": true, - "noEmit": false + "noEmit": true }, - "include": [ - "src", - "src/**/*.json" - ], - "exclude": [ - "node_modules", - "test", - "lib", - "benchmark", - "coverage", - "spec", - "**/*.benchmark.ts", - "**/*.spec.ts", - "keys", - "jest.config.js", - "**/__mock__/**", - "webpack.config.js" - ], - "references": [] + "include": [], + "references": [ + { + "path": "./tsconfig.cjs.json" + }, + { + "path": "./tsconfig.esm.json" + }, + { + "path": "./tsconfig.spec.json" + } + ] } diff --git a/packages/cli-core/tsconfig.spec.json b/packages/cli-core/tsconfig.spec.json new file mode 100644 index 000000000..75fcfa09d --- /dev/null +++ b/packages/cli-core/tsconfig.spec.json @@ -0,0 +1,29 @@ +{ + "extends": "@tsed/typescript/tsconfig.node.json", + "compilerOptions": { + "baseUrl": ".", + "rootDir": "..", + "module": "commonjs", + "outDir": "./lib/cjs", + "declaration": false, + "composite": false, + "noEmit": true, + "paths": {}, + "types": [ + "vite/client", + "vitest/globals" + ] + }, + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] +} diff --git a/packages/cli-core/vitest.config.mts b/packages/cli-core/vitest.config.mts new file mode 100644 index 000000000..d759e8179 --- /dev/null +++ b/packages/cli-core/vitest.config.mts @@ -0,0 +1,21 @@ +// @ts-ignore +import {presets} from "@tsed/vitest/presets"; +import {defineConfig} from "vitest/config"; + +export default defineConfig( + { + ...presets, + test: { + ...presets.test, + coverage: { + ...presets.test.coverage, + thresholds: { + statements: 0, + branches: 0, + functions: 0, + lines: 0 + } + } + } + } +); diff --git a/tools/eslint/package.json b/tools/eslint/package.json index 4ef9904c1..bb27c5ec2 100644 --- a/tools/eslint/package.json +++ b/tools/eslint/package.json @@ -9,7 +9,6 @@ "./node.js": "./node.js" }, "devDependencies": { - "@tsed/jest-config": "5.2.10", "cross-env": "7.0.3", "jest": "29.5.0" } diff --git a/tools/jest/install.js b/tools/jest/install.js deleted file mode 100644 index 44c552708..000000000 --- a/tools/jest/install.js +++ /dev/null @@ -1,34 +0,0 @@ -const mono = require("@tsed/monorepo-utils"); -const {dirname, join, relative} = require("path"); -const {writeJson, readFile, writeFile} = require("fs-extra"); - -const scriptDir = __dirname; - -async function main() { - const monoRepo = new mono.MonoRepo({ - rootDir: process.cwd(), verbose: false - }); - - const packages = await mono.findPackages(monoRepo); - const template = await readFile(join(scriptDir, "./jest.config.template.js")); - - const promises = packages.map(async (pkg) => { - const path = dirname(pkg.path); - - if (!pkg.pkg.private) { - await writeFile(join(path, "jest.config.js"), template, {spaces: 2}); - - pkg.pkg.scripts["test"] = "cross-env NODE_ENV=test yarn jest --max-workers=2 && jest-coverage-thresholds-bumper\",\n"; - - pkg.pkg.devDependencies["@tsed/jest-config"] = pkg.pkg.version; - pkg.pkg.devDependencies["jest"] = monoRepo.rootPkg.devDependencies["jest"]; - pkg.pkg.devDependencies["cross-env"] = monoRepo.rootPkg.devDependencies["cross-env"]; - - await writeJson(pkg.path, pkg.pkg, {spaces: 2}); - } - }); - - await Promise.all(promises); -} - -main(); diff --git a/tools/jest/jest.config.js b/tools/jest/jest.config.js deleted file mode 100644 index 253a3b5ee..000000000 --- a/tools/jest/jest.config.js +++ /dev/null @@ -1,59 +0,0 @@ -// For a detailed explanation regarding each configuration property, visit: -// https://jestjs.io/docs/en/configuration.html - -module.exports = { - roots: ["/src"], - // Automatically clear mock calls and instances between every test - clearMocks: true, - - // Indicates whether the coverage information should be collected while executing the test - collectCoverage: true, - - // An array of glob patterns indicating a set of files for which coverage information should be collected - // collectCoverageFrom: undefined, - - // The directory where Jest should output its coverage files - coverageProvider: "v8", - coverageDirectory: "coverage", - coverageReporters: ["clover", "json", "lcov", "text", "json-summary"], - // moduleDirectories: ["node_modules", "packages"], - // An array of regexp pattern strings used to skip coverage collection - coveragePathIgnorePatterns: [ - "index.ts", - "/lib", - "/node_modules/", - "/test/", - "exports.ts", - "__mock__", - "platform-test-utils", - "engines", - "FakeAdapter" - ], - // modulePathIgnorePatterns: ["/lib", "/dist"], // An object that configures minimum threshold enforcement for coverage results - testEnvironment: "node", - testPathIgnorePatterns: ["node_modules", "/docs/", "/docs-references/", "/engines/"], - // A map from regular expressions to paths to transformers - transform: { - "^.+\\.(t|j)sx?$": ["@swc/jest", require("./swc.node.json")] - }, - - transformIgnorePatterns: ["[/\\\\]node_modules[/\\\\].+\\.(js|jsx|mjs|cjs|ts|tsx)$", "^.+\\.module\\.(css|sass|scss)$"], - modulePaths: ["/src"], - moduleNameMapper: {}, - moduleFileExtensions: [ - // Place tsx and ts to beginning as suggestion from Jest team - // https://jestjs.io/docs/configuration#modulefileextensions-arraystring - "tsx", - "ts", - "js", - "json", - "jsx", - "node" - ], - extensionsToTreatAsEsm: [".ts", ".tsx"], - reporters: ["default"], - snapshotFormat: { - escapeString: true, - printBasicPrototype: true - } -}; diff --git a/tools/jest/jest.config.template.js b/tools/jest/jest.config.template.js deleted file mode 100644 index a61292c23..000000000 --- a/tools/jest/jest.config.template.js +++ /dev/null @@ -1,14 +0,0 @@ -// For a detailed explanation regarding each configuration property, visit: -// https://jestjs.io/docs/en/configuration.html - -module.exports = { - ...require("@tsed/jest-config"), - coverageThreshold: { - global: { - statements: 0, - branches: 0, - functions: 0, - lines: 0 - } - } -}; diff --git a/tools/jest/package.json b/tools/jest/package.json deleted file mode 100644 index 45a754a27..000000000 --- a/tools/jest/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "@tsed/jest-config", - "version": "5.2.10", - "private": true, - "main": "jest.config.js", - "exports": { - ".": "./jest.config.js", - "./install": "./install.js" - }, - "devDependencies": { - "cross-env": "7.0.3", - "jest": "29.5.0" - } -} diff --git a/tools/typescript/.npmignore.template b/tools/typescript/.npmignore.template new file mode 100644 index 000000000..672ed7652 --- /dev/null +++ b/tools/typescript/.npmignore.template @@ -0,0 +1,8 @@ +src +test +coverage +tsconfig.json +tsconfig.*.json +__mock__ +*.spec.js +*.tsbuildinfo diff --git a/tools/typescript/index.js b/tools/typescript/index.js index 7fdc0ff8e..a332a55c4 100644 --- a/tools/typescript/index.js +++ b/tools/typescript/index.js @@ -1,24 +1,34 @@ -const mono = require("@tsed/monorepo-utils"); -const {dirname, join, relative} = require("path"); -const cloneDeep = require("lodash/cloneDeep.js"); -const {readJson, writeJson, removeSync} = require("fs-extra"); +import {findPackages, MonoRepo} from "@tsed/monorepo-utils"; +import {dirname, join, relative} from "node:path"; +import cloneDeep from "lodash/cloneDeep.js"; +import omit from "lodash/omit.js"; +import fs from "fs-extra"; +import globby from "globby"; -const scriptDir = __dirname; +const scriptDir = import.meta.dirname; async function main() { - const monoRepo = new mono.MonoRepo({ + const monoRepo = new MonoRepo({ rootDir: process.cwd(), verbose: false }); - const tsConfigTemplate = await readJson(join(scriptDir, "./tsconfig.template.json")); - const tsConfigEsmTemplate = await readJson(join(scriptDir, "./tsconfig.template.esm.json")); + const pkgRoot = fs.readJsonSync(join(monoRepo.rootDir, "package.json")); + const packagesRootDir = join(monoRepo.rootDir, "packages"); const tsConfigRootPath = join(monoRepo.rootDir, "tsconfig.json"); - const tsConfigRoot = await readJson(tsConfigRootPath); + const tsConfigTemplate = await fs.readJson(join(scriptDir, "./tsconfig.template.json")); + const tsConfigTemplateCjsPath = join(scriptDir, "./tsconfig.template.cjs.json"); + const tsConfigTemplateEsmPath = join(scriptDir, "./tsconfig.template.esm.json"); + const tsConfigTemplateSpecPath = join(scriptDir, "./tsconfig.template.spec.json"); + const tsConfigTemplateSpec = await fs.readJson(tsConfigTemplateSpecPath); + const npmIgnoreTemplatePath = join(scriptDir, "./.npmignore.template"); + //const viteConfig = fs.readFileSync(join(scriptDir, "./vite.config.mts"), {encoding: "utf8"}); + + const tsConfigRoot = await fs.readJson(tsConfigRootPath); tsConfigRoot.references = []; - const packages = await mono.findPackages(monoRepo); + const packages = await findPackages(monoRepo); const packagesRefsMap = packages.reduce((map, pkg) => { if (pkg.pkg.source && pkg.pkg.source.endsWith(".ts")) { @@ -27,14 +37,26 @@ async function main() { return map; }, new Map()); - const promises = packages.map(async (pkg) => { + for (const pkg of packages) { const path = dirname(pkg.path); if (pkg.pkg.source && pkg.pkg.source.endsWith(".ts")) { const tsConfig = cloneDeep(tsConfigTemplate); const tsConfigPath = join(path, "tsconfig.json"); - const tsConfigEsm = cloneDeep(tsConfigEsmTemplate); - const tsConfigEsmPath = join(path, "tsconfig.esm.json"); + const tsConfigBuildEsmPath = join(path, "tsconfig.esm.json"); + const tsConfigBuildCjsPath = join(path, "tsconfig.cjs.json"); + const tsConfigBuildSpecPath = join(path, "tsconfig.spec.json"); + const npmignore = join(path, ".npmignore"); + const vitestPath = join(path, "vitest.config.mts"); + const vitePath = join(path, "vite.config.mts"); + + const hasFiles = await globby(["{src,test}/**/*.spec.ts", "!node_modules"], { + cwd: path + }); + + // const viteConfigPath = join(path, "vite.config.ts"); + tsConfig.references = []; + const deps = new Set(); Object.keys({ ...(pkg.pkg.peerDependencies || {}), @@ -45,42 +67,134 @@ async function main() { return packagesRefsMap.has(peer); }) .map((peer) => { + deps.add(peer); tsConfig.references.push({ - path: relative(dirname(pkg.path), packagesRefsMap.get(peer)) - }); - tsConfigEsm.references.push({ - path: relative(dirname(pkg.path), packagesRefsMap.get(peer)) + path: join(relative(dirname(pkg.path), packagesRefsMap.get(peer)), "tsconfig.json") }); }); - await writeJson(tsConfigPath, tsConfig, {spaces: 2}); - await writeJson(tsConfigEsmPath, tsConfigEsm, {spaces: 2}); + tsConfig.references.push( + { + path: "./tsconfig.cjs.json" + }, + { + path: "./tsconfig.esm.json" + } + ); + + if (hasFiles.length) { + tsConfig.references.push({ + path: "./tsconfig.spec.json" + }); + + const paths = {}; + + packages + .filter((dep) => { + return ( + ((dep.path.includes("/platform") && !dep.path.includes("serverless")) || + dep.path.includes("/components-scan") || + dep.path.includes("/spec") || + dep.path.includes("/di")) && + !deps.has(dep.name) && + pkg.name !== dep.name + ); + }) + .forEach((dep) => { + paths["@tsed/" + dep.name] = [relative(dirname(pkg.path), dirname(dep.path)) + "/src"]; + }); + const tsCopy = cloneDeep(tsConfigTemplateSpec); + tsCopy.compilerOptions.paths = paths; + tsCopy.compilerOptions.rootDir = relative(dirname(tsConfigBuildSpecPath), packagesRootDir); + + if (fs.existsSync(vitestPath)) { + tsCopy.include.push("vitest.config.mts"); + tsCopy.compilerOptions.types = ["vite/client", "vitest/globals"]; + } + + if (fs.existsSync(vitePath)) { + tsCopy.include.push("vite.config.mts"); + } + + await fs.writeJSON(tsConfigBuildSpecPath, tsCopy, {spaces: 2}); + } + + await fs.writeJson(tsConfigPath, tsConfig, {spaces: 2}); + await fs.copy(tsConfigTemplateEsmPath, tsConfigBuildEsmPath); + await fs.copy(tsConfigTemplateCjsPath, tsConfigBuildCjsPath); + await fs.copy(npmIgnoreTemplatePath, npmignore); tsConfigRoot.references.push({ - path: `./${relative(process.cwd(), path)}` + path: `./${relative(process.cwd(), path)}/tsconfig.json` }); - if (pkg.pkg.scripts["build:cjs"]) { - pkg.pkg.scripts["build"] = pkg.pkg.scripts["build"].replace("yarn run build:esm && yarn run build:cjs", "yarn build:ts"); - delete pkg.pkg.scripts["build:cjs"]; - delete pkg.pkg.scripts["build:esm"]; + // if (hasFiles.length) { + // tsConfigRoot.references.push( + // { + // path: `./${relative(process.cwd(), path)}/tsconfig.spec.json` + // } + // ); + // } + + pkg.pkg = { + name: pkg.pkg.name, + description: pkg.pkg.description, + type: "commonjs", + ...omit(pkg.pkg, ["name", "description"]) + }; + pkg.pkg.scripts = { + ...pkg.pkg.scripts, + "build:ts": "tsc --build tsconfig.json" + }; + + pkg.pkg.devDependencies["@tsed/typescript"] = "workspace:*"; + pkg.pkg.devDependencies["typescript"] = pkgRoot.devDependencies["typescript"]; + + // migrate task + // if (pkg.pkg.scripts["build:browser"] === "webpack") { + // delete pkg.pkg.devDependencies["webpack"]; + // + // pkg.pkg.scripts["build:browser"] = "vite build"; + // + // await fs.writeFile( + // viteConfigPath, + // viteConfig.replace("__PACKAGE__", pkg.pkg.name).replace("__NAME__", pkg.pkg.name.split("/")[1]), + // { + // encoding: "utf-8" + // } + // ); + // } + // + // if (pkg.pkg.scripts["build:browser"]) { + // pkg.pkg.devDependencies["vite"] = pkgRoot.devDependencies["vite"]; + // } + + // prepare exports + + // pkg.pkg.main = pkg.pkg.main.replace("cjs/", "esm/"); + + if (pkg.pkg.exports && !pkg.pkg.exports["."]) { + pkg.pkg.exports = { + ".": { + ...pkg.pkg.exports + } + }; } - pkg.pkg.scripts["build:ts"] = "tsc --build tsconfig.json && tsc --build tsconfig.esm.json"; - pkg.pkg.devDependencies["@tsed/typescript"] = pkg.pkg.version; - - await writeJson(pkg.path, pkg.pkg, {spaces: 2}); - try { - removeSync(join(path, "tsconfig.compile.esm.json")); - removeSync(join(path, "tsconfig.compile.json")); - removeSync(join(path, "tsconfig.cjs.json")); - } catch {} + await fs.writeJson(pkg.path, pkg.pkg, {spaces: 2}); + // try { + // fs.removeSync(join(path, "tsconfig.compile.esm.json")); + // fs.removeSync(join(path, "tsconfig.compile.json")); + // fs.removeSync(join(path, "tsconfig.cjs.json")); + // // fs.removeSync(join(path, "tsconfig.esm.json")); + // } catch { + // } } - }); - - await Promise.all(promises); + } - await writeJson(tsConfigRootPath, tsConfigRoot, {spaces: 2}); + await fs.writeJson(tsConfigRootPath, tsConfigRoot, {spaces: 2}); } -main(); +main().catch((e) => { + console.error(e); +}); diff --git a/tools/typescript/package.json b/tools/typescript/package.json index 756ae93b6..a39a0d912 100644 --- a/tools/typescript/package.json +++ b/tools/typescript/package.json @@ -10,10 +10,5 @@ }, "scripts": { "build:references": "node ./index.js" - }, - "devDependencies": { - "@tsed/jest-config": "5.2.10", - "cross-env": "7.0.3", - "jest": "29.5.0" } } diff --git a/tools/jest/swc.node.json b/tools/typescript/swc.node.json similarity index 100% rename from tools/jest/swc.node.json rename to tools/typescript/swc.node.json diff --git a/tools/typescript/tsconfig.node.json b/tools/typescript/tsconfig.node.json index c08fc9736..672ed6224 100644 --- a/tools/typescript/tsconfig.node.json +++ b/tools/typescript/tsconfig.node.json @@ -14,15 +14,16 @@ "noUnusedParameters": false, "esModuleInterop": true, "allowSyntheticDefaultImports": true, + "useDefineForClassFields": false, "importHelpers": true, "resolveJsonModule": true, "newLine": "LF", "skipLibCheck": true, - "lib": ["ES2021", "esnext.asynciterable"], - "declaration": true, + "lib": ["ESNext", "esnext.asynciterable"], + "declaration": false, "noResolve": false, "preserveConstEnums": true, "sourceMap": true, - "noEmit": false + "noEmit": true } } diff --git a/tools/typescript/tsconfig.template.cjs.json b/tools/typescript/tsconfig.template.cjs.json new file mode 100644 index 000000000..7f23b116d --- /dev/null +++ b/tools/typescript/tsconfig.template.cjs.json @@ -0,0 +1,28 @@ +{ + "extends": "@tsed/typescript/tsconfig.node.json", + "compilerOptions": { + "baseUrl": ".", + "module": "commonjs", + "moduleResolution": "Node16", + "rootDir": "src", + "outDir": "./lib/cjs", + "declaration": true, + "declarationDir": "./lib/types", + "composite": true, + "noEmit": false + }, + "include": ["src", "src/**/*.json"], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage", + "spec", + "**/*.benchmark.ts", + "**/*.spec.ts", + "keys", + "**/__mock__/**", + "webpack.config.js" + ] +} diff --git a/tools/typescript/tsconfig.template.esm.json b/tools/typescript/tsconfig.template.esm.json index 89f93d97c..ce32a9e07 100644 --- a/tools/typescript/tsconfig.template.esm.json +++ b/tools/typescript/tsconfig.template.esm.json @@ -2,11 +2,12 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ES2020", + "module": "ESNext", + "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", + "declarationDir": "./lib/types-esm", "declaration": true, - "declarationDir": "./lib/types", "composite": true, "noEmit": false }, @@ -21,9 +22,7 @@ "**/*.benchmark.ts", "**/*.spec.ts", "keys", - "jest.config.js", "**/__mock__/**", "webpack.config.js" - ], - "references": [] + ] } diff --git a/tools/typescript/tsconfig.template.json b/tools/typescript/tsconfig.template.json index 290e454ae..d5a1e1d14 100644 --- a/tools/typescript/tsconfig.template.json +++ b/tools/typescript/tsconfig.template.json @@ -2,28 +2,7 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "commonjs", - "rootDir": "src", - "outDir": "./lib/cjs", - "declaration": true, - "declarationDir": "./lib/types", - "composite": true, - "noEmit": false + "noEmit": true }, - "include": ["src", "src/**/*.json"], - "exclude": [ - "node_modules", - "test", - "lib", - "benchmark", - "coverage", - "spec", - "**/*.benchmark.ts", - "**/*.spec.ts", - "keys", - "jest.config.js", - "**/__mock__/**", - "webpack.config.js" - ], - "references": [] + "include": [] } diff --git a/tools/typescript/tsconfig.template.spec.json b/tools/typescript/tsconfig.template.spec.json new file mode 100644 index 000000000..50ffc4b33 --- /dev/null +++ b/tools/typescript/tsconfig.template.spec.json @@ -0,0 +1,14 @@ +{ + "extends": "@tsed/typescript/tsconfig.node.json", + "compilerOptions": { + "baseUrl": ".", + "rootDir": ".", + "module": "commonjs", + "outDir": "./lib/cjs", + "declaration": false, + "composite": false, + "noEmit": true + }, + "include": ["src/**/*.spec.ts", "test/**/*.spec.ts"], + "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] +} diff --git a/tools/vitest/index.js b/tools/vitest/index.js new file mode 100644 index 000000000..5b9ffa6ab --- /dev/null +++ b/tools/vitest/index.js @@ -0,0 +1,40 @@ +import {findPackages, MonoRepo} from "@tsed/monorepo-utils"; +import fs from "fs-extra"; +import {dirname, join} from "node:path"; + +const rootDir = import.meta.dirname; +const workspaceDir = join(rootDir, "../.."); + +async function main() { + const monoRepo = new MonoRepo({ + rootDir: workspaceDir, + verbose: false + }); + + const packages = await findPackages(monoRepo); + const vitestTemplate = await fs.readFile(join(rootDir, "templates/vitest.config.mts")); + + const promises = packages.map(async (pkg) => { + if (pkg.pkg.scripts && pkg.pkg.scripts["test"]) { + pkg.pkg.scripts["test"] = "vitest run"; + pkg.pkg.scripts["test:ci"] = "vitest run --coverage.thresholds.autoUpdate=true"; + pkg.pkg.devDependencies["vitest"] = monoRepo.rootPkg.devDependencies["vitest"]; + pkg.pkg.devDependencies["jest"] = undefined; + pkg.pkg.devDependencies["jest-coverage-thresholds-bumper"] = undefined; + + await fs.writeJson(pkg.path, pkg.pkg, {spaces: 2}); + await fs.writeFile(join(dirname(pkg.path), "vitest.config.mts"), vitestTemplate); + + const jestFile = join(dirname(pkg.path), "jest.config.js"); + + if (fs.existsSync(jestFile)) { + await fs.removeSync(jestFile); + } + } + + }); + + await Promise.all(promises); +} + +main(); diff --git a/tools/vitest/package.json b/tools/vitest/package.json new file mode 100644 index 000000000..d445ac77c --- /dev/null +++ b/tools/vitest/package.json @@ -0,0 +1,17 @@ +{ + "name": "@tsed/vitest", + "type": "module", + "version": "7.83.0", + "private": true, + "exports": { + ".": "./index.js", + "./plugins/*": "./plugins/*", + "./presets": "./presets/index.js" + }, + "devDependencies": { + "vitest": "2.0.5" + }, + "scripts": { + "generate": "node index.js" + } +} diff --git a/tools/vitest/plugins/resolveWorkspaceFiles.js b/tools/vitest/plugins/resolveWorkspaceFiles.js new file mode 100644 index 000000000..0afb7fef7 --- /dev/null +++ b/tools/vitest/plugins/resolveWorkspaceFiles.js @@ -0,0 +1,10 @@ +export function resolveWorkspaceFiles() { + return { + name: "resolve-workspace-files", + resolveId(id) { + if (id.includes("@tsed")) { + return id.replace(".js", ".ts"); + } + } + }; +} diff --git a/tools/vitest/presets/alias.js b/tools/vitest/presets/alias.js new file mode 100644 index 000000000..d9485ca8f --- /dev/null +++ b/tools/vitest/presets/alias.js @@ -0,0 +1,63 @@ +import {sync} from "globby"; +import {readFileSync} from "node:fs"; +import {basename, dirname, join} from "node:path"; + +const root = join(import.meta.dirname, "../../.."); + +function deps(pkg, pkgs, set = new Set()) { + Object.keys({ + ...(pkg.dependencies || {}), + ...(pkg.devDependencies || {}) + }).forEach((name) => { + if (pkgs.has(name)) { + deps(pkgs.get(name).pkg, pkgs, set); + } + }); + set.add(pkg.name); +} + +function findPackages() { + const pkgs = sync( + [ + "packages/*/package.json", + "packages/graphql/*/package.json", + "packages/orm/*/package.json", + "packages/utils/*/package.json", + "packages/platform/*/package.json", + "packages/security/*/package.json", + "packages/specs/*/package.json", + "packages/third-parties/*/package.json", + "!**/node_modules/**" + ], + { + cwd: root, + absolute: true + } + ).map((file) => ({ + path: file, + name: basename(dirname(file)), + pkg: JSON.parse(readFileSync(file, {encoding: "utf8"})) + })); + + const pkgsMap = pkgs.reduce((map, data) => { + map.set(data.pkg.name, data); + return map; + }, new Map()); + + const set = new Set(); + + pkgs.forEach(({pkg}) => { + deps(pkg, pkgsMap, set); + }); + + return [...set.keys()].map((mod) => pkgsMap.get(mod)); +} + +const packages = findPackages(); + +export const alias = packages.reduce((acc, pkg) => { + return { + ...acc, + [pkg.pkg.name]: join(dirname(pkg.path), pkg.pkg.source) + }; +}, {}); diff --git a/tools/vitest/presets/index.js b/tools/vitest/presets/index.js new file mode 100644 index 000000000..ac948ae85 --- /dev/null +++ b/tools/vitest/presets/index.js @@ -0,0 +1,43 @@ +import swc from "unplugin-swc"; +import {defineConfig} from "vitest/config"; +import {resolveWorkspaceFiles} from "../plugins/resolveWorkspaceFiles.js"; +import {alias} from "./alias.js"; + +export const presets = defineConfig({ + resolve: { + alias + }, + test: { + globals: true, + environment: "node", + coverage: { + enabled: true, + provider: "v8", + reporter: ["text", "json", "html"], + all: true, + include: ["src/**/*.{tsx,ts}"], + exclude: [ + "**/*.spec.{ts,tsx}", + "**/*.stories.{ts,tsx}", + "**/*.d.ts", + "**/__mocks__/**", + "**/__mock__/**", + "**/tests/**", + "**/index.ts" + ] + } + }, + plugins: [ + resolveWorkspaceFiles(), + swc.vite({ + //tsconfigFile: "./tsconfig.spec.json", + // Explicitly set the module type to avoid inheriting this value from a `.swcrc` config file + module: {type: "es6"}, + jsc: { + transform: { + useDefineForClassFields: false + } + } + }) + ] +}); diff --git a/tools/vitest/templates/vitest.config.mts b/tools/vitest/templates/vitest.config.mts new file mode 100644 index 000000000..d759e8179 --- /dev/null +++ b/tools/vitest/templates/vitest.config.mts @@ -0,0 +1,21 @@ +// @ts-ignore +import {presets} from "@tsed/vitest/presets"; +import {defineConfig} from "vitest/config"; + +export default defineConfig( + { + ...presets, + test: { + ...presets.test, + coverage: { + ...presets.test.coverage, + thresholds: { + statements: 0, + branches: 0, + functions: 0, + lines: 0 + } + } + } + } +); diff --git a/tools/vitest/tsconfig.json b/tools/vitest/tsconfig.json new file mode 100644 index 000000000..a95cd299d --- /dev/null +++ b/tools/vitest/tsconfig.json @@ -0,0 +1,6 @@ +{ + "compilerOptions": { + "noEmit": true + }, + "include": ["templates/**"] +} diff --git a/tsconfig.json b/tsconfig.json index f81154c53..8063298f9 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -13,49 +13,49 @@ }, "references": [ { - "path": "./packages/cli-core" + "path": "./packages/cli-core/tsconfig.json" }, { - "path": "./packages/cli-plugin-eslint" + "path": "./packages/cli/tsconfig.json" }, { - "path": "./packages/cli-plugin-jest" + "path": "./packages/cli-generate-http-client/tsconfig.json" }, { - "path": "./packages/cli-plugin-vitest" + "path": "./packages/cli-generate-swagger/tsconfig.json" }, { - "path": "./packages/cli-plugin-mocha" + "path": "./packages/cli-plugin-eslint/tsconfig.json" }, { - "path": "./packages/cli-plugin-mongoose" + "path": "./packages/cli-plugin-jest/tsconfig.json" }, { - "path": "./packages/cli-plugin-oidc-provider" + "path": "./packages/cli-plugin-mocha/tsconfig.json" }, { - "path": "./packages/cli-plugin-passport" + "path": "./packages/cli-plugin-mongoose/tsconfig.json" }, { - "path": "./packages/cli-plugin-prisma" + "path": "./packages/cli-plugin-oidc-provider/tsconfig.json" }, { - "path": "./packages/cli-testing" + "path": "./packages/cli-plugin-passport/tsconfig.json" }, { - "path": "./packages/cli-generate-swagger" + "path": "./packages/cli-plugin-prisma/tsconfig.json" }, { - "path": "./packages/cli-plugin-typegraphql" + "path": "./packages/cli-plugin-typegraphql/tsconfig.json" }, { - "path": "./packages/cli-generate-http-client" + "path": "./packages/cli-plugin-typeorm/tsconfig.json" }, { - "path": "./packages/cli-plugin-typeorm" + "path": "./packages/cli-plugin-vitest/tsconfig.json" }, { - "path": "./packages/cli" + "path": "./packages/cli-testing/tsconfig.json" } ], "exclude": [ diff --git a/yarn.lock b/yarn.lock index bd99667c3..d5721adb3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14,6 +14,16 @@ __metadata: languageName: node linkType: hard +"@ampproject/remapping@npm:^2.3.0": + version: 2.3.0 + resolution: "@ampproject/remapping@npm:2.3.0" + dependencies: + "@jridgewell/gen-mapping": "npm:^0.3.5" + "@jridgewell/trace-mapping": "npm:^0.3.24" + checksum: 10/f3451525379c68a73eb0a1e65247fbf28c0cccd126d93af21c75fceff77773d43c0d4a2d51978fb131aff25b5f2cb41a9fe48cc296e61ae65e679c4f6918b0ab + languageName: node + linkType: hard + "@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.7": version: 7.16.7 resolution: "@babel/code-frame@npm:7.16.7" @@ -194,6 +204,13 @@ __metadata: languageName: node linkType: hard +"@babel/helper-string-parser@npm:^7.24.8": + version: 7.24.8 + resolution: "@babel/helper-string-parser@npm:7.24.8" + checksum: 10/6d1bf8f27dd725ce02bdc6dffca3c95fb9ab8a06adc2edbd9c1c9d68500274230d1a609025833ed81981eff560045b6b38f7b4c6fb1ab19fc90e5004e3932535 + languageName: node + linkType: hard + "@babel/helper-validator-identifier@npm:^7.16.7, @babel/helper-validator-identifier@npm:^7.22.5": version: 7.22.5 resolution: "@babel/helper-validator-identifier@npm:7.22.5" @@ -208,6 +225,13 @@ __metadata: languageName: node linkType: hard +"@babel/helper-validator-identifier@npm:^7.24.7": + version: 7.24.7 + resolution: "@babel/helper-validator-identifier@npm:7.24.7" + checksum: 10/86875063f57361471b531dbc2ea10bbf5406e12b06d249b03827d361db4cad2388c6f00936bcd9dc86479f7e2c69ea21412c2228d4b3672588b754b70a449d4b + languageName: node + linkType: hard + "@babel/helper-validator-option@npm:^7.16.7": version: 7.16.7 resolution: "@babel/helper-validator-option@npm:7.16.7" @@ -257,6 +281,17 @@ __metadata: languageName: node linkType: hard +"@babel/parser@npm:^7.25.4": + version: 7.25.6 + resolution: "@babel/parser@npm:7.25.6" + dependencies: + "@babel/types": "npm:^7.25.6" + bin: + parser: ./bin/babel-parser.js + checksum: 10/830aab72116aa14eb8d61bfa8f9d69fc8f3a43d909ce993cb4350ae14d3af1a2f740a54410a22d821c48a253263643dfecbc094f9608e6a70ce9ff3c0bbfe91a + languageName: node + linkType: hard + "@babel/plugin-syntax-async-generators@npm:^7.8.4": version: 7.8.4 resolution: "@babel/plugin-syntax-async-generators@npm:7.8.4" @@ -451,6 +486,17 @@ __metadata: languageName: node linkType: hard +"@babel/types@npm:^7.25.4, @babel/types@npm:^7.25.6": + version: 7.25.6 + resolution: "@babel/types@npm:7.25.6" + dependencies: + "@babel/helper-string-parser": "npm:^7.24.8" + "@babel/helper-validator-identifier": "npm:^7.24.7" + to-fast-properties: "npm:^2.0.0" + checksum: 10/7b54665e1b51f525fe0f451efdd9fe7a4a6dfba3fd4956c3530bc77336b66ffe3d78c093796ed044119b5d213176af7cf326f317a2057c538d575c6cefcb3562 + languageName: node + linkType: hard + "@babel/types@npm:^7.8.3": version: 7.23.9 resolution: "@babel/types@npm:7.23.9" @@ -676,6 +722,167 @@ __metadata: languageName: node linkType: hard +"@esbuild/aix-ppc64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/aix-ppc64@npm:0.21.5" + conditions: os=aix & cpu=ppc64 + languageName: node + linkType: hard + +"@esbuild/android-arm64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/android-arm64@npm:0.21.5" + conditions: os=android & cpu=arm64 + languageName: node + linkType: hard + +"@esbuild/android-arm@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/android-arm@npm:0.21.5" + conditions: os=android & cpu=arm + languageName: node + linkType: hard + +"@esbuild/android-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/android-x64@npm:0.21.5" + conditions: os=android & cpu=x64 + languageName: node + linkType: hard + +"@esbuild/darwin-arm64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/darwin-arm64@npm:0.21.5" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + +"@esbuild/darwin-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/darwin-x64@npm:0.21.5" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + +"@esbuild/freebsd-arm64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/freebsd-arm64@npm:0.21.5" + conditions: os=freebsd & cpu=arm64 + languageName: node + linkType: hard + +"@esbuild/freebsd-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/freebsd-x64@npm:0.21.5" + conditions: os=freebsd & cpu=x64 + languageName: node + linkType: hard + +"@esbuild/linux-arm64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-arm64@npm:0.21.5" + conditions: os=linux & cpu=arm64 + languageName: node + linkType: hard + +"@esbuild/linux-arm@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-arm@npm:0.21.5" + conditions: os=linux & cpu=arm + languageName: node + linkType: hard + +"@esbuild/linux-ia32@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-ia32@npm:0.21.5" + conditions: os=linux & cpu=ia32 + languageName: node + linkType: hard + +"@esbuild/linux-loong64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-loong64@npm:0.21.5" + conditions: os=linux & cpu=loong64 + languageName: node + linkType: hard + +"@esbuild/linux-mips64el@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-mips64el@npm:0.21.5" + conditions: os=linux & cpu=mips64el + languageName: node + linkType: hard + +"@esbuild/linux-ppc64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-ppc64@npm:0.21.5" + conditions: os=linux & cpu=ppc64 + languageName: node + linkType: hard + +"@esbuild/linux-riscv64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-riscv64@npm:0.21.5" + conditions: os=linux & cpu=riscv64 + languageName: node + linkType: hard + +"@esbuild/linux-s390x@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-s390x@npm:0.21.5" + conditions: os=linux & cpu=s390x + languageName: node + linkType: hard + +"@esbuild/linux-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/linux-x64@npm:0.21.5" + conditions: os=linux & cpu=x64 + languageName: node + linkType: hard + +"@esbuild/netbsd-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/netbsd-x64@npm:0.21.5" + conditions: os=netbsd & cpu=x64 + languageName: node + linkType: hard + +"@esbuild/openbsd-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/openbsd-x64@npm:0.21.5" + conditions: os=openbsd & cpu=x64 + languageName: node + linkType: hard + +"@esbuild/sunos-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/sunos-x64@npm:0.21.5" + conditions: os=sunos & cpu=x64 + languageName: node + linkType: hard + +"@esbuild/win32-arm64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/win32-arm64@npm:0.21.5" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + +"@esbuild/win32-ia32@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/win32-ia32@npm:0.21.5" + conditions: os=win32 & cpu=ia32 + languageName: node + linkType: hard + +"@esbuild/win32-x64@npm:0.21.5": + version: 0.21.5 + resolution: "@esbuild/win32-x64@npm:0.21.5" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + "@eslint/eslintrc@npm:^1.3.0": version: 1.3.1 resolution: "@eslint/eslintrc@npm:1.3.1" @@ -835,15 +1042,6 @@ __metadata: languageName: node linkType: hard -"@jest/create-cache-key-function@npm:^27.4.2": - version: 27.5.1 - resolution: "@jest/create-cache-key-function@npm:27.5.1" - dependencies: - "@jest/types": "npm:^27.5.1" - checksum: 10/dbafbad1dc7e9008d9e25995e02d528ca7f4a3ffd829a69316dd345f7ecaa83ef9878476ee1bea37f38cf8ba9167ff972a17007c70cb91bdab0f158df3c58073 - languageName: node - linkType: hard - "@jest/environment@npm:^29.5.0": version: 29.5.0 resolution: "@jest/environment@npm:29.5.0" @@ -856,15 +1054,6 @@ __metadata: languageName: node linkType: hard -"@jest/expect-utils@npm:^28.1.3": - version: 28.1.3 - resolution: "@jest/expect-utils@npm:28.1.3" - dependencies: - jest-get-type: "npm:^28.0.2" - checksum: 10/f48e4c5b267438a565b6e4c00a06f2bd566dc65d8bb6114d57276ec1fa4f4cded548371e45caffe37c58e5cf3716dbec715c10cfacdae35c4c04b755d83fac96 - languageName: node - linkType: hard - "@jest/expect-utils@npm:^29.5.0": version: 29.5.0 resolution: "@jest/expect-utils@npm:29.5.0" @@ -1023,20 +1212,7 @@ __metadata: languageName: node linkType: hard -"@jest/types@npm:^27.5.1": - version: 27.5.1 - resolution: "@jest/types@npm:27.5.1" - dependencies: - "@types/istanbul-lib-coverage": "npm:^2.0.0" - "@types/istanbul-reports": "npm:^3.0.0" - "@types/node": "npm:*" - "@types/yargs": "npm:^16.0.0" - chalk: "npm:^4.0.0" - checksum: 10/d3ca1655673539c54665f3e9135dc70887feb6b667b956e712c38f42e513ae007d3593b8075aecea8f2db7119f911773010f17f93be070b1725fbc6225539b6e - languageName: node - linkType: hard - -"@jest/types@npm:^28.1.1, @jest/types@npm:^28.1.3": +"@jest/types@npm:^28.1.1": version: 28.1.3 resolution: "@jest/types@npm:28.1.3" dependencies: @@ -1075,6 +1251,17 @@ __metadata: languageName: node linkType: hard +"@jridgewell/gen-mapping@npm:^0.3.5": + version: 0.3.5 + resolution: "@jridgewell/gen-mapping@npm:0.3.5" + dependencies: + "@jridgewell/set-array": "npm:^1.2.1" + "@jridgewell/sourcemap-codec": "npm:^1.4.10" + "@jridgewell/trace-mapping": "npm:^0.3.24" + checksum: 10/81587b3c4dd8e6c60252122937cea0c637486311f4ed208b52b62aae2e7a87598f63ec330e6cd0984af494bfb16d3f0d60d3b21d7e5b4aedd2602ff3fe9d32e2 + languageName: node + linkType: hard + "@jridgewell/resolve-uri@npm:3.1.0": version: 3.1.0 resolution: "@jridgewell/resolve-uri@npm:3.1.0" @@ -1089,6 +1276,13 @@ __metadata: languageName: node linkType: hard +"@jridgewell/resolve-uri@npm:^3.1.0": + version: 3.1.2 + resolution: "@jridgewell/resolve-uri@npm:3.1.2" + checksum: 10/97106439d750a409c22c8bff822d648f6a71f3aa9bc8e5129efdc36343cd3096ddc4eeb1c62d2fe48e9bdd4db37b05d4646a17114ecebd3bbcacfa2de51c3c1d + languageName: node + linkType: hard + "@jridgewell/set-array@npm:^1.0.0": version: 1.1.1 resolution: "@jridgewell/set-array@npm:1.1.1" @@ -1096,6 +1290,13 @@ __metadata: languageName: node linkType: hard +"@jridgewell/set-array@npm:^1.2.1": + version: 1.2.1 + resolution: "@jridgewell/set-array@npm:1.2.1" + checksum: 10/832e513a85a588f8ed4f27d1279420d8547743cc37fcad5a5a76fc74bb895b013dfe614d0eed9cb860048e6546b798f8f2652020b4b2ba0561b05caa8c654b10 + languageName: node + linkType: hard + "@jridgewell/sourcemap-codec@npm:1.4.14": version: 1.4.14 resolution: "@jridgewell/sourcemap-codec@npm:1.4.14" @@ -1110,6 +1311,13 @@ __metadata: languageName: node linkType: hard +"@jridgewell/sourcemap-codec@npm:^1.4.14, @jridgewell/sourcemap-codec@npm:^1.5.0": + version: 1.5.0 + resolution: "@jridgewell/sourcemap-codec@npm:1.5.0" + checksum: 10/4ed6123217569a1484419ac53f6ea0d9f3b57e5b57ab30d7c267bdb27792a27eb0e4b08e84a2680aa55cc2f2b411ffd6ec3db01c44fdc6dc43aca4b55f8374fd + languageName: node + linkType: hard + "@jridgewell/trace-mapping@npm:0.3.9": version: 0.3.9 resolution: "@jridgewell/trace-mapping@npm:0.3.9" @@ -1130,6 +1338,16 @@ __metadata: languageName: node linkType: hard +"@jridgewell/trace-mapping@npm:^0.3.23, @jridgewell/trace-mapping@npm:^0.3.24": + version: 0.3.25 + resolution: "@jridgewell/trace-mapping@npm:0.3.25" + dependencies: + "@jridgewell/resolve-uri": "npm:^3.1.0" + "@jridgewell/sourcemap-codec": "npm:^1.4.14" + checksum: 10/dced32160a44b49d531b80a4a2159dceab6b3ddf0c8e95a0deae4b0e894b172defa63d5ac52a19c2068e1fe7d31ea4ba931fbeec103233ecb4208953967120fc + languageName: node + linkType: hard + "@lerna/add@npm:5.4.3": version: 5.4.3 resolution: "@lerna/add@npm:5.4.3" @@ -2794,6 +3012,134 @@ __metadata: languageName: node linkType: hard +"@rollup/pluginutils@npm:^5.1.0": + version: 5.1.0 + resolution: "@rollup/pluginutils@npm:5.1.0" + dependencies: + "@types/estree": "npm:^1.0.0" + estree-walker: "npm:^2.0.2" + picomatch: "npm:^2.3.1" + peerDependencies: + rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 + peerDependenciesMeta: + rollup: + optional: true + checksum: 10/abb15eaec5b36f159ec351b48578401bedcefdfa371d24a914cfdbb1e27d0ebfbf895299ec18ccc343d247e71f2502cba21202bc1362d7ef27d5ded699e5c2b2 + languageName: node + linkType: hard + +"@rollup/rollup-android-arm-eabi@npm:4.21.3": + version: 4.21.3 + resolution: "@rollup/rollup-android-arm-eabi@npm:4.21.3" + conditions: os=android & cpu=arm + languageName: node + linkType: hard + +"@rollup/rollup-android-arm64@npm:4.21.3": + version: 4.21.3 + resolution: "@rollup/rollup-android-arm64@npm:4.21.3" + conditions: os=android & cpu=arm64 + languageName: node + linkType: hard + +"@rollup/rollup-darwin-arm64@npm:4.21.3": + version: 4.21.3 + resolution: "@rollup/rollup-darwin-arm64@npm:4.21.3" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + +"@rollup/rollup-darwin-x64@npm:4.21.3": + version: 4.21.3 + resolution: "@rollup/rollup-darwin-x64@npm:4.21.3" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + +"@rollup/rollup-linux-arm-gnueabihf@npm:4.21.3": + version: 4.21.3 + resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.21.3" + conditions: os=linux & cpu=arm & libc=glibc + languageName: node + linkType: hard + +"@rollup/rollup-linux-arm-musleabihf@npm:4.21.3": + version: 4.21.3 + resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.21.3" + conditions: os=linux & cpu=arm & libc=musl + languageName: node + linkType: hard + +"@rollup/rollup-linux-arm64-gnu@npm:4.21.3": + version: 4.21.3 + resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.21.3" + conditions: os=linux & cpu=arm64 & libc=glibc + languageName: node + linkType: hard + +"@rollup/rollup-linux-arm64-musl@npm:4.21.3": + version: 4.21.3 + resolution: "@rollup/rollup-linux-arm64-musl@npm:4.21.3" + conditions: os=linux & cpu=arm64 & libc=musl + languageName: node + linkType: hard + +"@rollup/rollup-linux-powerpc64le-gnu@npm:4.21.3": + version: 4.21.3 + resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.21.3" + conditions: os=linux & cpu=ppc64 & libc=glibc + languageName: node + linkType: hard + +"@rollup/rollup-linux-riscv64-gnu@npm:4.21.3": + version: 4.21.3 + resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.21.3" + conditions: os=linux & cpu=riscv64 & libc=glibc + languageName: node + linkType: hard + +"@rollup/rollup-linux-s390x-gnu@npm:4.21.3": + version: 4.21.3 + resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.21.3" + conditions: os=linux & cpu=s390x & libc=glibc + languageName: node + linkType: hard + +"@rollup/rollup-linux-x64-gnu@npm:4.21.3": + version: 4.21.3 + resolution: "@rollup/rollup-linux-x64-gnu@npm:4.21.3" + conditions: os=linux & cpu=x64 & libc=glibc + languageName: node + linkType: hard + +"@rollup/rollup-linux-x64-musl@npm:4.21.3": + version: 4.21.3 + resolution: "@rollup/rollup-linux-x64-musl@npm:4.21.3" + conditions: os=linux & cpu=x64 & libc=musl + languageName: node + linkType: hard + +"@rollup/rollup-win32-arm64-msvc@npm:4.21.3": + version: 4.21.3 + resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.21.3" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + +"@rollup/rollup-win32-ia32-msvc@npm:4.21.3": + version: 4.21.3 + resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.21.3" + conditions: os=win32 & cpu=ia32 + languageName: node + linkType: hard + +"@rollup/rollup-win32-x64-msvc@npm:4.21.3": + version: 4.21.3 + resolution: "@rollup/rollup-win32-x64-msvc@npm:4.21.3" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + "@samverschueren/stream-to-observable@npm:0.3.1, @samverschueren/stream-to-observable@npm:>=0.3.1, @samverschueren/stream-to-observable@npm:^0.3.0": version: 0.3.1 resolution: "@samverschueren/stream-to-observable@npm:0.3.1" @@ -3060,92 +3406,94 @@ __metadata: languageName: node linkType: hard -"@swc/core-darwin-arm64@npm:1.3.61": - version: 1.3.61 - resolution: "@swc/core-darwin-arm64@npm:1.3.61" +"@swc/core-darwin-arm64@npm:1.7.26": + version: 1.7.26 + resolution: "@swc/core-darwin-arm64@npm:1.7.26" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@swc/core-darwin-x64@npm:1.3.61": - version: 1.3.61 - resolution: "@swc/core-darwin-x64@npm:1.3.61" +"@swc/core-darwin-x64@npm:1.7.26": + version: 1.7.26 + resolution: "@swc/core-darwin-x64@npm:1.7.26" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@swc/core-linux-arm-gnueabihf@npm:1.3.61": - version: 1.3.61 - resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.61" +"@swc/core-linux-arm-gnueabihf@npm:1.7.26": + version: 1.7.26 + resolution: "@swc/core-linux-arm-gnueabihf@npm:1.7.26" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@swc/core-linux-arm64-gnu@npm:1.3.61": - version: 1.3.61 - resolution: "@swc/core-linux-arm64-gnu@npm:1.3.61" +"@swc/core-linux-arm64-gnu@npm:1.7.26": + version: 1.7.26 + resolution: "@swc/core-linux-arm64-gnu@npm:1.7.26" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@swc/core-linux-arm64-musl@npm:1.3.61": - version: 1.3.61 - resolution: "@swc/core-linux-arm64-musl@npm:1.3.61" +"@swc/core-linux-arm64-musl@npm:1.7.26": + version: 1.7.26 + resolution: "@swc/core-linux-arm64-musl@npm:1.7.26" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@swc/core-linux-x64-gnu@npm:1.3.61": - version: 1.3.61 - resolution: "@swc/core-linux-x64-gnu@npm:1.3.61" +"@swc/core-linux-x64-gnu@npm:1.7.26": + version: 1.7.26 + resolution: "@swc/core-linux-x64-gnu@npm:1.7.26" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@swc/core-linux-x64-musl@npm:1.3.61": - version: 1.3.61 - resolution: "@swc/core-linux-x64-musl@npm:1.3.61" +"@swc/core-linux-x64-musl@npm:1.7.26": + version: 1.7.26 + resolution: "@swc/core-linux-x64-musl@npm:1.7.26" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@swc/core-win32-arm64-msvc@npm:1.3.61": - version: 1.3.61 - resolution: "@swc/core-win32-arm64-msvc@npm:1.3.61" +"@swc/core-win32-arm64-msvc@npm:1.7.26": + version: 1.7.26 + resolution: "@swc/core-win32-arm64-msvc@npm:1.7.26" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@swc/core-win32-ia32-msvc@npm:1.3.61": - version: 1.3.61 - resolution: "@swc/core-win32-ia32-msvc@npm:1.3.61" +"@swc/core-win32-ia32-msvc@npm:1.7.26": + version: 1.7.26 + resolution: "@swc/core-win32-ia32-msvc@npm:1.7.26" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@swc/core-win32-x64-msvc@npm:1.3.61": - version: 1.3.61 - resolution: "@swc/core-win32-x64-msvc@npm:1.3.61" +"@swc/core-win32-x64-msvc@npm:1.7.26": + version: 1.7.26 + resolution: "@swc/core-win32-x64-msvc@npm:1.7.26" conditions: os=win32 & cpu=x64 languageName: node linkType: hard -"@swc/core@npm:^1.3.61": - version: 1.3.61 - resolution: "@swc/core@npm:1.3.61" +"@swc/core@npm:1.7.26": + version: 1.7.26 + resolution: "@swc/core@npm:1.7.26" dependencies: - "@swc/core-darwin-arm64": "npm:1.3.61" - "@swc/core-darwin-x64": "npm:1.3.61" - "@swc/core-linux-arm-gnueabihf": "npm:1.3.61" - "@swc/core-linux-arm64-gnu": "npm:1.3.61" - "@swc/core-linux-arm64-musl": "npm:1.3.61" - "@swc/core-linux-x64-gnu": "npm:1.3.61" - "@swc/core-linux-x64-musl": "npm:1.3.61" - "@swc/core-win32-arm64-msvc": "npm:1.3.61" - "@swc/core-win32-ia32-msvc": "npm:1.3.61" - "@swc/core-win32-x64-msvc": "npm:1.3.61" + "@swc/core-darwin-arm64": "npm:1.7.26" + "@swc/core-darwin-x64": "npm:1.7.26" + "@swc/core-linux-arm-gnueabihf": "npm:1.7.26" + "@swc/core-linux-arm64-gnu": "npm:1.7.26" + "@swc/core-linux-arm64-musl": "npm:1.7.26" + "@swc/core-linux-x64-gnu": "npm:1.7.26" + "@swc/core-linux-x64-musl": "npm:1.7.26" + "@swc/core-win32-arm64-msvc": "npm:1.7.26" + "@swc/core-win32-ia32-msvc": "npm:1.7.26" + "@swc/core-win32-x64-msvc": "npm:1.7.26" + "@swc/counter": "npm:^0.1.3" + "@swc/types": "npm:^0.1.12" peerDependencies: - "@swc/helpers": ^0.5.0 + "@swc/helpers": "*" dependenciesMeta: "@swc/core-darwin-arm64": optional: true @@ -3170,28 +3518,32 @@ __metadata: peerDependenciesMeta: "@swc/helpers": optional: true - checksum: 10/0ade46a42801e22a36388ab12484d0b5d6849a1a4fd4c1d1a87b3033fbfcd3cbeb04ee60762cf5b57de6f7eefc205af8a13550a3a0e3bb55428b09556035da7d + checksum: 10/8fb43420bdd1b774dc054c6629f87f733e76860b97130609c7374f3a48406bc0ae1a2dd0b3e3c10317c692b2eaa64747f1a690b309727a8d1411112e2d2a884e languageName: node linkType: hard -"@swc/helpers@npm:^0.5.1": - version: 0.5.1 - resolution: "@swc/helpers@npm:0.5.1" +"@swc/counter@npm:^0.1.3": + version: 0.1.3 + resolution: "@swc/counter@npm:0.1.3" + checksum: 10/df8f9cfba9904d3d60f511664c70d23bb323b3a0803ec9890f60133954173047ba9bdeabce28cd70ba89ccd3fd6c71c7b0bd58be85f611e1ffbe5d5c18616598 + languageName: node + linkType: hard + +"@swc/helpers@npm:0.5.13": + version: 0.5.13 + resolution: "@swc/helpers@npm:0.5.13" dependencies: tslib: "npm:^2.4.0" - checksum: 10/4954c4d2dd97bf965e863a10ffa44c3fdaf7653f2fa9ef1a6cf7ffffd67f3f832216588f9751afd75fdeaea60c4688c75c01e2405119c448f1a109c9a7958c54 + checksum: 10/6ba2f7e215d32d71fce139e2cfc426b3ed7eaa709febdeb07b97260a4c9eea4784cf047cc1271be273990b08220b576b94a42b5780947c0b3be84973a847a24d languageName: node linkType: hard -"@swc/jest@npm:^0.2.26": - version: 0.2.26 - resolution: "@swc/jest@npm:0.2.26" +"@swc/types@npm:^0.1.12": + version: 0.1.12 + resolution: "@swc/types@npm:0.1.12" dependencies: - "@jest/create-cache-key-function": "npm:^27.4.2" - jsonc-parser: "npm:^3.2.0" - peerDependencies: - "@swc/core": "*" - checksum: 10/60c3cd2f1a83b131ac47043d5e2149dfc97ec00b948313247bac26a4589ed1311135a09b41a87af5d86be3fcc3f2b6e4695f7d7fab5bbed51a235ee352d6ce10 + "@swc/counter": "npm:^0.1.3" + checksum: 10/92dbbc70cd068ea30fb6fbdc1ae8599d6c058a5d09b2923d6e4e24fab5ad7c86a19dd01f349a8e03e300a9321e06911a24df18303b40e307fbd4109372cef2ef languageName: node linkType: hard @@ -3245,10 +3597,9 @@ __metadata: dependencies: "@npmcli/run-script": "npm:3.0.1" "@tsed/eslint": "npm:5.2.10" - "@tsed/jest-config": "npm:5.2.10" "@tsed/logger": "npm:>=6.1.1" "@tsed/normalize-path": "npm:>=7.14.2" - "@tsed/typescript": "npm:5.2.10" + "@tsed/typescript": "workspace:*" "@types/axios": "npm:0.14.0" "@types/commander": "npm:2.12.2" "@types/consolidate": "npm:0.14.1" @@ -3283,7 +3634,6 @@ __metadata: handlebars-utils: "npm:1.0.6" inquirer: "npm:8.2.4" inquirer-autocomplete-prompt: "npm:2.0.0" - jest: "npm:29.5.0" js-yaml: "npm:4.1.0" listr2: "npm:5.0.5" module-alias: "npm:2.2.2" @@ -3295,9 +3645,11 @@ __metadata: split: "npm:1.0.1" tslib: "npm:2.3.1" tunnel: "npm:0.0.6" + typescript: "npm:4.9.5" update-notifier: "npm:7.1.0" url-parse: "npm:1.5.10" uuid: "npm:^8.3.2" + vitest: "npm:2.1.1" peerDependencies: "@tsed/core": ">=7.14.2" "@tsed/di": ">=7.14.2" @@ -3311,14 +3663,14 @@ __metadata: "@tsed/cli": "npm:5.2.10" "@tsed/cli-core": "npm:5.2.10" "@tsed/eslint": "npm:5.2.10" - "@tsed/jest-config": "npm:5.2.10" - "@tsed/typescript": "npm:5.2.10" + "@tsed/typescript": "workspace:*" change-case: "npm:4.1.2" cross-env: "npm:7.0.3" eslint: "npm:8.22.0" - jest: "npm:29.5.0" swagger-typescript-api: "npm:^9.3.1" tslib: "npm:2.3.1" + typescript: "npm:4.9.5" + vitest: "npm:2.1.1" peerDependencies: "@tsed/common": ">=7.14.2" "@tsed/swagger": ">=7.14.2" @@ -3338,13 +3690,13 @@ __metadata: "@tsed/cli": "npm:5.2.10" "@tsed/cli-core": "npm:5.2.10" "@tsed/eslint": "npm:5.2.10" - "@tsed/jest-config": "npm:5.2.10" - "@tsed/typescript": "npm:5.2.10" + "@tsed/typescript": "workspace:*" change-case: "npm:4.1.2" cross-env: "npm:7.0.3" eslint: "npm:8.22.0" - jest: "npm:29.5.0" tslib: "npm:2.3.1" + typescript: "npm:4.9.5" + vitest: "npm:2.1.1" peerDependencies: "@tsed/common": ">=7.14.2" "@tsed/swagger": ">=7.14.2" @@ -3363,12 +3715,12 @@ __metadata: "@tsed/cli": "npm:5.2.10" "@tsed/cli-core": "npm:5.2.10" "@tsed/eslint": "npm:5.2.10" - "@tsed/jest-config": "npm:5.2.10" - "@tsed/typescript": "npm:5.2.10" + "@tsed/typescript": "workspace:*" cross-env: "npm:7.0.3" eslint: "npm:8.22.0" - jest: "npm:29.5.0" tslib: "npm:2.3.1" + typescript: "npm:4.9.5" + vitest: "npm:2.1.1" languageName: unknown linkType: soft @@ -3379,12 +3731,12 @@ __metadata: "@tsed/cli": "npm:5.2.10" "@tsed/cli-core": "npm:5.2.10" "@tsed/eslint": "npm:5.2.10" - "@tsed/jest-config": "npm:5.2.10" - "@tsed/typescript": "npm:5.2.10" + "@tsed/typescript": "workspace:*" cross-env: "npm:7.0.3" eslint: "npm:8.22.0" - jest: "npm:29.5.0" tslib: "npm:2.3.1" + typescript: "npm:4.9.5" + vitest: "npm:2.1.1" languageName: unknown linkType: soft @@ -3395,12 +3747,12 @@ __metadata: "@tsed/cli": "npm:5.2.10" "@tsed/cli-core": "npm:5.2.10" "@tsed/eslint": "npm:5.2.10" - "@tsed/jest-config": "npm:5.2.10" - "@tsed/typescript": "npm:5.2.10" + "@tsed/typescript": "workspace:*" cross-env: "npm:7.0.3" eslint: "npm:8.22.0" - jest: "npm:29.5.0" tslib: "npm:2.3.1" + typescript: "npm:4.9.5" + vitest: "npm:2.1.1" languageName: unknown linkType: soft @@ -3411,14 +3763,14 @@ __metadata: "@tsed/cli": "npm:5.2.10" "@tsed/cli-core": "npm:5.2.10" "@tsed/eslint": "npm:5.2.10" - "@tsed/jest-config": "npm:5.2.10" - "@tsed/typescript": "npm:5.2.10" + "@tsed/typescript": "workspace:*" change-case: "npm:4.1.2" cross-env: "npm:7.0.3" eslint: "npm:8.22.0" - jest: "npm:29.5.0" pluralize: "npm:8.0.0" tslib: "npm:2.3.1" + typescript: "npm:4.9.5" + vitest: "npm:2.1.1" languageName: unknown linkType: soft @@ -3429,12 +3781,12 @@ __metadata: "@tsed/cli": "npm:5.2.10" "@tsed/cli-core": "npm:5.2.10" "@tsed/eslint": "npm:5.2.10" - "@tsed/jest-config": "npm:5.2.10" - "@tsed/typescript": "npm:5.2.10" + "@tsed/typescript": "workspace:*" cross-env: "npm:7.0.3" eslint: "npm:8.22.0" - jest: "npm:29.5.0" tslib: "npm:2.3.1" + typescript: "npm:4.9.5" + vitest: "npm:2.1.1" peerDependencies: "@tsed/cli": 5.2.10 "@tsed/cli-core": 5.2.10 @@ -3448,14 +3800,14 @@ __metadata: "@tsed/cli": "npm:5.2.10" "@tsed/cli-core": "npm:5.2.10" "@tsed/eslint": "npm:5.2.10" - "@tsed/jest-config": "npm:5.2.10" - "@tsed/typescript": "npm:5.2.10" + "@tsed/typescript": "workspace:*" "@types/change-case": "npm:^2.3.1" change-case: "npm:^4.1.2" cross-env: "npm:7.0.3" eslint: "npm:8.22.0" - jest: "npm:29.5.0" tslib: "npm:2.3.1" + typescript: "npm:4.9.5" + vitest: "npm:2.1.1" languageName: unknown linkType: soft @@ -3466,13 +3818,13 @@ __metadata: "@tsed/cli": "npm:5.2.10" "@tsed/cli-core": "npm:5.2.10" "@tsed/eslint": "npm:5.2.10" - "@tsed/jest-config": "npm:5.2.10" - "@tsed/typescript": "npm:5.2.10" + "@tsed/typescript": "workspace:*" change-case: "npm:4.1.2" cross-env: "npm:7.0.3" eslint: "npm:8.22.0" - jest: "npm:29.5.0" tslib: "npm:2.3.1" + typescript: "npm:4.9.5" + vitest: "npm:2.1.1" languageName: unknown linkType: soft @@ -3483,12 +3835,12 @@ __metadata: "@tsed/cli": "npm:5.2.10" "@tsed/cli-core": "npm:5.2.10" "@tsed/eslint": "npm:5.2.10" - "@tsed/jest-config": "npm:5.2.10" - "@tsed/typescript": "npm:5.2.10" + "@tsed/typescript": "workspace:*" cross-env: "npm:7.0.3" eslint: "npm:8.22.0" - jest: "npm:29.5.0" tslib: "npm:2.3.1" + typescript: "npm:4.9.5" + vitest: "npm:2.1.1" peerDependencies: "@tsed/cli": 5.2.10 "@tsed/cli-core": 5.2.10 @@ -3502,13 +3854,13 @@ __metadata: "@tsed/cli": "npm:5.2.10" "@tsed/cli-core": "npm:5.2.10" "@tsed/eslint": "npm:5.2.10" - "@tsed/jest-config": "npm:5.2.10" - "@tsed/typescript": "npm:5.2.10" + "@tsed/typescript": "workspace:*" change-case: "npm:4.1.2" cross-env: "npm:7.0.3" eslint: "npm:8.22.0" - jest: "npm:29.5.0" tslib: "npm:2.3.1" + typescript: "npm:4.9.5" + vitest: "npm:2.1.1" languageName: unknown linkType: soft @@ -3519,12 +3871,12 @@ __metadata: "@tsed/cli": "npm:5.2.10" "@tsed/cli-core": "npm:5.2.10" "@tsed/eslint": "npm:5.2.10" - "@tsed/jest-config": "npm:5.2.10" - "@tsed/typescript": "npm:5.2.10" + "@tsed/typescript": "workspace:*" cross-env: "npm:7.0.3" eslint: "npm:8.22.0" - jest: "npm:29.5.0" tslib: "npm:2.3.1" + typescript: "npm:4.9.5" + vitest: "npm:2.1.1" languageName: unknown linkType: soft @@ -3535,9 +3887,8 @@ __metadata: "@commitlint/cli": "npm:^17.0.3" "@commitlint/config-conventional": "npm:^17.0.3" "@samverschueren/stream-to-observable": "npm:0.3.1" - "@swc/core": "npm:^1.3.61" - "@swc/helpers": "npm:^0.5.1" - "@swc/jest": "npm:^0.2.26" + "@swc/core": "npm:1.7.26" + "@swc/helpers": "npm:0.5.13" "@tsed/core": "npm:>=7.14.2" "@tsed/di": "npm:>=7.14.2" "@tsed/logger": "npm:>=6.2.1" @@ -3545,10 +3896,10 @@ __metadata: "@tsed/monorepo-utils": "npm:2.3.5" "@tsed/normalize-path": "npm:>=7.14.2" "@tsed/ts-doc": "npm:^4.1.0" - "@types/jest": "npm:28.1.7" "@types/node": "npm:18.7.8" "@typescript-eslint/eslint-plugin": "npm:^5.33.1" "@typescript-eslint/parser": "npm:^5.33.1" + "@vitest/coverage-v8": "npm:^2.1.1" any-observable: "npm:0.5.1" axios: "npm:1.6.7" chalk: "npm:4.1.0" @@ -3560,7 +3911,6 @@ __metadata: entities: "npm:1.1.2" eslint: "npm:8.22.0" eslint-config-prettier: "npm:8.5.0" - eslint-plugin-jest: "npm:27.1.6" eslint-plugin-mocha: "npm:10.1.0" eslint-plugin-prettier: "npm:4.2.1" eslint-plugin-workspaces: "npm:0.8.0" @@ -3574,8 +3924,6 @@ __metadata: inquirer: "npm:8.2.4" inquirer-autocomplete-prompt: "npm:2.0.0" is-ci: "npm:3.0.1" - jest: "npm:29.5.0" - jest-coverage-thresholds-bumper: "npm:1.1.0" js-yaml: "npm:4.1.0" lerna: "npm:5.4.3" lint-staged: "npm:13.0.3" @@ -3597,7 +3945,9 @@ __metadata: tsconfig-paths: "npm:4.1.2" tslib: "npm:2.3.1" typescript: "npm:4.9.5" + unplugin-swc: "npm:^1.5.1" update-notifier: "npm:5.1.0" + vitest: "npm:2.1.1" languageName: unknown linkType: soft @@ -3607,12 +3957,12 @@ __metadata: dependencies: "@tsed/cli-core": "npm:5.2.10" "@tsed/eslint": "npm:5.2.10" - "@tsed/jest-config": "npm:5.2.10" - "@tsed/typescript": "npm:5.2.10" + "@tsed/typescript": "workspace:*" cross-env: "npm:7.0.3" eslint: "npm:8.22.0" - jest: "npm:29.5.0" tslib: "npm:2.3.1" + typescript: "npm:4.9.5" + vitest: "npm:2.1.1" languageName: unknown linkType: soft @@ -3624,23 +3974,23 @@ __metadata: "@tsed/core": "npm:>=7.14.2" "@tsed/di": "npm:>=7.14.2" "@tsed/eslint": "npm:5.2.10" - "@tsed/jest-config": "npm:5.2.10" "@tsed/logger": "npm:>=6.2.1" "@tsed/openspec": "npm:>=7.14.2" "@tsed/schema": "npm:>=7.14.2" - "@tsed/typescript": "npm:5.2.10" + "@tsed/typescript": "workspace:*" "@types/change-case": "npm:^2.3.1" chalk: "npm:4.1.2" change-case: "npm:4.1.2" cross-env: "npm:7.0.3" eslint: "npm:8.22.0" globby: "npm:11.1.0" - jest: "npm:29.5.0" module-alias: "npm:^2.2.2" normalize-path: "npm:3.0.0" read-pkg-up: "npm:7.0.1" semver: "npm:^7.3.5" tslib: "npm:2.3.1" + typescript: "npm:4.9.5" + vitest: "npm:2.1.1" peerDependencies: "@tsed/cli-core": 5.2.10 "@tsed/core": ">=7.14.2" @@ -3686,16 +4036,6 @@ __metadata: "@tsed/eslint@npm:5.2.10, @tsed/eslint@workspace:tools/eslint": version: 0.0.0-use.local resolution: "@tsed/eslint@workspace:tools/eslint" - dependencies: - "@tsed/jest-config": "npm:5.2.10" - cross-env: "npm:7.0.3" - jest: "npm:29.5.0" - languageName: unknown - linkType: soft - -"@tsed/jest-config@npm:5.2.10, @tsed/jest-config@workspace:tools/jest": - version: 0.0.0-use.local - resolution: "@tsed/jest-config@workspace:tools/jest" dependencies: cross-env: "npm:7.0.3" jest: "npm:29.5.0" @@ -3813,13 +4153,17 @@ __metadata: languageName: node linkType: hard -"@tsed/typescript@npm:5.2.10, @tsed/typescript@workspace:tools/typescript": +"@tsed/typescript@workspace:*, @tsed/typescript@workspace:tools/typescript": version: 0.0.0-use.local resolution: "@tsed/typescript@workspace:tools/typescript" + languageName: unknown + linkType: soft + +"@tsed/vitest@workspace:tools/vitest": + version: 0.0.0-use.local + resolution: "@tsed/vitest@workspace:tools/vitest" dependencies: - "@tsed/jest-config": "npm:5.2.10" - cross-env: "npm:7.0.3" - jest: "npm:29.5.0" + vitest: "npm:2.0.5" languageName: unknown linkType: soft @@ -3932,6 +4276,13 @@ __metadata: languageName: node linkType: hard +"@types/estree@npm:1.0.5, @types/estree@npm:^1.0.0": + version: 1.0.5 + resolution: "@types/estree@npm:1.0.5" + checksum: 10/7de6d928dd4010b0e20c6919e1a6c27b61f8d4567befa89252055fad503d587ecb9a1e3eab1b1901f923964d7019796db810b7fd6430acb26c32866d126fd408 + languageName: node + linkType: hard + "@types/figures@npm:3.0.1": version: 3.0.1 resolution: "@types/figures@npm:3.0.1" @@ -4012,16 +4363,6 @@ __metadata: languageName: node linkType: hard -"@types/jest@npm:28.1.7": - version: 28.1.7 - resolution: "@types/jest@npm:28.1.7" - dependencies: - expect: "npm:^28.0.0" - pretty-format: "npm:^28.0.0" - checksum: 10/07cda8ee8ad7db8946883091c1516cf6fa8816471172957423543b5d24e59bfc75ff14c50f2b15d34df1e6df5ff8139a98f3d33317e4c18eb9bcc5c9e4ba9157 - languageName: node - linkType: hard - "@types/js-yaml@npm:4.0.5": version: 4.0.5 resolution: "@types/js-yaml@npm:4.0.5" @@ -4212,15 +4553,6 @@ __metadata: languageName: node linkType: hard -"@types/yargs@npm:^16.0.0": - version: 16.0.5 - resolution: "@types/yargs@npm:16.0.5" - dependencies: - "@types/yargs-parser": "npm:*" - checksum: 10/9673a69487768dad14e805777bca262f7a5774d3a0964981105ffc04ff95e754f1109fa2c8210a0fe863f263c580ddf667e1345f22e018036513245b3dc3c71c - languageName: node - linkType: hard - "@types/yargs@npm:^17.0.8": version: 17.0.10 resolution: "@types/yargs@npm:17.0.10" @@ -4383,7 +4715,7 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/utils@npm:5.36.1, @typescript-eslint/utils@npm:^5.10.0": +"@typescript-eslint/utils@npm:5.36.1": version: 5.36.1 resolution: "@typescript-eslint/utils@npm:5.36.1" dependencies: @@ -4429,6 +4761,177 @@ __metadata: languageName: node linkType: hard +"@vitest/coverage-v8@npm:^2.1.1": + version: 2.1.1 + resolution: "@vitest/coverage-v8@npm:2.1.1" + dependencies: + "@ampproject/remapping": "npm:^2.3.0" + "@bcoe/v8-coverage": "npm:^0.2.3" + debug: "npm:^4.3.6" + istanbul-lib-coverage: "npm:^3.2.2" + istanbul-lib-report: "npm:^3.0.1" + istanbul-lib-source-maps: "npm:^5.0.6" + istanbul-reports: "npm:^3.1.7" + magic-string: "npm:^0.30.11" + magicast: "npm:^0.3.4" + std-env: "npm:^3.7.0" + test-exclude: "npm:^7.0.1" + tinyrainbow: "npm:^1.2.0" + peerDependencies: + "@vitest/browser": 2.1.1 + vitest: 2.1.1 + peerDependenciesMeta: + "@vitest/browser": + optional: true + checksum: 10/f53e4ce5174b88007428faa0d253c62ed7cab6186172691f43e8a2fd2b7b569e8b06f92fd783f34c52f1251e7b5943be58515588b0634155be9c6a234b412b5b + languageName: node + linkType: hard + +"@vitest/expect@npm:2.0.5": + version: 2.0.5 + resolution: "@vitest/expect@npm:2.0.5" + dependencies: + "@vitest/spy": "npm:2.0.5" + "@vitest/utils": "npm:2.0.5" + chai: "npm:^5.1.1" + tinyrainbow: "npm:^1.2.0" + checksum: 10/ca9a218f50254b2259fd16166b2d8c9ccc8ee2cc068905e6b3d6281da10967b1590cc7d34b5fa9d429297f97e740450233745583b4cc12272ff11705faf70a37 + languageName: node + linkType: hard + +"@vitest/expect@npm:2.1.1": + version: 2.1.1 + resolution: "@vitest/expect@npm:2.1.1" + dependencies: + "@vitest/spy": "npm:2.1.1" + "@vitest/utils": "npm:2.1.1" + chai: "npm:^5.1.1" + tinyrainbow: "npm:^1.2.0" + checksum: 10/ece8d7f9e0c083c5cf30c0df9e052bba4402649736293a18e56a8db4be46a847b18dc7b33cdd1c08bea51bf6f2cb021e40e7227d9cfc24fdba4a955bffe371a2 + languageName: node + linkType: hard + +"@vitest/mocker@npm:2.1.1": + version: 2.1.1 + resolution: "@vitest/mocker@npm:2.1.1" + dependencies: + "@vitest/spy": "npm:^2.1.0-beta.1" + estree-walker: "npm:^3.0.3" + magic-string: "npm:^0.30.11" + peerDependencies: + "@vitest/spy": 2.1.1 + msw: ^2.3.5 + vite: ^5.0.0 + peerDependenciesMeta: + msw: + optional: true + vite: + optional: true + checksum: 10/4fbdaac36e3f603235b131e25d9e561381bd989a34e49522e16652077021532ae6653907b47bbca93c14ae4629e3e6a8f61438e3812620dc5654b61595b45208 + languageName: node + linkType: hard + +"@vitest/pretty-format@npm:2.0.5": + version: 2.0.5 + resolution: "@vitest/pretty-format@npm:2.0.5" + dependencies: + tinyrainbow: "npm:^1.2.0" + checksum: 10/70bf452dd0b8525e658795125b3f11110bd6baadfaa38c5bb91ca763bded35ec6dc80e27964ad4e91b91be6544d35e18ea7748c1997693988f975a7283c3e9a0 + languageName: node + linkType: hard + +"@vitest/pretty-format@npm:2.1.1, @vitest/pretty-format@npm:^2.0.5, @vitest/pretty-format@npm:^2.1.1": + version: 2.1.1 + resolution: "@vitest/pretty-format@npm:2.1.1" + dependencies: + tinyrainbow: "npm:^1.2.0" + checksum: 10/744278a3a91d080e51a94b03eaf7cf43779978d6391060cbfdda6d03194eef744ce8f12a2fe2fa90a9bf9b9f038d4c4c4d88f6192f042c88c5ee4125f38bf892 + languageName: node + linkType: hard + +"@vitest/runner@npm:2.0.5": + version: 2.0.5 + resolution: "@vitest/runner@npm:2.0.5" + dependencies: + "@vitest/utils": "npm:2.0.5" + pathe: "npm:^1.1.2" + checksum: 10/464449abb84b3c779e1c6d1bedfc9e7469240ba3ccc4b4fa884386d1752d6572b68b9a87440159d433f17f61aca4012ee3bb78a3718d0e2bc64d810e9fc574a5 + languageName: node + linkType: hard + +"@vitest/runner@npm:2.1.1": + version: 2.1.1 + resolution: "@vitest/runner@npm:2.1.1" + dependencies: + "@vitest/utils": "npm:2.1.1" + pathe: "npm:^1.1.2" + checksum: 10/cf13a2f0bebb494484e60614ff0e7cab06f4310b36c96fe311035ab2eec9cbc057fa5702e904d43e8976fb2214fe550286ceb0b3dc1c72081e23eb1b1f8fa193 + languageName: node + linkType: hard + +"@vitest/snapshot@npm:2.0.5": + version: 2.0.5 + resolution: "@vitest/snapshot@npm:2.0.5" + dependencies: + "@vitest/pretty-format": "npm:2.0.5" + magic-string: "npm:^0.30.10" + pathe: "npm:^1.1.2" + checksum: 10/fb46bc65851d4c8dcbbf86279c4146d5e7c17ad0d1be97132dedd98565d37f70ac8b0bf51ead0c6707786ffb15652535398c14d4304fa2146b0393d3db26fdff + languageName: node + linkType: hard + +"@vitest/snapshot@npm:2.1.1": + version: 2.1.1 + resolution: "@vitest/snapshot@npm:2.1.1" + dependencies: + "@vitest/pretty-format": "npm:2.1.1" + magic-string: "npm:^0.30.11" + pathe: "npm:^1.1.2" + checksum: 10/820f429d950cf63316464e7f2bc1f0ba4b7d2691c51f6ad03ba1c6edc7dbdc6a86b017c082f2a519b743ae53880b41366bbb596c8b43cf8cd68032f9433ec844 + languageName: node + linkType: hard + +"@vitest/spy@npm:2.0.5": + version: 2.0.5 + resolution: "@vitest/spy@npm:2.0.5" + dependencies: + tinyspy: "npm:^3.0.0" + checksum: 10/ed19f4c3bb4d3853241e8070979615138e24403ce4c137fa48c903b3af2c8b3ada2cc26aca9c1aa323bb314a457a8130a29acbb18dafd4e42737deefb2abf1ca + languageName: node + linkType: hard + +"@vitest/spy@npm:2.1.1, @vitest/spy@npm:^2.1.0-beta.1": + version: 2.1.1 + resolution: "@vitest/spy@npm:2.1.1" + dependencies: + tinyspy: "npm:^3.0.0" + checksum: 10/47e83b4a3d091c4fdc2fbf861ccf2df697d3446a6c69d384b168f9c3e0fa1cabec03e52cc8bec1909735969176ac6272cc4dee8dda945ff059183a5c4568a488 + languageName: node + linkType: hard + +"@vitest/utils@npm:2.0.5": + version: 2.0.5 + resolution: "@vitest/utils@npm:2.0.5" + dependencies: + "@vitest/pretty-format": "npm:2.0.5" + estree-walker: "npm:^3.0.3" + loupe: "npm:^3.1.1" + tinyrainbow: "npm:^1.2.0" + checksum: 10/d631d56d29c33bc8de631166b2b6691c470187a345469dfef7048befe6027e1c6ff9552f2ee11c8a247522c325c4a64bfcc73f8f0f0c525da39cb9f190f119f8 + languageName: node + linkType: hard + +"@vitest/utils@npm:2.1.1": + version: 2.1.1 + resolution: "@vitest/utils@npm:2.1.1" + dependencies: + "@vitest/pretty-format": "npm:2.1.1" + loupe: "npm:^3.1.1" + tinyrainbow: "npm:^1.2.0" + checksum: 10/605f1807c343ac01cde053b062bda8f0cc51b321a3cd9c751424a1e24549a35120896bd58612a14f068460242013f69e08fc0a69355387e981a5a50bce9ae04e + languageName: node + linkType: hard + "@yarnpkg/lockfile@npm:^1.1.0": version: 1.1.0 resolution: "@yarnpkg/lockfile@npm:1.1.0" @@ -4499,6 +5002,15 @@ __metadata: languageName: node linkType: hard +"acorn@npm:^8.12.1": + version: 8.12.1 + resolution: "acorn@npm:8.12.1" + bin: + acorn: bin/acorn + checksum: 10/d08c2d122bba32d0861e0aa840b2ee25946c286d5dc5990abca991baf8cdbfbe199b05aacb221b979411a2fea36f83e26b5ac4f6b4e0ce49038c62316c1848f0 + languageName: node + linkType: hard + "acorn@npm:^8.4.1, acorn@npm:^8.8.0": version: 8.8.0 resolution: "acorn@npm:8.8.0" @@ -5203,6 +5715,13 @@ __metadata: languageName: node linkType: hard +"assertion-error@npm:^2.0.1": + version: 2.0.1 + resolution: "assertion-error@npm:2.0.1" + checksum: 10/a0789dd882211b87116e81e2648ccb7f60340b34f19877dd020b39ebb4714e475eb943e14ba3e22201c221ef6645b7bfe10297e76b6ac95b48a9898c1211ce66 + languageName: node + linkType: hard + "assign-symbols@npm:^1.0.0": version: 1.0.0 resolution: "assign-symbols@npm:1.0.0" @@ -5660,6 +6179,13 @@ __metadata: languageName: node linkType: hard +"cac@npm:^6.7.14": + version: 6.7.14 + resolution: "cac@npm:6.7.14" + checksum: 10/002769a0fbfc51c062acd2a59df465a2a947916b02ac50b56c69ec6c018ee99ac3e7f4dd7366334ea847f1ecacf4defaa61bcd2ac283db50156ce1f1d8c8ad42 + languageName: node + linkType: hard + "cacache@npm:^16.0.0, cacache@npm:^16.0.6": version: 16.1.3 resolution: "cacache@npm:16.1.3" @@ -5863,6 +6389,19 @@ __metadata: languageName: node linkType: hard +"chai@npm:^5.1.1": + version: 5.1.1 + resolution: "chai@npm:5.1.1" + dependencies: + assertion-error: "npm:^2.0.1" + check-error: "npm:^2.1.1" + deep-eql: "npm:^5.0.1" + loupe: "npm:^3.1.0" + pathval: "npm:^2.0.0" + checksum: 10/ee67279a5613bd36dc1dc13660042429ae2f1dc5a9030a6abcf381345866dfb5bce7bc10b9d74c8de86b6f656489f654bbbef3f3361e06925591e6a00c72afff + languageName: node + linkType: hard + "chalk@npm:3.0.0, chalk@npm:^3.0.0": version: 3.0.0 resolution: "chalk@npm:3.0.0" @@ -5986,6 +6525,13 @@ __metadata: languageName: node linkType: hard +"check-error@npm:^2.1.1": + version: 2.1.1 + resolution: "check-error@npm:2.1.1" + checksum: 10/d785ed17b1d4a4796b6e75c765a9a290098cf52ff9728ce0756e8ffd4293d2e419dd30c67200aee34202463b474306913f2fcfaf1890641026d9fc6966fea27a + languageName: node + linkType: hard + "chownr@npm:^2.0.0": version: 2.0.0 resolution: "chownr@npm:2.0.0" @@ -7144,6 +7690,18 @@ __metadata: languageName: node linkType: hard +"debug@npm:^4.3.5, debug@npm:^4.3.6": + version: 4.3.7 + resolution: "debug@npm:4.3.7" + dependencies: + ms: "npm:^2.1.3" + peerDependenciesMeta: + supports-color: + optional: true + checksum: 10/71168908b9a78227ab29d5d25fe03c5867750e31ce24bf2c44a86efc5af041758bb56569b0a3d48a9b5344c00a24a777e6f4100ed6dfd9534a42c1dde285125a + languageName: node + linkType: hard + "debug@npm:~3.1.0": version: 3.1.0 resolution: "debug@npm:3.1.0" @@ -7200,6 +7758,13 @@ __metadata: languageName: node linkType: hard +"deep-eql@npm:^5.0.1": + version: 5.0.2 + resolution: "deep-eql@npm:5.0.2" + checksum: 10/a529b81e2ef8821621d20a36959a0328873a3e49d393ad11f8efe8559f31239494c2eb889b80342808674c475802ba95b9d6c4c27641b9a029405104c1b59fcf + languageName: node + linkType: hard + "deep-extend@npm:^0.6.0": version: 0.6.0 resolution: "deep-extend@npm:0.6.0" @@ -7387,13 +7952,6 @@ __metadata: languageName: node linkType: hard -"diff-sequences@npm:^28.1.1": - version: 28.1.1 - resolution: "diff-sequences@npm:28.1.1" - checksum: 10/89752708215cf0d13ec98cb3cded36154951beec9ac8c23d5a665498ba880e1e3aad544ad046ad5223c141fc35b362665fae534e14a253654da77b514a28438d - languageName: node - linkType: hard - "diff-sequences@npm:^29.4.3": version: 29.4.3 resolution: "diff-sequences@npm:29.4.3" @@ -7701,6 +8259,86 @@ __metadata: languageName: node linkType: hard +"esbuild@npm:^0.21.3": + version: 0.21.5 + resolution: "esbuild@npm:0.21.5" + dependencies: + "@esbuild/aix-ppc64": "npm:0.21.5" + "@esbuild/android-arm": "npm:0.21.5" + "@esbuild/android-arm64": "npm:0.21.5" + "@esbuild/android-x64": "npm:0.21.5" + "@esbuild/darwin-arm64": "npm:0.21.5" + "@esbuild/darwin-x64": "npm:0.21.5" + "@esbuild/freebsd-arm64": "npm:0.21.5" + "@esbuild/freebsd-x64": "npm:0.21.5" + "@esbuild/linux-arm": "npm:0.21.5" + "@esbuild/linux-arm64": "npm:0.21.5" + "@esbuild/linux-ia32": "npm:0.21.5" + "@esbuild/linux-loong64": "npm:0.21.5" + "@esbuild/linux-mips64el": "npm:0.21.5" + "@esbuild/linux-ppc64": "npm:0.21.5" + "@esbuild/linux-riscv64": "npm:0.21.5" + "@esbuild/linux-s390x": "npm:0.21.5" + "@esbuild/linux-x64": "npm:0.21.5" + "@esbuild/netbsd-x64": "npm:0.21.5" + "@esbuild/openbsd-x64": "npm:0.21.5" + "@esbuild/sunos-x64": "npm:0.21.5" + "@esbuild/win32-arm64": "npm:0.21.5" + "@esbuild/win32-ia32": "npm:0.21.5" + "@esbuild/win32-x64": "npm:0.21.5" + dependenciesMeta: + "@esbuild/aix-ppc64": + optional: true + "@esbuild/android-arm": + optional: true + "@esbuild/android-arm64": + optional: true + "@esbuild/android-x64": + optional: true + "@esbuild/darwin-arm64": + optional: true + "@esbuild/darwin-x64": + optional: true + "@esbuild/freebsd-arm64": + optional: true + "@esbuild/freebsd-x64": + optional: true + "@esbuild/linux-arm": + optional: true + "@esbuild/linux-arm64": + optional: true + "@esbuild/linux-ia32": + optional: true + "@esbuild/linux-loong64": + optional: true + "@esbuild/linux-mips64el": + optional: true + "@esbuild/linux-ppc64": + optional: true + "@esbuild/linux-riscv64": + optional: true + "@esbuild/linux-s390x": + optional: true + "@esbuild/linux-x64": + optional: true + "@esbuild/netbsd-x64": + optional: true + "@esbuild/openbsd-x64": + optional: true + "@esbuild/sunos-x64": + optional: true + "@esbuild/win32-arm64": + optional: true + "@esbuild/win32-ia32": + optional: true + "@esbuild/win32-x64": + optional: true + bin: + esbuild: bin/esbuild + checksum: 10/d2ff2ca84d30cce8e871517374d6c2290835380dc7cd413b2d49189ed170d45e407be14de2cb4794cf76f75cf89955c4714726ebd3de7444b3046f5cab23ab6b + languageName: node + linkType: hard + "escalade@npm:^3.1.1": version: 3.1.1 resolution: "escalade@npm:3.1.1" @@ -7761,23 +8399,6 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-jest@npm:27.1.6": - version: 27.1.6 - resolution: "eslint-plugin-jest@npm:27.1.6" - dependencies: - "@typescript-eslint/utils": "npm:^5.10.0" - peerDependencies: - "@typescript-eslint/eslint-plugin": ^5.0.0 - eslint: ^7.0.0 || ^8.0.0 - peerDependenciesMeta: - "@typescript-eslint/eslint-plugin": - optional: true - jest: - optional: true - checksum: 10/60d451bbcd80a6c70761af7861ec305ef3a63b85505edc272a9437e4f4d6e11afcf5bf1e63469f7ca91160d41e42e681ce07b37d1ceaaa20d05fef0fd940ce6e - languageName: node - linkType: hard - "eslint-plugin-mocha@npm:10.1.0": version: 10.1.0 resolution: "eslint-plugin-mocha@npm:10.1.0" @@ -7968,6 +8589,22 @@ __metadata: languageName: node linkType: hard +"estree-walker@npm:^2.0.2": + version: 2.0.2 + resolution: "estree-walker@npm:2.0.2" + checksum: 10/b02109c5d46bc2ed47de4990eef770f7457b1159a229f0999a09224d2b85ffeed2d7679cffcff90aeb4448e94b0168feb5265b209cdec29aad50a3d6e93d21e2 + languageName: node + linkType: hard + +"estree-walker@npm:^3.0.3": + version: 3.0.3 + resolution: "estree-walker@npm:3.0.3" + dependencies: + "@types/estree": "npm:^1.0.0" + checksum: 10/a65728d5727b71de172c5df323385755a16c0fdab8234dc756c3854cfee343261ddfbb72a809a5660fac8c75d960bb3e21aa898c2d7e9b19bb298482ca58a3af + languageName: node + linkType: hard + "esutils@npm:^2.0.2": version: 2.0.3 resolution: "esutils@npm:2.0.3" @@ -8013,7 +8650,7 @@ __metadata: languageName: node linkType: hard -"execa@npm:>=8.0.1, execa@npm:^8.0.0": +"execa@npm:>=8.0.1, execa@npm:^8.0.0, execa@npm:^8.0.1": version: 8.0.1 resolution: "execa@npm:8.0.1" dependencies: @@ -8118,19 +8755,6 @@ __metadata: languageName: node linkType: hard -"expect@npm:^28.0.0": - version: 28.1.3 - resolution: "expect@npm:28.1.3" - dependencies: - "@jest/expect-utils": "npm:^28.1.3" - jest-get-type: "npm:^28.0.2" - jest-matcher-utils: "npm:^28.1.3" - jest-message-util: "npm:^28.1.3" - jest-util: "npm:^28.1.3" - checksum: 10/87033c88f7a578063ae7de98000fbd423bdb751756b1c6a1c69cd2b093bdb8b11a5b7a66eb89984068850d14978c7daffc2cc8ed56eb912424c24885a7573061 - languageName: node - linkType: hard - "expect@npm:^29.5.0": version: 29.5.0 resolution: "expect@npm:29.5.0" @@ -8742,6 +9366,16 @@ __metadata: languageName: node linkType: hard +"fsevents@npm:~2.3.2, fsevents@npm:~2.3.3": + version: 2.3.3 + resolution: "fsevents@npm:2.3.3" + dependencies: + node-gyp: "npm:latest" + checksum: 10/4c1ade961ded57cdbfbb5cac5106ec17bc8bccd62e16343c569a0ceeca83b9dfef87550b4dc5cbb89642da412b20c5071f304c8c464b80415446e8e155a038c0 + conditions: os=darwin + languageName: node + linkType: hard + "fsevents@patch:fsevents@npm%3A^2.3.2#optional!builtin": version: 2.3.2 resolution: "fsevents@patch:fsevents@npm%3A2.3.2#optional!builtin::version=2.3.2&hash=df0bf1" @@ -8751,6 +9385,15 @@ __metadata: languageName: node linkType: hard +"fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin, fsevents@patch:fsevents@npm%3A~2.3.3#optional!builtin": + version: 2.3.3 + resolution: "fsevents@patch:fsevents@npm%3A2.3.3#optional!builtin::version=2.3.3&hash=df0bf1" + dependencies: + node-gyp: "npm:latest" + conditions: os=darwin + languageName: node + linkType: hard + "function-bind@npm:^1.1.1": version: 1.1.1 resolution: "function-bind@npm:1.1.1" @@ -8825,6 +9468,13 @@ __metadata: languageName: node linkType: hard +"get-func-name@npm:^2.0.1": + version: 2.0.2 + resolution: "get-func-name@npm:2.0.2" + checksum: 10/3f62f4c23647de9d46e6f76d2b3eafe58933a9b3830c60669e4180d6c601ce1b4aa310ba8366143f55e52b139f992087a9f0647274e8745621fa2af7e0acf13b + languageName: node + linkType: hard + "get-intrinsic@npm:^1.1.1": version: 1.1.1 resolution: "get-intrinsic@npm:1.1.1" @@ -9133,6 +9783,22 @@ __metadata: languageName: node linkType: hard +"glob@npm:^10.4.1": + version: 10.4.5 + resolution: "glob@npm:10.4.5" + dependencies: + foreground-child: "npm:^3.1.0" + jackspeak: "npm:^3.1.2" + minimatch: "npm:^9.0.4" + minipass: "npm:^7.1.2" + package-json-from-dist: "npm:^1.0.0" + path-scurry: "npm:^1.11.1" + bin: + glob: dist/esm/bin.mjs + checksum: 10/698dfe11828b7efd0514cd11e573eaed26b2dff611f0400907281ce3eab0c1e56143ef9b35adc7c77ecc71fba74717b510c7c223d34ca8a98ec81777b293d4ac + languageName: node + linkType: hard + "glob@npm:^7.1.2, glob@npm:^7.1.3, glob@npm:^7.1.4": version: 7.2.3 resolution: "glob@npm:7.2.3" @@ -10827,6 +11493,13 @@ __metadata: languageName: node linkType: hard +"istanbul-lib-coverage@npm:^3.2.2": + version: 3.2.2 + resolution: "istanbul-lib-coverage@npm:3.2.2" + checksum: 10/40bbdd1e937dfd8c830fa286d0f665e81b7a78bdabcd4565f6d5667c99828bda3db7fb7ac6b96a3e2e8a2461ddbc5452d9f8bc7d00cb00075fa6a3e99f5b6a81 + languageName: node + linkType: hard + "istanbul-lib-instrument@npm:^5.0.4, istanbul-lib-instrument@npm:^5.1.0": version: 5.2.0 resolution: "istanbul-lib-instrument@npm:5.2.0" @@ -10851,6 +11524,17 @@ __metadata: languageName: node linkType: hard +"istanbul-lib-report@npm:^3.0.1": + version: 3.0.1 + resolution: "istanbul-lib-report@npm:3.0.1" + dependencies: + istanbul-lib-coverage: "npm:^3.0.0" + make-dir: "npm:^4.0.0" + supports-color: "npm:^7.1.0" + checksum: 10/86a83421ca1cf2109a9f6d193c06c31ef04a45e72a74579b11060b1e7bb9b6337a4e6f04abfb8857e2d569c271273c65e855ee429376a0d7c91ad91db42accd1 + languageName: node + linkType: hard + "istanbul-lib-source-maps@npm:^4.0.0": version: 4.0.1 resolution: "istanbul-lib-source-maps@npm:4.0.1" @@ -10862,6 +11546,17 @@ __metadata: languageName: node linkType: hard +"istanbul-lib-source-maps@npm:^5.0.6": + version: 5.0.6 + resolution: "istanbul-lib-source-maps@npm:5.0.6" + dependencies: + "@jridgewell/trace-mapping": "npm:^0.3.23" + debug: "npm:^4.1.1" + istanbul-lib-coverage: "npm:^3.0.0" + checksum: 10/569dd0a392ee3464b1fe1accbaef5cc26de3479eacb5b91d8c67ebb7b425d39fd02247d85649c3a0e9c29b600809fa60b5af5a281a75a89c01f385b1e24823a2 + languageName: node + linkType: hard + "istanbul-reports@npm:^3.1.3": version: 3.1.4 resolution: "istanbul-reports@npm:3.1.4" @@ -10872,6 +11567,16 @@ __metadata: languageName: node linkType: hard +"istanbul-reports@npm:^3.1.7": + version: 3.1.7 + resolution: "istanbul-reports@npm:3.1.7" + dependencies: + html-escaper: "npm:^2.0.0" + istanbul-lib-report: "npm:^3.0.0" + checksum: 10/f1faaa4684efaf57d64087776018d7426312a59aa6eeb4e0e3a777347d23cd286ad18f427e98f0e3dee666103d7404c9d7abc5f240406a912fa16bd6695437fa + languageName: node + linkType: hard + "jackspeak@npm:^2.3.5": version: 2.3.6 resolution: "jackspeak@npm:2.3.6" @@ -10885,6 +11590,19 @@ __metadata: languageName: node linkType: hard +"jackspeak@npm:^3.1.2": + version: 3.4.3 + resolution: "jackspeak@npm:3.4.3" + dependencies: + "@isaacs/cliui": "npm:^8.0.2" + "@pkgjs/parseargs": "npm:^0.11.0" + dependenciesMeta: + "@pkgjs/parseargs": + optional: true + checksum: 10/96f8786eaab98e4bf5b2a5d6d9588ea46c4d06bbc4f2eb861fdd7b6b182b16f71d8a70e79820f335d52653b16d4843b29dd9cdcf38ae80406756db9199497cf3 + languageName: node + linkType: hard + "java-properties@npm:^1.0.2": version: 1.0.2 resolution: "java-properties@npm:1.0.2" @@ -10987,34 +11705,11 @@ __metadata: "@types/node": "*" ts-node: ">=9.0.0" peerDependenciesMeta: - "@types/node": - optional: true - ts-node: - optional: true - checksum: 10/f161fe2cd9e54884a19a8acd82cdb4cd5078174bc5a1a210fe587b8761d14941b15834ce7486b6b46d14b63394657656a258b01e4d07801641d1c8b38168d6a9 - languageName: node - linkType: hard - -"jest-coverage-thresholds-bumper@npm:1.1.0": - version: 1.1.0 - resolution: "jest-coverage-thresholds-bumper@npm:1.1.0" - dependencies: - yargs: "npm:^17.3.1" - bin: - jest-coverage-thresholds-bumper: index.js - checksum: 10/d906c0e5f9bca10bca67d24dfa002df72e22d6e1bbe296abbe762c0cc1e1ed62e7f4dd659c956f751bb14dbf75f13b19d2462c10ba491a23c87753867c3452ab - languageName: node - linkType: hard - -"jest-diff@npm:^28.1.3": - version: 28.1.3 - resolution: "jest-diff@npm:28.1.3" - dependencies: - chalk: "npm:^4.0.0" - diff-sequences: "npm:^28.1.1" - jest-get-type: "npm:^28.0.2" - pretty-format: "npm:^28.1.3" - checksum: 10/42b8d82c59df879b2cfdf3583fecd40c31ce8c9364644d8d430f5bd533a32e475ca0b383b7a744293332008c50f7901bedeac73c60463ac9e7e2b80249e1325c + "@types/node": + optional: true + ts-node: + optional: true + checksum: 10/f161fe2cd9e54884a19a8acd82cdb4cd5078174bc5a1a210fe587b8761d14941b15834ce7486b6b46d14b63394657656a258b01e4d07801641d1c8b38168d6a9 languageName: node linkType: hard @@ -11066,13 +11761,6 @@ __metadata: languageName: node linkType: hard -"jest-get-type@npm:^28.0.2": - version: 28.0.2 - resolution: "jest-get-type@npm:28.0.2" - checksum: 10/5281d7c89bc8156605f6d15784f45074f4548501195c26e9b188742768f72d40948252d13230ea905b5349038865a1a8eeff0e614cc530ff289dfc41fe843abd - languageName: node - linkType: hard - "jest-get-type@npm:^29.4.3": version: 29.4.3 resolution: "jest-get-type@npm:29.4.3" @@ -11113,18 +11801,6 @@ __metadata: languageName: node linkType: hard -"jest-matcher-utils@npm:^28.1.3": - version: 28.1.3 - resolution: "jest-matcher-utils@npm:28.1.3" - dependencies: - chalk: "npm:^4.0.0" - jest-diff: "npm:^28.1.3" - jest-get-type: "npm:^28.0.2" - pretty-format: "npm:^28.1.3" - checksum: 10/958f4bacdaee6949f1d1da413129f2249083bc6fa3f4ac5c559795b370aec7159f99f02340f706cc895b90938c2bafe1aab347c9a34f8819c59afd1a4cd6c009 - languageName: node - linkType: hard - "jest-matcher-utils@npm:^29.5.0": version: 29.5.0 resolution: "jest-matcher-utils@npm:29.5.0" @@ -11137,23 +11813,6 @@ __metadata: languageName: node linkType: hard -"jest-message-util@npm:^28.1.3": - version: 28.1.3 - resolution: "jest-message-util@npm:28.1.3" - dependencies: - "@babel/code-frame": "npm:^7.12.13" - "@jest/types": "npm:^28.1.3" - "@types/stack-utils": "npm:^2.0.0" - chalk: "npm:^4.0.0" - graceful-fs: "npm:^4.2.9" - micromatch: "npm:^4.0.4" - pretty-format: "npm:^28.1.3" - slash: "npm:^3.0.0" - stack-utils: "npm:^2.0.3" - checksum: 10/91137a507e9eb79ef6156a3d17c882a181fa662da28cc1a86245ff53ba13726653c8d5fed2660e922aae020a9caca4d22c3689bfe61a215c8a17a43e01b7eb5c - languageName: node - linkType: hard - "jest-message-util@npm:^29.5.0": version: 29.5.0 resolution: "jest-message-util@npm:29.5.0" @@ -11332,20 +11991,6 @@ __metadata: languageName: node linkType: hard -"jest-util@npm:^28.1.3": - version: 28.1.3 - resolution: "jest-util@npm:28.1.3" - dependencies: - "@jest/types": "npm:^28.1.3" - "@types/node": "npm:*" - chalk: "npm:^4.0.0" - ci-info: "npm:^3.2.0" - graceful-fs: "npm:^4.2.9" - picomatch: "npm:^2.2.3" - checksum: 10/92895523d30ddde8f22bebbc20ed6e1be35b0a21c8e9df8a1fc289bf354f6a3f96e5d271340f2ed212a5aa0b55fd7717ff3167da8c5f247d623e2a93a3bf7b32 - languageName: node - linkType: hard - "jest-util@npm:^29.5.0": version: 29.5.0 resolution: "jest-util@npm:29.5.0" @@ -11546,7 +12191,7 @@ __metadata: languageName: node linkType: hard -"jsonc-parser@npm:3.2.0, jsonc-parser@npm:^3.2.0": +"jsonc-parser@npm:3.2.0": version: 3.2.0 resolution: "jsonc-parser@npm:3.2.0" checksum: 10/bd68b902e5f9394f01da97921f49c5084b2dc03a0c5b4fdb2a429f8d6f292686c1bf87badaeb0a8148d024192a88f5ad2e57b2918ba43fe25cf15f3371db64d4 @@ -12109,6 +12754,13 @@ __metadata: languageName: node linkType: hard +"load-tsconfig@npm:^0.2.5": + version: 0.2.5 + resolution: "load-tsconfig@npm:0.2.5" + checksum: 10/b3176f6f0c86dbdbbc7e337440a803b0b4407c55e2e1cfc53bd3db68e0211448f36428a6075ecf5e286db5d1bf791da756fc0ac4d2447717140fb6a5218ecfb4 + languageName: node + linkType: hard + "locate-path@npm:^2.0.0": version: 2.0.0 resolution: "locate-path@npm:2.0.0" @@ -12353,6 +13005,15 @@ __metadata: languageName: node linkType: hard +"loupe@npm:^3.1.0, loupe@npm:^3.1.1": + version: 3.1.1 + resolution: "loupe@npm:3.1.1" + dependencies: + get-func-name: "npm:^2.0.1" + checksum: 10/56d71d64c5af109aaf2b5343668ea5952eed468ed2ff837373810e417bf8331f14491c6e4d38e08ff84a29cb18906e06e58ba660c53bd00f2989e1873fa2f54c + languageName: node + linkType: hard + "lower-case@npm:^2.0.2": version: 2.0.2 resolution: "lower-case@npm:2.0.2" @@ -12383,6 +13044,13 @@ __metadata: languageName: node linkType: hard +"lru-cache@npm:^10.2.0": + version: 10.4.3 + resolution: "lru-cache@npm:10.4.3" + checksum: 10/e6e90267360476720fa8e83cc168aa2bf0311f3f2eea20a6ba78b90a885ae72071d9db132f40fda4129c803e7dcec3a6b6a6fbb44ca90b081630b810b5d6a41a + languageName: node + linkType: hard + "lru-cache@npm:^4.0.1": version: 4.1.5 resolution: "lru-cache@npm:4.1.5" @@ -12416,6 +13084,26 @@ __metadata: languageName: node linkType: hard +"magic-string@npm:^0.30.10, magic-string@npm:^0.30.11": + version: 0.30.11 + resolution: "magic-string@npm:0.30.11" + dependencies: + "@jridgewell/sourcemap-codec": "npm:^1.5.0" + checksum: 10/b784d2240252f5b1e755d487354ada4c672cbca16f045144f7185a75b059210e5fcca7be7be03ef1bac2ca754c4428b21d36ae64a9057ba429916f06b8c54eb2 + languageName: node + linkType: hard + +"magicast@npm:^0.3.4": + version: 0.3.5 + resolution: "magicast@npm:0.3.5" + dependencies: + "@babel/parser": "npm:^7.25.4" + "@babel/types": "npm:^7.25.4" + source-map-js: "npm:^1.2.0" + checksum: 10/3a2dba6b0bdde957797361d09c7931ebdc1b30231705360eeb40ed458d28e1c3112841c3ed4e1b87ceb28f741e333c7673cd961193aa9fdb4f4946b202e6205a + languageName: node + linkType: hard + "make-dir@npm:^1.0.0": version: 1.3.0 resolution: "make-dir@npm:1.3.0" @@ -12444,6 +13132,15 @@ __metadata: languageName: node linkType: hard +"make-dir@npm:^4.0.0": + version: 4.0.0 + resolution: "make-dir@npm:4.0.0" + dependencies: + semver: "npm:^7.5.3" + checksum: 10/bf0731a2dd3aab4db6f3de1585cea0b746bb73eb5a02e3d8d72757e376e64e6ada190b1eddcde5b2f24a81b688a9897efd5018737d05e02e2a671dda9cff8a8a + languageName: node + linkType: hard + "make-error@npm:1.x, make-error@npm:^1.1.1": version: 1.3.6 resolution: "make-error@npm:1.3.6" @@ -12965,6 +13662,15 @@ __metadata: languageName: node linkType: hard +"minimatch@npm:^9.0.4": + version: 9.0.5 + resolution: "minimatch@npm:9.0.5" + dependencies: + brace-expansion: "npm:^2.0.1" + checksum: 10/dd6a8927b063aca6d910b119e1f2df6d2ce7d36eab91de83167dd136bb85e1ebff97b0d3de1cb08bd1f7e018ca170b4962479fefab5b2a69e2ae12cb2edc8348 + languageName: node + linkType: hard + "minimist-options@npm:4.1.0": version: 4.1.0 resolution: "minimist-options@npm:4.1.0" @@ -13091,6 +13797,13 @@ __metadata: languageName: node linkType: hard +"minipass@npm:^7.1.2": + version: 7.1.2 + resolution: "minipass@npm:7.1.2" + checksum: 10/c25f0ee8196d8e6036661104bacd743785b2599a21de5c516b32b3fa2b83113ac89a2358465bc04956baab37ffb956ae43be679b2262bf7be15fce467ccd7950 + languageName: node + linkType: hard + "minizlib@npm:^2.1.1, minizlib@npm:^2.1.2": version: 2.1.2 resolution: "minizlib@npm:2.1.2" @@ -13166,7 +13879,7 @@ __metadata: languageName: node linkType: hard -"ms@npm:^2.0.0, ms@npm:^2.1.2": +"ms@npm:^2.0.0, ms@npm:^2.1.2, ms@npm:^2.1.3": version: 2.1.3 resolution: "ms@npm:2.1.3" checksum: 10/aa92de608021b242401676e35cfa5aa42dd70cbdc082b916da7fb925c542173e36bce97ea3e804923fe92c0ad991434e4a38327e15a1b5b5f945d66df615ae6d @@ -13220,6 +13933,15 @@ __metadata: languageName: node linkType: hard +"nanoid@npm:^3.3.7": + version: 3.3.7 + resolution: "nanoid@npm:3.3.7" + bin: + nanoid: bin/nanoid.cjs + checksum: 10/ac1eb60f615b272bccb0e2b9cd933720dad30bf9708424f691b8113826bb91aca7e9d14ef5d9415a6ba15c266b37817256f58d8ce980c82b0ba3185352565679 + languageName: node + linkType: hard + "nanomatch@npm:^1.2.9": version: 1.2.13 resolution: "nanomatch@npm:1.2.13" @@ -14357,6 +15079,13 @@ __metadata: languageName: node linkType: hard +"package-json-from-dist@npm:^1.0.0": + version: 1.0.0 + resolution: "package-json-from-dist@npm:1.0.0" + checksum: 10/ac706ec856a5a03f5261e4e48fa974f24feb044d51f84f8332e2af0af04fbdbdd5bbbfb9cbbe354190409bc8307c83a9e38c6672c3c8855f709afb0006a009ea + languageName: node + linkType: hard + "package-json@npm:^10.0.0": version: 10.0.1 resolution: "package-json@npm:10.0.1" @@ -14686,6 +15415,16 @@ __metadata: languageName: node linkType: hard +"path-scurry@npm:^1.11.1": + version: 1.11.1 + resolution: "path-scurry@npm:1.11.1" + dependencies: + lru-cache: "npm:^10.2.0" + minipass: "npm:^5.0.0 || ^6.0.2 || ^7.0.0" + checksum: 10/5e8845c159261adda6f09814d7725683257fcc85a18f329880ab4d7cc1d12830967eae5d5894e453f341710d5484b8fdbbd4d75181b4d6e1eb2f4dc7aeadc434 + languageName: node + linkType: hard + "path-to-regexp@npm:^1.7.0": version: 1.8.0 resolution: "path-to-regexp@npm:1.8.0" @@ -14718,6 +15457,20 @@ __metadata: languageName: node linkType: hard +"pathe@npm:^1.1.2": + version: 1.1.2 + resolution: "pathe@npm:1.1.2" + checksum: 10/f201d796351bf7433d147b92c20eb154a4e0ea83512017bf4ec4e492a5d6e738fb45798be4259a61aa81270179fce11026f6ff0d3fa04173041de044defe9d80 + languageName: node + linkType: hard + +"pathval@npm:^2.0.0": + version: 2.0.0 + resolution: "pathval@npm:2.0.0" + checksum: 10/b91575bf9cdf01757afd7b5e521eb8a0b874a49bc972d08e0047cfea0cd3c019f5614521d4bc83d2855e3fcc331db6817dfd533dd8f3d90b16bc76fad2450fc1 + languageName: node + linkType: hard + "performance-now@npm:^2.1.0": version: 2.1.0 resolution: "performance-now@npm:2.1.0" @@ -14732,6 +15485,13 @@ __metadata: languageName: node linkType: hard +"picocolors@npm:^1.0.1": + version: 1.1.0 + resolution: "picocolors@npm:1.1.0" + checksum: 10/a2ad60d94d185c30f2a140b19c512547713fb89b920d32cc6cf658fa786d63a37ba7b8451872c3d9fc34883971fb6e5878e07a20b60506e0bb2554dce9169ccb + languageName: node + linkType: hard + "picomatch@npm:2.3.1, picomatch@npm:^2.0.4, picomatch@npm:^2.0.5, picomatch@npm:^2.2.3, picomatch@npm:^2.3.1": version: 2.3.1 resolution: "picomatch@npm:2.3.1" @@ -14826,6 +15586,17 @@ __metadata: languageName: node linkType: hard +"postcss@npm:^8.4.43": + version: 8.4.45 + resolution: "postcss@npm:8.4.45" + dependencies: + nanoid: "npm:^3.3.7" + picocolors: "npm:^1.0.1" + source-map-js: "npm:^1.2.0" + checksum: 10/7eaf7346d04929ee979548ece5e34d253eae6f175346e298b2c4621ad6f4ee00adfe7abe72688640e910c0361ae50537c5dda3e35fd1066491282c342b3ee5c8 + languageName: node + linkType: hard + "prelude-ls@npm:^1.2.1": version: 1.2.1 resolution: "prelude-ls@npm:1.2.1" @@ -14858,18 +15629,6 @@ __metadata: languageName: node linkType: hard -"pretty-format@npm:^28.0.0, pretty-format@npm:^28.1.3": - version: 28.1.3 - resolution: "pretty-format@npm:28.1.3" - dependencies: - "@jest/schemas": "npm:^28.1.3" - ansi-regex: "npm:^5.0.1" - ansi-styles: "npm:^5.0.0" - react-is: "npm:^18.0.0" - checksum: 10/26626d33e201388174a1ce352be46b8087f28184bf3684a88b2f7cf633e28419ffc664628eec261ba13b0f03748c3a6f85db063a2022f75a354c7b9e4e06526b - languageName: node - linkType: hard - "pretty-format@npm:^29.5.0": version: 29.5.0 resolution: "pretty-format@npm:29.5.0" @@ -15699,6 +16458,69 @@ __metadata: languageName: node linkType: hard +"rollup@npm:^4.20.0": + version: 4.21.3 + resolution: "rollup@npm:4.21.3" + dependencies: + "@rollup/rollup-android-arm-eabi": "npm:4.21.3" + "@rollup/rollup-android-arm64": "npm:4.21.3" + "@rollup/rollup-darwin-arm64": "npm:4.21.3" + "@rollup/rollup-darwin-x64": "npm:4.21.3" + "@rollup/rollup-linux-arm-gnueabihf": "npm:4.21.3" + "@rollup/rollup-linux-arm-musleabihf": "npm:4.21.3" + "@rollup/rollup-linux-arm64-gnu": "npm:4.21.3" + "@rollup/rollup-linux-arm64-musl": "npm:4.21.3" + "@rollup/rollup-linux-powerpc64le-gnu": "npm:4.21.3" + "@rollup/rollup-linux-riscv64-gnu": "npm:4.21.3" + "@rollup/rollup-linux-s390x-gnu": "npm:4.21.3" + "@rollup/rollup-linux-x64-gnu": "npm:4.21.3" + "@rollup/rollup-linux-x64-musl": "npm:4.21.3" + "@rollup/rollup-win32-arm64-msvc": "npm:4.21.3" + "@rollup/rollup-win32-ia32-msvc": "npm:4.21.3" + "@rollup/rollup-win32-x64-msvc": "npm:4.21.3" + "@types/estree": "npm:1.0.5" + fsevents: "npm:~2.3.2" + dependenciesMeta: + "@rollup/rollup-android-arm-eabi": + optional: true + "@rollup/rollup-android-arm64": + optional: true + "@rollup/rollup-darwin-arm64": + optional: true + "@rollup/rollup-darwin-x64": + optional: true + "@rollup/rollup-linux-arm-gnueabihf": + optional: true + "@rollup/rollup-linux-arm-musleabihf": + optional: true + "@rollup/rollup-linux-arm64-gnu": + optional: true + "@rollup/rollup-linux-arm64-musl": + optional: true + "@rollup/rollup-linux-powerpc64le-gnu": + optional: true + "@rollup/rollup-linux-riscv64-gnu": + optional: true + "@rollup/rollup-linux-s390x-gnu": + optional: true + "@rollup/rollup-linux-x64-gnu": + optional: true + "@rollup/rollup-linux-x64-musl": + optional: true + "@rollup/rollup-win32-arm64-msvc": + optional: true + "@rollup/rollup-win32-ia32-msvc": + optional: true + "@rollup/rollup-win32-x64-msvc": + optional: true + fsevents: + optional: true + bin: + rollup: dist/bin/rollup + checksum: 10/60a1d6548fa1e612209f9f98f83c73a213f27569abddcbfb246af08455d730f367d95f6bd541b58c9e1e643c181463db27326c712aa81efd4071372a4d3481b9 + languageName: node + linkType: hard + "run-async@npm:^2.4.0, run-async@npm:^2.4.1": version: 2.4.1 resolution: "run-async@npm:2.4.1" @@ -16100,6 +16922,13 @@ __metadata: languageName: node linkType: hard +"siginfo@npm:^2.0.0": + version: 2.0.0 + resolution: "siginfo@npm:2.0.0" + checksum: 10/e93ff66c6531a079af8fb217240df01f980155b5dc408d2d7bebc398dd284e383eb318153bf8acd4db3c4fe799aa5b9a641e38b0ba3b1975700b1c89547ea4e7 + languageName: node + linkType: hard + "signal-exit@npm:^3.0.0, signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.3, signal-exit@npm:^3.0.7": version: 3.0.7 resolution: "signal-exit@npm:3.0.7" @@ -16395,6 +17224,13 @@ __metadata: languageName: node linkType: hard +"source-map-js@npm:^1.2.0": + version: 1.2.1 + resolution: "source-map-js@npm:1.2.1" + checksum: 10/ff9d8c8bf096d534a5b7707e0382ef827b4dd360a577d3f34d2b9f48e12c9d230b5747974ee7c607f0df65113732711bb701fe9ece3c7edbd43cb2294d707df3 + languageName: node + linkType: hard + "source-map-resolve@npm:^0.5.0": version: 0.5.3 resolution: "source-map-resolve@npm:0.5.3" @@ -16585,6 +17421,13 @@ __metadata: languageName: node linkType: hard +"stackback@npm:0.0.2": + version: 0.0.2 + resolution: "stackback@npm:0.0.2" + checksum: 10/2d4dc4e64e2db796de4a3c856d5943daccdfa3dd092e452a1ce059c81e9a9c29e0b9badba91b43ef0d5ff5c04ee62feb3bcc559a804e16faf447bac2d883aa99 + languageName: node + linkType: hard + "static-extend@npm:^0.1.1": version: 0.1.2 resolution: "static-extend@npm:0.1.2" @@ -16602,6 +17445,13 @@ __metadata: languageName: node linkType: hard +"std-env@npm:^3.7.0": + version: 3.7.0 + resolution: "std-env@npm:3.7.0" + checksum: 10/6ee0cca1add3fd84656b0002cfbc5bfa20340389d9ba4720569840f1caa34bce74322aef4c93f046391583e50649d0cf81a5f8fe1d411e50b659571690a45f12 + languageName: node + linkType: hard + "stream-combiner2@npm:~1.1.1": version: 1.1.1 resolution: "stream-combiner2@npm:1.1.1" @@ -17070,6 +17920,17 @@ __metadata: languageName: node linkType: hard +"test-exclude@npm:^7.0.1": + version: 7.0.1 + resolution: "test-exclude@npm:7.0.1" + dependencies: + "@istanbuljs/schema": "npm:^0.1.2" + glob: "npm:^10.4.1" + minimatch: "npm:^9.0.4" + checksum: 10/e6f6f4e1df2e7810e082e8d7dfc53be51a931e6e87925f5e1c2ef92cc1165246ba3bf2dae6b5d86251c16925683dba906bd41e40169ebc77120a2d1b5a0dbbe0 + languageName: node + linkType: hard + "text-extensions@npm:^1.0.0": version: 1.9.0 resolution: "text-extensions@npm:1.9.0" @@ -17149,6 +18010,41 @@ __metadata: languageName: node linkType: hard +"tinybench@npm:^2.8.0, tinybench@npm:^2.9.0": + version: 2.9.0 + resolution: "tinybench@npm:2.9.0" + checksum: 10/cfa1e1418e91289219501703c4693c70708c91ffb7f040fd318d24aef419fb5a43e0c0160df9471499191968b2451d8da7f8087b08c3133c251c40d24aced06c + languageName: node + linkType: hard + +"tinyexec@npm:^0.3.0": + version: 0.3.0 + resolution: "tinyexec@npm:0.3.0" + checksum: 10/317cc536d091ce7e50271287798d91ef53c4dc80088844d890752a2c7387d213004cba83e5e1d9129390ced617625e34f4a8f0ba5779e31c9b6939f9be0d3543 + languageName: node + linkType: hard + +"tinypool@npm:^1.0.0": + version: 1.0.1 + resolution: "tinypool@npm:1.0.1" + checksum: 10/eaceb93784b8e27e60c0e3e2c7d11c29e1e79b2a025b2c232215db73b90fe22bd4753ad53fc8e801c2b5a63b94a823af549555d8361272bc98271de7dd4a9925 + languageName: node + linkType: hard + +"tinyrainbow@npm:^1.2.0": + version: 1.2.0 + resolution: "tinyrainbow@npm:1.2.0" + checksum: 10/2924444db6804355e5ba2b6e586c7f77329d93abdd7257a069a0f4530dff9f16de484e80479094e3f39273462541b003a65ee3a6afc2d12555aa745132deba5d + languageName: node + linkType: hard + +"tinyspy@npm:^3.0.0": + version: 3.0.2 + resolution: "tinyspy@npm:3.0.2" + checksum: 10/5db671b2ff5cd309de650c8c4761ca945459d7204afb1776db9a04fb4efa28a75f08517a8620c01ee32a577748802231ad92f7d5b194dc003ee7f987a2a06337 + languageName: node + linkType: hard + "tmp@npm:^0.0.33": version: 0.0.33 resolution: "tmp@npm:0.0.33" @@ -17884,6 +18780,34 @@ __metadata: languageName: node linkType: hard +"unplugin-swc@npm:^1.5.1": + version: 1.5.1 + resolution: "unplugin-swc@npm:1.5.1" + dependencies: + "@rollup/pluginutils": "npm:^5.1.0" + load-tsconfig: "npm:^0.2.5" + unplugin: "npm:^1.11.0" + peerDependencies: + "@swc/core": ^1.2.108 + checksum: 10/5bb16068c254bbd3c6971aeb7f4491e75a451140ad2d5997eb0526d7aa840ba48928a146e3582634a4143056a8d43108ff6d4a612feb5fca2f68dc5455de6940 + languageName: node + linkType: hard + +"unplugin@npm:^1.11.0": + version: 1.14.1 + resolution: "unplugin@npm:1.14.1" + dependencies: + acorn: "npm:^8.12.1" + webpack-virtual-modules: "npm:^0.6.2" + peerDependencies: + webpack-sources: ^3 + peerDependenciesMeta: + webpack-sources: + optional: true + checksum: 10/ad82ec5b8de5ae4fb7d24f8ed7d71071e15855d335365d7ab6f2e074d5d666589dd52e9f2a16017da19d7c43f60e50e09bc529420bf9f29ac7c90cc3cf13ef28 + languageName: node + linkType: hard + "unset-value@npm:^1.0.0": version: 1.0.0 resolution: "unset-value@npm:1.0.0" @@ -18164,6 +19088,176 @@ __metadata: languageName: node linkType: hard +"vite-node@npm:2.0.5": + version: 2.0.5 + resolution: "vite-node@npm:2.0.5" + dependencies: + cac: "npm:^6.7.14" + debug: "npm:^4.3.5" + pathe: "npm:^1.1.2" + tinyrainbow: "npm:^1.2.0" + vite: "npm:^5.0.0" + bin: + vite-node: vite-node.mjs + checksum: 10/de259cdf4b9ff82f39ba92ffca99db8a80783efd2764d3553b62cd8c8864488d590114a75bc93a93bf5ba2a2086bea1bee4b0029da9e62c4c0d3bf6c1f364eed + languageName: node + linkType: hard + +"vite-node@npm:2.1.1": + version: 2.1.1 + resolution: "vite-node@npm:2.1.1" + dependencies: + cac: "npm:^6.7.14" + debug: "npm:^4.3.6" + pathe: "npm:^1.1.2" + vite: "npm:^5.0.0" + bin: + vite-node: vite-node.mjs + checksum: 10/c21892b560cad87414ef774d7e53b207e8d66b511b7ef085940fd2f2160d8f6c42dfa9af2ef5465e775b767fc3312ec5b3418b898041f592b8e0b093b4b7110a + languageName: node + linkType: hard + +"vite@npm:^5.0.0": + version: 5.4.5 + resolution: "vite@npm:5.4.5" + dependencies: + esbuild: "npm:^0.21.3" + fsevents: "npm:~2.3.3" + postcss: "npm:^8.4.43" + rollup: "npm:^4.20.0" + peerDependencies: + "@types/node": ^18.0.0 || >=20.0.0 + less: "*" + lightningcss: ^1.21.0 + sass: "*" + sass-embedded: "*" + stylus: "*" + sugarss: "*" + terser: ^5.4.0 + dependenciesMeta: + fsevents: + optional: true + peerDependenciesMeta: + "@types/node": + optional: true + less: + optional: true + lightningcss: + optional: true + sass: + optional: true + sass-embedded: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true + bin: + vite: bin/vite.js + checksum: 10/ef794392c44cdc0b4256e6a58697ebf9b86536dde04ba6449a853664c8a9441c4ae8c380c35d7e78556f197a738d46921e076064a4ff7a7448e5905d55262baf + languageName: node + linkType: hard + +"vitest@npm:2.0.5": + version: 2.0.5 + resolution: "vitest@npm:2.0.5" + dependencies: + "@ampproject/remapping": "npm:^2.3.0" + "@vitest/expect": "npm:2.0.5" + "@vitest/pretty-format": "npm:^2.0.5" + "@vitest/runner": "npm:2.0.5" + "@vitest/snapshot": "npm:2.0.5" + "@vitest/spy": "npm:2.0.5" + "@vitest/utils": "npm:2.0.5" + chai: "npm:^5.1.1" + debug: "npm:^4.3.5" + execa: "npm:^8.0.1" + magic-string: "npm:^0.30.10" + pathe: "npm:^1.1.2" + std-env: "npm:^3.7.0" + tinybench: "npm:^2.8.0" + tinypool: "npm:^1.0.0" + tinyrainbow: "npm:^1.2.0" + vite: "npm:^5.0.0" + vite-node: "npm:2.0.5" + why-is-node-running: "npm:^2.3.0" + peerDependencies: + "@edge-runtime/vm": "*" + "@types/node": ^18.0.0 || >=20.0.0 + "@vitest/browser": 2.0.5 + "@vitest/ui": 2.0.5 + happy-dom: "*" + jsdom: "*" + peerDependenciesMeta: + "@edge-runtime/vm": + optional: true + "@types/node": + optional: true + "@vitest/browser": + optional: true + "@vitest/ui": + optional: true + happy-dom: + optional: true + jsdom: + optional: true + bin: + vitest: vitest.mjs + checksum: 10/abb916e3496a3fa9e9d05ecd806332dc4000aa0e433f0cb1e99f9dd1fa5c06d2c66656874b9860a683cec0f32abe1519599babef02e5c0ca80e9afbcdbddfdbd + languageName: node + linkType: hard + +"vitest@npm:2.1.1": + version: 2.1.1 + resolution: "vitest@npm:2.1.1" + dependencies: + "@vitest/expect": "npm:2.1.1" + "@vitest/mocker": "npm:2.1.1" + "@vitest/pretty-format": "npm:^2.1.1" + "@vitest/runner": "npm:2.1.1" + "@vitest/snapshot": "npm:2.1.1" + "@vitest/spy": "npm:2.1.1" + "@vitest/utils": "npm:2.1.1" + chai: "npm:^5.1.1" + debug: "npm:^4.3.6" + magic-string: "npm:^0.30.11" + pathe: "npm:^1.1.2" + std-env: "npm:^3.7.0" + tinybench: "npm:^2.9.0" + tinyexec: "npm:^0.3.0" + tinypool: "npm:^1.0.0" + tinyrainbow: "npm:^1.2.0" + vite: "npm:^5.0.0" + vite-node: "npm:2.1.1" + why-is-node-running: "npm:^2.3.0" + peerDependencies: + "@edge-runtime/vm": "*" + "@types/node": ^18.0.0 || >=20.0.0 + "@vitest/browser": 2.1.1 + "@vitest/ui": 2.1.1 + happy-dom: "*" + jsdom: "*" + peerDependenciesMeta: + "@edge-runtime/vm": + optional: true + "@types/node": + optional: true + "@vitest/browser": + optional: true + "@vitest/ui": + optional: true + happy-dom: + optional: true + jsdom: + optional: true + bin: + vitest: vitest.mjs + checksum: 10/5bbbc7298a043c7ca0914817a2c30e18af5a1619f4a750d36056f64f4d907a1fad50b8bab93aaf39f8174eb475108c9287f6e226e24d3a3ccd6f0b71d3f56438 + languageName: node + linkType: hard + "walk-up-path@npm:^1.0.0": version: 1.0.0 resolution: "walk-up-path@npm:1.0.0" @@ -18217,6 +19311,13 @@ __metadata: languageName: node linkType: hard +"webpack-virtual-modules@npm:^0.6.2": + version: 0.6.2 + resolution: "webpack-virtual-modules@npm:0.6.2" + checksum: 10/d9a0d035f7ec0c7f1055aaf88bfe48b7f96458043916a1b2926d9012fd61de3810a6b768e31a8cd4b3c84a9b6d55824361a9dd20aaf9f5ccfb6f017af216a178 + languageName: node + linkType: hard + "whatwg-url@npm:^5.0.0": version: 5.0.0 resolution: "whatwg-url@npm:5.0.0" @@ -18271,6 +19372,18 @@ __metadata: languageName: node linkType: hard +"why-is-node-running@npm:^2.3.0": + version: 2.3.0 + resolution: "why-is-node-running@npm:2.3.0" + dependencies: + siginfo: "npm:^2.0.0" + stackback: "npm:0.0.2" + bin: + why-is-node-running: cli.js + checksum: 10/0de6e6cd8f2f94a8b5ca44e84cf1751eadcac3ebedcdc6e5fbbe6c8011904afcbc1a2777c53496ec02ced7b81f2e7eda61e76bf8262a8bc3ceaa1f6040508051 + languageName: node + linkType: hard + "wide-align@npm:^1.1.5": version: 1.1.5 resolution: "wide-align@npm:1.1.5" From b12605c0f74e43fe2209ebf09483a56be7b002ca Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Sat, 14 Sep 2024 19:28:38 +0200 Subject: [PATCH 02/69] chore(cli): migrate unit test on vitest --- .eslintignore | 15 - .eslintrc.js | 3 - .husky/pre-commit | 2 +- eslint.config.mjs | 76 + package.json | 23 +- packages/cli-core/.eslintignore | 13 - packages/cli-core/.eslintrc.cjs | 1 - packages/cli-core/package.json | 4 - .../src/services/NpmRegistryClient.spec.ts | 4 +- .../cli-generate-http-client/.eslintignore | 13 - .../cli-generate-http-client/.eslintrc.js | 1 - packages/cli-generate-http-client/.npmignore | 6 +- .../cli-generate-http-client/jest.config.js | 14 - .../cli-generate-http-client/package.json | 30 +- .../tsconfig.cjs.json | 28 + .../tsconfig.esm.json | 19 +- .../cli-generate-http-client/tsconfig.json | 37 +- .../tsconfig.spec.json | 36 + .../vitest.config.mts | 21 + packages/cli-generate-swagger/.eslintignore | 13 - packages/cli-generate-swagger/.eslintrc.js | 1 - packages/cli-generate-swagger/.npmignore | 6 +- packages/cli-generate-swagger/jest.config.js | 14 - packages/cli-generate-swagger/package.json | 28 +- .../cli-generate-swagger/tsconfig.cjs.json | 28 + .../cli-generate-swagger/tsconfig.esm.json | 19 +- packages/cli-generate-swagger/tsconfig.json | 37 +- .../cli-generate-swagger/tsconfig.spec.json | 36 + .../cli-generate-swagger/vitest.config.mts | 21 + packages/cli-plugin-eslint/.eslintignore | 13 - packages/cli-plugin-eslint/.eslintrc.js | 1 - packages/cli-plugin-eslint/.npmignore | 6 +- packages/cli-plugin-eslint/jest.config.js | 14 - packages/cli-plugin-eslint/package.json | 28 +- packages/cli-plugin-eslint/tsconfig.cjs.json | 28 + packages/cli-plugin-eslint/tsconfig.esm.json | 19 +- packages/cli-plugin-eslint/tsconfig.json | 37 +- packages/cli-plugin-eslint/tsconfig.spec.json | 36 + packages/cli-plugin-eslint/vitest.config.mts | 21 + packages/cli-plugin-jest/.eslintignore | 13 - packages/cli-plugin-jest/.eslintrc.js | 1 - packages/cli-plugin-jest/.npmignore | 6 +- packages/cli-plugin-jest/jest.config.js | 15 - packages/cli-plugin-jest/package.json | 28 +- .../cli-plugin-jest/src/hooks/JestInitHook.ts | 2 +- packages/cli-plugin-jest/tsconfig.cjs.json | 28 + packages/cli-plugin-jest/tsconfig.esm.json | 19 +- packages/cli-plugin-jest/tsconfig.json | 40 +- packages/cli-plugin-jest/tsconfig.spec.json | 29 + packages/cli-plugin-jest/vitest.config.mts | 21 + packages/cli-plugin-mocha/.eslintignore | 13 - packages/cli-plugin-mocha/.eslintrc.js | 1 - packages/cli-plugin-mocha/.npmignore | 6 +- packages/cli-plugin-mocha/jest.config.js | 14 - packages/cli-plugin-mocha/package.json | 28 +- packages/cli-plugin-mocha/tsconfig.cjs.json | 28 + packages/cli-plugin-mocha/tsconfig.esm.json | 19 +- packages/cli-plugin-mocha/tsconfig.json | 37 +- packages/cli-plugin-mocha/tsconfig.spec.json | 36 + packages/cli-plugin-mocha/vitest.config.mts | 21 + packages/cli-plugin-mongoose/.eslintignore | 13 - packages/cli-plugin-mongoose/.eslintrc.js | 1 - packages/cli-plugin-mongoose/.npmignore | 6 +- packages/cli-plugin-mongoose/jest.config.js | 15 - packages/cli-plugin-mongoose/package.json | 28 +- .../cli-plugin-mongoose/tsconfig.cjs.json | 28 + .../cli-plugin-mongoose/tsconfig.esm.json | 19 +- packages/cli-plugin-mongoose/tsconfig.json | 40 +- .../cli-plugin-mongoose/tsconfig.spec.json | 29 + .../cli-plugin-mongoose/vitest.config.mts | 21 + .../cli-plugin-oidc-provider/.eslintignore | 13 - .../cli-plugin-oidc-provider/.eslintrc.js | 1 - packages/cli-plugin-oidc-provider/.npmignore | 6 +- .../cli-plugin-oidc-provider/jest.config.js | 14 - .../cli-plugin-oidc-provider/package.json | 28 +- .../interactions/ConsentInteraction.spec.ts | 8 +- .../src/interactions/LoginInteraction.spec.ts | 6 +- .../__mock__/oidcContext.fixture.ts | 26 +- .../init.integration.spec.ts.snap | 114 +- .../tsconfig.cjs.json | 28 + .../tsconfig.esm.json | 19 +- .../cli-plugin-oidc-provider/tsconfig.json | 40 +- .../tsconfig.spec.json | 29 + .../vitest.config.mts | 22 + packages/cli-plugin-passport/.eslintignore | 13 - packages/cli-plugin-passport/.eslintrc.js | 1 - packages/cli-plugin-passport/.npmignore | 6 +- packages/cli-plugin-passport/jest.config.js | 14 - packages/cli-plugin-passport/package.json | 28 +- .../cli-plugin-passport/tsconfig.cjs.json | 28 + .../cli-plugin-passport/tsconfig.esm.json | 19 +- packages/cli-plugin-passport/tsconfig.json | 37 +- .../cli-plugin-passport/tsconfig.spec.json | 36 + .../cli-plugin-passport/vitest.config.mts | 21 + packages/cli-plugin-prisma/.eslintignore | 13 - packages/cli-plugin-prisma/.eslintrc.js | 1 - packages/cli-plugin-prisma/.npmignore | 6 +- packages/cli-plugin-prisma/jest.config.js | 14 - packages/cli-plugin-prisma/package.json | 28 +- .../src/services/CliPrisma.spec.ts | 7 +- .../__snapshots__/CliPrisma.spec.ts.snap | 12 +- packages/cli-plugin-prisma/tsconfig.cjs.json | 28 + packages/cli-plugin-prisma/tsconfig.esm.json | 19 +- packages/cli-plugin-prisma/tsconfig.json | 40 +- packages/cli-plugin-prisma/tsconfig.spec.json | 29 + packages/cli-plugin-prisma/vitest.config.mts | 21 + packages/cli-plugin-typegraphql/.eslintignore | 13 - packages/cli-plugin-typegraphql/.eslintrc.js | 1 - packages/cli-plugin-typegraphql/.npmignore | 6 +- .../cli-plugin-typegraphql/jest.config.js | 15 - packages/cli-plugin-typegraphql/package.json | 28 +- .../init.integration.spec.ts.snap | 58 +- .../test/init/init.integration.spec.ts | 2 +- .../cli-plugin-typegraphql/tsconfig.cjs.json | 28 + .../cli-plugin-typegraphql/tsconfig.esm.json | 19 +- packages/cli-plugin-typegraphql/tsconfig.json | 40 +- .../cli-plugin-typegraphql/tsconfig.spec.json | 29 + .../cli-plugin-typegraphql/vitest.config.mts | 21 + packages/cli-plugin-typeorm/.eslintignore | 13 - packages/cli-plugin-typeorm/.eslintrc.js | 1 - packages/cli-plugin-typeorm/.npmignore | 6 +- packages/cli-plugin-typeorm/jest.config.js | 15 - packages/cli-plugin-typeorm/package.json | 28 +- ...nerate.controller.integration.spec.ts.snap | 28 +- .../generate.controller.integration.spec.ts | 1 - .../init.integration.spec.ts.snap | 82 +- .../init/init.integration.spec.ts | 14 +- packages/cli-plugin-typeorm/tsconfig.cjs.json | 28 + packages/cli-plugin-typeorm/tsconfig.esm.json | 19 +- packages/cli-plugin-typeorm/tsconfig.json | 40 +- .../cli-plugin-typeorm/tsconfig.spec.json | 29 + packages/cli-plugin-typeorm/vitest.config.mts | 21 + packages/cli-plugin-vitest/.eslintignore | 13 - packages/cli-plugin-vitest/.eslintrc.js | 1 - packages/cli-plugin-vitest/.npmignore | 6 +- packages/cli-plugin-vitest/jest.config.js | 15 - packages/cli-plugin-vitest/package.json | 28 +- packages/cli-plugin-vitest/tsconfig.cjs.json | 28 + packages/cli-plugin-vitest/tsconfig.esm.json | 19 +- packages/cli-plugin-vitest/tsconfig.json | 40 +- packages/cli-plugin-vitest/tsconfig.spec.json | 29 + packages/cli-plugin-vitest/vitest.config.mts | 21 + packages/cli-testing/.eslintignore | 13 - packages/cli-testing/.eslintrc.js | 1 - packages/cli-testing/.npmignore | 6 +- packages/cli-testing/jest.config.js | 14 - packages/cli-testing/package.json | 28 +- packages/cli-testing/tsconfig.cjs.json | 28 + packages/cli-testing/tsconfig.esm.json | 16 +- packages/cli-testing/tsconfig.json | 35 +- packages/cli-testing/tsconfig.spec.json | 36 + packages/cli-testing/vitest.config.mts | 21 + packages/cli/.eslintignore | 13 - packages/cli/.eslintrc.js | 1 - packages/cli/.npmignore | 6 +- packages/cli/jest.config.js | 16 - packages/cli/package.json | 28 +- .../src/commands/generate/GenerateCmd.spec.ts | 11 +- .../cli/src/commands/init/InitCmd.spec.ts | 5 +- .../init/prompts/getFeaturesPrompt.spec.ts | 188 +- packages/cli/src/commands/run/RunCmd.spec.ts | 17 +- .../cli/src/commands/update/UpdateCmd.spec.ts | 1 + .../cli/src/pipes/OutputFilePathPipe.spec.ts | 1 + .../__snapshots__/fillImport.spec.ts.snap | 156 +- .../init.integration.spec.ts.snap | 408 +- .../init/init.integration.spec.ts | 104 +- packages/cli/tsconfig.cjs.json | 28 + packages/cli/tsconfig.esm.json | 16 +- packages/cli/tsconfig.json | 39 +- packages/cli/tsconfig.spec.json | 29 + packages/cli/vitest.config.mts | 21 + tools/eslint/eslint.template.js | 1 - tools/eslint/eslintignore.template | 13 - tools/eslint/index.js | 38 - tools/eslint/node.js | 42 - tools/eslint/package.json | 15 - tools/vitest/presets/index.js | 4 + tsconfig.json | 3 + tsconfig.spec.json | 18 + vitest.workspace.mts | 3 + yarn.lock | 5653 +++++------------ 181 files changed, 3986 insertions(+), 6007 deletions(-) delete mode 100644 .eslintignore delete mode 100644 .eslintrc.js create mode 100644 eslint.config.mjs delete mode 100644 packages/cli-core/.eslintignore delete mode 100644 packages/cli-core/.eslintrc.cjs delete mode 100644 packages/cli-generate-http-client/.eslintignore delete mode 100644 packages/cli-generate-http-client/.eslintrc.js delete mode 100644 packages/cli-generate-http-client/jest.config.js create mode 100644 packages/cli-generate-http-client/tsconfig.cjs.json create mode 100644 packages/cli-generate-http-client/tsconfig.spec.json create mode 100644 packages/cli-generate-http-client/vitest.config.mts delete mode 100644 packages/cli-generate-swagger/.eslintignore delete mode 100644 packages/cli-generate-swagger/.eslintrc.js delete mode 100644 packages/cli-generate-swagger/jest.config.js create mode 100644 packages/cli-generate-swagger/tsconfig.cjs.json create mode 100644 packages/cli-generate-swagger/tsconfig.spec.json create mode 100644 packages/cli-generate-swagger/vitest.config.mts delete mode 100644 packages/cli-plugin-eslint/.eslintignore delete mode 100644 packages/cli-plugin-eslint/.eslintrc.js delete mode 100644 packages/cli-plugin-eslint/jest.config.js create mode 100644 packages/cli-plugin-eslint/tsconfig.cjs.json create mode 100644 packages/cli-plugin-eslint/tsconfig.spec.json create mode 100644 packages/cli-plugin-eslint/vitest.config.mts delete mode 100644 packages/cli-plugin-jest/.eslintignore delete mode 100644 packages/cli-plugin-jest/.eslintrc.js delete mode 100644 packages/cli-plugin-jest/jest.config.js create mode 100644 packages/cli-plugin-jest/tsconfig.cjs.json create mode 100644 packages/cli-plugin-jest/tsconfig.spec.json create mode 100644 packages/cli-plugin-jest/vitest.config.mts delete mode 100644 packages/cli-plugin-mocha/.eslintignore delete mode 100644 packages/cli-plugin-mocha/.eslintrc.js delete mode 100644 packages/cli-plugin-mocha/jest.config.js create mode 100644 packages/cli-plugin-mocha/tsconfig.cjs.json create mode 100644 packages/cli-plugin-mocha/tsconfig.spec.json create mode 100644 packages/cli-plugin-mocha/vitest.config.mts delete mode 100644 packages/cli-plugin-mongoose/.eslintignore delete mode 100644 packages/cli-plugin-mongoose/.eslintrc.js delete mode 100644 packages/cli-plugin-mongoose/jest.config.js create mode 100644 packages/cli-plugin-mongoose/tsconfig.cjs.json create mode 100644 packages/cli-plugin-mongoose/tsconfig.spec.json create mode 100644 packages/cli-plugin-mongoose/vitest.config.mts delete mode 100644 packages/cli-plugin-oidc-provider/.eslintignore delete mode 100644 packages/cli-plugin-oidc-provider/.eslintrc.js delete mode 100644 packages/cli-plugin-oidc-provider/jest.config.js create mode 100644 packages/cli-plugin-oidc-provider/tsconfig.cjs.json create mode 100644 packages/cli-plugin-oidc-provider/tsconfig.spec.json create mode 100644 packages/cli-plugin-oidc-provider/vitest.config.mts delete mode 100644 packages/cli-plugin-passport/.eslintignore delete mode 100644 packages/cli-plugin-passport/.eslintrc.js delete mode 100644 packages/cli-plugin-passport/jest.config.js create mode 100644 packages/cli-plugin-passport/tsconfig.cjs.json create mode 100644 packages/cli-plugin-passport/tsconfig.spec.json create mode 100644 packages/cli-plugin-passport/vitest.config.mts delete mode 100644 packages/cli-plugin-prisma/.eslintignore delete mode 100644 packages/cli-plugin-prisma/.eslintrc.js delete mode 100644 packages/cli-plugin-prisma/jest.config.js create mode 100644 packages/cli-plugin-prisma/tsconfig.cjs.json create mode 100644 packages/cli-plugin-prisma/tsconfig.spec.json create mode 100644 packages/cli-plugin-prisma/vitest.config.mts delete mode 100644 packages/cli-plugin-typegraphql/.eslintignore delete mode 100644 packages/cli-plugin-typegraphql/.eslintrc.js delete mode 100644 packages/cli-plugin-typegraphql/jest.config.js create mode 100644 packages/cli-plugin-typegraphql/tsconfig.cjs.json create mode 100644 packages/cli-plugin-typegraphql/tsconfig.spec.json create mode 100644 packages/cli-plugin-typegraphql/vitest.config.mts delete mode 100644 packages/cli-plugin-typeorm/.eslintignore delete mode 100644 packages/cli-plugin-typeorm/.eslintrc.js delete mode 100644 packages/cli-plugin-typeorm/jest.config.js create mode 100644 packages/cli-plugin-typeorm/tsconfig.cjs.json create mode 100644 packages/cli-plugin-typeorm/tsconfig.spec.json create mode 100644 packages/cli-plugin-typeorm/vitest.config.mts delete mode 100644 packages/cli-plugin-vitest/.eslintignore delete mode 100644 packages/cli-plugin-vitest/.eslintrc.js delete mode 100644 packages/cli-plugin-vitest/jest.config.js create mode 100644 packages/cli-plugin-vitest/tsconfig.cjs.json create mode 100644 packages/cli-plugin-vitest/tsconfig.spec.json create mode 100644 packages/cli-plugin-vitest/vitest.config.mts delete mode 100644 packages/cli-testing/.eslintignore delete mode 100644 packages/cli-testing/.eslintrc.js delete mode 100644 packages/cli-testing/jest.config.js create mode 100644 packages/cli-testing/tsconfig.cjs.json create mode 100644 packages/cli-testing/tsconfig.spec.json create mode 100644 packages/cli-testing/vitest.config.mts delete mode 100644 packages/cli/.eslintignore delete mode 100644 packages/cli/.eslintrc.js delete mode 100644 packages/cli/jest.config.js create mode 100644 packages/cli/tsconfig.cjs.json create mode 100644 packages/cli/tsconfig.spec.json create mode 100644 packages/cli/vitest.config.mts delete mode 100644 tools/eslint/eslint.template.js delete mode 100644 tools/eslint/eslintignore.template delete mode 100644 tools/eslint/index.js delete mode 100644 tools/eslint/node.js delete mode 100644 tools/eslint/package.json create mode 100644 tsconfig.spec.json create mode 100644 vitest.workspace.mts diff --git a/.eslintignore b/.eslintignore deleted file mode 100644 index 24db06b42..000000000 --- a/.eslintignore +++ /dev/null @@ -1,15 +0,0 @@ -node_modules -docs -docs-references -**/lib -**/dist -**/coverage -**/.nyc_output -**/node_modules -*-lock.json -*.lock -benchmarks.* -**/generated -**/test/**/data - -*/**/*.js diff --git a/.eslintrc.js b/.eslintrc.js deleted file mode 100644 index e95a622f9..000000000 --- a/.eslintrc.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = { - ...require("@tsed/eslint/node.js") -}; diff --git a/.husky/pre-commit b/.husky/pre-commit index 49088de75..50e6d6ae2 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,4 +1,4 @@ #!/bin/sh . "$(dirname "$0")/_/husky.sh" -npx lint-staged $1 +#npx lint-staged $1 diff --git a/eslint.config.mjs b/eslint.config.mjs new file mode 100644 index 000000000..ab5b302b4 --- /dev/null +++ b/eslint.config.mjs @@ -0,0 +1,76 @@ +import typescriptEslint from "@typescript-eslint/eslint-plugin"; +import typescriptParser from "@typescript-eslint/parser"; +import pluginPrettierRecommended from "eslint-plugin-prettier/recommended"; +import pluginSimpleImportSort from "eslint-plugin-simple-import-sort"; +import vitest from "eslint-plugin-vitest"; +import pluginWorkspaces from "eslint-plugin-workspaces"; +import globals from "globals"; + +export default [ + { + ignores: ["coverage", "dist", "processes.config.js"] + }, + { + files: ["**/*.{js,mjs,cjs,jsx,mjsx,ts,tsx,mtsx}"], + languageOptions: { + ecmaVersion: "latest", + sourceType: "module", + parser: typescriptParser, + parserOptions: { + ecmaVersion: "latest", + sourceType: "module" + }, + globals: { + ...globals.node + } + }, + plugins: { + "@typescript-eslint": typescriptEslint + }, + rules: { + // "@typescript-eslint/lines-between-class-members": [ + // "error", + // "always", + // { exceptAfterOverload: true } + // ], + "@typescript-eslint/ban-ts-comment": 0, + "@typescript-eslint/camelcase": 0, + "@typescript-eslint/no-inferrable-types": 0, + "@typescript-eslint/explicit-function-return-type": 0, + "@typescript-eslint/explicit-module-boundary-types": 0, + "@typescript-eslint/no-unused-vars": 0, + "@typescript-eslint/no-explicit-any": 0, + "@typescript-eslint/no-non-null-assertion": 0 + } + }, + { + files: ["**/*.spec.{js,mjs,cjs,jsx,mjsx,ts,tsx,mtsx}"], // or any other pattern + plugins: { + vitest + }, + rules: { + ...vitest.configs.recommended.rules, // you can also use vitest.configs.all.rules to enable all rules + "vitest/consistent-test-it": [ + "error", + { fn: "it", withinDescribe: "it" } + ], + "vitest/no-alias-methods": "error" + } + }, + { + files: ["**/*.{js,mjs,cjs,jsx,mjsx,ts,tsx,mtsx}"], + languageOptions: { + parserOptions: {} + }, + plugins: { + "simple-import-sort": pluginSimpleImportSort, + workspaces: pluginWorkspaces + }, + rules: { + "simple-import-sort/imports": "error", + "simple-import-sort/exports": "error", + "workspaces/no-absolute-imports": "error" + } + }, + pluginPrettierRecommended +]; diff --git a/package.json b/package.json index f56de5c44..1f93f2ff1 100644 --- a/package.json +++ b/package.json @@ -7,10 +7,9 @@ "postinstall": "cd docs && yarn install", "configure": "monorepo ci configure", "clean": "monorepo clean workspace", - "test": "lerna run test --stream", + "test": "vitest run", "lint": "eslint '**/*.{ts,js}'", - "test:lint": "lerna run lint --stream", - "test:lint:fix": "lerna run lint:fix --stream", + "lint:fix": "eslint '**/*.{ts,js}' --fix", "coveralls": "nyc report --reporter=text-lcov | coveralls", "build": "monorepo build --verbose", "build:references": "node ./tools/typescript", @@ -23,7 +22,6 @@ "api:build": "lerna run build && tsdoc", "vuepress:build": "rm -rf ./docs/api && cd ./docs && yarn vuepress:build", "vuepress:serve": "vuepress dev docs", - "prettier": "prettier '**/*.{ts,js,json,md,yml,yaml}' --write", "release": "semantic-release", "release:dryRun": "semantic-release --dry-run", "prepare": "is-ci || husky install" @@ -64,7 +62,7 @@ "inquirer": "8.2.4", "inquirer-autocomplete-prompt": "2.0.0", "js-yaml": "4.1.0", - "lerna": "5.4.3", + "lerna": "8.1.8", "listr2": "5.0.5", "module-alias": "2.2.2", "read-pkg-up": "7.0.1", @@ -84,24 +82,25 @@ "@tsed/monorepo-utils": "2.3.5", "@tsed/ts-doc": "^4.1.0", "@types/node": "18.7.8", - "@typescript-eslint/eslint-plugin": "^5.33.1", - "@typescript-eslint/parser": "^5.33.1", + "@typescript-eslint/eslint-plugin": "8.5.0", + "@typescript-eslint/parser": "8.5.0", "@vitest/coverage-v8": "^2.1.1", "concurrently": "7.6.0", "coveralls": "3.1.1", "cross-env": "7.0.3", "entities": "1.1.2", - "eslint": "8.22.0", - "eslint-config-prettier": "8.5.0", - "eslint-plugin-mocha": "10.1.0", - "eslint-plugin-prettier": "4.2.1", + "eslint": "9.10.0", + "eslint-config-prettier": "9.1.0", + "eslint-plugin-prettier": "5.2.1", + "eslint-plugin-simple-import-sort": "12.1.1", + "eslint-plugin-vitest": "^0.5.4", "eslint-plugin-workspaces": "0.8.0", "gflow": "^5.1.2", "husky": "8.0.1", "is-ci": "3.0.1", "lint-staged": "13.0.3", "markdown-it": "13.0.1", - "prettier": "2.7.1", + "prettier": "3.3.3", "semantic-release": "23.0.2", "semantic-release-slack-bot": "4.0.2", "sinon": "14.0.0", diff --git a/packages/cli-core/.eslintignore b/packages/cli-core/.eslintignore deleted file mode 100644 index 2aab498ae..000000000 --- a/packages/cli-core/.eslintignore +++ /dev/null @@ -1,13 +0,0 @@ -node_modules -docs -docs-references -lib -dist -coverage -.nyc_output -*-lock.json -*.lock -benchmarks.* -**/generated - -**/*.js diff --git a/packages/cli-core/.eslintrc.cjs b/packages/cli-core/.eslintrc.cjs deleted file mode 100644 index 802f86f8b..000000000 --- a/packages/cli-core/.eslintrc.cjs +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@tsed/eslint/node.js"); diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index 34760e977..598fe8355 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -18,8 +18,6 @@ "scripts": { "build": "yarn build:ts", "build:ts": "tsc --build tsconfig.json", - "lint": "eslint '**/*.{ts,js}'", - "lint:fix": "eslint '**/*.{ts,js}' --fix", "test": "vitest run", "test:ci": "vitest run --coverage.thresholds.autoUpdate=true" }, @@ -71,7 +69,6 @@ "uuid": "^8.3.2" }, "devDependencies": { - "@tsed/eslint": "5.2.10", "@tsed/typescript": "workspace:*", "@types/axios": "0.14.0", "@types/commander": "2.12.2", @@ -89,7 +86,6 @@ "@types/uuid": "8.3.4", "cross-env": "7.0.3", "deps": "^1.0.0", - "eslint": "8.22.0", "typescript": "4.9.5", "vitest": "2.1.1" }, diff --git a/packages/cli-core/src/services/NpmRegistryClient.spec.ts b/packages/cli-core/src/services/NpmRegistryClient.spec.ts index 44619e48c..cf1a324e9 100644 --- a/packages/cli-core/src/services/NpmRegistryClient.spec.ts +++ b/packages/cli-core/src/services/NpmRegistryClient.spec.ts @@ -4,8 +4,8 @@ import {CliHttpClient} from "./CliHttpClient"; import {NpmRegistryClient} from "./NpmRegistryClient"; describe("NpmRegistryClient", () => { - beforeEach(CliPlatformTest.create); - afterEach(CliPlatformTest.reset); + beforeEach(() => CliPlatformTest.create()); + afterEach(() => CliPlatformTest.reset()); describe("search()", () => { it("should search packages", async () => { diff --git a/packages/cli-generate-http-client/.eslintignore b/packages/cli-generate-http-client/.eslintignore deleted file mode 100644 index 2aab498ae..000000000 --- a/packages/cli-generate-http-client/.eslintignore +++ /dev/null @@ -1,13 +0,0 @@ -node_modules -docs -docs-references -lib -dist -coverage -.nyc_output -*-lock.json -*.lock -benchmarks.* -**/generated - -**/*.js diff --git a/packages/cli-generate-http-client/.eslintrc.js b/packages/cli-generate-http-client/.eslintrc.js deleted file mode 100644 index 802f86f8b..000000000 --- a/packages/cli-generate-http-client/.eslintrc.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@tsed/eslint/node.js"); diff --git a/packages/cli-generate-http-client/.npmignore b/packages/cli-generate-http-client/.npmignore index 7f50c0fb8..672ed7652 100644 --- a/packages/cli-generate-http-client/.npmignore +++ b/packages/cli-generate-http-client/.npmignore @@ -1,4 +1,8 @@ src test -tsconfig.compile.json +coverage tsconfig.json +tsconfig.*.json +__mock__ +*.spec.js +*.tsbuildinfo diff --git a/packages/cli-generate-http-client/jest.config.js b/packages/cli-generate-http-client/jest.config.js deleted file mode 100644 index a61292c23..000000000 --- a/packages/cli-generate-http-client/jest.config.js +++ /dev/null @@ -1,14 +0,0 @@ -// For a detailed explanation regarding each configuration property, visit: -// https://jestjs.io/docs/en/configuration.html - -module.exports = { - ...require("@tsed/jest-config"), - coverageThreshold: { - global: { - statements: 0, - branches: 0, - functions: 0, - lines: 0 - } - } -}; diff --git a/packages/cli-generate-http-client/package.json b/packages/cli-generate-http-client/package.json index 98fcb8a69..88303d716 100644 --- a/packages/cli-generate-http-client/package.json +++ b/packages/cli-generate-http-client/package.json @@ -1,23 +1,25 @@ { "name": "@tsed/cli-generate-http-client", - "version": "5.2.10", "description": "Ts.ED CLI plugin. Export a command that generate an HTTP Client (axios or fetch) from your Ts.ED controllers and OS3 spec.", + "type": "commonjs", + "version": "5.2.10", "source": "./src/index.ts", "main": "./lib/cjs/index.js", "module": "./lib/esm/index.js", "typings": "./lib/types/index.d.ts", "exports": { - "types": "./lib/types/index.d.ts", - "import": "./lib/esm/index.js", - "require": "./lib/cjs/index.js", - "default": "./lib/esm/index.js" + ".": { + "types": "./lib/types/index.d.ts", + "import": "./lib/esm/index.js", + "require": "./lib/cjs/index.js", + "default": "./lib/esm/index.js" + } }, "scripts": { "build": "yarn build:ts", - "build:ts": "tsc --build tsconfig.json && tsc --build tsconfig.esm.json", - "lint": "eslint '**/*.{ts,js}'", - "lint:fix": "eslint '**/*.{ts,js}' --fix", - "test": "cross-env NODE_ENV=test yarn jest --max-workers=2 --passWithNoTests && jest-coverage-thresholds-bumper" + "build:ts": "tsc --build tsconfig.json", + "/test": "vitest run", + "/test:ci": "vitest run --coverage.thresholds.autoUpdate=true" }, "dependencies": { "change-case": "4.1.2", @@ -26,13 +28,11 @@ "devDependencies": { "@tsed/cli": "5.2.10", "@tsed/cli-core": "5.2.10", - "@tsed/eslint": "5.2.10", - "@tsed/jest-config": "5.2.10", - "@tsed/typescript": "5.2.10", + "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", - "eslint": "8.22.0", - "jest": "29.5.0", - "swagger-typescript-api": "^9.3.1" + "swagger-typescript-api": "^9.3.1", + "typescript": "4.9.5", + "vitest": "2.1.1" }, "peerDependencies": { "@tsed/common": ">=7.14.2", diff --git a/packages/cli-generate-http-client/tsconfig.cjs.json b/packages/cli-generate-http-client/tsconfig.cjs.json new file mode 100644 index 000000000..7f23b116d --- /dev/null +++ b/packages/cli-generate-http-client/tsconfig.cjs.json @@ -0,0 +1,28 @@ +{ + "extends": "@tsed/typescript/tsconfig.node.json", + "compilerOptions": { + "baseUrl": ".", + "module": "commonjs", + "moduleResolution": "Node16", + "rootDir": "src", + "outDir": "./lib/cjs", + "declaration": true, + "declarationDir": "./lib/types", + "composite": true, + "noEmit": false + }, + "include": ["src", "src/**/*.json"], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage", + "spec", + "**/*.benchmark.ts", + "**/*.spec.ts", + "keys", + "**/__mock__/**", + "webpack.config.js" + ] +} diff --git a/packages/cli-generate-http-client/tsconfig.esm.json b/packages/cli-generate-http-client/tsconfig.esm.json index a500944d9..ce32a9e07 100644 --- a/packages/cli-generate-http-client/tsconfig.esm.json +++ b/packages/cli-generate-http-client/tsconfig.esm.json @@ -2,18 +2,16 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ES2020", + "module": "ESNext", + "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", + "declarationDir": "./lib/types-esm", "declaration": true, - "declarationDir": "./lib/types", "composite": true, "noEmit": false }, - "include": [ - "src", - "src/**/*.json" - ], + "include": ["src", "src/**/*.json"], "exclude": [ "node_modules", "test", @@ -24,16 +22,7 @@ "**/*.benchmark.ts", "**/*.spec.ts", "keys", - "jest.config.js", "**/__mock__/**", "webpack.config.js" - ], - "references": [ - { - "path": "../cli" - }, - { - "path": "../cli-core" - } ] } diff --git a/packages/cli-generate-http-client/tsconfig.json b/packages/cli-generate-http-client/tsconfig.json index 8f91fe8dc..8c80e7e4f 100644 --- a/packages/cli-generate-http-client/tsconfig.json +++ b/packages/cli-generate-http-client/tsconfig.json @@ -2,38 +2,21 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "commonjs", - "rootDir": "src", - "outDir": "./lib/cjs", - "declaration": true, - "declarationDir": "./lib/types", - "composite": true, - "noEmit": false + "noEmit": true }, - "include": [ - "src", - "src/**/*.json" - ], - "exclude": [ - "node_modules", - "test", - "lib", - "benchmark", - "coverage", - "spec", - "**/*.benchmark.ts", - "**/*.spec.ts", - "keys", - "jest.config.js", - "**/__mock__/**", - "webpack.config.js" - ], + "include": [], "references": [ { - "path": "../cli" + "path": "../cli/tsconfig.json" }, { - "path": "../cli-core" + "path": "../cli-core/tsconfig.json" + }, + { + "path": "./tsconfig.cjs.json" + }, + { + "path": "./tsconfig.esm.json" } ] } diff --git a/packages/cli-generate-http-client/tsconfig.spec.json b/packages/cli-generate-http-client/tsconfig.spec.json new file mode 100644 index 000000000..079424388 --- /dev/null +++ b/packages/cli-generate-http-client/tsconfig.spec.json @@ -0,0 +1,36 @@ +{ + "extends": "@tsed/typescript/tsconfig.node.json", + "compilerOptions": { + "baseUrl": ".", + "rootDir": "..", + "module": "commonjs", + "outDir": "./lib/cjs", + "declaration": false, + "composite": false, + "noEmit": true, + "paths": { + "@tsed/openspec": ["../specs/openspec/src"], + "@tsed/schema": ["../specs/schema/src"], + "@tsed/exceptions": ["../specs/exceptions/src"], + "@tsed/json-mapper": ["../specs/json-mapper/src"], + "@tsed/platform-exceptions": ["../platform/platform-exceptions/src"], + "@tsed/platform-middlewares": ["../platform/platform-middlewares/src"], + "@tsed/platform-params": ["../platform/platform-params/src"], + "@tsed/platform-log-middleware": ["../platform/platform-log-middleware/src"], + "@tsed/platform-response-filter": ["../platform/platform-response-filter/src"], + "@tsed/platform-router": ["../platform/platform-router/src"], + "@tsed/platform-views": ["../platform/platform-views/src"], + "@tsed/components-scan": ["../third-parties/components-scan/src"], + "@tsed/common": ["../platform/common/src"], + "@tsed/ajv": ["../specs/ajv/src"], + "@tsed/platform-cache": ["../platform/platform-cache/src"], + "@tsed/swagger": ["../specs/swagger/src"], + "@tsed/platform-test-sdk": ["../platform/platform-test-sdk/src"], + "@tsed/platform-express": ["../platform/platform-express/src"], + "@tsed/platform-koa": ["../platform/platform-koa/src"] + }, + "types": ["vite/client", "vitest/globals"] + }, + "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], + "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] +} diff --git a/packages/cli-generate-http-client/vitest.config.mts b/packages/cli-generate-http-client/vitest.config.mts new file mode 100644 index 000000000..d759e8179 --- /dev/null +++ b/packages/cli-generate-http-client/vitest.config.mts @@ -0,0 +1,21 @@ +// @ts-ignore +import {presets} from "@tsed/vitest/presets"; +import {defineConfig} from "vitest/config"; + +export default defineConfig( + { + ...presets, + test: { + ...presets.test, + coverage: { + ...presets.test.coverage, + thresholds: { + statements: 0, + branches: 0, + functions: 0, + lines: 0 + } + } + } + } +); diff --git a/packages/cli-generate-swagger/.eslintignore b/packages/cli-generate-swagger/.eslintignore deleted file mode 100644 index 2aab498ae..000000000 --- a/packages/cli-generate-swagger/.eslintignore +++ /dev/null @@ -1,13 +0,0 @@ -node_modules -docs -docs-references -lib -dist -coverage -.nyc_output -*-lock.json -*.lock -benchmarks.* -**/generated - -**/*.js diff --git a/packages/cli-generate-swagger/.eslintrc.js b/packages/cli-generate-swagger/.eslintrc.js deleted file mode 100644 index 802f86f8b..000000000 --- a/packages/cli-generate-swagger/.eslintrc.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@tsed/eslint/node.js"); diff --git a/packages/cli-generate-swagger/.npmignore b/packages/cli-generate-swagger/.npmignore index 7f50c0fb8..672ed7652 100644 --- a/packages/cli-generate-swagger/.npmignore +++ b/packages/cli-generate-swagger/.npmignore @@ -1,4 +1,8 @@ src test -tsconfig.compile.json +coverage tsconfig.json +tsconfig.*.json +__mock__ +*.spec.js +*.tsbuildinfo diff --git a/packages/cli-generate-swagger/jest.config.js b/packages/cli-generate-swagger/jest.config.js deleted file mode 100644 index a61292c23..000000000 --- a/packages/cli-generate-swagger/jest.config.js +++ /dev/null @@ -1,14 +0,0 @@ -// For a detailed explanation regarding each configuration property, visit: -// https://jestjs.io/docs/en/configuration.html - -module.exports = { - ...require("@tsed/jest-config"), - coverageThreshold: { - global: { - statements: 0, - branches: 0, - functions: 0, - lines: 0 - } - } -}; diff --git a/packages/cli-generate-swagger/package.json b/packages/cli-generate-swagger/package.json index 5338510d6..d50281eea 100644 --- a/packages/cli-generate-swagger/package.json +++ b/packages/cli-generate-swagger/package.json @@ -1,23 +1,25 @@ { "name": "@tsed/cli-generate-swagger", - "version": "5.2.10", "description": "Ts.ED CLI plugin. Export a command that generate the swagger.json from your Ts.ED controllers and OS3 spec.", + "type": "commonjs", + "version": "5.2.10", "source": "./src/index.ts", "main": "./lib/cjs/index.js", "module": "./lib/esm/index.js", "typings": "./lib/types/index.d.ts", "exports": { - "types": "./lib/types/index.d.ts", - "import": "./lib/esm/index.js", - "require": "./lib/cjs/index.js", - "default": "./lib/esm/index.js" + ".": { + "types": "./lib/types/index.d.ts", + "import": "./lib/esm/index.js", + "require": "./lib/cjs/index.js", + "default": "./lib/esm/index.js" + } }, "scripts": { "build": "yarn build:ts", - "build:ts": "tsc --build tsconfig.json && tsc --build tsconfig.esm.json", - "lint": "eslint '**/*.{ts,js}'", - "lint:fix": "eslint '**/*.{ts,js}' --fix", - "test": "cross-env NODE_ENV=test yarn jest --max-workers=2 --passWithNoTests && jest-coverage-thresholds-bumper" + "build:ts": "tsc --build tsconfig.json", + "/test": "vitest run", + "/test:ci": "vitest run --coverage.thresholds.autoUpdate=true" }, "dependencies": { "change-case": "4.1.2", @@ -26,12 +28,10 @@ "devDependencies": { "@tsed/cli": "5.2.10", "@tsed/cli-core": "5.2.10", - "@tsed/eslint": "5.2.10", - "@tsed/jest-config": "5.2.10", - "@tsed/typescript": "5.2.10", + "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", - "eslint": "8.22.0", - "jest": "29.5.0" + "typescript": "4.9.5", + "vitest": "2.1.1" }, "peerDependencies": { "@tsed/common": ">=7.14.2", diff --git a/packages/cli-generate-swagger/tsconfig.cjs.json b/packages/cli-generate-swagger/tsconfig.cjs.json new file mode 100644 index 000000000..7f23b116d --- /dev/null +++ b/packages/cli-generate-swagger/tsconfig.cjs.json @@ -0,0 +1,28 @@ +{ + "extends": "@tsed/typescript/tsconfig.node.json", + "compilerOptions": { + "baseUrl": ".", + "module": "commonjs", + "moduleResolution": "Node16", + "rootDir": "src", + "outDir": "./lib/cjs", + "declaration": true, + "declarationDir": "./lib/types", + "composite": true, + "noEmit": false + }, + "include": ["src", "src/**/*.json"], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage", + "spec", + "**/*.benchmark.ts", + "**/*.spec.ts", + "keys", + "**/__mock__/**", + "webpack.config.js" + ] +} diff --git a/packages/cli-generate-swagger/tsconfig.esm.json b/packages/cli-generate-swagger/tsconfig.esm.json index a500944d9..ce32a9e07 100644 --- a/packages/cli-generate-swagger/tsconfig.esm.json +++ b/packages/cli-generate-swagger/tsconfig.esm.json @@ -2,18 +2,16 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ES2020", + "module": "ESNext", + "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", + "declarationDir": "./lib/types-esm", "declaration": true, - "declarationDir": "./lib/types", "composite": true, "noEmit": false }, - "include": [ - "src", - "src/**/*.json" - ], + "include": ["src", "src/**/*.json"], "exclude": [ "node_modules", "test", @@ -24,16 +22,7 @@ "**/*.benchmark.ts", "**/*.spec.ts", "keys", - "jest.config.js", "**/__mock__/**", "webpack.config.js" - ], - "references": [ - { - "path": "../cli" - }, - { - "path": "../cli-core" - } ] } diff --git a/packages/cli-generate-swagger/tsconfig.json b/packages/cli-generate-swagger/tsconfig.json index 8f91fe8dc..8c80e7e4f 100644 --- a/packages/cli-generate-swagger/tsconfig.json +++ b/packages/cli-generate-swagger/tsconfig.json @@ -2,38 +2,21 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "commonjs", - "rootDir": "src", - "outDir": "./lib/cjs", - "declaration": true, - "declarationDir": "./lib/types", - "composite": true, - "noEmit": false + "noEmit": true }, - "include": [ - "src", - "src/**/*.json" - ], - "exclude": [ - "node_modules", - "test", - "lib", - "benchmark", - "coverage", - "spec", - "**/*.benchmark.ts", - "**/*.spec.ts", - "keys", - "jest.config.js", - "**/__mock__/**", - "webpack.config.js" - ], + "include": [], "references": [ { - "path": "../cli" + "path": "../cli/tsconfig.json" }, { - "path": "../cli-core" + "path": "../cli-core/tsconfig.json" + }, + { + "path": "./tsconfig.cjs.json" + }, + { + "path": "./tsconfig.esm.json" } ] } diff --git a/packages/cli-generate-swagger/tsconfig.spec.json b/packages/cli-generate-swagger/tsconfig.spec.json new file mode 100644 index 000000000..079424388 --- /dev/null +++ b/packages/cli-generate-swagger/tsconfig.spec.json @@ -0,0 +1,36 @@ +{ + "extends": "@tsed/typescript/tsconfig.node.json", + "compilerOptions": { + "baseUrl": ".", + "rootDir": "..", + "module": "commonjs", + "outDir": "./lib/cjs", + "declaration": false, + "composite": false, + "noEmit": true, + "paths": { + "@tsed/openspec": ["../specs/openspec/src"], + "@tsed/schema": ["../specs/schema/src"], + "@tsed/exceptions": ["../specs/exceptions/src"], + "@tsed/json-mapper": ["../specs/json-mapper/src"], + "@tsed/platform-exceptions": ["../platform/platform-exceptions/src"], + "@tsed/platform-middlewares": ["../platform/platform-middlewares/src"], + "@tsed/platform-params": ["../platform/platform-params/src"], + "@tsed/platform-log-middleware": ["../platform/platform-log-middleware/src"], + "@tsed/platform-response-filter": ["../platform/platform-response-filter/src"], + "@tsed/platform-router": ["../platform/platform-router/src"], + "@tsed/platform-views": ["../platform/platform-views/src"], + "@tsed/components-scan": ["../third-parties/components-scan/src"], + "@tsed/common": ["../platform/common/src"], + "@tsed/ajv": ["../specs/ajv/src"], + "@tsed/platform-cache": ["../platform/platform-cache/src"], + "@tsed/swagger": ["../specs/swagger/src"], + "@tsed/platform-test-sdk": ["../platform/platform-test-sdk/src"], + "@tsed/platform-express": ["../platform/platform-express/src"], + "@tsed/platform-koa": ["../platform/platform-koa/src"] + }, + "types": ["vite/client", "vitest/globals"] + }, + "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], + "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] +} diff --git a/packages/cli-generate-swagger/vitest.config.mts b/packages/cli-generate-swagger/vitest.config.mts new file mode 100644 index 000000000..d759e8179 --- /dev/null +++ b/packages/cli-generate-swagger/vitest.config.mts @@ -0,0 +1,21 @@ +// @ts-ignore +import {presets} from "@tsed/vitest/presets"; +import {defineConfig} from "vitest/config"; + +export default defineConfig( + { + ...presets, + test: { + ...presets.test, + coverage: { + ...presets.test.coverage, + thresholds: { + statements: 0, + branches: 0, + functions: 0, + lines: 0 + } + } + } + } +); diff --git a/packages/cli-plugin-eslint/.eslintignore b/packages/cli-plugin-eslint/.eslintignore deleted file mode 100644 index 2aab498ae..000000000 --- a/packages/cli-plugin-eslint/.eslintignore +++ /dev/null @@ -1,13 +0,0 @@ -node_modules -docs -docs-references -lib -dist -coverage -.nyc_output -*-lock.json -*.lock -benchmarks.* -**/generated - -**/*.js diff --git a/packages/cli-plugin-eslint/.eslintrc.js b/packages/cli-plugin-eslint/.eslintrc.js deleted file mode 100644 index 802f86f8b..000000000 --- a/packages/cli-plugin-eslint/.eslintrc.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@tsed/eslint/node.js"); diff --git a/packages/cli-plugin-eslint/.npmignore b/packages/cli-plugin-eslint/.npmignore index 7f50c0fb8..672ed7652 100644 --- a/packages/cli-plugin-eslint/.npmignore +++ b/packages/cli-plugin-eslint/.npmignore @@ -1,4 +1,8 @@ src test -tsconfig.compile.json +coverage tsconfig.json +tsconfig.*.json +__mock__ +*.spec.js +*.tsbuildinfo diff --git a/packages/cli-plugin-eslint/jest.config.js b/packages/cli-plugin-eslint/jest.config.js deleted file mode 100644 index a61292c23..000000000 --- a/packages/cli-plugin-eslint/jest.config.js +++ /dev/null @@ -1,14 +0,0 @@ -// For a detailed explanation regarding each configuration property, visit: -// https://jestjs.io/docs/en/configuration.html - -module.exports = { - ...require("@tsed/jest-config"), - coverageThreshold: { - global: { - statements: 0, - branches: 0, - functions: 0, - lines: 0 - } - } -}; diff --git a/packages/cli-plugin-eslint/package.json b/packages/cli-plugin-eslint/package.json index ac799e773..af260ae94 100644 --- a/packages/cli-plugin-eslint/package.json +++ b/packages/cli-plugin-eslint/package.json @@ -1,33 +1,33 @@ { "name": "@tsed/cli-plugin-eslint", - "version": "5.2.10", "description": "Ts.ED CLI plugin. Add EsLint support", + "type": "commonjs", + "version": "5.2.10", "source": "./src/index.ts", "main": "./lib/cjs/index.js", "module": "./lib/esm/index.js", "typings": "./lib/types/index.d.ts", "exports": { - "types": "./lib/types/index.d.ts", - "import": "./lib/esm/index.js", - "require": "./lib/cjs/index.js", - "default": "./lib/esm/index.js" + ".": { + "types": "./lib/types/index.d.ts", + "import": "./lib/esm/index.js", + "require": "./lib/cjs/index.js", + "default": "./lib/esm/index.js" + } }, "scripts": { "build": "yarn build:ts", - "build:ts": "tsc --build tsconfig.json && tsc --build tsconfig.esm.json && cp scripts/templateDir.esm.js lib/esm/utils/templateDir.js", - "lint": "eslint '**/*.{ts,js}'", - "lint:fix": "eslint '**/*.{ts,js}' --fix", - "test": "cross-env NODE_ENV=test yarn jest --max-workers=2 --passWithNoTests && jest-coverage-thresholds-bumper" + "build:ts": "tsc --build tsconfig.json", + "/test": "vitest run", + "/test:ci": "vitest run --coverage.thresholds.autoUpdate=true" }, "devDependencies": { "@tsed/cli": "5.2.10", "@tsed/cli-core": "5.2.10", - "@tsed/eslint": "5.2.10", - "@tsed/jest-config": "5.2.10", - "@tsed/typescript": "5.2.10", + "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", - "eslint": "8.22.0", - "jest": "29.5.0" + "typescript": "4.9.5", + "vitest": "2.1.1" }, "dependencies": { "tslib": "2.3.1" diff --git a/packages/cli-plugin-eslint/tsconfig.cjs.json b/packages/cli-plugin-eslint/tsconfig.cjs.json new file mode 100644 index 000000000..7f23b116d --- /dev/null +++ b/packages/cli-plugin-eslint/tsconfig.cjs.json @@ -0,0 +1,28 @@ +{ + "extends": "@tsed/typescript/tsconfig.node.json", + "compilerOptions": { + "baseUrl": ".", + "module": "commonjs", + "moduleResolution": "Node16", + "rootDir": "src", + "outDir": "./lib/cjs", + "declaration": true, + "declarationDir": "./lib/types", + "composite": true, + "noEmit": false + }, + "include": ["src", "src/**/*.json"], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage", + "spec", + "**/*.benchmark.ts", + "**/*.spec.ts", + "keys", + "**/__mock__/**", + "webpack.config.js" + ] +} diff --git a/packages/cli-plugin-eslint/tsconfig.esm.json b/packages/cli-plugin-eslint/tsconfig.esm.json index a500944d9..ce32a9e07 100644 --- a/packages/cli-plugin-eslint/tsconfig.esm.json +++ b/packages/cli-plugin-eslint/tsconfig.esm.json @@ -2,18 +2,16 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ES2020", + "module": "ESNext", + "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", + "declarationDir": "./lib/types-esm", "declaration": true, - "declarationDir": "./lib/types", "composite": true, "noEmit": false }, - "include": [ - "src", - "src/**/*.json" - ], + "include": ["src", "src/**/*.json"], "exclude": [ "node_modules", "test", @@ -24,16 +22,7 @@ "**/*.benchmark.ts", "**/*.spec.ts", "keys", - "jest.config.js", "**/__mock__/**", "webpack.config.js" - ], - "references": [ - { - "path": "../cli" - }, - { - "path": "../cli-core" - } ] } diff --git a/packages/cli-plugin-eslint/tsconfig.json b/packages/cli-plugin-eslint/tsconfig.json index 8f91fe8dc..8c80e7e4f 100644 --- a/packages/cli-plugin-eslint/tsconfig.json +++ b/packages/cli-plugin-eslint/tsconfig.json @@ -2,38 +2,21 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "commonjs", - "rootDir": "src", - "outDir": "./lib/cjs", - "declaration": true, - "declarationDir": "./lib/types", - "composite": true, - "noEmit": false + "noEmit": true }, - "include": [ - "src", - "src/**/*.json" - ], - "exclude": [ - "node_modules", - "test", - "lib", - "benchmark", - "coverage", - "spec", - "**/*.benchmark.ts", - "**/*.spec.ts", - "keys", - "jest.config.js", - "**/__mock__/**", - "webpack.config.js" - ], + "include": [], "references": [ { - "path": "../cli" + "path": "../cli/tsconfig.json" }, { - "path": "../cli-core" + "path": "../cli-core/tsconfig.json" + }, + { + "path": "./tsconfig.cjs.json" + }, + { + "path": "./tsconfig.esm.json" } ] } diff --git a/packages/cli-plugin-eslint/tsconfig.spec.json b/packages/cli-plugin-eslint/tsconfig.spec.json new file mode 100644 index 000000000..079424388 --- /dev/null +++ b/packages/cli-plugin-eslint/tsconfig.spec.json @@ -0,0 +1,36 @@ +{ + "extends": "@tsed/typescript/tsconfig.node.json", + "compilerOptions": { + "baseUrl": ".", + "rootDir": "..", + "module": "commonjs", + "outDir": "./lib/cjs", + "declaration": false, + "composite": false, + "noEmit": true, + "paths": { + "@tsed/openspec": ["../specs/openspec/src"], + "@tsed/schema": ["../specs/schema/src"], + "@tsed/exceptions": ["../specs/exceptions/src"], + "@tsed/json-mapper": ["../specs/json-mapper/src"], + "@tsed/platform-exceptions": ["../platform/platform-exceptions/src"], + "@tsed/platform-middlewares": ["../platform/platform-middlewares/src"], + "@tsed/platform-params": ["../platform/platform-params/src"], + "@tsed/platform-log-middleware": ["../platform/platform-log-middleware/src"], + "@tsed/platform-response-filter": ["../platform/platform-response-filter/src"], + "@tsed/platform-router": ["../platform/platform-router/src"], + "@tsed/platform-views": ["../platform/platform-views/src"], + "@tsed/components-scan": ["../third-parties/components-scan/src"], + "@tsed/common": ["../platform/common/src"], + "@tsed/ajv": ["../specs/ajv/src"], + "@tsed/platform-cache": ["../platform/platform-cache/src"], + "@tsed/swagger": ["../specs/swagger/src"], + "@tsed/platform-test-sdk": ["../platform/platform-test-sdk/src"], + "@tsed/platform-express": ["../platform/platform-express/src"], + "@tsed/platform-koa": ["../platform/platform-koa/src"] + }, + "types": ["vite/client", "vitest/globals"] + }, + "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], + "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] +} diff --git a/packages/cli-plugin-eslint/vitest.config.mts b/packages/cli-plugin-eslint/vitest.config.mts new file mode 100644 index 000000000..d759e8179 --- /dev/null +++ b/packages/cli-plugin-eslint/vitest.config.mts @@ -0,0 +1,21 @@ +// @ts-ignore +import {presets} from "@tsed/vitest/presets"; +import {defineConfig} from "vitest/config"; + +export default defineConfig( + { + ...presets, + test: { + ...presets.test, + coverage: { + ...presets.test.coverage, + thresholds: { + statements: 0, + branches: 0, + functions: 0, + lines: 0 + } + } + } + } +); diff --git a/packages/cli-plugin-jest/.eslintignore b/packages/cli-plugin-jest/.eslintignore deleted file mode 100644 index 2aab498ae..000000000 --- a/packages/cli-plugin-jest/.eslintignore +++ /dev/null @@ -1,13 +0,0 @@ -node_modules -docs -docs-references -lib -dist -coverage -.nyc_output -*-lock.json -*.lock -benchmarks.* -**/generated - -**/*.js diff --git a/packages/cli-plugin-jest/.eslintrc.js b/packages/cli-plugin-jest/.eslintrc.js deleted file mode 100644 index 802f86f8b..000000000 --- a/packages/cli-plugin-jest/.eslintrc.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@tsed/eslint/node.js"); diff --git a/packages/cli-plugin-jest/.npmignore b/packages/cli-plugin-jest/.npmignore index 7f50c0fb8..672ed7652 100644 --- a/packages/cli-plugin-jest/.npmignore +++ b/packages/cli-plugin-jest/.npmignore @@ -1,4 +1,8 @@ src test -tsconfig.compile.json +coverage tsconfig.json +tsconfig.*.json +__mock__ +*.spec.js +*.tsbuildinfo diff --git a/packages/cli-plugin-jest/jest.config.js b/packages/cli-plugin-jest/jest.config.js deleted file mode 100644 index 7cf703d73..000000000 --- a/packages/cli-plugin-jest/jest.config.js +++ /dev/null @@ -1,15 +0,0 @@ -// For a detailed explanation regarding each configuration property, visit: -// https://jestjs.io/docs/en/configuration.html - -module.exports = { - ...require("@tsed/jest-config"), - roots: ["/src", "/test"], - coverageThreshold: { - global: { - statements: 80, - branches: 37.5, - functions: 60, - lines: 80 - } - } -}; diff --git a/packages/cli-plugin-jest/package.json b/packages/cli-plugin-jest/package.json index 6879db02b..f771cad9e 100644 --- a/packages/cli-plugin-jest/package.json +++ b/packages/cli-plugin-jest/package.json @@ -1,33 +1,33 @@ { "name": "@tsed/cli-plugin-jest", - "version": "5.2.10", "description": "Ts.ED CLI plugin. Add Jest support", + "type": "commonjs", + "version": "5.2.10", "source": "./src/index.ts", "main": "./lib/cjs/index.js", "module": "./lib/esm/index.js", "typings": "./lib/types/index.d.ts", "exports": { - "types": "./lib/types/index.d.ts", - "import": "./lib/esm/index.js", - "require": "./lib/cjs/index.js", - "default": "./lib/esm/index.js" + ".": { + "types": "./lib/types/index.d.ts", + "import": "./lib/esm/index.js", + "require": "./lib/cjs/index.js", + "default": "./lib/esm/index.js" + } }, "scripts": { "build": "yarn build:ts", - "build:ts": "tsc --build tsconfig.json && tsc --build tsconfig.esm.json && cp scripts/templateDir.esm.js lib/esm/utils/templateDir.js", - "lint": "eslint '**/*.{ts,js}'", - "lint:fix": "eslint '**/*.{ts,js}' --fix", - "test": "cross-env NODE_ENV=test yarn jest --max-workers=2 --passWithNoTests && jest-coverage-thresholds-bumper" + "build:ts": "tsc --build tsconfig.json", + "test": "vitest run", + "test:ci": "vitest run --coverage.thresholds.autoUpdate=true" }, "devDependencies": { "@tsed/cli": "5.2.10", "@tsed/cli-core": "5.2.10", - "@tsed/eslint": "5.2.10", - "@tsed/jest-config": "5.2.10", - "@tsed/typescript": "5.2.10", + "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", - "eslint": "8.22.0", - "jest": "29.5.0" + "typescript": "4.9.5", + "vitest": "2.1.1" }, "dependencies": { "tslib": "2.3.1" diff --git a/packages/cli-plugin-jest/src/hooks/JestInitHook.ts b/packages/cli-plugin-jest/src/hooks/JestInitHook.ts index ab8122b5c..a14739b08 100644 --- a/packages/cli-plugin-jest/src/hooks/JestInitHook.ts +++ b/packages/cli-plugin-jest/src/hooks/JestInitHook.ts @@ -29,7 +29,7 @@ export class JestInitHook { { title: "Generate files for jest", task: (ctx: any) => { - return this.rootRenderer.renderAll(["jest.config.js.hbs"], ctx, { + return this.rootRenderer.renderAll(["vi.config.js.hbs"], ctx, { templateDir: `${TEMPLATE_DIR}/init` }); } diff --git a/packages/cli-plugin-jest/tsconfig.cjs.json b/packages/cli-plugin-jest/tsconfig.cjs.json new file mode 100644 index 000000000..7f23b116d --- /dev/null +++ b/packages/cli-plugin-jest/tsconfig.cjs.json @@ -0,0 +1,28 @@ +{ + "extends": "@tsed/typescript/tsconfig.node.json", + "compilerOptions": { + "baseUrl": ".", + "module": "commonjs", + "moduleResolution": "Node16", + "rootDir": "src", + "outDir": "./lib/cjs", + "declaration": true, + "declarationDir": "./lib/types", + "composite": true, + "noEmit": false + }, + "include": ["src", "src/**/*.json"], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage", + "spec", + "**/*.benchmark.ts", + "**/*.spec.ts", + "keys", + "**/__mock__/**", + "webpack.config.js" + ] +} diff --git a/packages/cli-plugin-jest/tsconfig.esm.json b/packages/cli-plugin-jest/tsconfig.esm.json index a500944d9..ce32a9e07 100644 --- a/packages/cli-plugin-jest/tsconfig.esm.json +++ b/packages/cli-plugin-jest/tsconfig.esm.json @@ -2,18 +2,16 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ES2020", + "module": "ESNext", + "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", + "declarationDir": "./lib/types-esm", "declaration": true, - "declarationDir": "./lib/types", "composite": true, "noEmit": false }, - "include": [ - "src", - "src/**/*.json" - ], + "include": ["src", "src/**/*.json"], "exclude": [ "node_modules", "test", @@ -24,16 +22,7 @@ "**/*.benchmark.ts", "**/*.spec.ts", "keys", - "jest.config.js", "**/__mock__/**", "webpack.config.js" - ], - "references": [ - { - "path": "../cli" - }, - { - "path": "../cli-core" - } ] } diff --git a/packages/cli-plugin-jest/tsconfig.json b/packages/cli-plugin-jest/tsconfig.json index 8f91fe8dc..705b5ce35 100644 --- a/packages/cli-plugin-jest/tsconfig.json +++ b/packages/cli-plugin-jest/tsconfig.json @@ -2,38 +2,24 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "commonjs", - "rootDir": "src", - "outDir": "./lib/cjs", - "declaration": true, - "declarationDir": "./lib/types", - "composite": true, - "noEmit": false + "noEmit": true }, - "include": [ - "src", - "src/**/*.json" - ], - "exclude": [ - "node_modules", - "test", - "lib", - "benchmark", - "coverage", - "spec", - "**/*.benchmark.ts", - "**/*.spec.ts", - "keys", - "jest.config.js", - "**/__mock__/**", - "webpack.config.js" - ], + "include": [], "references": [ { - "path": "../cli" + "path": "../cli/tsconfig.json" }, { - "path": "../cli-core" + "path": "../cli-core/tsconfig.json" + }, + { + "path": "./tsconfig.cjs.json" + }, + { + "path": "./tsconfig.esm.json" + }, + { + "path": "./tsconfig.spec.json" } ] } diff --git a/packages/cli-plugin-jest/tsconfig.spec.json b/packages/cli-plugin-jest/tsconfig.spec.json new file mode 100644 index 000000000..75fcfa09d --- /dev/null +++ b/packages/cli-plugin-jest/tsconfig.spec.json @@ -0,0 +1,29 @@ +{ + "extends": "@tsed/typescript/tsconfig.node.json", + "compilerOptions": { + "baseUrl": ".", + "rootDir": "..", + "module": "commonjs", + "outDir": "./lib/cjs", + "declaration": false, + "composite": false, + "noEmit": true, + "paths": {}, + "types": [ + "vite/client", + "vitest/globals" + ] + }, + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] +} diff --git a/packages/cli-plugin-jest/vitest.config.mts b/packages/cli-plugin-jest/vitest.config.mts new file mode 100644 index 000000000..d759e8179 --- /dev/null +++ b/packages/cli-plugin-jest/vitest.config.mts @@ -0,0 +1,21 @@ +// @ts-ignore +import {presets} from "@tsed/vitest/presets"; +import {defineConfig} from "vitest/config"; + +export default defineConfig( + { + ...presets, + test: { + ...presets.test, + coverage: { + ...presets.test.coverage, + thresholds: { + statements: 0, + branches: 0, + functions: 0, + lines: 0 + } + } + } + } +); diff --git a/packages/cli-plugin-mocha/.eslintignore b/packages/cli-plugin-mocha/.eslintignore deleted file mode 100644 index 2aab498ae..000000000 --- a/packages/cli-plugin-mocha/.eslintignore +++ /dev/null @@ -1,13 +0,0 @@ -node_modules -docs -docs-references -lib -dist -coverage -.nyc_output -*-lock.json -*.lock -benchmarks.* -**/generated - -**/*.js diff --git a/packages/cli-plugin-mocha/.eslintrc.js b/packages/cli-plugin-mocha/.eslintrc.js deleted file mode 100644 index 802f86f8b..000000000 --- a/packages/cli-plugin-mocha/.eslintrc.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@tsed/eslint/node.js"); diff --git a/packages/cli-plugin-mocha/.npmignore b/packages/cli-plugin-mocha/.npmignore index 7f50c0fb8..672ed7652 100644 --- a/packages/cli-plugin-mocha/.npmignore +++ b/packages/cli-plugin-mocha/.npmignore @@ -1,4 +1,8 @@ src test -tsconfig.compile.json +coverage tsconfig.json +tsconfig.*.json +__mock__ +*.spec.js +*.tsbuildinfo diff --git a/packages/cli-plugin-mocha/jest.config.js b/packages/cli-plugin-mocha/jest.config.js deleted file mode 100644 index a61292c23..000000000 --- a/packages/cli-plugin-mocha/jest.config.js +++ /dev/null @@ -1,14 +0,0 @@ -// For a detailed explanation regarding each configuration property, visit: -// https://jestjs.io/docs/en/configuration.html - -module.exports = { - ...require("@tsed/jest-config"), - coverageThreshold: { - global: { - statements: 0, - branches: 0, - functions: 0, - lines: 0 - } - } -}; diff --git a/packages/cli-plugin-mocha/package.json b/packages/cli-plugin-mocha/package.json index fb699fdb3..4654c96cc 100644 --- a/packages/cli-plugin-mocha/package.json +++ b/packages/cli-plugin-mocha/package.json @@ -1,33 +1,33 @@ { "name": "@tsed/cli-plugin-mocha", - "version": "5.2.10", "description": "Ts.ED CLI plugin. Add Mocha support", + "type": "commonjs", + "version": "5.2.10", "source": "./src/index.ts", "main": "./lib/cjs/index.js", "module": "./lib/esm/index.js", "typings": "./lib/types/index.d.ts", "exports": { - "types": "./lib/types/index.d.ts", - "import": "./lib/esm/index.js", - "require": "./lib/cjs/index.js", - "default": "./lib/esm/index.js" + ".": { + "types": "./lib/types/index.d.ts", + "import": "./lib/esm/index.js", + "require": "./lib/cjs/index.js", + "default": "./lib/esm/index.js" + } }, "scripts": { "build": "yarn build:ts", - "build:ts": "tsc --build tsconfig.json && tsc --build tsconfig.esm.json && cp scripts/templateDir.esm.js lib/esm/utils/templateDir.js", - "lint": "eslint '**/*.{ts,js}'", - "lint:fix": "eslint '**/*.{ts,js}' --fix", - "test": "cross-env NODE_ENV=test yarn jest --max-workers=2 --passWithNoTests && jest-coverage-thresholds-bumper" + "build:ts": "tsc --build tsconfig.json", + "test": "vitest run", + "test:ci": "vitest run --coverage.thresholds.autoUpdate=true" }, "devDependencies": { "@tsed/cli": "5.2.10", "@tsed/cli-core": "5.2.10", - "@tsed/eslint": "5.2.10", - "@tsed/jest-config": "5.2.10", - "@tsed/typescript": "5.2.10", + "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", - "eslint": "8.22.0", - "jest": "29.5.0" + "typescript": "4.9.5", + "vitest": "2.1.1" }, "dependencies": { "tslib": "2.3.1" diff --git a/packages/cli-plugin-mocha/tsconfig.cjs.json b/packages/cli-plugin-mocha/tsconfig.cjs.json new file mode 100644 index 000000000..7f23b116d --- /dev/null +++ b/packages/cli-plugin-mocha/tsconfig.cjs.json @@ -0,0 +1,28 @@ +{ + "extends": "@tsed/typescript/tsconfig.node.json", + "compilerOptions": { + "baseUrl": ".", + "module": "commonjs", + "moduleResolution": "Node16", + "rootDir": "src", + "outDir": "./lib/cjs", + "declaration": true, + "declarationDir": "./lib/types", + "composite": true, + "noEmit": false + }, + "include": ["src", "src/**/*.json"], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage", + "spec", + "**/*.benchmark.ts", + "**/*.spec.ts", + "keys", + "**/__mock__/**", + "webpack.config.js" + ] +} diff --git a/packages/cli-plugin-mocha/tsconfig.esm.json b/packages/cli-plugin-mocha/tsconfig.esm.json index a500944d9..ce32a9e07 100644 --- a/packages/cli-plugin-mocha/tsconfig.esm.json +++ b/packages/cli-plugin-mocha/tsconfig.esm.json @@ -2,18 +2,16 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ES2020", + "module": "ESNext", + "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", + "declarationDir": "./lib/types-esm", "declaration": true, - "declarationDir": "./lib/types", "composite": true, "noEmit": false }, - "include": [ - "src", - "src/**/*.json" - ], + "include": ["src", "src/**/*.json"], "exclude": [ "node_modules", "test", @@ -24,16 +22,7 @@ "**/*.benchmark.ts", "**/*.spec.ts", "keys", - "jest.config.js", "**/__mock__/**", "webpack.config.js" - ], - "references": [ - { - "path": "../cli" - }, - { - "path": "../cli-core" - } ] } diff --git a/packages/cli-plugin-mocha/tsconfig.json b/packages/cli-plugin-mocha/tsconfig.json index 8f91fe8dc..8c80e7e4f 100644 --- a/packages/cli-plugin-mocha/tsconfig.json +++ b/packages/cli-plugin-mocha/tsconfig.json @@ -2,38 +2,21 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "commonjs", - "rootDir": "src", - "outDir": "./lib/cjs", - "declaration": true, - "declarationDir": "./lib/types", - "composite": true, - "noEmit": false + "noEmit": true }, - "include": [ - "src", - "src/**/*.json" - ], - "exclude": [ - "node_modules", - "test", - "lib", - "benchmark", - "coverage", - "spec", - "**/*.benchmark.ts", - "**/*.spec.ts", - "keys", - "jest.config.js", - "**/__mock__/**", - "webpack.config.js" - ], + "include": [], "references": [ { - "path": "../cli" + "path": "../cli/tsconfig.json" }, { - "path": "../cli-core" + "path": "../cli-core/tsconfig.json" + }, + { + "path": "./tsconfig.cjs.json" + }, + { + "path": "./tsconfig.esm.json" } ] } diff --git a/packages/cli-plugin-mocha/tsconfig.spec.json b/packages/cli-plugin-mocha/tsconfig.spec.json new file mode 100644 index 000000000..079424388 --- /dev/null +++ b/packages/cli-plugin-mocha/tsconfig.spec.json @@ -0,0 +1,36 @@ +{ + "extends": "@tsed/typescript/tsconfig.node.json", + "compilerOptions": { + "baseUrl": ".", + "rootDir": "..", + "module": "commonjs", + "outDir": "./lib/cjs", + "declaration": false, + "composite": false, + "noEmit": true, + "paths": { + "@tsed/openspec": ["../specs/openspec/src"], + "@tsed/schema": ["../specs/schema/src"], + "@tsed/exceptions": ["../specs/exceptions/src"], + "@tsed/json-mapper": ["../specs/json-mapper/src"], + "@tsed/platform-exceptions": ["../platform/platform-exceptions/src"], + "@tsed/platform-middlewares": ["../platform/platform-middlewares/src"], + "@tsed/platform-params": ["../platform/platform-params/src"], + "@tsed/platform-log-middleware": ["../platform/platform-log-middleware/src"], + "@tsed/platform-response-filter": ["../platform/platform-response-filter/src"], + "@tsed/platform-router": ["../platform/platform-router/src"], + "@tsed/platform-views": ["../platform/platform-views/src"], + "@tsed/components-scan": ["../third-parties/components-scan/src"], + "@tsed/common": ["../platform/common/src"], + "@tsed/ajv": ["../specs/ajv/src"], + "@tsed/platform-cache": ["../platform/platform-cache/src"], + "@tsed/swagger": ["../specs/swagger/src"], + "@tsed/platform-test-sdk": ["../platform/platform-test-sdk/src"], + "@tsed/platform-express": ["../platform/platform-express/src"], + "@tsed/platform-koa": ["../platform/platform-koa/src"] + }, + "types": ["vite/client", "vitest/globals"] + }, + "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], + "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] +} diff --git a/packages/cli-plugin-mocha/vitest.config.mts b/packages/cli-plugin-mocha/vitest.config.mts new file mode 100644 index 000000000..d759e8179 --- /dev/null +++ b/packages/cli-plugin-mocha/vitest.config.mts @@ -0,0 +1,21 @@ +// @ts-ignore +import {presets} from "@tsed/vitest/presets"; +import {defineConfig} from "vitest/config"; + +export default defineConfig( + { + ...presets, + test: { + ...presets.test, + coverage: { + ...presets.test.coverage, + thresholds: { + statements: 0, + branches: 0, + functions: 0, + lines: 0 + } + } + } + } +); diff --git a/packages/cli-plugin-mongoose/.eslintignore b/packages/cli-plugin-mongoose/.eslintignore deleted file mode 100644 index 2aab498ae..000000000 --- a/packages/cli-plugin-mongoose/.eslintignore +++ /dev/null @@ -1,13 +0,0 @@ -node_modules -docs -docs-references -lib -dist -coverage -.nyc_output -*-lock.json -*.lock -benchmarks.* -**/generated - -**/*.js diff --git a/packages/cli-plugin-mongoose/.eslintrc.js b/packages/cli-plugin-mongoose/.eslintrc.js deleted file mode 100644 index 802f86f8b..000000000 --- a/packages/cli-plugin-mongoose/.eslintrc.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@tsed/eslint/node.js"); diff --git a/packages/cli-plugin-mongoose/.npmignore b/packages/cli-plugin-mongoose/.npmignore index 7f50c0fb8..672ed7652 100644 --- a/packages/cli-plugin-mongoose/.npmignore +++ b/packages/cli-plugin-mongoose/.npmignore @@ -1,4 +1,8 @@ src test -tsconfig.compile.json +coverage tsconfig.json +tsconfig.*.json +__mock__ +*.spec.js +*.tsbuildinfo diff --git a/packages/cli-plugin-mongoose/jest.config.js b/packages/cli-plugin-mongoose/jest.config.js deleted file mode 100644 index 9b8da2ec0..000000000 --- a/packages/cli-plugin-mongoose/jest.config.js +++ /dev/null @@ -1,15 +0,0 @@ -// For a detailed explanation regarding each configuration property, visit: -// https://jestjs.io/docs/en/configuration.html - -module.exports = { - ...require("@tsed/jest-config"), - roots: ["/src", "/test"], - coverageThreshold: { - global: { - statements: 63.9, - branches: 22.72, - functions: 33.33, - lines: 63.9 - } - } -}; diff --git a/packages/cli-plugin-mongoose/package.json b/packages/cli-plugin-mongoose/package.json index 516acc472..84ccfeefd 100644 --- a/packages/cli-plugin-mongoose/package.json +++ b/packages/cli-plugin-mongoose/package.json @@ -1,23 +1,25 @@ { "name": "@tsed/cli-plugin-mongoose", - "version": "5.2.10", "description": "Ts.ED CLI plugin. Add Mongoose support", + "type": "commonjs", + "version": "5.2.10", "source": "./src/index.ts", "main": "./lib/cjs/index.js", "module": "./lib/esm/index.js", "typings": "./lib/types/index.d.ts", "exports": { - "types": "./lib/types/index.d.ts", - "import": "./lib/esm/index.js", - "require": "./lib/cjs/index.js", - "default": "./lib/esm/index.js" + ".": { + "types": "./lib/types/index.d.ts", + "import": "./lib/esm/index.js", + "require": "./lib/cjs/index.js", + "default": "./lib/esm/index.js" + } }, "scripts": { "build": "yarn build:ts", - "build:ts": "tsc --build tsconfig.json && tsc --build tsconfig.esm.json && cp scripts/templateDir.esm.js lib/esm/utils/templateDir.js", - "lint": "eslint '**/*.{ts,js}'", - "lint:fix": "eslint '**/*.{ts,js}' --fix", - "test": "cross-env NODE_ENV=test yarn jest --max-workers=2 --passWithNoTests && jest-coverage-thresholds-bumper" + "build:ts": "tsc --build tsconfig.json", + "test": "vitest run", + "test:ci": "vitest run --coverage.thresholds.autoUpdate=true" }, "dependencies": { "change-case": "4.1.2", @@ -27,11 +29,9 @@ "devDependencies": { "@tsed/cli": "5.2.10", "@tsed/cli-core": "5.2.10", - "@tsed/eslint": "5.2.10", - "@tsed/jest-config": "5.2.10", - "@tsed/typescript": "5.2.10", + "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", - "eslint": "8.22.0", - "jest": "29.5.0" + "typescript": "4.9.5", + "vitest": "2.1.1" } } diff --git a/packages/cli-plugin-mongoose/tsconfig.cjs.json b/packages/cli-plugin-mongoose/tsconfig.cjs.json new file mode 100644 index 000000000..7f23b116d --- /dev/null +++ b/packages/cli-plugin-mongoose/tsconfig.cjs.json @@ -0,0 +1,28 @@ +{ + "extends": "@tsed/typescript/tsconfig.node.json", + "compilerOptions": { + "baseUrl": ".", + "module": "commonjs", + "moduleResolution": "Node16", + "rootDir": "src", + "outDir": "./lib/cjs", + "declaration": true, + "declarationDir": "./lib/types", + "composite": true, + "noEmit": false + }, + "include": ["src", "src/**/*.json"], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage", + "spec", + "**/*.benchmark.ts", + "**/*.spec.ts", + "keys", + "**/__mock__/**", + "webpack.config.js" + ] +} diff --git a/packages/cli-plugin-mongoose/tsconfig.esm.json b/packages/cli-plugin-mongoose/tsconfig.esm.json index a500944d9..ce32a9e07 100644 --- a/packages/cli-plugin-mongoose/tsconfig.esm.json +++ b/packages/cli-plugin-mongoose/tsconfig.esm.json @@ -2,18 +2,16 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ES2020", + "module": "ESNext", + "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", + "declarationDir": "./lib/types-esm", "declaration": true, - "declarationDir": "./lib/types", "composite": true, "noEmit": false }, - "include": [ - "src", - "src/**/*.json" - ], + "include": ["src", "src/**/*.json"], "exclude": [ "node_modules", "test", @@ -24,16 +22,7 @@ "**/*.benchmark.ts", "**/*.spec.ts", "keys", - "jest.config.js", "**/__mock__/**", "webpack.config.js" - ], - "references": [ - { - "path": "../cli" - }, - { - "path": "../cli-core" - } ] } diff --git a/packages/cli-plugin-mongoose/tsconfig.json b/packages/cli-plugin-mongoose/tsconfig.json index 8f91fe8dc..705b5ce35 100644 --- a/packages/cli-plugin-mongoose/tsconfig.json +++ b/packages/cli-plugin-mongoose/tsconfig.json @@ -2,38 +2,24 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "commonjs", - "rootDir": "src", - "outDir": "./lib/cjs", - "declaration": true, - "declarationDir": "./lib/types", - "composite": true, - "noEmit": false + "noEmit": true }, - "include": [ - "src", - "src/**/*.json" - ], - "exclude": [ - "node_modules", - "test", - "lib", - "benchmark", - "coverage", - "spec", - "**/*.benchmark.ts", - "**/*.spec.ts", - "keys", - "jest.config.js", - "**/__mock__/**", - "webpack.config.js" - ], + "include": [], "references": [ { - "path": "../cli" + "path": "../cli/tsconfig.json" }, { - "path": "../cli-core" + "path": "../cli-core/tsconfig.json" + }, + { + "path": "./tsconfig.cjs.json" + }, + { + "path": "./tsconfig.esm.json" + }, + { + "path": "./tsconfig.spec.json" } ] } diff --git a/packages/cli-plugin-mongoose/tsconfig.spec.json b/packages/cli-plugin-mongoose/tsconfig.spec.json new file mode 100644 index 000000000..75fcfa09d --- /dev/null +++ b/packages/cli-plugin-mongoose/tsconfig.spec.json @@ -0,0 +1,29 @@ +{ + "extends": "@tsed/typescript/tsconfig.node.json", + "compilerOptions": { + "baseUrl": ".", + "rootDir": "..", + "module": "commonjs", + "outDir": "./lib/cjs", + "declaration": false, + "composite": false, + "noEmit": true, + "paths": {}, + "types": [ + "vite/client", + "vitest/globals" + ] + }, + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] +} diff --git a/packages/cli-plugin-mongoose/vitest.config.mts b/packages/cli-plugin-mongoose/vitest.config.mts new file mode 100644 index 000000000..d759e8179 --- /dev/null +++ b/packages/cli-plugin-mongoose/vitest.config.mts @@ -0,0 +1,21 @@ +// @ts-ignore +import {presets} from "@tsed/vitest/presets"; +import {defineConfig} from "vitest/config"; + +export default defineConfig( + { + ...presets, + test: { + ...presets.test, + coverage: { + ...presets.test.coverage, + thresholds: { + statements: 0, + branches: 0, + functions: 0, + lines: 0 + } + } + } + } +); diff --git a/packages/cli-plugin-oidc-provider/.eslintignore b/packages/cli-plugin-oidc-provider/.eslintignore deleted file mode 100644 index 2aab498ae..000000000 --- a/packages/cli-plugin-oidc-provider/.eslintignore +++ /dev/null @@ -1,13 +0,0 @@ -node_modules -docs -docs-references -lib -dist -coverage -.nyc_output -*-lock.json -*.lock -benchmarks.* -**/generated - -**/*.js diff --git a/packages/cli-plugin-oidc-provider/.eslintrc.js b/packages/cli-plugin-oidc-provider/.eslintrc.js deleted file mode 100644 index 802f86f8b..000000000 --- a/packages/cli-plugin-oidc-provider/.eslintrc.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@tsed/eslint/node.js"); diff --git a/packages/cli-plugin-oidc-provider/.npmignore b/packages/cli-plugin-oidc-provider/.npmignore index 7f50c0fb8..672ed7652 100644 --- a/packages/cli-plugin-oidc-provider/.npmignore +++ b/packages/cli-plugin-oidc-provider/.npmignore @@ -1,4 +1,8 @@ src test -tsconfig.compile.json +coverage tsconfig.json +tsconfig.*.json +__mock__ +*.spec.js +*.tsbuildinfo diff --git a/packages/cli-plugin-oidc-provider/jest.config.js b/packages/cli-plugin-oidc-provider/jest.config.js deleted file mode 100644 index a61292c23..000000000 --- a/packages/cli-plugin-oidc-provider/jest.config.js +++ /dev/null @@ -1,14 +0,0 @@ -// For a detailed explanation regarding each configuration property, visit: -// https://jestjs.io/docs/en/configuration.html - -module.exports = { - ...require("@tsed/jest-config"), - coverageThreshold: { - global: { - statements: 0, - branches: 0, - functions: 0, - lines: 0 - } - } -}; diff --git a/packages/cli-plugin-oidc-provider/package.json b/packages/cli-plugin-oidc-provider/package.json index e793dd329..3e1e0923c 100644 --- a/packages/cli-plugin-oidc-provider/package.json +++ b/packages/cli-plugin-oidc-provider/package.json @@ -1,23 +1,25 @@ { "name": "@tsed/cli-plugin-oidc-provider", - "version": "5.2.10", "description": "Ts.ED CLI plugin. Add OIDC Provider", + "type": "commonjs", + "version": "5.2.10", "source": "./src/index.ts", "main": "./lib/cjs/index.js", "module": "./lib/esm/index.js", "typings": "./lib/types/index.d.ts", "exports": { - "types": "./lib/types/index.d.ts", - "import": "./lib/esm/index.js", - "require": "./lib/cjs/index.js", - "default": "./lib/esm/index.js" + ".": { + "types": "./lib/types/index.d.ts", + "import": "./lib/esm/index.js", + "require": "./lib/cjs/index.js", + "default": "./lib/esm/index.js" + } }, "scripts": { "build": "yarn build:ts", - "build:ts": "tsc --build tsconfig.json && tsc --build tsconfig.esm.json && cp scripts/templateDir.esm.js lib/esm/utils/templateDir.js", - "lint": "eslint '**/*.{ts,js}'", - "lint:fix": "eslint '**/*.{ts,js}' --fix", - "test": "cross-env NODE_ENV=test yarn jest --max-workers=2 --passWithNoTests && jest-coverage-thresholds-bumper" + "build:ts": "tsc --build tsconfig.json", + "test": "vitest run", + "test:ci": "vitest run --coverage.thresholds.autoUpdate=true" }, "files": [ "lib", @@ -29,12 +31,10 @@ "devDependencies": { "@tsed/cli": "5.2.10", "@tsed/cli-core": "5.2.10", - "@tsed/eslint": "5.2.10", - "@tsed/jest-config": "5.2.10", - "@tsed/typescript": "5.2.10", + "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", - "eslint": "8.22.0", - "jest": "29.5.0" + "typescript": "4.9.5", + "vitest": "2.1.1" }, "peerDependencies": { "@tsed/cli": "5.2.10", diff --git a/packages/cli-plugin-oidc-provider/templates/init/src/interactions/ConsentInteraction.spec.ts b/packages/cli-plugin-oidc-provider/templates/init/src/interactions/ConsentInteraction.spec.ts index 868908691..909793f9c 100644 --- a/packages/cli-plugin-oidc-provider/templates/init/src/interactions/ConsentInteraction.spec.ts +++ b/packages/cli-plugin-oidc-provider/templates/init/src/interactions/ConsentInteraction.spec.ts @@ -41,10 +41,10 @@ describe("ConsentInteraction", () => { oidcContext.prompt.name = "consent"; const grant = { - save: jest.fn().mockResolvedValue("grantId"), - addOIDCScope: jest.fn(), - addOIDCClaims: jest.fn(), - addResourceScope: jest.fn() + save: vi.fn().mockResolvedValue("grantId"), + addOIDCScope: vi.fn(), + addOIDCClaims: vi.fn(), + addResourceScope: vi.fn() }; oidcContext.getGrant.mockResolvedValue(grant); diff --git a/packages/cli-plugin-oidc-provider/templates/init/src/interactions/LoginInteraction.spec.ts b/packages/cli-plugin-oidc-provider/templates/init/src/interactions/LoginInteraction.spec.ts index 902fe1998..26d5269f4 100644 --- a/packages/cli-plugin-oidc-provider/templates/init/src/interactions/LoginInteraction.spec.ts +++ b/packages/cli-plugin-oidc-provider/templates/init/src/interactions/LoginInteraction.spec.ts @@ -8,7 +8,7 @@ import { LoginInteraction } from "./LoginInteraction"; async function createInteractionFixture() { const accounts = { - authenticate: jest.fn() + authenticate: vi.fn() }; const interaction = await PlatformTest.invoke(LoginInteraction, [ @@ -23,7 +23,7 @@ async function createInteractionFixture() { describe("LoginInteraction", () => { beforeEach(() => { - jest.resetAllMocks(); + vi.resetAllMocks(); return PlatformTest.create(); }); afterEach(() => PlatformTest.reset()); @@ -54,7 +54,7 @@ describe("LoginInteraction", () => { const { interaction } = await createInteractionFixture(); const oidcContext = getOidcContextFixture(); - (oidcContext.checkClientId as jest.Mock).mockRejectedValue(new Error("Unknown given client_id: client_id")); + (oidcContext.checkClientId as vi.Mock).mockRejectedValue(new Error("Unknown given client_id: client_id")); const result = await catchAsyncError(() => interaction.$prompt(oidcContext)); diff --git a/packages/cli-plugin-oidc-provider/templates/init/src/interactions/__mock__/oidcContext.fixture.ts b/packages/cli-plugin-oidc-provider/templates/init/src/interactions/__mock__/oidcContext.fixture.ts index 796751ce7..d210baf62 100644 --- a/packages/cli-plugin-oidc-provider/templates/init/src/interactions/__mock__/oidcContext.fixture.ts +++ b/packages/cli-plugin-oidc-provider/templates/init/src/interactions/__mock__/oidcContext.fixture.ts @@ -17,17 +17,17 @@ export function getOidcContextFixture(opts: Partial = {} oidcInteractions: undefined, oidcProvider: undefined, raw: undefined, - debug: jest.fn(), - findAccount: jest.fn(), - findClient: jest.fn(), - getGrant: jest.fn(), + debug: vi.fn(), + findAccount: vi.fn(), + findClient: vi.fn(), + getGrant: vi.fn(), grantId: undefined, - checkInteractionName: jest.fn(), - checkClientId: jest.fn(), - interactionDetails: jest.fn().mockResolvedValue({}), - interactionFinished: jest.fn().mockResolvedValue(undefined), - interactionResult: jest.fn().mockResolvedValue(""), - interactionPrompt: jest.fn().mockImplementation((obj) => { + checkInteractionName: vi.fn(), + checkClientId: vi.fn(), + interactionDetails: vi.fn().mockResolvedValue({}), + interactionFinished: vi.fn().mockResolvedValue(undefined), + interactionResult: vi.fn().mockResolvedValue(""), + interactionPrompt: vi.fn().mockImplementation((obj) => { return { client: { client_id: "client_id" @@ -41,9 +41,9 @@ export function getOidcContextFixture(opts: Partial = {} } }; }), - render: jest.fn(), - runInteraction: jest.fn(), - save: jest.fn(), + render: vi.fn(), + runInteraction: vi.fn(), + save: vi.fn(), session: {}, params: { client_id: "client_id" diff --git a/packages/cli-plugin-oidc-provider/test/init/__snapshots__/init.integration.spec.ts.snap b/packages/cli-plugin-oidc-provider/test/init/__snapshots__/init.integration.spec.ts.snap index 8f65b4122..e18697677 100644 --- a/packages/cli-plugin-oidc-provider/test/init/__snapshots__/init.integration.spec.ts.snap +++ b/packages/cli-plugin-oidc-provider/test/init/__snapshots__/init.integration.spec.ts.snap @@ -1,7 +1,7 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP +// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html -exports[`Init OIDC Provider project should generate a project with oidc 1`] = ` -Array [ +exports[`Init OIDC Provider project > should generate a project with oidc 1`] = ` +[ "./project-name", "project-name", "project-name/.barrelsby.json", @@ -58,48 +58,51 @@ Array [ ] `; -exports[`Init OIDC Provider project should generate a project with oidc 2`] = ` -"import {join} from \\"path\\"; -import {Configuration, Inject} from \\"@tsed/di\\"; -import {PlatformApplication} from \\"@tsed/common\\"; -import \\"@tsed/platform-express\\"; // /!\\\\ keep this import -import \\"@tsed/ajv\\"; -import \\"@tsed/oidc-provider\\"; -import {config} from \\"./config/index\\"; -import * as rest from \\"./controllers/rest/index\\"; -import * as pages from \\"./controllers/pages/index\\"; -import {InteractionsController} from \\"./controllers/oidc/InteractionsController\\"; +exports[`Init OIDC Provider project > should generate a project with oidc 2`] = ` +"import {join} from "path"; +import {Configuration, Inject} from "@tsed/di"; +import {PlatformApplication} from "@tsed/common"; +import "@tsed/platform-express"; // /!\\ keep this import +import "@tsed/ajv"; +import "@tsed/oidc-provider"; +import {config} from "./config/index"; +import * as rest from "./controllers/rest/index"; +import * as pages from "./controllers/pages/index"; +import {InteractionsController} from "./controllers/oidc/InteractionsController"; @Configuration({ ...config, - acceptMimes: [\\"application/json\\"], + acceptMimes: ["application/json"], httpPort: process.env.PORT || 8083, httpsPort: false, // CHANGE disableComponentsScan: true, + ajv: { + returnsCoercedValues: true + }, mount: { - \\"/rest\\": [ + "/rest": [ ...Object.values(rest) ], - \\"/\\": [ + "/": [ InteractionsController ] }, middlewares: [ - \\"cors\\", - \\"cookie-parser\\", - \\"compression\\", - \\"method-override\\", - \\"json-parser\\", - { use: \\"urlencoded-parser\\", options: { extended: true }} + "cors", + "cookie-parser", + "compression", + "method-override", + "json-parser", + { use: "urlencoded-parser", options: { extended: true }} ], views: { - root: join(process.cwd(), \\"../views\\"), + root: join(process.cwd(), "../views"), extensions: { - ejs: \\"ejs\\" + ejs: "ejs" } }, exclude: [ - \\"**/*.spec.ts\\" + "**/*.spec.ts" ] }) export class Server { @@ -112,8 +115,8 @@ export class Server { " `; -exports[`Init OIDC Provider project should generate a project with oidc and swagger 1`] = ` -Array [ +exports[`Init OIDC Provider project > should generate a project with oidc and swagger 1`] = ` +[ "./project-name", "project-name", "project-name/.barrelsby.json", @@ -168,56 +171,59 @@ Array [ ] `; -exports[`Init OIDC Provider project should generate a project with oidc and swagger 2`] = ` -"import {join} from \\"path\\"; -import {Configuration, Inject} from \\"@tsed/di\\"; -import {PlatformApplication} from \\"@tsed/common\\"; -import \\"@tsed/platform-express\\"; // /!\\\\ keep this import -import \\"@tsed/ajv\\"; -import \\"@tsed/swagger\\"; -import \\"@tsed/oidc-provider\\"; -import {config} from \\"./config/index\\"; -import * as rest from \\"./controllers/rest/index\\"; -import * as pages from \\"./controllers/pages/index\\"; -import {InteractionsController} from \\"./controllers/oidc/InteractionsController\\"; +exports[`Init OIDC Provider project > should generate a project with oidc and swagger 2`] = ` +"import {join} from "path"; +import {Configuration, Inject} from "@tsed/di"; +import {PlatformApplication} from "@tsed/common"; +import "@tsed/platform-express"; // /!\\ keep this import +import "@tsed/ajv"; +import "@tsed/swagger"; +import "@tsed/oidc-provider"; +import {config} from "./config/index"; +import * as rest from "./controllers/rest/index"; +import * as pages from "./controllers/pages/index"; +import {InteractionsController} from "./controllers/oidc/InteractionsController"; @Configuration({ ...config, - acceptMimes: [\\"application/json\\"], + acceptMimes: ["application/json"], httpPort: process.env.PORT || 8083, httpsPort: false, // CHANGE disableComponentsScan: true, + ajv: { + returnsCoercedValues: true + }, mount: { - \\"/rest\\": [ + "/rest": [ ...Object.values(rest) ], - \\"/\\": [ + "/": [ ...Object.values(pages), InteractionsController ] }, swagger: [ { - path: \\"/doc\\", - specVersion: \\"3.0.1\\" + path: "/doc", + specVersion: "3.0.1" } ], middlewares: [ - \\"cors\\", - \\"cookie-parser\\", - \\"compression\\", - \\"method-override\\", - \\"json-parser\\", - { use: \\"urlencoded-parser\\", options: { extended: true }} + "cors", + "cookie-parser", + "compression", + "method-override", + "json-parser", + { use: "urlencoded-parser", options: { extended: true }} ], views: { - root: join(process.cwd(), \\"../views\\"), + root: join(process.cwd(), "../views"), extensions: { - ejs: \\"ejs\\" + ejs: "ejs" } }, exclude: [ - \\"**/*.spec.ts\\" + "**/*.spec.ts" ] }) export class Server { diff --git a/packages/cli-plugin-oidc-provider/tsconfig.cjs.json b/packages/cli-plugin-oidc-provider/tsconfig.cjs.json new file mode 100644 index 000000000..7f23b116d --- /dev/null +++ b/packages/cli-plugin-oidc-provider/tsconfig.cjs.json @@ -0,0 +1,28 @@ +{ + "extends": "@tsed/typescript/tsconfig.node.json", + "compilerOptions": { + "baseUrl": ".", + "module": "commonjs", + "moduleResolution": "Node16", + "rootDir": "src", + "outDir": "./lib/cjs", + "declaration": true, + "declarationDir": "./lib/types", + "composite": true, + "noEmit": false + }, + "include": ["src", "src/**/*.json"], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage", + "spec", + "**/*.benchmark.ts", + "**/*.spec.ts", + "keys", + "**/__mock__/**", + "webpack.config.js" + ] +} diff --git a/packages/cli-plugin-oidc-provider/tsconfig.esm.json b/packages/cli-plugin-oidc-provider/tsconfig.esm.json index a500944d9..ce32a9e07 100644 --- a/packages/cli-plugin-oidc-provider/tsconfig.esm.json +++ b/packages/cli-plugin-oidc-provider/tsconfig.esm.json @@ -2,18 +2,16 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ES2020", + "module": "ESNext", + "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", + "declarationDir": "./lib/types-esm", "declaration": true, - "declarationDir": "./lib/types", "composite": true, "noEmit": false }, - "include": [ - "src", - "src/**/*.json" - ], + "include": ["src", "src/**/*.json"], "exclude": [ "node_modules", "test", @@ -24,16 +22,7 @@ "**/*.benchmark.ts", "**/*.spec.ts", "keys", - "jest.config.js", "**/__mock__/**", "webpack.config.js" - ], - "references": [ - { - "path": "../cli" - }, - { - "path": "../cli-core" - } ] } diff --git a/packages/cli-plugin-oidc-provider/tsconfig.json b/packages/cli-plugin-oidc-provider/tsconfig.json index 8f91fe8dc..705b5ce35 100644 --- a/packages/cli-plugin-oidc-provider/tsconfig.json +++ b/packages/cli-plugin-oidc-provider/tsconfig.json @@ -2,38 +2,24 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "commonjs", - "rootDir": "src", - "outDir": "./lib/cjs", - "declaration": true, - "declarationDir": "./lib/types", - "composite": true, - "noEmit": false + "noEmit": true }, - "include": [ - "src", - "src/**/*.json" - ], - "exclude": [ - "node_modules", - "test", - "lib", - "benchmark", - "coverage", - "spec", - "**/*.benchmark.ts", - "**/*.spec.ts", - "keys", - "jest.config.js", - "**/__mock__/**", - "webpack.config.js" - ], + "include": [], "references": [ { - "path": "../cli" + "path": "../cli/tsconfig.json" }, { - "path": "../cli-core" + "path": "../cli-core/tsconfig.json" + }, + { + "path": "./tsconfig.cjs.json" + }, + { + "path": "./tsconfig.esm.json" + }, + { + "path": "./tsconfig.spec.json" } ] } diff --git a/packages/cli-plugin-oidc-provider/tsconfig.spec.json b/packages/cli-plugin-oidc-provider/tsconfig.spec.json new file mode 100644 index 000000000..75fcfa09d --- /dev/null +++ b/packages/cli-plugin-oidc-provider/tsconfig.spec.json @@ -0,0 +1,29 @@ +{ + "extends": "@tsed/typescript/tsconfig.node.json", + "compilerOptions": { + "baseUrl": ".", + "rootDir": "..", + "module": "commonjs", + "outDir": "./lib/cjs", + "declaration": false, + "composite": false, + "noEmit": true, + "paths": {}, + "types": [ + "vite/client", + "vitest/globals" + ] + }, + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] +} diff --git a/packages/cli-plugin-oidc-provider/vitest.config.mts b/packages/cli-plugin-oidc-provider/vitest.config.mts new file mode 100644 index 000000000..7df710e4c --- /dev/null +++ b/packages/cli-plugin-oidc-provider/vitest.config.mts @@ -0,0 +1,22 @@ +// @ts-ignore +import {presets} from "@tsed/vitest/presets"; +import {defineConfig} from "vitest/config"; + +export default defineConfig( + { + ...presets, + test: { + ...presets.test, + + coverage: { + ...presets.test.coverage, + thresholds: { + statements: 0, + branches: 0, + functions: 0, + lines: 0 + } + } + } + } +); diff --git a/packages/cli-plugin-passport/.eslintignore b/packages/cli-plugin-passport/.eslintignore deleted file mode 100644 index 2aab498ae..000000000 --- a/packages/cli-plugin-passport/.eslintignore +++ /dev/null @@ -1,13 +0,0 @@ -node_modules -docs -docs-references -lib -dist -coverage -.nyc_output -*-lock.json -*.lock -benchmarks.* -**/generated - -**/*.js diff --git a/packages/cli-plugin-passport/.eslintrc.js b/packages/cli-plugin-passport/.eslintrc.js deleted file mode 100644 index 802f86f8b..000000000 --- a/packages/cli-plugin-passport/.eslintrc.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@tsed/eslint/node.js"); diff --git a/packages/cli-plugin-passport/.npmignore b/packages/cli-plugin-passport/.npmignore index 7f50c0fb8..672ed7652 100644 --- a/packages/cli-plugin-passport/.npmignore +++ b/packages/cli-plugin-passport/.npmignore @@ -1,4 +1,8 @@ src test -tsconfig.compile.json +coverage tsconfig.json +tsconfig.*.json +__mock__ +*.spec.js +*.tsbuildinfo diff --git a/packages/cli-plugin-passport/jest.config.js b/packages/cli-plugin-passport/jest.config.js deleted file mode 100644 index a61292c23..000000000 --- a/packages/cli-plugin-passport/jest.config.js +++ /dev/null @@ -1,14 +0,0 @@ -// For a detailed explanation regarding each configuration property, visit: -// https://jestjs.io/docs/en/configuration.html - -module.exports = { - ...require("@tsed/jest-config"), - coverageThreshold: { - global: { - statements: 0, - branches: 0, - functions: 0, - lines: 0 - } - } -}; diff --git a/packages/cli-plugin-passport/package.json b/packages/cli-plugin-passport/package.json index d564c4a54..9290c480f 100644 --- a/packages/cli-plugin-passport/package.json +++ b/packages/cli-plugin-passport/package.json @@ -1,23 +1,25 @@ { "name": "@tsed/cli-plugin-passport", - "version": "5.2.10", "description": "Ts.ED CLI plugin. Add Passport.js support", + "type": "commonjs", + "version": "5.2.10", "source": "./src/index.ts", "main": "./lib/cjs/index.js", "module": "./lib/esm/index.js", "typings": "./lib/types/index.d.ts", "exports": { - "types": "./lib/types/index.d.ts", - "import": "./lib/esm/index.js", - "require": "./lib/cjs/index.js", - "default": "./lib/esm/index.js" + ".": { + "types": "./lib/types/index.d.ts", + "import": "./lib/esm/index.js", + "require": "./lib/cjs/index.js", + "default": "./lib/esm/index.js" + } }, "scripts": { "build": "yarn build:ts", - "build:ts": "tsc --build tsconfig.json && tsc --build tsconfig.esm.json && cp scripts/templateDir.esm.js lib/esm/utils/templateDir.js", - "lint": "eslint '**/*.{ts,js}'", - "lint:fix": "eslint '**/*.{ts,js}' --fix", - "test": "cross-env NODE_ENV=test yarn jest --max-workers=2 --passWithNoTests && jest-coverage-thresholds-bumper" + "build:ts": "tsc --build tsconfig.json", + "test": "vitest run", + "test:ci": "vitest run --coverage.thresholds.autoUpdate=true" }, "dependencies": { "change-case": "^4.1.2", @@ -26,12 +28,10 @@ "devDependencies": { "@tsed/cli": "5.2.10", "@tsed/cli-core": "5.2.10", - "@tsed/eslint": "5.2.10", - "@tsed/jest-config": "5.2.10", - "@tsed/typescript": "5.2.10", + "@tsed/typescript": "workspace:*", "@types/change-case": "^2.3.1", "cross-env": "7.0.3", - "eslint": "8.22.0", - "jest": "29.5.0" + "typescript": "4.9.5", + "vitest": "2.1.1" } } diff --git a/packages/cli-plugin-passport/tsconfig.cjs.json b/packages/cli-plugin-passport/tsconfig.cjs.json new file mode 100644 index 000000000..7f23b116d --- /dev/null +++ b/packages/cli-plugin-passport/tsconfig.cjs.json @@ -0,0 +1,28 @@ +{ + "extends": "@tsed/typescript/tsconfig.node.json", + "compilerOptions": { + "baseUrl": ".", + "module": "commonjs", + "moduleResolution": "Node16", + "rootDir": "src", + "outDir": "./lib/cjs", + "declaration": true, + "declarationDir": "./lib/types", + "composite": true, + "noEmit": false + }, + "include": ["src", "src/**/*.json"], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage", + "spec", + "**/*.benchmark.ts", + "**/*.spec.ts", + "keys", + "**/__mock__/**", + "webpack.config.js" + ] +} diff --git a/packages/cli-plugin-passport/tsconfig.esm.json b/packages/cli-plugin-passport/tsconfig.esm.json index a500944d9..ce32a9e07 100644 --- a/packages/cli-plugin-passport/tsconfig.esm.json +++ b/packages/cli-plugin-passport/tsconfig.esm.json @@ -2,18 +2,16 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ES2020", + "module": "ESNext", + "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", + "declarationDir": "./lib/types-esm", "declaration": true, - "declarationDir": "./lib/types", "composite": true, "noEmit": false }, - "include": [ - "src", - "src/**/*.json" - ], + "include": ["src", "src/**/*.json"], "exclude": [ "node_modules", "test", @@ -24,16 +22,7 @@ "**/*.benchmark.ts", "**/*.spec.ts", "keys", - "jest.config.js", "**/__mock__/**", "webpack.config.js" - ], - "references": [ - { - "path": "../cli" - }, - { - "path": "../cli-core" - } ] } diff --git a/packages/cli-plugin-passport/tsconfig.json b/packages/cli-plugin-passport/tsconfig.json index 8f91fe8dc..8c80e7e4f 100644 --- a/packages/cli-plugin-passport/tsconfig.json +++ b/packages/cli-plugin-passport/tsconfig.json @@ -2,38 +2,21 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "commonjs", - "rootDir": "src", - "outDir": "./lib/cjs", - "declaration": true, - "declarationDir": "./lib/types", - "composite": true, - "noEmit": false + "noEmit": true }, - "include": [ - "src", - "src/**/*.json" - ], - "exclude": [ - "node_modules", - "test", - "lib", - "benchmark", - "coverage", - "spec", - "**/*.benchmark.ts", - "**/*.spec.ts", - "keys", - "jest.config.js", - "**/__mock__/**", - "webpack.config.js" - ], + "include": [], "references": [ { - "path": "../cli" + "path": "../cli/tsconfig.json" }, { - "path": "../cli-core" + "path": "../cli-core/tsconfig.json" + }, + { + "path": "./tsconfig.cjs.json" + }, + { + "path": "./tsconfig.esm.json" } ] } diff --git a/packages/cli-plugin-passport/tsconfig.spec.json b/packages/cli-plugin-passport/tsconfig.spec.json new file mode 100644 index 000000000..079424388 --- /dev/null +++ b/packages/cli-plugin-passport/tsconfig.spec.json @@ -0,0 +1,36 @@ +{ + "extends": "@tsed/typescript/tsconfig.node.json", + "compilerOptions": { + "baseUrl": ".", + "rootDir": "..", + "module": "commonjs", + "outDir": "./lib/cjs", + "declaration": false, + "composite": false, + "noEmit": true, + "paths": { + "@tsed/openspec": ["../specs/openspec/src"], + "@tsed/schema": ["../specs/schema/src"], + "@tsed/exceptions": ["../specs/exceptions/src"], + "@tsed/json-mapper": ["../specs/json-mapper/src"], + "@tsed/platform-exceptions": ["../platform/platform-exceptions/src"], + "@tsed/platform-middlewares": ["../platform/platform-middlewares/src"], + "@tsed/platform-params": ["../platform/platform-params/src"], + "@tsed/platform-log-middleware": ["../platform/platform-log-middleware/src"], + "@tsed/platform-response-filter": ["../platform/platform-response-filter/src"], + "@tsed/platform-router": ["../platform/platform-router/src"], + "@tsed/platform-views": ["../platform/platform-views/src"], + "@tsed/components-scan": ["../third-parties/components-scan/src"], + "@tsed/common": ["../platform/common/src"], + "@tsed/ajv": ["../specs/ajv/src"], + "@tsed/platform-cache": ["../platform/platform-cache/src"], + "@tsed/swagger": ["../specs/swagger/src"], + "@tsed/platform-test-sdk": ["../platform/platform-test-sdk/src"], + "@tsed/platform-express": ["../platform/platform-express/src"], + "@tsed/platform-koa": ["../platform/platform-koa/src"] + }, + "types": ["vite/client", "vitest/globals"] + }, + "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], + "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] +} diff --git a/packages/cli-plugin-passport/vitest.config.mts b/packages/cli-plugin-passport/vitest.config.mts new file mode 100644 index 000000000..d759e8179 --- /dev/null +++ b/packages/cli-plugin-passport/vitest.config.mts @@ -0,0 +1,21 @@ +// @ts-ignore +import {presets} from "@tsed/vitest/presets"; +import {defineConfig} from "vitest/config"; + +export default defineConfig( + { + ...presets, + test: { + ...presets.test, + coverage: { + ...presets.test.coverage, + thresholds: { + statements: 0, + branches: 0, + functions: 0, + lines: 0 + } + } + } + } +); diff --git a/packages/cli-plugin-prisma/.eslintignore b/packages/cli-plugin-prisma/.eslintignore deleted file mode 100644 index 2aab498ae..000000000 --- a/packages/cli-plugin-prisma/.eslintignore +++ /dev/null @@ -1,13 +0,0 @@ -node_modules -docs -docs-references -lib -dist -coverage -.nyc_output -*-lock.json -*.lock -benchmarks.* -**/generated - -**/*.js diff --git a/packages/cli-plugin-prisma/.eslintrc.js b/packages/cli-plugin-prisma/.eslintrc.js deleted file mode 100644 index 802f86f8b..000000000 --- a/packages/cli-plugin-prisma/.eslintrc.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@tsed/eslint/node.js"); diff --git a/packages/cli-plugin-prisma/.npmignore b/packages/cli-plugin-prisma/.npmignore index 7f50c0fb8..672ed7652 100644 --- a/packages/cli-plugin-prisma/.npmignore +++ b/packages/cli-plugin-prisma/.npmignore @@ -1,4 +1,8 @@ src test -tsconfig.compile.json +coverage tsconfig.json +tsconfig.*.json +__mock__ +*.spec.js +*.tsbuildinfo diff --git a/packages/cli-plugin-prisma/jest.config.js b/packages/cli-plugin-prisma/jest.config.js deleted file mode 100644 index 05d8a1303..000000000 --- a/packages/cli-plugin-prisma/jest.config.js +++ /dev/null @@ -1,14 +0,0 @@ -// For a detailed explanation regarding each configuration property, visit: -// https://jestjs.io/docs/en/configuration.html - -module.exports = { - ...require("@tsed/jest-config"), - coverageThreshold: { - global: { - statements: 84.44, - branches: 50, - functions: 33.33, - lines: 84.44 - } - } -}; diff --git a/packages/cli-plugin-prisma/package.json b/packages/cli-plugin-prisma/package.json index b9b13152a..180a73116 100644 --- a/packages/cli-plugin-prisma/package.json +++ b/packages/cli-plugin-prisma/package.json @@ -1,23 +1,25 @@ { "name": "@tsed/cli-plugin-prisma", - "version": "5.2.10", "description": "Ts.ED CLI plugin. Add Prisma project initialisation support.", + "type": "commonjs", + "version": "5.2.10", "source": "./src/index.ts", "main": "./lib/cjs/index.js", "module": "./lib/esm/index.js", "typings": "./lib/types/index.d.ts", "exports": { - "types": "./lib/types/index.d.ts", - "import": "./lib/esm/index.js", - "require": "./lib/cjs/index.js", - "default": "./lib/esm/index.js" + ".": { + "types": "./lib/types/index.d.ts", + "import": "./lib/esm/index.js", + "require": "./lib/cjs/index.js", + "default": "./lib/esm/index.js" + } }, "scripts": { "build": "yarn build:ts", - "build:ts": "tsc --build tsconfig.json && tsc --build tsconfig.esm.json && cp scripts/templateDir.esm.js lib/esm/utils/templateDir.js", - "lint": "eslint '**/*.{ts,js}'", - "lint:fix": "eslint '**/*.{ts,js}' --fix", - "test": "cross-env NODE_ENV=test yarn jest --max-workers=2 --passWithNoTests && jest-coverage-thresholds-bumper" + "build:ts": "tsc --build tsconfig.json", + "test": "vitest run", + "test:ci": "vitest run --coverage.thresholds.autoUpdate=true" }, "dependencies": { "change-case": "4.1.2", @@ -26,11 +28,9 @@ "devDependencies": { "@tsed/cli": "5.2.10", "@tsed/cli-core": "5.2.10", - "@tsed/eslint": "5.2.10", - "@tsed/jest-config": "5.2.10", - "@tsed/typescript": "5.2.10", + "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", - "eslint": "8.22.0", - "jest": "29.5.0" + "typescript": "4.9.5", + "vitest": "2.1.1" } } diff --git a/packages/cli-plugin-prisma/src/services/CliPrisma.spec.ts b/packages/cli-plugin-prisma/src/services/CliPrisma.spec.ts index 475d219e6..4b115db35 100644 --- a/packages/cli-plugin-prisma/src/services/CliPrisma.spec.ts +++ b/packages/cli-plugin-prisma/src/services/CliPrisma.spec.ts @@ -1,3 +1,4 @@ +// @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; import {CliPrisma} from "./CliPrisma"; import {CliFs, normalizePath} from "@tsed/cli-core"; @@ -6,9 +7,9 @@ import {join} from "path"; async function createServiceFixture() { const cliFs = { join: (...args: string[]) => normalizePath(join(...args)), - exists: jest.fn(), - readFile: jest.fn(), - writeFile: jest.fn() + exists: vi.fn(), + readFile: vi.fn(), + writeFile: vi.fn() }; const service = await CliPlatformTest.invoke(CliPrisma, [ diff --git a/packages/cli-plugin-prisma/src/services/__snapshots__/CliPrisma.spec.ts.snap b/packages/cli-plugin-prisma/src/services/__snapshots__/CliPrisma.spec.ts.snap index caac66ce1..6676da0dd 100644 --- a/packages/cli-plugin-prisma/src/services/__snapshots__/CliPrisma.spec.ts.snap +++ b/packages/cli-plugin-prisma/src/services/__snapshots__/CliPrisma.spec.ts.snap @@ -1,17 +1,17 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP +// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html -exports[`CliPrisma patchPrismaSchema() should patch the schema 1`] = ` +exports[`CliPrisma > patchPrismaSchema() > should patch the schema 1`] = ` "datasource db { - provider = \\"sqlite\\" - url = env(\\"DATABASE_URL\\") + provider = "sqlite" + url = env("DATABASE_URL") } generator client { - provider = \\"prisma-client-js\\" + provider = "prisma-client-js" } generator tsed { - provider = \\"tsed-prisma\\" + provider = "tsed-prisma" } model User { diff --git a/packages/cli-plugin-prisma/tsconfig.cjs.json b/packages/cli-plugin-prisma/tsconfig.cjs.json new file mode 100644 index 000000000..7f23b116d --- /dev/null +++ b/packages/cli-plugin-prisma/tsconfig.cjs.json @@ -0,0 +1,28 @@ +{ + "extends": "@tsed/typescript/tsconfig.node.json", + "compilerOptions": { + "baseUrl": ".", + "module": "commonjs", + "moduleResolution": "Node16", + "rootDir": "src", + "outDir": "./lib/cjs", + "declaration": true, + "declarationDir": "./lib/types", + "composite": true, + "noEmit": false + }, + "include": ["src", "src/**/*.json"], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage", + "spec", + "**/*.benchmark.ts", + "**/*.spec.ts", + "keys", + "**/__mock__/**", + "webpack.config.js" + ] +} diff --git a/packages/cli-plugin-prisma/tsconfig.esm.json b/packages/cli-plugin-prisma/tsconfig.esm.json index a500944d9..ce32a9e07 100644 --- a/packages/cli-plugin-prisma/tsconfig.esm.json +++ b/packages/cli-plugin-prisma/tsconfig.esm.json @@ -2,18 +2,16 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ES2020", + "module": "ESNext", + "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", + "declarationDir": "./lib/types-esm", "declaration": true, - "declarationDir": "./lib/types", "composite": true, "noEmit": false }, - "include": [ - "src", - "src/**/*.json" - ], + "include": ["src", "src/**/*.json"], "exclude": [ "node_modules", "test", @@ -24,16 +22,7 @@ "**/*.benchmark.ts", "**/*.spec.ts", "keys", - "jest.config.js", "**/__mock__/**", "webpack.config.js" - ], - "references": [ - { - "path": "../cli" - }, - { - "path": "../cli-core" - } ] } diff --git a/packages/cli-plugin-prisma/tsconfig.json b/packages/cli-plugin-prisma/tsconfig.json index 8f91fe8dc..705b5ce35 100644 --- a/packages/cli-plugin-prisma/tsconfig.json +++ b/packages/cli-plugin-prisma/tsconfig.json @@ -2,38 +2,24 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "commonjs", - "rootDir": "src", - "outDir": "./lib/cjs", - "declaration": true, - "declarationDir": "./lib/types", - "composite": true, - "noEmit": false + "noEmit": true }, - "include": [ - "src", - "src/**/*.json" - ], - "exclude": [ - "node_modules", - "test", - "lib", - "benchmark", - "coverage", - "spec", - "**/*.benchmark.ts", - "**/*.spec.ts", - "keys", - "jest.config.js", - "**/__mock__/**", - "webpack.config.js" - ], + "include": [], "references": [ { - "path": "../cli" + "path": "../cli/tsconfig.json" }, { - "path": "../cli-core" + "path": "../cli-core/tsconfig.json" + }, + { + "path": "./tsconfig.cjs.json" + }, + { + "path": "./tsconfig.esm.json" + }, + { + "path": "./tsconfig.spec.json" } ] } diff --git a/packages/cli-plugin-prisma/tsconfig.spec.json b/packages/cli-plugin-prisma/tsconfig.spec.json new file mode 100644 index 000000000..75fcfa09d --- /dev/null +++ b/packages/cli-plugin-prisma/tsconfig.spec.json @@ -0,0 +1,29 @@ +{ + "extends": "@tsed/typescript/tsconfig.node.json", + "compilerOptions": { + "baseUrl": ".", + "rootDir": "..", + "module": "commonjs", + "outDir": "./lib/cjs", + "declaration": false, + "composite": false, + "noEmit": true, + "paths": {}, + "types": [ + "vite/client", + "vitest/globals" + ] + }, + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] +} diff --git a/packages/cli-plugin-prisma/vitest.config.mts b/packages/cli-plugin-prisma/vitest.config.mts new file mode 100644 index 000000000..d759e8179 --- /dev/null +++ b/packages/cli-plugin-prisma/vitest.config.mts @@ -0,0 +1,21 @@ +// @ts-ignore +import {presets} from "@tsed/vitest/presets"; +import {defineConfig} from "vitest/config"; + +export default defineConfig( + { + ...presets, + test: { + ...presets.test, + coverage: { + ...presets.test.coverage, + thresholds: { + statements: 0, + branches: 0, + functions: 0, + lines: 0 + } + } + } + } +); diff --git a/packages/cli-plugin-typegraphql/.eslintignore b/packages/cli-plugin-typegraphql/.eslintignore deleted file mode 100644 index 2aab498ae..000000000 --- a/packages/cli-plugin-typegraphql/.eslintignore +++ /dev/null @@ -1,13 +0,0 @@ -node_modules -docs -docs-references -lib -dist -coverage -.nyc_output -*-lock.json -*.lock -benchmarks.* -**/generated - -**/*.js diff --git a/packages/cli-plugin-typegraphql/.eslintrc.js b/packages/cli-plugin-typegraphql/.eslintrc.js deleted file mode 100644 index 802f86f8b..000000000 --- a/packages/cli-plugin-typegraphql/.eslintrc.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@tsed/eslint/node.js"); diff --git a/packages/cli-plugin-typegraphql/.npmignore b/packages/cli-plugin-typegraphql/.npmignore index 7f50c0fb8..672ed7652 100644 --- a/packages/cli-plugin-typegraphql/.npmignore +++ b/packages/cli-plugin-typegraphql/.npmignore @@ -1,4 +1,8 @@ src test -tsconfig.compile.json +coverage tsconfig.json +tsconfig.*.json +__mock__ +*.spec.js +*.tsbuildinfo diff --git a/packages/cli-plugin-typegraphql/jest.config.js b/packages/cli-plugin-typegraphql/jest.config.js deleted file mode 100644 index a4f00514a..000000000 --- a/packages/cli-plugin-typegraphql/jest.config.js +++ /dev/null @@ -1,15 +0,0 @@ -// For a detailed explanation regarding each configuration property, visit: -// https://jestjs.io/docs/en/configuration.html - -module.exports = { - ...require("@tsed/jest-config"), - roots: ["/src", "/test"], - coverageThreshold: { - global: { - statements: 0, - branches: 0, - functions: 0, - lines: 0 - } - } -}; diff --git a/packages/cli-plugin-typegraphql/package.json b/packages/cli-plugin-typegraphql/package.json index 3efff17c8..75d83f638 100644 --- a/packages/cli-plugin-typegraphql/package.json +++ b/packages/cli-plugin-typegraphql/package.json @@ -1,23 +1,25 @@ { "name": "@tsed/cli-plugin-typegraphql", - "version": "5.2.10", "description": "Ts.ED CLI plugin. Add TypeGraphql support.", + "type": "commonjs", + "version": "5.2.10", "source": "./src/index.ts", "main": "./lib/cjs/index.js", "module": "./lib/esm/index.js", "typings": "./lib/types/index.d.ts", "exports": { - "types": "./lib/types/index.d.ts", - "import": "./lib/esm/index.js", - "require": "./lib/cjs/index.js", - "default": "./lib/esm/index.js" + ".": { + "types": "./lib/types/index.d.ts", + "import": "./lib/esm/index.js", + "require": "./lib/cjs/index.js", + "default": "./lib/esm/index.js" + } }, "scripts": { "build": "yarn build:ts", - "build:ts": "tsc --build tsconfig.json && tsc --build tsconfig.esm.json && cp scripts/templateDir.esm.js lib/esm/utils/templateDir.js", - "lint": "eslint '**/*.{ts,js}'", - "lint:fix": "eslint '**/*.{ts,js}' --fix", - "test": "cross-env NODE_ENV=test yarn jest --max-workers=2 --passWithNoTests && jest-coverage-thresholds-bumper" + "build:ts": "tsc --build tsconfig.json", + "test": "vitest run", + "test:ci": "vitest run --coverage.thresholds.autoUpdate=true" }, "files": [ "lib", @@ -29,12 +31,10 @@ "devDependencies": { "@tsed/cli": "5.2.10", "@tsed/cli-core": "5.2.10", - "@tsed/eslint": "5.2.10", - "@tsed/jest-config": "5.2.10", - "@tsed/typescript": "5.2.10", + "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", - "eslint": "8.22.0", - "jest": "29.5.0" + "typescript": "4.9.5", + "vitest": "2.1.1" }, "peerDependencies": { "@tsed/cli": "5.2.10", diff --git a/packages/cli-plugin-typegraphql/test/init/__snapshots__/init.integration.spec.ts.snap b/packages/cli-plugin-typegraphql/test/init/__snapshots__/init.integration.spec.ts.snap index 3fdd9cacc..e45c3d49c 100644 --- a/packages/cli-plugin-typegraphql/test/init/__snapshots__/init.integration.spec.ts.snap +++ b/packages/cli-plugin-typegraphql/test/init/__snapshots__/init.integration.spec.ts.snap @@ -1,20 +1,20 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP +// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html -exports[`Init TypeGraphQL project should generate a project with typegraphql 2`] = ` -"import {join} from \\"path\\"; -import {Configuration, Inject} from \\"@tsed/di\\"; -import {PlatformApplication} from \\"@tsed/common\\"; -import \\"@tsed/platform-express\\"; // /!\\\\ keep this import -import \\"@tsed/ajv\\"; -import \\"@tsed/typegraphql\\"; -import \\"./datasources/index\\"; -import \\"./resolvers/index\\"; -import {config} from \\"./config/index\\"; -import * as rest from \\"./controllers/rest/index\\"; +exports[`Init TypeGraphQL project > should generate a project with typegraphql 2`] = ` +"import {join} from "path"; +import {Configuration, Inject} from "@tsed/di"; +import {PlatformApplication} from "@tsed/common"; +import "@tsed/platform-express"; // /!\\ keep this import +import "@tsed/ajv"; +import "@tsed/typegraphql"; +import "./datasources/index"; +import "./resolvers/index"; +import {config} from "./config/index"; +import * as rest from "./controllers/rest/index"; @Configuration({ ...config, - acceptMimes: [\\"application/json\\"], + acceptMimes: ["application/json"], httpPort: process.env.PORT || 8083, httpsPort: false, // CHANGE disableComponentsScan: true, @@ -22,26 +22,26 @@ import * as rest from \\"./controllers/rest/index\\"; returnsCoercedValues: true }, mount: { - \\"/rest\\": [ + "/rest": [ ...Object.values(rest) ] }, middlewares: [ - \\"cors\\", - \\"cookie-parser\\", - \\"compression\\", - \\"method-override\\", - \\"json-parser\\", - { use: \\"urlencoded-parser\\", options: { extended: true }} + "cors", + "cookie-parser", + "compression", + "method-override", + "json-parser", + { use: "urlencoded-parser", options: { extended: true }} ], views: { - root: join(process.cwd(), \\"../views\\"), + root: join(process.cwd(), "../views"), extensions: { - ejs: \\"ejs\\" + ejs: "ejs" } }, exclude: [ - \\"**/*.spec.ts\\" + "**/*.spec.ts" ] }) export class Server { @@ -54,11 +54,11 @@ export class Server { " `; -exports[`Init TypeGraphQL project should generate a project with typegraphql 3`] = ` -"import {readFileSync} from \\"fs\\"; -import {envs} from \\"./envs/index\\"; -import loggerConfig from \\"./logger/index\\"; -const pkg = JSON.parse(readFileSync(\\"./package.json\\", {encoding: \\"utf8\\"})); +exports[`Init TypeGraphQL project > should generate a project with typegraphql 3`] = ` +"import {readFileSync} from "fs"; +import {envs} from "./envs/index"; +import loggerConfig from "./logger/index"; +const pkg = JSON.parse(readFileSync("./package.json", {encoding: "utf8"})); export const config: Partial = { version: pkg.version, @@ -66,7 +66,7 @@ export const config: Partial = { logger: loggerConfig, graphql: { default: { - path: \\"/graphql\\", + path: "/graphql", buildSchemaOptions: { } } diff --git a/packages/cli-plugin-typegraphql/test/init/init.integration.spec.ts b/packages/cli-plugin-typegraphql/test/init/init.integration.spec.ts index b40d0229f..c1c147f29 100644 --- a/packages/cli-plugin-typegraphql/test/init/init.integration.spec.ts +++ b/packages/cli-plugin-typegraphql/test/init/init.integration.spec.ts @@ -31,7 +31,7 @@ describe("Init TypeGraphQL project", () => { }); expect(FakeCliFs.getKeys()).toMatchInlineSnapshot(` - Array [ + [ "./project-name", "project-name", "project-name/.barrelsby.json", diff --git a/packages/cli-plugin-typegraphql/tsconfig.cjs.json b/packages/cli-plugin-typegraphql/tsconfig.cjs.json new file mode 100644 index 000000000..7f23b116d --- /dev/null +++ b/packages/cli-plugin-typegraphql/tsconfig.cjs.json @@ -0,0 +1,28 @@ +{ + "extends": "@tsed/typescript/tsconfig.node.json", + "compilerOptions": { + "baseUrl": ".", + "module": "commonjs", + "moduleResolution": "Node16", + "rootDir": "src", + "outDir": "./lib/cjs", + "declaration": true, + "declarationDir": "./lib/types", + "composite": true, + "noEmit": false + }, + "include": ["src", "src/**/*.json"], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage", + "spec", + "**/*.benchmark.ts", + "**/*.spec.ts", + "keys", + "**/__mock__/**", + "webpack.config.js" + ] +} diff --git a/packages/cli-plugin-typegraphql/tsconfig.esm.json b/packages/cli-plugin-typegraphql/tsconfig.esm.json index a500944d9..ce32a9e07 100644 --- a/packages/cli-plugin-typegraphql/tsconfig.esm.json +++ b/packages/cli-plugin-typegraphql/tsconfig.esm.json @@ -2,18 +2,16 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ES2020", + "module": "ESNext", + "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", + "declarationDir": "./lib/types-esm", "declaration": true, - "declarationDir": "./lib/types", "composite": true, "noEmit": false }, - "include": [ - "src", - "src/**/*.json" - ], + "include": ["src", "src/**/*.json"], "exclude": [ "node_modules", "test", @@ -24,16 +22,7 @@ "**/*.benchmark.ts", "**/*.spec.ts", "keys", - "jest.config.js", "**/__mock__/**", "webpack.config.js" - ], - "references": [ - { - "path": "../cli" - }, - { - "path": "../cli-core" - } ] } diff --git a/packages/cli-plugin-typegraphql/tsconfig.json b/packages/cli-plugin-typegraphql/tsconfig.json index 8f91fe8dc..705b5ce35 100644 --- a/packages/cli-plugin-typegraphql/tsconfig.json +++ b/packages/cli-plugin-typegraphql/tsconfig.json @@ -2,38 +2,24 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "commonjs", - "rootDir": "src", - "outDir": "./lib/cjs", - "declaration": true, - "declarationDir": "./lib/types", - "composite": true, - "noEmit": false + "noEmit": true }, - "include": [ - "src", - "src/**/*.json" - ], - "exclude": [ - "node_modules", - "test", - "lib", - "benchmark", - "coverage", - "spec", - "**/*.benchmark.ts", - "**/*.spec.ts", - "keys", - "jest.config.js", - "**/__mock__/**", - "webpack.config.js" - ], + "include": [], "references": [ { - "path": "../cli" + "path": "../cli/tsconfig.json" }, { - "path": "../cli-core" + "path": "../cli-core/tsconfig.json" + }, + { + "path": "./tsconfig.cjs.json" + }, + { + "path": "./tsconfig.esm.json" + }, + { + "path": "./tsconfig.spec.json" } ] } diff --git a/packages/cli-plugin-typegraphql/tsconfig.spec.json b/packages/cli-plugin-typegraphql/tsconfig.spec.json new file mode 100644 index 000000000..75fcfa09d --- /dev/null +++ b/packages/cli-plugin-typegraphql/tsconfig.spec.json @@ -0,0 +1,29 @@ +{ + "extends": "@tsed/typescript/tsconfig.node.json", + "compilerOptions": { + "baseUrl": ".", + "rootDir": "..", + "module": "commonjs", + "outDir": "./lib/cjs", + "declaration": false, + "composite": false, + "noEmit": true, + "paths": {}, + "types": [ + "vite/client", + "vitest/globals" + ] + }, + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] +} diff --git a/packages/cli-plugin-typegraphql/vitest.config.mts b/packages/cli-plugin-typegraphql/vitest.config.mts new file mode 100644 index 000000000..d759e8179 --- /dev/null +++ b/packages/cli-plugin-typegraphql/vitest.config.mts @@ -0,0 +1,21 @@ +// @ts-ignore +import {presets} from "@tsed/vitest/presets"; +import {defineConfig} from "vitest/config"; + +export default defineConfig( + { + ...presets, + test: { + ...presets.test, + coverage: { + ...presets.test.coverage, + thresholds: { + statements: 0, + branches: 0, + functions: 0, + lines: 0 + } + } + } + } +); diff --git a/packages/cli-plugin-typeorm/.eslintignore b/packages/cli-plugin-typeorm/.eslintignore deleted file mode 100644 index 2aab498ae..000000000 --- a/packages/cli-plugin-typeorm/.eslintignore +++ /dev/null @@ -1,13 +0,0 @@ -node_modules -docs -docs-references -lib -dist -coverage -.nyc_output -*-lock.json -*.lock -benchmarks.* -**/generated - -**/*.js diff --git a/packages/cli-plugin-typeorm/.eslintrc.js b/packages/cli-plugin-typeorm/.eslintrc.js deleted file mode 100644 index 802f86f8b..000000000 --- a/packages/cli-plugin-typeorm/.eslintrc.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@tsed/eslint/node.js"); diff --git a/packages/cli-plugin-typeorm/.npmignore b/packages/cli-plugin-typeorm/.npmignore index 7f50c0fb8..672ed7652 100644 --- a/packages/cli-plugin-typeorm/.npmignore +++ b/packages/cli-plugin-typeorm/.npmignore @@ -1,4 +1,8 @@ src test -tsconfig.compile.json +coverage tsconfig.json +tsconfig.*.json +__mock__ +*.spec.js +*.tsbuildinfo diff --git a/packages/cli-plugin-typeorm/jest.config.js b/packages/cli-plugin-typeorm/jest.config.js deleted file mode 100644 index dbaf595df..000000000 --- a/packages/cli-plugin-typeorm/jest.config.js +++ /dev/null @@ -1,15 +0,0 @@ -// For a detailed explanation regarding each configuration property, visit: -// https://jestjs.io/docs/en/configuration.html - -module.exports = { - ...require("@tsed/jest-config"), - roots: ["/src", "/test"], - coverageThreshold: { - global: { - statements: 86.25, - branches: 61.11, - functions: 92.3, - lines: 86.25 - } - } -}; diff --git a/packages/cli-plugin-typeorm/package.json b/packages/cli-plugin-typeorm/package.json index 007c728b7..30973f0e7 100644 --- a/packages/cli-plugin-typeorm/package.json +++ b/packages/cli-plugin-typeorm/package.json @@ -1,23 +1,25 @@ { "name": "@tsed/cli-plugin-typeorm", - "version": "5.2.10", "description": "Ts.ED CLI plugin. Add TypeORM support", + "type": "commonjs", + "version": "5.2.10", "source": "./src/index.ts", "main": "./lib/cjs/index.js", "module": "./lib/esm/index.js", "typings": "./lib/types/index.d.ts", "exports": { - "types": "./lib/types/index.d.ts", - "import": "./lib/esm/index.js", - "require": "./lib/cjs/index.js", - "default": "./lib/esm/index.js" + ".": { + "types": "./lib/types/index.d.ts", + "import": "./lib/esm/index.js", + "require": "./lib/cjs/index.js", + "default": "./lib/esm/index.js" + } }, "scripts": { "build": "yarn build:ts", - "build:ts": "tsc --build tsconfig.json && tsc --build tsconfig.esm.json && cp scripts/templateDir.esm.js lib/esm/utils/templateDir.js", - "lint": "eslint '**/*.{ts,js}'", - "lint:fix": "eslint '**/*.{ts,js}' --fix", - "test": "cross-env NODE_ENV=test yarn jest --max-workers=2 --passWithNoTests && jest-coverage-thresholds-bumper" + "build:ts": "tsc --build tsconfig.json", + "test": "vitest run", + "test:ci": "vitest run --coverage.thresholds.autoUpdate=true" }, "dependencies": { "change-case": "4.1.2", @@ -26,11 +28,9 @@ "devDependencies": { "@tsed/cli": "5.2.10", "@tsed/cli-core": "5.2.10", - "@tsed/eslint": "5.2.10", - "@tsed/jest-config": "5.2.10", - "@tsed/typescript": "5.2.10", + "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", - "eslint": "8.22.0", - "jest": "29.5.0" + "typescript": "4.9.5", + "vitest": "2.1.1" } } diff --git a/packages/cli-plugin-typeorm/test/integrations/generate/__snapshots__/generate.controller.integration.spec.ts.snap b/packages/cli-plugin-typeorm/test/integrations/generate/__snapshots__/generate.controller.integration.spec.ts.snap index 6b084631d..37750a020 100644 --- a/packages/cli-plugin-typeorm/test/integrations/generate/__snapshots__/generate.controller.integration.spec.ts.snap +++ b/packages/cli-plugin-typeorm/test/integrations/generate/__snapshots__/generate.controller.integration.spec.ts.snap @@ -1,31 +1,31 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP +// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html -exports[`Generate DataSource should generate the template with the right options (simple path) 1`] = ` -"import {registerProvider} from \\"@tsed/di\\"; -import {DataSource} from \\"typeorm\\"; -import {Logger} from \\"@tsed/logger\\"; +exports[`Generate DataSource > should generate the template with the right options (simple path) 1`] = ` +"import {registerProvider} from "@tsed/di"; +import {DataSource} from "typeorm"; +import {Logger} from "@tsed/logger"; -export const TestDatasource = Symbol.for(\\"TestDatasource\\"); +export const TestDatasource = Symbol.for("TestDatasource"); export type TestDatasource = DataSource; export const testDatasource = new DataSource({ - type: \\"mysql\\", + type: "mysql", entities: [], - host: \\"localhost\\", + host: "localhost", port: 3306, - username: \\"test\\", - password: \\"test\\", - database: \\"test\\" + username: "test", + password: "test", + database: "test" }); registerProvider({ provide: TestDatasource, - type: \\"typeorm:datasource\\", + type: "typeorm:datasource", deps: [Logger], async useAsyncFactory(logger: Logger) { await testDatasource.initialize(); - logger.info(\\"Connected with typeorm to database: Test\\"); + logger.info("Connected with typeorm to database: Test"); return testDatasource; }, @@ -38,7 +38,7 @@ registerProvider({ " `; -exports[`Generate DataSource should generate the template with the right options (simple path) 2`] = ` +exports[`Generate DataSource > should generate the template with the right options (simple path) 2`] = ` "services: test: image: mysql:8.0.28-oracle diff --git a/packages/cli-plugin-typeorm/test/integrations/generate/generate.controller.integration.spec.ts b/packages/cli-plugin-typeorm/test/integrations/generate/generate.controller.integration.spec.ts index dd7cb7aee..b222543bc 100644 --- a/packages/cli-plugin-typeorm/test/integrations/generate/generate.controller.integration.spec.ts +++ b/packages/cli-plugin-typeorm/test/integrations/generate/generate.controller.integration.spec.ts @@ -2,7 +2,6 @@ import {GenerateCmd, TEMPLATE_DIR} from "@tsed/cli"; import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; import "../../../src"; - describe("Generate DataSource", () => { beforeEach(() => CliPlatformTest.bootstrap({ diff --git a/packages/cli-plugin-typeorm/test/integrations/init/__snapshots__/init.integration.spec.ts.snap b/packages/cli-plugin-typeorm/test/integrations/init/__snapshots__/init.integration.spec.ts.snap index 4cd9e43c5..0e01f2501 100644 --- a/packages/cli-plugin-typeorm/test/integrations/init/__snapshots__/init.integration.spec.ts.snap +++ b/packages/cli-plugin-typeorm/test/integrations/init/__snapshots__/init.integration.spec.ts.snap @@ -1,17 +1,17 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP +// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html -exports[`TypeORM: Init cmd should generate a project with the right options 2`] = ` -"import {join} from \\"path\\"; -import {Configuration, Inject} from \\"@tsed/di\\"; -import {PlatformApplication} from \\"@tsed/common\\"; -import \\"@tsed/platform-express\\"; // /!\\\\ keep this import -import \\"@tsed/ajv\\"; -import {config} from \\"./config/index\\"; -import * as rest from \\"./controllers/rest/index\\"; +exports[`TypeORM: Init cmd > should generate a project with the right options 2`] = ` +"import {join} from "path"; +import {Configuration, Inject} from "@tsed/di"; +import {PlatformApplication} from "@tsed/common"; +import "@tsed/platform-express"; // /!\\ keep this import +import "@tsed/ajv"; +import {config} from "./config/index"; +import * as rest from "./controllers/rest/index"; @Configuration({ ...config, - acceptMimes: [\\"application/json\\"], + acceptMimes: ["application/json"], httpPort: process.env.PORT || 8083, httpsPort: false, // CHANGE disableComponentsScan: true, @@ -19,26 +19,26 @@ import * as rest from \\"./controllers/rest/index\\"; returnsCoercedValues: true }, mount: { - \\"/rest\\": [ + "/rest": [ ...Object.values(rest) ] }, middlewares: [ - \\"cors\\", - \\"cookie-parser\\", - \\"compression\\", - \\"method-override\\", - \\"json-parser\\", - { use: \\"urlencoded-parser\\", options: { extended: true }} + "cors", + "cookie-parser", + "compression", + "method-override", + "json-parser", + { use: "urlencoded-parser", options: { extended: true }} ], views: { - root: join(process.cwd(), \\"../views\\"), + root: join(process.cwd(), "../views"), extensions: { - ejs: \\"ejs\\" + ejs: "ejs" } }, exclude: [ - \\"**/*.spec.ts\\" + "**/*.spec.ts" ] }) export class Server { @@ -51,32 +51,32 @@ export class Server { " `; -exports[`TypeORM: Init cmd should generate a project with the right options 3`] = ` -"import {registerProvider} from \\"@tsed/di\\"; -import {DataSource} from \\"typeorm\\"; -import {Logger} from \\"@tsed/logger\\"; +exports[`TypeORM: Init cmd > should generate a project with the right options 3`] = ` +"import {registerProvider} from "@tsed/di"; +import {DataSource} from "typeorm"; +import {Logger} from "@tsed/logger"; -export const MysqlDatasource = Symbol.for(\\"MysqlDatasource\\"); +export const MysqlDatasource = Symbol.for("MysqlDatasource"); export type MysqlDatasource = DataSource; export const mysqlDatasource = new DataSource({ - type: \\"mysql\\", + type: "mysql", entities: [], - host: \\"localhost\\", + host: "localhost", port: 3306, - username: \\"test\\", - password: \\"test\\", - database: \\"test\\" + username: "test", + password: "test", + database: "test" }); registerProvider({ provide: MysqlDatasource, - type: \\"typeorm:datasource\\", + type: "typeorm:datasource", deps: [Logger], async useAsyncFactory(logger: Logger) { await mysqlDatasource.initialize(); - logger.info(\\"Connected with typeorm to database: Mysql\\"); + logger.info("Connected with typeorm to database: Mysql"); return mysqlDatasource; }, @@ -89,20 +89,4 @@ registerProvider({ " `; -exports[`TypeORM: Init cmd should generate a project with the right options 4`] = ` -"import { PlatformTest } from \\"@tsed/common\\"; -import { MysqlDatasource } from \\"./MysqlDatasource\\"; - -describe(\\"MysqlDatasource\\", () => { - beforeEach(PlatformTest.create); - afterEach(PlatformTest.reset); - - it(\\"should do something\\", () => { - const instance = PlatformTest.get(MysqlDatasource); - // const instance = PlatformTest.invoke(MysqlDatasource); // get fresh instance - - expect(instance).toBeInstanceOf(MysqlDatasource); - }); -}); -" -`; +exports[`TypeORM: Init cmd > should generate a project with the right options 4`] = `undefined`; diff --git a/packages/cli-plugin-typeorm/test/integrations/init/init.integration.spec.ts b/packages/cli-plugin-typeorm/test/integrations/init/init.integration.spec.ts index ab98cded6..b6baa8315 100644 --- a/packages/cli-plugin-typeorm/test/integrations/init/init.integration.spec.ts +++ b/packages/cli-plugin-typeorm/test/integrations/init/init.integration.spec.ts @@ -2,7 +2,6 @@ import {PackageManager} from "@tsed/cli-core"; import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; import {ArchitectureConvention, FeatureType, InitCmd, PlatformType, ProjectConvention, TEMPLATE_DIR} from "@tsed/cli"; import "../../../src"; -import "@tsed/cli-plugin-jest"; describe("TypeORM: Init cmd", () => { beforeEach(() => { @@ -50,7 +49,7 @@ describe("TypeORM: Init cmd", () => { }); expect(FakeCliFs.getKeys()).toMatchInlineSnapshot(` - Array [ + [ "./project-name", "project-name", "project-name/.barrelsby.json", @@ -59,11 +58,9 @@ describe("TypeORM: Init cmd", () => { "project-name/Dockerfile", "project-name/README.md", "project-name/docker-compose.yml", - "project-name/jest.config.js", "project-name/package.json", "project-name/processes.config.js", "project-name/src", - "project-name/src/Server.integration.spec.ts", "project-name/src/Server.ts", "project-name/src/config", "project-name/src/config/envs", @@ -72,11 +69,8 @@ describe("TypeORM: Init cmd", () => { "project-name/src/config/logger", "project-name/src/config/logger/index.ts", "project-name/src/controllers/rest", - "project-name/src/controllers/rest/HelloWorldController.integration.spec.ts", - "project-name/src/controllers/rest/HelloWorldController.spec.ts", "project-name/src/controllers/rest/HelloWorldController.ts", "project-name/src/datasources", - "project-name/src/datasources/MysqlDatasource.spec.ts", "project-name/src/datasources/MysqlDatasource.ts", "project-name/src/index.ts", "project-name/tsconfig.compile.json", @@ -129,7 +123,7 @@ describe("TypeORM: Init cmd", () => { }); expect(FakeCliFs.getKeys()).toMatchInlineSnapshot(` - Array [ + [ "./project-name", "project-name", "project-name/.barrelsby.json", @@ -138,11 +132,9 @@ describe("TypeORM: Init cmd", () => { "project-name/Dockerfile", "project-name/README.md", "project-name/docker-compose.yml", - "project-name/jest.config.js", "project-name/package.json", "project-name/processes.config.js", "project-name/src", - "project-name/src/Server.integration.spec.ts", "project-name/src/Server.ts", "project-name/src/config", "project-name/src/config/envs", @@ -151,8 +143,6 @@ describe("TypeORM: Init cmd", () => { "project-name/src/config/logger", "project-name/src/config/logger/index.ts", "project-name/src/controllers/rest", - "project-name/src/controllers/rest/HelloWorldController.integration.spec.ts", - "project-name/src/controllers/rest/HelloWorldController.spec.ts", "project-name/src/controllers/rest/HelloWorldController.ts", "project-name/src/index.ts", "project-name/tsconfig.compile.json", diff --git a/packages/cli-plugin-typeorm/tsconfig.cjs.json b/packages/cli-plugin-typeorm/tsconfig.cjs.json new file mode 100644 index 000000000..7f23b116d --- /dev/null +++ b/packages/cli-plugin-typeorm/tsconfig.cjs.json @@ -0,0 +1,28 @@ +{ + "extends": "@tsed/typescript/tsconfig.node.json", + "compilerOptions": { + "baseUrl": ".", + "module": "commonjs", + "moduleResolution": "Node16", + "rootDir": "src", + "outDir": "./lib/cjs", + "declaration": true, + "declarationDir": "./lib/types", + "composite": true, + "noEmit": false + }, + "include": ["src", "src/**/*.json"], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage", + "spec", + "**/*.benchmark.ts", + "**/*.spec.ts", + "keys", + "**/__mock__/**", + "webpack.config.js" + ] +} diff --git a/packages/cli-plugin-typeorm/tsconfig.esm.json b/packages/cli-plugin-typeorm/tsconfig.esm.json index a500944d9..ce32a9e07 100644 --- a/packages/cli-plugin-typeorm/tsconfig.esm.json +++ b/packages/cli-plugin-typeorm/tsconfig.esm.json @@ -2,18 +2,16 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ES2020", + "module": "ESNext", + "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", + "declarationDir": "./lib/types-esm", "declaration": true, - "declarationDir": "./lib/types", "composite": true, "noEmit": false }, - "include": [ - "src", - "src/**/*.json" - ], + "include": ["src", "src/**/*.json"], "exclude": [ "node_modules", "test", @@ -24,16 +22,7 @@ "**/*.benchmark.ts", "**/*.spec.ts", "keys", - "jest.config.js", "**/__mock__/**", "webpack.config.js" - ], - "references": [ - { - "path": "../cli" - }, - { - "path": "../cli-core" - } ] } diff --git a/packages/cli-plugin-typeorm/tsconfig.json b/packages/cli-plugin-typeorm/tsconfig.json index 8f91fe8dc..705b5ce35 100644 --- a/packages/cli-plugin-typeorm/tsconfig.json +++ b/packages/cli-plugin-typeorm/tsconfig.json @@ -2,38 +2,24 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "commonjs", - "rootDir": "src", - "outDir": "./lib/cjs", - "declaration": true, - "declarationDir": "./lib/types", - "composite": true, - "noEmit": false + "noEmit": true }, - "include": [ - "src", - "src/**/*.json" - ], - "exclude": [ - "node_modules", - "test", - "lib", - "benchmark", - "coverage", - "spec", - "**/*.benchmark.ts", - "**/*.spec.ts", - "keys", - "jest.config.js", - "**/__mock__/**", - "webpack.config.js" - ], + "include": [], "references": [ { - "path": "../cli" + "path": "../cli/tsconfig.json" }, { - "path": "../cli-core" + "path": "../cli-core/tsconfig.json" + }, + { + "path": "./tsconfig.cjs.json" + }, + { + "path": "./tsconfig.esm.json" + }, + { + "path": "./tsconfig.spec.json" } ] } diff --git a/packages/cli-plugin-typeorm/tsconfig.spec.json b/packages/cli-plugin-typeorm/tsconfig.spec.json new file mode 100644 index 000000000..75fcfa09d --- /dev/null +++ b/packages/cli-plugin-typeorm/tsconfig.spec.json @@ -0,0 +1,29 @@ +{ + "extends": "@tsed/typescript/tsconfig.node.json", + "compilerOptions": { + "baseUrl": ".", + "rootDir": "..", + "module": "commonjs", + "outDir": "./lib/cjs", + "declaration": false, + "composite": false, + "noEmit": true, + "paths": {}, + "types": [ + "vite/client", + "vitest/globals" + ] + }, + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] +} diff --git a/packages/cli-plugin-typeorm/vitest.config.mts b/packages/cli-plugin-typeorm/vitest.config.mts new file mode 100644 index 000000000..d759e8179 --- /dev/null +++ b/packages/cli-plugin-typeorm/vitest.config.mts @@ -0,0 +1,21 @@ +// @ts-ignore +import {presets} from "@tsed/vitest/presets"; +import {defineConfig} from "vitest/config"; + +export default defineConfig( + { + ...presets, + test: { + ...presets.test, + coverage: { + ...presets.test.coverage, + thresholds: { + statements: 0, + branches: 0, + functions: 0, + lines: 0 + } + } + } + } +); diff --git a/packages/cli-plugin-vitest/.eslintignore b/packages/cli-plugin-vitest/.eslintignore deleted file mode 100644 index 2aab498ae..000000000 --- a/packages/cli-plugin-vitest/.eslintignore +++ /dev/null @@ -1,13 +0,0 @@ -node_modules -docs -docs-references -lib -dist -coverage -.nyc_output -*-lock.json -*.lock -benchmarks.* -**/generated - -**/*.js diff --git a/packages/cli-plugin-vitest/.eslintrc.js b/packages/cli-plugin-vitest/.eslintrc.js deleted file mode 100644 index 802f86f8b..000000000 --- a/packages/cli-plugin-vitest/.eslintrc.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@tsed/eslint/node.js"); diff --git a/packages/cli-plugin-vitest/.npmignore b/packages/cli-plugin-vitest/.npmignore index 7f50c0fb8..672ed7652 100644 --- a/packages/cli-plugin-vitest/.npmignore +++ b/packages/cli-plugin-vitest/.npmignore @@ -1,4 +1,8 @@ src test -tsconfig.compile.json +coverage tsconfig.json +tsconfig.*.json +__mock__ +*.spec.js +*.tsbuildinfo diff --git a/packages/cli-plugin-vitest/jest.config.js b/packages/cli-plugin-vitest/jest.config.js deleted file mode 100644 index 70dcc4a9d..000000000 --- a/packages/cli-plugin-vitest/jest.config.js +++ /dev/null @@ -1,15 +0,0 @@ -// For a detailed explanation regarding each configuration property, visit: -// https://jestjs.io/docs/en/configuration.html - -module.exports = { - ...require("@tsed/jest-config"), - roots: ["/src", "/test"], - coverageThreshold: { - global: { - statements: 78.94, - branches: 37.5, - functions: 60, - lines: 78.94 - } - } -}; diff --git a/packages/cli-plugin-vitest/package.json b/packages/cli-plugin-vitest/package.json index f5c39c704..e95926593 100644 --- a/packages/cli-plugin-vitest/package.json +++ b/packages/cli-plugin-vitest/package.json @@ -1,33 +1,33 @@ { "name": "@tsed/cli-plugin-vitest", - "version": "5.2.10", "description": "Ts.ED CLI plugin. Add Jest support", + "type": "commonjs", + "version": "5.2.10", "source": "./src/index.ts", "main": "./lib/cjs/index.js", "module": "./lib/esm/index.js", "typings": "./lib/types/index.d.ts", "exports": { - "types": "./lib/types/index.d.ts", - "import": "./lib/esm/index.js", - "require": "./lib/cjs/index.js", - "default": "./lib/esm/index.js" + ".": { + "types": "./lib/types/index.d.ts", + "import": "./lib/esm/index.js", + "require": "./lib/cjs/index.js", + "default": "./lib/esm/index.js" + } }, "scripts": { "build": "yarn build:ts", - "build:ts": "tsc --build tsconfig.json && tsc --build tsconfig.esm.json && cp scripts/templateDir.esm.js lib/esm/utils/templateDir.js", - "lint": "eslint '**/*.{ts,js}'", - "lint:fix": "eslint '**/*.{ts,js}' --fix", - "test": "cross-env NODE_ENV=test yarn jest --max-workers=2 --passWithNoTests && jest-coverage-thresholds-bumper" + "build:ts": "tsc --build tsconfig.json", + "test": "vitest run", + "test:ci": "vitest run --coverage.thresholds.autoUpdate=true" }, "devDependencies": { "@tsed/cli": "5.2.10", "@tsed/cli-core": "5.2.10", - "@tsed/eslint": "5.2.10", - "@tsed/jest-config": "5.2.10", - "@tsed/typescript": "5.2.10", + "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", - "eslint": "8.22.0", - "jest": "29.5.0" + "typescript": "4.9.5", + "vitest": "2.1.1" }, "dependencies": { "tslib": "2.3.1" diff --git a/packages/cli-plugin-vitest/tsconfig.cjs.json b/packages/cli-plugin-vitest/tsconfig.cjs.json new file mode 100644 index 000000000..7f23b116d --- /dev/null +++ b/packages/cli-plugin-vitest/tsconfig.cjs.json @@ -0,0 +1,28 @@ +{ + "extends": "@tsed/typescript/tsconfig.node.json", + "compilerOptions": { + "baseUrl": ".", + "module": "commonjs", + "moduleResolution": "Node16", + "rootDir": "src", + "outDir": "./lib/cjs", + "declaration": true, + "declarationDir": "./lib/types", + "composite": true, + "noEmit": false + }, + "include": ["src", "src/**/*.json"], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage", + "spec", + "**/*.benchmark.ts", + "**/*.spec.ts", + "keys", + "**/__mock__/**", + "webpack.config.js" + ] +} diff --git a/packages/cli-plugin-vitest/tsconfig.esm.json b/packages/cli-plugin-vitest/tsconfig.esm.json index a500944d9..ce32a9e07 100644 --- a/packages/cli-plugin-vitest/tsconfig.esm.json +++ b/packages/cli-plugin-vitest/tsconfig.esm.json @@ -2,18 +2,16 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ES2020", + "module": "ESNext", + "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", + "declarationDir": "./lib/types-esm", "declaration": true, - "declarationDir": "./lib/types", "composite": true, "noEmit": false }, - "include": [ - "src", - "src/**/*.json" - ], + "include": ["src", "src/**/*.json"], "exclude": [ "node_modules", "test", @@ -24,16 +22,7 @@ "**/*.benchmark.ts", "**/*.spec.ts", "keys", - "jest.config.js", "**/__mock__/**", "webpack.config.js" - ], - "references": [ - { - "path": "../cli" - }, - { - "path": "../cli-core" - } ] } diff --git a/packages/cli-plugin-vitest/tsconfig.json b/packages/cli-plugin-vitest/tsconfig.json index 8f91fe8dc..705b5ce35 100644 --- a/packages/cli-plugin-vitest/tsconfig.json +++ b/packages/cli-plugin-vitest/tsconfig.json @@ -2,38 +2,24 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "commonjs", - "rootDir": "src", - "outDir": "./lib/cjs", - "declaration": true, - "declarationDir": "./lib/types", - "composite": true, - "noEmit": false + "noEmit": true }, - "include": [ - "src", - "src/**/*.json" - ], - "exclude": [ - "node_modules", - "test", - "lib", - "benchmark", - "coverage", - "spec", - "**/*.benchmark.ts", - "**/*.spec.ts", - "keys", - "jest.config.js", - "**/__mock__/**", - "webpack.config.js" - ], + "include": [], "references": [ { - "path": "../cli" + "path": "../cli/tsconfig.json" }, { - "path": "../cli-core" + "path": "../cli-core/tsconfig.json" + }, + { + "path": "./tsconfig.cjs.json" + }, + { + "path": "./tsconfig.esm.json" + }, + { + "path": "./tsconfig.spec.json" } ] } diff --git a/packages/cli-plugin-vitest/tsconfig.spec.json b/packages/cli-plugin-vitest/tsconfig.spec.json new file mode 100644 index 000000000..75fcfa09d --- /dev/null +++ b/packages/cli-plugin-vitest/tsconfig.spec.json @@ -0,0 +1,29 @@ +{ + "extends": "@tsed/typescript/tsconfig.node.json", + "compilerOptions": { + "baseUrl": ".", + "rootDir": "..", + "module": "commonjs", + "outDir": "./lib/cjs", + "declaration": false, + "composite": false, + "noEmit": true, + "paths": {}, + "types": [ + "vite/client", + "vitest/globals" + ] + }, + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] +} diff --git a/packages/cli-plugin-vitest/vitest.config.mts b/packages/cli-plugin-vitest/vitest.config.mts new file mode 100644 index 000000000..d759e8179 --- /dev/null +++ b/packages/cli-plugin-vitest/vitest.config.mts @@ -0,0 +1,21 @@ +// @ts-ignore +import {presets} from "@tsed/vitest/presets"; +import {defineConfig} from "vitest/config"; + +export default defineConfig( + { + ...presets, + test: { + ...presets.test, + coverage: { + ...presets.test.coverage, + thresholds: { + statements: 0, + branches: 0, + functions: 0, + lines: 0 + } + } + } + } +); diff --git a/packages/cli-testing/.eslintignore b/packages/cli-testing/.eslintignore deleted file mode 100644 index 2aab498ae..000000000 --- a/packages/cli-testing/.eslintignore +++ /dev/null @@ -1,13 +0,0 @@ -node_modules -docs -docs-references -lib -dist -coverage -.nyc_output -*-lock.json -*.lock -benchmarks.* -**/generated - -**/*.js diff --git a/packages/cli-testing/.eslintrc.js b/packages/cli-testing/.eslintrc.js deleted file mode 100644 index 802f86f8b..000000000 --- a/packages/cli-testing/.eslintrc.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@tsed/eslint/node.js"); diff --git a/packages/cli-testing/.npmignore b/packages/cli-testing/.npmignore index 7f50c0fb8..672ed7652 100644 --- a/packages/cli-testing/.npmignore +++ b/packages/cli-testing/.npmignore @@ -1,4 +1,8 @@ src test -tsconfig.compile.json +coverage tsconfig.json +tsconfig.*.json +__mock__ +*.spec.js +*.tsbuildinfo diff --git a/packages/cli-testing/jest.config.js b/packages/cli-testing/jest.config.js deleted file mode 100644 index a61292c23..000000000 --- a/packages/cli-testing/jest.config.js +++ /dev/null @@ -1,14 +0,0 @@ -// For a detailed explanation regarding each configuration property, visit: -// https://jestjs.io/docs/en/configuration.html - -module.exports = { - ...require("@tsed/jest-config"), - coverageThreshold: { - global: { - statements: 0, - branches: 0, - functions: 0, - lines: 0 - } - } -}; diff --git a/packages/cli-testing/package.json b/packages/cli-testing/package.json index 8d8c3578f..1a9cf2255 100644 --- a/packages/cli-testing/package.json +++ b/packages/cli-testing/package.json @@ -1,23 +1,25 @@ { "name": "@tsed/cli-testing", - "version": "5.2.10", "description": "Utils to test you CLI based on Ts.ED CLI", + "type": "commonjs", + "version": "5.2.10", "source": "./src/index.ts", "main": "./lib/cjs/index.js", "module": "./lib/esm/index.js", "typings": "./lib/types/index.d.ts", "exports": { - "types": "./lib/types/index.d.ts", - "import": "./lib/esm/index.js", - "require": "./lib/cjs/index.js", - "default": "./lib/esm/index.js" + ".": { + "types": "./lib/types/index.d.ts", + "import": "./lib/esm/index.js", + "require": "./lib/cjs/index.js", + "default": "./lib/esm/index.js" + } }, "scripts": { "build": "yarn build:ts", - "build:ts": "tsc --build tsconfig.json && tsc --build tsconfig.esm.json", - "lint": "eslint '**/*.{ts,js}'", - "lint:fix": "eslint '**/*.{ts,js}' --fix", - "test": "cross-env NODE_ENV=test yarn jest --max-workers=2 --passWithNoTests && jest-coverage-thresholds-bumper" + "build:ts": "tsc --build tsconfig.json", + "test": "vitest run", + "test:ci": "vitest run --coverage.thresholds.autoUpdate=true" }, "keywords": [ "Ts.ED", @@ -34,11 +36,9 @@ "tslib": "2.3.1" }, "devDependencies": { - "@tsed/eslint": "5.2.10", - "@tsed/jest-config": "5.2.10", - "@tsed/typescript": "5.2.10", + "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", - "eslint": "8.22.0", - "jest": "29.5.0" + "typescript": "4.9.5", + "vitest": "2.1.1" } } diff --git a/packages/cli-testing/tsconfig.cjs.json b/packages/cli-testing/tsconfig.cjs.json new file mode 100644 index 000000000..7f23b116d --- /dev/null +++ b/packages/cli-testing/tsconfig.cjs.json @@ -0,0 +1,28 @@ +{ + "extends": "@tsed/typescript/tsconfig.node.json", + "compilerOptions": { + "baseUrl": ".", + "module": "commonjs", + "moduleResolution": "Node16", + "rootDir": "src", + "outDir": "./lib/cjs", + "declaration": true, + "declarationDir": "./lib/types", + "composite": true, + "noEmit": false + }, + "include": ["src", "src/**/*.json"], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage", + "spec", + "**/*.benchmark.ts", + "**/*.spec.ts", + "keys", + "**/__mock__/**", + "webpack.config.js" + ] +} diff --git a/packages/cli-testing/tsconfig.esm.json b/packages/cli-testing/tsconfig.esm.json index 9fcce9b4d..ce32a9e07 100644 --- a/packages/cli-testing/tsconfig.esm.json +++ b/packages/cli-testing/tsconfig.esm.json @@ -2,18 +2,16 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ES2020", + "module": "ESNext", + "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", + "declarationDir": "./lib/types-esm", "declaration": true, - "declarationDir": "./lib/types", "composite": true, "noEmit": false }, - "include": [ - "src", - "src/**/*.json" - ], + "include": ["src", "src/**/*.json"], "exclude": [ "node_modules", "test", @@ -24,13 +22,7 @@ "**/*.benchmark.ts", "**/*.spec.ts", "keys", - "jest.config.js", "**/__mock__/**", "webpack.config.js" - ], - "references": [ - { - "path": "../cli-core" - } ] } diff --git a/packages/cli-testing/tsconfig.json b/packages/cli-testing/tsconfig.json index 3fea65865..3b5108a39 100644 --- a/packages/cli-testing/tsconfig.json +++ b/packages/cli-testing/tsconfig.json @@ -2,35 +2,18 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "commonjs", - "rootDir": "src", - "outDir": "./lib/cjs", - "declaration": true, - "declarationDir": "./lib/types", - "composite": true, - "noEmit": false + "noEmit": true }, - "include": [ - "src", - "src/**/*.json" - ], - "exclude": [ - "node_modules", - "test", - "lib", - "benchmark", - "coverage", - "spec", - "**/*.benchmark.ts", - "**/*.spec.ts", - "keys", - "jest.config.js", - "**/__mock__/**", - "webpack.config.js" - ], + "include": [], "references": [ { - "path": "../cli-core" + "path": "../cli-core/tsconfig.json" + }, + { + "path": "./tsconfig.cjs.json" + }, + { + "path": "./tsconfig.esm.json" } ] } diff --git a/packages/cli-testing/tsconfig.spec.json b/packages/cli-testing/tsconfig.spec.json new file mode 100644 index 000000000..079424388 --- /dev/null +++ b/packages/cli-testing/tsconfig.spec.json @@ -0,0 +1,36 @@ +{ + "extends": "@tsed/typescript/tsconfig.node.json", + "compilerOptions": { + "baseUrl": ".", + "rootDir": "..", + "module": "commonjs", + "outDir": "./lib/cjs", + "declaration": false, + "composite": false, + "noEmit": true, + "paths": { + "@tsed/openspec": ["../specs/openspec/src"], + "@tsed/schema": ["../specs/schema/src"], + "@tsed/exceptions": ["../specs/exceptions/src"], + "@tsed/json-mapper": ["../specs/json-mapper/src"], + "@tsed/platform-exceptions": ["../platform/platform-exceptions/src"], + "@tsed/platform-middlewares": ["../platform/platform-middlewares/src"], + "@tsed/platform-params": ["../platform/platform-params/src"], + "@tsed/platform-log-middleware": ["../platform/platform-log-middleware/src"], + "@tsed/platform-response-filter": ["../platform/platform-response-filter/src"], + "@tsed/platform-router": ["../platform/platform-router/src"], + "@tsed/platform-views": ["../platform/platform-views/src"], + "@tsed/components-scan": ["../third-parties/components-scan/src"], + "@tsed/common": ["../platform/common/src"], + "@tsed/ajv": ["../specs/ajv/src"], + "@tsed/platform-cache": ["../platform/platform-cache/src"], + "@tsed/swagger": ["../specs/swagger/src"], + "@tsed/platform-test-sdk": ["../platform/platform-test-sdk/src"], + "@tsed/platform-express": ["../platform/platform-express/src"], + "@tsed/platform-koa": ["../platform/platform-koa/src"] + }, + "types": ["vite/client", "vitest/globals"] + }, + "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], + "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] +} diff --git a/packages/cli-testing/vitest.config.mts b/packages/cli-testing/vitest.config.mts new file mode 100644 index 000000000..d759e8179 --- /dev/null +++ b/packages/cli-testing/vitest.config.mts @@ -0,0 +1,21 @@ +// @ts-ignore +import {presets} from "@tsed/vitest/presets"; +import {defineConfig} from "vitest/config"; + +export default defineConfig( + { + ...presets, + test: { + ...presets.test, + coverage: { + ...presets.test.coverage, + thresholds: { + statements: 0, + branches: 0, + functions: 0, + lines: 0 + } + } + } + } +); diff --git a/packages/cli/.eslintignore b/packages/cli/.eslintignore deleted file mode 100644 index 0489ff139..000000000 --- a/packages/cli/.eslintignore +++ /dev/null @@ -1,13 +0,0 @@ -node_modules -docs -docs-references -lib -dist -coverage -.nyc_output -*-lock.json -*.lock -benchmarks.* -**/generated -test/integrations/init/data -**/*.js diff --git a/packages/cli/.eslintrc.js b/packages/cli/.eslintrc.js deleted file mode 100644 index 802f86f8b..000000000 --- a/packages/cli/.eslintrc.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@tsed/eslint/node.js"); diff --git a/packages/cli/.npmignore b/packages/cli/.npmignore index 7f50c0fb8..672ed7652 100644 --- a/packages/cli/.npmignore +++ b/packages/cli/.npmignore @@ -1,4 +1,8 @@ src test -tsconfig.compile.json +coverage tsconfig.json +tsconfig.*.json +__mock__ +*.spec.js +*.tsbuildinfo diff --git a/packages/cli/jest.config.js b/packages/cli/jest.config.js deleted file mode 100644 index 7254c8b95..000000000 --- a/packages/cli/jest.config.js +++ /dev/null @@ -1,16 +0,0 @@ -// For a detailed explanation regarding each configuration property, visit: -// https://jestjs.io/docs/en/configuration.html - -module.exports = { - ...require("@tsed/jest-config"), - roots: ["/src", "/test"], - - coverageThreshold: { - global: { - statements: 92.17, - branches: 72.37, - functions: 83.47, - lines: 92.17 - } - } -}; diff --git a/packages/cli/package.json b/packages/cli/package.json index 248c67a0d..865aa3f41 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,19 +1,23 @@ { "name": "@tsed/cli", + "description": "CLI to bootstrap your Ts.ED project", + "type": "commonjs", "version": "5.2.10", "source": "./src/index.ts", "main": "./lib/cjs/index.js", "module": "./lib/esm/index.js", "typings": "./lib/types/index.d.ts", "exports": { - "types": "./lib/types/index.d.ts", - "import": "./lib/esm/index.js", - "require": "./lib/cjs/index.js", - "default": "./lib/esm/index.js" + ".": { + "types": "./lib/types/index.d.ts", + "import": "./lib/esm/index.js", + "require": "./lib/cjs/index.js", + "default": "./lib/esm/index.js" + } }, "scripts": { "build": "yarn build:ts", - "build:ts": "tsc --build tsconfig.json && tsc --build tsconfig.esm.json && cp scripts/index.esm.js lib/esm/constants/index.js", + "build:ts": "tsc --build tsconfig.json", "start:help": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts -h", "start:help:g": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts generate -h", "start:help:i": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts init -h", @@ -33,9 +37,8 @@ "start:g:prisma": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts g service -r ./.tmp/init/awesome prisma", "start:generate:run": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts generate -r ./.tmp/init/awesome", "start:typeorm:run": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts typeorm entity:create -r ./.tmp/init/awesome --name User", - "lint": "eslint '**/*.{ts,js}'", - "lint:fix": "eslint '**/*.{ts,js}' --fix", - "test": "cross-env NODE_ENV=test yarn jest --max-workers=2 --passWithNoTests && jest-coverage-thresholds-bumper" + "test": "vitest run", + "test:ci": "vitest run --coverage.thresholds.autoUpdate=true" }, "bin": { "tsed": "lib/cjs/bin/tsed.js" @@ -48,7 +51,6 @@ "lib", "templates" ], - "description": "CLI to bootstrap your Ts.ED project", "keywords": [ "Ts.ED", "cli", @@ -79,13 +81,11 @@ "tslib": "2.3.1" }, "devDependencies": { - "@tsed/eslint": "5.2.10", - "@tsed/jest-config": "5.2.10", - "@tsed/typescript": "5.2.10", + "@tsed/typescript": "workspace:*", "@types/change-case": "^2.3.1", "cross-env": "7.0.3", - "eslint": "8.22.0", - "jest": "29.5.0" + "typescript": "4.9.5", + "vitest": "2.1.1" }, "peerDependencies": { "@tsed/cli-core": "5.2.10", diff --git a/packages/cli/src/commands/generate/GenerateCmd.spec.ts b/packages/cli/src/commands/generate/GenerateCmd.spec.ts index 3205c90f2..07a745831 100644 --- a/packages/cli/src/commands/generate/GenerateCmd.spec.ts +++ b/packages/cli/src/commands/generate/GenerateCmd.spec.ts @@ -1,10 +1,11 @@ -import {SrcRendererService} from "@tsed/cli-core"; +// @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; +import {SrcRendererService} from "@tsed/cli-core"; import {GenerateCmd} from "./GenerateCmd"; describe("GenerateCmd", () => { - beforeEach(CliPlatformTest.create); - afterEach(CliPlatformTest.reset); + beforeEach(() => CliPlatformTest.create()); + afterEach(() => CliPlatformTest.reset()); describe("$prompt", () => { it( @@ -73,7 +74,7 @@ describe("GenerateCmd", () => { it("should return tasks", async () => { // GIVEN const renderService = { - render: jest.fn() + render: vi.fn() }; let options = { @@ -127,7 +128,7 @@ describe("GenerateCmd", () => { it("should return empty tasks", async () => { // GIVEN const renderService = { - render: jest.fn() + render: vi.fn() }; let options = { diff --git a/packages/cli/src/commands/init/InitCmd.spec.ts b/packages/cli/src/commands/init/InitCmd.spec.ts index a4e1cd858..4ce21ffd0 100644 --- a/packages/cli/src/commands/init/InitCmd.spec.ts +++ b/packages/cli/src/commands/init/InitCmd.spec.ts @@ -1,16 +1,17 @@ import {catchError} from "@tsed/core"; import {InitCmd} from "../../../src/commands/init/InitCmd"; +// @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; import {PackageManagersModule} from "@tsed/cli-core"; import {RuntimesModule} from "../../runtimes/RuntimesModule"; async function getServiceFixture() { const packageManagers = { - list: jest.fn().mockReturnValue([]) + list: vi.fn().mockReturnValue([]) }; const runtimes = { - list: jest.fn().mockReturnValue(["node"]) + list: vi.fn().mockReturnValue(["node"]) }; const service = await CliPlatformTest.invoke(InitCmd, [ diff --git a/packages/cli/src/commands/init/prompts/getFeaturesPrompt.spec.ts b/packages/cli/src/commands/init/prompts/getFeaturesPrompt.spec.ts index 038abbdd2..91d761638 100644 --- a/packages/cli/src/commands/init/prompts/getFeaturesPrompt.spec.ts +++ b/packages/cli/src/commands/init/prompts/getFeaturesPrompt.spec.ts @@ -6,15 +6,15 @@ describe("getFeaturesPrompt", () => { expect(prompt).toBeInstanceOf(Array); expect(prompt).toMatchInlineSnapshot(` - Array [ - Object { - "choices": Array [ - Object { + [ + { + "choices": [ + { "checked": true, "name": "Express.js", "value": "express", }, - Object { + { "checked": false, "name": "Koa.js", "value": "koa", @@ -24,14 +24,14 @@ describe("getFeaturesPrompt", () => { "name": "platform", "type": "list", }, - Object { - "choices": Array [ - Object { + { + "choices": [ + { "checked": true, "name": "Ts.ED", "value": "arc_default", }, - Object { + { "checked": false, "name": "Feature", "value": "feature", @@ -41,14 +41,14 @@ describe("getFeaturesPrompt", () => { "name": "architecture", "type": "list", }, - Object { - "choices": Array [ - Object { + { + "choices": [ + { "checked": true, "name": "Ts.ED", "value": "conv_default", }, - Object { + { "checked": false, "name": "Angular", "value": "angular", @@ -58,70 +58,70 @@ describe("getFeaturesPrompt", () => { "name": "convention", "type": "list", }, - Object { - "choices": Array [ - Object { - "dependencies": Object { + { + "choices": [ + { + "dependencies": { "@tsed/typegraphql": "{{tsedVersion}}", }, - "devDependencies": Object { + "devDependencies": { "@tsed/cli-plugin-typegraphql": "{{cliVersion}}", }, "name": "TypeGraphQL", "value": "graphql", }, - Object { + { "name": "Database", "value": "db", }, - Object { - "devDependencies": Object { + { + "devDependencies": { "@tsed/cli-plugin-passport": "{{cliVersion}}", }, "name": "Passport.js", "value": "passportjs", "when": [Function], }, - Object { - "dependencies": Object { + { + "dependencies": { "@tsed/socketio": "{{tsedVersion}}", "socket.io": "latest", }, "name": "Socket.io", "value": "socketio", }, - Object { - "dependencies": Object { + { + "dependencies": { "@tsed/swagger": "{{tsedVersion}}", }, "name": "Swagger", "value": "swagger", }, - Object { - "devDependencies": Object { + { + "devDependencies": { "@tsed/cli-plugin-oidc-provider": "{{cliVersion}}", }, "name": "OpenID Connect provider", "value": "oidc", }, - Object { - "dependencies": Object {}, - "devDependencies": Object { + { + "dependencies": {}, + "devDependencies": { "@types/supertest": "latest", "supertest": "latest", }, "name": "Testing", "value": "testing", }, - Object { + { "name": "Linter", "value": "linter", }, - Object { - "dependencies": Object { + { + "dependencies": { "@tsed/cli-core": "{{cliVersion}}", }, - "devDependencies": Object { + "devDependencies": { "@types/inquirer": "^8.2.4", }, "name": "Commands", @@ -132,24 +132,24 @@ describe("getFeaturesPrompt", () => { "name": "features", "type": "checkbox", }, - Object { - "choices": Array [ - Object { - "devDependencies": Object { + { + "choices": [ + { + "devDependencies": { "@tsed/cli-plugin-prisma": "{{cliVersion}}", }, "name": "Prisma", "value": "prisma", }, - Object { - "devDependencies": Object { + { + "devDependencies": { "@tsed/cli-plugin-mongoose": "{{cliVersion}}", }, "name": "Mongoose", "value": "mongoose", }, - Object { - "devDependencies": Object { + { + "devDependencies": { "@tsed/cli-plugin-typeorm": "{{cliVersion}}", "typeorm": "latest", }, @@ -162,88 +162,88 @@ describe("getFeaturesPrompt", () => { "type": "list", "when": [Function], }, - Object { - "choices": Array [ - Object { - "dependencies": Object { + { + "choices": [ + { + "dependencies": { "mysql2": "latest", }, "name": "MySQL", "value": "typeorm:mysql", }, - Object { - "dependencies": Object { + { + "dependencies": { "mariadb": "latest", }, "name": "MariaDB", "value": "typeorm:mariadb", }, - Object { - "dependencies": Object { + { + "dependencies": { "pg": "latest", }, "name": "Postgres", "value": "typeorm:postgres", }, - Object { - "dependencies": Object { + { + "dependencies": { "cockroachdb": "latest", }, "name": "CockRoachDB", "value": "typeorm:cockroachdb", }, - Object { - "dependencies": Object { + { + "dependencies": { "sqlite3": "latest", }, "name": "SQLite", "value": "typeorm:sqlite", }, - Object { - "dependencies": Object { + { + "dependencies": { "better-sqlite3": "latest", }, "name": "Better SQLite3", "value": "typeorm:better-sqlite3", }, - Object { + { "name": "Cordova", "value": "typeorm:cordova", }, - Object { + { "name": "NativeScript", "value": "typeorm:nativescript", }, - Object { - "dependencies": Object { + { + "dependencies": { "oracledb": "latest", }, "name": "Oracle", "value": "typeorm:oracle", }, - Object { - "dependencies": Object { + { + "dependencies": { "mssql": "latest", }, "name": "MsSQL", "value": "typeorm:mssql", }, - Object { - "dependencies": Object { + { + "dependencies": { "mongodb": "latest", }, "name": "MongoDB", "value": "typeorm:mongodb", }, - Object { + { "name": "SQL.js", "value": "typeorm:sqljs", }, - Object { + { "name": "ReactNative", "value": "typeorm:reactnative", }, - Object { + { "name": "Expo", "value": "typeorm:expo", }, @@ -253,24 +253,24 @@ describe("getFeaturesPrompt", () => { "type": "list", "when": [Function], }, - Object { - "choices": Array [ - Object { - "devDependencies": Object { + { + "choices": [ + { + "devDependencies": { "@tsed/cli-plugin-vitest": "{{cliVersion}}", }, "name": "Vitest", "value": "vitest", }, - Object { - "devDependencies": Object { + { + "devDependencies": { "@tsed/cli-plugin-jest": "{{cliVersion}}", }, "name": "Jest", "value": "jest", }, - Object { - "devDependencies": Object { + { + "devDependencies": { "@tsed/cli-plugin-mocha": "{{cliVersion}}", }, "name": "Mocha + Chai + Sinon", @@ -282,11 +282,11 @@ describe("getFeaturesPrompt", () => { "type": "list", "when": [Function], }, - Object { - "choices": Array [ - Object { + { + "choices": [ + { "checked": true, - "devDependencies": Object { + "devDependencies": { "@tsed/cli-plugin-eslint": "{{cliVersion}}", }, "name": "EsLint", @@ -298,13 +298,13 @@ describe("getFeaturesPrompt", () => { "type": "list", "when": [Function], }, - Object { - "choices": Array [ - Object { + { + "choices": [ + { "name": "Prettier", "value": "prettier", }, - Object { + { "name": "Lint on commit", "value": "lintstaged", }, @@ -314,21 +314,21 @@ describe("getFeaturesPrompt", () => { "type": "checkbox", "when": [Function], }, - Object { + { "default": "/oidc", "message": "Choose the OIDC base path server", "name": "oidcBasePath", "type": "input", "when": [Function], }, - Object { - "choices": Array [ - Object { + { + "choices": [ + { "checked": true, "name": "Node.js", "value": "node", }, - Object { + { "checked": false, "name": "Bun.js (experimental)", "value": "bun", @@ -338,24 +338,24 @@ describe("getFeaturesPrompt", () => { "name": "runtime", "type": "list", }, - Object { - "choices": Array [ - Object { + { + "choices": [ + { "checked": true, "name": "Yarn", "value": "yarn", }, - Object { + { "checked": false, "name": "NPM", "value": "npm", }, - Object { + { "checked": false, "name": "PNPM (experimental)", "value": "pnpm", }, - Object { + { "checked": false, "name": "Bun.js (experimental)", "value": "bun", diff --git a/packages/cli/src/commands/run/RunCmd.spec.ts b/packages/cli/src/commands/run/RunCmd.spec.ts index cde0b90ab..0c58d4ee7 100644 --- a/packages/cli/src/commands/run/RunCmd.spec.ts +++ b/packages/cli/src/commands/run/RunCmd.spec.ts @@ -1,3 +1,4 @@ +// @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; import {RunCmd} from "./RunCmd"; import {CliFs, CliRunScript} from "@tsed/cli-core"; @@ -9,10 +10,10 @@ describe("RunCmd", () => { describe("$exec()", () => { it("should run sub project command (development)", async () => { const runScript = { - run: jest.fn() + run: vi.fn() }; const cliFs = { - exists: jest.fn().mockReturnValue(false) + exists: vi.fn().mockReturnValue(false) }; const command = await CliPlatformTest.invoke(RunCmd, [ { @@ -40,10 +41,10 @@ describe("RunCmd", () => { }); it("should run sub project command (production)", async () => { const runScript = { - run: jest.fn() + run: vi.fn() }; const cliFs = { - exists: jest.fn().mockReturnValue(false) + exists: vi.fn().mockReturnValue(false) }; const command = await CliPlatformTest.invoke(RunCmd, [ { @@ -72,12 +73,12 @@ describe("RunCmd", () => { }); it("should run sub project command (production + tsconfig)", async () => { const runScript = { - run: jest.fn() + run: vi.fn() }; const cliFs = { - exists: jest.fn().mockReturnValue(true), - readFile: jest.fn().mockResolvedValue(JSON.stringify({compilerOptions: {outDir: "./lib"}})), - readJsonSync: jest.fn().mockResolvedValue({}) + exists: vi.fn().mockReturnValue(true), + readFile: vi.fn().mockResolvedValue(JSON.stringify({compilerOptions: {outDir: "./lib"}})), + readJsonSync: vi.fn().mockResolvedValue({}) }; const command = await CliPlatformTest.invoke(RunCmd, [ { diff --git a/packages/cli/src/commands/update/UpdateCmd.spec.ts b/packages/cli/src/commands/update/UpdateCmd.spec.ts index e1a1ddf05..a672e5e05 100644 --- a/packages/cli/src/commands/update/UpdateCmd.spec.ts +++ b/packages/cli/src/commands/update/UpdateCmd.spec.ts @@ -1,4 +1,5 @@ import {NpmRegistryClient, ProjectPackageJson} from "@tsed/cli-core"; +// @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; import {UpdateCmd} from "./UpdateCmd"; diff --git a/packages/cli/src/pipes/OutputFilePathPipe.spec.ts b/packages/cli/src/pipes/OutputFilePathPipe.spec.ts index 00a962cb2..03131465b 100644 --- a/packages/cli/src/pipes/OutputFilePathPipe.spec.ts +++ b/packages/cli/src/pipes/OutputFilePathPipe.spec.ts @@ -2,6 +2,7 @@ import {ArchitectureConvention} from "./../interfaces/ArchitectureConvention"; import {ProvidersInfoService} from "../services/ProvidersInfoService"; import {ClassNamePipe} from "./ClassNamePipe"; import {OutputFilePathPipe} from "./OutputFilePathPipe"; +// @ts-ignore import {normalizePath} from "@tsed/cli-testing"; describe("OutputFilePathPipe", () => { diff --git a/packages/cli/src/utils/__snapshots__/fillImport.spec.ts.snap b/packages/cli/src/utils/__snapshots__/fillImport.spec.ts.snap index d393edadd..f770e1bca 100644 --- a/packages/cli/src/utils/__snapshots__/fillImport.spec.ts.snap +++ b/packages/cli/src/utils/__snapshots__/fillImport.spec.ts.snap @@ -1,27 +1,27 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP +// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html -exports[`fillImports() it should return barrels and imports files for (arc_default, oidc: false, graphql: false, swagger: true, passportjs: false, express: false, koa: false, mongoose: false) 1`] = ` -Object { +exports[`fillImports() > it should return barrels and imports files for ('arc_default', oidc: false, graphql: false, swagger: true, passportjs: false, express: false, koa: false, mongoose: false) 1`] = ` +{ "architecture": "arc_default", - "barrels": "[\\"./src/controllers/rest\\",\\"./src/controllers/pages\\"]", + "barrels": "["./src/controllers/rest","./src/controllers/pages"]", "express": false, "graphql": false, - "imports": Array [ - Object { + "imports": [ + { "from": "@tsed/ajv", }, - Object { + { "from": "@tsed/swagger", }, - Object { + { "from": "./config/index", "symbols": "{config}", }, - Object { + { "from": "./controllers/rest/index", "symbols": "* as rest", }, - Object { + { "from": "./controllers/pages/index", "symbols": "* as pages", }, @@ -34,32 +34,32 @@ Object { } `; -exports[`fillImports() it should return barrels and imports files for (arc_default, oidc: true, graphql: false, swagger: false, passportjs: false, express: false, koa: true, mongoose: false) 1`] = ` -Object { +exports[`fillImports() > it should return barrels and imports files for ('arc_default', oidc: true, graphql: false, swagger: false, passportjs: false, express: false, koa: true, mongoose: false) 1`] = ` +{ "architecture": "arc_default", - "barrels": "[\\"./src/controllers/rest\\",\\"./src/interactions\\"]", + "barrels": "["./src/controllers/rest","./src/interactions"]", "express": false, "graphql": false, - "imports": Array [ - Object { + "imports": [ + { "from": "@tsed/ajv", }, - Object { + { "from": "@tsed/oidc-provider", }, - Object { + { "from": "./config/index", "symbols": "{config}", }, - Object { + { "from": "./controllers/rest/index", "symbols": "* as rest", }, - Object { + { "from": "./controllers/pages/index", "symbols": "* as pages", }, - Object { + { "from": "./controllers/oidc/InteractionsController", "symbols": "{InteractionsController}", }, @@ -72,50 +72,50 @@ Object { } `; -exports[`fillImports() it should return barrels and imports files for (arc_default, oidc: true, graphql: true, swagger: true, passportjs: true, express: false, koa: true, mongoose: true) 1`] = ` -Object { +exports[`fillImports() > it should return barrels and imports files for ('arc_default', oidc: true, graphql: true, swagger: true, passportjs: true, express: false, koa: true, mongoose: true) 1`] = ` +{ "architecture": "arc_default", - "barrels": "[\\"./src/controllers/rest\\",\\"./src/controllers/pages\\",\\"./src/interactions\\",\\"./src/datasources\\",\\"./src/resolvers\\"]", + "barrels": "["./src/controllers/rest","./src/controllers/pages","./src/interactions","./src/datasources","./src/resolvers"]", "express": false, "graphql": true, - "imports": Array [ - Object { + "imports": [ + { "from": "@tsed/ajv", }, - Object { + { "from": "@tsed/swagger", }, - Object { + { "from": "@tsed/mongoose", }, - Object { + { "from": "@tsed/oidc-provider", }, - Object { + { "from": "@tsed/passport", }, - Object { + { "from": "@tsed/typegraphql", }, - Object { + { "from": "./datasources/index", }, - Object { + { "from": "./resolvers/index", }, - Object { + { "from": "./config/index", "symbols": "{config}", }, - Object { + { "from": "./controllers/rest/index", "symbols": "* as rest", }, - Object { + { "from": "./controllers/pages/index", "symbols": "* as pages", }, - Object { + { "from": "./controllers/oidc/InteractionsController", "symbols": "{InteractionsController}", }, @@ -128,21 +128,21 @@ Object { } `; -exports[`fillImports() it should return barrels and imports files for (feature, oidc: false, graphql: false, swagger: false, passportjs: false, express: false, koa: false, mongoose: false) 1`] = ` -Object { +exports[`fillImports() > it should return barrels and imports files for ('feature', oidc: false, graphql: false, swagger: false, passportjs: false, express: false, koa: false, mongoose: false) 1`] = ` +{ "architecture": "feature", - "barrels": "[\\"./src/rest\\"]", + "barrels": "["./src/rest"]", "express": false, "graphql": false, - "imports": Array [ - Object { + "imports": [ + { "from": "@tsed/ajv", }, - Object { + { "from": "./config/index", "symbols": "{config}", }, - Object { + { "from": "./rest/index", "symbols": "* as rest", }, @@ -155,28 +155,28 @@ Object { } `; -exports[`fillImports() it should return barrels and imports files for (feature, oidc: false, graphql: false, swagger: true, passportjs: false, express: false, koa: false, mongoose: false) 1`] = ` -Object { +exports[`fillImports() > it should return barrels and imports files for ('feature', oidc: false, graphql: false, swagger: true, passportjs: false, express: false, koa: false, mongoose: false) 1`] = ` +{ "architecture": "feature", - "barrels": "[\\"./src/rest\\",\\"./src/pages\\"]", + "barrels": "["./src/rest","./src/pages"]", "express": false, "graphql": false, - "imports": Array [ - Object { + "imports": [ + { "from": "@tsed/ajv", }, - Object { + { "from": "@tsed/swagger", }, - Object { + { "from": "./config/index", "symbols": "{config}", }, - Object { + { "from": "./rest/index", "symbols": "* as rest", }, - Object { + { "from": "./pages/index", "symbols": "* as pages", }, @@ -189,32 +189,32 @@ Object { } `; -exports[`fillImports() it should return barrels and imports files for (feature, oidc: true, graphql: false, swagger: false, passportjs: false, express: true, koa: false, mongoose: false) 1`] = ` -Object { +exports[`fillImports() > it should return barrels and imports files for ('feature', oidc: true, graphql: false, swagger: false, passportjs: false, express: true, koa: false, mongoose: false) 1`] = ` +{ "architecture": "feature", - "barrels": "[\\"./src/rest\\",\\"./src/interactions\\"]", + "barrels": "["./src/rest","./src/interactions"]", "express": false, "graphql": false, - "imports": Array [ - Object { + "imports": [ + { "from": "@tsed/ajv", }, - Object { + { "from": "@tsed/oidc-provider", }, - Object { + { "from": "./config/index", "symbols": "{config}", }, - Object { + { "from": "./rest/index", "symbols": "* as rest", }, - Object { + { "from": "./pages/index", "symbols": "* as pages", }, - Object { + { "from": "./controllers/oidc/InteractionsController", "symbols": "{InteractionsController}", }, @@ -227,50 +227,50 @@ Object { } `; -exports[`fillImports() it should return barrels and imports files for (feature, oidc: true, graphql: true, swagger: true, passportjs: true, express: true, koa: false, mongoose: true) 1`] = ` -Object { +exports[`fillImports() > it should return barrels and imports files for ('feature', oidc: true, graphql: true, swagger: true, passportjs: true, express: true, koa: false, mongoose: true) 1`] = ` +{ "architecture": "feature", - "barrels": "[\\"./src/rest\\",\\"./src/pages\\",\\"./src/interactions\\",\\"./src/datasources\\",\\"./src/resolvers\\"]", + "barrels": "["./src/rest","./src/pages","./src/interactions","./src/datasources","./src/resolvers"]", "express": false, "graphql": true, - "imports": Array [ - Object { + "imports": [ + { "from": "@tsed/ajv", }, - Object { + { "from": "@tsed/swagger", }, - Object { + { "from": "@tsed/mongoose", }, - Object { + { "from": "@tsed/oidc-provider", }, - Object { + { "from": "@tsed/passport", }, - Object { + { "from": "@tsed/typegraphql", }, - Object { + { "from": "./datasources/index", }, - Object { + { "from": "./resolvers/index", }, - Object { + { "from": "./config/index", "symbols": "{config}", }, - Object { + { "from": "./rest/index", "symbols": "* as rest", }, - Object { + { "from": "./pages/index", "symbols": "* as pages", }, - Object { + { "from": "./controllers/oidc/InteractionsController", "symbols": "{InteractionsController}", }, diff --git a/packages/cli/test/integrations/init/__snapshots__/init.integration.spec.ts.snap b/packages/cli/test/integrations/init/__snapshots__/init.integration.spec.ts.snap index 8c8b6a952..703525400 100644 --- a/packages/cli/test/integrations/init/__snapshots__/init.integration.spec.ts.snap +++ b/packages/cli/test/integrations/init/__snapshots__/init.integration.spec.ts.snap @@ -1,19 +1,19 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP +// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html -exports[`Init cmd Express.js should generate a project with Arch FEATURE 2`] = ` -"import {join} from \\"path\\"; -import {Configuration, Inject} from \\"@tsed/di\\"; -import {PlatformApplication} from \\"@tsed/common\\"; -import \\"@tsed/platform-express\\"; // /!\\\\ keep this import -import \\"@tsed/ajv\\"; -import \\"@tsed/swagger\\"; -import {config} from \\"./config/index\\"; -import * as rest from \\"./rest/index\\"; -import * as pages from \\"./pages/index\\"; +exports[`Init cmd > Express.js > should generate a project with Arch FEATURE 2`] = ` +"import {join} from "path"; +import {Configuration, Inject} from "@tsed/di"; +import {PlatformApplication} from "@tsed/common"; +import "@tsed/platform-express"; // /!\\ keep this import +import "@tsed/ajv"; +import "@tsed/swagger"; +import {config} from "./config/index"; +import * as rest from "./rest/index"; +import * as pages from "./pages/index"; @Configuration({ ...config, - acceptMimes: [\\"application/json\\"], + acceptMimes: ["application/json"], httpPort: process.env.PORT || 8083, httpsPort: false, // CHANGE disableComponentsScan: true, @@ -21,35 +21,35 @@ import * as pages from \\"./pages/index\\"; returnsCoercedValues: true }, mount: { - \\"/rest\\": [ + "/rest": [ ...Object.values(rest) ], - \\"/\\": [ + "/": [ ...Object.values(pages) ] }, swagger: [ { - path: \\"/doc\\", - specVersion: \\"3.0.1\\" + path: "/doc", + specVersion: "3.0.1" } ], middlewares: [ - \\"cors\\", - \\"cookie-parser\\", - \\"compression\\", - \\"method-override\\", - \\"json-parser\\", - { use: \\"urlencoded-parser\\", options: { extended: true }} + "cors", + "cookie-parser", + "compression", + "method-override", + "json-parser", + { use: "urlencoded-parser", options: { extended: true }} ], views: { - root: join(process.cwd(), \\"../views\\"), + root: join(process.cwd(), "../views"), extensions: { - ejs: \\"ejs\\" + ejs: "ejs" } }, exclude: [ - \\"**/*.spec.ts\\" + "**/*.spec.ts" ] }) export class Server { @@ -62,18 +62,18 @@ export class Server { " `; -exports[`Init cmd Express.js should generate a project with Babel 2`] = ` -"import {join} from \\"path\\"; -import {Configuration, Inject} from \\"@tsed/di\\"; -import {PlatformApplication} from \\"@tsed/common\\"; -import \\"@tsed/platform-express\\"; // /!\\\\ keep this import -import \\"@tsed/ajv\\"; -import {config} from \\"./config/index\\"; -import * as rest from \\"./controllers/rest/index\\"; +exports[`Init cmd > Express.js > should generate a project with Babel 2`] = ` +"import {join} from "path"; +import {Configuration, Inject} from "@tsed/di"; +import {PlatformApplication} from "@tsed/common"; +import "@tsed/platform-express"; // /!\\ keep this import +import "@tsed/ajv"; +import {config} from "./config/index"; +import * as rest from "./controllers/rest/index"; @Configuration({ ...config, - acceptMimes: [\\"application/json\\"], + acceptMimes: ["application/json"], httpPort: process.env.PORT || 8083, httpsPort: false, // CHANGE disableComponentsScan: true, @@ -81,26 +81,26 @@ import * as rest from \\"./controllers/rest/index\\"; returnsCoercedValues: true }, mount: { - \\"/rest\\": [ + "/rest": [ ...Object.values(rest) ] }, middlewares: [ - \\"cors\\", - \\"cookie-parser\\", - \\"compression\\", - \\"method-override\\", - \\"json-parser\\", - { use: \\"urlencoded-parser\\", options: { extended: true }} + "cors", + "cookie-parser", + "compression", + "method-override", + "json-parser", + { use: "urlencoded-parser", options: { extended: true }} ], views: { - root: join(process.cwd(), \\"../views\\"), + root: join(process.cwd(), "../views"), extensions: { - ejs: \\"ejs\\" + ejs: "ejs" } }, exclude: [ - \\"**/*.spec.ts\\" + "**/*.spec.ts" ] }) export class Server { @@ -113,18 +113,18 @@ export class Server { " `; -exports[`Init cmd Express.js should generate a project with Bun 2`] = ` -"import {join} from \\"path\\"; -import {Configuration, Inject} from \\"@tsed/di\\"; -import {PlatformApplication} from \\"@tsed/common\\"; -import \\"@tsed/platform-express\\"; // /!\\\\ keep this import -import \\"@tsed/ajv\\"; -import {config} from \\"./config/index\\"; -import * as rest from \\"./controllers/rest/index\\"; +exports[`Init cmd > Express.js > should generate a project with Bun 2`] = ` +"import {join} from "path"; +import {Configuration, Inject} from "@tsed/di"; +import {PlatformApplication} from "@tsed/common"; +import "@tsed/platform-express"; // /!\\ keep this import +import "@tsed/ajv"; +import {config} from "./config/index"; +import * as rest from "./controllers/rest/index"; @Configuration({ ...config, - acceptMimes: [\\"application/json\\"], + acceptMimes: ["application/json"], httpPort: process.env.PORT || 8083, httpsPort: false, // CHANGE disableComponentsScan: true, @@ -132,26 +132,26 @@ import * as rest from \\"./controllers/rest/index\\"; returnsCoercedValues: true }, mount: { - \\"/rest\\": [ + "/rest": [ ...Object.values(rest) ] }, middlewares: [ - \\"cors\\", - \\"cookie-parser\\", - \\"compression\\", - \\"method-override\\", - \\"json-parser\\", - { use: \\"urlencoded-parser\\", options: { extended: true }} + "cors", + "cookie-parser", + "compression", + "method-override", + "json-parser", + { use: "urlencoded-parser", options: { extended: true }} ], views: { - root: join(process.cwd(), \\"../views\\"), + root: join(process.cwd(), "../views"), extensions: { - ejs: \\"ejs\\" + ejs: "ejs" } }, exclude: [ - \\"**/*.spec.ts\\" + "**/*.spec.ts" ] }) export class Server { @@ -164,20 +164,20 @@ export class Server { " `; -exports[`Init cmd Express.js should generate a project with Convention ANGULAR 2`] = ` -"import {join} from \\"path\\"; -import {Configuration, Inject} from \\"@tsed/di\\"; -import {PlatformApplication} from \\"@tsed/common\\"; -import \\"@tsed/platform-express\\"; // /!\\\\ keep this import -import \\"@tsed/ajv\\"; -import \\"@tsed/swagger\\"; -import {config} from \\"./config/index\\"; -import * as rest from \\"./controllers/rest/index\\"; -import * as pages from \\"./controllers/pages/index\\"; +exports[`Init cmd > Express.js > should generate a project with Convention ANGULAR 2`] = ` +"import {join} from "path"; +import {Configuration, Inject} from "@tsed/di"; +import {PlatformApplication} from "@tsed/common"; +import "@tsed/platform-express"; // /!\\ keep this import +import "@tsed/ajv"; +import "@tsed/swagger"; +import {config} from "./config/index"; +import * as rest from "./controllers/rest/index"; +import * as pages from "./controllers/pages/index"; @Configuration({ ...config, - acceptMimes: [\\"application/json\\"], + acceptMimes: ["application/json"], httpPort: process.env.PORT || 8083, httpsPort: false, // CHANGE disableComponentsScan: true, @@ -185,35 +185,35 @@ import * as pages from \\"./controllers/pages/index\\"; returnsCoercedValues: true }, mount: { - \\"/rest\\": [ + "/rest": [ ...Object.values(rest) ], - \\"/\\": [ + "/": [ ...Object.values(pages) ] }, swagger: [ { - path: \\"/doc\\", - specVersion: \\"3.0.1\\" + path: "/doc", + specVersion: "3.0.1" } ], middlewares: [ - \\"cors\\", - \\"cookie-parser\\", - \\"compression\\", - \\"method-override\\", - \\"json-parser\\", - { use: \\"urlencoded-parser\\", options: { extended: true }} + "cors", + "cookie-parser", + "compression", + "method-override", + "json-parser", + { use: "urlencoded-parser", options: { extended: true }} ], views: { - root: join(process.cwd(), \\"../views\\"), + root: join(process.cwd(), "../views"), extensions: { - ejs: \\"ejs\\" + ejs: "ejs" } }, exclude: [ - \\"**/*.spec.ts\\" + "**/*.spec.ts" ] }) export class Server { @@ -226,18 +226,18 @@ export class Server { " `; -exports[`Init cmd Express.js should generate a project with NPM 2`] = ` -"import {join} from \\"path\\"; -import {Configuration, Inject} from \\"@tsed/di\\"; -import {PlatformApplication} from \\"@tsed/common\\"; -import \\"@tsed/platform-express\\"; // /!\\\\ keep this import -import \\"@tsed/ajv\\"; -import {config} from \\"./config/index\\"; -import * as rest from \\"./controllers/rest/index\\"; +exports[`Init cmd > Express.js > should generate a project with NPM 2`] = ` +"import {join} from "path"; +import {Configuration, Inject} from "@tsed/di"; +import {PlatformApplication} from "@tsed/common"; +import "@tsed/platform-express"; // /!\\ keep this import +import "@tsed/ajv"; +import {config} from "./config/index"; +import * as rest from "./controllers/rest/index"; @Configuration({ ...config, - acceptMimes: [\\"application/json\\"], + acceptMimes: ["application/json"], httpPort: process.env.PORT || 8083, httpsPort: false, // CHANGE disableComponentsScan: true, @@ -245,26 +245,26 @@ import * as rest from \\"./controllers/rest/index\\"; returnsCoercedValues: true }, mount: { - \\"/rest\\": [ + "/rest": [ ...Object.values(rest) ] }, middlewares: [ - \\"cors\\", - \\"cookie-parser\\", - \\"compression\\", - \\"method-override\\", - \\"json-parser\\", - { use: \\"urlencoded-parser\\", options: { extended: true }} + "cors", + "cookie-parser", + "compression", + "method-override", + "json-parser", + { use: "urlencoded-parser", options: { extended: true }} ], views: { - root: join(process.cwd(), \\"../views\\"), + root: join(process.cwd(), "../views"), extensions: { - ejs: \\"ejs\\" + ejs: "ejs" } }, exclude: [ - \\"**/*.spec.ts\\" + "**/*.spec.ts" ] }) export class Server { @@ -277,18 +277,18 @@ export class Server { " `; -exports[`Init cmd Express.js should generate a project with SWC 2`] = ` -"import {join} from \\"path\\"; -import {Configuration, Inject} from \\"@tsed/di\\"; -import {PlatformApplication} from \\"@tsed/common\\"; -import \\"@tsed/platform-express\\"; // /!\\\\ keep this import -import \\"@tsed/ajv\\"; -import {config} from \\"./config/index\\"; -import * as rest from \\"./controllers/rest/index\\"; +exports[`Init cmd > Express.js > should generate a project with SWC 2`] = ` +"import {join} from "path"; +import {Configuration, Inject} from "@tsed/di"; +import {PlatformApplication} from "@tsed/common"; +import "@tsed/platform-express"; // /!\\ keep this import +import "@tsed/ajv"; +import {config} from "./config/index"; +import * as rest from "./controllers/rest/index"; @Configuration({ ...config, - acceptMimes: [\\"application/json\\"], + acceptMimes: ["application/json"], httpPort: process.env.PORT || 8083, httpsPort: false, // CHANGE disableComponentsScan: true, @@ -296,26 +296,26 @@ import * as rest from \\"./controllers/rest/index\\"; returnsCoercedValues: true }, mount: { - \\"/rest\\": [ + "/rest": [ ...Object.values(rest) ] }, middlewares: [ - \\"cors\\", - \\"cookie-parser\\", - \\"compression\\", - \\"method-override\\", - \\"json-parser\\", - { use: \\"urlencoded-parser\\", options: { extended: true }} + "cors", + "cookie-parser", + "compression", + "method-override", + "json-parser", + { use: "urlencoded-parser", options: { extended: true }} ], views: { - root: join(process.cwd(), \\"../views\\"), + root: join(process.cwd(), "../views"), extensions: { - ejs: \\"ejs\\" + ejs: "ejs" } }, exclude: [ - \\"**/*.spec.ts\\" + "**/*.spec.ts" ] }) export class Server { @@ -328,18 +328,18 @@ export class Server { " `; -exports[`Init cmd Express.js should generate a project with Webpack 2`] = ` -"import {join} from \\"path\\"; -import {Configuration, Inject} from \\"@tsed/di\\"; -import {PlatformApplication} from \\"@tsed/common\\"; -import \\"@tsed/platform-express\\"; // /!\\\\ keep this import -import \\"@tsed/ajv\\"; -import {config} from \\"./config/index\\"; -import * as rest from \\"./controllers/rest/index\\"; +exports[`Init cmd > Express.js > should generate a project with Webpack 2`] = ` +"import {join} from "path"; +import {Configuration, Inject} from "@tsed/di"; +import {PlatformApplication} from "@tsed/common"; +import "@tsed/platform-express"; // /!\\ keep this import +import "@tsed/ajv"; +import {config} from "./config/index"; +import * as rest from "./controllers/rest/index"; @Configuration({ ...config, - acceptMimes: [\\"application/json\\"], + acceptMimes: ["application/json"], httpPort: process.env.PORT || 8083, httpsPort: false, // CHANGE disableComponentsScan: true, @@ -347,26 +347,26 @@ import * as rest from \\"./controllers/rest/index\\"; returnsCoercedValues: true }, mount: { - \\"/rest\\": [ + "/rest": [ ...Object.values(rest) ] }, middlewares: [ - \\"cors\\", - \\"cookie-parser\\", - \\"compression\\", - \\"method-override\\", - \\"json-parser\\", - { use: \\"urlencoded-parser\\", options: { extended: true }} + "cors", + "cookie-parser", + "compression", + "method-override", + "json-parser", + { use: "urlencoded-parser", options: { extended: true }} ], views: { - root: join(process.cwd(), \\"../views\\"), + root: join(process.cwd(), "../views"), extensions: { - ejs: \\"ejs\\" + ejs: "ejs" } }, exclude: [ - \\"**/*.spec.ts\\" + "**/*.spec.ts" ] }) export class Server { @@ -379,20 +379,20 @@ export class Server { " `; -exports[`Init cmd Express.js should generate a project with swagger 2`] = ` -"import {join} from \\"path\\"; -import {Configuration, Inject} from \\"@tsed/di\\"; -import {PlatformApplication} from \\"@tsed/common\\"; -import \\"@tsed/platform-express\\"; // /!\\\\ keep this import -import \\"@tsed/ajv\\"; -import \\"@tsed/swagger\\"; -import {config} from \\"./config/index\\"; -import * as rest from \\"./controllers/rest/index\\"; -import * as pages from \\"./controllers/pages/index\\"; +exports[`Init cmd > Express.js > should generate a project with swagger 2`] = ` +"import {join} from "path"; +import {Configuration, Inject} from "@tsed/di"; +import {PlatformApplication} from "@tsed/common"; +import "@tsed/platform-express"; // /!\\ keep this import +import "@tsed/ajv"; +import "@tsed/swagger"; +import {config} from "./config/index"; +import * as rest from "./controllers/rest/index"; +import * as pages from "./controllers/pages/index"; @Configuration({ ...config, - acceptMimes: [\\"application/json\\"], + acceptMimes: ["application/json"], httpPort: process.env.PORT || 8083, httpsPort: false, // CHANGE disableComponentsScan: true, @@ -400,35 +400,35 @@ import * as pages from \\"./controllers/pages/index\\"; returnsCoercedValues: true }, mount: { - \\"/rest\\": [ + "/rest": [ ...Object.values(rest) ], - \\"/\\": [ + "/": [ ...Object.values(pages) ] }, swagger: [ { - path: \\"/doc\\", - specVersion: \\"3.0.1\\" + path: "/doc", + specVersion: "3.0.1" } ], middlewares: [ - \\"cors\\", - \\"cookie-parser\\", - \\"compression\\", - \\"method-override\\", - \\"json-parser\\", - { use: \\"urlencoded-parser\\", options: { extended: true }} + "cors", + "cookie-parser", + "compression", + "method-override", + "json-parser", + { use: "urlencoded-parser", options: { extended: true }} ], views: { - root: join(process.cwd(), \\"../views\\"), + root: join(process.cwd(), "../views"), extensions: { - ejs: \\"ejs\\" + ejs: "ejs" } }, exclude: [ - \\"**/*.spec.ts\\" + "**/*.spec.ts" ] }) export class Server { @@ -441,18 +441,18 @@ export class Server { " `; -exports[`Init cmd Express.js should generate a project with the right options 2`] = ` -"import {join} from \\"path\\"; -import {Configuration, Inject} from \\"@tsed/di\\"; -import {PlatformApplication} from \\"@tsed/common\\"; -import \\"@tsed/platform-express\\"; // /!\\\\ keep this import -import \\"@tsed/ajv\\"; -import {config} from \\"./config/index\\"; -import * as rest from \\"./controllers/rest/index\\"; +exports[`Init cmd > Express.js > should generate a project with the right options 2`] = ` +"import {join} from "path"; +import {Configuration, Inject} from "@tsed/di"; +import {PlatformApplication} from "@tsed/common"; +import "@tsed/platform-express"; // /!\\ keep this import +import "@tsed/ajv"; +import {config} from "./config/index"; +import * as rest from "./controllers/rest/index"; @Configuration({ ...config, - acceptMimes: [\\"application/json\\"], + acceptMimes: ["application/json"], httpPort: process.env.PORT || 8083, httpsPort: false, // CHANGE disableComponentsScan: true, @@ -460,26 +460,26 @@ import * as rest from \\"./controllers/rest/index\\"; returnsCoercedValues: true }, mount: { - \\"/rest\\": [ + "/rest": [ ...Object.values(rest) ] }, middlewares: [ - \\"cors\\", - \\"cookie-parser\\", - \\"compression\\", - \\"method-override\\", - \\"json-parser\\", - { use: \\"urlencoded-parser\\", options: { extended: true }} + "cors", + "cookie-parser", + "compression", + "method-override", + "json-parser", + { use: "urlencoded-parser", options: { extended: true }} ], views: { - root: join(process.cwd(), \\"../views\\"), + root: join(process.cwd(), "../views"), extensions: { - ejs: \\"ejs\\" + ejs: "ejs" } }, exclude: [ - \\"**/*.spec.ts\\" + "**/*.spec.ts" ] }) export class Server { @@ -492,18 +492,18 @@ export class Server { " `; -exports[`Init cmd Koa.js should generate a project with the right options 2`] = ` -"import {join} from \\"path\\"; -import {Configuration, Inject} from \\"@tsed/di\\"; -import {PlatformApplication} from \\"@tsed/common\\"; -import \\"@tsed/platform-koa\\"; // /!\\\\ keep this import -import \\"@tsed/ajv\\"; -import {config} from \\"./config/index\\"; -import * as rest from \\"./controllers/rest/index\\"; +exports[`Init cmd > Koa.js > should generate a project with the right options 2`] = ` +"import {join} from "path"; +import {Configuration, Inject} from "@tsed/di"; +import {PlatformApplication} from "@tsed/common"; +import "@tsed/platform-koa"; // /!\\ keep this import +import "@tsed/ajv"; +import {config} from "./config/index"; +import * as rest from "./controllers/rest/index"; @Configuration({ ...config, - acceptMimes: [\\"application/json\\"], + acceptMimes: ["application/json"], httpPort: process.env.PORT || 8083, httpsPort: false, // CHANGE disableComponentsScan: true, @@ -511,24 +511,24 @@ import * as rest from \\"./controllers/rest/index\\"; returnsCoercedValues: true }, mount: { - \\"/rest\\": [ + "/rest": [ ...Object.values(rest) ] }, middlewares: [ - \\"@koa/cors\\", - \\"koa-compress\\", - \\"koa-override\\", - \\"koa-bodyparser\\" + "@koa/cors", + "koa-compress", + "koa-override", + "koa-bodyparser" ], views: { - root: join(process.cwd(), \\"../views\\"), + root: join(process.cwd(), "../views"), extensions: { - ejs: \\"ejs\\" + ejs: "ejs" } }, exclude: [ - \\"**/*.spec.ts\\" + "**/*.spec.ts" ] }) export class Server { diff --git a/packages/cli/test/integrations/init/init.integration.spec.ts b/packages/cli/test/integrations/init/init.integration.spec.ts index 20b9d0cd7..73b645c05 100644 --- a/packages/cli/test/integrations/init/init.integration.spec.ts +++ b/packages/cli/test/integrations/init/init.integration.spec.ts @@ -37,7 +37,7 @@ describe("Init cmd", () => { }); expect(FakeCliFs.getKeys()).toMatchInlineSnapshot(` - Array [ + [ "./project-name", "project-name", "project-name/.barrelsby.json", @@ -72,8 +72,8 @@ describe("Init cmd", () => { const pkg = JSON.parse(FakeCliFs.entries.get("project-name/package.json")!); expect(pkg).toMatchInlineSnapshot(` - Object { - "dependencies": Object { + { + "dependencies": { "@tsed/ajv": "5.58.1", "@tsed/common": "5.58.1", "@tsed/core": "5.58.1", @@ -92,15 +92,15 @@ describe("Init cmd", () => { "@tsed/schema": "5.58.1", }, "description": "", - "devDependencies": Object {}, + "devDependencies": {}, "name": "project-data", - "scripts": Object { + "scripts": { "barrels": "barrelsby --config .barrelsby.json", "build": "yarn run barrels && tsc --project tsconfig.compile.json", "start": "yarn run barrels && tsnd --inspect --exit-child --cls --ignore-watch node_modules --respawn --transpile-only src/index.ts", "start:prod": "cross-env NODE_ENV=production node dist/index.js", }, - "tsed": Object { + "tsed": { "packageManager": "yarn", "runtime": "node", }, @@ -136,7 +136,7 @@ describe("Init cmd", () => { }); expect(FakeCliFs.getKeys()).toMatchInlineSnapshot(` - Array [ + [ "./project-name", "project-name", "project-name/.barrelsby.json", @@ -177,8 +177,8 @@ describe("Init cmd", () => { const pkg = JSON.parse(FakeCliFs.entries.get("project-name/package.json")!); expect(pkg).toMatchInlineSnapshot(` - Object { - "dependencies": Object { + { + "dependencies": { "@tsed/ajv": "5.58.1", "@tsed/common": "5.58.1", "@tsed/core": "5.58.1", @@ -197,15 +197,15 @@ describe("Init cmd", () => { "@tsed/schema": "5.58.1", }, "description": "", - "devDependencies": Object {}, + "devDependencies": {}, "name": "project-data", - "scripts": Object { + "scripts": { "barrels": "barrelsby --config .barrelsby.json", "build": "yarn run barrels && tsc --project tsconfig.compile.json", "start": "yarn run barrels && tsnd --inspect --exit-child --cls --ignore-watch node_modules --respawn --transpile-only src/index.ts", "start:prod": "cross-env NODE_ENV=production node dist/index.js", }, - "tsed": Object { + "tsed": { "packageManager": "yarn", "runtime": "node", }, @@ -232,7 +232,7 @@ describe("Init cmd", () => { }); expect(FakeCliFs.getKeys()).toMatchInlineSnapshot(` - Array [ + [ "./project-name", "project-name", "project-name/.barrelsby.json", @@ -267,8 +267,8 @@ describe("Init cmd", () => { const pkg = JSON.parse(FakeCliFs.entries.get("project-name/package.json")!); expect(pkg).toMatchInlineSnapshot(` - Object { - "dependencies": Object { + { + "dependencies": { "@tsed/ajv": "5.58.1", "@tsed/common": "5.58.1", "@tsed/core": "5.58.1", @@ -287,15 +287,15 @@ describe("Init cmd", () => { "@tsed/schema": "5.58.1", }, "description": "", - "devDependencies": Object {}, + "devDependencies": {}, "name": "project-data", - "scripts": Object { + "scripts": { "barrels": "barrelsby --config .barrelsby.json", "build": "bun run barrels && bun build --target=bun src/index.ts --outfile=dist/index.js", "start": "bun run barrels && bun --watch src/index.ts", "start:prod": "cross-env NODE_ENV=production bun dist/index.js", }, - "tsed": Object { + "tsed": { "packageManager": "bun", "runtime": "bun", }, @@ -322,7 +322,7 @@ describe("Init cmd", () => { }); expect(FakeCliFs.getKeys()).toMatchInlineSnapshot(` - Array [ + [ "./project-name", "project-name", "project-name/.babelrc", @@ -358,8 +358,8 @@ describe("Init cmd", () => { const pkg = JSON.parse(FakeCliFs.entries.get("project-name/package.json")!); expect(pkg).toMatchInlineSnapshot(` - Object { - "dependencies": Object { + { + "dependencies": { "@tsed/ajv": "5.58.1", "@tsed/common": "5.58.1", "@tsed/core": "5.58.1", @@ -378,15 +378,15 @@ describe("Init cmd", () => { "@tsed/schema": "5.58.1", }, "description": "", - "devDependencies": Object {}, + "devDependencies": {}, "name": "project-data", - "scripts": Object { + "scripts": { "barrels": "barrelsby --config .barrelsby.json", - "build": "yarn run barrels && tsc && babel src --out-dir dist --extensions \\".ts,.tsx\\" --source-maps inline", + "build": "yarn run barrels && tsc && babel src --out-dir dist --extensions ".ts,.tsx" --source-maps inline", "start": "yarn run barrels && babel-watch --extensions .ts src/index.ts", "start:prod": "cross-env NODE_ENV=production node dist/index.js", }, - "tsed": Object { + "tsed": { "packageManager": "yarn", "runtime": "babel", }, @@ -413,7 +413,7 @@ describe("Init cmd", () => { }); expect(FakeCliFs.getKeys()).toMatchInlineSnapshot(` - Array [ + [ "./project-name", "project-name", "project-name/.babelrc", @@ -450,8 +450,8 @@ describe("Init cmd", () => { const pkg = JSON.parse(FakeCliFs.entries.get("project-name/package.json")!); expect(pkg).toMatchInlineSnapshot(` - Object { - "dependencies": Object { + { + "dependencies": { "@tsed/ajv": "5.58.1", "@tsed/common": "5.58.1", "@tsed/core": "5.58.1", @@ -470,15 +470,15 @@ describe("Init cmd", () => { "@tsed/schema": "5.58.1", }, "description": "", - "devDependencies": Object {}, + "devDependencies": {}, "name": "project-data", - "scripts": Object { + "scripts": { "barrels": "barrelsby --config .barrelsby.json", "build": "yarn run barrels && tsc && cross-env NODE_ENV=production webpack", "start": "yarn run barrels && babel-watch --extensions .ts src/index.ts", "start:prod": "cross-env NODE_ENV=production node dist/app.bundle.js", }, - "tsed": Object { + "tsed": { "packageManager": "yarn", "runtime": "webpack", }, @@ -505,7 +505,7 @@ describe("Init cmd", () => { }); expect(FakeCliFs.getKeys()).toMatchInlineSnapshot(` - Array [ + [ "./project-name", "project-name", "project-name/.barrelsby.json", @@ -542,8 +542,8 @@ describe("Init cmd", () => { const pkg = JSON.parse(FakeCliFs.entries.get("project-name/package.json")!); expect(pkg).toMatchInlineSnapshot(` - Object { - "dependencies": Object { + { + "dependencies": { "@tsed/ajv": "5.58.1", "@tsed/common": "5.58.1", "@tsed/core": "5.58.1", @@ -562,15 +562,15 @@ describe("Init cmd", () => { "@tsed/schema": "5.58.1", }, "description": "", - "devDependencies": Object {}, + "devDependencies": {}, "name": "project-data", - "scripts": Object { + "scripts": { "barrels": "barrelsby --config .barrelsby.json", "build": "yarn run barrels && swc src --out-dir dist -s", "start": "yarn run barrels && node-dev src/index.ts", "start:prod": "cross-env NODE_ENV=production node dist/index.js", }, - "tsed": Object { + "tsed": { "packageManager": "yarn", "runtime": "swc", }, @@ -597,7 +597,7 @@ describe("Init cmd", () => { }); expect(FakeCliFs.getKeys()).toMatchInlineSnapshot(` - Array [ + [ "./project-name", "project-name", "project-name/.barrelsby.json", @@ -632,8 +632,8 @@ describe("Init cmd", () => { const pkg = JSON.parse(FakeCliFs.entries.get("project-name/package.json")!); expect(pkg).toMatchInlineSnapshot(` - Object { - "dependencies": Object { + { + "dependencies": { "@tsed/ajv": "5.58.1", "@tsed/common": "5.58.1", "@tsed/core": "5.58.1", @@ -652,15 +652,15 @@ describe("Init cmd", () => { "@tsed/schema": "5.58.1", }, "description": "", - "devDependencies": Object {}, + "devDependencies": {}, "name": "project-data", - "scripts": Object { + "scripts": { "barrels": "barrelsby --config .barrelsby.json", "build": "npm run barrels && tsc --project tsconfig.compile.json", "start": "npm run barrels && tsnd --inspect --exit-child --cls --ignore-watch node_modules --respawn --transpile-only src/index.ts", "start:prod": "cross-env NODE_ENV=production node dist/index.js", }, - "tsed": Object { + "tsed": { "packageManager": "npm", "runtime": "node", }, @@ -691,7 +691,7 @@ describe("Init cmd", () => { }); expect(FakeCliFs.getKeys()).toMatchInlineSnapshot(` - Array [ + [ "./project-name", "project-name", "project-name/.barrelsby.json", @@ -755,7 +755,7 @@ describe("Init cmd", () => { }); expect(FakeCliFs.getKeys()).toMatchInlineSnapshot(` - Array [ + [ "./project-name", "project-name", "project-name/.barrelsby.json", @@ -818,7 +818,7 @@ describe("Init cmd", () => { }); expect(FakeCliFs.getKeys()).toMatchInlineSnapshot(` - Array [ + [ "./project-name", "project-name", "project-name/.barrelsby.json", @@ -854,8 +854,8 @@ describe("Init cmd", () => { const pkg = JSON.parse(FakeCliFs.entries.get("project-name/package.json")!); expect(pkg).toMatchInlineSnapshot(` - Object { - "dependencies": Object { + { + "dependencies": { "@tsed/ajv": "5.58.1", "@tsed/common": "5.58.1", "@tsed/core": "5.58.1", @@ -874,15 +874,15 @@ describe("Init cmd", () => { "@tsed/schema": "5.58.1", }, "description": "", - "devDependencies": Object {}, + "devDependencies": {}, "name": "project-data", - "scripts": Object { + "scripts": { "barrels": "barrelsby --config .barrelsby.json", "build": "yarn run barrels && tsc --project tsconfig.compile.json", "start": "yarn run barrels && tsnd --inspect --exit-child --cls --ignore-watch node_modules --respawn --transpile-only src/index.ts", "start:prod": "cross-env NODE_ENV=production node dist/index.js", }, - "tsed": Object { + "tsed": { "packageManager": "yarn", "runtime": "node", }, @@ -924,7 +924,7 @@ describe("Init cmd", () => { } expect(FakeCliFs.getKeys()).toMatchInlineSnapshot(` - Array [ + [ "./project-name", "project-name", "project-name/.barrelsby.json", diff --git a/packages/cli/tsconfig.cjs.json b/packages/cli/tsconfig.cjs.json new file mode 100644 index 000000000..7f23b116d --- /dev/null +++ b/packages/cli/tsconfig.cjs.json @@ -0,0 +1,28 @@ +{ + "extends": "@tsed/typescript/tsconfig.node.json", + "compilerOptions": { + "baseUrl": ".", + "module": "commonjs", + "moduleResolution": "Node16", + "rootDir": "src", + "outDir": "./lib/cjs", + "declaration": true, + "declarationDir": "./lib/types", + "composite": true, + "noEmit": false + }, + "include": ["src", "src/**/*.json"], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage", + "spec", + "**/*.benchmark.ts", + "**/*.spec.ts", + "keys", + "**/__mock__/**", + "webpack.config.js" + ] +} diff --git a/packages/cli/tsconfig.esm.json b/packages/cli/tsconfig.esm.json index 9fcce9b4d..ce32a9e07 100644 --- a/packages/cli/tsconfig.esm.json +++ b/packages/cli/tsconfig.esm.json @@ -2,18 +2,16 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ES2020", + "module": "ESNext", + "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", + "declarationDir": "./lib/types-esm", "declaration": true, - "declarationDir": "./lib/types", "composite": true, "noEmit": false }, - "include": [ - "src", - "src/**/*.json" - ], + "include": ["src", "src/**/*.json"], "exclude": [ "node_modules", "test", @@ -24,13 +22,7 @@ "**/*.benchmark.ts", "**/*.spec.ts", "keys", - "jest.config.js", "**/__mock__/**", "webpack.config.js" - ], - "references": [ - { - "path": "../cli-core" - } ] } diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json index 28bc55124..c92ac778d 100644 --- a/packages/cli/tsconfig.json +++ b/packages/cli/tsconfig.json @@ -2,36 +2,21 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "commonjs", - "moduleResolution": "node", - "rootDir": "src", - "outDir": "./lib/cjs", - "declaration": true, - "declarationDir": "./lib/types", - "composite": true, - "noEmit": false + "noEmit": true }, - "include": [ - "src", - "src/**/*.json" - ], - "exclude": [ - "node_modules", - "test", - "lib", - "benchmark", - "coverage", - "spec", - "**/*.benchmark.ts", - "**/*.spec.ts", - "keys", - "jest.config.js", - "**/__mock__/**", - "webpack.config.js" - ], + "include": [], "references": [ { - "path": "../cli-core" + "path": "../cli-core/tsconfig.json" + }, + { + "path": "./tsconfig.cjs.json" + }, + { + "path": "./tsconfig.esm.json" + }, + { + "path": "./tsconfig.spec.json" } ] } diff --git a/packages/cli/tsconfig.spec.json b/packages/cli/tsconfig.spec.json new file mode 100644 index 000000000..75fcfa09d --- /dev/null +++ b/packages/cli/tsconfig.spec.json @@ -0,0 +1,29 @@ +{ + "extends": "@tsed/typescript/tsconfig.node.json", + "compilerOptions": { + "baseUrl": ".", + "rootDir": "..", + "module": "commonjs", + "outDir": "./lib/cjs", + "declaration": false, + "composite": false, + "noEmit": true, + "paths": {}, + "types": [ + "vite/client", + "vitest/globals" + ] + }, + "include": [ + "src/**/*.spec.ts", + "test/**/*.spec.ts", + "vitest.config.mts" + ], + "exclude": [ + "node_modules", + "test", + "lib", + "benchmark", + "coverage" + ] +} diff --git a/packages/cli/vitest.config.mts b/packages/cli/vitest.config.mts new file mode 100644 index 000000000..d759e8179 --- /dev/null +++ b/packages/cli/vitest.config.mts @@ -0,0 +1,21 @@ +// @ts-ignore +import {presets} from "@tsed/vitest/presets"; +import {defineConfig} from "vitest/config"; + +export default defineConfig( + { + ...presets, + test: { + ...presets.test, + coverage: { + ...presets.test.coverage, + thresholds: { + statements: 0, + branches: 0, + functions: 0, + lines: 0 + } + } + } + } +); diff --git a/tools/eslint/eslint.template.js b/tools/eslint/eslint.template.js deleted file mode 100644 index 802f86f8b..000000000 --- a/tools/eslint/eslint.template.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require("@tsed/eslint/node.js"); diff --git a/tools/eslint/eslintignore.template b/tools/eslint/eslintignore.template deleted file mode 100644 index 2aab498ae..000000000 --- a/tools/eslint/eslintignore.template +++ /dev/null @@ -1,13 +0,0 @@ -node_modules -docs -docs-references -lib -dist -coverage -.nyc_output -*-lock.json -*.lock -benchmarks.* -**/generated - -**/*.js diff --git a/tools/eslint/index.js b/tools/eslint/index.js deleted file mode 100644 index fd12e632b..000000000 --- a/tools/eslint/index.js +++ /dev/null @@ -1,38 +0,0 @@ -const mono = require("@tsed/monorepo-utils"); -const {dirname, join, relative} = require("path"); -const cloneDeep = require("lodash/cloneDeep.js"); -const {readFile, writeFile, writeJson} = require("fs-extra"); - -const scriptDir = __dirname; - -async function main() { - const monoRepo = new mono.MonoRepo({ - rootDir: process.cwd(), - verbose: false - }); - - const packages = await mono.findPackages(monoRepo); - const template = await readFile(join(scriptDir, "./eslint.template.js")); - const ignore = await readFile(join(scriptDir, "./eslintignore.template")); - - const promises = packages.map(async (pkg) => { - const path = dirname(pkg.path); - - if (pkg.pkg.source && pkg.pkg.source.endsWith(".ts")) { - await writeFile(join(path, ".eslintrc.js"), template, {spaces: 2}); - await writeFile(join(path, ".eslintignore"), ignore, {spaces: 2}); - - pkg.pkg.scripts["lint"] = "eslint '**/*.{ts,js}'"; - pkg.pkg.scripts["lint:fix"] = "eslint '**/*.{ts,js}' --fix"; - - pkg.pkg.devDependencies["@tsed/eslint"] = pkg.pkg.version; - pkg.pkg.devDependencies["eslint"] = monoRepo.rootPkg.devDependencies["eslint"]; - - await writeJson(pkg.path, pkg.pkg, {spaces: 2}); - } - }); - - await Promise.all(promises); -} - -main(); diff --git a/tools/eslint/node.js b/tools/eslint/node.js deleted file mode 100644 index 2a487f20c..000000000 --- a/tools/eslint/node.js +++ /dev/null @@ -1,42 +0,0 @@ -module.exports = { - parser: "@typescript-eslint/parser", - extends: ["prettier", "plugin:@typescript-eslint/recommended"], - plugins: ["@typescript-eslint", "workspaces"], - parserOptions: { - ecmaVersion: 2018, - sourceType: "module" - }, - env: { - node: true, - es6: true - }, - rules: { - "@typescript-eslint/no-empty-function": "off", - "@typescript-eslint/ban-ts-comment": "off", - "@typescript-eslint/ban-types": "off", - "@typescript-eslint/no-inferrable-types": "off", - "@typescript-eslint/no-empty-interface": "off", - "@typescript-eslint/no-namespace": "off", - "@typescript-eslint/no-var-requires": "off", - "@typescript-eslint/no-this-alias": "off", - "@typescript-eslint/no-explicit-any": "off", - "@typescript-eslint/explicit-module-boundary-types": "off", - "@typescript-eslint/no-unused-vars": "off", - "@typescript-eslint/no-non-null-assertion": "off", - "require-await": "error", - "no-return-await": "error", - "no-case-declarations": "off", - "no-empty": "off", - "prefer-const": "off", - "no-fallthrough": "off", - "workspaces/no-absolute-imports": "error" - }, - overrides: [ - { - files: ["**/*.benchmark.ts", "**/test/**", "**/__mock__/**"], - rules: { - "workspaces/no-absolute-imports": "off" - } - } - ] -}; diff --git a/tools/eslint/package.json b/tools/eslint/package.json deleted file mode 100644 index bb27c5ec2..000000000 --- a/tools/eslint/package.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "@tsed/eslint", - "version": "5.2.10", - "description": "Util to install eslint configuration on the workspace", - "private": true, - "main": "index.js", - "exports": { - ".": "./index.js", - "./node.js": "./node.js" - }, - "devDependencies": { - "cross-env": "7.0.3", - "jest": "29.5.0" - } -} diff --git a/tools/vitest/presets/index.js b/tools/vitest/presets/index.js index ac948ae85..d7964d08b 100644 --- a/tools/vitest/presets/index.js +++ b/tools/vitest/presets/index.js @@ -10,6 +10,9 @@ export const presets = defineConfig({ test: { globals: true, environment: "node", + exclude:[ + "**/templates/**" + ], coverage: { enabled: true, provider: "v8", @@ -17,6 +20,7 @@ export const presets = defineConfig({ all: true, include: ["src/**/*.{tsx,ts}"], exclude: [ + "**/templates/**", "**/*.spec.{ts,tsx}", "**/*.stories.{ts,tsx}", "**/*.d.ts", diff --git a/tsconfig.json b/tsconfig.json index 8063298f9..61781135e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -56,6 +56,9 @@ }, { "path": "./packages/cli-testing/tsconfig.json" + }, + { + "path": "./tsconfig.spec.json" } ], "exclude": [ diff --git a/tsconfig.spec.json b/tsconfig.spec.json new file mode 100644 index 000000000..16ae60f7d --- /dev/null +++ b/tsconfig.spec.json @@ -0,0 +1,18 @@ +{ + "extends": "@tsed/typescript/tsconfig.node.json", + "compilerOptions": { + "baseUrl": ".", + "noEmit": true, + "composite": false, + "declarationMap": false, + "types": [ + "vitest/globals", + "vitest/importMeta", + "vite/client", + "node", + "vitest" + ] + }, + "include": ["vitest.*.mts"], + "exclude": ["dist"] +} diff --git a/vitest.workspace.mts b/vitest.workspace.mts new file mode 100644 index 000000000..7f5ae9407 --- /dev/null +++ b/vitest.workspace.mts @@ -0,0 +1,3 @@ +export default [ + 'packages/**/vitest.config.{mts,ts}', +] diff --git a/yarn.lock b/yarn.lock index d5721adb3..bfb951379 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5,15 +5,6 @@ __metadata: version: 8 cacheKey: 10 -"@ampproject/remapping@npm:^2.1.0": - version: 2.1.2 - resolution: "@ampproject/remapping@npm:2.1.2" - dependencies: - "@jridgewell/trace-mapping": "npm:^0.3.0" - checksum: 10/2151b1fd8149e9e288fa16c02699d74e6020baf3fe3154d2bd933e59db7a03076567e28493d1408ffa162d67880a2b9e0a9bbc64f3bb4af22a7cce2fdb4c345d - languageName: node - linkType: hard - "@ampproject/remapping@npm:^2.3.0": version: 2.3.0 resolution: "@ampproject/remapping@npm:2.3.0" @@ -24,7 +15,7 @@ __metadata: languageName: node linkType: hard -"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.7": +"@babel/code-frame@npm:^7.0.0": version: 7.16.7 resolution: "@babel/code-frame@npm:7.16.7" dependencies: @@ -43,167 +34,6 @@ __metadata: languageName: node linkType: hard -"@babel/compat-data@npm:^7.17.10": - version: 7.18.5 - resolution: "@babel/compat-data@npm:7.18.5" - checksum: 10/edb559a1232c37d2b2fef7f453b0b179d754363a4e6a3b9a0d5f208d89e5520b6ce8bdb154f41ae495e4f3c4a8206d328ed1dfd0a22181ceb9502930b874b5a5 - languageName: node - linkType: hard - -"@babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3": - version: 7.18.5 - resolution: "@babel/core@npm:7.18.5" - dependencies: - "@ampproject/remapping": "npm:^2.1.0" - "@babel/code-frame": "npm:^7.16.7" - "@babel/generator": "npm:^7.18.2" - "@babel/helper-compilation-targets": "npm:^7.18.2" - "@babel/helper-module-transforms": "npm:^7.18.0" - "@babel/helpers": "npm:^7.18.2" - "@babel/parser": "npm:^7.18.5" - "@babel/template": "npm:^7.16.7" - "@babel/traverse": "npm:^7.18.5" - "@babel/types": "npm:^7.18.4" - convert-source-map: "npm:^1.7.0" - debug: "npm:^4.1.0" - gensync: "npm:^1.0.0-beta.2" - json5: "npm:^2.2.1" - semver: "npm:^6.3.0" - checksum: 10/9215d03aa4c0aeaee0d36c6a6bd9c53048325c0644ce774c1a382ad717af9cf4b3b6313c69377fa0068a59822c9cd909bcf62955439634c5035e89cfc6278e0e - languageName: node - linkType: hard - -"@babel/generator@npm:^7.18.2, @babel/generator@npm:^7.7.2": - version: 7.18.2 - resolution: "@babel/generator@npm:7.18.2" - dependencies: - "@babel/types": "npm:^7.18.2" - "@jridgewell/gen-mapping": "npm:^0.3.0" - jsesc: "npm:^2.5.1" - checksum: 10/961191f7548794711730e21adf215302c2f5f95bdc025ce997a31c4de39ec17c91e27d3ecdc1d641e7b1756872599045145a9334acbb80a5abfb626f678280e5 - languageName: node - linkType: hard - -"@babel/helper-compilation-targets@npm:^7.18.2": - version: 7.18.2 - resolution: "@babel/helper-compilation-targets@npm:7.18.2" - dependencies: - "@babel/compat-data": "npm:^7.17.10" - "@babel/helper-validator-option": "npm:^7.16.7" - browserslist: "npm:^4.20.2" - semver: "npm:^6.3.0" - peerDependencies: - "@babel/core": ^7.0.0 - checksum: 10/0bb927e6a73fffebceeaa5aa03594b011ab2022a0b43e942f3598550171969d2e02768953c5eece9e2bb3591dad56f56cce0bdca5499cd06f8c2ca5d9a4311f1 - languageName: node - linkType: hard - -"@babel/helper-environment-visitor@npm:^7.16.7": - version: 7.16.7 - resolution: "@babel/helper-environment-visitor@npm:7.16.7" - dependencies: - "@babel/types": "npm:^7.16.7" - checksum: 10/c03a10105d9ebd1fe632a77356b2e6e2f3c44edba9a93b0dc3591b6a66bd7a2e323dd9502f9ce96fc6401234abff1907aa877b6674f7826b61c953f7c8204bbe - languageName: node - linkType: hard - -"@babel/helper-environment-visitor@npm:^7.18.2": - version: 7.18.2 - resolution: "@babel/helper-environment-visitor@npm:7.18.2" - checksum: 10/1a9c8726fad454a082d077952a90f17188e92eabb3de236cb4782c49b39e3f69c327e272b965e9a20ff8abf37d30d03ffa6fd7974625a6c23946f70f7527f5e9 - languageName: node - linkType: hard - -"@babel/helper-function-name@npm:^7.17.9": - version: 7.17.9 - resolution: "@babel/helper-function-name@npm:7.17.9" - dependencies: - "@babel/template": "npm:^7.16.7" - "@babel/types": "npm:^7.17.0" - checksum: 10/bca529617a8f0cccc0644df8454ed4d4bdcd3c39ad14f7af38ae6d3231a0c8d44750317df45fd916fe4998150943bb8fd83254dfdb89989761b56bfc3203a448 - languageName: node - linkType: hard - -"@babel/helper-hoist-variables@npm:^7.16.7": - version: 7.16.7 - resolution: "@babel/helper-hoist-variables@npm:7.16.7" - dependencies: - "@babel/types": "npm:^7.16.7" - checksum: 10/6ae1641f4a751cd9045346e3f61c3d9ec1312fd779ab6d6fecfe2a96e59a481ad5d7e40d2a840894c13b3fd6114345b157f9e3062fc5f1580f284636e722de60 - languageName: node - linkType: hard - -"@babel/helper-module-imports@npm:^7.16.7": - version: 7.16.7 - resolution: "@babel/helper-module-imports@npm:7.16.7" - dependencies: - "@babel/types": "npm:^7.16.7" - checksum: 10/f48cb485be7cad70c3fdcbc1d6d104732565288fe5dd38575be4b6dd577aa606a0e7553078cebf91bea5182e1b059bcc5b6882cd1f8ccb9013d6c76b6ff136ff - languageName: node - linkType: hard - -"@babel/helper-module-transforms@npm:^7.18.0": - version: 7.18.0 - resolution: "@babel/helper-module-transforms@npm:7.18.0" - dependencies: - "@babel/helper-environment-visitor": "npm:^7.16.7" - "@babel/helper-module-imports": "npm:^7.16.7" - "@babel/helper-simple-access": "npm:^7.17.7" - "@babel/helper-split-export-declaration": "npm:^7.16.7" - "@babel/helper-validator-identifier": "npm:^7.16.7" - "@babel/template": "npm:^7.16.7" - "@babel/traverse": "npm:^7.18.0" - "@babel/types": "npm:^7.18.0" - checksum: 10/33fd762844c98c3dd786373928848ff4b5bdfb48979a2cc58f54fcf37d1752180fc53101df551f1c996a07daadb75382be7ac8c042515546876ee5da3056d66f - languageName: node - linkType: hard - -"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.17.12, @babel/helper-plugin-utils@npm:^7.8.0": - version: 7.17.12 - resolution: "@babel/helper-plugin-utils@npm:7.17.12" - checksum: 10/4813cf0ddb0f143de032cb88d4207024a2334951db330f8216d6fa253ea320c02c9b2667429ef1a34b5e95d4cfbd085f6cb72d418999751c31d0baf2422cc61d - languageName: node - linkType: hard - -"@babel/helper-plugin-utils@npm:^7.20.2": - version: 7.21.5 - resolution: "@babel/helper-plugin-utils@npm:7.21.5" - checksum: 10/e84986c6e17451f3868ad6a94176f40e96fde77ab89e266ab6f5d3e776544d2d5cbe003767dfef15c6de461f0dc0688000a52c1c6dae4ee9157ed8acfc46bf0e - languageName: node - linkType: hard - -"@babel/helper-simple-access@npm:^7.17.7": - version: 7.17.7 - resolution: "@babel/helper-simple-access@npm:7.17.7" - dependencies: - "@babel/types": "npm:^7.17.0" - checksum: 10/58a9bfd054720024f6ff47fbb113c96061dc2bd31a5e5285756bd3c2e83918c6926900e00150d0fb175d899494fe7d69bf2a8b278c32ef6f6bea8d032e6a3831 - languageName: node - linkType: hard - -"@babel/helper-split-export-declaration@npm:^7.16.7": - version: 7.16.7 - resolution: "@babel/helper-split-export-declaration@npm:7.16.7" - dependencies: - "@babel/types": "npm:^7.16.7" - checksum: 10/e10aaf135465c55114627951b79115f24bc7af72ecbb58d541d66daf1edaee5dde7cae3ec8c3639afaf74526c03ae3ce723444e3b5b3dc77140c456cd84bcaa1 - languageName: node - linkType: hard - -"@babel/helper-string-parser@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/helper-string-parser@npm:7.22.5" - checksum: 10/7f275a7f1a9504da06afc33441e219796352a4a3d0288a961bc14d1e30e06833a71621b33c3e60ee3ac1ff3c502d55e392bcbc0665f6f9d2629809696fab7cdd - languageName: node - linkType: hard - -"@babel/helper-string-parser@npm:^7.23.4": - version: 7.23.4 - resolution: "@babel/helper-string-parser@npm:7.23.4" - checksum: 10/c352082474a2ee1d2b812bd116a56b2e8b38065df9678a32a535f151ec6f58e54633cc778778374f10544b930703cca6ddf998803888a636afa27e2658068a9c - languageName: node - linkType: hard - "@babel/helper-string-parser@npm:^7.24.8": version: 7.24.8 resolution: "@babel/helper-string-parser@npm:7.24.8" @@ -211,7 +41,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-validator-identifier@npm:^7.16.7, @babel/helper-validator-identifier@npm:^7.22.5": +"@babel/helper-validator-identifier@npm:^7.16.7": version: 7.22.5 resolution: "@babel/helper-validator-identifier@npm:7.22.5" checksum: 10/12cb7d4535b3f8d109a446f7bef08d20eebe94fd97b534cd415c936ab342e9634edc5c99961af976bd78bcae6e6ec4b2ab8483d0da2ac5926fbe9f7dd9ab28ab @@ -232,24 +62,6 @@ __metadata: languageName: node linkType: hard -"@babel/helper-validator-option@npm:^7.16.7": - version: 7.16.7 - resolution: "@babel/helper-validator-option@npm:7.16.7" - checksum: 10/c5ccc451911883cc9f12125d47be69434f28094475c1b9d2ada7c3452e6ac98a1ee8ddd364ca9e3f9855fcdee96cdeafa32543ebd9d17fee7a1062c202e80570 - languageName: node - linkType: hard - -"@babel/helpers@npm:^7.18.2": - version: 7.18.2 - resolution: "@babel/helpers@npm:7.18.2" - dependencies: - "@babel/template": "npm:^7.16.7" - "@babel/traverse": "npm:^7.18.2" - "@babel/types": "npm:^7.18.2" - checksum: 10/4f54a16c0d74581921db9dd98fd715c030c9fcd35addf5fad46984e902bdef43881839a99f831ed8493b5e9bd2959279652b24cd3a5662a3cee92faa2d4dceec - languageName: node - linkType: hard - "@babel/highlight@npm:^7.16.7": version: 7.16.10 resolution: "@babel/highlight@npm:7.16.10" @@ -272,15 +84,6 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.16.7, @babel/parser@npm:^7.18.5, @babel/parser@npm:^7.20.7": - version: 7.22.5 - resolution: "@babel/parser@npm:7.22.5" - bin: - parser: ./bin/babel-parser.js - checksum: 10/46525855c9290e455a548336bfbb4dddb5ced0f213e982fa50f459995c747da3ff196b8603b093ad39a498d66069ca3cc1111c47a6424b521831ca02f706ccbf - languageName: node - linkType: hard - "@babel/parser@npm:^7.25.4": version: 7.25.6 resolution: "@babel/parser@npm:7.25.6" @@ -292,200 +95,6 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-syntax-async-generators@npm:^7.8.4": - version: 7.8.4 - resolution: "@babel/plugin-syntax-async-generators@npm:7.8.4" - dependencies: - "@babel/helper-plugin-utils": "npm:^7.8.0" - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 10/7ed1c1d9b9e5b64ef028ea5e755c0be2d4e5e4e3d6cf7df757b9a8c4cfa4193d268176d0f1f7fbecdda6fe722885c7fda681f480f3741d8a2d26854736f05367 - languageName: node - linkType: hard - -"@babel/plugin-syntax-bigint@npm:^7.8.3": - version: 7.8.3 - resolution: "@babel/plugin-syntax-bigint@npm:7.8.3" - dependencies: - "@babel/helper-plugin-utils": "npm:^7.8.0" - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 10/3a10849d83e47aec50f367a9e56a6b22d662ddce643334b087f9828f4c3dd73bdc5909aaeabe123fed78515767f9ca43498a0e621c438d1cd2802d7fae3c9648 - languageName: node - linkType: hard - -"@babel/plugin-syntax-class-properties@npm:^7.8.3": - version: 7.12.13 - resolution: "@babel/plugin-syntax-class-properties@npm:7.12.13" - dependencies: - "@babel/helper-plugin-utils": "npm:^7.12.13" - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 10/24f34b196d6342f28d4bad303612d7ff566ab0a013ce89e775d98d6f832969462e7235f3e7eaf17678a533d4be0ba45d3ae34ab4e5a9dcbda5d98d49e5efa2fc - languageName: node - linkType: hard - -"@babel/plugin-syntax-import-meta@npm:^7.8.3": - version: 7.10.4 - resolution: "@babel/plugin-syntax-import-meta@npm:7.10.4" - dependencies: - "@babel/helper-plugin-utils": "npm:^7.10.4" - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 10/166ac1125d10b9c0c430e4156249a13858c0366d38844883d75d27389621ebe651115cb2ceb6dc011534d5055719fa1727b59f39e1ab3ca97820eef3dcab5b9b - languageName: node - linkType: hard - -"@babel/plugin-syntax-json-strings@npm:^7.8.3": - version: 7.8.3 - resolution: "@babel/plugin-syntax-json-strings@npm:7.8.3" - dependencies: - "@babel/helper-plugin-utils": "npm:^7.8.0" - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 10/bf5aea1f3188c9a507e16efe030efb996853ca3cadd6512c51db7233cc58f3ac89ff8c6bdfb01d30843b161cfe7d321e1bf28da82f7ab8d7e6bc5464666f354a - languageName: node - linkType: hard - -"@babel/plugin-syntax-jsx@npm:^7.7.2": - version: 7.21.4 - resolution: "@babel/plugin-syntax-jsx@npm:7.21.4" - dependencies: - "@babel/helper-plugin-utils": "npm:^7.20.2" - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 10/bb7309402a1d4e155f32aa0cf216e1fa8324d6c4cfd248b03280028a015a10e46b6efd6565f515f8913918a3602b39255999c06046f7d4b8a5106be2165d724a - languageName: node - linkType: hard - -"@babel/plugin-syntax-logical-assignment-operators@npm:^7.8.3": - version: 7.10.4 - resolution: "@babel/plugin-syntax-logical-assignment-operators@npm:7.10.4" - dependencies: - "@babel/helper-plugin-utils": "npm:^7.10.4" - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 10/aff33577037e34e515911255cdbb1fd39efee33658aa00b8a5fd3a4b903585112d037cce1cc9e4632f0487dc554486106b79ccd5ea63a2e00df4363f6d4ff886 - languageName: node - linkType: hard - -"@babel/plugin-syntax-nullish-coalescing-operator@npm:^7.8.3": - version: 7.8.3 - resolution: "@babel/plugin-syntax-nullish-coalescing-operator@npm:7.8.3" - dependencies: - "@babel/helper-plugin-utils": "npm:^7.8.0" - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 10/87aca4918916020d1fedba54c0e232de408df2644a425d153be368313fdde40d96088feed6c4e5ab72aac89be5d07fef2ddf329a15109c5eb65df006bf2580d1 - languageName: node - linkType: hard - -"@babel/plugin-syntax-numeric-separator@npm:^7.8.3": - version: 7.10.4 - resolution: "@babel/plugin-syntax-numeric-separator@npm:7.10.4" - dependencies: - "@babel/helper-plugin-utils": "npm:^7.10.4" - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 10/01ec5547bd0497f76cc903ff4d6b02abc8c05f301c88d2622b6d834e33a5651aa7c7a3d80d8d57656a4588f7276eba357f6b7e006482f5b564b7a6488de493a1 - languageName: node - linkType: hard - -"@babel/plugin-syntax-object-rest-spread@npm:^7.8.3": - version: 7.8.3 - resolution: "@babel/plugin-syntax-object-rest-spread@npm:7.8.3" - dependencies: - "@babel/helper-plugin-utils": "npm:^7.8.0" - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 10/fddcf581a57f77e80eb6b981b10658421bc321ba5f0a5b754118c6a92a5448f12a0c336f77b8abf734841e102e5126d69110a306eadb03ca3e1547cab31f5cbf - languageName: node - linkType: hard - -"@babel/plugin-syntax-optional-catch-binding@npm:^7.8.3": - version: 7.8.3 - resolution: "@babel/plugin-syntax-optional-catch-binding@npm:7.8.3" - dependencies: - "@babel/helper-plugin-utils": "npm:^7.8.0" - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 10/910d90e72bc90ea1ce698e89c1027fed8845212d5ab588e35ef91f13b93143845f94e2539d831dc8d8ededc14ec02f04f7bd6a8179edd43a326c784e7ed7f0b9 - languageName: node - linkType: hard - -"@babel/plugin-syntax-optional-chaining@npm:^7.8.3": - version: 7.8.3 - resolution: "@babel/plugin-syntax-optional-chaining@npm:7.8.3" - dependencies: - "@babel/helper-plugin-utils": "npm:^7.8.0" - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 10/eef94d53a1453361553c1f98b68d17782861a04a392840341bc91780838dd4e695209c783631cf0de14c635758beafb6a3a65399846ffa4386bff90639347f30 - languageName: node - linkType: hard - -"@babel/plugin-syntax-top-level-await@npm:^7.8.3": - version: 7.14.5 - resolution: "@babel/plugin-syntax-top-level-await@npm:7.14.5" - dependencies: - "@babel/helper-plugin-utils": "npm:^7.14.5" - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 10/bbd1a56b095be7820029b209677b194db9b1d26691fe999856462e66b25b281f031f3dfd91b1619e9dcf95bebe336211833b854d0fb8780d618e35667c2d0d7e - languageName: node - linkType: hard - -"@babel/plugin-syntax-typescript@npm:^7.7.2": - version: 7.17.12 - resolution: "@babel/plugin-syntax-typescript@npm:7.17.12" - dependencies: - "@babel/helper-plugin-utils": "npm:^7.17.12" - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 10/50ab09f1953a2b0586cff9e29bf7cea3d886b48c1361a861687c2aef46356c6d73778c3341b0c051dc82a34417f19e9d759ae918353c5a98d25e85f2f6d24181 - languageName: node - linkType: hard - -"@babel/template@npm:^7.16.7, @babel/template@npm:^7.3.3": - version: 7.16.7 - resolution: "@babel/template@npm:7.16.7" - dependencies: - "@babel/code-frame": "npm:^7.16.7" - "@babel/parser": "npm:^7.16.7" - "@babel/types": "npm:^7.16.7" - checksum: 10/f35836a8cd53663508bc5e0b13e7fe3d646197fc1baa74c21d3a713c0c91d39fe6f6c5be8ec1ec139b3d0a00443ab1b8cc7ddf88c6ceb6f9fcf7ea0ae7594eca - languageName: node - linkType: hard - -"@babel/traverse@npm:^7.18.0, @babel/traverse@npm:^7.18.2, @babel/traverse@npm:^7.18.5, @babel/traverse@npm:^7.7.2": - version: 7.18.5 - resolution: "@babel/traverse@npm:7.18.5" - dependencies: - "@babel/code-frame": "npm:^7.16.7" - "@babel/generator": "npm:^7.18.2" - "@babel/helper-environment-visitor": "npm:^7.18.2" - "@babel/helper-function-name": "npm:^7.17.9" - "@babel/helper-hoist-variables": "npm:^7.16.7" - "@babel/helper-split-export-declaration": "npm:^7.16.7" - "@babel/parser": "npm:^7.18.5" - "@babel/types": "npm:^7.18.4" - debug: "npm:^4.1.0" - globals: "npm:^11.1.0" - checksum: 10/576dd8a2db3a77eb56945e09beb3179145a6cb88842a9a84a352a68942e032c056986848513a4f988e0ce6b35d64d83d6423c6b7d92ef3f2fee971da75b33ada - languageName: node - linkType: hard - -"@babel/types@npm:^7.0.0, @babel/types@npm:^7.16.7, @babel/types@npm:^7.17.0, @babel/types@npm:^7.18.0, @babel/types@npm:^7.18.2, @babel/types@npm:^7.18.4, @babel/types@npm:^7.20.7, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3": - version: 7.22.5 - resolution: "@babel/types@npm:7.22.5" - dependencies: - "@babel/helper-string-parser": "npm:^7.22.5" - "@babel/helper-validator-identifier": "npm:^7.22.5" - to-fast-properties: "npm:^2.0.0" - checksum: 10/7f7edffe7e13dbd26a182677575ca7451bc234ce43b93dc49d27325306748628019e7753e6b5619ae462ea0d7e5ce2c0cc24092d53b592642ea89542037748b5 - languageName: node - linkType: hard - "@babel/types@npm:^7.25.4, @babel/types@npm:^7.25.6": version: 7.25.6 resolution: "@babel/types@npm:7.25.6" @@ -497,17 +106,6 @@ __metadata: languageName: node linkType: hard -"@babel/types@npm:^7.8.3": - version: 7.23.9 - resolution: "@babel/types@npm:7.23.9" - dependencies: - "@babel/helper-string-parser": "npm:^7.23.4" - "@babel/helper-validator-identifier": "npm:^7.22.20" - to-fast-properties: "npm:^2.0.0" - checksum: 10/bed9634e5fd0f9dc63c84cfa83316c4cb617192db9fedfea464fca743affe93736d7bf2ebf418ee8358751a9d388e303af87a0c050cb5d87d5870c1b0154f6cb - languageName: node - linkType: hard - "@bcoe/v8-coverage@npm:^0.2.3": version: 0.2.3 resolution: "@bcoe/v8-coverage@npm:0.2.3" @@ -722,6 +320,34 @@ __metadata: languageName: node linkType: hard +"@emnapi/core@npm:^1.1.0": + version: 1.2.0 + resolution: "@emnapi/core@npm:1.2.0" + dependencies: + "@emnapi/wasi-threads": "npm:1.0.1" + tslib: "npm:^2.4.0" + checksum: 10/b0b32b7702ae501be76c72ee77778e0356696b49a72f56c3c04774db23baa3a6054acf839a3d8a49fee415386946685edb904eaa3ac95b5c73cedd2f2766853c + languageName: node + linkType: hard + +"@emnapi/runtime@npm:^1.1.0": + version: 1.2.0 + resolution: "@emnapi/runtime@npm:1.2.0" + dependencies: + tslib: "npm:^2.4.0" + checksum: 10/c954b36493b713e451c74e9f1a48124b5491196700ec458c5d4a94eac3351e14803b4fd48ae6f72c77956d75792093d377f96412a6f59766099cb142e5c5b8f4 + languageName: node + linkType: hard + +"@emnapi/wasi-threads@npm:1.0.1": + version: 1.0.1 + resolution: "@emnapi/wasi-threads@npm:1.0.1" + dependencies: + tslib: "npm:^2.4.0" + checksum: 10/949f8bdcb11153d530652516b11d4b11d8c6ed48a692b4a59cbaa4305327aed59a61f0d87c366085c20ad0b0336c3b50eaddbddeeb3e8c55e7e82b583b9d98fb + languageName: node + linkType: hard + "@esbuild/aix-ppc64@npm:0.21.5": version: 0.21.5 resolution: "@esbuild/aix-ppc64@npm:0.21.5" @@ -883,20 +509,72 @@ __metadata: languageName: node linkType: hard -"@eslint/eslintrc@npm:^1.3.0": - version: 1.3.1 - resolution: "@eslint/eslintrc@npm:1.3.1" +"@eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0": + version: 4.4.0 + resolution: "@eslint-community/eslint-utils@npm:4.4.0" + dependencies: + eslint-visitor-keys: "npm:^3.3.0" + peerDependencies: + eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 + checksum: 10/8d70bcdcd8cd279049183aca747d6c2ed7092a5cf0cf5916faac1ef37ffa74f0c245c2a3a3d3b9979d9dfdd4ca59257b4c5621db699d637b847a2c5e02f491c2 + languageName: node + linkType: hard + +"@eslint-community/regexpp@npm:^4.10.0, @eslint-community/regexpp@npm:^4.11.0": + version: 4.11.0 + resolution: "@eslint-community/regexpp@npm:4.11.0" + checksum: 10/f053f371c281ba173fe6ee16dbc4fe544c84870d58035ccca08dba7f6ce1830d895ce3237a0db89ba37616524775dca82f1c502066b58e2d5712d7f87f5ba17c + languageName: node + linkType: hard + +"@eslint/config-array@npm:^0.18.0": + version: 0.18.0 + resolution: "@eslint/config-array@npm:0.18.0" + dependencies: + "@eslint/object-schema": "npm:^2.1.4" + debug: "npm:^4.3.1" + minimatch: "npm:^3.1.2" + checksum: 10/60ccad1eb4806710b085cd739568ec7afd289ee5af6ca0383f0876f9fe375559ef525f7b3f86bdb3f961493de952f2cf3ab4aa4a6ccaef0ae3cd688267cabcb3 + languageName: node + linkType: hard + +"@eslint/eslintrc@npm:^3.1.0": + version: 3.1.0 + resolution: "@eslint/eslintrc@npm:3.1.0" dependencies: ajv: "npm:^6.12.4" debug: "npm:^4.3.2" - espree: "npm:^9.4.0" - globals: "npm:^13.15.0" + espree: "npm:^10.0.1" + globals: "npm:^14.0.0" ignore: "npm:^5.2.0" import-fresh: "npm:^3.2.1" js-yaml: "npm:^4.1.0" minimatch: "npm:^3.1.2" strip-json-comments: "npm:^3.1.1" - checksum: 10/33f55a02a881882a2799a2819bd226ac389b30c96ea356514e90ed5182ac3283e0444e62778eddfe2f89b440eb254de5839c0b632f76be6a2a7096111f7a9611 + checksum: 10/02bf892d1397e1029209dea685e9f4f87baf643315df2a632b5f121ec7e8548a3b34f428a007234fa82772218fa8a3ac2d10328637b9ce63b7f8344035b74db3 + languageName: node + linkType: hard + +"@eslint/js@npm:9.10.0": + version: 9.10.0 + resolution: "@eslint/js@npm:9.10.0" + checksum: 10/cbda2bf268c8ac7a2b2493aaaa0113a78165a576ee5178b9fbdaf245c3d40ffaf41d006f75afab5718f68d816f00319e267b4c88ead100b19022fe491f9e0175 + languageName: node + linkType: hard + +"@eslint/object-schema@npm:^2.1.4": + version: 2.1.4 + resolution: "@eslint/object-schema@npm:2.1.4" + checksum: 10/221e8d9f281c605948cd6e030874aacce83fe097f8f9c1964787037bccf08e82b7aa9eff1850a30fffac43f1d76555727ec22a2af479d91e268e89d1e035131e + languageName: node + linkType: hard + +"@eslint/plugin-kit@npm:^0.1.0": + version: 0.1.0 + resolution: "@eslint/plugin-kit@npm:0.1.0" + dependencies: + levn: "npm:^0.4.1" + checksum: 10/3c6b10505f53c6e32b40572f780164b75389bbabd1bf80ab8742222710d90683a2cc9480468fca132da636f6a3053ae60b173181d14f4975fde2e6f8f9564c6d languageName: node linkType: hard @@ -914,1240 +592,229 @@ __metadata: languageName: node linkType: hard -"@humanwhocodes/config-array@npm:^0.10.4": - version: 0.10.4 - resolution: "@humanwhocodes/config-array@npm:0.10.4" - dependencies: - "@humanwhocodes/object-schema": "npm:^1.2.1" - debug: "npm:^4.1.1" - minimatch: "npm:^3.0.4" - checksum: 10/df03778d745c73ca82226b693129c7b3acd0586f3d22b329a4557442c5eb0371559da627565cd9697b68728b8d2e77fb75bfbe918c95b7004970ee2c531bfc3e - languageName: node - linkType: hard - -"@humanwhocodes/gitignore-to-minimatch@npm:^1.0.2": - version: 1.0.2 - resolution: "@humanwhocodes/gitignore-to-minimatch@npm:1.0.2" - checksum: 10/012feb4bb622633fff044e378c47e5779feea7cbf28b2d026ea17ed47f40107032bfab39e7f66ffd8e94800a685d52c285515bc40c68b63e48d4a9678f188508 +"@humanwhocodes/module-importer@npm:^1.0.1": + version: 1.0.1 + resolution: "@humanwhocodes/module-importer@npm:1.0.1" + checksum: 10/e993950e346331e5a32eefb27948ecdee2a2c4ab3f072b8f566cd213ef485dd50a3ca497050608db91006f5479e43f91a439aef68d2a313bd3ded06909c7c5b3 languageName: node linkType: hard -"@humanwhocodes/object-schema@npm:^1.2.1": - version: 1.2.1 - resolution: "@humanwhocodes/object-schema@npm:1.2.1" - checksum: 10/b48a8f87fcd5fdc4ac60a31a8bf710d19cc64556050575e6a35a4a48a8543cf8cde1598a65640ff2cdfbfd165b38f9db4fa3782bea7848eb585cc3db824002e6 +"@humanwhocodes/retry@npm:^0.3.0": + version: 0.3.0 + resolution: "@humanwhocodes/retry@npm:0.3.0" + checksum: 10/e574bab58680867414e225c9002e9a97eb396f85871c180fbb1a9bcdf9ded4b4de0b327f7d0c43b775873362b7c92956d4b322e8bc4b90be56077524341f04b2 languageName: node linkType: hard "@hutson/parse-repository-url@npm:^3.0.0": version: 3.0.2 resolution: "@hutson/parse-repository-url@npm:3.0.2" - checksum: 10/dae0656f2e77315a3027ab9ca438ed344bf78a5fda7b145f65a1fface20dfb17e94e1d31e146c8b76de4657c21020aabc72dc53b53941c9f5fe2c27416559283 - languageName: node - linkType: hard - -"@isaacs/cliui@npm:^8.0.2": - version: 8.0.2 - resolution: "@isaacs/cliui@npm:8.0.2" - dependencies: - string-width: "npm:^5.1.2" - string-width-cjs: "npm:string-width@^4.2.0" - strip-ansi: "npm:^7.0.1" - strip-ansi-cjs: "npm:strip-ansi@^6.0.1" - wrap-ansi: "npm:^8.1.0" - wrap-ansi-cjs: "npm:wrap-ansi@^7.0.0" - checksum: 10/e9ed5fd27c3aec1095e3a16e0c0cf148d1fee55a38665c35f7b3f86a9b5d00d042ddaabc98e8a1cb7463b9378c15f22a94eb35e99469c201453eb8375191f243 - languageName: node - linkType: hard - -"@isaacs/string-locale-compare@npm:^1.1.0": - version: 1.1.0 - resolution: "@isaacs/string-locale-compare@npm:1.1.0" - checksum: 10/85682b14602f32023e487f62bc4076fe13cd3e887df9cca36acc0d41ea99b403100d586acb9367331526f3ee737d802ecaa582f59020998d75991e62a7ef0db5 - languageName: node - linkType: hard - -"@istanbuljs/load-nyc-config@npm:^1.0.0": - version: 1.1.0 - resolution: "@istanbuljs/load-nyc-config@npm:1.1.0" - dependencies: - camelcase: "npm:^5.3.1" - find-up: "npm:^4.1.0" - get-package-type: "npm:^0.1.0" - js-yaml: "npm:^3.13.1" - resolve-from: "npm:^5.0.0" - checksum: 10/b000a5acd8d4fe6e34e25c399c8bdbb5d3a202b4e10416e17bfc25e12bab90bb56d33db6089ae30569b52686f4b35ff28ef26e88e21e69821d2b85884bd055b8 - languageName: node - linkType: hard - -"@istanbuljs/schema@npm:^0.1.2": - version: 0.1.3 - resolution: "@istanbuljs/schema@npm:0.1.3" - checksum: 10/a9b1e49acdf5efc2f5b2359f2df7f90c5c725f2656f16099e8b2cd3a000619ecca9fc48cf693ba789cf0fd989f6e0df6a22bc05574be4223ecdbb7997d04384b - languageName: node - linkType: hard - -"@jest/console@npm:^29.5.0": - version: 29.5.0 - resolution: "@jest/console@npm:29.5.0" - dependencies: - "@jest/types": "npm:^29.5.0" - "@types/node": "npm:*" - chalk: "npm:^4.0.0" - jest-message-util: "npm:^29.5.0" - jest-util: "npm:^29.5.0" - slash: "npm:^3.0.0" - checksum: 10/0971c3d6abbb6adfa0b4e88c41121bbd45d7df821f7a9f7b3f4fce86d25b237925db526b315f9791a24b29efd0028bb235f68d5b6cc343e83246a6e76b5724dc - languageName: node - linkType: hard - -"@jest/core@npm:^29.5.0": - version: 29.5.0 - resolution: "@jest/core@npm:29.5.0" - dependencies: - "@jest/console": "npm:^29.5.0" - "@jest/reporters": "npm:^29.5.0" - "@jest/test-result": "npm:^29.5.0" - "@jest/transform": "npm:^29.5.0" - "@jest/types": "npm:^29.5.0" - "@types/node": "npm:*" - ansi-escapes: "npm:^4.2.1" - chalk: "npm:^4.0.0" - ci-info: "npm:^3.2.0" - exit: "npm:^0.1.2" - graceful-fs: "npm:^4.2.9" - jest-changed-files: "npm:^29.5.0" - jest-config: "npm:^29.5.0" - jest-haste-map: "npm:^29.5.0" - jest-message-util: "npm:^29.5.0" - jest-regex-util: "npm:^29.4.3" - jest-resolve: "npm:^29.5.0" - jest-resolve-dependencies: "npm:^29.5.0" - jest-runner: "npm:^29.5.0" - jest-runtime: "npm:^29.5.0" - jest-snapshot: "npm:^29.5.0" - jest-util: "npm:^29.5.0" - jest-validate: "npm:^29.5.0" - jest-watcher: "npm:^29.5.0" - micromatch: "npm:^4.0.4" - pretty-format: "npm:^29.5.0" - slash: "npm:^3.0.0" - strip-ansi: "npm:^6.0.0" - peerDependencies: - node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 - peerDependenciesMeta: - node-notifier: - optional: true - checksum: 10/6c26610e65e61017347ae11e90f05cac8419607fcd15b50aeb6b6a1908aa0999e6d97ac0a33dc1108b507b80dae3cd8ad64d9f9c85bd457f8580e289c29c88b0 - languageName: node - linkType: hard - -"@jest/environment@npm:^29.5.0": - version: 29.5.0 - resolution: "@jest/environment@npm:29.5.0" - dependencies: - "@jest/fake-timers": "npm:^29.5.0" - "@jest/types": "npm:^29.5.0" - "@types/node": "npm:*" - jest-mock: "npm:^29.5.0" - checksum: 10/320d388d43b278aed2e17e082f1fa03913665a42551a0d30c5d7f73d098f074c003a8c3794286d09d6e592b723bab2223aa7f2b0eef6a6ba8f77399c16f0c3b0 - languageName: node - linkType: hard - -"@jest/expect-utils@npm:^29.5.0": - version: 29.5.0 - resolution: "@jest/expect-utils@npm:29.5.0" - dependencies: - jest-get-type: "npm:^29.4.3" - checksum: 10/2df3ee42f6f7e904e06dd8be65662344493ec5525554fa76a91f80bbbcf85d207f40bb308bf0dd2e52b4b2ce42167a650ab686c109ecc736e9582e08d7f19e42 - languageName: node - linkType: hard - -"@jest/expect@npm:^29.5.0": - version: 29.5.0 - resolution: "@jest/expect@npm:29.5.0" - dependencies: - expect: "npm:^29.5.0" - jest-snapshot: "npm:^29.5.0" - checksum: 10/b8f7045f2601808b88ccbfa1c41a7ab484131b155d90a787c31d604c284b98da31dfec1f302b496ceef4e43107d2f6a3b5f0b5217b64ca908cec6dc2ff7b5ca6 - languageName: node - linkType: hard - -"@jest/fake-timers@npm:^29.5.0": - version: 29.5.0 - resolution: "@jest/fake-timers@npm:29.5.0" - dependencies: - "@jest/types": "npm:^29.5.0" - "@sinonjs/fake-timers": "npm:^10.0.2" - "@types/node": "npm:*" - jest-message-util: "npm:^29.5.0" - jest-mock: "npm:^29.5.0" - jest-util: "npm:^29.5.0" - checksum: 10/7e1e0817431b8b47fb7fec9b148c884c26ec8c613a1c64725ccf83ac776ddf76f9d0ddc7c60a74f25777cf2f0091861fcab538301ff9d537675df2b8ed71b100 - languageName: node - linkType: hard - -"@jest/globals@npm:^29.5.0": - version: 29.5.0 - resolution: "@jest/globals@npm:29.5.0" - dependencies: - "@jest/environment": "npm:^29.5.0" - "@jest/expect": "npm:^29.5.0" - "@jest/types": "npm:^29.5.0" - jest-mock: "npm:^29.5.0" - checksum: 10/b309ab8f21b571a7c672608682e84bbdd3d2b554ddf81e4e32617fec0a69094a290ab42e3c8b2c66ba891882bfb1b8b2736720ea1285b3ad646d55c2abefedd9 - languageName: node - linkType: hard - -"@jest/reporters@npm:^29.5.0": - version: 29.5.0 - resolution: "@jest/reporters@npm:29.5.0" - dependencies: - "@bcoe/v8-coverage": "npm:^0.2.3" - "@jest/console": "npm:^29.5.0" - "@jest/test-result": "npm:^29.5.0" - "@jest/transform": "npm:^29.5.0" - "@jest/types": "npm:^29.5.0" - "@jridgewell/trace-mapping": "npm:^0.3.15" - "@types/node": "npm:*" - chalk: "npm:^4.0.0" - collect-v8-coverage: "npm:^1.0.0" - exit: "npm:^0.1.2" - glob: "npm:^7.1.3" - graceful-fs: "npm:^4.2.9" - istanbul-lib-coverage: "npm:^3.0.0" - istanbul-lib-instrument: "npm:^5.1.0" - istanbul-lib-report: "npm:^3.0.0" - istanbul-lib-source-maps: "npm:^4.0.0" - istanbul-reports: "npm:^3.1.3" - jest-message-util: "npm:^29.5.0" - jest-util: "npm:^29.5.0" - jest-worker: "npm:^29.5.0" - slash: "npm:^3.0.0" - string-length: "npm:^4.0.1" - strip-ansi: "npm:^6.0.0" - v8-to-istanbul: "npm:^9.0.1" - peerDependencies: - node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 - peerDependenciesMeta: - node-notifier: - optional: true - checksum: 10/bf9a13434e0d623a66de80b835fec37227fbef0de7cf73545d8a8a3c80b2d96a8ffd3d077378da0a0c7565772ca6cd3641a5d6c282d9490400d2ce39dbf47525 - languageName: node - linkType: hard - -"@jest/schemas@npm:^28.1.3": - version: 28.1.3 - resolution: "@jest/schemas@npm:28.1.3" - dependencies: - "@sinclair/typebox": "npm:^0.24.1" - checksum: 10/3cf1d4b66c9c4ffda58b246de1ddcba8e6ad085af63dccdf07922511f13b68c0cc480a7bc620cb4f3099a6f134801c747e1df7bfc7a4ef4dceefbdea3e31e1de - languageName: node - linkType: hard - -"@jest/schemas@npm:^29.4.3": - version: 29.4.3 - resolution: "@jest/schemas@npm:29.4.3" - dependencies: - "@sinclair/typebox": "npm:^0.25.16" - checksum: 10/ac754e245c19dc39e10ebd41dce09040214c96a4cd8efa143b82148e383e45128f24599195ab4f01433adae4ccfbe2db6574c90db2862ccd8551a86704b5bebd - languageName: node - linkType: hard - -"@jest/source-map@npm:^29.4.3": - version: 29.4.3 - resolution: "@jest/source-map@npm:29.4.3" - dependencies: - "@jridgewell/trace-mapping": "npm:^0.3.15" - callsites: "npm:^3.0.0" - graceful-fs: "npm:^4.2.9" - checksum: 10/2301d225145f8123540c0be073f35a80fd26a2f5e59550fd68525d8cea580fb896d12bf65106591ffb7366a8a19790076dbebc70e0f5e6ceb51f81827ed1f89c - languageName: node - linkType: hard - -"@jest/test-result@npm:^29.5.0": - version: 29.5.0 - resolution: "@jest/test-result@npm:29.5.0" - dependencies: - "@jest/console": "npm:^29.5.0" - "@jest/types": "npm:^29.5.0" - "@types/istanbul-lib-coverage": "npm:^2.0.0" - collect-v8-coverage: "npm:^1.0.0" - checksum: 10/e41ab6137b26dba4d08441f3c921c8c9f4543bddd23072e1dbb54770584ac118f957fc6da4bf94bc5127161bee8e1ea6983b4e92249e47604163b10347d373ce - languageName: node - linkType: hard - -"@jest/test-sequencer@npm:^29.5.0": - version: 29.5.0 - resolution: "@jest/test-sequencer@npm:29.5.0" - dependencies: - "@jest/test-result": "npm:^29.5.0" - graceful-fs: "npm:^4.2.9" - jest-haste-map: "npm:^29.5.0" - slash: "npm:^3.0.0" - checksum: 10/5328f9abea50edadb325c27b8ac8ef6499d0710329fb5c85ca995b45bdaed94bb5e257ccc368d6c6fcf907700108c711b63690aac38f214d92314601c102bc22 - languageName: node - linkType: hard - -"@jest/transform@npm:^29.5.0": - version: 29.5.0 - resolution: "@jest/transform@npm:29.5.0" - dependencies: - "@babel/core": "npm:^7.11.6" - "@jest/types": "npm:^29.5.0" - "@jridgewell/trace-mapping": "npm:^0.3.15" - babel-plugin-istanbul: "npm:^6.1.1" - chalk: "npm:^4.0.0" - convert-source-map: "npm:^2.0.0" - fast-json-stable-stringify: "npm:^2.1.0" - graceful-fs: "npm:^4.2.9" - jest-haste-map: "npm:^29.5.0" - jest-regex-util: "npm:^29.4.3" - jest-util: "npm:^29.5.0" - micromatch: "npm:^4.0.4" - pirates: "npm:^4.0.4" - slash: "npm:^3.0.0" - write-file-atomic: "npm:^4.0.2" - checksum: 10/5b52b11670e213e404cfee4c9a951f7eb38733f9ec5b974fdf46f3e7934af167b84c85cd7ba0e10343335b35035aaa81e9b9badf201d12731edf873c82e62fe9 - languageName: node - linkType: hard - -"@jest/types@npm:^28.1.1": - version: 28.1.3 - resolution: "@jest/types@npm:28.1.3" - dependencies: - "@jest/schemas": "npm:^28.1.3" - "@types/istanbul-lib-coverage": "npm:^2.0.0" - "@types/istanbul-reports": "npm:^3.0.0" - "@types/node": "npm:*" - "@types/yargs": "npm:^17.0.8" - chalk: "npm:^4.0.0" - checksum: 10/a90e636df760799b6c3d91e34e539e701ea803e80312257e674e345a3c23a7c892df7a301afbc7883ec1d623daf3ba266cde57c5965e0692e5f1e61915d3524b - languageName: node - linkType: hard - -"@jest/types@npm:^29.5.0": - version: 29.5.0 - resolution: "@jest/types@npm:29.5.0" - dependencies: - "@jest/schemas": "npm:^29.4.3" - "@types/istanbul-lib-coverage": "npm:^2.0.0" - "@types/istanbul-reports": "npm:^3.0.0" - "@types/node": "npm:*" - "@types/yargs": "npm:^17.0.8" - chalk: "npm:^4.0.0" - checksum: 10/910a134cd1c2cd7d74dfcf9981c2f1a6c1d9772edecb7738947b059c4e0bb843a0d26a3c7dfff112f2fc4a473ecc18679edda498416f0048a8d181ff43a08bee - languageName: node - linkType: hard - -"@jridgewell/gen-mapping@npm:^0.3.0": - version: 0.3.1 - resolution: "@jridgewell/gen-mapping@npm:0.3.1" - dependencies: - "@jridgewell/set-array": "npm:^1.0.0" - "@jridgewell/sourcemap-codec": "npm:^1.4.10" - "@jridgewell/trace-mapping": "npm:^0.3.9" - checksum: 10/9aeaa863b2b42f986c985c87608b68443987c2d9c0705d1fdbf117ccd482781389f8674021eaceb72ef9a91e4c06a6d0e5c3d894ce24cc1ec8005c55d2ed7103 - languageName: node - linkType: hard - -"@jridgewell/gen-mapping@npm:^0.3.5": - version: 0.3.5 - resolution: "@jridgewell/gen-mapping@npm:0.3.5" - dependencies: - "@jridgewell/set-array": "npm:^1.2.1" - "@jridgewell/sourcemap-codec": "npm:^1.4.10" - "@jridgewell/trace-mapping": "npm:^0.3.24" - checksum: 10/81587b3c4dd8e6c60252122937cea0c637486311f4ed208b52b62aae2e7a87598f63ec330e6cd0984af494bfb16d3f0d60d3b21d7e5b4aedd2602ff3fe9d32e2 - languageName: node - linkType: hard - -"@jridgewell/resolve-uri@npm:3.1.0": - version: 3.1.0 - resolution: "@jridgewell/resolve-uri@npm:3.1.0" - checksum: 10/320ceb37af56953757b28e5b90c34556157676d41e3d0a3ff88769274d62373582bb0f0276a4f2d29c3f4fdd55b82b8be5731f52d391ad2ecae9b321ee1c742d - languageName: node - linkType: hard - -"@jridgewell/resolve-uri@npm:^3.0.3": - version: 3.0.5 - resolution: "@jridgewell/resolve-uri@npm:3.0.5" - checksum: 10/66da0c14dfaebd3481ac363306eefa45aca6779f8635df7337b97c18873853a7e2946d79104fad3e2ab832fe438ebabcaa2091e55e069a81b35001fa6738f532 - languageName: node - linkType: hard - -"@jridgewell/resolve-uri@npm:^3.1.0": - version: 3.1.2 - resolution: "@jridgewell/resolve-uri@npm:3.1.2" - checksum: 10/97106439d750a409c22c8bff822d648f6a71f3aa9bc8e5129efdc36343cd3096ddc4eeb1c62d2fe48e9bdd4db37b05d4646a17114ecebd3bbcacfa2de51c3c1d - languageName: node - linkType: hard - -"@jridgewell/set-array@npm:^1.0.0": - version: 1.1.1 - resolution: "@jridgewell/set-array@npm:1.1.1" - checksum: 10/cc5d91e0381c347e3edee4ca90b3c292df9e6e55f29acbe0dd97de8651b4730e9ab761406fd572effa79972a0edc55647b627f8c72315e276d959508853d9bf2 - languageName: node - linkType: hard - -"@jridgewell/set-array@npm:^1.2.1": - version: 1.2.1 - resolution: "@jridgewell/set-array@npm:1.2.1" - checksum: 10/832e513a85a588f8ed4f27d1279420d8547743cc37fcad5a5a76fc74bb895b013dfe614d0eed9cb860048e6546b798f8f2652020b4b2ba0561b05caa8c654b10 - languageName: node - linkType: hard - -"@jridgewell/sourcemap-codec@npm:1.4.14": - version: 1.4.14 - resolution: "@jridgewell/sourcemap-codec@npm:1.4.14" - checksum: 10/26e768fae6045481a983e48aa23d8fcd23af5da70ebd74b0649000e815e7fbb01ea2bc088c9176b3fffeb9bec02184e58f46125ef3320b30eaa1f4094cfefa38 - languageName: node - linkType: hard - -"@jridgewell/sourcemap-codec@npm:^1.4.10": - version: 1.4.11 - resolution: "@jridgewell/sourcemap-codec@npm:1.4.11" - checksum: 10/591ca7f7884a51643e713b1b623c6c7d751bdc78d61b6cda1dcf7de1287e7f0530514c3f2c7d443273ddc8687637a95cd19f5d8986b32e2349d0f7310623df40 - languageName: node - linkType: hard - -"@jridgewell/sourcemap-codec@npm:^1.4.14, @jridgewell/sourcemap-codec@npm:^1.5.0": - version: 1.5.0 - resolution: "@jridgewell/sourcemap-codec@npm:1.5.0" - checksum: 10/4ed6123217569a1484419ac53f6ea0d9f3b57e5b57ab30d7c267bdb27792a27eb0e4b08e84a2680aa55cc2f2b411ffd6ec3db01c44fdc6dc43aca4b55f8374fd - languageName: node - linkType: hard - -"@jridgewell/trace-mapping@npm:0.3.9": - version: 0.3.9 - resolution: "@jridgewell/trace-mapping@npm:0.3.9" - dependencies: - "@jridgewell/resolve-uri": "npm:^3.0.3" - "@jridgewell/sourcemap-codec": "npm:^1.4.10" - checksum: 10/83deafb8e7a5ca98993c2c6eeaa93c270f6f647a4c0dc00deb38c9cf9b2d3b7bf15e8839540155247ef034a052c0ec4466f980bf0c9e2ab63b97d16c0cedd3ff - languageName: node - linkType: hard - -"@jridgewell/trace-mapping@npm:^0.3.0, @jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.15, @jridgewell/trace-mapping@npm:^0.3.9": - version: 0.3.18 - resolution: "@jridgewell/trace-mapping@npm:0.3.18" - dependencies: - "@jridgewell/resolve-uri": "npm:3.1.0" - "@jridgewell/sourcemap-codec": "npm:1.4.14" - checksum: 10/f4fabdddf82398a797bcdbb51c574cd69b383db041a6cae1a6a91478681d6aab340c01af655cfd8c6e01cde97f63436a1445f08297cdd33587621cf05ffa0d55 - languageName: node - linkType: hard - -"@jridgewell/trace-mapping@npm:^0.3.23, @jridgewell/trace-mapping@npm:^0.3.24": - version: 0.3.25 - resolution: "@jridgewell/trace-mapping@npm:0.3.25" - dependencies: - "@jridgewell/resolve-uri": "npm:^3.1.0" - "@jridgewell/sourcemap-codec": "npm:^1.4.14" - checksum: 10/dced32160a44b49d531b80a4a2159dceab6b3ddf0c8e95a0deae4b0e894b172defa63d5ac52a19c2068e1fe7d31ea4ba931fbeec103233ecb4208953967120fc - languageName: node - linkType: hard - -"@lerna/add@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/add@npm:5.4.3" - dependencies: - "@lerna/bootstrap": "npm:5.4.3" - "@lerna/command": "npm:5.4.3" - "@lerna/filter-options": "npm:5.4.3" - "@lerna/npm-conf": "npm:5.4.3" - "@lerna/validation-error": "npm:5.4.3" - dedent: "npm:^0.7.0" - npm-package-arg: "npm:8.1.1" - p-map: "npm:^4.0.0" - pacote: "npm:^13.6.1" - semver: "npm:^7.3.4" - checksum: 10/053d152ea34604cce6dd5e046c846b27d00e9a8990be29d1088de830e6f0dfbe5a2b00da8680adee1264f58a87589bb22c0d427968a6fc316f37512fa3be0bd4 - languageName: node - linkType: hard - -"@lerna/bootstrap@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/bootstrap@npm:5.4.3" - dependencies: - "@lerna/command": "npm:5.4.3" - "@lerna/filter-options": "npm:5.4.3" - "@lerna/has-npm-version": "npm:5.4.3" - "@lerna/npm-install": "npm:5.4.3" - "@lerna/package-graph": "npm:5.4.3" - "@lerna/pulse-till-done": "npm:5.4.3" - "@lerna/rimraf-dir": "npm:5.4.3" - "@lerna/run-lifecycle": "npm:5.4.3" - "@lerna/run-topologically": "npm:5.4.3" - "@lerna/symlink-binary": "npm:5.4.3" - "@lerna/symlink-dependencies": "npm:5.4.3" - "@lerna/validation-error": "npm:5.4.3" - "@npmcli/arborist": "npm:5.3.0" - dedent: "npm:^0.7.0" - get-port: "npm:^5.1.1" - multimatch: "npm:^5.0.0" - npm-package-arg: "npm:8.1.1" - npmlog: "npm:^6.0.2" - p-map: "npm:^4.0.0" - p-map-series: "npm:^2.1.0" - p-waterfall: "npm:^2.1.1" - semver: "npm:^7.3.4" - checksum: 10/0ff41a70b62e2be2651a984b09829d5ac21230a2921b564409f2970a5c59d03a622858a284e59416cb3ab1b9f0aa9032a2c4deb294973b76ee6900623e97a3d9 - languageName: node - linkType: hard - -"@lerna/changed@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/changed@npm:5.4.3" - dependencies: - "@lerna/collect-updates": "npm:5.4.3" - "@lerna/command": "npm:5.4.3" - "@lerna/listable": "npm:5.4.3" - "@lerna/output": "npm:5.4.3" - checksum: 10/144a7f0f7c97da1fd479c58de355ac4dea2049059c633e101c94854be572088ea55815eabb5eb175526092ae6b673b47a0c4151a3d88a9c4e116aaec975be914 - languageName: node - linkType: hard - -"@lerna/check-working-tree@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/check-working-tree@npm:5.4.3" - dependencies: - "@lerna/collect-uncommitted": "npm:5.4.3" - "@lerna/describe-ref": "npm:5.4.3" - "@lerna/validation-error": "npm:5.4.3" - checksum: 10/2fb7f5663c4fb9d2c8b4fad9c95ddb86ade3d491a0dad35d3b10176267dc35c0f59fc54a9d94483acb2eaa822343bf796c7d576a72adfebd749acc89aac66fe3 - languageName: node - linkType: hard - -"@lerna/child-process@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/child-process@npm:5.4.3" - dependencies: - chalk: "npm:^4.1.0" - execa: "npm:^5.0.0" - strong-log-transformer: "npm:^2.1.0" - checksum: 10/0c5b5e39129018071a0ddb63317c33a82984c33049eda007f447e00e7870a9e501b4d59c8dc56f617ce2f0c9a91cdcc3b6bf1dcdbe55b84bc81fe59e2a131309 - languageName: node - linkType: hard - -"@lerna/clean@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/clean@npm:5.4.3" - dependencies: - "@lerna/command": "npm:5.4.3" - "@lerna/filter-options": "npm:5.4.3" - "@lerna/prompt": "npm:5.4.3" - "@lerna/pulse-till-done": "npm:5.4.3" - "@lerna/rimraf-dir": "npm:5.4.3" - p-map: "npm:^4.0.0" - p-map-series: "npm:^2.1.0" - p-waterfall: "npm:^2.1.1" - checksum: 10/e267e1fec2aaf770f9eb52bf71bf05e7a935159a2ff1c0a77998e759b967203a6ecd93350ecf68bd4a151198804b9f67d17ece48300509f314449d76d03c720c - languageName: node - linkType: hard - -"@lerna/cli@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/cli@npm:5.4.3" - dependencies: - "@lerna/global-options": "npm:5.4.3" - dedent: "npm:^0.7.0" - npmlog: "npm:^6.0.2" - yargs: "npm:^16.2.0" - checksum: 10/b2edfb53f8aad575948810ba8018b033ca1b7db6c7806ae460cd5e2d487788182294cb939ea00ff7d848bb30d51a1ace3049d74e91428fe6e9d838a64f36f0f0 - languageName: node - linkType: hard - -"@lerna/collect-uncommitted@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/collect-uncommitted@npm:5.4.3" - dependencies: - "@lerna/child-process": "npm:5.4.3" - chalk: "npm:^4.1.0" - npmlog: "npm:^6.0.2" - checksum: 10/2c7196d4b12f2566b056f7eb2067c03961686146db6cf728f0936c68bbb7ac798226d1fad185a5c13dba9d5471242869f512d0b171a46a5ec45c8d6fcd4fbd0d - languageName: node - linkType: hard - -"@lerna/collect-updates@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/collect-updates@npm:5.4.3" - dependencies: - "@lerna/child-process": "npm:5.4.3" - "@lerna/describe-ref": "npm:5.4.3" - minimatch: "npm:^3.0.4" - npmlog: "npm:^6.0.2" - slash: "npm:^3.0.0" - checksum: 10/794f1aab30ce8829e022830127a0b5d9825cccd0ffe79ce3ce8a3a6311b9e58f73ac7d612be34feb80aaf627abf228a451b16bf543e5e03ea9fdd1d435b4c589 - languageName: node - linkType: hard - -"@lerna/command@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/command@npm:5.4.3" - dependencies: - "@lerna/child-process": "npm:5.4.3" - "@lerna/package-graph": "npm:5.4.3" - "@lerna/project": "npm:5.4.3" - "@lerna/validation-error": "npm:5.4.3" - "@lerna/write-log-file": "npm:5.4.3" - clone-deep: "npm:^4.0.1" - dedent: "npm:^0.7.0" - execa: "npm:^5.0.0" - is-ci: "npm:^2.0.0" - npmlog: "npm:^6.0.2" - checksum: 10/15f379e3eb884ae0e856844afca2385c03929d4e511adc4bbcfdc5a8c4ef6b0be62b40e070acfa98d63d68c6a04f2fa88f0af92c8e11a349eedbbb36dffc5b1a - languageName: node - linkType: hard - -"@lerna/conventional-commits@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/conventional-commits@npm:5.4.3" - dependencies: - "@lerna/validation-error": "npm:5.4.3" - conventional-changelog-angular: "npm:^5.0.12" - conventional-changelog-core: "npm:^4.2.4" - conventional-recommended-bump: "npm:^6.1.0" - fs-extra: "npm:^9.1.0" - get-stream: "npm:^6.0.0" - npm-package-arg: "npm:8.1.1" - npmlog: "npm:^6.0.2" - pify: "npm:^5.0.0" - semver: "npm:^7.3.4" - checksum: 10/efd8f097b03cf1b1736697bc12f6d60f94ffb0f9f3bdc5b9a595cd1ba647e32ca10322b24e7b52483ac7534d5f5d09c235b65307e141fe7946b97cdab4de37cf - languageName: node - linkType: hard - -"@lerna/create-symlink@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/create-symlink@npm:5.4.3" - dependencies: - cmd-shim: "npm:^5.0.0" - fs-extra: "npm:^9.1.0" - npmlog: "npm:^6.0.2" - checksum: 10/58ec36d182fb2a48a853e0bbdb204af2558f8b030ecdab769658b96f1acf1212e63c6d540c94781fd983938defe32a9dd51ab321347bdcb15eed1b5719148c4b - languageName: node - linkType: hard - -"@lerna/create@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/create@npm:5.4.3" - dependencies: - "@lerna/child-process": "npm:5.4.3" - "@lerna/command": "npm:5.4.3" - "@lerna/npm-conf": "npm:5.4.3" - "@lerna/validation-error": "npm:5.4.3" - dedent: "npm:^0.7.0" - fs-extra: "npm:^9.1.0" - globby: "npm:^11.0.2" - init-package-json: "npm:^3.0.2" - npm-package-arg: "npm:8.1.1" - p-reduce: "npm:^2.1.0" - pacote: "npm:^13.6.1" - pify: "npm:^5.0.0" - semver: "npm:^7.3.4" - slash: "npm:^3.0.0" - validate-npm-package-license: "npm:^3.0.4" - validate-npm-package-name: "npm:^4.0.0" - whatwg-url: "npm:^8.4.0" - yargs-parser: "npm:20.2.4" - checksum: 10/e1567f76632e91079c89b45948867a731495b5bbe013fd2caa7e127753557251b867d0a2ddc6a4b2199ea0170f576bafd49de9fd90a3c1e3d16e3610fd3e2c6c - languageName: node - linkType: hard - -"@lerna/describe-ref@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/describe-ref@npm:5.4.3" - dependencies: - "@lerna/child-process": "npm:5.4.3" - npmlog: "npm:^6.0.2" - checksum: 10/f7952e860c86fe83d1860318848589dca07383c1c4c7a912f8c3d77d9fcf05e2f32c45e05f70270219f30ead0dc649e65239681c10d0fa3132c347eb7ff28783 - languageName: node - linkType: hard - -"@lerna/diff@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/diff@npm:5.4.3" - dependencies: - "@lerna/child-process": "npm:5.4.3" - "@lerna/command": "npm:5.4.3" - "@lerna/validation-error": "npm:5.4.3" - npmlog: "npm:^6.0.2" - checksum: 10/8b58ed5b4a02e3449ede46b3efadb55b4c99f7f391366878e2a5b78d1b94dd819f6a8b6bb49dd8e2babc0059d703a1188d9b0d842d8f0ca856f74db863027b46 - languageName: node - linkType: hard - -"@lerna/exec@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/exec@npm:5.4.3" - dependencies: - "@lerna/child-process": "npm:5.4.3" - "@lerna/command": "npm:5.4.3" - "@lerna/filter-options": "npm:5.4.3" - "@lerna/profiler": "npm:5.4.3" - "@lerna/run-topologically": "npm:5.4.3" - "@lerna/validation-error": "npm:5.4.3" - p-map: "npm:^4.0.0" - checksum: 10/9493ba07e6159fc875fea75bc278b81fd561d590f3cc9211a952c9ee1d76ebf00ab5a2f81bec1919c9f40d3cf8a47772e5a819ef32dd8c03d7874661f17f2fcf - languageName: node - linkType: hard - -"@lerna/filter-options@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/filter-options@npm:5.4.3" - dependencies: - "@lerna/collect-updates": "npm:5.4.3" - "@lerna/filter-packages": "npm:5.4.3" - dedent: "npm:^0.7.0" - npmlog: "npm:^6.0.2" - checksum: 10/7c6a188ca3542940213387967f2494593fac7ede6754709f991986ed1678af96b064269091c23aa9ee03babd4faca21ea1c07a51a2a645212b5b93625da2b119 - languageName: node - linkType: hard - -"@lerna/filter-packages@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/filter-packages@npm:5.4.3" - dependencies: - "@lerna/validation-error": "npm:5.4.3" - multimatch: "npm:^5.0.0" - npmlog: "npm:^6.0.2" - checksum: 10/c2d3afb354346819b88bad011049f1eca120b6188e1492a7ab95f087a3aca0f6432715c60f3089ed8e5e34b5399630b4c8585d4e56d7d59652355af9264f2442 - languageName: node - linkType: hard - -"@lerna/get-npm-exec-opts@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/get-npm-exec-opts@npm:5.4.3" - dependencies: - npmlog: "npm:^6.0.2" - checksum: 10/c2e3a961a0e64997b926452eb35843e89806fb56d23688442d3a5ecca24a6ecd8d2e04953a0eb9a58d04fcb362b2b2358e55adfbc46217f801ade71957a2afa2 - languageName: node - linkType: hard - -"@lerna/get-packed@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/get-packed@npm:5.4.3" - dependencies: - fs-extra: "npm:^9.1.0" - ssri: "npm:^9.0.1" - tar: "npm:^6.1.0" - checksum: 10/32981e8cc82654b11e7ae630ff167beca63ad7923efe45f965e5d241c6d9943b214dcb06aac19ae0dc022e497b9682325336323fe7c5658a4cc366dfdbde0c47 - languageName: node - linkType: hard - -"@lerna/github-client@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/github-client@npm:5.4.3" - dependencies: - "@lerna/child-process": "npm:5.4.3" - "@octokit/plugin-enterprise-rest": "npm:^6.0.1" - "@octokit/rest": "npm:^19.0.3" - git-url-parse: "npm:^12.0.0" - npmlog: "npm:^6.0.2" - checksum: 10/a55cab5a08390c42dae932b40975442de9ac551531b86e51f060a5d5a8894f07f386163e36e81e76467db4024038eae757f59531af8cd2c7dc97212f4cf7b614 - languageName: node - linkType: hard - -"@lerna/gitlab-client@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/gitlab-client@npm:5.4.3" - dependencies: - node-fetch: "npm:^2.6.1" - npmlog: "npm:^6.0.2" - whatwg-url: "npm:^8.4.0" - checksum: 10/669e7d48507dbfbb0f5db070c558858a187bdf877e5b16a0baa368e7f78a32a3365d95a0e118a2be9583cc6c2724165285a8efa03674bab08b8d8ea340b77784 - languageName: node - linkType: hard - -"@lerna/global-options@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/global-options@npm:5.4.3" - checksum: 10/a945031a88723a18f6ccb24682235dd71df3742d8ffe83d15992ef653c5244c9061fc55610f89bfbcf8b206a2a8f51cdd342e2a2140388935c6571a110eda5f9 - languageName: node - linkType: hard - -"@lerna/has-npm-version@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/has-npm-version@npm:5.4.3" - dependencies: - "@lerna/child-process": "npm:5.4.3" - semver: "npm:^7.3.4" - checksum: 10/06fe65279ff76c9141d25c666d8a597c4115164e2d975a38f89437f2a66d443c947cf70f34df3703feaee49d336262bef4897f00656d1088a524638df9709ca6 - languageName: node - linkType: hard - -"@lerna/import@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/import@npm:5.4.3" - dependencies: - "@lerna/child-process": "npm:5.4.3" - "@lerna/command": "npm:5.4.3" - "@lerna/prompt": "npm:5.4.3" - "@lerna/pulse-till-done": "npm:5.4.3" - "@lerna/validation-error": "npm:5.4.3" - dedent: "npm:^0.7.0" - fs-extra: "npm:^9.1.0" - p-map-series: "npm:^2.1.0" - checksum: 10/29387f2bd1d0c01ecaf42339c6936116f8cfc13f6700de3c69348ce08eb4ceab04e7e5d467250f26181b254eb4b89943f558f2e93f92e3d9a2cc5fa67e3f0746 - languageName: node - linkType: hard - -"@lerna/info@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/info@npm:5.4.3" - dependencies: - "@lerna/command": "npm:5.4.3" - "@lerna/output": "npm:5.4.3" - envinfo: "npm:^7.7.4" - checksum: 10/5dd3ff7727e02345449679be5bed50266dfc8e58b48ac18430bf2f1df8b30898df50442f40390cad7303060c3bb8dd8b1ca656043623a9eebb82e32257449c50 - languageName: node - linkType: hard - -"@lerna/init@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/init@npm:5.4.3" - dependencies: - "@lerna/child-process": "npm:5.4.3" - "@lerna/command": "npm:5.4.3" - "@lerna/project": "npm:5.4.3" - fs-extra: "npm:^9.1.0" - p-map: "npm:^4.0.0" - write-json-file: "npm:^4.3.0" - checksum: 10/a2477a86a4a8f04fc11a7daa9d48a3676dd90516322a925c4fde41ae8108a2883d7a3b82eb3927c8fff7870f5e087774192084c910d0745e6c2c86a18a29a6e8 - languageName: node - linkType: hard - -"@lerna/link@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/link@npm:5.4.3" - dependencies: - "@lerna/command": "npm:5.4.3" - "@lerna/package-graph": "npm:5.4.3" - "@lerna/symlink-dependencies": "npm:5.4.3" - p-map: "npm:^4.0.0" - slash: "npm:^3.0.0" - checksum: 10/ff648c3f4562f3136d810b73b206f621c7c6445f246b4f9cfd74e69dae01d3de6114cdd4e88e30436e7360f1e3d3bd5e106c130debddc049f8cc29716cc13219 - languageName: node - linkType: hard - -"@lerna/list@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/list@npm:5.4.3" - dependencies: - "@lerna/command": "npm:5.4.3" - "@lerna/filter-options": "npm:5.4.3" - "@lerna/listable": "npm:5.4.3" - "@lerna/output": "npm:5.4.3" - checksum: 10/7b9eeb3262224a620bde2d1f07f18b1a2bf432744cb940a2ebef219e4b3bdccf435b6072151f243cf734fd1fc75564dde3c248f086a408acc41a177f92d366e5 - languageName: node - linkType: hard - -"@lerna/listable@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/listable@npm:5.4.3" - dependencies: - "@lerna/query-graph": "npm:5.4.3" - chalk: "npm:^4.1.0" - columnify: "npm:^1.6.0" - checksum: 10/d525849a8e72771a24f7e76df42bbb33031c731dfffc2467d60b7463c232733e3fa9a83bbae4655c42c9670b7e33d14621b8ca9b6d836d4aba0f050512084c33 - languageName: node - linkType: hard - -"@lerna/log-packed@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/log-packed@npm:5.4.3" - dependencies: - byte-size: "npm:^7.0.0" - columnify: "npm:^1.6.0" - has-unicode: "npm:^2.0.1" - npmlog: "npm:^6.0.2" - checksum: 10/97f9745a5b7df0b5dd828bf759e3e5c5d1fe2e0a836d21d6a221496f1c192748c25a91a1af530cd88ac418a45f3dd006e4c2651467909d22acd1a76c56e94643 - languageName: node - linkType: hard - -"@lerna/npm-conf@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/npm-conf@npm:5.4.3" - dependencies: - config-chain: "npm:^1.1.12" - pify: "npm:^5.0.0" - checksum: 10/4fdba7e32afe11f2ebd6803dbcc6280f93cb302c9e8d74a7f527546e3abf69a7eadc985f93c53c4f8dfa55f0258260355b2b03cc8dfbd3128b6451f88e6075cc - languageName: node - linkType: hard - -"@lerna/npm-dist-tag@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/npm-dist-tag@npm:5.4.3" - dependencies: - "@lerna/otplease": "npm:5.4.3" - npm-package-arg: "npm:8.1.1" - npm-registry-fetch: "npm:^13.3.0" - npmlog: "npm:^6.0.2" - checksum: 10/b086104555d6730f97a116a5eddeb91a88dfa5cc4dc5d5f4b2862e2362c8c376e5ff6d45e01a4992860c34f719374154e45c36bcf7852876a3fc9867c01cd307 - languageName: node - linkType: hard - -"@lerna/npm-install@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/npm-install@npm:5.4.3" - dependencies: - "@lerna/child-process": "npm:5.4.3" - "@lerna/get-npm-exec-opts": "npm:5.4.3" - fs-extra: "npm:^9.1.0" - npm-package-arg: "npm:8.1.1" - npmlog: "npm:^6.0.2" - signal-exit: "npm:^3.0.3" - write-pkg: "npm:^4.0.0" - checksum: 10/3e74bf952b8254b91b5d71852abbd8c8f0ee988d17469290badc0eb3afcc6ced12f94baaf6305f3552e3651715f95c06ef5f24c2d1b97689fb3e06fe81555b57 - languageName: node - linkType: hard - -"@lerna/npm-publish@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/npm-publish@npm:5.4.3" - dependencies: - "@lerna/otplease": "npm:5.4.3" - "@lerna/run-lifecycle": "npm:5.4.3" - fs-extra: "npm:^9.1.0" - libnpmpublish: "npm:^6.0.4" - npm-package-arg: "npm:8.1.1" - npmlog: "npm:^6.0.2" - pify: "npm:^5.0.0" - read-package-json: "npm:^5.0.1" - checksum: 10/b42875e591079228f88e6d7b2ba9efcbe62bd784b05a300186a95c0be25c38274e10943cceffa63600a607d07f54cdd63505ac04745f647cf7657fd9e1e89111 - languageName: node - linkType: hard - -"@lerna/npm-run-script@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/npm-run-script@npm:5.4.3" - dependencies: - "@lerna/child-process": "npm:5.4.3" - "@lerna/get-npm-exec-opts": "npm:5.4.3" - npmlog: "npm:^6.0.2" - checksum: 10/9eb532fa2835498eab2b547113c4a2efe32842d35244d2801e4994bf98474880e601a955bfac983be1e6f96b7c0dd6edf388f2ce5add18c571acc508e78ac2d5 - languageName: node - linkType: hard - -"@lerna/otplease@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/otplease@npm:5.4.3" - dependencies: - "@lerna/prompt": "npm:5.4.3" - checksum: 10/01fb94b06211ac65953ec14b770b5581bbdbeb8292cb2af2579b65f66b2958277ad89eab145faa83feb5d844491fd7f89a7cc258ea87985c1df4325b5043f1bf - languageName: node - linkType: hard - -"@lerna/output@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/output@npm:5.4.3" - dependencies: - npmlog: "npm:^6.0.2" - checksum: 10/4625e4f72b99c436cff006692424c8a405473ce063747576e7ab5c6fe39ca0db48c33d4eae68fd529e6e2481527c1eada91f65f4c5465c5debdce5af1b5aeadb - languageName: node - linkType: hard - -"@lerna/pack-directory@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/pack-directory@npm:5.4.3" - dependencies: - "@lerna/get-packed": "npm:5.4.3" - "@lerna/package": "npm:5.4.3" - "@lerna/run-lifecycle": "npm:5.4.3" - "@lerna/temp-write": "npm:5.4.3" - npm-packlist: "npm:^5.1.1" - npmlog: "npm:^6.0.2" - tar: "npm:^6.1.0" - checksum: 10/7a837a04ea9a4e1d8ab3bf12f894cc9f7b79c2661d4b7c51945a738f16c1e5f369870c18ed7b1ee1ea7bc7f0bde85f873cef7a810b99996d2a99c52d2337c3dd - languageName: node - linkType: hard - -"@lerna/package-graph@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/package-graph@npm:5.4.3" - dependencies: - "@lerna/prerelease-id-from-version": "npm:5.4.3" - "@lerna/validation-error": "npm:5.4.3" - npm-package-arg: "npm:8.1.1" - npmlog: "npm:^6.0.2" - semver: "npm:^7.3.4" - checksum: 10/1f762a9dc1de8b4ea4b436b19adc80f0babe22bfa355a0e2e288d076a07f9256cc2bb4f9a875e5ffea4f773731ad87656983a4d9582d0ca3473f1038d7895c4d - languageName: node - linkType: hard - -"@lerna/package@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/package@npm:5.4.3" - dependencies: - load-json-file: "npm:^6.2.0" - npm-package-arg: "npm:8.1.1" - write-pkg: "npm:^4.0.0" - checksum: 10/321edba6217e2a69e8f6b2c2b2ec2331bc90dc2a5883ab91eaead99478139826303fd7adb427d95d500ba6bd95aa33df21feaf8c091847321678f51532aa82d1 - languageName: node - linkType: hard - -"@lerna/prerelease-id-from-version@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/prerelease-id-from-version@npm:5.4.3" - dependencies: - semver: "npm:^7.3.4" - checksum: 10/c71d3adb5236bdc856d25175aed752b3a93389dc0dd85f27f088ed124f5f9d46ba03c43adc2e9b329638ec3c6d9debb80825a37ee23d768b9b7e2efddb156de1 - languageName: node - linkType: hard - -"@lerna/profiler@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/profiler@npm:5.4.3" - dependencies: - fs-extra: "npm:^9.1.0" - npmlog: "npm:^6.0.2" - upath: "npm:^2.0.1" - checksum: 10/3639e3a991b02bead7d141e57344fde5709816fe735525039879a10b8b679f1a7e8f75f752ad4a1c0fec31e70ef5f5d9d5b8a8937a7fd0e14c49d6084924b81a + checksum: 10/dae0656f2e77315a3027ab9ca438ed344bf78a5fda7b145f65a1fface20dfb17e94e1d31e146c8b76de4657c21020aabc72dc53b53941c9f5fe2c27416559283 languageName: node linkType: hard -"@lerna/project@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/project@npm:5.4.3" +"@isaacs/cliui@npm:^8.0.2": + version: 8.0.2 + resolution: "@isaacs/cliui@npm:8.0.2" dependencies: - "@lerna/package": "npm:5.4.3" - "@lerna/validation-error": "npm:5.4.3" - cosmiconfig: "npm:^7.0.0" - dedent: "npm:^0.7.0" - dot-prop: "npm:^6.0.1" - glob-parent: "npm:^5.1.1" - globby: "npm:^11.0.2" - load-json-file: "npm:^6.2.0" - npmlog: "npm:^6.0.2" - p-map: "npm:^4.0.0" - resolve-from: "npm:^5.0.0" - write-json-file: "npm:^4.3.0" - checksum: 10/85f7aba0ec8ce3b2ce8b0aa4d9714b637c6b637e3717128226c15968eea5f4d28ef0a8d67f9187a8b7b4886cfd786467ebc8e1a17dd88925d0b252ce6e291c39 + string-width: "npm:^5.1.2" + string-width-cjs: "npm:string-width@^4.2.0" + strip-ansi: "npm:^7.0.1" + strip-ansi-cjs: "npm:strip-ansi@^6.0.1" + wrap-ansi: "npm:^8.1.0" + wrap-ansi-cjs: "npm:wrap-ansi@^7.0.0" + checksum: 10/e9ed5fd27c3aec1095e3a16e0c0cf148d1fee55a38665c35f7b3f86a9b5d00d042ddaabc98e8a1cb7463b9378c15f22a94eb35e99469c201453eb8375191f243 languageName: node linkType: hard -"@lerna/prompt@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/prompt@npm:5.4.3" - dependencies: - inquirer: "npm:^8.2.4" - npmlog: "npm:^6.0.2" - checksum: 10/b2ad5aa911ae16ce846c822a42f674629bc3e4dbff73ded0c5bcd4328196fadfb5398c05d8374e6c2bdbd898b301e3ece9a1bb4df9bd1f95cdf9f18306dcb498 - languageName: node - linkType: hard - -"@lerna/publish@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/publish@npm:5.4.3" - dependencies: - "@lerna/check-working-tree": "npm:5.4.3" - "@lerna/child-process": "npm:5.4.3" - "@lerna/collect-updates": "npm:5.4.3" - "@lerna/command": "npm:5.4.3" - "@lerna/describe-ref": "npm:5.4.3" - "@lerna/log-packed": "npm:5.4.3" - "@lerna/npm-conf": "npm:5.4.3" - "@lerna/npm-dist-tag": "npm:5.4.3" - "@lerna/npm-publish": "npm:5.4.3" - "@lerna/otplease": "npm:5.4.3" - "@lerna/output": "npm:5.4.3" - "@lerna/pack-directory": "npm:5.4.3" - "@lerna/prerelease-id-from-version": "npm:5.4.3" - "@lerna/prompt": "npm:5.4.3" - "@lerna/pulse-till-done": "npm:5.4.3" - "@lerna/run-lifecycle": "npm:5.4.3" - "@lerna/run-topologically": "npm:5.4.3" - "@lerna/validation-error": "npm:5.4.3" - "@lerna/version": "npm:5.4.3" - fs-extra: "npm:^9.1.0" - libnpmaccess: "npm:^6.0.3" - npm-package-arg: "npm:8.1.1" - npm-registry-fetch: "npm:^13.3.0" - npmlog: "npm:^6.0.2" - p-map: "npm:^4.0.0" - p-pipe: "npm:^3.1.0" - pacote: "npm:^13.6.1" - semver: "npm:^7.3.4" - checksum: 10/3cbce1c84fb764f50eed0a9e8e3c4a201d07641ad7f7ea852b218dd5a134892f85a3797a937e625316f65151987ef458b1eabd6f73229d3fd15fbc11aa4ab1e5 +"@isaacs/string-locale-compare@npm:^1.1.0": + version: 1.1.0 + resolution: "@isaacs/string-locale-compare@npm:1.1.0" + checksum: 10/85682b14602f32023e487f62bc4076fe13cd3e887df9cca36acc0d41ea99b403100d586acb9367331526f3ee737d802ecaa582f59020998d75991e62a7ef0db5 languageName: node linkType: hard -"@lerna/pulse-till-done@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/pulse-till-done@npm:5.4.3" - dependencies: - npmlog: "npm:^6.0.2" - checksum: 10/626298098da39e2caf0114dcc61cfbb681f76b72f46adaeccfc63e9950abf9ecfdbc29d1120f442d999b922f035d3b3a75ef3d94473aafb158d4ab75930df9cc +"@istanbuljs/schema@npm:^0.1.2": + version: 0.1.3 + resolution: "@istanbuljs/schema@npm:0.1.3" + checksum: 10/a9b1e49acdf5efc2f5b2359f2df7f90c5c725f2656f16099e8b2cd3a000619ecca9fc48cf693ba789cf0fd989f6e0df6a22bc05574be4223ecdbb7997d04384b languageName: node linkType: hard -"@lerna/query-graph@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/query-graph@npm:5.4.3" +"@jest/schemas@npm:^28.1.3": + version: 28.1.3 + resolution: "@jest/schemas@npm:28.1.3" dependencies: - "@lerna/package-graph": "npm:5.4.3" - checksum: 10/569645cbc6beb8b8518a0300c459ca26581f8b1197796365e71ddc57c799ce333e6cfc4d6eb992c4a1b976a262066e9b09a10433cb58666e02b89041722e7494 + "@sinclair/typebox": "npm:^0.24.1" + checksum: 10/3cf1d4b66c9c4ffda58b246de1ddcba8e6ad085af63dccdf07922511f13b68c0cc480a7bc620cb4f3099a6f134801c747e1df7bfc7a4ef4dceefbdea3e31e1de languageName: node linkType: hard -"@lerna/resolve-symlink@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/resolve-symlink@npm:5.4.3" +"@jest/schemas@npm:^29.6.3": + version: 29.6.3 + resolution: "@jest/schemas@npm:29.6.3" dependencies: - fs-extra: "npm:^9.1.0" - npmlog: "npm:^6.0.2" - read-cmd-shim: "npm:^3.0.0" - checksum: 10/8af902b373caee9477bd19ee679898ca2a0eb06bf962aa04e813f7fdb482984373032e413ef1ca02a7c9d993464e892a9f18ebbad0f7d012ce0bc4c859cefca7 + "@sinclair/typebox": "npm:^0.27.8" + checksum: 10/910040425f0fc93cd13e68c750b7885590b8839066dfa0cd78e7def07bbb708ad869381f725945d66f2284de5663bbecf63e8fdd856e2ae6e261ba30b1687e93 languageName: node linkType: hard -"@lerna/rimraf-dir@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/rimraf-dir@npm:5.4.3" +"@jest/types@npm:^28.1.1": + version: 28.1.3 + resolution: "@jest/types@npm:28.1.3" dependencies: - "@lerna/child-process": "npm:5.4.3" - npmlog: "npm:^6.0.2" - path-exists: "npm:^4.0.0" - rimraf: "npm:^3.0.2" - checksum: 10/fbb6c20a3c1164b09c410cc09f79abe69f3d5fc59a6f50fcffbb188c839ab063a2cd1a0cd24f541b30eb61733ce194ddde494ae338318c798d3b0a246fae4844 + "@jest/schemas": "npm:^28.1.3" + "@types/istanbul-lib-coverage": "npm:^2.0.0" + "@types/istanbul-reports": "npm:^3.0.0" + "@types/node": "npm:*" + "@types/yargs": "npm:^17.0.8" + chalk: "npm:^4.0.0" + checksum: 10/a90e636df760799b6c3d91e34e539e701ea803e80312257e674e345a3c23a7c892df7a301afbc7883ec1d623daf3ba266cde57c5965e0692e5f1e61915d3524b languageName: node linkType: hard -"@lerna/run-lifecycle@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/run-lifecycle@npm:5.4.3" +"@jridgewell/gen-mapping@npm:^0.3.5": + version: 0.3.5 + resolution: "@jridgewell/gen-mapping@npm:0.3.5" dependencies: - "@lerna/npm-conf": "npm:5.4.3" - "@npmcli/run-script": "npm:^4.1.7" - npmlog: "npm:^6.0.2" - p-queue: "npm:^6.6.2" - checksum: 10/e5432932e246c1b9eed22b89ca8fa94c78cfb70a24c95bbe23e4155b5ac76ba674b34e22fbb7ffa4fbfe117f2f480cd1014e938ae9ad06b72f2103f349741c1e + "@jridgewell/set-array": "npm:^1.2.1" + "@jridgewell/sourcemap-codec": "npm:^1.4.10" + "@jridgewell/trace-mapping": "npm:^0.3.24" + checksum: 10/81587b3c4dd8e6c60252122937cea0c637486311f4ed208b52b62aae2e7a87598f63ec330e6cd0984af494bfb16d3f0d60d3b21d7e5b4aedd2602ff3fe9d32e2 languageName: node linkType: hard -"@lerna/run-topologically@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/run-topologically@npm:5.4.3" - dependencies: - "@lerna/query-graph": "npm:5.4.3" - p-queue: "npm:^6.6.2" - checksum: 10/ff22f41fe243a8c739275011c33e004d8dd9cbbff54250028da88e1ca0b71a0aaf0c8c07a94a54e950722c934a808ebedd3cd66f354e233fa803b14dc53ad496 +"@jridgewell/resolve-uri@npm:^3.0.3": + version: 3.0.5 + resolution: "@jridgewell/resolve-uri@npm:3.0.5" + checksum: 10/66da0c14dfaebd3481ac363306eefa45aca6779f8635df7337b97c18873853a7e2946d79104fad3e2ab832fe438ebabcaa2091e55e069a81b35001fa6738f532 languageName: node linkType: hard -"@lerna/run@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/run@npm:5.4.3" - dependencies: - "@lerna/command": "npm:5.4.3" - "@lerna/filter-options": "npm:5.4.3" - "@lerna/npm-run-script": "npm:5.4.3" - "@lerna/output": "npm:5.4.3" - "@lerna/profiler": "npm:5.4.3" - "@lerna/run-topologically": "npm:5.4.3" - "@lerna/timer": "npm:5.4.3" - "@lerna/validation-error": "npm:5.4.3" - p-map: "npm:^4.0.0" - checksum: 10/52110c30ada809ef73d143ae93acf3c0894089d4b0e6b6a6de822eb5df6e405fac6ed11d29c72c7b508546b78f7a91b6f6221aab81b977feb9d3ec3a5e175aaa +"@jridgewell/resolve-uri@npm:^3.1.0": + version: 3.1.2 + resolution: "@jridgewell/resolve-uri@npm:3.1.2" + checksum: 10/97106439d750a409c22c8bff822d648f6a71f3aa9bc8e5129efdc36343cd3096ddc4eeb1c62d2fe48e9bdd4db37b05d4646a17114ecebd3bbcacfa2de51c3c1d languageName: node linkType: hard -"@lerna/symlink-binary@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/symlink-binary@npm:5.4.3" - dependencies: - "@lerna/create-symlink": "npm:5.4.3" - "@lerna/package": "npm:5.4.3" - fs-extra: "npm:^9.1.0" - p-map: "npm:^4.0.0" - checksum: 10/c4748435ef68a885478d3fcee5ee65517220642ec06195990fce7aa7ddd926200188762b90f04c26a48f6e5555c56b24ebbd5faba1cf9a2de0466ac002486b3f +"@jridgewell/set-array@npm:^1.2.1": + version: 1.2.1 + resolution: "@jridgewell/set-array@npm:1.2.1" + checksum: 10/832e513a85a588f8ed4f27d1279420d8547743cc37fcad5a5a76fc74bb895b013dfe614d0eed9cb860048e6546b798f8f2652020b4b2ba0561b05caa8c654b10 languageName: node linkType: hard -"@lerna/symlink-dependencies@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/symlink-dependencies@npm:5.4.3" - dependencies: - "@lerna/create-symlink": "npm:5.4.3" - "@lerna/resolve-symlink": "npm:5.4.3" - "@lerna/symlink-binary": "npm:5.4.3" - fs-extra: "npm:^9.1.0" - p-map: "npm:^4.0.0" - p-map-series: "npm:^2.1.0" - checksum: 10/a9732b7d4e01604ee74dfb542b29d4e070241d7442244956de554a044afcdd873ed8074b2551fcad0445055229a919bc94fa4a10a16cd71d2426d5f2e00b40af +"@jridgewell/sourcemap-codec@npm:^1.4.10": + version: 1.4.11 + resolution: "@jridgewell/sourcemap-codec@npm:1.4.11" + checksum: 10/591ca7f7884a51643e713b1b623c6c7d751bdc78d61b6cda1dcf7de1287e7f0530514c3f2c7d443273ddc8687637a95cd19f5d8986b32e2349d0f7310623df40 languageName: node linkType: hard -"@lerna/temp-write@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/temp-write@npm:5.4.3" - dependencies: - graceful-fs: "npm:^4.1.15" - is-stream: "npm:^2.0.0" - make-dir: "npm:^3.0.0" - temp-dir: "npm:^1.0.0" - uuid: "npm:^8.3.2" - checksum: 10/83c933565e1f4ece0c006537906e7ae491adc02ed8bdf812a5995d333434efe5af01f7dff332cd68f85846abc1ce0b5349f596a0d4f4255f2aa3ac74d6ea37b8 +"@jridgewell/sourcemap-codec@npm:^1.4.14, @jridgewell/sourcemap-codec@npm:^1.5.0": + version: 1.5.0 + resolution: "@jridgewell/sourcemap-codec@npm:1.5.0" + checksum: 10/4ed6123217569a1484419ac53f6ea0d9f3b57e5b57ab30d7c267bdb27792a27eb0e4b08e84a2680aa55cc2f2b411ffd6ec3db01c44fdc6dc43aca4b55f8374fd languageName: node linkType: hard -"@lerna/timer@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/timer@npm:5.4.3" - checksum: 10/bf8c42d8ca5a34885d554e0f62746e942937b7749e04a37474effe69802a2e3322e286457746178727a5f3482f84af2b12ddbeef53af065edddbf04f4e07f2ac +"@jridgewell/trace-mapping@npm:0.3.9": + version: 0.3.9 + resolution: "@jridgewell/trace-mapping@npm:0.3.9" + dependencies: + "@jridgewell/resolve-uri": "npm:^3.0.3" + "@jridgewell/sourcemap-codec": "npm:^1.4.10" + checksum: 10/83deafb8e7a5ca98993c2c6eeaa93c270f6f647a4c0dc00deb38c9cf9b2d3b7bf15e8839540155247ef034a052c0ec4466f980bf0c9e2ab63b97d16c0cedd3ff languageName: node linkType: hard -"@lerna/validation-error@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/validation-error@npm:5.4.3" +"@jridgewell/trace-mapping@npm:^0.3.23, @jridgewell/trace-mapping@npm:^0.3.24": + version: 0.3.25 + resolution: "@jridgewell/trace-mapping@npm:0.3.25" dependencies: - npmlog: "npm:^6.0.2" - checksum: 10/7173637d7ea33fa7ecd951444394ded0b8bfef59c8226ae40c72c0da1e6d41c91a45f511fffaad03b3c69d30ab9adbc7f3900530a1f1142d189a02869df154d3 + "@jridgewell/resolve-uri": "npm:^3.1.0" + "@jridgewell/sourcemap-codec": "npm:^1.4.14" + checksum: 10/dced32160a44b49d531b80a4a2159dceab6b3ddf0c8e95a0deae4b0e894b172defa63d5ac52a19c2068e1fe7d31ea4ba931fbeec103233ecb4208953967120fc languageName: node linkType: hard -"@lerna/version@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/version@npm:5.4.3" +"@lerna/create@npm:8.1.8": + version: 8.1.8 + resolution: "@lerna/create@npm:8.1.8" dependencies: - "@lerna/check-working-tree": "npm:5.4.3" - "@lerna/child-process": "npm:5.4.3" - "@lerna/collect-updates": "npm:5.4.3" - "@lerna/command": "npm:5.4.3" - "@lerna/conventional-commits": "npm:5.4.3" - "@lerna/github-client": "npm:5.4.3" - "@lerna/gitlab-client": "npm:5.4.3" - "@lerna/output": "npm:5.4.3" - "@lerna/prerelease-id-from-version": "npm:5.4.3" - "@lerna/prompt": "npm:5.4.3" - "@lerna/run-lifecycle": "npm:5.4.3" - "@lerna/run-topologically": "npm:5.4.3" - "@lerna/temp-write": "npm:5.4.3" - "@lerna/validation-error": "npm:5.4.3" - chalk: "npm:^4.1.0" - dedent: "npm:^0.7.0" - load-json-file: "npm:^6.2.0" - minimatch: "npm:^3.0.4" - npmlog: "npm:^6.0.2" - p-map: "npm:^4.0.0" - p-pipe: "npm:^3.1.0" + "@npmcli/arborist": "npm:7.5.4" + "@npmcli/package-json": "npm:5.2.0" + "@npmcli/run-script": "npm:8.1.0" + "@nx/devkit": "npm:>=17.1.2 < 20" + "@octokit/plugin-enterprise-rest": "npm:6.0.1" + "@octokit/rest": "npm:19.0.11" + aproba: "npm:2.0.0" + byte-size: "npm:8.1.1" + chalk: "npm:4.1.0" + clone-deep: "npm:4.0.1" + cmd-shim: "npm:6.0.3" + color-support: "npm:1.1.3" + columnify: "npm:1.6.0" + console-control-strings: "npm:^1.1.0" + conventional-changelog-core: "npm:5.0.1" + conventional-recommended-bump: "npm:7.0.1" + cosmiconfig: "npm:^8.2.0" + dedent: "npm:1.5.3" + execa: "npm:5.0.0" + fs-extra: "npm:^11.2.0" + get-stream: "npm:6.0.0" + git-url-parse: "npm:14.0.0" + glob-parent: "npm:6.0.2" + globby: "npm:11.1.0" + graceful-fs: "npm:4.2.11" + has-unicode: "npm:2.0.1" + ini: "npm:^1.3.8" + init-package-json: "npm:6.0.3" + inquirer: "npm:^8.2.4" + is-ci: "npm:3.0.1" + is-stream: "npm:2.0.0" + js-yaml: "npm:4.1.0" + libnpmpublish: "npm:9.0.9" + load-json-file: "npm:6.2.0" + lodash: "npm:^4.17.21" + make-dir: "npm:4.0.0" + minimatch: "npm:3.0.5" + multimatch: "npm:5.0.0" + node-fetch: "npm:2.6.7" + npm-package-arg: "npm:11.0.2" + npm-packlist: "npm:8.0.2" + npm-registry-fetch: "npm:^17.1.0" + nx: "npm:>=17.1.2 < 20" + p-map: "npm:4.0.0" + p-map-series: "npm:2.1.0" + p-queue: "npm:6.6.2" p-reduce: "npm:^2.1.0" - p-waterfall: "npm:^2.1.1" + pacote: "npm:^18.0.6" + pify: "npm:5.0.0" + read-cmd-shim: "npm:4.0.0" + resolve-from: "npm:5.0.0" + rimraf: "npm:^4.4.1" semver: "npm:^7.3.4" + set-blocking: "npm:^2.0.0" + signal-exit: "npm:3.0.7" slash: "npm:^3.0.0" - write-json-file: "npm:^4.3.0" - checksum: 10/15a80f354b9d3f4f9ed68224a9b9ae7bb9e4b2147b11e495d31cd48194391d80dbe3f17d0928a26f79c263690c2cbbd72f175d432a6ca5829122de2d30b2f0b9 - languageName: node - linkType: hard - -"@lerna/write-log-file@npm:5.4.3": - version: 5.4.3 - resolution: "@lerna/write-log-file@npm:5.4.3" - dependencies: - npmlog: "npm:^6.0.2" - write-file-atomic: "npm:^4.0.1" - checksum: 10/6514a430e9339c16c61297faed58eb2fc6a2686cccc243b8e2f069477a577db579aa7a976dadb8fca2c0e15c2f0663c1212965a6ab5e12b21f7f5e9014a51ab6 + ssri: "npm:^10.0.6" + string-width: "npm:^4.2.3" + strip-ansi: "npm:^6.0.1" + strong-log-transformer: "npm:2.1.0" + tar: "npm:6.2.1" + temp-dir: "npm:1.0.0" + upath: "npm:2.0.1" + uuid: "npm:^10.0.0" + validate-npm-package-license: "npm:^3.0.4" + validate-npm-package-name: "npm:5.0.1" + wide-align: "npm:1.1.5" + write-file-atomic: "npm:5.0.1" + write-pkg: "npm:4.0.0" + yargs: "npm:17.7.2" + yargs-parser: "npm:21.1.1" + checksum: 10/810df5d35303882f84585be5360b248cec2d339df90bd594231ef2276cc5d2f633b264ae3221b0d2fa0611eeca86ae00cf8c184f79a1fab46ab0663a039a010b languageName: node linkType: hard @@ -2170,6 +837,17 @@ __metadata: languageName: node linkType: hard +"@napi-rs/wasm-runtime@npm:0.2.4": + version: 0.2.4 + resolution: "@napi-rs/wasm-runtime@npm:0.2.4" + dependencies: + "@emnapi/core": "npm:^1.1.0" + "@emnapi/runtime": "npm:^1.1.0" + "@tybys/wasm-util": "npm:^0.9.0" + checksum: 10/af335867eca9696b0dbb1b8439878e0408a853c42419cd71d2c5dcf9f7c9f6a8549ea88b3a31b9544bb3a9376e5742f3268e58ee066925d3726bd76a121eb8a6 + languageName: node + linkType: hard + "@nodelib/fs.scandir@npm:2.1.5": version: 2.1.5 resolution: "@nodelib/fs.scandir@npm:2.1.5" @@ -2194,7 +872,7 @@ __metadata: languageName: node linkType: hard -"@nodelib/fs.walk@npm:^1.2.3": +"@nodelib/fs.walk@npm:^1.2.3, @nodelib/fs.walk@npm:^1.2.8": version: 1.2.8 resolution: "@nodelib/fs.walk@npm:1.2.8" dependencies: @@ -2217,47 +895,48 @@ __metadata: languageName: node linkType: hard -"@npmcli/arborist@npm:5.3.0": - version: 5.3.0 - resolution: "@npmcli/arborist@npm:5.3.0" +"@npmcli/arborist@npm:7.5.4": + version: 7.5.4 + resolution: "@npmcli/arborist@npm:7.5.4" dependencies: "@isaacs/string-locale-compare": "npm:^1.1.0" - "@npmcli/installed-package-contents": "npm:^1.0.7" - "@npmcli/map-workspaces": "npm:^2.0.3" - "@npmcli/metavuln-calculator": "npm:^3.0.1" - "@npmcli/move-file": "npm:^2.0.0" - "@npmcli/name-from-folder": "npm:^1.0.1" - "@npmcli/node-gyp": "npm:^2.0.0" - "@npmcli/package-json": "npm:^2.0.0" - "@npmcli/run-script": "npm:^4.1.3" - bin-links: "npm:^3.0.0" - cacache: "npm:^16.0.6" + "@npmcli/fs": "npm:^3.1.1" + "@npmcli/installed-package-contents": "npm:^2.1.0" + "@npmcli/map-workspaces": "npm:^3.0.2" + "@npmcli/metavuln-calculator": "npm:^7.1.1" + "@npmcli/name-from-folder": "npm:^2.0.0" + "@npmcli/node-gyp": "npm:^3.0.0" + "@npmcli/package-json": "npm:^5.1.0" + "@npmcli/query": "npm:^3.1.0" + "@npmcli/redact": "npm:^2.0.0" + "@npmcli/run-script": "npm:^8.1.0" + bin-links: "npm:^4.0.4" + cacache: "npm:^18.0.3" common-ancestor-path: "npm:^1.0.1" - json-parse-even-better-errors: "npm:^2.3.1" + hosted-git-info: "npm:^7.0.2" + json-parse-even-better-errors: "npm:^3.0.2" json-stringify-nice: "npm:^1.1.4" - mkdirp: "npm:^1.0.4" - mkdirp-infer-owner: "npm:^2.0.0" - nopt: "npm:^5.0.0" - npm-install-checks: "npm:^5.0.0" - npm-package-arg: "npm:^9.0.0" - npm-pick-manifest: "npm:^7.0.0" - npm-registry-fetch: "npm:^13.0.0" - npmlog: "npm:^6.0.2" - pacote: "npm:^13.6.1" - parse-conflict-json: "npm:^2.0.1" - proc-log: "npm:^2.0.0" + lru-cache: "npm:^10.2.2" + minimatch: "npm:^9.0.4" + nopt: "npm:^7.2.1" + npm-install-checks: "npm:^6.2.0" + npm-package-arg: "npm:^11.0.2" + npm-pick-manifest: "npm:^9.0.1" + npm-registry-fetch: "npm:^17.0.1" + pacote: "npm:^18.0.6" + parse-conflict-json: "npm:^3.0.0" + proc-log: "npm:^4.2.0" + proggy: "npm:^2.0.0" promise-all-reject-late: "npm:^1.0.0" - promise-call-limit: "npm:^1.0.1" - read-package-json-fast: "npm:^2.0.2" - readdir-scoped-modules: "npm:^1.1.0" - rimraf: "npm:^3.0.2" + promise-call-limit: "npm:^3.0.1" + read-package-json-fast: "npm:^3.0.2" semver: "npm:^7.3.7" - ssri: "npm:^9.0.0" - treeverse: "npm:^2.0.0" - walk-up-path: "npm:^1.0.0" + ssri: "npm:^10.0.6" + treeverse: "npm:^3.0.0" + walk-up-path: "npm:^3.0.1" bin: arborist: bin/index.js - checksum: 10/5dafa0f197554da6505cd9cb58458c61c2433e35117ba8eea4e8629680b8b79c31caa3681f55de820432ec6064f91e2987967a91cff3929ce42692b069b16346 + checksum: 10/b77170754f419171e5ca2abfb679a9c811443e2b67036916a62eda81fd069f12c98186941cd73a0d36c2ec76cda638b43ceeb4c5fae39de1bb9df825432f3ef7 languageName: node linkType: hard @@ -2348,20 +1027,12 @@ __metadata: languageName: node linkType: hard -"@npmcli/git@npm:^3.0.0": - version: 3.0.2 - resolution: "@npmcli/git@npm:3.0.2" +"@npmcli/fs@npm:^3.1.1": + version: 3.1.1 + resolution: "@npmcli/fs@npm:3.1.1" dependencies: - "@npmcli/promise-spawn": "npm:^3.0.0" - lru-cache: "npm:^7.4.4" - mkdirp: "npm:^1.0.4" - npm-pick-manifest: "npm:^7.0.0" - proc-log: "npm:^2.0.0" - promise-inflight: "npm:^1.0.1" - promise-retry: "npm:^2.0.1" semver: "npm:^7.3.5" - which: "npm:^2.0.2" - checksum: 10/c2c4af8ec3044b5452f2c522d78e2b87be44427951fca0a8506d73fa93c799443ab262060d36f0ecbd6fe721162ad6b7e1370c22719b20dd98ffad0b3a57c890 + checksum: 10/1e0e04087049b24b38bc0b30d87a9388ee3ca1d3fdfc347c2f77d84fcfe6a51f250bc57ba2c1f614d7e4285c6c62bf8c769bc19aa0949ea39e5b043ee023b0bd languageName: node linkType: hard @@ -2381,18 +1052,6 @@ __metadata: languageName: node linkType: hard -"@npmcli/installed-package-contents@npm:^1.0.7": - version: 1.0.7 - resolution: "@npmcli/installed-package-contents@npm:1.0.7" - dependencies: - npm-bundled: "npm:^1.1.1" - npm-normalize-package-bin: "npm:^1.0.1" - bin: - installed-package-contents: index.js - checksum: 10/dec95d385dd7149c54e005941aed689fb9a90a1eb3f88caefddd1498a0b631218c4d9bb482f0e8286fef3c69ef85c93e026d61691de8e908f9f1a52a98248f45 - languageName: node - linkType: hard - "@npmcli/installed-package-contents@npm:^2.0.1, @npmcli/installed-package-contents@npm:^2.0.2": version: 2.0.2 resolution: "@npmcli/installed-package-contents@npm:2.0.2" @@ -2405,15 +1064,15 @@ __metadata: languageName: node linkType: hard -"@npmcli/map-workspaces@npm:^2.0.3": - version: 2.0.4 - resolution: "@npmcli/map-workspaces@npm:2.0.4" +"@npmcli/installed-package-contents@npm:^2.1.0": + version: 2.1.0 + resolution: "@npmcli/installed-package-contents@npm:2.1.0" dependencies: - "@npmcli/name-from-folder": "npm:^1.0.1" - glob: "npm:^8.0.1" - minimatch: "npm:^5.0.1" - read-package-json-fast: "npm:^2.0.3" - checksum: 10/424f7cb6932d0d5cc60348e17f7c16cd3266173e161613aa16f91c32c508530642207084da8acf7f1c3a27c90218cd082076688b7c312350c6e3c0b84ea30944 + npm-bundled: "npm:^3.0.0" + npm-normalize-package-bin: "npm:^3.0.0" + bin: + installed-package-contents: bin/index.js + checksum: 10/68ab3ea2994f5ea21c61940de94ec4f2755fe569ef0b86e22db0695d651a3c88915c5eab61d634cfa203b9c801ee307c8aa134c2c4bd2e4fe1aa8d295ce8a163 languageName: node linkType: hard @@ -2429,18 +1088,6 @@ __metadata: languageName: node linkType: hard -"@npmcli/metavuln-calculator@npm:^3.0.1": - version: 3.1.1 - resolution: "@npmcli/metavuln-calculator@npm:3.1.1" - dependencies: - cacache: "npm:^16.0.0" - json-parse-even-better-errors: "npm:^2.3.1" - pacote: "npm:^13.0.3" - semver: "npm:^7.3.5" - checksum: 10/934424123c345627e8718d802f0b399abbad56512f63c758b5ce5a9a5636bf7b329d20b021ec87d900352dd6f5a8da09108a2f66d88761a10e91667ce1a9141a - languageName: node - linkType: hard - "@npmcli/metavuln-calculator@npm:^7.0.0": version: 7.0.0 resolution: "@npmcli/metavuln-calculator@npm:7.0.0" @@ -2453,6 +1100,19 @@ __metadata: languageName: node linkType: hard +"@npmcli/metavuln-calculator@npm:^7.1.1": + version: 7.1.1 + resolution: "@npmcli/metavuln-calculator@npm:7.1.1" + dependencies: + cacache: "npm:^18.0.0" + json-parse-even-better-errors: "npm:^3.0.0" + pacote: "npm:^18.0.0" + proc-log: "npm:^4.1.0" + semver: "npm:^7.3.5" + checksum: 10/57163b4bde4af3f5badb0c9b0c868f9539e2a112ee73c606680b7548b148bf58e793952d74eb1e581c9cc2e630bc03bc60adc04b3f1e7960482f97af817f28d2 + languageName: node + linkType: hard + "@npmcli/move-file@npm:^2.0.0": version: 2.0.0 resolution: "@npmcli/move-file@npm:2.0.0" @@ -2463,13 +1123,6 @@ __metadata: languageName: node linkType: hard -"@npmcli/name-from-folder@npm:^1.0.1": - version: 1.0.1 - resolution: "@npmcli/name-from-folder@npm:1.0.1" - checksum: 10/f38abf56e754f7a8b679e8302f26cb7d37b136dd0336e08078c801b50e2176bf94ad3cc8aae843cb6fe37f7b55ef84919bfc44fb7f24779deb775cba753b59e0 - languageName: node - linkType: hard - "@npmcli/name-from-folder@npm:^2.0.0": version: 2.0.0 resolution: "@npmcli/name-from-folder@npm:2.0.0" @@ -2484,13 +1137,6 @@ __metadata: languageName: node linkType: hard -"@npmcli/node-gyp@npm:^2.0.0": - version: 2.0.0 - resolution: "@npmcli/node-gyp@npm:2.0.0" - checksum: 10/c8abcb345e3206237fde4cfd8e5991a66cab5fd41c564ff42a45edfb492773db8647f546841da455f66cb4cc22c8dbdcbf2920cbc1ca8044f4581404c59b6832 - languageName: node - linkType: hard - "@npmcli/node-gyp@npm:^3.0.0": version: 3.0.0 resolution: "@npmcli/node-gyp@npm:3.0.0" @@ -2498,12 +1144,18 @@ __metadata: languageName: node linkType: hard -"@npmcli/package-json@npm:^2.0.0": - version: 2.0.0 - resolution: "@npmcli/package-json@npm:2.0.0" +"@npmcli/package-json@npm:5.2.0, @npmcli/package-json@npm:^5.1.0": + version: 5.2.0 + resolution: "@npmcli/package-json@npm:5.2.0" dependencies: - json-parse-even-better-errors: "npm:^2.3.1" - checksum: 10/9fbff70603b8bdc40fda2675271bce4237fab48c51e58f8704218c9e2f291be454c13b5f37c8d325e23c4736b372cd6ecf34819fe2ced124ac06740fae8dd378 + "@npmcli/git": "npm:^5.0.0" + glob: "npm:^10.2.2" + hosted-git-info: "npm:^7.0.0" + json-parse-even-better-errors: "npm:^3.0.0" + normalize-package-data: "npm:^6.0.0" + proc-log: "npm:^4.0.0" + semver: "npm:^7.5.3" + checksum: 10/c3d2218877bfc005bca3b7a11f53825bf16a68811b8e8ed0c9b219cceb8e8e646d70efab8c5d6decbd8007f286076468b3f456dab4d41d648aff73a5f3a6fce2 languageName: node linkType: hard @@ -2531,15 +1183,6 @@ __metadata: languageName: node linkType: hard -"@npmcli/promise-spawn@npm:^3.0.0": - version: 3.0.0 - resolution: "@npmcli/promise-spawn@npm:3.0.0" - dependencies: - infer-owner: "npm:^1.0.4" - checksum: 10/3454465a2731cea5875ba51f80873e2205e5bd878c31517286b0ede4ea931c7bf3de895382287e906d03710fff6f9e44186bd0eee068ce578901c5d3b58e7692 - languageName: node - linkType: hard - "@npmcli/promise-spawn@npm:^7.0.0, @npmcli/promise-spawn@npm:^7.0.1": version: 7.0.1 resolution: "@npmcli/promise-spawn@npm:7.0.1" @@ -2558,6 +1201,13 @@ __metadata: languageName: node linkType: hard +"@npmcli/redact@npm:^2.0.0": + version: 2.0.1 + resolution: "@npmcli/redact@npm:2.0.1" + checksum: 10/f19a521fa71b539707eee69106ed3d97e3047712d4f279c80007a8d0aef63d137e3062941f11e19d6cec03812eaa0872891ae20c84f603d9e021dfb93cc9d6e5 + languageName: node + linkType: hard + "@npmcli/run-script@npm:3.0.1": version: 3.0.1 resolution: "@npmcli/run-script@npm:3.0.1" @@ -2570,16 +1220,17 @@ __metadata: languageName: node linkType: hard -"@npmcli/run-script@npm:^4.1.0, @npmcli/run-script@npm:^4.1.3, @npmcli/run-script@npm:^4.1.7": - version: 4.2.1 - resolution: "@npmcli/run-script@npm:4.2.1" +"@npmcli/run-script@npm:8.1.0, @npmcli/run-script@npm:^8.0.0, @npmcli/run-script@npm:^8.1.0": + version: 8.1.0 + resolution: "@npmcli/run-script@npm:8.1.0" dependencies: - "@npmcli/node-gyp": "npm:^2.0.0" - "@npmcli/promise-spawn": "npm:^3.0.0" - node-gyp: "npm:^9.0.0" - read-package-json-fast: "npm:^2.0.3" - which: "npm:^2.0.2" - checksum: 10/4e77ef95378a2944ab48ea7adb830791248b2a1992a733443266bc99174b63418870e38ed034a33e007b7b7d622108eafb19ac940ce01c7bfb5531ab1df98238 + "@npmcli/node-gyp": "npm:^3.0.0" + "@npmcli/package-json": "npm:^5.0.0" + "@npmcli/promise-spawn": "npm:^7.0.0" + node-gyp: "npm:^10.0.0" + proc-log: "npm:^4.0.0" + which: "npm:^4.0.0" + checksum: 10/256bd580f82b98db93e54065bf9bcc94946be4f2d668a062cf756cb8ea091f58ef7154b3d2450d79738081a150f25cc48f6075351911e672f24ffd34350f02f2 languageName: node linkType: hard @@ -2596,89 +1247,116 @@ __metadata: languageName: node linkType: hard -"@nrwl/cli@npm:15.9.7": - version: 15.9.7 - resolution: "@nrwl/cli@npm:15.9.7" +"@nrwl/devkit@npm:19.7.3": + version: 19.7.3 + resolution: "@nrwl/devkit@npm:19.7.3" + dependencies: + "@nx/devkit": "npm:19.7.3" + checksum: 10/18332a1025ac22268d1c165999e3ebcb8577acd96c05b17dab988dbfe06881e13d17ddea5c41901c98b818de4a6c7a469002ac6aa1ccae20bcb86650fdbfe2e0 + languageName: node + linkType: hard + +"@nrwl/tao@npm:19.7.3": + version: 19.7.3 + resolution: "@nrwl/tao@npm:19.7.3" + dependencies: + nx: "npm:19.7.3" + tslib: "npm:^2.3.0" + bin: + tao: index.js + checksum: 10/abc86975f70ad7f704fd1552b01154742b38678e4421aaa6ae1f0aba5f174a696052afac68aa6dddb028815812a2b3b12c79d01f30c2946a74a2bea5038f8ef8 + languageName: node + linkType: hard + +"@nx/devkit@npm:19.7.3, @nx/devkit@npm:>=17.1.2 < 20": + version: 19.7.3 + resolution: "@nx/devkit@npm:19.7.3" dependencies: - nx: "npm:15.9.7" - checksum: 10/55bcd3ec4319bdcbd51184a01f5dc3c03ab2a79caa1240249f6ca11c3e33555954bfab19d9156b210bf46fea9b6d543312cd199cd1421cd9b21a84224a76dc73 + "@nrwl/devkit": "npm:19.7.3" + ejs: "npm:^3.1.7" + enquirer: "npm:~2.3.6" + ignore: "npm:^5.0.4" + minimatch: "npm:9.0.3" + semver: "npm:^7.5.3" + tmp: "npm:~0.2.1" + tslib: "npm:^2.3.0" + yargs-parser: "npm:21.1.1" + peerDependencies: + nx: ">= 17 <= 20" + checksum: 10/678e7dcd2fb5eede00a4c15736581be6006a5363f1847376c8fea97838de2d9025ca3fe39748f2f2a6bac435f92133010d0291076fdef4c1206e253ccd1c24f6 languageName: node linkType: hard -"@nrwl/nx-darwin-arm64@npm:15.9.7": - version: 15.9.7 - resolution: "@nrwl/nx-darwin-arm64@npm:15.9.7" +"@nx/nx-darwin-arm64@npm:19.7.3": + version: 19.7.3 + resolution: "@nx/nx-darwin-arm64@npm:19.7.3" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@nrwl/nx-darwin-x64@npm:15.9.7": - version: 15.9.7 - resolution: "@nrwl/nx-darwin-x64@npm:15.9.7" +"@nx/nx-darwin-x64@npm:19.7.3": + version: 19.7.3 + resolution: "@nx/nx-darwin-x64@npm:19.7.3" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@nrwl/nx-linux-arm-gnueabihf@npm:15.9.7": - version: 15.9.7 - resolution: "@nrwl/nx-linux-arm-gnueabihf@npm:15.9.7" +"@nx/nx-freebsd-x64@npm:19.7.3": + version: 19.7.3 + resolution: "@nx/nx-freebsd-x64@npm:19.7.3" + conditions: os=freebsd & cpu=x64 + languageName: node + linkType: hard + +"@nx/nx-linux-arm-gnueabihf@npm:19.7.3": + version: 19.7.3 + resolution: "@nx/nx-linux-arm-gnueabihf@npm:19.7.3" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@nrwl/nx-linux-arm64-gnu@npm:15.9.7": - version: 15.9.7 - resolution: "@nrwl/nx-linux-arm64-gnu@npm:15.9.7" +"@nx/nx-linux-arm64-gnu@npm:19.7.3": + version: 19.7.3 + resolution: "@nx/nx-linux-arm64-gnu@npm:19.7.3" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@nrwl/nx-linux-arm64-musl@npm:15.9.7": - version: 15.9.7 - resolution: "@nrwl/nx-linux-arm64-musl@npm:15.9.7" +"@nx/nx-linux-arm64-musl@npm:19.7.3": + version: 19.7.3 + resolution: "@nx/nx-linux-arm64-musl@npm:19.7.3" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@nrwl/nx-linux-x64-gnu@npm:15.9.7": - version: 15.9.7 - resolution: "@nrwl/nx-linux-x64-gnu@npm:15.9.7" +"@nx/nx-linux-x64-gnu@npm:19.7.3": + version: 19.7.3 + resolution: "@nx/nx-linux-x64-gnu@npm:19.7.3" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@nrwl/nx-linux-x64-musl@npm:15.9.7": - version: 15.9.7 - resolution: "@nrwl/nx-linux-x64-musl@npm:15.9.7" +"@nx/nx-linux-x64-musl@npm:19.7.3": + version: 19.7.3 + resolution: "@nx/nx-linux-x64-musl@npm:19.7.3" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@nrwl/nx-win32-arm64-msvc@npm:15.9.7": - version: 15.9.7 - resolution: "@nrwl/nx-win32-arm64-msvc@npm:15.9.7" +"@nx/nx-win32-arm64-msvc@npm:19.7.3": + version: 19.7.3 + resolution: "@nx/nx-win32-arm64-msvc@npm:19.7.3" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@nrwl/nx-win32-x64-msvc@npm:15.9.7": - version: 15.9.7 - resolution: "@nrwl/nx-win32-x64-msvc@npm:15.9.7" +"@nx/nx-win32-x64-msvc@npm:19.7.3": + version: 19.7.3 + resolution: "@nx/nx-win32-x64-msvc@npm:19.7.3" conditions: os=win32 & cpu=x64 languageName: node linkType: hard -"@nrwl/tao@npm:15.9.7": - version: 15.9.7 - resolution: "@nrwl/tao@npm:15.9.7" - dependencies: - nx: "npm:15.9.7" - bin: - tao: index.js - checksum: 10/8c848c72f02de776086d2ad82928e15b102b2fb943eed5943a54375f16a75f2a3d2444385ead26bf3f465139d69fd5011ca429961be3970ed8addc7187880cd1 - languageName: node - linkType: hard - "@octokit/auth-token@npm:^3.0.0": version: 3.0.1 resolution: "@octokit/auth-token@npm:3.0.1" @@ -2789,7 +1467,7 @@ __metadata: languageName: node linkType: hard -"@octokit/plugin-enterprise-rest@npm:^6.0.1": +"@octokit/plugin-enterprise-rest@npm:6.0.1": version: 6.0.1 resolution: "@octokit/plugin-enterprise-rest@npm:6.0.1" checksum: 10/2ea8aca141a0329479cfaf9425f7bc226fe6aa0064fd6e7798b565aa962a5a757a89a03e78b956909e767aa86cd28e1346bf82908dfdf614af921d175a6a95e1 @@ -2912,15 +1590,15 @@ __metadata: languageName: node linkType: hard -"@octokit/rest@npm:^19.0.3": - version: 19.0.13 - resolution: "@octokit/rest@npm:19.0.13" +"@octokit/rest@npm:19.0.11": + version: 19.0.11 + resolution: "@octokit/rest@npm:19.0.11" dependencies: "@octokit/core": "npm:^4.2.1" "@octokit/plugin-paginate-rest": "npm:^6.1.2" "@octokit/plugin-request-log": "npm:^1.0.4" "@octokit/plugin-rest-endpoint-methods": "npm:^7.1.2" - checksum: 10/7fbee09a2f832be6802a026713aa93cbf82dcfc8103d68c585b23214caf0accfced6efe2c49169158d39875d5c5ad3994b83b02e26537b75687ac16d0572c212 + checksum: 10/c9b15de6b544506c85c0297e48aa51a2aeb8f73415eef7331fc5c951c7eaa75f6fcf9d549ca5bb52a5f631553c94a70ac550ef9a3202ee765c49c04a85523d8b languageName: node linkType: hard @@ -2967,17 +1645,6 @@ __metadata: languageName: node linkType: hard -"@parcel/watcher@npm:2.0.4": - version: 2.0.4 - resolution: "@parcel/watcher@npm:2.0.4" - dependencies: - node-addon-api: "npm:^3.2.1" - node-gyp: "npm:latest" - node-gyp-build: "npm:^4.3.0" - checksum: 10/ec3ba32c16856c34460d79bc95887f68869201e0cae68c5d1d4cd1f0358673d76dea56e194ede1e83af78656bde4eef2b17716a7396b54f63a40e4655c7a63c4 - languageName: node - linkType: hard - "@pkgjs/parseargs@npm:^0.11.0": version: 0.11.0 resolution: "@pkgjs/parseargs@npm:0.11.0" @@ -2985,6 +1652,13 @@ __metadata: languageName: node linkType: hard +"@pkgr/core@npm:^0.1.0": + version: 0.1.1 + resolution: "@pkgr/core@npm:0.1.1" + checksum: 10/6f25fd2e3008f259c77207ac9915b02f1628420403b2630c92a07ff963129238c9262afc9e84344c7a23b5cc1f3965e2cd17e3798219f5fd78a63d144d3cceba + languageName: node + linkType: hard + "@pnpm/config.env-replace@npm:^1.1.0": version: 1.1.0 resolution: "@pnpm/config.env-replace@npm:1.1.0" @@ -3317,10 +1991,10 @@ __metadata: languageName: node linkType: hard -"@sinclair/typebox@npm:^0.25.16": - version: 0.25.24 - resolution: "@sinclair/typebox@npm:0.25.24" - checksum: 10/d415546153478befa3c8386a4723e3061ac065867c7e22fe0374d36091991676d231e5381e66daa0ed21639217c6c80e0d6224a9c89aaac269e58b82b2f4a2f4 +"@sinclair/typebox@npm:^0.27.8": + version: 0.27.8 + resolution: "@sinclair/typebox@npm:0.27.8" + checksum: 10/297f95ff77c82c54de8c9907f186076e715ff2621c5222ba50b8d40a170661c0c5242c763cba2a4791f0f91cb1d8ffa53ea1d7294570cf8cd4694c0e383e484d languageName: node linkType: hard @@ -3361,15 +2035,6 @@ __metadata: languageName: node linkType: hard -"@sinonjs/commons@npm:^3.0.0": - version: 3.0.0 - resolution: "@sinonjs/commons@npm:3.0.0" - dependencies: - type-detect: "npm:4.0.8" - checksum: 10/086720ae0bc370829322df32612205141cdd44e592a8a9ca97197571f8f970352ea39d3bda75b347c43789013ddab36b34b59e40380a49bdae1c2df3aa85fe4f - languageName: node - linkType: hard - "@sinonjs/fake-timers@npm:>=5, @sinonjs/fake-timers@npm:^9.1.2": version: 9.1.2 resolution: "@sinonjs/fake-timers@npm:9.1.2" @@ -3379,15 +2044,6 @@ __metadata: languageName: node linkType: hard -"@sinonjs/fake-timers@npm:^10.0.2": - version: 10.2.0 - resolution: "@sinonjs/fake-timers@npm:10.2.0" - dependencies: - "@sinonjs/commons": "npm:^3.0.0" - checksum: 10/da08032b67a090b8844b2a2be7b299da1f6f48fa0b86f74e5add9d545bb8cc23aed2ed8d0cde43fca5e486b29004e31f65cbe205fd892213d5ada0c1ce9005c1 - languageName: node - linkType: hard - "@sinonjs/samsam@npm:^6.1.1": version: 6.1.1 resolution: "@sinonjs/samsam@npm:6.1.1" @@ -3596,7 +2252,6 @@ __metadata: resolution: "@tsed/cli-core@workspace:packages/cli-core" dependencies: "@npmcli/run-script": "npm:3.0.1" - "@tsed/eslint": "npm:5.2.10" "@tsed/logger": "npm:>=6.1.1" "@tsed/normalize-path": "npm:>=7.14.2" "@tsed/typescript": "workspace:*" @@ -3625,7 +2280,6 @@ __metadata: cross-env: "npm:7.0.3" deps: "npm:^1.0.0" enquirer: "npm:2.3.6" - eslint: "npm:8.22.0" execa: "npm:5.1.1" figures: "npm:4.0.1" fs-extra: "npm:11.1.0" @@ -3662,11 +2316,9 @@ __metadata: dependencies: "@tsed/cli": "npm:5.2.10" "@tsed/cli-core": "npm:5.2.10" - "@tsed/eslint": "npm:5.2.10" "@tsed/typescript": "workspace:*" change-case: "npm:4.1.2" cross-env: "npm:7.0.3" - eslint: "npm:8.22.0" swagger-typescript-api: "npm:^9.3.1" tslib: "npm:2.3.1" typescript: "npm:4.9.5" @@ -3689,11 +2341,9 @@ __metadata: dependencies: "@tsed/cli": "npm:5.2.10" "@tsed/cli-core": "npm:5.2.10" - "@tsed/eslint": "npm:5.2.10" "@tsed/typescript": "workspace:*" change-case: "npm:4.1.2" cross-env: "npm:7.0.3" - eslint: "npm:8.22.0" tslib: "npm:2.3.1" typescript: "npm:4.9.5" vitest: "npm:2.1.1" @@ -3714,10 +2364,8 @@ __metadata: dependencies: "@tsed/cli": "npm:5.2.10" "@tsed/cli-core": "npm:5.2.10" - "@tsed/eslint": "npm:5.2.10" "@tsed/typescript": "workspace:*" cross-env: "npm:7.0.3" - eslint: "npm:8.22.0" tslib: "npm:2.3.1" typescript: "npm:4.9.5" vitest: "npm:2.1.1" @@ -3730,10 +2378,8 @@ __metadata: dependencies: "@tsed/cli": "npm:5.2.10" "@tsed/cli-core": "npm:5.2.10" - "@tsed/eslint": "npm:5.2.10" "@tsed/typescript": "workspace:*" cross-env: "npm:7.0.3" - eslint: "npm:8.22.0" tslib: "npm:2.3.1" typescript: "npm:4.9.5" vitest: "npm:2.1.1" @@ -3746,10 +2392,8 @@ __metadata: dependencies: "@tsed/cli": "npm:5.2.10" "@tsed/cli-core": "npm:5.2.10" - "@tsed/eslint": "npm:5.2.10" "@tsed/typescript": "workspace:*" cross-env: "npm:7.0.3" - eslint: "npm:8.22.0" tslib: "npm:2.3.1" typescript: "npm:4.9.5" vitest: "npm:2.1.1" @@ -3762,11 +2406,9 @@ __metadata: dependencies: "@tsed/cli": "npm:5.2.10" "@tsed/cli-core": "npm:5.2.10" - "@tsed/eslint": "npm:5.2.10" "@tsed/typescript": "workspace:*" change-case: "npm:4.1.2" cross-env: "npm:7.0.3" - eslint: "npm:8.22.0" pluralize: "npm:8.0.0" tslib: "npm:2.3.1" typescript: "npm:4.9.5" @@ -3780,10 +2422,8 @@ __metadata: dependencies: "@tsed/cli": "npm:5.2.10" "@tsed/cli-core": "npm:5.2.10" - "@tsed/eslint": "npm:5.2.10" "@tsed/typescript": "workspace:*" cross-env: "npm:7.0.3" - eslint: "npm:8.22.0" tslib: "npm:2.3.1" typescript: "npm:4.9.5" vitest: "npm:2.1.1" @@ -3799,12 +2439,10 @@ __metadata: dependencies: "@tsed/cli": "npm:5.2.10" "@tsed/cli-core": "npm:5.2.10" - "@tsed/eslint": "npm:5.2.10" "@tsed/typescript": "workspace:*" "@types/change-case": "npm:^2.3.1" change-case: "npm:^4.1.2" cross-env: "npm:7.0.3" - eslint: "npm:8.22.0" tslib: "npm:2.3.1" typescript: "npm:4.9.5" vitest: "npm:2.1.1" @@ -3817,11 +2455,9 @@ __metadata: dependencies: "@tsed/cli": "npm:5.2.10" "@tsed/cli-core": "npm:5.2.10" - "@tsed/eslint": "npm:5.2.10" "@tsed/typescript": "workspace:*" change-case: "npm:4.1.2" cross-env: "npm:7.0.3" - eslint: "npm:8.22.0" tslib: "npm:2.3.1" typescript: "npm:4.9.5" vitest: "npm:2.1.1" @@ -3834,10 +2470,8 @@ __metadata: dependencies: "@tsed/cli": "npm:5.2.10" "@tsed/cli-core": "npm:5.2.10" - "@tsed/eslint": "npm:5.2.10" "@tsed/typescript": "workspace:*" cross-env: "npm:7.0.3" - eslint: "npm:8.22.0" tslib: "npm:2.3.1" typescript: "npm:4.9.5" vitest: "npm:2.1.1" @@ -3853,11 +2487,9 @@ __metadata: dependencies: "@tsed/cli": "npm:5.2.10" "@tsed/cli-core": "npm:5.2.10" - "@tsed/eslint": "npm:5.2.10" "@tsed/typescript": "workspace:*" change-case: "npm:4.1.2" cross-env: "npm:7.0.3" - eslint: "npm:8.22.0" tslib: "npm:2.3.1" typescript: "npm:4.9.5" vitest: "npm:2.1.1" @@ -3870,10 +2502,8 @@ __metadata: dependencies: "@tsed/cli": "npm:5.2.10" "@tsed/cli-core": "npm:5.2.10" - "@tsed/eslint": "npm:5.2.10" "@tsed/typescript": "workspace:*" cross-env: "npm:7.0.3" - eslint: "npm:8.22.0" tslib: "npm:2.3.1" typescript: "npm:4.9.5" vitest: "npm:2.1.1" @@ -3897,8 +2527,8 @@ __metadata: "@tsed/normalize-path": "npm:>=7.14.2" "@tsed/ts-doc": "npm:^4.1.0" "@types/node": "npm:18.7.8" - "@typescript-eslint/eslint-plugin": "npm:^5.33.1" - "@typescript-eslint/parser": "npm:^5.33.1" + "@typescript-eslint/eslint-plugin": "npm:8.5.0" + "@typescript-eslint/parser": "npm:8.5.0" "@vitest/coverage-v8": "npm:^2.1.1" any-observable: "npm:0.5.1" axios: "npm:1.6.7" @@ -3909,10 +2539,11 @@ __metadata: coveralls: "npm:3.1.1" cross-env: "npm:7.0.3" entities: "npm:1.1.2" - eslint: "npm:8.22.0" - eslint-config-prettier: "npm:8.5.0" - eslint-plugin-mocha: "npm:10.1.0" - eslint-plugin-prettier: "npm:4.2.1" + eslint: "npm:9.10.0" + eslint-config-prettier: "npm:9.1.0" + eslint-plugin-prettier: "npm:5.2.1" + eslint-plugin-simple-import-sort: "npm:12.1.1" + eslint-plugin-vitest: "npm:^0.5.4" eslint-plugin-workspaces: "npm:0.8.0" execa: "npm:5.1.1" figures: "npm:4.0.1" @@ -3925,12 +2556,12 @@ __metadata: inquirer-autocomplete-prompt: "npm:2.0.0" is-ci: "npm:3.0.1" js-yaml: "npm:4.1.0" - lerna: "npm:5.4.3" + lerna: "npm:8.1.8" lint-staged: "npm:13.0.3" listr2: "npm:5.0.5" markdown-it: "npm:13.0.1" module-alias: "npm:2.2.2" - prettier: "npm:2.7.1" + prettier: "npm:3.3.3" read-pkg-up: "npm:7.0.1" registry-url: "npm:5.1.0" rxjs: "npm:^7.5.5" @@ -3956,10 +2587,8 @@ __metadata: resolution: "@tsed/cli-testing@workspace:packages/cli-testing" dependencies: "@tsed/cli-core": "npm:5.2.10" - "@tsed/eslint": "npm:5.2.10" "@tsed/typescript": "workspace:*" cross-env: "npm:7.0.3" - eslint: "npm:8.22.0" tslib: "npm:2.3.1" typescript: "npm:4.9.5" vitest: "npm:2.1.1" @@ -3973,7 +2602,6 @@ __metadata: "@tsed/cli-core": "npm:5.2.10" "@tsed/core": "npm:>=7.14.2" "@tsed/di": "npm:>=7.14.2" - "@tsed/eslint": "npm:5.2.10" "@tsed/logger": "npm:>=6.2.1" "@tsed/openspec": "npm:>=7.14.2" "@tsed/schema": "npm:>=7.14.2" @@ -3982,7 +2610,6 @@ __metadata: chalk: "npm:4.1.2" change-case: "npm:4.1.2" cross-env: "npm:7.0.3" - eslint: "npm:8.22.0" globby: "npm:11.1.0" module-alias: "npm:^2.2.2" normalize-path: "npm:3.0.0" @@ -4033,15 +2660,6 @@ __metadata: languageName: node linkType: hard -"@tsed/eslint@npm:5.2.10, @tsed/eslint@workspace:tools/eslint": - version: 0.0.0-use.local - resolution: "@tsed/eslint@workspace:tools/eslint" - dependencies: - cross-env: "npm:7.0.3" - jest: "npm:29.5.0" - languageName: unknown - linkType: soft - "@tsed/logger@npm:>=6.1.1, @tsed/logger@npm:>=6.2.1": version: 6.6.2 resolution: "@tsed/logger@npm:6.6.2" @@ -4184,6 +2802,15 @@ __metadata: languageName: node linkType: hard +"@tybys/wasm-util@npm:^0.9.0": + version: 0.9.0 + resolution: "@tybys/wasm-util@npm:0.9.0" + dependencies: + tslib: "npm:^2.4.0" + checksum: 10/aa58e64753a420ad1eefaf7bacef3dda61d74f9336925943d9244132d5b48d9242f734f1e707fd5ccfa6dd1d8ec8e6debc234b4dedb3a5b0d8486d1f373350b2 + languageName: node + linkType: hard + "@types/axios@npm:0.14.0": version: 0.14.0 resolution: "@types/axios@npm:0.14.0" @@ -4193,47 +2820,6 @@ __metadata: languageName: node linkType: hard -"@types/babel__core@npm:^7.1.14": - version: 7.20.1 - resolution: "@types/babel__core@npm:7.20.1" - dependencies: - "@babel/parser": "npm:^7.20.7" - "@babel/types": "npm:^7.20.7" - "@types/babel__generator": "npm:*" - "@types/babel__template": "npm:*" - "@types/babel__traverse": "npm:*" - checksum: 10/e63e5e71be75dd2fe41951c83650ab62006179340a7b280bfa58e9c39118cb2752ca786f952f4a12f75b83b55346f2d5e8df2b91926ef99f2f4a2a69162cab99 - languageName: node - linkType: hard - -"@types/babel__generator@npm:*": - version: 7.6.4 - resolution: "@types/babel__generator@npm:7.6.4" - dependencies: - "@babel/types": "npm:^7.0.0" - checksum: 10/34f361a0d54a0d85ea4c4b5122c4025a5738fe6795361c85f07a4f8f9add383de640e8611edeeb8339db8203c2d64bff30be266bdcfe3cf777c19e8d34f9cebc - languageName: node - linkType: hard - -"@types/babel__template@npm:*": - version: 7.4.1 - resolution: "@types/babel__template@npm:7.4.1" - dependencies: - "@babel/parser": "npm:^7.1.0" - "@babel/types": "npm:^7.0.0" - checksum: 10/649fe8b42c2876be1fd28c6ed9b276f78152d5904ec290b6c861d9ef324206e0a5c242e8305c421ac52ecf6358fa7e32ab7a692f55370484825c1df29b1596ee - languageName: node - linkType: hard - -"@types/babel__traverse@npm:*, @types/babel__traverse@npm:^7.0.6": - version: 7.14.2 - resolution: "@types/babel__traverse@npm:7.14.2" - dependencies: - "@babel/types": "npm:^7.3.0" - checksum: 10/daa949c48570f7ccc1dc0fad6d660244257de7110bae5a151842d4dac6ac90c6e0f476c8d7ac0a5a856fa34cb5f0c3299784da25a07eb79d5a9d75c7e4c68655 - languageName: node - linkType: hard - "@types/bluebird@npm:*": version: 3.5.36 resolution: "@types/bluebird@npm:3.5.36" @@ -4320,15 +2906,6 @@ __metadata: languageName: node linkType: hard -"@types/graceful-fs@npm:^4.1.3": - version: 4.1.5 - resolution: "@types/graceful-fs@npm:4.1.5" - dependencies: - "@types/node": "npm:*" - checksum: 10/d076bb61f45d0fc42dee496ef8b1c2f8742e15d5e47e90e20d0243386e426c04d4efd408a48875ab432f7960b4ce3414db20ed0fbbfc7bcc89d84e574f6e045a - languageName: node - linkType: hard - "@types/inquirer@npm:8.2.4": version: 8.2.4 resolution: "@types/inquirer@npm:8.2.4" @@ -4338,7 +2915,7 @@ __metadata: languageName: node linkType: hard -"@types/istanbul-lib-coverage@npm:*, @types/istanbul-lib-coverage@npm:^2.0.0, @types/istanbul-lib-coverage@npm:^2.0.1": +"@types/istanbul-lib-coverage@npm:*, @types/istanbul-lib-coverage@npm:^2.0.0": version: 2.0.4 resolution: "@types/istanbul-lib-coverage@npm:2.0.4" checksum: 10/a25d7589ee65c94d31464c16b72a9dc81dfa0bea9d3e105ae03882d616e2a0712a9c101a599ec482d297c3591e16336962878cb3eb1a0a62d5b76d277a890ce7 @@ -4370,13 +2947,6 @@ __metadata: languageName: node linkType: hard -"@types/json-schema@npm:^7.0.9": - version: 7.0.11 - resolution: "@types/json-schema@npm:7.0.11" - checksum: 10/e50864a93f4dcb9de64c0c605d836f5416341c824d7a8cde1aa15a5fc68bed44b33cdcb2e04e5098339e9121848378f2d0cc5b124dec41c89203c6f67d6f344a - languageName: node - linkType: hard - "@types/keyv@npm:^3.1.1": version: 3.1.4 resolution: "@types/keyv@npm:3.1.4" @@ -4451,13 +3021,6 @@ __metadata: languageName: node linkType: hard -"@types/prettier@npm:^2.1.5": - version: 2.6.3 - resolution: "@types/prettier@npm:2.6.3" - checksum: 10/fbaba4bfe1b4543bed6e62db0f9ae734b4536ff3dc83a1b8bb79835928fb0f653de626edae530703a20c5023546fdf2ba7e307c60f8544c9e65d0f8e196a9b72 - languageName: node - linkType: hard - "@types/read-pkg-up@npm:6.0.0": version: 6.0.0 resolution: "@types/read-pkg-up@npm:6.0.0" @@ -4483,13 +3046,6 @@ __metadata: languageName: node linkType: hard -"@types/stack-utils@npm:^2.0.0": - version: 2.0.1 - resolution: "@types/stack-utils@npm:2.0.1" - checksum: 10/205fdbe3326b7046d7eaf5e494d8084f2659086a266f3f9cf00bccc549c8e36e407f88168ad4383c8b07099957ad669f75f2532ed4bc70be2b037330f7bae019 - languageName: node - linkType: hard - "@types/swagger-schema-official@npm:2.0.21": version: 2.0.21 resolution: "@types/swagger-schema-official@npm:2.0.21" @@ -4562,137 +3118,138 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:^5.33.1": - version: 5.36.1 - resolution: "@typescript-eslint/eslint-plugin@npm:5.36.1" - dependencies: - "@typescript-eslint/scope-manager": "npm:5.36.1" - "@typescript-eslint/type-utils": "npm:5.36.1" - "@typescript-eslint/utils": "npm:5.36.1" - debug: "npm:^4.3.4" - functional-red-black-tree: "npm:^1.0.1" - ignore: "npm:^5.2.0" - regexpp: "npm:^3.2.0" - semver: "npm:^7.3.7" - tsutils: "npm:^3.21.0" +"@typescript-eslint/eslint-plugin@npm:8.5.0": + version: 8.5.0 + resolution: "@typescript-eslint/eslint-plugin@npm:8.5.0" + dependencies: + "@eslint-community/regexpp": "npm:^4.10.0" + "@typescript-eslint/scope-manager": "npm:8.5.0" + "@typescript-eslint/type-utils": "npm:8.5.0" + "@typescript-eslint/utils": "npm:8.5.0" + "@typescript-eslint/visitor-keys": "npm:8.5.0" + graphemer: "npm:^1.4.0" + ignore: "npm:^5.3.1" + natural-compare: "npm:^1.4.0" + ts-api-utils: "npm:^1.3.0" peerDependencies: - "@typescript-eslint/parser": ^5.0.0 - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + "@typescript-eslint/parser": ^8.0.0 || ^8.0.0-alpha.0 + eslint: ^8.57.0 || ^9.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 10/6291b5bd14c8ceb1ed4f8cead8222db49ad66c284e053bd2b8f73c1249858bdfb464cf1c085fd059b5717ef5b6c495b30ad19bab0694ee65cd44cfd51802926e + checksum: 10/344f5aca7e167544af718b81269b87b8c2a041210882cac76e1608dbec7c2a646de74387920ca9a5704fcd4c24ada052c2bc5adbeee39e950e7bce83647dae7d languageName: node linkType: hard -"@typescript-eslint/parser@npm:^5.33.1": - version: 5.50.0 - resolution: "@typescript-eslint/parser@npm:5.50.0" +"@typescript-eslint/parser@npm:8.5.0": + version: 8.5.0 + resolution: "@typescript-eslint/parser@npm:8.5.0" dependencies: - "@typescript-eslint/scope-manager": "npm:5.50.0" - "@typescript-eslint/types": "npm:5.50.0" - "@typescript-eslint/typescript-estree": "npm:5.50.0" + "@typescript-eslint/scope-manager": "npm:8.5.0" + "@typescript-eslint/types": "npm:8.5.0" + "@typescript-eslint/typescript-estree": "npm:8.5.0" + "@typescript-eslint/visitor-keys": "npm:8.5.0" debug: "npm:^4.3.4" peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + eslint: ^8.57.0 || ^9.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 10/e3d47f0ebd0e3c210f34346e95c8b7a1a341e24cc539877576fb79d5769b11a0394bef632d5e7018d045db1bdfc4d777ac9427537c3266a942cf402c4536e36f + checksum: 10/f0d5a11a8d4b42750c3e7a3a8f6874740c7bb006b6bf3037a2b1422ba8f4eb2ff2d46e673a9f54007b95d3e4302b7966677b2481da58b6307d0ceb962478ee95 languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.36.1": - version: 5.36.1 - resolution: "@typescript-eslint/scope-manager@npm:5.36.1" +"@typescript-eslint/scope-manager@npm:7.18.0": + version: 7.18.0 + resolution: "@typescript-eslint/scope-manager@npm:7.18.0" dependencies: - "@typescript-eslint/types": "npm:5.36.1" - "@typescript-eslint/visitor-keys": "npm:5.36.1" - checksum: 10/795354e901b196cdf5117b52f8b0607f576cc009519fcc29f2d96f0c0a4ad00d0d984ecbf55acce55e482602d20e96df89f5827b70570142f414525bb59d94ba + "@typescript-eslint/types": "npm:7.18.0" + "@typescript-eslint/visitor-keys": "npm:7.18.0" + checksum: 10/9eb2ae5d69d9f723e706c16b2b97744fc016996a5473bed596035ac4d12429b3d24e7340a8235d704efa57f8f52e1b3b37925ff7c2e3384859d28b23a99b8bcc languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.50.0": - version: 5.50.0 - resolution: "@typescript-eslint/scope-manager@npm:5.50.0" +"@typescript-eslint/scope-manager@npm:8.5.0": + version: 8.5.0 + resolution: "@typescript-eslint/scope-manager@npm:8.5.0" dependencies: - "@typescript-eslint/types": "npm:5.50.0" - "@typescript-eslint/visitor-keys": "npm:5.50.0" - checksum: 10/090e2ab21a504964df38f11db0804b0f5256395a9dd4a3665b56bf7886d1eff858cf0a382f6d6870b49aa6387d873bcb9e5600052850075d5ac2c053969c57e5 + "@typescript-eslint/types": "npm:8.5.0" + "@typescript-eslint/visitor-keys": "npm:8.5.0" + checksum: 10/18f9958cdf196a0beede93535e564313d27dfd392a335952c785e46c32def55fdeae8c3c7d46f07c81c105ed2b48e9cd36a1fe5101fccd80e83c04cf1693dbed languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:5.36.1": - version: 5.36.1 - resolution: "@typescript-eslint/type-utils@npm:5.36.1" +"@typescript-eslint/type-utils@npm:8.5.0": + version: 8.5.0 + resolution: "@typescript-eslint/type-utils@npm:8.5.0" dependencies: - "@typescript-eslint/typescript-estree": "npm:5.36.1" - "@typescript-eslint/utils": "npm:5.36.1" + "@typescript-eslint/typescript-estree": "npm:8.5.0" + "@typescript-eslint/utils": "npm:8.5.0" debug: "npm:^4.3.4" - tsutils: "npm:^3.21.0" - peerDependencies: - eslint: "*" + ts-api-utils: "npm:^1.3.0" peerDependenciesMeta: typescript: optional: true - checksum: 10/5f8f45653579a26f169b112abb611830156e5bbafd88312890dcd6b3739571409e18112e9920a3739ff5024f7b07809ef196ec7a3d2f1d7504744fa7958c1e07 + checksum: 10/ed487c8b530a0a6ea292385c82b2d9d9d94b99768ddd93882899be3319ea6af09c1b9f1a07e0381beb6149bbbb1f66ae95a635279fad8946345fd2298bce3549 languageName: node linkType: hard -"@typescript-eslint/types@npm:5.36.1": - version: 5.36.1 - resolution: "@typescript-eslint/types@npm:5.36.1" - checksum: 10/93752c4b9720b2acd8e67d8ad3dc7bc2fe6633d91f34d13a9e41e4305c329b9f909a6f1470ba18dd2659ce6860783f506606bd3ffc028d235ecb5c1c65e1cfa1 +"@typescript-eslint/types@npm:6.20.0": + version: 6.20.0 + resolution: "@typescript-eslint/types@npm:6.20.0" + checksum: 10/74ed1761e27c3c1a29fd260fe51096f42cfb1472b20390d6df6ec41de0420208f379e809de416e81cd7c00fdc3d5550b2391872be56bf4a1b0c595f71db0b1ea languageName: node linkType: hard -"@typescript-eslint/types@npm:5.50.0": - version: 5.50.0 - resolution: "@typescript-eslint/types@npm:5.50.0" - checksum: 10/25c53c74f865c812f35283cdc9116bbc1203bf14253c452a65837f267c18982879b136c0f12cd3f0ab2284c85ee7038ad89c9c3582076606215a6eb3a5314db2 +"@typescript-eslint/types@npm:7.18.0": + version: 7.18.0 + resolution: "@typescript-eslint/types@npm:7.18.0" + checksum: 10/0e30c73a3cc3c67dd06360a5a12fd12cee831e4092750eec3d6c031bdc4feafcb0ab1d882910a73e66b451a4f6e1dd015e9e2c4d45bf6bf716a474e5d123ddf0 languageName: node linkType: hard -"@typescript-eslint/types@npm:6.20.0": - version: 6.20.0 - resolution: "@typescript-eslint/types@npm:6.20.0" - checksum: 10/74ed1761e27c3c1a29fd260fe51096f42cfb1472b20390d6df6ec41de0420208f379e809de416e81cd7c00fdc3d5550b2391872be56bf4a1b0c595f71db0b1ea +"@typescript-eslint/types@npm:8.5.0": + version: 8.5.0 + resolution: "@typescript-eslint/types@npm:8.5.0" + checksum: 10/5cc55411fbf3f46d1571fe6ad1ef88f937093629a58e2b7bafb389646dde8a4e29d938fd57309eb30ee3f20978b4bdc5f823b31d718e053ba4c54c637a6df4e4 languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.36.1": - version: 5.36.1 - resolution: "@typescript-eslint/typescript-estree@npm:5.36.1" +"@typescript-eslint/typescript-estree@npm:7.18.0": + version: 7.18.0 + resolution: "@typescript-eslint/typescript-estree@npm:7.18.0" dependencies: - "@typescript-eslint/types": "npm:5.36.1" - "@typescript-eslint/visitor-keys": "npm:5.36.1" + "@typescript-eslint/types": "npm:7.18.0" + "@typescript-eslint/visitor-keys": "npm:7.18.0" debug: "npm:^4.3.4" globby: "npm:^11.1.0" is-glob: "npm:^4.0.3" - semver: "npm:^7.3.7" - tsutils: "npm:^3.21.0" + minimatch: "npm:^9.0.4" + semver: "npm:^7.6.0" + ts-api-utils: "npm:^1.3.0" peerDependenciesMeta: typescript: optional: true - checksum: 10/cc5af65edd96e6daf2a5f56b7a3059fef5ff3a16f5ec7ef791d31a673f2a912ea844353f090993b598c60d5a3e6ceebc307d9f02643d7c687a5275bcfbc858de + checksum: 10/b01e66235a91aa4439d02081d4a5f8b4a7cf9cb24f26b334812f657e3c603493e5f41e5c1e89cf4efae7d64509fa1f73affc16afc5e15cb7f83f724577c82036 languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.50.0": - version: 5.50.0 - resolution: "@typescript-eslint/typescript-estree@npm:5.50.0" +"@typescript-eslint/typescript-estree@npm:8.5.0": + version: 8.5.0 + resolution: "@typescript-eslint/typescript-estree@npm:8.5.0" dependencies: - "@typescript-eslint/types": "npm:5.50.0" - "@typescript-eslint/visitor-keys": "npm:5.50.0" + "@typescript-eslint/types": "npm:8.5.0" + "@typescript-eslint/visitor-keys": "npm:8.5.0" debug: "npm:^4.3.4" - globby: "npm:^11.1.0" + fast-glob: "npm:^3.3.2" is-glob: "npm:^4.0.3" - semver: "npm:^7.3.7" - tsutils: "npm:^3.21.0" + minimatch: "npm:^9.0.4" + semver: "npm:^7.6.0" + ts-api-utils: "npm:^1.3.0" peerDependenciesMeta: typescript: optional: true - checksum: 10/63f315a3c9fbbdd851e68f2d9031cfff9474527bfc49ee765ee1255739361a2828db111581307f0c1b5d0e459e0422aa2809e4933a31e74783bc8459b391fdc1 + checksum: 10/69f21c49a158c394106e0d627f57451430cf32449a6c01118ee4afbb9f92f06be3aa87f3478ffc84d1062c3b21dca983e458f70f2cbe4fee1ad206f84ab97eb8 languageName: node linkType: hard @@ -4715,39 +3272,31 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/utils@npm:5.36.1": - version: 5.36.1 - resolution: "@typescript-eslint/utils@npm:5.36.1" +"@typescript-eslint/utils@npm:8.5.0": + version: 8.5.0 + resolution: "@typescript-eslint/utils@npm:8.5.0" dependencies: - "@types/json-schema": "npm:^7.0.9" - "@typescript-eslint/scope-manager": "npm:5.36.1" - "@typescript-eslint/types": "npm:5.36.1" - "@typescript-eslint/typescript-estree": "npm:5.36.1" - eslint-scope: "npm:^5.1.1" - eslint-utils: "npm:^3.0.0" + "@eslint-community/eslint-utils": "npm:^4.4.0" + "@typescript-eslint/scope-manager": "npm:8.5.0" + "@typescript-eslint/types": "npm:8.5.0" + "@typescript-eslint/typescript-estree": "npm:8.5.0" peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: 10/b7aef93d4337c6101a9ae82015e4a3997bef882804a4490bf2162224d3c8e40578e2680e111341be312e649398287291aa504c36fc7eef59c71597c26d293425 - languageName: node - linkType: hard - -"@typescript-eslint/visitor-keys@npm:5.36.1": - version: 5.36.1 - resolution: "@typescript-eslint/visitor-keys@npm:5.36.1" - dependencies: - "@typescript-eslint/types": "npm:5.36.1" - eslint-visitor-keys: "npm:^3.3.0" - checksum: 10/013e71806297c87d17c1b307bc2d15fc65dba18e9fba090b52e08607d20bc3ee0faf6fddf6800a93d66928d43a0c8245f943c1d14c572b43a89861a7fa18374d + eslint: ^8.57.0 || ^9.0.0 + checksum: 10/f4727ebdee15082debe61a815eaad588f006a4f93d7fe94d065da563b4d3f91b7b7f795b5c77aa4cdebdf0936f83aa878089f22b8dbdbb738c557e8974129f54 languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.50.0": - version: 5.50.0 - resolution: "@typescript-eslint/visitor-keys@npm:5.50.0" +"@typescript-eslint/utils@npm:^7.7.1": + version: 7.18.0 + resolution: "@typescript-eslint/utils@npm:7.18.0" dependencies: - "@typescript-eslint/types": "npm:5.50.0" - eslint-visitor-keys: "npm:^3.3.0" - checksum: 10/45fb9256a21a2d855f3e33ff0df98dadcfcc82a6df45197cf2bb9d82e52cd1554b3ddd21f6cc987f4cf5c8e982467fc9a8bfd2ba2d123baa3508c6166ba62c79 + "@eslint-community/eslint-utils": "npm:^4.4.0" + "@typescript-eslint/scope-manager": "npm:7.18.0" + "@typescript-eslint/types": "npm:7.18.0" + "@typescript-eslint/typescript-estree": "npm:7.18.0" + peerDependencies: + eslint: ^8.56.0 + checksum: 10/f43fedb4f4d2e3836bdf137889449063a55c0ece74fdb283929cd376197b992313be8ef4df920c1c801b5c3076b92964c84c6c3b9b749d263b648d0011f5926e languageName: node linkType: hard @@ -4761,6 +3310,26 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/visitor-keys@npm:7.18.0": + version: 7.18.0 + resolution: "@typescript-eslint/visitor-keys@npm:7.18.0" + dependencies: + "@typescript-eslint/types": "npm:7.18.0" + eslint-visitor-keys: "npm:^3.4.3" + checksum: 10/b7cfe6fdeae86c507357ac6b2357813c64fb2fbf1aaf844393ba82f73a16e2599b41981b34200d9fc7765d70bc3a8181d76b503051e53f04bcb7c9afef637eab + languageName: node + linkType: hard + +"@typescript-eslint/visitor-keys@npm:8.5.0": + version: 8.5.0 + resolution: "@typescript-eslint/visitor-keys@npm:8.5.0" + dependencies: + "@typescript-eslint/types": "npm:8.5.0" + eslint-visitor-keys: "npm:^3.4.3" + checksum: 10/32cc9d8120531bb1b5da79d697ab80bbbf18e5630d74c8b6c0f835d7914be7833ed9e5b95fa05f6f7b724d928cd4208b4028a2cc9d767401434d88214614887b + languageName: node + linkType: hard + "@vitest/coverage-v8@npm:^2.1.1": version: 2.1.1 resolution: "@vitest/coverage-v8@npm:2.1.1" @@ -4949,14 +3518,14 @@ __metadata: languageName: node linkType: hard -"@zkochan/js-yaml@npm:0.0.6": - version: 0.0.6 - resolution: "@zkochan/js-yaml@npm:0.0.6" +"@zkochan/js-yaml@npm:0.0.7": + version: 0.0.7 + resolution: "@zkochan/js-yaml@npm:0.0.7" dependencies: argparse: "npm:^2.0.1" bin: js-yaml: bin/js-yaml.js - checksum: 10/1a079db8bc76dfd200f3d2334c96fd5df6ce072f40b5aa6fe4508e6fd5af0e57cab6fc879ea7f8c376e4c553febd73c4b46c924bd48b838b5b9522936b88517b + checksum: 10/83642debff31400764e8721ba8f386e0f5444b118c7a6c17dbdcb316b56fefa061ea0587af47de75e04d60059215a703a1ca8bbc479149581cd57d752cb3d4e0 languageName: node linkType: hard @@ -5002,7 +3571,7 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^8.12.1": +"acorn@npm:^8.12.0, acorn@npm:^8.12.1": version: 8.12.1 resolution: "acorn@npm:8.12.1" bin: @@ -5011,7 +3580,7 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^8.4.1, acorn@npm:^8.8.0": +"acorn@npm:^8.4.1": version: 8.8.0 resolution: "acorn@npm:8.8.0" bin: @@ -5088,7 +3657,7 @@ __metadata: languageName: node linkType: hard -"ajv@npm:^6.10.0, ajv@npm:^6.12.3, ajv@npm:^6.12.4": +"ajv@npm:^6.12.3, ajv@npm:^6.12.4": version: 6.12.6 resolution: "ajv@npm:6.12.6" dependencies: @@ -5531,17 +4100,7 @@ __metadata: languageName: node linkType: hard -"anymatch@npm:^3.0.3": - version: 3.1.2 - resolution: "anymatch@npm:3.1.2" - dependencies: - normalize-path: "npm:^3.0.0" - picomatch: "npm:^2.0.4" - checksum: 10/985163db2292fac9e5a1e072bf99f1b5baccf196e4de25a0b0b81865ebddeb3b3eb4480734ef0a2ac8c002845396b91aa89121f5b84f93981a4658164a9ec6e9 - languageName: node - linkType: hard - -"aproba@npm:^1.0.3 || ^2.0.0, aproba@npm:^2.0.0": +"aproba@npm:2.0.0, aproba@npm:^1.0.3 || ^2.0.0, aproba@npm:^2.0.0": version: 2.0.0 resolution: "aproba@npm:2.0.0" checksum: 10/c2b9a631298e8d6f3797547e866db642f68493808f5b37cd61da778d5f6ada890d16f668285f7d60bd4fc3b03889bd590ffe62cf81b700e9bb353431238a0a7b @@ -5692,13 +4251,6 @@ __metadata: languageName: node linkType: hard -"asap@npm:^2.0.0": - version: 2.0.6 - resolution: "asap@npm:2.0.6" - checksum: 10/b244c0458c571945e4b3be0b14eb001bea5596f9868cc50cc711dc03d58a7e953517d3f0dad81ccde3ff37d1f074701fa76a6f07d41aaa992d7204a37b915dda - languageName: node - linkType: hard - "asn1@npm:~0.2.3": version: 0.2.6 resolution: "asn1@npm:0.2.6" @@ -5736,6 +4288,13 @@ __metadata: languageName: node linkType: hard +"async@npm:^3.2.3": + version: 3.2.6 + resolution: "async@npm:3.2.6" + checksum: 10/cb6e0561a3c01c4b56a799cc8bab6ea5fef45f069ab32500b6e19508db270ef2dffa55e5aed5865c5526e9907b1f8be61b27530823b411ffafb5e1538c86c368 + languageName: node + linkType: hard + "asynckit@npm:^0.4.0": version: 0.4.0 resolution: "asynckit@npm:0.4.0" @@ -5743,13 +4302,6 @@ __metadata: languageName: node linkType: hard -"at-least-node@npm:^1.0.0": - version: 1.0.0 - resolution: "at-least-node@npm:1.0.0" - checksum: 10/463e2f8e43384f1afb54bc68485c436d7622acec08b6fad269b421cb1d29cebb5af751426793d0961ed243146fe4dc983402f6d5a51b720b277818dbf6f2e49e - languageName: node - linkType: hard - "atob@npm:^2.1.2": version: 2.1.2 resolution: "atob@npm:2.1.2" @@ -5791,7 +4343,7 @@ __metadata: languageName: node linkType: hard -"axios@npm:1.6.7, axios@npm:>=1.6.7, axios@npm:^1.0.0": +"axios@npm:1.6.7, axios@npm:>=1.6.7": version: 1.6.7 resolution: "axios@npm:1.6.7" dependencies: @@ -5811,79 +4363,14 @@ __metadata: languageName: node linkType: hard -"babel-jest@npm:^29.5.0": - version: 29.5.0 - resolution: "babel-jest@npm:29.5.0" - dependencies: - "@jest/transform": "npm:^29.5.0" - "@types/babel__core": "npm:^7.1.14" - babel-plugin-istanbul: "npm:^6.1.1" - babel-preset-jest: "npm:^29.5.0" - chalk: "npm:^4.0.0" - graceful-fs: "npm:^4.2.9" - slash: "npm:^3.0.0" - peerDependencies: - "@babel/core": ^7.8.0 - checksum: 10/33bad2c4e567f0db04c9e5575371b98422994d6047ebc855926fe05e48c7fd580f89fa67708c11b2d41c1ddb02f420ba51483b36eac909490488056ade683474 - languageName: node - linkType: hard - -"babel-plugin-istanbul@npm:^6.1.1": - version: 6.1.1 - resolution: "babel-plugin-istanbul@npm:6.1.1" - dependencies: - "@babel/helper-plugin-utils": "npm:^7.0.0" - "@istanbuljs/load-nyc-config": "npm:^1.0.0" - "@istanbuljs/schema": "npm:^0.1.2" - istanbul-lib-instrument: "npm:^5.0.4" - test-exclude: "npm:^6.0.0" - checksum: 10/ffd436bb2a77bbe1942a33245d770506ab2262d9c1b3c1f1da7f0592f78ee7445a95bc2efafe619dd9c1b6ee52c10033d6c7d29ddefe6f5383568e60f31dfe8d - languageName: node - linkType: hard - -"babel-plugin-jest-hoist@npm:^29.5.0": - version: 29.5.0 - resolution: "babel-plugin-jest-hoist@npm:29.5.0" - dependencies: - "@babel/template": "npm:^7.3.3" - "@babel/types": "npm:^7.3.3" - "@types/babel__core": "npm:^7.1.14" - "@types/babel__traverse": "npm:^7.0.6" - checksum: 10/18066c177da855f478178bd2a48fa1c131d31f15c04af8c732bb4c7eb5c952fde8ac9b11133e5ddd5b74aed92c6a833fbfde51cc5dec1f7169bf865b548da680 - languageName: node - linkType: hard - -"babel-preset-current-node-syntax@npm:^1.0.0": - version: 1.0.1 - resolution: "babel-preset-current-node-syntax@npm:1.0.1" - dependencies: - "@babel/plugin-syntax-async-generators": "npm:^7.8.4" - "@babel/plugin-syntax-bigint": "npm:^7.8.3" - "@babel/plugin-syntax-class-properties": "npm:^7.8.3" - "@babel/plugin-syntax-import-meta": "npm:^7.8.3" - "@babel/plugin-syntax-json-strings": "npm:^7.8.3" - "@babel/plugin-syntax-logical-assignment-operators": "npm:^7.8.3" - "@babel/plugin-syntax-nullish-coalescing-operator": "npm:^7.8.3" - "@babel/plugin-syntax-numeric-separator": "npm:^7.8.3" - "@babel/plugin-syntax-object-rest-spread": "npm:^7.8.3" - "@babel/plugin-syntax-optional-catch-binding": "npm:^7.8.3" - "@babel/plugin-syntax-optional-chaining": "npm:^7.8.3" - "@babel/plugin-syntax-top-level-await": "npm:^7.8.3" - peerDependencies: - "@babel/core": ^7.0.0 - checksum: 10/94561959cb12bfa80867c9eeeace7c3d48d61707d33e55b4c3fdbe82fc745913eb2dbfafca62aef297421b38aadcb58550e5943f50fbcebbeefd70ce2bed4b74 - languageName: node - linkType: hard - -"babel-preset-jest@npm:^29.5.0": - version: 29.5.0 - resolution: "babel-preset-jest@npm:29.5.0" +"axios@npm:^1.7.4": + version: 1.7.7 + resolution: "axios@npm:1.7.7" dependencies: - babel-plugin-jest-hoist: "npm:^29.5.0" - babel-preset-current-node-syntax: "npm:^1.0.0" - peerDependencies: - "@babel/core": ^7.0.0 - checksum: 10/5566ca2762766c9319b4973d018d2fa08c0fcf6415c72cc54f4c8e7199e851ea8f5e6c6730f03ed7ed44fc8beefa959dd15911f2647dee47c615ff4faeddb1ad + follow-redirects: "npm:^1.15.6" + form-data: "npm:^4.0.0" + proxy-from-env: "npm:^1.1.0" + checksum: 10/7f875ea13b9298cd7b40fd09985209f7a38d38321f1118c701520939de2f113c4ba137832fe8e3f811f99a38e12c8225481011023209a77b0c0641270e20cde1 languageName: node linkType: hard @@ -5939,20 +4426,6 @@ __metadata: languageName: node linkType: hard -"bin-links@npm:^3.0.0": - version: 3.0.3 - resolution: "bin-links@npm:3.0.3" - dependencies: - cmd-shim: "npm:^5.0.0" - mkdirp-infer-owner: "npm:^2.0.0" - npm-normalize-package-bin: "npm:^2.0.0" - read-cmd-shim: "npm:^3.0.0" - rimraf: "npm:^3.0.0" - write-file-atomic: "npm:^4.0.0" - checksum: 10/27a86e45348553eb40581b9232168901fd22a11d00fd6166760b742e4ac39b3e3ddce2cdc4dad5d93d63f3fced555882d5af2a8f46ae161f398899b1af4945f9 - languageName: node - linkType: hard - "bin-links@npm:^4.0.1": version: 4.0.3 resolution: "bin-links@npm:4.0.3" @@ -5965,6 +4438,18 @@ __metadata: languageName: node linkType: hard +"bin-links@npm:^4.0.4": + version: 4.0.4 + resolution: "bin-links@npm:4.0.4" + dependencies: + cmd-shim: "npm:^6.0.0" + npm-normalize-package-bin: "npm:^3.0.0" + read-cmd-shim: "npm:^4.0.0" + write-file-atomic: "npm:^5.0.0" + checksum: 10/58d62143aacdbb783b076e9bdd970d8470f2750e1076d6fd1ae559fa532c4647478dd2550a911ba22d4c9e6339881451046e2fbc4b8958f4bf3bf8e5144d1e4d + languageName: node + linkType: hard + "binary-extensions@npm:^2.2.0": version: 2.2.0 resolution: "binary-extensions@npm:2.2.0" @@ -6107,20 +4592,6 @@ __metadata: languageName: node linkType: hard -"browserslist@npm:^4.20.2": - version: 4.21.0 - resolution: "browserslist@npm:4.21.0" - dependencies: - caniuse-lite: "npm:^1.0.30001358" - electron-to-chromium: "npm:^1.4.164" - node-releases: "npm:^2.0.5" - update-browserslist-db: "npm:^1.0.0" - bin: - browserslist: cli.js - checksum: 10/aa642c4fea1937163c127e84153f73d21446d6e51a9596bf884f6814d3e2c25296beefa87cfedcf6e6fa217a5a6ec03cbd19449b1a9c78fa5ce04b04b712d5c2 - languageName: node - linkType: hard - "bs-logger@npm:0.x": version: 0.2.6 resolution: "bs-logger@npm:0.2.6" @@ -6130,15 +4601,6 @@ __metadata: languageName: node linkType: hard -"bser@npm:2.1.1": - version: 2.1.1 - resolution: "bser@npm:2.1.1" - dependencies: - node-int64: "npm:^0.4.0" - checksum: 10/edba1b65bae682450be4117b695997972bd9a3c4dfee029cab5bcb72ae5393a79a8f909b8bc77957eb0deec1c7168670f18f4d5c556f46cdd3bca5f3b3a8d020 - languageName: node - linkType: hard - "buffer-from@npm:^1.0.0": version: 1.1.2 resolution: "buffer-from@npm:1.1.2" @@ -6156,13 +4618,6 @@ __metadata: languageName: node linkType: hard -"builtins@npm:^1.0.3": - version: 1.0.3 - resolution: "builtins@npm:1.0.3" - checksum: 10/8f756616bd3d92611bcb5bcc3008308e7cdaadbc4603a5ce6fe709193198bc115351d138524d79e5269339ef7ba5ba73185da541c7b4bc076b00dd0124f938f6 - languageName: node - linkType: hard - "builtins@npm:^5.0.0": version: 5.0.1 resolution: "builtins@npm:5.0.1" @@ -6172,10 +4627,10 @@ __metadata: languageName: node linkType: hard -"byte-size@npm:^7.0.0": - version: 7.0.1 - resolution: "byte-size@npm:7.0.1" - checksum: 10/823afd08712cb58da94a37307c4a2e695c8db3fde6e24a3a4267552f526d57c976daaf4f027a724f89e395a8673f4af4be1e5bb5bb30ba00dadfde58909158cf +"byte-size@npm:8.1.1": + version: 8.1.1 + resolution: "byte-size@npm:8.1.1" + checksum: 10/eacd83b5f39b4b35115160201553150c3c085473ddb1e788d0f4ee22a2f3461470de5732eef8d7874efbbd883b7ae1277190b579128060e616d606ff419fe1e0 languageName: node linkType: hard @@ -6186,32 +4641,6 @@ __metadata: languageName: node linkType: hard -"cacache@npm:^16.0.0, cacache@npm:^16.0.6": - version: 16.1.3 - resolution: "cacache@npm:16.1.3" - dependencies: - "@npmcli/fs": "npm:^2.1.0" - "@npmcli/move-file": "npm:^2.0.0" - chownr: "npm:^2.0.0" - fs-minipass: "npm:^2.1.0" - glob: "npm:^8.0.1" - infer-owner: "npm:^1.0.4" - lru-cache: "npm:^7.7.1" - minipass: "npm:^3.1.6" - minipass-collect: "npm:^1.0.2" - minipass-flush: "npm:^1.0.5" - minipass-pipeline: "npm:^1.2.4" - mkdirp: "npm:^1.0.4" - p-map: "npm:^4.0.0" - promise-inflight: "npm:^1.0.1" - rimraf: "npm:^3.0.2" - ssri: "npm:^9.0.0" - tar: "npm:^6.1.11" - unique-filename: "npm:^2.0.0" - checksum: 10/a14524d90e377ee691d63a81173b33c473f8bc66eb299c64290b58e1d41b28842397f8d6c15a01b4c57ca340afcec019ae112a45c2f67a79f76130d326472e92 - languageName: node - linkType: hard - "cacache@npm:^16.1.0": version: 16.1.0 resolution: "cacache@npm:16.1.0" @@ -6258,6 +4687,26 @@ __metadata: languageName: node linkType: hard +"cacache@npm:^18.0.3": + version: 18.0.4 + resolution: "cacache@npm:18.0.4" + dependencies: + "@npmcli/fs": "npm:^3.1.0" + fs-minipass: "npm:^3.0.0" + glob: "npm:^10.2.2" + lru-cache: "npm:^10.0.1" + minipass: "npm:^7.0.3" + minipass-collect: "npm:^2.0.1" + minipass-flush: "npm:^1.0.5" + minipass-pipeline: "npm:^1.2.4" + p-map: "npm:^4.0.0" + ssri: "npm:^10.0.0" + tar: "npm:^6.1.11" + unique-filename: "npm:^3.0.0" + checksum: 10/ca2f7b2d3003f84d362da9580b5561058ccaecd46cba661cbcff0375c90734b610520d46b472a339fd032d91597ad6ed12dde8af81571197f3c9772b5d35b104 + languageName: node + linkType: hard + "cache-base@npm:^1.0.1": version: 1.0.1 resolution: "cache-base@npm:1.0.1" @@ -6357,13 +4806,6 @@ __metadata: languageName: node linkType: hard -"caniuse-lite@npm:^1.0.30001358": - version: 1.0.30001359 - resolution: "caniuse-lite@npm:1.0.30001359" - checksum: 10/c748f10f9e9b8b3f54b6f0a2308e4c15b6f687dd6fce1294bb1bae1bacdc9f610bc84499a364884474cb5df9c0e62c66bc4b23499dd76942216314c6a7a723e9 - languageName: node - linkType: hard - "capital-case@npm:^1.0.4": version: 1.0.4 resolution: "capital-case@npm:1.0.4" @@ -6422,7 +4864,7 @@ __metadata: languageName: node linkType: hard -"chalk@npm:4.1.2, chalk@npm:^4.1.1": +"chalk@npm:4.1.2, chalk@npm:^4.0.2, chalk@npm:^4.1.1": version: 4.1.2 resolution: "chalk@npm:4.1.2" dependencies: @@ -6569,13 +5011,6 @@ __metadata: languageName: node linkType: hard -"cjs-module-lexer@npm:^1.0.0": - version: 1.2.2 - resolution: "cjs-module-lexer@npm:1.2.2" - checksum: 10/f80f84bfdcc53379cc18e25ea3c0cdb4595c142b8e28df304f5c88f38202e1bccf13e845401593656781f79fb43273e1d402d6187d0eeee8dca5ddecee1dcad4 - languageName: node - linkType: hard - "class-utils@npm:^0.3.5": version: 0.3.6 resolution: "class-utils@npm:0.3.6" @@ -6778,7 +5213,7 @@ __metadata: languageName: node linkType: hard -"clone-deep@npm:^4.0.1": +"clone-deep@npm:4.0.1": version: 4.0.1 resolution: "clone-deep@npm:4.0.1" dependencies: @@ -6805,12 +5240,10 @@ __metadata: languageName: node linkType: hard -"cmd-shim@npm:^5.0.0": - version: 5.0.0 - resolution: "cmd-shim@npm:5.0.0" - dependencies: - mkdirp-infer-owner: "npm:^2.0.0" - checksum: 10/3a517ba5ca4ae247b6294132ce00cef2e72c136a14eaf710145ab0c0f3f102a9989b68820a80c5ddce0f70c1fae43a865f20de62a496e89a0ce0030dbc8d8c4f +"cmd-shim@npm:6.0.3": + version: 6.0.3 + resolution: "cmd-shim@npm:6.0.3" + checksum: 10/791c9779cf57deae978ef24daf7e49e7fdb2070cc273aa7d691ed258a660ad3861edbc9f39daa2b6e5f72a64526b6812c04f08becc54402618b99946ccad7d71 languageName: node linkType: hard @@ -6821,13 +5254,6 @@ __metadata: languageName: node linkType: hard -"co@npm:^4.6.0": - version: 4.6.0 - resolution: "co@npm:4.6.0" - checksum: 10/a5d9f37091c70398a269e625cedff5622f200ed0aa0cff22ee7b55ed74a123834b58711776eb0f1dc58eb6ebbc1185aa7567b57bd5979a948c6e4f85073e2c05 - languageName: node - linkType: hard - "code-point-at@npm:^1.0.0": version: 1.1.0 resolution: "code-point-at@npm:1.1.0" @@ -6835,13 +5261,6 @@ __metadata: languageName: node linkType: hard -"collect-v8-coverage@npm:^1.0.0": - version: 1.0.1 - resolution: "collect-v8-coverage@npm:1.0.1" - checksum: 10/85b26945ab9b8e15077f877a4a5bc91d836480c600bac4cd0a0e8be8515583fdfc393ccff049ff3e9f46cac39e5295af049209f3c484f30a028056cc5dd1fe8a - languageName: node - linkType: hard - "collection-visit@npm:^1.0.0": version: 1.0.0 resolution: "collection-visit@npm:1.0.0" @@ -6884,7 +5303,7 @@ __metadata: languageName: node linkType: hard -"color-support@npm:^1.1.3": +"color-support@npm:1.1.3, color-support@npm:^1.1.3": version: 1.1.3 resolution: "color-support@npm:1.1.3" bin: @@ -6914,7 +5333,7 @@ __metadata: languageName: node linkType: hard -"columnify@npm:^1.6.0": +"columnify@npm:1.6.0, columnify@npm:^1.6.0": version: 1.6.0 resolution: "columnify@npm:1.6.0" dependencies: @@ -7040,7 +5459,7 @@ __metadata: languageName: node linkType: hard -"config-chain@npm:^1.1.11, config-chain@npm:^1.1.12": +"config-chain@npm:^1.1.11": version: 1.1.13 resolution: "config-chain@npm:1.1.13" dependencies: @@ -7271,22 +5690,22 @@ __metadata: languageName: node linkType: hard -"conventional-changelog-angular@npm:^5.0.11, conventional-changelog-angular@npm:^5.0.12": - version: 5.0.13 - resolution: "conventional-changelog-angular@npm:5.0.13" +"conventional-changelog-angular@npm:7.0.0, conventional-changelog-angular@npm:^7.0.0": + version: 7.0.0 + resolution: "conventional-changelog-angular@npm:7.0.0" dependencies: compare-func: "npm:^2.0.0" - q: "npm:^1.5.1" - checksum: 10/e7ee31ac703bc139552a735185f330d1b2e53d7c1ff40a78bf43339e563d95c290a4f57e68b76bb223345524702d80bf18dc955417cd0852d9457595c04ad8ce + checksum: 10/e7966d2fee5475e76263f30f8b714b2b592b5bf556df225b7091e5090831fc9a20b99598a7d2997e19c2ef8118c0a3150b1eba290786367b0f55a5ccfa804ec9 languageName: node linkType: hard -"conventional-changelog-angular@npm:^7.0.0": - version: 7.0.0 - resolution: "conventional-changelog-angular@npm:7.0.0" +"conventional-changelog-angular@npm:^5.0.11": + version: 5.0.13 + resolution: "conventional-changelog-angular@npm:5.0.13" dependencies: compare-func: "npm:^2.0.0" - checksum: 10/e7966d2fee5475e76263f30f8b714b2b592b5bf556df225b7091e5090831fc9a20b99598a7d2997e19c2ef8118c0a3150b1eba290786367b0f55a5ccfa804ec9 + q: "npm:^1.5.1" + checksum: 10/e7ee31ac703bc139552a735185f330d1b2e53d7c1ff40a78bf43339e563d95c290a4f57e68b76bb223345524702d80bf18dc955417cd0852d9457595c04ad8ce languageName: node linkType: hard @@ -7301,51 +5720,46 @@ __metadata: languageName: node linkType: hard -"conventional-changelog-core@npm:^4.2.4": - version: 4.2.4 - resolution: "conventional-changelog-core@npm:4.2.4" +"conventional-changelog-core@npm:5.0.1": + version: 5.0.1 + resolution: "conventional-changelog-core@npm:5.0.1" dependencies: add-stream: "npm:^1.0.0" - conventional-changelog-writer: "npm:^5.0.0" - conventional-commits-parser: "npm:^3.2.0" - dateformat: "npm:^3.0.0" - get-pkg-repo: "npm:^4.0.0" - git-raw-commits: "npm:^2.0.8" + conventional-changelog-writer: "npm:^6.0.0" + conventional-commits-parser: "npm:^4.0.0" + dateformat: "npm:^3.0.3" + get-pkg-repo: "npm:^4.2.1" + git-raw-commits: "npm:^3.0.0" git-remote-origin-url: "npm:^2.0.0" - git-semver-tags: "npm:^4.1.1" - lodash: "npm:^4.17.15" - normalize-package-data: "npm:^3.0.0" - q: "npm:^1.5.1" + git-semver-tags: "npm:^5.0.0" + normalize-package-data: "npm:^3.0.3" read-pkg: "npm:^3.0.0" read-pkg-up: "npm:^3.0.0" - through2: "npm:^4.0.0" - checksum: 10/c8104986724ec384baa559425485bd7834bb94a12e5d52b71b4829eddf664895be4c6269504a83788179959e60e40ba2fcbdb474cc70606ba7ce06b61e016726 + checksum: 10/df716cd61eec26b1379370f7dc87df6eadfb6b42c1c99291fcca1c68cd669643539d619fae3fa0ad9255b4e8c30af3b709e058ba62bc5c3a06dc14190c7ef5cc languageName: node linkType: hard -"conventional-changelog-preset-loader@npm:^2.3.4": - version: 2.3.4 - resolution: "conventional-changelog-preset-loader@npm:2.3.4" - checksum: 10/23a889b7fcf6fe7653e61f32a048877b2f954dcc1e0daa2848c5422eb908e6f24c78372f8d0d2130b5ed941c02e7010c599dccf44b8552602c6c8db9cb227453 +"conventional-changelog-preset-loader@npm:^3.0.0": + version: 3.0.0 + resolution: "conventional-changelog-preset-loader@npm:3.0.0" + checksum: 10/199c4730c5151f243d35c24585114900c2a7091eab5832cfeb49067a18a2b77d5c9a86b779e6e18b49278a1ff83c011c1d9bb6da95bd1f78d9e36d4d379216d5 languageName: node linkType: hard -"conventional-changelog-writer@npm:^5.0.0": - version: 5.0.1 - resolution: "conventional-changelog-writer@npm:5.0.1" +"conventional-changelog-writer@npm:^6.0.0": + version: 6.0.1 + resolution: "conventional-changelog-writer@npm:6.0.1" dependencies: - conventional-commits-filter: "npm:^2.0.7" - dateformat: "npm:^3.0.0" + conventional-commits-filter: "npm:^3.0.0" + dateformat: "npm:^3.0.3" handlebars: "npm:^4.7.7" json-stringify-safe: "npm:^5.0.1" - lodash: "npm:^4.17.15" - meow: "npm:^8.0.0" - semver: "npm:^6.0.0" - split: "npm:^1.0.0" - through2: "npm:^4.0.0" + meow: "npm:^8.1.2" + semver: "npm:^7.0.0" + split: "npm:^1.0.1" bin: conventional-changelog-writer: cli.js - checksum: 10/09703c3fcea24753ac79dd408fad391f64b7e48c6b3813d0429e6ed25b72aec5235400cf9f182400520ad193598983a81345ad817ca9c37ae289ef70975ae0c6 + checksum: 10/9649d390b91c0621b17ccd7faf046990385da46c53004fcc3f13e5887ece26d134316d466de8c21d0c90672c1fca2b7ec98f28603ee04df8cfe5bcfc1fb70e76 languageName: node linkType: hard @@ -7365,13 +5779,13 @@ __metadata: languageName: node linkType: hard -"conventional-commits-filter@npm:^2.0.7": - version: 2.0.7 - resolution: "conventional-commits-filter@npm:2.0.7" +"conventional-commits-filter@npm:^3.0.0": + version: 3.0.0 + resolution: "conventional-commits-filter@npm:3.0.0" dependencies: lodash.ismatch: "npm:^4.4.0" - modify-values: "npm:^1.0.0" - checksum: 10/c7e25df941047750324704ca61ea281cbc156d359a1bd8587dc5e9e94311fa8343d97be9f1115b2e3948624830093926992a2854ae1ac8cbc560e60e360fdd9b + modify-values: "npm:^1.0.1" + checksum: 10/73337f42acff7189e1dfca8d13c9448ce085ac1c09976cb33617cc909949621befb1640b1c6c30a1be4953a1be0deea9e93fa0dc86725b8be8e249a64fbb4632 languageName: node linkType: hard @@ -7382,7 +5796,7 @@ __metadata: languageName: node linkType: hard -"conventional-commits-parser@npm:^3.2.0, conventional-commits-parser@npm:^3.2.2": +"conventional-commits-parser@npm:^3.2.2": version: 3.2.4 resolution: "conventional-commits-parser@npm:3.2.4" dependencies: @@ -7398,6 +5812,20 @@ __metadata: languageName: node linkType: hard +"conventional-commits-parser@npm:^4.0.0": + version: 4.0.0 + resolution: "conventional-commits-parser@npm:4.0.0" + dependencies: + JSONStream: "npm:^1.3.5" + is-text-path: "npm:^1.0.1" + meow: "npm:^8.1.2" + split2: "npm:^3.2.2" + bin: + conventional-commits-parser: cli.js + checksum: 10/d3b7d947b486d3bb40f961808947ee46487429e050be840030211a80aa2eec170e427207c830f2720d8ab898649a652bbbe1825993b8bf0596517e3603f5a1bd + languageName: node + linkType: hard + "conventional-commits-parser@npm:^5.0.0": version: 5.0.0 resolution: "conventional-commits-parser@npm:5.0.0" @@ -7412,37 +5840,20 @@ __metadata: languageName: node linkType: hard -"conventional-recommended-bump@npm:^6.1.0": - version: 6.1.0 - resolution: "conventional-recommended-bump@npm:6.1.0" +"conventional-recommended-bump@npm:7.0.1": + version: 7.0.1 + resolution: "conventional-recommended-bump@npm:7.0.1" dependencies: concat-stream: "npm:^2.0.0" - conventional-changelog-preset-loader: "npm:^2.3.4" - conventional-commits-filter: "npm:^2.0.7" - conventional-commits-parser: "npm:^3.2.0" - git-raw-commits: "npm:^2.0.8" - git-semver-tags: "npm:^4.1.1" - meow: "npm:^8.0.0" - q: "npm:^1.5.1" + conventional-changelog-preset-loader: "npm:^3.0.0" + conventional-commits-filter: "npm:^3.0.0" + conventional-commits-parser: "npm:^4.0.0" + git-raw-commits: "npm:^3.0.0" + git-semver-tags: "npm:^5.0.0" + meow: "npm:^8.1.2" bin: conventional-recommended-bump: cli.js - checksum: 10/5561a4163e097b502e5372420ae9eee240a2b0e00e8cca3f5d8a7110c35021a5fe61a18d457961ace815d58beecc0192ebd26da40c6affcfc038be2d3a5f77c4 - languageName: node - linkType: hard - -"convert-source-map@npm:^1.6.0, convert-source-map@npm:^1.7.0": - version: 1.8.0 - resolution: "convert-source-map@npm:1.8.0" - dependencies: - safe-buffer: "npm:~5.1.1" - checksum: 10/985d974a2d33e1a2543ada51c93e1ba2f73eaed608dc39f229afc78f71dcc4c8b7d7c684aa647e3c6a3a204027444d69e53e169ce94e8d1fa8d7dee80c9c8fed - languageName: node - linkType: hard - -"convert-source-map@npm:^2.0.0": - version: 2.0.0 - resolution: "convert-source-map@npm:2.0.0" - checksum: 10/c987be3ec061348cdb3c2bfb924bec86dea1eacad10550a85ca23edb0fe3556c3a61c7399114f3331ccb3499d7fd0285ab24566e5745929412983494c3926e15 + checksum: 10/8d815e7c6f8083085ce4c784b27b0799de628ad2671d99e23c4b08885fb04c5b2adcb6053898eb1f183ee26489273edcbb110c7cd9f80cb06153be53fef2b174 languageName: node linkType: hard @@ -7492,6 +5903,23 @@ __metadata: languageName: node linkType: hard +"cosmiconfig@npm:^8.2.0": + version: 8.3.6 + resolution: "cosmiconfig@npm:8.3.6" + dependencies: + import-fresh: "npm:^3.3.0" + js-yaml: "npm:^4.1.0" + parse-json: "npm:^5.2.0" + path-type: "npm:^4.0.0" + peerDependencies: + typescript: ">=4.9.5" + peerDependenciesMeta: + typescript: + optional: true + checksum: 10/91d082baca0f33b1c085bf010f9ded4af43cbedacba8821da0fb5667184d0a848addc52c31fadd080007f904a555319c238cf5f4c03e6d58ece2e4876b2e73d6 + languageName: node + linkType: hard + "cosmiconfig@npm:^9.0.0": version: 9.0.0 resolution: "cosmiconfig@npm:9.0.0" @@ -7662,7 +6090,7 @@ __metadata: languageName: node linkType: hard -"dateformat@npm:^3.0.0": +"dateformat@npm:^3.0.3": version: 3.0.3 resolution: "dateformat@npm:3.0.3" checksum: 10/0504baf50c3777ad333c96c37d1673d67efcb7dd071563832f70b5cbf7f3f4753f18981d44bfd8f665d5e5a511d2fc0af8e0ead8b585b9b3ddaa90067864d3f0 @@ -7690,7 +6118,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:^4.3.5, debug@npm:^4.3.6": +"debug@npm:^4.3.1, debug@npm:^4.3.5, debug@npm:^4.3.6": version: 4.3.7 resolution: "debug@npm:4.3.7" dependencies: @@ -7711,13 +6139,6 @@ __metadata: languageName: node linkType: hard -"debuglog@npm:^1.0.1": - version: 1.0.1 - resolution: "debuglog@npm:1.0.1" - checksum: 10/942a3196951ef139e3c19dc55583c1f9532fad92e293ffc6cbf8bb67562ea1aa013b5b86b4a89c2dd89e5e1c16e00b975e5ba3aa0a11070a3577e81162e6e29d - languageName: node - linkType: hard - "decamelize-keys@npm:^1.1.0": version: 1.1.0 resolution: "decamelize-keys@npm:1.1.0" @@ -7751,10 +6172,15 @@ __metadata: languageName: node linkType: hard -"dedent@npm:^0.7.0": - version: 0.7.0 - resolution: "dedent@npm:0.7.0" - checksum: 10/87de191050d9a40dd70cad01159a0bcf05ecb59750951242070b6abf9569088684880d00ba92a955b4058804f16eeaf91d604f283929b4f614d181cd7ae633d2 +"dedent@npm:1.5.3": + version: 1.5.3 + resolution: "dedent@npm:1.5.3" + peerDependencies: + babel-plugin-macros: ^3.1.0 + peerDependenciesMeta: + babel-plugin-macros: + optional: true + checksum: 10/e5277f6268f288649503125b781a7b7a2c9b22d011139688c0b3619fe40121e600eb1f077c891938d4b2428bdb6326cc3c77a763e4b1cc681bd9666ab1bad2a1 languageName: node linkType: hard @@ -7779,13 +6205,6 @@ __metadata: languageName: node linkType: hard -"deepmerge@npm:^4.2.2": - version: 4.2.2 - resolution: "deepmerge@npm:4.2.2" - checksum: 10/0e58ed14f530d08f9b996cfc3a41b0801691620235bc5e1883260e3ed1c1b4a1dfb59f865770e45d5dfb1d7ee108c4fc10c2f85e822989d4123490ea90be2545 - languageName: node - linkType: hard - "default-compare@npm:^1.0.0": version: 1.0.0 resolution: "default-compare@npm:1.0.0" @@ -7928,34 +6347,10 @@ __metadata: languageName: node linkType: hard -"detect-indent@npm:^6.0.0": - version: 6.1.0 - resolution: "detect-indent@npm:6.1.0" - checksum: 10/ab953a73c72dbd4e8fc68e4ed4bfd92c97eb6c43734af3900add963fd3a9316f3bc0578b018b24198d4c31a358571eff5f0656e81a1f3b9ad5c547d58b2d093d - languageName: node - linkType: hard - -"detect-newline@npm:^3.0.0": - version: 3.1.0 - resolution: "detect-newline@npm:3.1.0" - checksum: 10/ae6cd429c41ad01b164c59ea36f264a2c479598e61cba7c99da24175a7ab80ddf066420f2bec9a1c57a6bead411b4655ff15ad7d281c000a89791f48cbe939e7 - languageName: node - linkType: hard - -"dezalgo@npm:^1.0.0": - version: 1.0.4 - resolution: "dezalgo@npm:1.0.4" - dependencies: - asap: "npm:^2.0.0" - wrappy: "npm:1" - checksum: 10/895389c6aead740d2ab5da4d3466d20fa30f738010a4d3f4dcccc9fc645ca31c9d10b7e1804ae489b1eb02c7986f9f1f34ba132d409b043082a86d9a4e745624 - languageName: node - linkType: hard - -"diff-sequences@npm:^29.4.3": - version: 29.4.3 - resolution: "diff-sequences@npm:29.4.3" - checksum: 10/2287b259400513332d757f921eeda7c740863a919a00bd1d1b22ab2532b3e763538c404aec0953a813bbe33e660cbc77d0742875d6674d8dc5bc31d74ec88cc1 +"diff-sequences@npm:^29.6.3": + version: 29.6.3 + resolution: "diff-sequences@npm:29.6.3" + checksum: 10/179daf9d2f9af5c57ad66d97cb902a538bcf8ed64963fa7aa0c329b3de3665ce2eb6ffdc2f69f29d445fa4af2517e5e55e5b6e00c00a9ae4f43645f97f7078cb languageName: node linkType: hard @@ -7999,15 +6394,6 @@ __metadata: languageName: node linkType: hard -"doctrine@npm:^3.0.0": - version: 3.0.0 - resolution: "doctrine@npm:3.0.0" - dependencies: - esutils: "npm:^2.0.2" - checksum: 10/b4b28f1df5c563f7d876e7461254a4597b8cabe915abe94d7c5d1633fed263fcf9a85e8d3836591fc2d040108e822b0d32758e5ec1fe31c590dc7e08086e3e48 - languageName: node - linkType: hard - "dot-case@npm:^3.0.4": version: 3.0.4 resolution: "dot-case@npm:3.0.4" @@ -8045,10 +6431,19 @@ __metadata: languageName: node linkType: hard -"dotenv@npm:~10.0.0": - version: 10.0.0 - resolution: "dotenv@npm:10.0.0" - checksum: 10/55f701ae213e3afe3f4232fae5edfb6e0c49f061a363ff9f1c5a0c2bf3fb990a6e49aeada11b2a116efb5fdc3bc3f1ef55ab330be43033410b267f7c0809a9dc +"dotenv-expand@npm:~11.0.6": + version: 11.0.6 + resolution: "dotenv-expand@npm:11.0.6" + dependencies: + dotenv: "npm:^16.4.4" + checksum: 10/8912aba44c024982449c14a701455f84a65af8db38c58977d9952b73d1741952a1ef950e72e5fb9201cc3ab231b593dc9d5c5293c9154794dbaa33c900faceb4 + languageName: node + linkType: hard + +"dotenv@npm:^16.4.4, dotenv@npm:~16.4.5": + version: 16.4.5 + resolution: "dotenv@npm:16.4.5" + checksum: 10/55a3134601115194ae0f924e54473459ed0d9fc340ae610b676e248cca45aa7c680d86365318ea964e6da4e2ea80c4514c1adab5adb43d6867fb57ff068f95c8 languageName: node linkType: hard @@ -8099,10 +6494,14 @@ __metadata: languageName: node linkType: hard -"electron-to-chromium@npm:^1.4.164": - version: 1.4.169 - resolution: "electron-to-chromium@npm:1.4.169" - checksum: 10/242384f805b1b6fda8f7d4b2a547e7ab6f4c276b6422ba1c6ed91ad5aa676e26ea6507c2da96603ff48adc5c3ecb3c370dfaf3e48f7004534c1a8984cd308ed0 +"ejs@npm:^3.1.7": + version: 3.1.10 + resolution: "ejs@npm:3.1.10" + dependencies: + jake: "npm:^10.8.5" + bin: + ejs: bin/cli.js + checksum: 10/a9cb7d7cd13b7b1cd0be5c4788e44dd10d92f7285d2f65b942f33e127230c054f99a42db4d99f766d8dbc6c57e94799593ee66a14efd7c8dd70c4812bf6aa384 languageName: node linkType: hard @@ -8113,13 +6512,6 @@ __metadata: languageName: node linkType: hard -"emittery@npm:^0.13.1": - version: 0.13.1 - resolution: "emittery@npm:0.13.1" - checksum: 10/fbe214171d878b924eedf1757badf58a5dce071cd1fa7f620fa841a0901a80d6da47ff05929d53163105e621ce11a71b9d8acb1148ffe1745e045145f6e69521 - languageName: node - linkType: hard - "emoji-regex@npm:^10.3.0": version: 10.3.0 resolution: "emoji-regex@npm:10.3.0" @@ -8220,12 +6612,12 @@ __metadata: languageName: node linkType: hard -"envinfo@npm:^7.7.4": - version: 7.11.1 - resolution: "envinfo@npm:7.11.1" +"envinfo@npm:7.13.0": + version: 7.13.0 + resolution: "envinfo@npm:7.13.0" bin: envinfo: dist/cli.js - checksum: 10/5a18ead05954ac1643350170fefce2436a9cb758dc402e36fe4616553ee46469f766fcb6df72379d1741a2e5b55918949b343ff6174502c31c524a5cf75f05cd + checksum: 10/450c962053880f46852119cf89f4412cabd6d465ff5b74cf64e74e9da3a27ebd9e901944a5c4b0bf62950ad25025552282cbde6c00a5a9af0980dd001720fcbb languageName: node linkType: hard @@ -8374,13 +6766,6 @@ __metadata: languageName: node linkType: hard -"escape-string-regexp@npm:^2.0.0": - version: 2.0.0 - resolution: "escape-string-regexp@npm:2.0.0" - checksum: 10/9f8a2d5743677c16e85c810e3024d54f0c8dea6424fad3c79ef6666e81dd0846f7437f5e729dfcdac8981bc9e5294c39b4580814d114076b8d36318f46ae4395 - languageName: node - linkType: hard - "escape-string-regexp@npm:^4.0.0": version: 4.0.0 resolution: "escape-string-regexp@npm:4.0.0" @@ -8388,41 +6773,60 @@ __metadata: languageName: node linkType: hard -"eslint-config-prettier@npm:8.5.0": - version: 8.5.0 - resolution: "eslint-config-prettier@npm:8.5.0" +"eslint-config-prettier@npm:9.1.0": + version: 9.1.0 + resolution: "eslint-config-prettier@npm:9.1.0" peerDependencies: eslint: ">=7.0.0" bin: eslint-config-prettier: bin/cli.js - checksum: 10/cafd93fb39997969e9e79b3e0b3466d0b8570273d15423986597b8422b7363d4a80f009aec1d1443fa2329972dafde79031b1649590cc35069b0a68d31098e7b + checksum: 10/411e3b3b1c7aa04e3e0f20d561271b3b909014956c4dba51c878bf1a23dbb8c800a3be235c46c4732c70827276e540b6eed4636d9b09b444fd0a8e07f0fcd830 languageName: node linkType: hard -"eslint-plugin-mocha@npm:10.1.0": - version: 10.1.0 - resolution: "eslint-plugin-mocha@npm:10.1.0" +"eslint-plugin-prettier@npm:5.2.1": + version: 5.2.1 + resolution: "eslint-plugin-prettier@npm:5.2.1" dependencies: - eslint-utils: "npm:^3.0.0" - rambda: "npm:^7.1.0" + prettier-linter-helpers: "npm:^1.0.0" + synckit: "npm:^0.9.1" peerDependencies: - eslint: ">=7.0.0" - checksum: 10/26a79ccf1f575ac559425f0c4fd8489f0c23544477b5eceb110eab7664ff4e003a8eeb26079bdfde810db46798b2af1f71021e46d42052adab921512daf0064a + "@types/eslint": ">=8.0.0" + eslint: ">=8.0.0" + eslint-config-prettier: "*" + prettier: ">=3.0.0" + peerDependenciesMeta: + "@types/eslint": + optional: true + eslint-config-prettier: + optional: true + checksum: 10/10ddf68215237e327af09a47adab4c63f3885fda4fb28c4c42d1fc5f47d8a0cc45df6484799360ff1417a0aa3c77c3aaac49d7e9dfd145557b17e2d7ecc2a27c languageName: node linkType: hard -"eslint-plugin-prettier@npm:4.2.1": - version: 4.2.1 - resolution: "eslint-plugin-prettier@npm:4.2.1" +"eslint-plugin-simple-import-sort@npm:12.1.1": + version: 12.1.1 + resolution: "eslint-plugin-simple-import-sort@npm:12.1.1" + peerDependencies: + eslint: ">=5.0.0" + checksum: 10/2a690cea9243fbefa70345687bca8952f5e185fa459b7a8db687a908cc31082435cfee236c619d5245548fa5f89a2f2c4f8499f80512e048d2bedc60e3662d5a + languageName: node + linkType: hard + +"eslint-plugin-vitest@npm:^0.5.4": + version: 0.5.4 + resolution: "eslint-plugin-vitest@npm:0.5.4" dependencies: - prettier-linter-helpers: "npm:^1.0.0" + "@typescript-eslint/utils": "npm:^7.7.1" peerDependencies: - eslint: ">=7.28.0" - prettier: ">=2.0.0" + eslint: ^8.57.0 || ^9.0.0 + vitest: "*" peerDependenciesMeta: - eslint-config-prettier: + "@typescript-eslint/eslint-plugin": + optional: true + vitest: optional: true - checksum: 10/d387f85dd1bfcb6bc6b794845fee6afb9ebb2375653de6bcde6e615892fb97f85121a7c012a4651b181fc09953bdf54c9bc70cab7ad297019d89ae87dd007e28 + checksum: 10/a81eda0b6fff5f05afa9e4e2deb114562e8a53e224293a0dd3f524c01a240a1f8b6c7284d15862c5b740adc6816a2f23e5b96fc65d95c0abd24a5ef171215589 languageName: node linkType: hard @@ -8435,41 +6839,13 @@ __metadata: languageName: node linkType: hard -"eslint-scope@npm:^5.1.1": - version: 5.1.1 - resolution: "eslint-scope@npm:5.1.1" - dependencies: - esrecurse: "npm:^4.3.0" - estraverse: "npm:^4.1.1" - checksum: 10/c541ef384c92eb5c999b7d3443d80195fcafb3da335500946f6db76539b87d5826c8f2e1d23bf6afc3154ba8cd7c8e566f8dc00f1eea25fdf3afc8fb9c87b238 - languageName: node - linkType: hard - -"eslint-scope@npm:^7.1.1": - version: 7.1.1 - resolution: "eslint-scope@npm:7.1.1" +"eslint-scope@npm:^8.0.2": + version: 8.0.2 + resolution: "eslint-scope@npm:8.0.2" dependencies: esrecurse: "npm:^4.3.0" estraverse: "npm:^5.2.0" - checksum: 10/5bc6f6bdfd815202471077108e76af1c8c648a16e4f60d71d9f98db0dd2b2ba9596fa1d427974f6fc7a2cfea728870b9f2f06048cd426f0f2d3d2375f51f67a9 - languageName: node - linkType: hard - -"eslint-utils@npm:^3.0.0": - version: 3.0.0 - resolution: "eslint-utils@npm:3.0.0" - dependencies: - eslint-visitor-keys: "npm:^2.0.0" - peerDependencies: - eslint: ">=5" - checksum: 10/7675260a6b220c70f13e4cdbf077e93cad0dfb388429a27d6c0b584b2b20dca24594508e8bdb00a460a5764bd364a5018e20c2b8b1d70f82bcc3fdc30692a4d2 - languageName: node - linkType: hard - -"eslint-visitor-keys@npm:^2.0.0": - version: 2.1.0 - resolution: "eslint-visitor-keys@npm:2.1.0" - checksum: 10/db4547eef5039122d518fa307e938ceb8589da5f6e8f5222efaf14dd62f748ce82e2d2becd3ff9412a50350b726bda95dbea8515a471074547daefa58aee8735 + checksum: 10/d17c2e1ff4d3a98911414a954531078db912e2747d6da8ea4cafd16d0526e32086c676ce9aeaffb3ca0ff695fc951ac3169d7f08a0b42962db683dff126cc95b languageName: node linkType: hard @@ -8480,70 +6856,77 @@ __metadata: languageName: node linkType: hard -"eslint-visitor-keys@npm:^3.4.1": +"eslint-visitor-keys@npm:^3.4.1, eslint-visitor-keys@npm:^3.4.3": version: 3.4.3 resolution: "eslint-visitor-keys@npm:3.4.3" checksum: 10/3f357c554a9ea794b094a09bd4187e5eacd1bc0d0653c3adeb87962c548e6a1ab8f982b86963ae1337f5d976004146536dcee5d0e2806665b193fbfbf1a9231b languageName: node linkType: hard -"eslint@npm:8.22.0": - version: 8.22.0 - resolution: "eslint@npm:8.22.0" +"eslint-visitor-keys@npm:^4.0.0": + version: 4.0.0 + resolution: "eslint-visitor-keys@npm:4.0.0" + checksum: 10/c7617166e6291a15ce2982b5c4b9cdfb6409f5c14562712d12e2584480cdf18609694b21d7dad35b02df0fa2cd037505048ded54d2f405c64f600949564eb334 + languageName: node + linkType: hard + +"eslint@npm:9.10.0": + version: 9.10.0 + resolution: "eslint@npm:9.10.0" dependencies: - "@eslint/eslintrc": "npm:^1.3.0" - "@humanwhocodes/config-array": "npm:^0.10.4" - "@humanwhocodes/gitignore-to-minimatch": "npm:^1.0.2" - ajv: "npm:^6.10.0" + "@eslint-community/eslint-utils": "npm:^4.2.0" + "@eslint-community/regexpp": "npm:^4.11.0" + "@eslint/config-array": "npm:^0.18.0" + "@eslint/eslintrc": "npm:^3.1.0" + "@eslint/js": "npm:9.10.0" + "@eslint/plugin-kit": "npm:^0.1.0" + "@humanwhocodes/module-importer": "npm:^1.0.1" + "@humanwhocodes/retry": "npm:^0.3.0" + "@nodelib/fs.walk": "npm:^1.2.8" + ajv: "npm:^6.12.4" chalk: "npm:^4.0.0" cross-spawn: "npm:^7.0.2" debug: "npm:^4.3.2" - doctrine: "npm:^3.0.0" escape-string-regexp: "npm:^4.0.0" - eslint-scope: "npm:^7.1.1" - eslint-utils: "npm:^3.0.0" - eslint-visitor-keys: "npm:^3.3.0" - espree: "npm:^9.3.3" - esquery: "npm:^1.4.0" + eslint-scope: "npm:^8.0.2" + eslint-visitor-keys: "npm:^4.0.0" + espree: "npm:^10.1.0" + esquery: "npm:^1.5.0" esutils: "npm:^2.0.2" fast-deep-equal: "npm:^3.1.3" - file-entry-cache: "npm:^6.0.1" + file-entry-cache: "npm:^8.0.0" find-up: "npm:^5.0.0" - functional-red-black-tree: "npm:^1.0.1" - glob-parent: "npm:^6.0.1" - globals: "npm:^13.15.0" - globby: "npm:^11.1.0" - grapheme-splitter: "npm:^1.0.4" + glob-parent: "npm:^6.0.2" ignore: "npm:^5.2.0" - import-fresh: "npm:^3.0.0" imurmurhash: "npm:^0.1.4" is-glob: "npm:^4.0.0" - js-yaml: "npm:^4.1.0" + is-path-inside: "npm:^3.0.3" json-stable-stringify-without-jsonify: "npm:^1.0.1" - levn: "npm:^0.4.1" lodash.merge: "npm:^4.6.2" minimatch: "npm:^3.1.2" natural-compare: "npm:^1.4.0" - optionator: "npm:^0.9.1" - regexpp: "npm:^3.2.0" + optionator: "npm:^0.9.3" strip-ansi: "npm:^6.0.1" - strip-json-comments: "npm:^3.1.0" text-table: "npm:^0.2.0" - v8-compile-cache: "npm:^2.0.3" + peerDependencies: + jiti: "*" + peerDependenciesMeta: + jiti: + optional: true bin: eslint: bin/eslint.js - checksum: 10/67bf1fb5cb54521910b939264f2832af7f2478b039af4cb2176ade3783cc3a1cee7d33928c29f56aae1420703f879ddb1281b4c23b92335d4d4a0daf5c1b1b35 + checksum: 10/bbb6da7db83f5182cff5a5e1681cf77be761e37bfbfedf66add9d3d2a216dbc336e787d02d05a2ea85179c51a10203713b2438b86adfd7666c29afd3ee008fe8 languageName: node linkType: hard -"espree@npm:^9.3.3, espree@npm:^9.4.0": - version: 9.4.0 - resolution: "espree@npm:9.4.0" +"espree@npm:^10.0.1, espree@npm:^10.1.0": + version: 10.1.0 + resolution: "espree@npm:10.1.0" dependencies: - acorn: "npm:^8.8.0" + acorn: "npm:^8.12.0" acorn-jsx: "npm:^5.3.2" - eslint-visitor-keys: "npm:^3.3.0" - checksum: 10/d0e156213ecdc12b225afc5db3ce7a46068be350c39caa05cf08a59ee91efce1ef5620aa40ac5cd52b89233d62f2eba998580e67f8366f5e6bbb4aa7d24ab2f4 + eslint-visitor-keys: "npm:^4.0.0" + checksum: 10/a673aa39a19a51763d92272f8f3772ae3d4b10624740bb72d5f273b631b43f1a5a32b385c1da6ae6bc10be05a5913bc4679ebd22a09c7b336a745204834806ea languageName: node linkType: hard @@ -8557,12 +6940,12 @@ __metadata: languageName: node linkType: hard -"esquery@npm:^1.4.0": - version: 1.4.0 - resolution: "esquery@npm:1.4.0" +"esquery@npm:^1.5.0": + version: 1.6.0 + resolution: "esquery@npm:1.6.0" dependencies: estraverse: "npm:^5.1.0" - checksum: 10/25b571ec54f186521819be48cd12643f9f5bdef6be9679161a48dec9cfd478764970a77ef563a516cf1f0f05e7e490e3ff2d514715b86cb8d03329cbb56ae4a8 + checksum: 10/c587fb8ec9ed83f2b1bc97cf2f6854cc30bf784a79d62ba08c6e358bf22280d69aee12827521cf38e69ae9761d23fb7fde593ce315610f85655c139d99b05e5a languageName: node linkType: hard @@ -8575,13 +6958,6 @@ __metadata: languageName: node linkType: hard -"estraverse@npm:^4.1.1": - version: 4.3.0 - resolution: "estraverse@npm:4.3.0" - checksum: 10/3f67ad02b6dbfaddd9ea459cf2b6ef4ecff9a6082a7af9d22e445b9abc082ad9ca47e1825557b293fcdae477f4714e561123e30bb6a5b2f184fb2bad4a9497eb - languageName: node - linkType: hard - "estraverse@npm:^5.1.0, estraverse@npm:^5.2.0": version: 5.3.0 resolution: "estraverse@npm:5.3.0" @@ -8633,6 +7009,23 @@ __metadata: languageName: node linkType: hard +"execa@npm:5.0.0": + version: 5.0.0 + resolution: "execa@npm:5.0.0" + dependencies: + cross-spawn: "npm:^7.0.3" + get-stream: "npm:^6.0.0" + human-signals: "npm:^2.1.0" + is-stream: "npm:^2.0.0" + merge-stream: "npm:^2.0.0" + npm-run-path: "npm:^4.0.1" + onetime: "npm:^5.1.2" + signal-exit: "npm:^3.0.3" + strip-final-newline: "npm:^2.0.0" + checksum: 10/9cc45d682725f0c5d22b5846c06be4542c1df1775332e2e62c7a6a51613e2b7f54792044266e3dcffec8b24c55ee5837349f93f489f75ce52446e3c08feaa32e + languageName: node + linkType: hard + "execa@npm:5.1.1, execa@npm:^5.0.0": version: 5.1.1 resolution: "execa@npm:5.1.1" @@ -8733,13 +7126,6 @@ __metadata: languageName: node linkType: hard -"exit@npm:^0.1.2": - version: 0.1.2 - resolution: "exit@npm:0.1.2" - checksum: 10/387555050c5b3c10e7a9e8df5f43194e95d7737c74532c409910e585d5554eaff34960c166643f5e23d042196529daad059c292dcf1fb61b8ca878d3677f4b87 - languageName: node - linkType: hard - "expand-brackets@npm:^2.1.4": version: 2.1.4 resolution: "expand-brackets@npm:2.1.4" @@ -8755,19 +7141,6 @@ __metadata: languageName: node linkType: hard -"expect@npm:^29.5.0": - version: 29.5.0 - resolution: "expect@npm:29.5.0" - dependencies: - "@jest/expect-utils": "npm:^29.5.0" - jest-get-type: "npm:^29.4.3" - jest-matcher-utils: "npm:^29.5.0" - jest-message-util: "npm:^29.5.0" - jest-util: "npm:^29.5.0" - checksum: 10/32135b6d4ff798963eeac04f47fac3ee36f9b33532cf2ba91c8fd2e4fbba09a87bc8b02dab49c07d5c431c0471079272977b42602c2b75e601eb29b02e92e61e - languageName: node - linkType: hard - "exponential-backoff@npm:^3.1.1": version: 3.1.1 resolution: "exponential-backoff@npm:3.1.1" @@ -8880,22 +7253,9 @@ __metadata: linkType: hard "fast-diff@npm:^1.1.2": - version: 1.2.0 - resolution: "fast-diff@npm:1.2.0" - checksum: 10/f62419b3d770f201d51c3ee8c4443b752b3ba2d548a6639026b7e09a08203ed2699a8d1fe21efcb8c5186135002d5d2916c12a687cac63785626456a92915adc - languageName: node - linkType: hard - -"fast-glob@npm:3.2.7": - version: 3.2.7 - resolution: "fast-glob@npm:3.2.7" - dependencies: - "@nodelib/fs.stat": "npm:^2.0.2" - "@nodelib/fs.walk": "npm:^1.2.3" - glob-parent: "npm:^5.1.2" - merge2: "npm:^1.3.0" - micromatch: "npm:^4.0.4" - checksum: 10/86ef62a138ede74916a10215cfea01cc4fbc18da77f56b802d08db2eff81f47ce1e7f77eda246977b6d600d9b1865eeff599db9899d99b655cb4fea3da146efa + version: 1.3.0 + resolution: "fast-diff@npm:1.3.0" + checksum: 10/9e57415bc69cd6efcc720b3b8fe9fdaf42dcfc06f86f0f45378b1fa512598a8aac48aa3928c8751d58e2f01bb4ba4f07e4f3d9bc0d57586d45f1bd1e872c6cde languageName: node linkType: hard @@ -8952,7 +7312,7 @@ __metadata: languageName: node linkType: hard -"fast-json-stable-stringify@npm:2.x, fast-json-stable-stringify@npm:^2.0.0, fast-json-stable-stringify@npm:^2.1.0": +"fast-json-stable-stringify@npm:2.x, fast-json-stable-stringify@npm:^2.0.0": version: 2.1.0 resolution: "fast-json-stable-stringify@npm:2.1.0" checksum: 10/2c20055c1fa43c922428f16ca8bb29f2807de63e5c851f665f7ac9790176c01c3b40335257736b299764a8d383388dabc73c8083b8e1bc3d99f0a941444ec60e @@ -8989,15 +7349,6 @@ __metadata: languageName: node linkType: hard -"fb-watchman@npm:^2.0.0": - version: 2.0.1 - resolution: "fb-watchman@npm:2.0.1" - dependencies: - bser: "npm:2.1.1" - checksum: 10/9a03efc7d41ce3ca3d799d63505a1f7312caddf4e7737d39f2165bfe4872cbd4b87eccc9e6c57229ea08f14b4d7187896da31a7270b8da7a4aaa8fba2d3d1c42 - languageName: node - linkType: hard - "figures@npm:*, figures@npm:4.0.1": version: 4.0.1 resolution: "figures@npm:4.0.1" @@ -9045,12 +7396,21 @@ __metadata: languageName: node linkType: hard -"file-entry-cache@npm:^6.0.1": - version: 6.0.1 - resolution: "file-entry-cache@npm:6.0.1" +"file-entry-cache@npm:^8.0.0": + version: 8.0.0 + resolution: "file-entry-cache@npm:8.0.0" dependencies: - flat-cache: "npm:^3.0.4" - checksum: 10/099bb9d4ab332cb93c48b14807a6918a1da87c45dce91d4b61fd40e6505d56d0697da060cb901c729c90487067d93c9243f5da3dc9c41f0358483bfdebca736b + flat-cache: "npm:^4.0.0" + checksum: 10/afe55c4de4e0d226a23c1eae62a7219aafb390859122608a89fa4df6addf55c7fd3f1a2da6f5b41e7cdff496e4cf28bbd215d53eab5c817afa96d2b40c81bfb0 + languageName: node + linkType: hard + +"filelist@npm:^1.0.4": + version: 1.0.4 + resolution: "filelist@npm:1.0.4" + dependencies: + minimatch: "npm:^5.0.1" + checksum: 10/4b436fa944b1508b95cffdfc8176ae6947b92825483639ef1b9a89b27d82f3f8aa22b21eed471993f92709b431670d4e015b39c087d435a61e1bb04564cf51de languageName: node linkType: hard @@ -9141,13 +7501,13 @@ __metadata: languageName: node linkType: hard -"flat-cache@npm:^3.0.4": - version: 3.0.4 - resolution: "flat-cache@npm:3.0.4" +"flat-cache@npm:^4.0.0": + version: 4.0.1 + resolution: "flat-cache@npm:4.0.1" dependencies: - flatted: "npm:^3.1.0" - rimraf: "npm:^3.0.2" - checksum: 10/9fe5d0cb97c988e3b25242e71346965fae22757674db3fca14206850af2efa3ca3b04a3ba0eba8d5e20fd8a3be80a2e14b1c2917e70ffe1acb98a8c3327e4c9f + flatted: "npm:^3.2.9" + keyv: "npm:^4.5.4" + checksum: 10/58ce851d9045fffc7871ce2bd718bc485ad7e777bf748c054904b87c351ff1080c2c11da00788d78738bfb51b71e4d5ea12d13b98eb36e3358851ffe495b62dc languageName: node linkType: hard @@ -9160,10 +7520,10 @@ __metadata: languageName: node linkType: hard -"flatted@npm:^3.1.0": - version: 3.2.5 - resolution: "flatted@npm:3.2.5" - checksum: 10/eed01f72ad0317561e4d6187f7408dc391f7849d9cd6700520ce06155d1859539b6899afdfefc815ce51ec48f97d1015350287c541b5302a49581cf25cec1cd2 +"flatted@npm:^3.2.9": + version: 3.3.1 + resolution: "flatted@npm:3.3.1" + checksum: 10/7b8376061d5be6e0d3658bbab8bde587647f68797cf6bfeae9dea0e5137d9f27547ab92aaff3512dd9d1299086a6d61be98e9d48a56d17531b634f77faadbc49 languageName: node linkType: hard @@ -9187,6 +7547,16 @@ __metadata: languageName: node linkType: hard +"follow-redirects@npm:^1.15.6": + version: 1.15.9 + resolution: "follow-redirects@npm:1.15.9" + peerDependenciesMeta: + debug: + optional: true + checksum: 10/e3ab42d1097e90d28b913903841e6779eb969b62a64706a3eb983e894a5db000fbd89296f45f08885a0e54cd558ef62e81be1165da9be25a6c44920da10f424c + languageName: node + linkType: hard + "for-in@npm:^1.0.1, for-in@npm:^1.0.2": version: 1.0.2 resolution: "for-in@npm:1.0.2" @@ -9261,6 +7631,15 @@ __metadata: languageName: node linkType: hard +"front-matter@npm:^4.0.2": + version: 4.0.2 + resolution: "front-matter@npm:4.0.2" + dependencies: + js-yaml: "npm:^3.13.1" + checksum: 10/8897a831a82c5d35413b02b806ed421e793068ad8bf75e864163ec07b7f0cfd87e2fcce0893e8ceccc8f6c63a46e953a6c01208e573627626867a8b86cf6abb9 + languageName: node + linkType: hard + "fs-constants@npm:^1.0.0": version: 1.0.0 resolution: "fs-constants@npm:1.0.0" @@ -9297,7 +7676,7 @@ __metadata: languageName: node linkType: hard -"fs-extra@npm:>=11.2.0, fs-extra@npm:^11.0.0, fs-extra@npm:^11.1.0": +"fs-extra@npm:>=11.2.0, fs-extra@npm:^11.0.0, fs-extra@npm:^11.1.0, fs-extra@npm:^11.2.0": version: 11.2.0 resolution: "fs-extra@npm:11.2.0" dependencies: @@ -9319,18 +7698,6 @@ __metadata: languageName: node linkType: hard -"fs-extra@npm:^9.1.0": - version: 9.1.0 - resolution: "fs-extra@npm:9.1.0" - dependencies: - at-least-node: "npm:^1.0.0" - graceful-fs: "npm:^4.2.0" - jsonfile: "npm:^6.0.1" - universalify: "npm:^2.0.0" - checksum: 10/08600da1b49552ed23dfac598c8fc909c66776dd130fea54fbcad22e330f7fcc13488bb995f6bc9ce5651aa35b65702faf616fe76370ee56f1aade55da982dca - languageName: node - linkType: hard - "fs-minipass@npm:^2.0.0, fs-minipass@npm:^2.1.0": version: 2.1.0 resolution: "fs-minipass@npm:2.1.0" @@ -9356,16 +7723,6 @@ __metadata: languageName: node linkType: hard -"fsevents@npm:^2.3.2": - version: 2.3.2 - resolution: "fsevents@npm:2.3.2" - dependencies: - node-gyp: "npm:latest" - checksum: 10/6b5b6f5692372446ff81cf9501c76e3e0459a4852b3b5f1fc72c103198c125a6b8c72f5f166bdd76ffb2fca261e7f6ee5565daf80dca6e571e55bcc589cc1256 - conditions: os=darwin - languageName: node - linkType: hard - "fsevents@npm:~2.3.2, fsevents@npm:~2.3.3": version: 2.3.3 resolution: "fsevents@npm:2.3.3" @@ -9376,15 +7733,6 @@ __metadata: languageName: node linkType: hard -"fsevents@patch:fsevents@npm%3A^2.3.2#optional!builtin": - version: 2.3.2 - resolution: "fsevents@patch:fsevents@npm%3A2.3.2#optional!builtin::version=2.3.2&hash=df0bf1" - dependencies: - node-gyp: "npm:latest" - conditions: os=darwin - languageName: node - linkType: hard - "fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin, fsevents@patch:fsevents@npm%3A~2.3.3#optional!builtin": version: 2.3.3 resolution: "fsevents@patch:fsevents@npm%3A2.3.3#optional!builtin::version=2.3.3&hash=df0bf1" @@ -9408,13 +7756,6 @@ __metadata: languageName: node linkType: hard -"functional-red-black-tree@npm:^1.0.1": - version: 1.0.1 - resolution: "functional-red-black-tree@npm:1.0.1" - checksum: 10/debe73e92204341d1fa5f89614e44284d3add26dee660722978d8c50829170f87d1c74768f68c251d215ae461c11db7bac13101c77f4146ff051da75466f7a12 - languageName: node - linkType: hard - "gauge@npm:^4.0.3": version: 4.0.4 resolution: "gauge@npm:4.0.4" @@ -9447,13 +7788,6 @@ __metadata: languageName: node linkType: hard -"gensync@npm:^1.0.0-beta.2": - version: 1.0.0-beta.2 - resolution: "gensync@npm:1.0.0-beta.2" - checksum: 10/17d8333460204fbf1f9160d067e1e77f908a5447febb49424b8ab043026049835c9ef3974445c57dbd39161f4d2b04356d7de12b2eecaa27a7a7ea7d871cbedd - languageName: node - linkType: hard - "get-caller-file@npm:^2.0.5": version: 2.0.5 resolution: "get-caller-file@npm:2.0.5" @@ -9508,14 +7842,7 @@ __metadata: languageName: node linkType: hard -"get-package-type@npm:^0.1.0": - version: 0.1.0 - resolution: "get-package-type@npm:0.1.0" - checksum: 10/bba0811116d11e56d702682ddef7c73ba3481f114590e705fc549f4d868972263896af313c57a25c076e3c0d567e11d919a64ba1b30c879be985fc9d44f96148 - languageName: node - linkType: hard - -"get-pkg-repo@npm:^4.0.0": +"get-pkg-repo@npm:^4.2.1": version: 4.2.1 resolution: "get-pkg-repo@npm:4.2.1" dependencies: @@ -9529,13 +7856,20 @@ __metadata: languageName: node linkType: hard -"get-port@npm:^5.1.1": +"get-port@npm:5.1.1": version: 5.1.1 resolution: "get-port@npm:5.1.1" checksum: 10/0162663ffe5c09e748cd79d97b74cd70e5a5c84b760a475ce5767b357fb2a57cb821cee412d646aa8a156ed39b78aab88974eddaa9e5ee926173c036c0713787 languageName: node linkType: hard +"get-stream@npm:6.0.0": + version: 6.0.0 + resolution: "get-stream@npm:6.0.0" + checksum: 10/a8bf40227191743149ab5d5d05f9577cb95768b60456553319296ad4e8566aa9cd3611b5f0f3168697f135233b24e47c761b3b225db6f79fb86326d11a3a0c2c + languageName: node + linkType: hard + "get-stream@npm:^3.0.0": version: 3.0.0 resolution: "get-stream@npm:3.0.0" @@ -9640,18 +7974,31 @@ __metadata: languageName: node linkType: hard -"git-raw-commits@npm:^2.0.0, git-raw-commits@npm:^2.0.8": +"git-raw-commits@npm:^2.0.0": version: 2.0.11 resolution: "git-raw-commits@npm:2.0.11" dependencies: dargs: "npm:^7.0.0" - lodash: "npm:^4.17.15" - meow: "npm:^8.0.0" - split2: "npm:^3.0.0" - through2: "npm:^4.0.0" + lodash: "npm:^4.17.15" + meow: "npm:^8.0.0" + split2: "npm:^3.0.0" + through2: "npm:^4.0.0" + bin: + git-raw-commits: cli.js + checksum: 10/04e02b3da7c0e13a55f3e6fa8c1c5f06f7d0d641a9f90d896393ef0144bfcf91aa59beede68d14d61ed56aaf09f2c8dba175563c47ec000a8cf70f9df4877577 + languageName: node + linkType: hard + +"git-raw-commits@npm:^3.0.0": + version: 3.0.0 + resolution: "git-raw-commits@npm:3.0.0" + dependencies: + dargs: "npm:^7.0.0" + meow: "npm:^8.1.2" + split2: "npm:^3.2.2" bin: git-raw-commits: cli.js - checksum: 10/04e02b3da7c0e13a55f3e6fa8c1c5f06f7d0d641a9f90d896393ef0144bfcf91aa59beede68d14d61ed56aaf09f2c8dba175563c47ec000a8cf70f9df4877577 + checksum: 10/198892f307829d22fc8ec1c9b4a63876a1fde847763857bb74bd1b04c6f6bc0d7464340c25d0f34fd0fb395759363aa1f8ce324357027320d80523bf234676ab languageName: node linkType: hard @@ -9665,34 +8012,34 @@ __metadata: languageName: node linkType: hard -"git-semver-tags@npm:^4.1.1": - version: 4.1.1 - resolution: "git-semver-tags@npm:4.1.1" +"git-semver-tags@npm:^5.0.0": + version: 5.0.1 + resolution: "git-semver-tags@npm:5.0.1" dependencies: - meow: "npm:^8.0.0" - semver: "npm:^6.0.0" + meow: "npm:^8.1.2" + semver: "npm:^7.0.0" bin: git-semver-tags: cli.js - checksum: 10/ab2ad6c7c81aeb6e703f9c9dd1d590a4c546a86b036540780ca414eb6d327f582a9c2d164899ccf0c20e1e875ec4db13b1e665c12c9d5c802eee79d9c71fdd0f + checksum: 10/056e34a3dd0d91ca737225d360e46a0330c92f1508c38ad93965c3a204e5c7bfe7746f1f7e7d6b456bd61245c770fd0755148823bf852eed71099d094bee6cc2 languageName: node linkType: hard -"git-up@npm:^6.0.0": - version: 6.0.0 - resolution: "git-up@npm:6.0.0" +"git-up@npm:^7.0.0": + version: 7.0.0 + resolution: "git-up@npm:7.0.0" dependencies: is-ssh: "npm:^1.4.0" - parse-url: "npm:^7.0.2" - checksum: 10/2ed3b1227bfc2406d2c03d35ae3689344a683eb6cf9579f53fc4be12f74de294dc45aff9944ad81c9385fcc59acb764f7e0f2784e4e4db9d6de74b5877495253 + parse-url: "npm:^8.1.0" + checksum: 10/003ef38424702ac4cbe6d2817ccfb5811251244c955a8011ca40298d12cf1fb6529529f074d5832b5221e193ec05f4742ecf7806e6c4f41a81a2f2cff65d6bf4 languageName: node linkType: hard -"git-url-parse@npm:^12.0.0": - version: 12.0.0 - resolution: "git-url-parse@npm:12.0.0" +"git-url-parse@npm:14.0.0": + version: 14.0.0 + resolution: "git-url-parse@npm:14.0.0" dependencies: - git-up: "npm:^6.0.0" - checksum: 10/c3a181944e56a306b21ab91ab27e3e4861643f9e441a09331069f05a1cb677e331745c254370f707b606bb75ec0af0b14ff966a8ccc031858d57afb6c14a53ce + git-up: "npm:^7.0.0" + checksum: 10/c19430947895676c59ce472d534c88e5d2d9f443e6b6e4deaa8ad9ad921ded6c27a996b219503775c37fbb90f4a3c02a5f106f14b61286386f9e5098dff7d634 languageName: node linkType: hard @@ -9705,6 +8052,15 @@ __metadata: languageName: node linkType: hard +"glob-parent@npm:6.0.2, glob-parent@npm:^6.0.2": + version: 6.0.2 + resolution: "glob-parent@npm:6.0.2" + dependencies: + is-glob: "npm:^4.0.3" + checksum: 10/c13ee97978bef4f55106b71e66428eb1512e71a7466ba49025fc2aec59a5bfb0954d5abd58fc5ee6c9b076eef4e1f6d3375c2e964b88466ca390da4419a786a8 + languageName: node + linkType: hard + "glob-parent@npm:^3.1.0": version: 3.1.0 resolution: "glob-parent@npm:3.1.0" @@ -9715,7 +8071,7 @@ __metadata: languageName: node linkType: hard -"glob-parent@npm:^5.1.1, glob-parent@npm:^5.1.2": +"glob-parent@npm:^5.1.2": version: 5.1.2 resolution: "glob-parent@npm:5.1.2" dependencies: @@ -9724,15 +8080,6 @@ __metadata: languageName: node linkType: hard -"glob-parent@npm:^6.0.1": - version: 6.0.2 - resolution: "glob-parent@npm:6.0.2" - dependencies: - is-glob: "npm:^4.0.3" - checksum: 10/c13ee97978bef4f55106b71e66428eb1512e71a7466ba49025fc2aec59a5bfb0954d5abd58fc5ee6c9b076eef4e1f6d3375c2e964b88466ca390da4419a786a8 - languageName: node - linkType: hard - "glob-to-regexp@npm:^0.3.0": version: 0.3.0 resolution: "glob-to-regexp@npm:0.3.0" @@ -9740,20 +8087,6 @@ __metadata: languageName: node linkType: hard -"glob@npm:7.1.4": - version: 7.1.4 - resolution: "glob@npm:7.1.4" - dependencies: - fs.realpath: "npm:^1.0.0" - inflight: "npm:^1.0.4" - inherits: "npm:2" - minimatch: "npm:^3.0.4" - once: "npm:^1.3.0" - path-is-absolute: "npm:^1.0.0" - checksum: 10/776bcc31371797eb5cf6b58c4618378f8df83d23f00aef8e98af5e7f0e59f5ee8b470c4e95e71cfa7a8682634849e21ea1f1ad38639c1828a2dbc2757bf7a63b - languageName: node - linkType: hard - "glob@npm:7.1.6": version: 7.1.6 resolution: "glob@npm:7.1.6" @@ -9826,6 +8159,18 @@ __metadata: languageName: node linkType: hard +"glob@npm:^9.2.0": + version: 9.3.5 + resolution: "glob@npm:9.3.5" + dependencies: + fs.realpath: "npm:^1.0.0" + minimatch: "npm:^8.0.2" + minipass: "npm:^4.2.4" + path-scurry: "npm:^1.6.1" + checksum: 10/e5fa8a58adf53525bca42d82a1fad9e6800032b7e4d372209b80cfdca524dd9a7dbe7d01a92d7ed20d89c572457f12c250092bc8817cb4f1c63efefdf9b658c0 + languageName: node + linkType: hard + "global-directory@npm:^4.0.1": version: 4.0.1 resolution: "global-directory@npm:4.0.1" @@ -9853,19 +8198,10 @@ __metadata: languageName: node linkType: hard -"globals@npm:^11.1.0": - version: 11.12.0 - resolution: "globals@npm:11.12.0" - checksum: 10/9f054fa38ff8de8fa356502eb9d2dae0c928217b8b5c8de1f09f5c9b6c8a96d8b9bd3afc49acbcd384a98a81fea713c859e1b09e214c60509517bb8fc2bc13c2 - languageName: node - linkType: hard - -"globals@npm:^13.15.0": - version: 13.17.0 - resolution: "globals@npm:13.17.0" - dependencies: - type-fest: "npm:^0.20.2" - checksum: 10/1e3e0ede067a99ca16bdeb2fe241d5f8f2458d1bf64b8c17986b17e42ab0760c9a4bc190f2ae4359337d63de1d96ed07b93b29c47282f724f1a56b958c5df6f0 +"globals@npm:^14.0.0": + version: 14.0.0 + resolution: "globals@npm:14.0.0" + checksum: 10/03939c8af95c6df5014b137cac83aa909090c3a3985caef06ee9a5a669790877af8698ab38007e4c0186873adc14c0b13764acc754b16a754c216cc56aa5f021 languageName: node linkType: hard @@ -9882,7 +8218,7 @@ __metadata: languageName: node linkType: hard -"globby@npm:11.1.0, globby@npm:^11.0.2, globby@npm:^11.1.0": +"globby@npm:11.1.0, globby@npm:^11.1.0": version: 11.1.0 resolution: "globby@npm:11.1.0" dependencies: @@ -9990,17 +8326,17 @@ __metadata: languageName: node linkType: hard -"graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.11": +"graceful-fs@npm:4.2.11, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.11": version: 4.2.11 resolution: "graceful-fs@npm:4.2.11" checksum: 10/bf152d0ed1dc159239db1ba1f74fdbc40cb02f626770dcd5815c427ce0688c2635a06ed69af364396da4636d0408fcf7d4afdf7881724c3307e46aff30ca49e2 languageName: node linkType: hard -"grapheme-splitter@npm:^1.0.4": - version: 1.0.4 - resolution: "grapheme-splitter@npm:1.0.4" - checksum: 10/fdb2f51fd430ce881e18e44c4934ad30e59736e46213f7ad35ea5970a9ebdf7d0fe56150d15cc98230d55d2fd48c73dc6781494c38d8cf2405718366c36adb88 +"graphemer@npm:^1.4.0": + version: 1.4.0 + resolution: "graphemer@npm:1.4.0" + checksum: 10/6dd60dba97007b21e3a829fab3f771803cc1292977fe610e240ea72afd67e5690ac9eeaafc4a99710e78962e5936ab5a460787c2a1180f1cb0ccfac37d29f897 languageName: node linkType: hard @@ -10168,7 +8504,7 @@ __metadata: languageName: node linkType: hard -"has-unicode@npm:^2.0.1": +"has-unicode@npm:2.0.1, has-unicode@npm:^2.0.1": version: 2.0.1 resolution: "has-unicode@npm:2.0.1" checksum: 10/041b4293ad6bf391e21c5d85ed03f412506d6623786b801c4ab39e4e6ca54993f13201bceb544d92963f9e0024e6e7fbf0cb1d84c9d6b31cb9c79c8c990d13d8 @@ -10318,15 +8654,6 @@ __metadata: languageName: node linkType: hard -"hosted-git-info@npm:^3.0.6": - version: 3.0.8 - resolution: "hosted-git-info@npm:3.0.8" - dependencies: - lru-cache: "npm:^6.0.0" - checksum: 10/fac26fe551d87f271b31e80e5a7519cbb50a3c30ea89cad734da8068930f27288a049258e6ed9c39e20ebec9cf4b67c5cb02055bd73230962ef34db0d45da3e7 - languageName: node - linkType: hard - "hosted-git-info@npm:^4.0.0, hosted-git-info@npm:^4.0.1": version: 4.1.0 resolution: "hosted-git-info@npm:4.1.0" @@ -10336,15 +8663,6 @@ __metadata: languageName: node linkType: hard -"hosted-git-info@npm:^5.0.0": - version: 5.2.1 - resolution: "hosted-git-info@npm:5.2.1" - dependencies: - lru-cache: "npm:^7.5.1" - checksum: 10/f0cb6527162b61a65ac350a4d11f55f16629278a19ca61bf421f272c22531b9a1bad34e874b980db6be512130f189c81d1eb9b481b60eeda293b6dc8d35d2aec - languageName: node - linkType: hard - "hosted-git-info@npm:^7.0.0, hosted-git-info@npm:^7.0.1": version: 7.0.1 resolution: "hosted-git-info@npm:7.0.1" @@ -10354,6 +8672,15 @@ __metadata: languageName: node linkType: hard +"hosted-git-info@npm:^7.0.2": + version: 7.0.2 + resolution: "hosted-git-info@npm:7.0.2" + dependencies: + lru-cache: "npm:^10.0.1" + checksum: 10/8f085df8a4a637d995f357f48b1e3f6fc1f9f92e82b33fb406415b5741834ed431a510a09141071001e8deea2eee43ce72786463e2aa5e5a70db8648c0eedeab + languageName: node + linkType: hard + "html-escaper@npm:^2.0.0": version: 2.0.2 resolution: "html-escaper@npm:2.0.2" @@ -10525,15 +8852,6 @@ __metadata: languageName: node linkType: hard -"ignore-walk@npm:^5.0.1": - version: 5.0.1 - resolution: "ignore-walk@npm:5.0.1" - dependencies: - minimatch: "npm:^5.0.1" - checksum: 10/a88b3fbda155496363fb3db66c7c7b85cf04d614fb51146f0aa5fc6b35c65370c57f9e6c550cd6048651fc378985b7a2bb9015c9fcb3e0dc798fc0728746703c - languageName: node - linkType: hard - "ignore-walk@npm:^6.0.4": version: 6.0.4 resolution: "ignore-walk@npm:6.0.4" @@ -10564,6 +8882,13 @@ __metadata: languageName: node linkType: hard +"ignore@npm:^5.3.1": + version: 5.3.2 + resolution: "ignore@npm:5.3.2" + checksum: 10/cceb6a457000f8f6a50e1196429750d782afce5680dd878aa4221bd79972d68b3a55b4b1458fc682be978f4d3c6a249046aa0880637367216444ab7b014cfc98 + languageName: node + linkType: hard + "import-fresh@npm:^3.0.0, import-fresh@npm:^3.2.1, import-fresh@npm:^3.3.0": version: 3.3.0 resolution: "import-fresh@npm:3.3.0" @@ -10598,7 +8923,7 @@ __metadata: languageName: node linkType: hard -"import-local@npm:^3.0.2": +"import-local@npm:3.1.0": version: 3.1.0 resolution: "import-local@npm:3.1.0" dependencies: @@ -10697,25 +9022,25 @@ __metadata: languageName: node linkType: hard -"ini@npm:^1.3.2, ini@npm:^1.3.4, ini@npm:~1.3.0": +"ini@npm:^1.3.2, ini@npm:^1.3.4, ini@npm:^1.3.8, ini@npm:~1.3.0": version: 1.3.8 resolution: "ini@npm:1.3.8" checksum: 10/314ae176e8d4deb3def56106da8002b462221c174ddb7ce0c49ee72c8cd1f9044f7b10cc555a7d8850982c3b9ca96fc212122749f5234bc2b6fb05fb942ed566 languageName: node linkType: hard -"init-package-json@npm:^3.0.2": - version: 3.0.2 - resolution: "init-package-json@npm:3.0.2" +"init-package-json@npm:6.0.3": + version: 6.0.3 + resolution: "init-package-json@npm:6.0.3" dependencies: - npm-package-arg: "npm:^9.0.1" - promzard: "npm:^0.3.0" - read: "npm:^1.0.7" - read-package-json: "npm:^5.0.0" + "@npmcli/package-json": "npm:^5.0.0" + npm-package-arg: "npm:^11.0.0" + promzard: "npm:^1.0.0" + read: "npm:^3.0.1" semver: "npm:^7.3.5" validate-npm-package-license: "npm:^3.0.4" - validate-npm-package-name: "npm:^4.0.0" - checksum: 10/fa0a4c709963e421d431213a2e2c56e438291df394a35a42057523b71872dcb74aa807b5ad26ced02f7ff3f5620faa0e5fecb93bb18ac849543040a9786b48d1 + validate-npm-package-name: "npm:^5.0.0" + checksum: 10/1274365e2c9e693395af07edc03692284b708fc101d7058cee956c02dca525f69c09748ac1c3de261f81ae42de301300bd62042b58943aa0088cb2c52e1e2e4f languageName: node linkType: hard @@ -11070,13 +9395,6 @@ __metadata: languageName: node linkType: hard -"is-generator-fn@npm:^2.0.0": - version: 2.1.0 - resolution: "is-generator-fn@npm:2.1.0" - checksum: 10/a6ad5492cf9d1746f73b6744e0c43c0020510b59d56ddcb78a91cbc173f09b5e6beff53d75c9c5a29feb618bfef2bf458e025ecf3a57ad2268e2fb2569f56215 - languageName: node - linkType: hard - "is-glob@npm:^3.1.0": version: 3.1.0 resolution: "is-glob@npm:3.1.0" @@ -11256,7 +9574,7 @@ __metadata: languageName: node linkType: hard -"is-path-inside@npm:^3.0.1, is-path-inside@npm:^3.0.2": +"is-path-inside@npm:^3.0.1, is-path-inside@npm:^3.0.2, is-path-inside@npm:^3.0.3": version: 3.0.3 resolution: "is-path-inside@npm:3.0.3" checksum: 10/abd50f06186a052b349c15e55b182326f1936c89a78bf6c8f2b707412517c097ce04bc49a0ca221787bc44e1049f51f09a2ffb63d22899051988d3a618ba13e9 @@ -11325,6 +9643,13 @@ __metadata: languageName: node linkType: hard +"is-stream@npm:2.0.0": + version: 2.0.0 + resolution: "is-stream@npm:2.0.0" + checksum: 10/4dc47738e26bc4f1b3be9070b6b9e39631144f204fc6f87db56961220add87c10a999ba26cf81699f9ef9610426f69cb08a4713feff8deb7d8cadac907826935 + languageName: node + linkType: hard + "is-stream@npm:^1.1.0": version: 1.1.0 resolution: "is-stream@npm:1.1.0" @@ -11486,7 +9811,7 @@ __metadata: languageName: node linkType: hard -"istanbul-lib-coverage@npm:^3.0.0, istanbul-lib-coverage@npm:^3.2.0": +"istanbul-lib-coverage@npm:^3.0.0": version: 3.2.0 resolution: "istanbul-lib-coverage@npm:3.2.0" checksum: 10/31621b84ad29339242b63d454243f558a7958ee0b5177749bacf1f74be7d95d3fd93853738ef7eebcddfaf3eab014716e51392a8dbd5aa1bdc1b15c2ebc53c24 @@ -11500,480 +9825,112 @@ __metadata: languageName: node linkType: hard -"istanbul-lib-instrument@npm:^5.0.4, istanbul-lib-instrument@npm:^5.1.0": - version: 5.2.0 - resolution: "istanbul-lib-instrument@npm:5.2.0" - dependencies: - "@babel/core": "npm:^7.12.3" - "@babel/parser": "npm:^7.14.7" - "@istanbuljs/schema": "npm:^0.1.2" - istanbul-lib-coverage: "npm:^3.2.0" - semver: "npm:^6.3.0" - checksum: 10/4caf04f696c80ee39ceb3c6633a77fef85d2f9071592e32ad1ce60aaa3be86489042fffd6cce9f1d4d14ee0c20663dc681875795562ed1cc85fe98fbae8a5895 - languageName: node - linkType: hard - "istanbul-lib-report@npm:^3.0.0": version: 3.0.0 resolution: "istanbul-lib-report@npm:3.0.0" dependencies: istanbul-lib-coverage: "npm:^3.0.0" make-dir: "npm:^3.0.0" - supports-color: "npm:^7.1.0" - checksum: 10/06b37952e9cb0fe419a37c7f3d74612a098167a9eb0e5264228036e78b42ca5226501e8130738b5306d94bae2ea068ca674080d4af959992523d84aacff67728 - languageName: node - linkType: hard - -"istanbul-lib-report@npm:^3.0.1": - version: 3.0.1 - resolution: "istanbul-lib-report@npm:3.0.1" - dependencies: - istanbul-lib-coverage: "npm:^3.0.0" - make-dir: "npm:^4.0.0" - supports-color: "npm:^7.1.0" - checksum: 10/86a83421ca1cf2109a9f6d193c06c31ef04a45e72a74579b11060b1e7bb9b6337a4e6f04abfb8857e2d569c271273c65e855ee429376a0d7c91ad91db42accd1 - languageName: node - linkType: hard - -"istanbul-lib-source-maps@npm:^4.0.0": - version: 4.0.1 - resolution: "istanbul-lib-source-maps@npm:4.0.1" - dependencies: - debug: "npm:^4.1.1" - istanbul-lib-coverage: "npm:^3.0.0" - source-map: "npm:^0.6.1" - checksum: 10/5526983462799aced011d776af166e350191b816821ea7bcf71cab3e5272657b062c47dc30697a22a43656e3ced78893a42de677f9ccf276a28c913190953b82 - languageName: node - linkType: hard - -"istanbul-lib-source-maps@npm:^5.0.6": - version: 5.0.6 - resolution: "istanbul-lib-source-maps@npm:5.0.6" - dependencies: - "@jridgewell/trace-mapping": "npm:^0.3.23" - debug: "npm:^4.1.1" - istanbul-lib-coverage: "npm:^3.0.0" - checksum: 10/569dd0a392ee3464b1fe1accbaef5cc26de3479eacb5b91d8c67ebb7b425d39fd02247d85649c3a0e9c29b600809fa60b5af5a281a75a89c01f385b1e24823a2 - languageName: node - linkType: hard - -"istanbul-reports@npm:^3.1.3": - version: 3.1.4 - resolution: "istanbul-reports@npm:3.1.4" - dependencies: - html-escaper: "npm:^2.0.0" - istanbul-lib-report: "npm:^3.0.0" - checksum: 10/b720f7ff87a37e1500e001913e781395b96cc6ca4d475e01da2ec78d1571435ded4b1b31fb53ef8d760bc5fa691b2b6b647bcb4c1238f6aaf58b261d47510c93 - languageName: node - linkType: hard - -"istanbul-reports@npm:^3.1.7": - version: 3.1.7 - resolution: "istanbul-reports@npm:3.1.7" - dependencies: - html-escaper: "npm:^2.0.0" - istanbul-lib-report: "npm:^3.0.0" - checksum: 10/f1faaa4684efaf57d64087776018d7426312a59aa6eeb4e0e3a777347d23cd286ad18f427e98f0e3dee666103d7404c9d7abc5f240406a912fa16bd6695437fa - languageName: node - linkType: hard - -"jackspeak@npm:^2.3.5": - version: 2.3.6 - resolution: "jackspeak@npm:2.3.6" - dependencies: - "@isaacs/cliui": "npm:^8.0.2" - "@pkgjs/parseargs": "npm:^0.11.0" - dependenciesMeta: - "@pkgjs/parseargs": - optional: true - checksum: 10/6e6490d676af8c94a7b5b29b8fd5629f21346911ebe2e32931c2a54210134408171c24cee1a109df2ec19894ad04a429402a8438cbf5cc2794585d35428ace76 - languageName: node - linkType: hard - -"jackspeak@npm:^3.1.2": - version: 3.4.3 - resolution: "jackspeak@npm:3.4.3" - dependencies: - "@isaacs/cliui": "npm:^8.0.2" - "@pkgjs/parseargs": "npm:^0.11.0" - dependenciesMeta: - "@pkgjs/parseargs": - optional: true - checksum: 10/96f8786eaab98e4bf5b2a5d6d9588ea46c4d06bbc4f2eb861fdd7b6b182b16f71d8a70e79820f335d52653b16d4843b29dd9cdcf38ae80406756db9199497cf3 - languageName: node - linkType: hard - -"java-properties@npm:^1.0.2": - version: 1.0.2 - resolution: "java-properties@npm:1.0.2" - checksum: 10/d6e8bf8a28a8782afadbcebf2504ab8ea2c75d3675d7eec470920f6c056fd90c8a35a2705cd492a07ec3b2309d3d848ff4cfae098a2cda33a922153eed4bef6a - languageName: node - linkType: hard - -"jest-changed-files@npm:^29.5.0": - version: 29.5.0 - resolution: "jest-changed-files@npm:29.5.0" - dependencies: - execa: "npm:^5.0.0" - p-limit: "npm:^3.1.0" - checksum: 10/6e337b09dca173dc60d53a1c880817ef31f91c6ddc23d93fabb7e714d4388857332c76e7a7fc627bf150e3fba0b70ba968912f86934bd176ca0dc66883303122 - languageName: node - linkType: hard - -"jest-circus@npm:^29.5.0": - version: 29.5.0 - resolution: "jest-circus@npm:29.5.0" - dependencies: - "@jest/environment": "npm:^29.5.0" - "@jest/expect": "npm:^29.5.0" - "@jest/test-result": "npm:^29.5.0" - "@jest/types": "npm:^29.5.0" - "@types/node": "npm:*" - chalk: "npm:^4.0.0" - co: "npm:^4.6.0" - dedent: "npm:^0.7.0" - is-generator-fn: "npm:^2.0.0" - jest-each: "npm:^29.5.0" - jest-matcher-utils: "npm:^29.5.0" - jest-message-util: "npm:^29.5.0" - jest-runtime: "npm:^29.5.0" - jest-snapshot: "npm:^29.5.0" - jest-util: "npm:^29.5.0" - p-limit: "npm:^3.1.0" - pretty-format: "npm:^29.5.0" - pure-rand: "npm:^6.0.0" - slash: "npm:^3.0.0" - stack-utils: "npm:^2.0.3" - checksum: 10/1b013c0f97f10768d6ebc0071c47a24cb6c40789be7a485c1a366776c93ae3455a1fd274b3a452e4684521face01cc053f6b39fa526b5d04a2ffa42650726ca3 - languageName: node - linkType: hard - -"jest-cli@npm:^29.5.0": - version: 29.5.0 - resolution: "jest-cli@npm:29.5.0" - dependencies: - "@jest/core": "npm:^29.5.0" - "@jest/test-result": "npm:^29.5.0" - "@jest/types": "npm:^29.5.0" - chalk: "npm:^4.0.0" - exit: "npm:^0.1.2" - graceful-fs: "npm:^4.2.9" - import-local: "npm:^3.0.2" - jest-config: "npm:^29.5.0" - jest-util: "npm:^29.5.0" - jest-validate: "npm:^29.5.0" - prompts: "npm:^2.0.1" - yargs: "npm:^17.3.1" - peerDependencies: - node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 - peerDependenciesMeta: - node-notifier: - optional: true - bin: - jest: bin/jest.js - checksum: 10/a187b91096efbdeea3a2529f4dff610a7d93a61ddb71dce46ddd314ab6ccb82b9e11936d5ca057441e5e5e0a87b30a7c7c1b18df2dad8ff13d10e5f8ab52c695 - languageName: node - linkType: hard - -"jest-config@npm:^29.5.0": - version: 29.5.0 - resolution: "jest-config@npm:29.5.0" - dependencies: - "@babel/core": "npm:^7.11.6" - "@jest/test-sequencer": "npm:^29.5.0" - "@jest/types": "npm:^29.5.0" - babel-jest: "npm:^29.5.0" - chalk: "npm:^4.0.0" - ci-info: "npm:^3.2.0" - deepmerge: "npm:^4.2.2" - glob: "npm:^7.1.3" - graceful-fs: "npm:^4.2.9" - jest-circus: "npm:^29.5.0" - jest-environment-node: "npm:^29.5.0" - jest-get-type: "npm:^29.4.3" - jest-regex-util: "npm:^29.4.3" - jest-resolve: "npm:^29.5.0" - jest-runner: "npm:^29.5.0" - jest-util: "npm:^29.5.0" - jest-validate: "npm:^29.5.0" - micromatch: "npm:^4.0.4" - parse-json: "npm:^5.2.0" - pretty-format: "npm:^29.5.0" - slash: "npm:^3.0.0" - strip-json-comments: "npm:^3.1.1" - peerDependencies: - "@types/node": "*" - ts-node: ">=9.0.0" - peerDependenciesMeta: - "@types/node": - optional: true - ts-node: - optional: true - checksum: 10/f161fe2cd9e54884a19a8acd82cdb4cd5078174bc5a1a210fe587b8761d14941b15834ce7486b6b46d14b63394657656a258b01e4d07801641d1c8b38168d6a9 - languageName: node - linkType: hard - -"jest-diff@npm:^29.5.0": - version: 29.5.0 - resolution: "jest-diff@npm:29.5.0" - dependencies: - chalk: "npm:^4.0.0" - diff-sequences: "npm:^29.4.3" - jest-get-type: "npm:^29.4.3" - pretty-format: "npm:^29.5.0" - checksum: 10/c81f8da61d3af9d6b854c1099f1d54f71288d828a8730ff46298e63dc0afd4c89be61c6dfd2959a0bd8176bca14ce1198e34156866f34d5638ddc0f92726c995 - languageName: node - linkType: hard - -"jest-docblock@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-docblock@npm:29.4.3" - dependencies: - detect-newline: "npm:^3.0.0" - checksum: 10/fd6bb0b6c60a1d87ade37b8bd8404c64518dc42357f256eeb8cb3f313eb00c138645d602ba7c57059a3de4a6570f12ab1234cb3d2d7a9b948d9dfa255e85b1d2 - languageName: node - linkType: hard - -"jest-each@npm:^29.5.0": - version: 29.5.0 - resolution: "jest-each@npm:29.5.0" - dependencies: - "@jest/types": "npm:^29.5.0" - chalk: "npm:^4.0.0" - jest-get-type: "npm:^29.4.3" - jest-util: "npm:^29.5.0" - pretty-format: "npm:^29.5.0" - checksum: 10/4e9426293bb42616e81d34e7ad810e17f0b81c6e58a388a786aa92e8076e4de8770668940e0976a61161df852decbeec0fa79f219c39a17ef6217db1ccb0486a - languageName: node - linkType: hard - -"jest-environment-node@npm:^29.5.0": - version: 29.5.0 - resolution: "jest-environment-node@npm:29.5.0" - dependencies: - "@jest/environment": "npm:^29.5.0" - "@jest/fake-timers": "npm:^29.5.0" - "@jest/types": "npm:^29.5.0" - "@types/node": "npm:*" - jest-mock: "npm:^29.5.0" - jest-util: "npm:^29.5.0" - checksum: 10/87248747bc988468ab973020b34e668d63331853f84e137e9d8538db9e931c6d506a81fa1abfb0e4bf89a7ee9c325a417a6081e9f795d21cbf793ae4afb96643 - languageName: node - linkType: hard - -"jest-get-type@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-get-type@npm:29.4.3" - checksum: 10/6ac7f2dde1c65e292e4355b6c63b3a4897d7e92cb4c8afcf6d397f2682f8080e094c8b0b68205a74d269882ec06bf696a9de6cd3e1b7333531e5ed7b112605ce - languageName: node - linkType: hard - -"jest-haste-map@npm:^29.5.0": - version: 29.5.0 - resolution: "jest-haste-map@npm:29.5.0" - dependencies: - "@jest/types": "npm:^29.5.0" - "@types/graceful-fs": "npm:^4.1.3" - "@types/node": "npm:*" - anymatch: "npm:^3.0.3" - fb-watchman: "npm:^2.0.0" - fsevents: "npm:^2.3.2" - graceful-fs: "npm:^4.2.9" - jest-regex-util: "npm:^29.4.3" - jest-util: "npm:^29.5.0" - jest-worker: "npm:^29.5.0" - micromatch: "npm:^4.0.4" - walker: "npm:^1.0.8" - dependenciesMeta: - fsevents: - optional: true - checksum: 10/0f48ff383c25e657cc201139d1d430154ae2d16233f756c8707fd360c03e1424ddfcab3290f06094598d9464f2af14e63b6afa62b8a69583322183ae7692117d + supports-color: "npm:^7.1.0" + checksum: 10/06b37952e9cb0fe419a37c7f3d74612a098167a9eb0e5264228036e78b42ca5226501e8130738b5306d94bae2ea068ca674080d4af959992523d84aacff67728 languageName: node linkType: hard -"jest-leak-detector@npm:^29.5.0": - version: 29.5.0 - resolution: "jest-leak-detector@npm:29.5.0" +"istanbul-lib-report@npm:^3.0.1": + version: 3.0.1 + resolution: "istanbul-lib-report@npm:3.0.1" dependencies: - jest-get-type: "npm:^29.4.3" - pretty-format: "npm:^29.5.0" - checksum: 10/0fb845da7ac9cdfc9b3b2e35f6f623a41c547d7dc0103ceb0349013459d00de5870b5689a625e7e37f9644934b40e8f1dcdd5422d14d57470600350364676313 + istanbul-lib-coverage: "npm:^3.0.0" + make-dir: "npm:^4.0.0" + supports-color: "npm:^7.1.0" + checksum: 10/86a83421ca1cf2109a9f6d193c06c31ef04a45e72a74579b11060b1e7bb9b6337a4e6f04abfb8857e2d569c271273c65e855ee429376a0d7c91ad91db42accd1 languageName: node linkType: hard -"jest-matcher-utils@npm:^29.5.0": - version: 29.5.0 - resolution: "jest-matcher-utils@npm:29.5.0" +"istanbul-lib-source-maps@npm:^5.0.6": + version: 5.0.6 + resolution: "istanbul-lib-source-maps@npm:5.0.6" dependencies: - chalk: "npm:^4.0.0" - jest-diff: "npm:^29.5.0" - jest-get-type: "npm:^29.4.3" - pretty-format: "npm:^29.5.0" - checksum: 10/80686b629d40489f09ef987a187d24c63528614fcfe34e62ec83f0485729396e11354e9ab9a28d6d80e82c9454e06cc810e936a2155e033bd112ab1fead11f1a + "@jridgewell/trace-mapping": "npm:^0.3.23" + debug: "npm:^4.1.1" + istanbul-lib-coverage: "npm:^3.0.0" + checksum: 10/569dd0a392ee3464b1fe1accbaef5cc26de3479eacb5b91d8c67ebb7b425d39fd02247d85649c3a0e9c29b600809fa60b5af5a281a75a89c01f385b1e24823a2 languageName: node linkType: hard -"jest-message-util@npm:^29.5.0": - version: 29.5.0 - resolution: "jest-message-util@npm:29.5.0" +"istanbul-reports@npm:^3.1.7": + version: 3.1.7 + resolution: "istanbul-reports@npm:3.1.7" dependencies: - "@babel/code-frame": "npm:^7.12.13" - "@jest/types": "npm:^29.5.0" - "@types/stack-utils": "npm:^2.0.0" - chalk: "npm:^4.0.0" - graceful-fs: "npm:^4.2.9" - micromatch: "npm:^4.0.4" - pretty-format: "npm:^29.5.0" - slash: "npm:^3.0.0" - stack-utils: "npm:^2.0.3" - checksum: 10/eeb0a064e2db486428e37374422d4101a30845815a8842a0f62e77c2a82ae80837a74d5b4f58aaadfb3f19aa7d42e7d604aab1fb670cf170c46f0c46d0d725fd + html-escaper: "npm:^2.0.0" + istanbul-lib-report: "npm:^3.0.0" + checksum: 10/f1faaa4684efaf57d64087776018d7426312a59aa6eeb4e0e3a777347d23cd286ad18f427e98f0e3dee666103d7404c9d7abc5f240406a912fa16bd6695437fa languageName: node linkType: hard -"jest-mock@npm:^29.5.0": - version: 29.5.0 - resolution: "jest-mock@npm:29.5.0" +"jackspeak@npm:^2.3.5": + version: 2.3.6 + resolution: "jackspeak@npm:2.3.6" dependencies: - "@jest/types": "npm:^29.5.0" - "@types/node": "npm:*" - jest-util: "npm:^29.5.0" - checksum: 10/f76c4d226e8b27bfc372aeaa1b1ead490edc6af0d42b275b958260994b26f25f72f10dd1d9b8989fb4e7337c9126fde84e6f4bf5137f9b66b0fe2aed53bffd61 + "@isaacs/cliui": "npm:^8.0.2" + "@pkgjs/parseargs": "npm:^0.11.0" + dependenciesMeta: + "@pkgjs/parseargs": + optional: true + checksum: 10/6e6490d676af8c94a7b5b29b8fd5629f21346911ebe2e32931c2a54210134408171c24cee1a109df2ec19894ad04a429402a8438cbf5cc2794585d35428ace76 languageName: node linkType: hard -"jest-pnp-resolver@npm:^1.2.2": - version: 1.2.2 - resolution: "jest-pnp-resolver@npm:1.2.2" - peerDependencies: - jest-resolve: "*" - peerDependenciesMeta: - jest-resolve: +"jackspeak@npm:^3.1.2": + version: 3.4.3 + resolution: "jackspeak@npm:3.4.3" + dependencies: + "@isaacs/cliui": "npm:^8.0.2" + "@pkgjs/parseargs": "npm:^0.11.0" + dependenciesMeta: + "@pkgjs/parseargs": optional: true - checksum: 10/bd85dcc0e76e0eb0c3d56382ec140f08d25ff4068cda9d0e360bb78fb176cb726d0beab82dc0e8694cafd09f55fee7622b8bcb240afa5fad301f4ed3eebb4f47 + checksum: 10/96f8786eaab98e4bf5b2a5d6d9588ea46c4d06bbc4f2eb861fdd7b6b182b16f71d8a70e79820f335d52653b16d4843b29dd9cdcf38ae80406756db9199497cf3 languageName: node linkType: hard -"jest-regex-util@npm:^29.4.3": - version: 29.4.3 - resolution: "jest-regex-util@npm:29.4.3" - checksum: 10/96fc7fc28cd4dd73a63c13a526202c4bd8b351d4e5b68b1a2a2c88da3308c2a16e26feaa593083eb0bac38cca1aa9dd05025412e7de013ba963fb8e66af22b8a +"jake@npm:^10.8.5": + version: 10.9.2 + resolution: "jake@npm:10.9.2" + dependencies: + async: "npm:^3.2.3" + chalk: "npm:^4.0.2" + filelist: "npm:^1.0.4" + minimatch: "npm:^3.1.2" + bin: + jake: bin/cli.js + checksum: 10/3be324708f99f031e0aec49ef8fd872eb4583cbe8a29a0c875f554f6ac638ee4ea5aa759bb63723fd54f77ca6d7db851eaa78353301734ed3700db9cb109a0cd languageName: node linkType: hard -"jest-resolve-dependencies@npm:^29.5.0": - version: 29.5.0 - resolution: "jest-resolve-dependencies@npm:29.5.0" - dependencies: - jest-regex-util: "npm:^29.4.3" - jest-snapshot: "npm:^29.5.0" - checksum: 10/d2b94f78deeee217e16853eb0a0a59ef70d1173eb104e5a801ea8045d18bc405ef8d65e8d4b74cc33d0649a16c7cd4118a5641f86c26c2ab43beadad52649e95 +"java-properties@npm:^1.0.2": + version: 1.0.2 + resolution: "java-properties@npm:1.0.2" + checksum: 10/d6e8bf8a28a8782afadbcebf2504ab8ea2c75d3675d7eec470920f6c056fd90c8a35a2705cd492a07ec3b2309d3d848ff4cfae098a2cda33a922153eed4bef6a languageName: node linkType: hard -"jest-resolve@npm:^29.5.0": - version: 29.5.0 - resolution: "jest-resolve@npm:29.5.0" +"jest-diff@npm:>=29.4.3 < 30, jest-diff@npm:^29.4.1": + version: 29.7.0 + resolution: "jest-diff@npm:29.7.0" dependencies: chalk: "npm:^4.0.0" - graceful-fs: "npm:^4.2.9" - jest-haste-map: "npm:^29.5.0" - jest-pnp-resolver: "npm:^1.2.2" - jest-util: "npm:^29.5.0" - jest-validate: "npm:^29.5.0" - resolve: "npm:^1.20.0" - resolve.exports: "npm:^2.0.0" - slash: "npm:^3.0.0" - checksum: 10/80a14a1c91bea1b1bf40bbf11566fddcac5abd9d55b32b084481237d1af03baf5fde673581fabf59474c85008e62f31043f4e49c391f3c103ad2f268a1f1b6b0 + diff-sequences: "npm:^29.6.3" + jest-get-type: "npm:^29.6.3" + pretty-format: "npm:^29.7.0" + checksum: 10/6f3a7eb9cd9de5ea9e5aa94aed535631fa6f80221832952839b3cb59dd419b91c20b73887deb0b62230d06d02d6b6cf34ebb810b88d904bb4fe1e2e4f0905c98 languageName: node linkType: hard -"jest-runner@npm:^29.5.0": - version: 29.5.0 - resolution: "jest-runner@npm:29.5.0" - dependencies: - "@jest/console": "npm:^29.5.0" - "@jest/environment": "npm:^29.5.0" - "@jest/test-result": "npm:^29.5.0" - "@jest/transform": "npm:^29.5.0" - "@jest/types": "npm:^29.5.0" - "@types/node": "npm:*" - chalk: "npm:^4.0.0" - emittery: "npm:^0.13.1" - graceful-fs: "npm:^4.2.9" - jest-docblock: "npm:^29.4.3" - jest-environment-node: "npm:^29.5.0" - jest-haste-map: "npm:^29.5.0" - jest-leak-detector: "npm:^29.5.0" - jest-message-util: "npm:^29.5.0" - jest-resolve: "npm:^29.5.0" - jest-runtime: "npm:^29.5.0" - jest-util: "npm:^29.5.0" - jest-watcher: "npm:^29.5.0" - jest-worker: "npm:^29.5.0" - p-limit: "npm:^3.1.0" - source-map-support: "npm:0.5.13" - checksum: 10/f54327a4d5510910eb5b07d75532e44c326d97eaedf24d2b59994818f8c25d564f1bcb4f34cc38c1393d45e29c78604cd97ce052721d9c5bb402e92cdd729528 - languageName: node - linkType: hard - -"jest-runtime@npm:^29.5.0": - version: 29.5.0 - resolution: "jest-runtime@npm:29.5.0" - dependencies: - "@jest/environment": "npm:^29.5.0" - "@jest/fake-timers": "npm:^29.5.0" - "@jest/globals": "npm:^29.5.0" - "@jest/source-map": "npm:^29.4.3" - "@jest/test-result": "npm:^29.5.0" - "@jest/transform": "npm:^29.5.0" - "@jest/types": "npm:^29.5.0" - "@types/node": "npm:*" - chalk: "npm:^4.0.0" - cjs-module-lexer: "npm:^1.0.0" - collect-v8-coverage: "npm:^1.0.0" - glob: "npm:^7.1.3" - graceful-fs: "npm:^4.2.9" - jest-haste-map: "npm:^29.5.0" - jest-message-util: "npm:^29.5.0" - jest-mock: "npm:^29.5.0" - jest-regex-util: "npm:^29.4.3" - jest-resolve: "npm:^29.5.0" - jest-snapshot: "npm:^29.5.0" - jest-util: "npm:^29.5.0" - slash: "npm:^3.0.0" - strip-bom: "npm:^4.0.0" - checksum: 10/179245d7f43474a6338483ba509f5a3a1ee6945d054e59e3599e4e56de914ab42eb1420240ba9477098410f931211789dee4fe08c7f23d0fa56e2df236ac54fa - languageName: node - linkType: hard - -"jest-snapshot@npm:^29.5.0": - version: 29.5.0 - resolution: "jest-snapshot@npm:29.5.0" - dependencies: - "@babel/core": "npm:^7.11.6" - "@babel/generator": "npm:^7.7.2" - "@babel/plugin-syntax-jsx": "npm:^7.7.2" - "@babel/plugin-syntax-typescript": "npm:^7.7.2" - "@babel/traverse": "npm:^7.7.2" - "@babel/types": "npm:^7.3.3" - "@jest/expect-utils": "npm:^29.5.0" - "@jest/transform": "npm:^29.5.0" - "@jest/types": "npm:^29.5.0" - "@types/babel__traverse": "npm:^7.0.6" - "@types/prettier": "npm:^2.1.5" - babel-preset-current-node-syntax: "npm:^1.0.0" - chalk: "npm:^4.0.0" - expect: "npm:^29.5.0" - graceful-fs: "npm:^4.2.9" - jest-diff: "npm:^29.5.0" - jest-get-type: "npm:^29.4.3" - jest-matcher-utils: "npm:^29.5.0" - jest-message-util: "npm:^29.5.0" - jest-util: "npm:^29.5.0" - natural-compare: "npm:^1.4.0" - pretty-format: "npm:^29.5.0" - semver: "npm:^7.3.5" - checksum: 10/f46a16b05370ef0f7a54562490574c3705379745879065c379fe7199b3e445177a57823eb8da2d21b9bd89a9a5d5e13395d37d1e281366481cde9919a973b8aa +"jest-get-type@npm:^29.6.3": + version: 29.6.3 + resolution: "jest-get-type@npm:29.6.3" + checksum: 10/88ac9102d4679d768accae29f1e75f592b760b44277df288ad76ce5bf038c3f5ce3719dea8aa0f035dac30e9eb034b848ce716b9183ad7cc222d029f03e92205 languageName: node linkType: hard @@ -11991,81 +9948,6 @@ __metadata: languageName: node linkType: hard -"jest-util@npm:^29.5.0": - version: 29.5.0 - resolution: "jest-util@npm:29.5.0" - dependencies: - "@jest/types": "npm:^29.5.0" - "@types/node": "npm:*" - chalk: "npm:^4.0.0" - ci-info: "npm:^3.2.0" - graceful-fs: "npm:^4.2.9" - picomatch: "npm:^2.2.3" - checksum: 10/27ae6fc6221d29b31df9c071f190e0e27a9caaeca04ee1ce03f5c925ec8abf594fcf0cb57bdcb93149381415ff1f8198157332b0c76f3592065b7c3fdb35fca1 - languageName: node - linkType: hard - -"jest-validate@npm:^29.5.0": - version: 29.5.0 - resolution: "jest-validate@npm:29.5.0" - dependencies: - "@jest/types": "npm:^29.5.0" - camelcase: "npm:^6.2.0" - chalk: "npm:^4.0.0" - jest-get-type: "npm:^29.4.3" - leven: "npm:^3.1.0" - pretty-format: "npm:^29.5.0" - checksum: 10/91e9e55e7090da456689a5fbe2496a5c5878d5bc9f5d7d883c374b32e90cab834718ebb54f73272c18b0784ad0f22459ac3c48f14ad80d1cc9e218914906733e - languageName: node - linkType: hard - -"jest-watcher@npm:^29.5.0": - version: 29.5.0 - resolution: "jest-watcher@npm:29.5.0" - dependencies: - "@jest/test-result": "npm:^29.5.0" - "@jest/types": "npm:^29.5.0" - "@types/node": "npm:*" - ansi-escapes: "npm:^4.2.1" - chalk: "npm:^4.0.0" - emittery: "npm:^0.13.1" - jest-util: "npm:^29.5.0" - string-length: "npm:^4.0.1" - checksum: 10/accd79e95dbe27106500fcc6814c4690438dda54f3bae2e5373b341e398a7ee3be64c07ff0e1e26c675e699025a4d0dd7822466f0273a17a0613d5157f3941ad - languageName: node - linkType: hard - -"jest-worker@npm:^29.5.0": - version: 29.5.0 - resolution: "jest-worker@npm:29.5.0" - dependencies: - "@types/node": "npm:*" - jest-util: "npm:^29.5.0" - merge-stream: "npm:^2.0.0" - supports-color: "npm:^8.0.0" - checksum: 10/3daf0a13d020985ce28d8436f3f94b0be9f8fc5f63ad753aa0779008d0a23b4e16bca38e2a2e9ae20d5d5ded8c43217b5e1bd54f25c5afe41b1be369aee30d4d - languageName: node - linkType: hard - -"jest@npm:29.5.0": - version: 29.5.0 - resolution: "jest@npm:29.5.0" - dependencies: - "@jest/core": "npm:^29.5.0" - "@jest/types": "npm:^29.5.0" - import-local: "npm:^3.0.2" - jest-cli: "npm:^29.5.0" - peerDependencies: - node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 - peerDependenciesMeta: - node-notifier: - optional: true - bin: - jest: bin/jest.js - checksum: 10/08c9b31f1d37deeb11fefd84fcc81b466c02d76f50056633d8c36951205ab7e220cd26efb49312849a2e08b43ce9f632f8a5b4f69717d9a91d8e069c0534115f - languageName: node - linkType: hard - "js-tokens@npm:^4.0.0": version: 4.0.0 resolution: "js-tokens@npm:4.0.0" @@ -12103,15 +9985,6 @@ __metadata: languageName: node linkType: hard -"jsesc@npm:^2.5.1": - version: 2.5.2 - resolution: "jsesc@npm:2.5.2" - bin: - jsesc: bin/jsesc - checksum: 10/d2096abdcdec56969764b40ffc91d4a23408aa2f351b4d1c13f736f25476643238c43fdbaf38a191c26b1b78fd856d965f5d4d0dde7b89459cd94025190cdf13 - languageName: node - linkType: hard - "json-buffer@npm:3.0.0": version: 3.0.0 resolution: "json-buffer@npm:3.0.0" @@ -12119,6 +9992,13 @@ __metadata: languageName: node linkType: hard +"json-buffer@npm:3.0.1": + version: 3.0.1 + resolution: "json-buffer@npm:3.0.1" + checksum: 10/82876154521b7b68ba71c4f969b91572d1beabadd87bd3a6b236f85fbc7dc4695089191ed60bb59f9340993c51b33d479f45b6ba9f3548beb519705281c32c3c + languageName: node + linkType: hard + "json-parse-better-errors@npm:^1.0.1": version: 1.0.2 resolution: "json-parse-better-errors@npm:1.0.2" @@ -12126,7 +10006,7 @@ __metadata: languageName: node linkType: hard -"json-parse-even-better-errors@npm:^2.3.0, json-parse-even-better-errors@npm:^2.3.1": +"json-parse-even-better-errors@npm:^2.3.0": version: 2.3.1 resolution: "json-parse-even-better-errors@npm:2.3.1" checksum: 10/5f3a99009ed5f2a5a67d06e2f298cc97bc86d462034173308156f15b43a6e850be8511dc204b9b94566305da2947f7d90289657237d210351a39059ff9d666cf @@ -12140,6 +10020,13 @@ __metadata: languageName: node linkType: hard +"json-parse-even-better-errors@npm:^3.0.2": + version: 3.0.2 + resolution: "json-parse-even-better-errors@npm:3.0.2" + checksum: 10/6f04ea6c9ccb783630a59297959247e921cc90b917b8351197ca7fd058fccc7079268fd9362be21ba876fc26aa5039369dd0a2280aae49aae425784794a94927 + languageName: node + linkType: hard + "json-schema-traverse@npm:^0.4.1": version: 0.4.1 resolution: "json-schema-traverse@npm:0.4.1" @@ -12249,13 +10136,6 @@ __metadata: languageName: node linkType: hard -"just-diff@npm:^5.0.1": - version: 5.2.0 - resolution: "just-diff@npm:5.2.0" - checksum: 10/b0d9e306e5bed9f61bdcd528e40608d664eb77abd4c82f90359fe6c35dbebaca29eb3b64f182a1163641eaea3a6dcea2d9ce4dbe257486c6999da0d1172e4aa9 - languageName: node - linkType: hard - "just-diff@npm:^6.0.0": version: 6.0.2 resolution: "just-diff@npm:6.0.2" @@ -12279,6 +10159,15 @@ __metadata: languageName: node linkType: hard +"keyv@npm:^4.5.4": + version: 4.5.4 + resolution: "keyv@npm:4.5.4" + dependencies: + json-buffer: "npm:3.0.1" + checksum: 10/167eb6ef64cc84b6fa0780ee50c9de456b422a1e18802209234f7c2cf7eae648c7741f32e50d7e24ccb22b24c13154070b01563d642755b156c357431a191e75 + languageName: node + linkType: hard + "kind-of@npm:^3.0.2, kind-of@npm:^3.0.3, kind-of@npm:^3.1.0, kind-of@npm:^3.2.0": version: 3.2.2 resolution: "kind-of@npm:3.2.2" @@ -12311,13 +10200,6 @@ __metadata: languageName: node linkType: hard -"kleur@npm:^3.0.3": - version: 3.0.3 - resolution: "kleur@npm:3.0.3" - checksum: 10/0c0ecaf00a5c6173d25059c7db2113850b5457016dfa1d0e3ef26da4704fbb186b4938d7611246d86f0ddf1bccf26828daa5877b1f232a65e7373d0122a83e7f - languageName: node - linkType: hard - "ky@npm:^1.2.0": version: 1.4.0 resolution: "ky@npm:1.4.0" @@ -12361,39 +10243,94 @@ __metadata: languageName: node linkType: hard -"lerna@npm:5.4.3": - version: 5.4.3 - resolution: "lerna@npm:5.4.3" - dependencies: - "@lerna/add": "npm:5.4.3" - "@lerna/bootstrap": "npm:5.4.3" - "@lerna/changed": "npm:5.4.3" - "@lerna/clean": "npm:5.4.3" - "@lerna/cli": "npm:5.4.3" - "@lerna/create": "npm:5.4.3" - "@lerna/diff": "npm:5.4.3" - "@lerna/exec": "npm:5.4.3" - "@lerna/import": "npm:5.4.3" - "@lerna/info": "npm:5.4.3" - "@lerna/init": "npm:5.4.3" - "@lerna/link": "npm:5.4.3" - "@lerna/list": "npm:5.4.3" - "@lerna/publish": "npm:5.4.3" - "@lerna/run": "npm:5.4.3" - "@lerna/version": "npm:5.4.3" - import-local: "npm:^3.0.2" - npmlog: "npm:^6.0.2" - nx: "npm:>=14.5.4 < 16" +"lerna@npm:8.1.8": + version: 8.1.8 + resolution: "lerna@npm:8.1.8" + dependencies: + "@lerna/create": "npm:8.1.8" + "@npmcli/arborist": "npm:7.5.4" + "@npmcli/package-json": "npm:5.2.0" + "@npmcli/run-script": "npm:8.1.0" + "@nx/devkit": "npm:>=17.1.2 < 20" + "@octokit/plugin-enterprise-rest": "npm:6.0.1" + "@octokit/rest": "npm:19.0.11" + aproba: "npm:2.0.0" + byte-size: "npm:8.1.1" + chalk: "npm:4.1.0" + clone-deep: "npm:4.0.1" + cmd-shim: "npm:6.0.3" + color-support: "npm:1.1.3" + columnify: "npm:1.6.0" + console-control-strings: "npm:^1.1.0" + conventional-changelog-angular: "npm:7.0.0" + conventional-changelog-core: "npm:5.0.1" + conventional-recommended-bump: "npm:7.0.1" + cosmiconfig: "npm:^8.2.0" + dedent: "npm:1.5.3" + envinfo: "npm:7.13.0" + execa: "npm:5.0.0" + fs-extra: "npm:^11.2.0" + get-port: "npm:5.1.1" + get-stream: "npm:6.0.0" + git-url-parse: "npm:14.0.0" + glob-parent: "npm:6.0.2" + globby: "npm:11.1.0" + graceful-fs: "npm:4.2.11" + has-unicode: "npm:2.0.1" + import-local: "npm:3.1.0" + ini: "npm:^1.3.8" + init-package-json: "npm:6.0.3" + inquirer: "npm:^8.2.4" + is-ci: "npm:3.0.1" + is-stream: "npm:2.0.0" + jest-diff: "npm:>=29.4.3 < 30" + js-yaml: "npm:4.1.0" + libnpmaccess: "npm:8.0.6" + libnpmpublish: "npm:9.0.9" + load-json-file: "npm:6.2.0" + lodash: "npm:^4.17.21" + make-dir: "npm:4.0.0" + minimatch: "npm:3.0.5" + multimatch: "npm:5.0.0" + node-fetch: "npm:2.6.7" + npm-package-arg: "npm:11.0.2" + npm-packlist: "npm:8.0.2" + npm-registry-fetch: "npm:^17.1.0" + nx: "npm:>=17.1.2 < 20" + p-map: "npm:4.0.0" + p-map-series: "npm:2.1.0" + p-pipe: "npm:3.1.0" + p-queue: "npm:6.6.2" + p-reduce: "npm:2.1.0" + p-waterfall: "npm:2.1.1" + pacote: "npm:^18.0.6" + pify: "npm:5.0.0" + read-cmd-shim: "npm:4.0.0" + resolve-from: "npm:5.0.0" + rimraf: "npm:^4.4.1" + semver: "npm:^7.3.8" + set-blocking: "npm:^2.0.0" + signal-exit: "npm:3.0.7" + slash: "npm:3.0.0" + ssri: "npm:^10.0.6" + string-width: "npm:^4.2.3" + strip-ansi: "npm:^6.0.1" + strong-log-transformer: "npm:2.1.0" + tar: "npm:6.2.1" + temp-dir: "npm:1.0.0" + typescript: "npm:>=3 < 6" + upath: "npm:2.0.1" + uuid: "npm:^10.0.0" + validate-npm-package-license: "npm:3.0.4" + validate-npm-package-name: "npm:5.0.1" + wide-align: "npm:1.1.5" + write-file-atomic: "npm:5.0.1" + write-pkg: "npm:4.0.0" + yargs: "npm:17.7.2" + yargs-parser: "npm:21.1.1" bin: - lerna: cli.js - checksum: 10/ca4dba06403313e6faf0f8fe53d4fbdb7434cfa7a8d94ecfd692bb650807d774eed6ce84b17c6a0e3dfc1307a64d662c29529b163ca34ad6fb2d1805a83b095e - languageName: node - linkType: hard - -"leven@npm:^3.1.0": - version: 3.1.0 - resolution: "leven@npm:3.1.0" - checksum: 10/638401d534585261b6003db9d99afd244dfe82d75ddb6db5c0df412842d5ab30b2ef18de471aaec70fe69a46f17b4ae3c7f01d8a4e6580ef7adb9f4273ad1e55 + lerna: dist/cli.js + checksum: 10/c058064f07b3e32fb10a2e37bd8a76b3cbba76c5e90250e508726003c4c2f80545d6a95a3de533ff8f1f20931c47055290e555a34b78de53eed786995d25b3e9 languageName: node linkType: hard @@ -12407,15 +10344,13 @@ __metadata: languageName: node linkType: hard -"libnpmaccess@npm:^6.0.3": - version: 6.0.4 - resolution: "libnpmaccess@npm:6.0.4" +"libnpmaccess@npm:8.0.6": + version: 8.0.6 + resolution: "libnpmaccess@npm:8.0.6" dependencies: - aproba: "npm:^2.0.0" - minipass: "npm:^3.1.1" - npm-package-arg: "npm:^9.0.1" - npm-registry-fetch: "npm:^13.0.0" - checksum: 10/7f552e90a421a01f66100a55c222ee3060af891895fc743e1faf508777e6a7f79dabdf69f4ee1a525baf5b207d51d1b56fc5e46d235d16aaa6325ddce07716ed + npm-package-arg: "npm:^11.0.2" + npm-registry-fetch: "npm:^17.0.1" + checksum: 10/62fa6a476321268ebd379f35782d9ead8993964bd9dfc8afbd201921d9037b7bc9d956f8b2717f1247e44ab33cb7de45b556ded66144f4b3038a828299cb260d languageName: node linkType: hard @@ -12506,16 +10441,19 @@ __metadata: languageName: node linkType: hard -"libnpmpublish@npm:^6.0.4": - version: 6.0.5 - resolution: "libnpmpublish@npm:6.0.5" +"libnpmpublish@npm:9.0.9": + version: 9.0.9 + resolution: "libnpmpublish@npm:9.0.9" dependencies: - normalize-package-data: "npm:^4.0.0" - npm-package-arg: "npm:^9.0.1" - npm-registry-fetch: "npm:^13.0.0" + ci-info: "npm:^4.0.0" + normalize-package-data: "npm:^6.0.1" + npm-package-arg: "npm:^11.0.2" + npm-registry-fetch: "npm:^17.0.1" + proc-log: "npm:^4.2.0" semver: "npm:^7.3.7" - ssri: "npm:^9.0.0" - checksum: 10/d2f2434517038438be44db2e90e1c8c524df05f7c3b1458617177c2f9ca008dde8a72a4f739b34aee4df0352f71c9289788da86aa38a4709e05c6db33eed570a + sigstore: "npm:^2.2.0" + ssri: "npm:^10.0.6" + checksum: 10/ea1064a727938abefe345d5af1261db8bdc1e71aedabf6945187c2b3a6ef1a4c9db69747ad3ffd4ecd61ea16866890e0da1a4defcbed64e555e7dcae49e55a98 languageName: node linkType: hard @@ -12574,6 +10512,13 @@ __metadata: languageName: node linkType: hard +"lines-and-columns@npm:2.0.3": + version: 2.0.3 + resolution: "lines-and-columns@npm:2.0.3" + checksum: 10/b5bb0d6ee2f82ae834ceddc9251af2060c30db476673e9c817c34c00bed58e0c5d90a6866b64afe7bdcb2c5eb1b418a5b1ee631d2592dc8ff381540901fa4da6 + languageName: node + linkType: hard + "lines-and-columns@npm:^1.1.6": version: 1.2.4 resolution: "lines-and-columns@npm:1.2.4" @@ -12581,13 +10526,6 @@ __metadata: languageName: node linkType: hard -"lines-and-columns@npm:~2.0.3": - version: 2.0.4 - resolution: "lines-and-columns@npm:2.0.4" - checksum: 10/81ac2f943f5428a46bd4ea2561c74ba674a107d8e6cc70cd317d16892a36ff3ba0dc6e599aca8b6f8668d26c85288394c6edf7a40e985ca843acab3701b80d4c - languageName: node - linkType: hard - "linkify-it@npm:^4.0.1": version: 4.0.1 resolution: "linkify-it@npm:4.0.1" @@ -12730,6 +10668,18 @@ __metadata: languageName: node linkType: hard +"load-json-file@npm:6.2.0": + version: 6.2.0 + resolution: "load-json-file@npm:6.2.0" + dependencies: + graceful-fs: "npm:^4.1.15" + parse-json: "npm:^5.0.0" + strip-bom: "npm:^4.0.0" + type-fest: "npm:^0.6.0" + checksum: 10/4429e430ebb99375fc7cd936348e4f7ba729486080ced4272091c1e386a7f5f738ea3337d8ffd4b01c2f5bc3ddde92f2c780045b66838fe98bdb79f901884643 + languageName: node + linkType: hard + "load-json-file@npm:^4.0.0": version: 4.0.0 resolution: "load-json-file@npm:4.0.0" @@ -12742,18 +10692,6 @@ __metadata: languageName: node linkType: hard -"load-json-file@npm:^6.2.0": - version: 6.2.0 - resolution: "load-json-file@npm:6.2.0" - dependencies: - graceful-fs: "npm:^4.1.15" - parse-json: "npm:^5.0.0" - strip-bom: "npm:^4.0.0" - type-fest: "npm:^0.6.0" - checksum: 10/4429e430ebb99375fc7cd936348e4f7ba729486080ced4272091c1e386a7f5f738ea3337d8ffd4b01c2f5bc3ddde92f2c780045b66838fe98bdb79f901884643 - languageName: node - linkType: hard - "load-tsconfig@npm:^0.2.5": version: 0.2.5 resolution: "load-tsconfig@npm:0.2.5" @@ -12894,7 +10832,7 @@ __metadata: languageName: node linkType: hard -"lodash@npm:>=4.17.21, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.21, lodash@npm:^4.17.4, lodash@npm:^4.7.0": +"lodash@npm:>=4.17.21, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.21, lodash@npm:^4.17.4": version: 4.17.21 resolution: "lodash@npm:4.17.21" checksum: 10/c08619c038846ea6ac754abd6dd29d2568aa705feb69339e836dfa8d8b09abbb2f859371e86863eda41848221f9af43714491467b5b0299122431e202bb0c532 @@ -12927,7 +10865,7 @@ __metadata: languageName: node linkType: hard -"log-symbols@npm:^4.1.0": +"log-symbols@npm:^4.0.0, log-symbols@npm:^4.1.0": version: 4.1.0 resolution: "log-symbols@npm:4.1.0" dependencies: @@ -13044,7 +10982,7 @@ __metadata: languageName: node linkType: hard -"lru-cache@npm:^10.2.0": +"lru-cache@npm:^10.2.0, lru-cache@npm:^10.2.2": version: 10.4.3 resolution: "lru-cache@npm:10.4.3" checksum: 10/e6e90267360476720fa8e83cc168aa2bf0311f3f2eea20a6ba78b90a885ae72071d9db132f40fda4129c803e7dcec3a6b6a6fbb44ca90b081630b810b5d6a41a @@ -13070,14 +11008,7 @@ __metadata: languageName: node linkType: hard -"lru-cache@npm:^7.4.4": - version: 7.18.3 - resolution: "lru-cache@npm:7.18.3" - checksum: 10/6029ca5aba3aacb554e919d7ef804fffd4adfc4c83db00fac8248c7c78811fb6d4b6f70f7fd9d55032b3823446546a007edaa66ad1f2377ae833bd983fac5d98 - languageName: node - linkType: hard - -"lru-cache@npm:^7.5.1, lru-cache@npm:^7.7.1": +"lru-cache@npm:^7.7.1": version: 7.10.1 resolution: "lru-cache@npm:7.10.1" checksum: 10/34a917a3764992fa1e8ed9449afece4c2b1ee8787bb904770d76994f84d3d6bdc7175cc3017ce2f1faaf87518f49bfb1f986de20ab775791f50fea340e551bda @@ -13104,6 +11035,15 @@ __metadata: languageName: node linkType: hard +"make-dir@npm:4.0.0, make-dir@npm:^4.0.0": + version: 4.0.0 + resolution: "make-dir@npm:4.0.0" + dependencies: + semver: "npm:^7.5.3" + checksum: 10/bf0731a2dd3aab4db6f3de1585cea0b746bb73eb5a02e3d8d72757e376e64e6ada190b1eddcde5b2f24a81b688a9897efd5018737d05e02e2a671dda9cff8a8a + languageName: node + linkType: hard + "make-dir@npm:^1.0.0": version: 1.3.0 resolution: "make-dir@npm:1.3.0" @@ -13132,15 +11072,6 @@ __metadata: languageName: node linkType: hard -"make-dir@npm:^4.0.0": - version: 4.0.0 - resolution: "make-dir@npm:4.0.0" - dependencies: - semver: "npm:^7.5.3" - checksum: 10/bf0731a2dd3aab4db6f3de1585cea0b746bb73eb5a02e3d8d72757e376e64e6ada190b1eddcde5b2f24a81b688a9897efd5018737d05e02e2a671dda9cff8a8a - languageName: node - linkType: hard - "make-error@npm:1.x, make-error@npm:^1.1.1": version: 1.3.6 resolution: "make-error@npm:1.3.6" @@ -13172,30 +11103,6 @@ __metadata: languageName: node linkType: hard -"make-fetch-happen@npm:^10.0.6": - version: 10.2.1 - resolution: "make-fetch-happen@npm:10.2.1" - dependencies: - agentkeepalive: "npm:^4.2.1" - cacache: "npm:^16.1.0" - http-cache-semantics: "npm:^4.1.0" - http-proxy-agent: "npm:^5.0.0" - https-proxy-agent: "npm:^5.0.0" - is-lambda: "npm:^1.0.1" - lru-cache: "npm:^7.7.1" - minipass: "npm:^3.1.6" - minipass-collect: "npm:^1.0.2" - minipass-fetch: "npm:^2.0.3" - minipass-flush: "npm:^1.0.5" - minipass-pipeline: "npm:^1.2.4" - negotiator: "npm:^0.6.3" - promise-retry: "npm:^2.0.1" - socks-proxy-agent: "npm:^7.0.0" - ssri: "npm:^9.0.0" - checksum: 10/fef5acb865a46f25ad0b5ad7d979799125db5dbb24ea811ffa850fbb804bc8e495df2237a8ec3a4fc6250e73c2f95549cca6d6d36a73b1faa61224504eb1188f - languageName: node - linkType: hard - "make-fetch-happen@npm:^13.0.0": version: 13.0.0 resolution: "make-fetch-happen@npm:13.0.0" @@ -13215,15 +11122,6 @@ __metadata: languageName: node linkType: hard -"makeerror@npm:1.0.12": - version: 1.0.12 - resolution: "makeerror@npm:1.0.12" - dependencies: - tmpl: "npm:1.0.5" - checksum: 10/4c66ddfc654537333da952c084f507fa4c30c707b1635344eb35be894d797ba44c901a9cebe914aa29a7f61357543ba09b09dddbd7f65b4aee756b450f169f40 - languageName: node - linkType: hard - "map-cache@npm:^0.2.2": version: 0.2.2 resolution: "map-cache@npm:0.2.2" @@ -13425,7 +11323,7 @@ __metadata: languageName: node linkType: hard -"meow@npm:^8.0.0": +"meow@npm:^8.0.0, meow@npm:^8.1.2": version: 8.1.2 resolution: "meow@npm:8.1.2" dependencies: @@ -13662,6 +11560,15 @@ __metadata: languageName: node linkType: hard +"minimatch@npm:^8.0.2": + version: 8.0.4 + resolution: "minimatch@npm:8.0.4" + dependencies: + brace-expansion: "npm:^2.0.1" + checksum: 10/aef05598ee565e1013bc8a10f53410ac681561f901c1a084b8ecfd016c9ed919f58f4bbd5b63e05643189dfb26e8106a84f0e1ff12e4a263aa37e1cae7ce9828 + languageName: node + linkType: hard + "minimatch@npm:^9.0.4": version: 9.0.5 resolution: "minimatch@npm:9.0.5" @@ -13783,6 +11690,13 @@ __metadata: languageName: node linkType: hard +"minipass@npm:^4.2.4": + version: 4.2.8 + resolution: "minipass@npm:4.2.8" + checksum: 10/e148eb6dcb85c980234cad889139ef8ddf9d5bdac534f4f0268446c8792dd4c74f4502479be48de3c1cce2f6450f6da4d0d4a86405a8a12be04c1c36b339569a + languageName: node + linkType: hard + "minipass@npm:^5.0.0": version: 5.0.0 resolution: "minipass@npm:5.0.0" @@ -13824,17 +11738,6 @@ __metadata: languageName: node linkType: hard -"mkdirp-infer-owner@npm:^2.0.0": - version: 2.0.0 - resolution: "mkdirp-infer-owner@npm:2.0.0" - dependencies: - chownr: "npm:^2.0.0" - infer-owner: "npm:^1.0.4" - mkdirp: "npm:^1.0.3" - checksum: 10/d8f4ecd32f6762459d6b5714eae6487c67ae9734ab14e26d14377ddd9b2a1bf868d8baa18c0f3e73d3d513f53ec7a698e0f81a9367102c870a55bef7833880f7 - languageName: node - linkType: hard - "mkdirp@npm:^1.0.3, mkdirp@npm:^1.0.4": version: 1.0.4 resolution: "mkdirp@npm:1.0.4" @@ -13844,7 +11747,7 @@ __metadata: languageName: node linkType: hard -"modify-values@npm:^1.0.0": +"modify-values@npm:^1.0.1": version: 1.0.1 resolution: "modify-values@npm:1.0.1" checksum: 10/16fa93f7ddb2540a8e82c99738ae4ed0e8e8cae57c96e13a0db9d68dfad074fd2eec542929b62ebbb18b357bbb3e4680b92d3a4099baa7aeb32360cb1c8f0247 @@ -13886,7 +11789,7 @@ __metadata: languageName: node linkType: hard -"multimatch@npm:^5.0.0": +"multimatch@npm:5.0.0": version: 5.0.0 resolution: "multimatch@npm:5.0.0" dependencies: @@ -13899,7 +11802,7 @@ __metadata: languageName: node linkType: hard -"mute-stream@npm:0.0.8, mute-stream@npm:~0.0.4": +"mute-stream@npm:0.0.8": version: 0.0.8 resolution: "mute-stream@npm:0.0.8" checksum: 10/a2d2e79dde87e3424ffc8c334472c7f3d17b072137734ca46e6f221131f1b014201cc593b69a38062e974fb2394d3d1cb4349f80f012bbf8b8ac1b28033e515f @@ -14012,15 +11915,6 @@ __metadata: languageName: node linkType: hard -"node-addon-api@npm:^3.2.1": - version: 3.2.1 - resolution: "node-addon-api@npm:3.2.1" - dependencies: - node-gyp: "npm:latest" - checksum: 10/681b52dfa3e15b0a8e5cf283cc0d8cd5fd2a57c559ae670fcfd20544cbb32f75de7648674110defcd17ab2c76ebef630aa7d2d2f930bc7a8cc439b20fe233518 - languageName: node - linkType: hard - "node-emoji@npm:^1.10.0": version: 1.11.0 resolution: "node-emoji@npm:1.11.0" @@ -14051,7 +11945,7 @@ __metadata: languageName: node linkType: hard -"node-fetch@npm:^2.3.0, node-fetch@npm:^2.6.1, node-fetch@npm:^2.6.7": +"node-fetch@npm:2.6.7, node-fetch@npm:^2.3.0, node-fetch@npm:^2.6.1, node-fetch@npm:^2.6.7": version: 2.6.7 resolution: "node-fetch@npm:2.6.7" dependencies: @@ -14065,17 +11959,6 @@ __metadata: languageName: node linkType: hard -"node-gyp-build@npm:^4.3.0": - version: 4.8.0 - resolution: "node-gyp-build@npm:4.8.0" - bin: - node-gyp-build: bin.js - node-gyp-build-optional: optional.js - node-gyp-build-test: build-test.js - checksum: 10/80f410ab412df38e84171d3634a5716b6c6f14ecfa4eb971424d289381fb76f8bcbe1b666419ceb2c81060e558fd7c6d70cc0f60832bcca6a1559098925d9657 - languageName: node - linkType: hard - "node-gyp@npm:^10.0.0, node-gyp@npm:^10.0.1, node-gyp@npm:latest": version: 10.0.1 resolution: "node-gyp@npm:10.0.1" @@ -14116,10 +11999,10 @@ __metadata: languageName: node linkType: hard -"node-int64@npm:^0.4.0": - version: 0.4.0 - resolution: "node-int64@npm:0.4.0" - checksum: 10/b7afc2b65e56f7035b1a2eec57ae0fbdee7d742b1cdcd0f4387562b6527a011ab1cbe9f64cc8b3cca61e3297c9637c8bf61cec2e6b8d3a711d4b5267dfafbe02 +"node-machine-id@npm:1.1.12": + version: 1.1.12 + resolution: "node-machine-id@npm:1.1.12" + checksum: 10/46bf3d4fab8d0e63b24c42bcec2b6975c7ec5bc16e53d7a589d095668d0fdf0bfcbcdc28246dd1ef74cf95a37fbd774cd4b17b41f518d79dfad7fdc99f995903 languageName: node linkType: hard @@ -14132,13 +12015,6 @@ __metadata: languageName: node linkType: hard -"node-releases@npm:^2.0.5": - version: 2.0.5 - resolution: "node-releases@npm:2.0.5" - checksum: 10/e85d949addd19f8827f32569d2be5751e7812ccf6cc47879d49f79b5234ff4982225e39a3929315f96370823b070640fb04d79fc0ddec8b515a969a03493a42f - languageName: node - linkType: hard - "nopt@npm:^5.0.0": version: 5.0.0 resolution: "nopt@npm:5.0.0" @@ -14161,6 +12037,17 @@ __metadata: languageName: node linkType: hard +"nopt@npm:^7.2.1": + version: 7.2.1 + resolution: "nopt@npm:7.2.1" + dependencies: + abbrev: "npm:^2.0.0" + bin: + nopt: bin/nopt.js + checksum: 10/95a1f6dec8a81cd18cdc2fed93e6f0b4e02cf6bdb4501c848752c6e34f9883d9942f036a5e3b21a699047d8a448562d891e67492df68ec9c373e6198133337ae + languageName: node + linkType: hard + "normalize-package-data@npm:^2.3.2, normalize-package-data@npm:^2.5.0": version: 2.5.0 resolution: "normalize-package-data@npm:2.5.0" @@ -14173,7 +12060,7 @@ __metadata: languageName: node linkType: hard -"normalize-package-data@npm:^3.0.0, normalize-package-data@npm:^3.0.2": +"normalize-package-data@npm:^3.0.0, normalize-package-data@npm:^3.0.2, normalize-package-data@npm:^3.0.3": version: 3.0.3 resolution: "normalize-package-data@npm:3.0.3" dependencies: @@ -14185,27 +12072,26 @@ __metadata: languageName: node linkType: hard -"normalize-package-data@npm:^4.0.0": - version: 4.0.1 - resolution: "normalize-package-data@npm:4.0.1" +"normalize-package-data@npm:^6.0.0": + version: 6.0.0 + resolution: "normalize-package-data@npm:6.0.0" dependencies: - hosted-git-info: "npm:^5.0.0" + hosted-git-info: "npm:^7.0.0" is-core-module: "npm:^2.8.1" semver: "npm:^7.3.5" validate-npm-package-license: "npm:^3.0.4" - checksum: 10/4fdc904a6974137a92c4d782e9c0a767371f50fcc727f664e74d130eb5dda223383c3052ae2e1e9146f718b215de923baca73c488eec4e8c8f0bfd09a8990c23 + checksum: 10/e31e31a2ebaef93ef107feb9408f105044eeae9cb7d0d4619544ab2323cd4b15ca648b0d558ac29db2fece161c7b8658206bb27ebe9340df723f7174b3e2759d languageName: node linkType: hard -"normalize-package-data@npm:^6.0.0": - version: 6.0.0 - resolution: "normalize-package-data@npm:6.0.0" +"normalize-package-data@npm:^6.0.1": + version: 6.0.2 + resolution: "normalize-package-data@npm:6.0.2" dependencies: hosted-git-info: "npm:^7.0.0" - is-core-module: "npm:^2.8.1" semver: "npm:^7.3.5" validate-npm-package-license: "npm:^3.0.4" - checksum: 10/e31e31a2ebaef93ef107feb9408f105044eeae9cb7d0d4619544ab2323cd4b15ca648b0d558ac29db2fece161c7b8658206bb27ebe9340df723f7174b3e2759d + checksum: 10/7c4216a2426aa76c0197f8372f06b23a0484d62b3518fb5c0f6ebccb16376bdfab29ceba96f95c75f60506473198f1337fe337b945c8df0541fe32b8049ab4c9 languageName: node linkType: hard @@ -14223,13 +12109,6 @@ __metadata: languageName: node linkType: hard -"normalize-url@npm:^6.1.0": - version: 6.1.0 - resolution: "normalize-url@npm:6.1.0" - checksum: 10/5ae699402c9d5ffa330adc348fcd6fc6e6a155ab7c811b96e30b7ecab60ceef821d8f86443869671dda71bbc47f4b9625739c82ad247e883e9aefe875bfb8659 - languageName: node - linkType: hard - "normalize-url@npm:^8.0.0": version: 8.0.0 resolution: "normalize-url@npm:8.0.0" @@ -14244,24 +12123,6 @@ __metadata: languageName: node linkType: hard -"npm-bundled@npm:^1.1.1": - version: 1.1.2 - resolution: "npm-bundled@npm:1.1.2" - dependencies: - npm-normalize-package-bin: "npm:^1.0.1" - checksum: 10/722154cb5e9792abc2aa0112f8a5ac62885224f2e01f010d4e1a32233522a8b7849a716a9184bbf7d6ba865177da337fafeaf41bd32800785067093133a380e3 - languageName: node - linkType: hard - -"npm-bundled@npm:^2.0.0": - version: 2.0.1 - resolution: "npm-bundled@npm:2.0.1" - dependencies: - npm-normalize-package-bin: "npm:^2.0.0" - checksum: 10/adf5d727915cbd61603e2171ba67e39319efa343ceb72868348232a36ad774a8365d5af5e1aad29acc41c3caeda4ebd80e5b7a3da319985509aeedf79e352c0d - languageName: node - linkType: hard - "npm-bundled@npm:^3.0.0": version: 3.0.0 resolution: "npm-bundled@npm:3.0.0" @@ -14271,15 +12132,6 @@ __metadata: languageName: node linkType: hard -"npm-install-checks@npm:^5.0.0": - version: 5.0.0 - resolution: "npm-install-checks@npm:5.0.0" - dependencies: - semver: "npm:^7.1.1" - checksum: 10/0e7d1aae52b1fe9d3a0fd4a008850c7047931722dd49ee908afd13fd0297ac5ddb10964d9c59afcdaaa2ca04b51d75af2788f668c729ae71fec0e4cdac590ffc - languageName: node - linkType: hard - "npm-install-checks@npm:^6.0.0, npm-install-checks@npm:^6.2.0, npm-install-checks@npm:^6.3.0": version: 6.3.0 resolution: "npm-install-checks@npm:6.3.0" @@ -14296,13 +12148,6 @@ __metadata: languageName: node linkType: hard -"npm-normalize-package-bin@npm:^2.0.0": - version: 2.0.0 - resolution: "npm-normalize-package-bin@npm:2.0.0" - checksum: 10/7c5379f9b188b564c4332c97bdd9a5d6b7b15f02b5823b00989d6a0e6fb31eb0280f02b0a924f930e1fcaf00e60fae333aec8923d2a4c7747613c7d629d8aa25 - languageName: node - linkType: hard - "npm-normalize-package-bin@npm:^3.0.0": version: 3.0.1 resolution: "npm-normalize-package-bin@npm:3.0.1" @@ -14310,14 +12155,15 @@ __metadata: languageName: node linkType: hard -"npm-package-arg@npm:8.1.1": - version: 8.1.1 - resolution: "npm-package-arg@npm:8.1.1" +"npm-package-arg@npm:11.0.2": + version: 11.0.2 + resolution: "npm-package-arg@npm:11.0.2" dependencies: - hosted-git-info: "npm:^3.0.6" - semver: "npm:^7.0.0" - validate-npm-package-name: "npm:^3.0.0" - checksum: 10/b50b130680997f37c97fd6a4b100e447739eb5615a7f06e8c8010c2cc6ba61ba91e370d481cea06a90febc89816197a900189a9f91dab7b860171dda2334b320 + hosted-git-info: "npm:^7.0.0" + proc-log: "npm:^4.0.0" + semver: "npm:^7.3.5" + validate-npm-package-name: "npm:^5.0.0" + checksum: 10/ce4c51900a73aadb408c9830c38a61b1930e1ab08509ec5ebbcf625ad14326ee33b014df289c942039bd28071ab17e813368f68d26a4ccad0eb6e9928f8ad03c languageName: node linkType: hard @@ -14333,33 +12179,19 @@ __metadata: languageName: node linkType: hard -"npm-package-arg@npm:^9.0.0, npm-package-arg@npm:^9.0.1": - version: 9.1.2 - resolution: "npm-package-arg@npm:9.1.2" +"npm-package-arg@npm:^11.0.2": + version: 11.0.3 + resolution: "npm-package-arg@npm:11.0.3" dependencies: - hosted-git-info: "npm:^5.0.0" - proc-log: "npm:^2.0.1" + hosted-git-info: "npm:^7.0.0" + proc-log: "npm:^4.0.0" semver: "npm:^7.3.5" - validate-npm-package-name: "npm:^4.0.0" - checksum: 10/f74ada23df3819c798f1b3d85103593c070bd02bfca517af0e9412759030b9ab4525916bd921aaf277ebf990b6f35a9e63fad13df10d1d8df866e27515f3ad3f - languageName: node - linkType: hard - -"npm-packlist@npm:^5.1.0, npm-packlist@npm:^5.1.1": - version: 5.1.3 - resolution: "npm-packlist@npm:5.1.3" - dependencies: - glob: "npm:^8.0.1" - ignore-walk: "npm:^5.0.1" - npm-bundled: "npm:^2.0.0" - npm-normalize-package-bin: "npm:^2.0.0" - bin: - npm-packlist: bin/index.js - checksum: 10/78aa1c69a349c40cf7ba556581bff2dd5cbc1455614a44bd673e076f7f402096ac7c01660c45ec17cbd51bf0db3a4df7e9bc3a0a8e8e497ebf6d53848f33dfad + validate-npm-package-name: "npm:^5.0.0" + checksum: 10/bacc863907edf98940286edc2fd80327901c1e8b34426d538cdc708ed66bc6567f06d742d838eaf35db6804347bb4ba56ca9cef032c4b52743b33e7a22a2678e languageName: node linkType: hard -"npm-packlist@npm:^8.0.0": +"npm-packlist@npm:8.0.2, npm-packlist@npm:^8.0.0": version: 8.0.2 resolution: "npm-packlist@npm:8.0.2" dependencies: @@ -14368,27 +12200,27 @@ __metadata: languageName: node linkType: hard -"npm-pick-manifest@npm:^7.0.0": - version: 7.0.2 - resolution: "npm-pick-manifest@npm:7.0.2" +"npm-pick-manifest@npm:^9.0.0": + version: 9.0.0 + resolution: "npm-pick-manifest@npm:9.0.0" dependencies: - npm-install-checks: "npm:^5.0.0" - npm-normalize-package-bin: "npm:^2.0.0" - npm-package-arg: "npm:^9.0.0" + npm-install-checks: "npm:^6.0.0" + npm-normalize-package-bin: "npm:^3.0.0" + npm-package-arg: "npm:^11.0.0" semver: "npm:^7.3.5" - checksum: 10/5aac6e8e602ef2f3cfa637b70480476e6446201a02d2c673fad4ff0d7051af8f33c240e7f3fa80e5ed46c10f33c2a7150acf294367ad70230b73e05cdbbbddd1 + checksum: 10/29dca2a838ed35c714df1a76f76616df2df51ce31bc3ca5943a0668b2eca2a5aab448f9f89cadf7a77eb5e3831c554cebaf7802f3e432838acb34c1a74fa2786 languageName: node linkType: hard -"npm-pick-manifest@npm:^9.0.0": - version: 9.0.0 - resolution: "npm-pick-manifest@npm:9.0.0" +"npm-pick-manifest@npm:^9.0.1": + version: 9.1.0 + resolution: "npm-pick-manifest@npm:9.1.0" dependencies: npm-install-checks: "npm:^6.0.0" npm-normalize-package-bin: "npm:^3.0.0" npm-package-arg: "npm:^11.0.0" semver: "npm:^7.3.5" - checksum: 10/29dca2a838ed35c714df1a76f76616df2df51ce31bc3ca5943a0668b2eca2a5aab448f9f89cadf7a77eb5e3831c554cebaf7802f3e432838acb34c1a74fa2786 + checksum: 10/e759e4fe4076da9169cf522964a80bbc096d50cd24c8c44b50b44706c4479bd9d9d018fbdb76c6ea0c6037e012e07c6c917a1ecaa7ae1a1169cddfae1c0f24b6 languageName: node linkType: hard @@ -14402,21 +12234,6 @@ __metadata: languageName: node linkType: hard -"npm-registry-fetch@npm:^13.0.0, npm-registry-fetch@npm:^13.0.1, npm-registry-fetch@npm:^13.3.0": - version: 13.3.1 - resolution: "npm-registry-fetch@npm:13.3.1" - dependencies: - make-fetch-happen: "npm:^10.0.6" - minipass: "npm:^3.1.6" - minipass-fetch: "npm:^2.0.3" - minipass-json-stream: "npm:^1.0.1" - minizlib: "npm:^2.1.2" - npm-package-arg: "npm:^9.0.1" - proc-log: "npm:^2.0.0" - checksum: 10/eb8ea7f5eccdc3fe595e70cafbfbffc8e0d5bc0abbb9a48fdf224d9c3e6d37fc6bf3cfdf879e7f8cdbcfba38c03e73316be6e3bf649a2cd6636a37e62d0e67cb - languageName: node - linkType: hard - "npm-registry-fetch@npm:^16.0.0, npm-registry-fetch@npm:^16.1.0": version: 16.1.0 resolution: "npm-registry-fetch@npm:16.1.0" @@ -14432,6 +12249,22 @@ __metadata: languageName: node linkType: hard +"npm-registry-fetch@npm:^17.0.0, npm-registry-fetch@npm:^17.0.1, npm-registry-fetch@npm:^17.1.0": + version: 17.1.0 + resolution: "npm-registry-fetch@npm:17.1.0" + dependencies: + "@npmcli/redact": "npm:^2.0.0" + jsonparse: "npm:^1.3.1" + make-fetch-happen: "npm:^13.0.0" + minipass: "npm:^7.0.2" + minipass-fetch: "npm:^3.0.0" + minizlib: "npm:^2.1.2" + npm-package-arg: "npm:^11.0.0" + proc-log: "npm:^4.0.0" + checksum: 10/b9b2a73907fb5b2d8187031e040d7b2918f2b127ac858a84bd244f6435d16dd04df23c9660f32d7e9deb0216b91071623f040fd51b0bd375e8c7fed7d7a82a1c + languageName: node + linkType: hard + "npm-run-path@npm:^2.0.0": version: 2.0.2 resolution: "npm-run-path@npm:2.0.2" @@ -14556,7 +12389,7 @@ __metadata: languageName: node linkType: hard -"npmlog@npm:^6.0.0, npmlog@npm:^6.0.2": +"npmlog@npm:^6.0.0": version: 6.0.2 resolution: "npmlog@npm:6.0.2" dependencies: @@ -14587,75 +12420,78 @@ __metadata: languageName: node linkType: hard -"nx@npm:15.9.7, nx@npm:>=14.5.4 < 16": - version: 15.9.7 - resolution: "nx@npm:15.9.7" +"nx@npm:19.7.3, nx@npm:>=17.1.2 < 20": + version: 19.7.3 + resolution: "nx@npm:19.7.3" dependencies: - "@nrwl/cli": "npm:15.9.7" - "@nrwl/nx-darwin-arm64": "npm:15.9.7" - "@nrwl/nx-darwin-x64": "npm:15.9.7" - "@nrwl/nx-linux-arm-gnueabihf": "npm:15.9.7" - "@nrwl/nx-linux-arm64-gnu": "npm:15.9.7" - "@nrwl/nx-linux-arm64-musl": "npm:15.9.7" - "@nrwl/nx-linux-x64-gnu": "npm:15.9.7" - "@nrwl/nx-linux-x64-musl": "npm:15.9.7" - "@nrwl/nx-win32-arm64-msvc": "npm:15.9.7" - "@nrwl/nx-win32-x64-msvc": "npm:15.9.7" - "@nrwl/tao": "npm:15.9.7" - "@parcel/watcher": "npm:2.0.4" + "@napi-rs/wasm-runtime": "npm:0.2.4" + "@nrwl/tao": "npm:19.7.3" + "@nx/nx-darwin-arm64": "npm:19.7.3" + "@nx/nx-darwin-x64": "npm:19.7.3" + "@nx/nx-freebsd-x64": "npm:19.7.3" + "@nx/nx-linux-arm-gnueabihf": "npm:19.7.3" + "@nx/nx-linux-arm64-gnu": "npm:19.7.3" + "@nx/nx-linux-arm64-musl": "npm:19.7.3" + "@nx/nx-linux-x64-gnu": "npm:19.7.3" + "@nx/nx-linux-x64-musl": "npm:19.7.3" + "@nx/nx-win32-arm64-msvc": "npm:19.7.3" + "@nx/nx-win32-x64-msvc": "npm:19.7.3" "@yarnpkg/lockfile": "npm:^1.1.0" "@yarnpkg/parsers": "npm:3.0.0-rc.46" - "@zkochan/js-yaml": "npm:0.0.6" - axios: "npm:^1.0.0" + "@zkochan/js-yaml": "npm:0.0.7" + axios: "npm:^1.7.4" chalk: "npm:^4.1.0" cli-cursor: "npm:3.1.0" cli-spinners: "npm:2.6.1" - cliui: "npm:^7.0.2" - dotenv: "npm:~10.0.0" + cliui: "npm:^8.0.1" + dotenv: "npm:~16.4.5" + dotenv-expand: "npm:~11.0.6" enquirer: "npm:~2.3.6" - fast-glob: "npm:3.2.7" figures: "npm:3.2.0" flat: "npm:^5.0.2" + front-matter: "npm:^4.0.2" fs-extra: "npm:^11.1.0" - glob: "npm:7.1.4" ignore: "npm:^5.0.4" - js-yaml: "npm:4.1.0" + jest-diff: "npm:^29.4.1" jsonc-parser: "npm:3.2.0" - lines-and-columns: "npm:~2.0.3" - minimatch: "npm:3.0.5" + lines-and-columns: "npm:2.0.3" + minimatch: "npm:9.0.3" + node-machine-id: "npm:1.1.12" npm-run-path: "npm:^4.0.1" open: "npm:^8.4.0" - semver: "npm:7.5.4" + ora: "npm:5.3.0" + semver: "npm:^7.5.3" string-width: "npm:^4.2.3" strong-log-transformer: "npm:^2.1.0" tar-stream: "npm:~2.2.0" tmp: "npm:~0.2.1" tsconfig-paths: "npm:^4.1.2" tslib: "npm:^2.3.0" - v8-compile-cache: "npm:2.3.0" yargs: "npm:^17.6.2" yargs-parser: "npm:21.1.1" peerDependencies: - "@swc-node/register": ^1.4.2 - "@swc/core": ^1.2.173 + "@swc-node/register": ^1.8.0 + "@swc/core": ^1.3.85 dependenciesMeta: - "@nrwl/nx-darwin-arm64": + "@nx/nx-darwin-arm64": optional: true - "@nrwl/nx-darwin-x64": + "@nx/nx-darwin-x64": optional: true - "@nrwl/nx-linux-arm-gnueabihf": + "@nx/nx-freebsd-x64": optional: true - "@nrwl/nx-linux-arm64-gnu": + "@nx/nx-linux-arm-gnueabihf": optional: true - "@nrwl/nx-linux-arm64-musl": + "@nx/nx-linux-arm64-gnu": optional: true - "@nrwl/nx-linux-x64-gnu": + "@nx/nx-linux-arm64-musl": optional: true - "@nrwl/nx-linux-x64-musl": + "@nx/nx-linux-x64-gnu": optional: true - "@nrwl/nx-win32-arm64-msvc": + "@nx/nx-linux-x64-musl": optional: true - "@nrwl/nx-win32-x64-msvc": + "@nx/nx-win32-arm64-msvc": + optional: true + "@nx/nx-win32-x64-msvc": optional: true peerDependenciesMeta: "@swc-node/register": @@ -14664,7 +12500,8 @@ __metadata: optional: true bin: nx: bin/nx.js - checksum: 10/79b64ee253f8b6f534f7c4f21412996d868ec31e567fa202154c897a7489bb03f98c99b7ce9f8d20aefc0567de0e2228c9f27d617e8616baf8dd2f94ac27e088 + nx-cloud: bin/nx-cloud.js + checksum: 10/995eca56d7631cd05fa847c85e24a791ef890d6b3aa4952808f1b3d6ce055d7ff40a97dcb1657d85331861474404fc8454b1602a92cff28fd8fb46b3285bb7cf languageName: node linkType: hard @@ -14823,17 +12660,33 @@ __metadata: languageName: node linkType: hard -"optionator@npm:^0.9.1": - version: 0.9.1 - resolution: "optionator@npm:0.9.1" +"optionator@npm:^0.9.3": + version: 0.9.4 + resolution: "optionator@npm:0.9.4" dependencies: deep-is: "npm:^0.1.3" fast-levenshtein: "npm:^2.0.6" levn: "npm:^0.4.1" prelude-ls: "npm:^1.2.1" type-check: "npm:^0.4.0" - word-wrap: "npm:^1.2.3" - checksum: 10/19cfb625ba3cafd99c204744595a8b5111491632d379be341a8286c53a0101adac6f7ca9be4319ccecaaf5d43a55e65dde8b434620726032472833d958d43698 + word-wrap: "npm:^1.2.5" + checksum: 10/a8398559c60aef88d7f353a4f98dcdff6090a4e70f874c827302bf1213d9106a1c4d5fcb68dacb1feb3c30a04c4102f41047aa55d4c576b863d6fc876e001af6 + languageName: node + linkType: hard + +"ora@npm:5.3.0": + version: 5.3.0 + resolution: "ora@npm:5.3.0" + dependencies: + bl: "npm:^4.0.3" + chalk: "npm:^4.1.0" + cli-cursor: "npm:^3.1.0" + cli-spinners: "npm:^2.5.0" + is-interactive: "npm:^1.0.0" + log-symbols: "npm:^4.0.0" + strip-ansi: "npm:^6.0.0" + wcwidth: "npm:^1.0.1" + checksum: 10/989a075b596c297acfee647010e555709bd657dedd9eee9ff99d923cbc65c68b6189c2c9ea58167675b101433509f87d1674a84047c7b766babab15d9220f1d5 languageName: node linkType: hard @@ -14923,7 +12776,7 @@ __metadata: languageName: node linkType: hard -"p-limit@npm:^3.0.2, p-limit@npm:^3.1.0": +"p-limit@npm:^3.0.2": version: 3.1.0 resolution: "p-limit@npm:3.1.0" dependencies: @@ -14977,13 +12830,22 @@ __metadata: languageName: node linkType: hard -"p-map-series@npm:^2.1.0": +"p-map-series@npm:2.1.0": version: 2.1.0 resolution: "p-map-series@npm:2.1.0" checksum: 10/69d4efbb6951c0dd62591d5a18c3af0af78496eae8b55791e049da239d70011aa3af727dece3fc9943e0bb3fd4fa64d24177cfbecc46efaf193179f0feeac486 languageName: node linkType: hard +"p-map@npm:4.0.0, p-map@npm:^4.0.0": + version: 4.0.0 + resolution: "p-map@npm:4.0.0" + dependencies: + aggregate-error: "npm:^3.0.0" + checksum: 10/7ba4a2b1e24c05e1fc14bbaea0fc6d85cf005ae7e9c9425d4575550f37e2e584b1af97bcde78eacd7559208f20995988d52881334db16cf77bc1bcf68e48ed7c + languageName: node + linkType: hard + "p-map@npm:^2.0.0": version: 2.1.0 resolution: "p-map@npm:2.1.0" @@ -15000,15 +12862,6 @@ __metadata: languageName: node linkType: hard -"p-map@npm:^4.0.0": - version: 4.0.0 - resolution: "p-map@npm:4.0.0" - dependencies: - aggregate-error: "npm:^3.0.0" - checksum: 10/7ba4a2b1e24c05e1fc14bbaea0fc6d85cf005ae7e9c9425d4575550f37e2e584b1af97bcde78eacd7559208f20995988d52881334db16cf77bc1bcf68e48ed7c - languageName: node - linkType: hard - "p-map@npm:^7.0.1": version: 7.0.1 resolution: "p-map@npm:7.0.1" @@ -15016,14 +12869,14 @@ __metadata: languageName: node linkType: hard -"p-pipe@npm:^3.1.0": +"p-pipe@npm:3.1.0": version: 3.1.0 resolution: "p-pipe@npm:3.1.0" checksum: 10/d4ef73801a99bd6ca6f1bd0f46c7992c4d006421d653de387893b72d91373ab93fca75ffaacba6199b1ce5bb5ff51d715f1c669541186afbb0a11b4aebb032b3 languageName: node linkType: hard -"p-queue@npm:^6.6.2": +"p-queue@npm:6.6.2": version: 6.6.2 resolution: "p-queue@npm:6.6.2" dependencies: @@ -15033,7 +12886,7 @@ __metadata: languageName: node linkType: hard -"p-reduce@npm:^2.0.0, p-reduce@npm:^2.1.0": +"p-reduce@npm:2.1.0, p-reduce@npm:^2.0.0, p-reduce@npm:^2.1.0": version: 2.1.0 resolution: "p-reduce@npm:2.1.0" checksum: 10/99b26d36066a921982f25c575e78355824da0787c486e3dd9fc867460e8bf17d5fb3ce98d006b41bdc81ffc0aa99edf5faee53d11fe282a20291fb721b0cb1c7 @@ -15070,7 +12923,7 @@ __metadata: languageName: node linkType: hard -"p-waterfall@npm:^2.1.1": +"p-waterfall@npm:2.1.1": version: 2.1.1 resolution: "p-waterfall@npm:2.1.1" dependencies: @@ -15110,37 +12963,6 @@ __metadata: languageName: node linkType: hard -"pacote@npm:^13.0.3, pacote@npm:^13.6.1": - version: 13.6.2 - resolution: "pacote@npm:13.6.2" - dependencies: - "@npmcli/git": "npm:^3.0.0" - "@npmcli/installed-package-contents": "npm:^1.0.7" - "@npmcli/promise-spawn": "npm:^3.0.0" - "@npmcli/run-script": "npm:^4.1.0" - cacache: "npm:^16.0.0" - chownr: "npm:^2.0.0" - fs-minipass: "npm:^2.1.0" - infer-owner: "npm:^1.0.4" - minipass: "npm:^3.1.6" - mkdirp: "npm:^1.0.4" - npm-package-arg: "npm:^9.0.0" - npm-packlist: "npm:^5.1.0" - npm-pick-manifest: "npm:^7.0.0" - npm-registry-fetch: "npm:^13.0.1" - proc-log: "npm:^2.0.0" - promise-retry: "npm:^2.0.1" - read-package-json: "npm:^5.0.0" - read-package-json-fast: "npm:^2.0.3" - rimraf: "npm:^3.0.2" - ssri: "npm:^9.0.0" - tar: "npm:^6.1.11" - bin: - pacote: lib/bin.js - checksum: 10/a80061730420574ee7286bd25a6e93b70ff03df51053e14e703857400dcd02ef5cd4cdf2f12b289d81e6d97b82f70947ea299cac4603d0568ffa7a6f11d6adc3 - languageName: node - linkType: hard - "pacote@npm:^17.0.0, pacote@npm:^17.0.4, pacote@npm:^17.0.6": version: 17.0.6 resolution: "pacote@npm:17.0.6" @@ -15169,6 +12991,33 @@ __metadata: languageName: node linkType: hard +"pacote@npm:^18.0.0, pacote@npm:^18.0.6": + version: 18.0.6 + resolution: "pacote@npm:18.0.6" + dependencies: + "@npmcli/git": "npm:^5.0.0" + "@npmcli/installed-package-contents": "npm:^2.0.1" + "@npmcli/package-json": "npm:^5.1.0" + "@npmcli/promise-spawn": "npm:^7.0.0" + "@npmcli/run-script": "npm:^8.0.0" + cacache: "npm:^18.0.0" + fs-minipass: "npm:^3.0.0" + minipass: "npm:^7.0.2" + npm-package-arg: "npm:^11.0.0" + npm-packlist: "npm:^8.0.0" + npm-pick-manifest: "npm:^9.0.0" + npm-registry-fetch: "npm:^17.0.0" + proc-log: "npm:^4.0.0" + promise-retry: "npm:^2.0.1" + sigstore: "npm:^2.2.0" + ssri: "npm:^10.0.0" + tar: "npm:^6.1.11" + bin: + pacote: bin/index.js + checksum: 10/48cbcb3c20792952d431c995c2965340d3501e1795313d7225149435c883fb071d6a9bfbe11b1021dc888319f27a8c865cb70656f6472d7443545eb347447553 + languageName: node + linkType: hard + "param-case@npm:^3.0.4": version: 3.0.4 resolution: "param-case@npm:3.0.4" @@ -15188,17 +13037,6 @@ __metadata: languageName: node linkType: hard -"parse-conflict-json@npm:^2.0.1": - version: 2.0.2 - resolution: "parse-conflict-json@npm:2.0.2" - dependencies: - json-parse-even-better-errors: "npm:^2.3.1" - just-diff: "npm:^5.0.1" - just-diff-apply: "npm:^5.2.0" - checksum: 10/63715749f9f98fad0abf792f38ee5bd136b7753dee7ea104230c19570d7767ac0e04e972a20aed89392a871b6fc6474d43bd606d53738207b26542ba8544d98f - languageName: node - linkType: hard - "parse-conflict-json@npm:^3.0.0, parse-conflict-json@npm:^3.0.1": version: 3.0.1 resolution: "parse-conflict-json@npm:3.0.1" @@ -15264,24 +13102,21 @@ __metadata: languageName: node linkType: hard -"parse-path@npm:^5.0.0": - version: 5.0.0 - resolution: "parse-path@npm:5.0.0" +"parse-path@npm:^7.0.0": + version: 7.0.0 + resolution: "parse-path@npm:7.0.0" dependencies: protocols: "npm:^2.0.0" - checksum: 10/1cf389cb15d89e58fa1614b723b22bfcf8ef1fdc0738bb07e81ec9e2e5383d6d544d3949f6746ae12cbad909b245b5f152add3e5c3a47232c0c0e10758c048f3 + checksum: 10/2e6eadae5aff97a8b6373c1c08440bfeed814f65452674a139dc606c7c410e8e48b7983fe451aedc59802a2814121b40415ca00675c1546ff75cb73ad0c1df5a languageName: node linkType: hard -"parse-url@npm:^7.0.2": - version: 7.0.2 - resolution: "parse-url@npm:7.0.2" +"parse-url@npm:^8.1.0": + version: 8.1.0 + resolution: "parse-url@npm:8.1.0" dependencies: - is-ssh: "npm:^1.4.0" - normalize-url: "npm:^6.1.0" - parse-path: "npm:^5.0.0" - protocols: "npm:^2.0.1" - checksum: 10/b378f3a806bbbacdfdbb510307af418ccbc0b62450b64cc49b417c6e2089f0c57b4ae7131accbb4b59fc7dc2da68612701e4aabb0f882faf326040aab777ce83 + parse-path: "npm:^7.0.0" + checksum: 10/ceb51dc474568092a50d6d936036dfe438a87aa45bcf20947c8fcdf1544ee9c50255608abae604644e718e91e0b83cfbea4675e8b2fd90bc197432f6d9be263c languageName: node linkType: hard @@ -15415,7 +13250,7 @@ __metadata: languageName: node linkType: hard -"path-scurry@npm:^1.11.1": +"path-scurry@npm:^1.11.1, path-scurry@npm:^1.6.1": version: 1.11.1 resolution: "path-scurry@npm:1.11.1" dependencies: @@ -15492,7 +13327,7 @@ __metadata: languageName: node linkType: hard -"picomatch@npm:2.3.1, picomatch@npm:^2.0.4, picomatch@npm:^2.0.5, picomatch@npm:^2.2.3, picomatch@npm:^2.3.1": +"picomatch@npm:2.3.1, picomatch@npm:^2.0.5, picomatch@npm:^2.2.3, picomatch@npm:^2.3.1": version: 2.3.1 resolution: "picomatch@npm:2.3.1" checksum: 10/60c2595003b05e4535394d1da94850f5372c9427ca4413b71210f437f7b2ca091dbd611c45e8b37d10036fa8eade25c1b8951654f9d3973bfa66a2ff4d3b08bc @@ -15508,6 +13343,13 @@ __metadata: languageName: node linkType: hard +"pify@npm:5.0.0": + version: 5.0.0 + resolution: "pify@npm:5.0.0" + checksum: 10/443e3e198ad6bfa8c0c533764cf75c9d5bc976387a163792fb553ffe6ce923887cf14eebf5aea9b7caa8eab930da8c33612990ae85bd8c2bc18bedb9eae94ecb + languageName: node + linkType: hard + "pify@npm:^2.3.0": version: 2.3.0 resolution: "pify@npm:2.3.0" @@ -15529,20 +13371,6 @@ __metadata: languageName: node linkType: hard -"pify@npm:^5.0.0": - version: 5.0.0 - resolution: "pify@npm:5.0.0" - checksum: 10/443e3e198ad6bfa8c0c533764cf75c9d5bc976387a163792fb553ffe6ce923887cf14eebf5aea9b7caa8eab930da8c33612990ae85bd8c2bc18bedb9eae94ecb - languageName: node - linkType: hard - -"pirates@npm:^4.0.4": - version: 4.0.5 - resolution: "pirates@npm:4.0.5" - checksum: 10/3728bae0cf6c18c3d25f5449ee8c5bc1a6a83bca688abe0e1654ce8c069bfd408170397cef133ed9ec8b0faeb4093c5c728d0e72ab7b3385256cd87008c40364 - languageName: node - linkType: hard - "pkg-conf@npm:^2.1.0": version: 2.1.0 resolution: "pkg-conf@npm:2.1.0" @@ -15620,7 +13448,16 @@ __metadata: languageName: node linkType: hard -"prettier@npm:2.7.1, prettier@npm:^2.2.1": +"prettier@npm:3.3.3": + version: 3.3.3 + resolution: "prettier@npm:3.3.3" + bin: + prettier: bin/prettier.cjs + checksum: 10/5beac1f30b5b40162532b8e2f7c3a4eb650910a2695e9c8512a62ffdc09dae93190c29db9107fa7f26d1b6c71aad3628ecb9b5de1ecb0911191099be109434d7 + languageName: node + linkType: hard + +"prettier@npm:^2.2.1": version: 2.7.1 resolution: "prettier@npm:2.7.1" bin: @@ -15629,21 +13466,14 @@ __metadata: languageName: node linkType: hard -"pretty-format@npm:^29.5.0": - version: 29.5.0 - resolution: "pretty-format@npm:29.5.0" +"pretty-format@npm:^29.7.0": + version: 29.7.0 + resolution: "pretty-format@npm:29.7.0" dependencies: - "@jest/schemas": "npm:^29.4.3" + "@jest/schemas": "npm:^29.6.3" ansi-styles: "npm:^5.0.0" react-is: "npm:^18.0.0" - checksum: 10/b025cb1d2bf27b8dc338792b208811b196828ccf590a87014d9ac9406eb809324ef56151ba41d489c8a67fed94cdacc94ca003380c2795233e117a5874b2566b - languageName: node - linkType: hard - -"proc-log@npm:^2.0.0, proc-log@npm:^2.0.1": - version: 2.0.1 - resolution: "proc-log@npm:2.0.1" - checksum: 10/f6f23564ff759097db37443e6e2765af84979a703d2c52c1b9df506ee9f87caa101ba49d8fdc115c1a313ec78e37e8134704e9069e6a870f3499d98bb24c436f + checksum: 10/dea96bc83c83cd91b2bfc55757b6b2747edcaac45b568e46de29deee80742f17bc76fe8898135a70d904f4928eafd8bb693cd1da4896e8bdd3c5e82cadf1d2bb languageName: node linkType: hard @@ -15654,6 +13484,13 @@ __metadata: languageName: node linkType: hard +"proc-log@npm:^4.0.0, proc-log@npm:^4.1.0, proc-log@npm:^4.2.0": + version: 4.2.0 + resolution: "proc-log@npm:4.2.0" + checksum: 10/4e1394491b717f6c1ade15c570ecd4c2b681698474d3ae2d303c1e4b6ab9455bd5a81566211e82890d5a5ae9859718cc6954d5150bb18b09b72ecb297beae90a + languageName: node + linkType: hard + "process-nextick-args@npm:~2.0.0": version: 2.0.1 resolution: "process-nextick-args@npm:2.0.1" @@ -15661,6 +13498,13 @@ __metadata: languageName: node linkType: hard +"proggy@npm:^2.0.0": + version: 2.0.0 + resolution: "proggy@npm:2.0.0" + checksum: 10/9c96830d30516534c91e1260cae98d2c12aa32ea4ca7ff979876557ae293581c4874c95daf80497a7350179e7fec6d119cd589ef09af9c925f5842161897ed7e + languageName: node + linkType: hard + "promise-all-reject-late@npm:^1.0.0": version: 1.0.1 resolution: "promise-all-reject-late@npm:1.0.1" @@ -15668,13 +13512,6 @@ __metadata: languageName: node linkType: hard -"promise-call-limit@npm:^1.0.1": - version: 1.0.2 - resolution: "promise-call-limit@npm:1.0.2" - checksum: 10/d0664dd2954c063115c58a4d0f929ff8dcfca634146dfdd4ec86f4993cfe14db229fb990457901ad04c923b3fb872067f3b47e692e0c645c01536b92fc4460bd - languageName: node - linkType: hard - "promise-call-limit@npm:^3.0.1": version: 3.0.1 resolution: "promise-call-limit@npm:3.0.1" @@ -15699,25 +13536,6 @@ __metadata: languageName: node linkType: hard -"prompts@npm:^2.0.1": - version: 2.4.2 - resolution: "prompts@npm:2.4.2" - dependencies: - kleur: "npm:^3.0.3" - sisteransi: "npm:^1.0.5" - checksum: 10/c52536521a4d21eff4f2f2aa4572446cad227464066365a7167e52ccf8d9839c099f9afec1aba0eed3d5a2514b3e79e0b3e7a1dc326b9acde6b75d27ed74b1a9 - languageName: node - linkType: hard - -"promzard@npm:^0.3.0": - version: 0.3.0 - resolution: "promzard@npm:0.3.0" - dependencies: - read: "npm:1" - checksum: 10/fb3d2e52e8665bdbec1cb8db96acf5c1777cd7da1d2e062606ee6159bebec881065e8f292183feab28a9f42506e5b0f37f38368860b77ccfe658cd8db6894cb6 - languageName: node - linkType: hard - "promzard@npm:^1.0.0": version: 1.0.0 resolution: "promzard@npm:1.0.0" @@ -15797,13 +13615,6 @@ __metadata: languageName: node linkType: hard -"pure-rand@npm:^6.0.0": - version: 6.0.2 - resolution: "pure-rand@npm:6.0.2" - checksum: 10/d33f92dbac58eba65e851046905379ddd32b0af11daa49187bf2b44c4da6e5685cdcd8775388a3c706c126dcdb19bdcc0f736a0c432de25d68d21a762ff5f572 - languageName: node - linkType: hard - "q@npm:^1.5.1": version: 1.5.1 resolution: "q@npm:1.5.1" @@ -15848,13 +13659,6 @@ __metadata: languageName: node linkType: hard -"rambda@npm:^7.1.0": - version: 7.1.4 - resolution: "rambda@npm:7.1.4" - checksum: 10/b30109f47c6ae00a1281b9b37975cb501efc532397982699500dc7fd4b8e2aedeef6b82ec490d00f66e5ec6670e712fe0024163ad262059a44a76dc1723f0436 - languageName: node - linkType: hard - "rc@npm:1.2.8, rc@npm:^1.2.8": version: 1.2.8 resolution: "rc@npm:1.2.8" @@ -15876,21 +13680,14 @@ __metadata: languageName: node linkType: hard -"read-cmd-shim@npm:^3.0.0": - version: 3.0.1 - resolution: "read-cmd-shim@npm:3.0.1" - checksum: 10/40da114bb365d42df8871be6b586774b52872a4b1d8d95386003329e4948782d72a439daf2be2501b95884fe2cbfcc243da5ebfa9b396ffecf979fd64bd08206 - languageName: node - linkType: hard - -"read-cmd-shim@npm:^4.0.0": +"read-cmd-shim@npm:4.0.0, read-cmd-shim@npm:^4.0.0": version: 4.0.0 resolution: "read-cmd-shim@npm:4.0.0" checksum: 10/69a83acf0a3e2357762d5944a6f4a3f3c5527d0f9fe8a5c9362225aaf702ccfa580ff3bc0b84809c99e88861a5e5be147629717f02ff9befdac68fca1ccc7664 languageName: node linkType: hard -"read-package-json-fast@npm:^2.0.2, read-package-json-fast@npm:^2.0.3": +"read-package-json-fast@npm:^2.0.3": version: 2.0.3 resolution: "read-package-json-fast@npm:2.0.3" dependencies: @@ -15910,18 +13707,6 @@ __metadata: languageName: node linkType: hard -"read-package-json@npm:^5.0.0, read-package-json@npm:^5.0.1": - version: 5.0.2 - resolution: "read-package-json@npm:5.0.2" - dependencies: - glob: "npm:^8.0.1" - json-parse-even-better-errors: "npm:^2.3.1" - normalize-package-data: "npm:^4.0.0" - npm-normalize-package-bin: "npm:^2.0.0" - checksum: 10/a54db7c85671090cfd16d5d90ff4fa6a1a776b65e8995d48ef98e3d7e09334fd1a009271ab9c9884e097d3312ec4f1973b81a26a5e343f2b844e26b2c7b3b149 - languageName: node - linkType: hard - "read-package-json@npm:^7.0.0": version: 7.0.0 resolution: "read-package-json@npm:7.0.0" @@ -16047,15 +13832,6 @@ __metadata: languageName: node linkType: hard -"read@npm:1, read@npm:^1.0.7": - version: 1.0.7 - resolution: "read@npm:1.0.7" - dependencies: - mute-stream: "npm:~0.0.4" - checksum: 10/2777c254e5732cac96f5d0a1c0f6b836c89ae23d8febd405b206f6f24d5de1873420f1a0795e0e3721066650d19adf802c7882c4027143ee0acf942a4f34f97b - languageName: node - linkType: hard - "read@npm:^2.0.0, read@npm:^2.1.0": version: 2.1.0 resolution: "read@npm:2.1.0" @@ -16094,21 +13870,9 @@ __metadata: isarray: "npm:~1.0.0" process-nextick-args: "npm:~2.0.0" safe-buffer: "npm:~5.1.1" - string_decoder: "npm:~1.1.1" - util-deprecate: "npm:~1.0.1" - checksum: 10/d04c677c1705e3fc6283d45859a23f4c05243d0c0f1fc08cb8f995b4d69f0eb7f38ec0ec102f0ee20535c5d999ee27449f40aa2edf6bf30c24d0cc8f8efeb6d7 - languageName: node - linkType: hard - -"readdir-scoped-modules@npm:^1.1.0": - version: 1.1.0 - resolution: "readdir-scoped-modules@npm:1.1.0" - dependencies: - debuglog: "npm:^1.0.1" - dezalgo: "npm:^1.0.0" - graceful-fs: "npm:^4.1.2" - once: "npm:^1.3.0" - checksum: 10/6d9f334e40dfd0f5e4a8aab5e67eb460c95c85083c690431f87ab2c9135191170e70c2db6d71afcafb78e073d23eb95dcb3fc33ef91308f6ebfe3197be35e608 + string_decoder: "npm:~1.1.1" + util-deprecate: "npm:~1.0.1" + checksum: 10/d04c677c1705e3fc6283d45859a23f4c05243d0c0f1fc08cb8f995b4d69f0eb7f38ec0ec102f0ee20535c5d999ee27449f40aa2edf6bf30c24d0cc8f8efeb6d7 languageName: node linkType: hard @@ -16146,13 +13910,6 @@ __metadata: languageName: node linkType: hard -"regexpp@npm:^3.2.0": - version: 3.2.0 - resolution: "regexpp@npm:3.2.0" - checksum: 10/3310010895a906873262f4b494fc99bcef1e71ef6720a0532c5999ca586498cbd4a284c8e3c2423f9d1d37512fd08d6064b7564e0e59508cf938f76dd15ace84 - languageName: node - linkType: hard - "registry-auth-token@npm:^4.0.0": version: 4.2.1 resolution: "registry-auth-token@npm:4.2.1" @@ -16340,14 +14097,7 @@ __metadata: languageName: node linkType: hard -"resolve.exports@npm:^2.0.0": - version: 2.0.2 - resolution: "resolve.exports@npm:2.0.2" - checksum: 10/f1cc0b6680f9a7e0345d783e0547f2a5110d8336b3c2a4227231dd007271ffd331fd722df934f017af90bae0373920ca0d4005da6f76cb3176c8ae426370f893 - languageName: node - linkType: hard - -"resolve@npm:^1.10.0, resolve@npm:^1.20.0": +"resolve@npm:^1.10.0": version: 1.22.1 resolution: "resolve@npm:1.22.1" dependencies: @@ -16360,7 +14110,7 @@ __metadata: languageName: node linkType: hard -"resolve@patch:resolve@npm%3A^1.10.0#optional!builtin, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin": +"resolve@patch:resolve@npm%3A^1.10.0#optional!builtin": version: 1.22.1 resolution: "resolve@patch:resolve@npm%3A1.22.1#optional!builtin::version=1.22.1&hash=c3c19d" dependencies: @@ -16458,6 +14208,17 @@ __metadata: languageName: node linkType: hard +"rimraf@npm:^4.4.1": + version: 4.4.1 + resolution: "rimraf@npm:4.4.1" + dependencies: + glob: "npm:^9.2.0" + bin: + rimraf: dist/cjs/src/bin.js + checksum: 10/218ef9122145ccce9d0a71124d36a3894537de46600b37fae7dba26ccff973251eaa98aa63c2c5855a05fa04bca7cbbd7a92d4b29f2875d2203e72530ecf6ede + languageName: node + linkType: hard + "rollup@npm:^4.20.0": version: 4.21.3 resolution: "rollup@npm:4.21.3" @@ -16726,7 +14487,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:7.5.4, semver@npm:>=7.5.4, semver@npm:^7.5.4": +"semver@npm:>=7.5.4, semver@npm:^7.5.4": version: 7.5.4 resolution: "semver@npm:7.5.4" dependencies: @@ -16746,6 +14507,15 @@ __metadata: languageName: node linkType: hard +"semver@npm:^7.3.8, semver@npm:^7.6.2": + version: 7.6.3 + resolution: "semver@npm:7.6.3" + bin: + semver: bin/semver.js + checksum: 10/36b1fbe1a2b6f873559cd57b238f1094a053dbfd997ceeb8757d79d1d2089c56d1321b9f1069ce263dc64cfa922fa1d2ad566b39426fe1ac6c723c1487589e10 + languageName: node + linkType: hard + "semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.6.0": version: 7.6.0 resolution: "semver@npm:7.6.0" @@ -16757,15 +14527,6 @@ __metadata: languageName: node linkType: hard -"semver@npm:^7.6.2": - version: 7.6.3 - resolution: "semver@npm:7.6.3" - bin: - semver: bin/semver.js - checksum: 10/36b1fbe1a2b6f873559cd57b238f1094a053dbfd997ceeb8757d79d1d2089c56d1321b9f1069ce263dc64cfa922fa1d2ad566b39426fe1ac6c723c1487589e10 - languageName: node - linkType: hard - "sentence-case@npm:^3.0.4": version: 3.0.4 resolution: "sentence-case@npm:3.0.4" @@ -16929,7 +14690,7 @@ __metadata: languageName: node linkType: hard -"signal-exit@npm:^3.0.0, signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.3, signal-exit@npm:^3.0.7": +"signal-exit@npm:3.0.7, signal-exit@npm:^3.0.0, signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.3, signal-exit@npm:^3.0.7": version: 3.0.7 resolution: "signal-exit@npm:3.0.7" checksum: 10/a2f098f247adc367dffc27845853e9959b9e88b01cb301658cfe4194352d8d2bb32e18467c786a7fe15f1d44b233ea35633d076d5e737870b7139949d1ab6318 @@ -16992,13 +14753,6 @@ __metadata: languageName: node linkType: hard -"sisteransi@npm:^1.0.5": - version: 1.0.5 - resolution: "sisteransi@npm:1.0.5" - checksum: 10/aba6438f46d2bfcef94cf112c835ab395172c75f67453fe05c340c770d3c402363018ae1ab4172a1026a90c47eaccf3af7b6ff6fa749a680c2929bd7fa2b37a4 - languageName: node - linkType: hard - "skin-tone@npm:^2.0.0": version: 2.0.0 resolution: "skin-tone@npm:2.0.0" @@ -17023,6 +14777,13 @@ __metadata: languageName: node linkType: hard +"slash@npm:3.0.0, slash@npm:^3.0.0": + version: 3.0.0 + resolution: "slash@npm:3.0.0" + checksum: 10/94a93fff615f25a999ad4b83c9d5e257a7280c90a32a7cb8b4a87996e4babf322e469c42b7f649fd5796edd8687652f3fb452a86dc97a816f01113183393f11c + languageName: node + linkType: hard + "slash@npm:^1.0.0": version: 1.0.0 resolution: "slash@npm:1.0.0" @@ -17030,13 +14791,6 @@ __metadata: languageName: node linkType: hard -"slash@npm:^3.0.0": - version: 3.0.0 - resolution: "slash@npm:3.0.0" - checksum: 10/94a93fff615f25a999ad4b83c9d5e257a7280c90a32a7cb8b4a87996e4babf322e469c42b7f649fd5796edd8687652f3fb452a86dc97a816f01113183393f11c - languageName: node - linkType: hard - "slash@npm:^4.0.0": version: 4.0.0 resolution: "slash@npm:4.0.0" @@ -17164,17 +14918,6 @@ __metadata: languageName: node linkType: hard -"socks-proxy-agent@npm:^7.0.0": - version: 7.0.0 - resolution: "socks-proxy-agent@npm:7.0.0" - dependencies: - agent-base: "npm:^6.0.2" - debug: "npm:^4.3.3" - socks: "npm:^2.6.2" - checksum: 10/26c75d9c62a9ed3fd494df60e65e88da442f78e0d4bc19bfd85ac37bd2c67470d6d4bba5202e804561cda6674db52864c9e2a2266775f879bc8d89c1445a5f4c - languageName: node - linkType: hard - "socks-proxy-agent@npm:^8.0.1": version: 8.0.2 resolution: "socks-proxy-agent@npm:8.0.2" @@ -17244,16 +14987,6 @@ __metadata: languageName: node linkType: hard -"source-map-support@npm:0.5.13": - version: 0.5.13 - resolution: "source-map-support@npm:0.5.13" - dependencies: - buffer-from: "npm:^1.0.0" - source-map: "npm:^0.6.0" - checksum: 10/d1514a922ac9c7e4786037eeff6c3322f461cd25da34bb9fefb15387b3490531774e6e31d95ab6d5b84a3e139af9c3a570ccaee6b47bd7ea262691ed3a8bc34e - languageName: node - linkType: hard - "source-map-url@npm:^0.4.0": version: 0.4.1 resolution: "source-map-url@npm:0.4.1" @@ -17268,7 +15001,7 @@ __metadata: languageName: node linkType: hard -"source-map@npm:^0.6.0, source-map@npm:^0.6.1": +"source-map@npm:^0.6.1": version: 0.6.1 resolution: "source-map@npm:0.6.1" checksum: 10/59ef7462f1c29d502b3057e822cdbdae0b0e565302c4dd1a95e11e793d8d9d62006cdc10e0fd99163ca33ff2071360cf50ee13f90440806e7ed57d81cba2f7ff @@ -17332,7 +15065,7 @@ __metadata: languageName: node linkType: hard -"split2@npm:^3.0.0": +"split2@npm:^3.0.0, split2@npm:^3.2.2": version: 3.2.2 resolution: "split2@npm:3.2.2" dependencies: @@ -17357,7 +15090,7 @@ __metadata: languageName: node linkType: hard -"split@npm:1.0.1, split@npm:>=1.0.1, split@npm:^1.0.0, split@npm:^1.0.1": +"split@npm:1.0.1, split@npm:>=1.0.1, split@npm:^1.0.1": version: 1.0.1 resolution: "split@npm:1.0.1" dependencies: @@ -17403,21 +15136,21 @@ __metadata: languageName: node linkType: hard -"ssri@npm:^9.0.0, ssri@npm:^9.0.1": - version: 9.0.1 - resolution: "ssri@npm:9.0.1" +"ssri@npm:^10.0.6": + version: 10.0.6 + resolution: "ssri@npm:10.0.6" dependencies: - minipass: "npm:^3.1.1" - checksum: 10/7638a61e91432510718e9265d48d0438a17d53065e5184f1336f234ef6aa3479663942e41e97df56cda06bb24d9d0b5ef342c10685add3cac7267a82d7fa6718 + minipass: "npm:^7.0.3" + checksum: 10/f92c1b3cc9bfd0a925417412d07d999935917bc87049f43ebec41074661d64cf720315661844106a77da9f8204b6d55ae29f9514e673083cae39464343af2a8b languageName: node linkType: hard -"stack-utils@npm:^2.0.3": - version: 2.0.5 - resolution: "stack-utils@npm:2.0.5" +"ssri@npm:^9.0.0": + version: 9.0.1 + resolution: "ssri@npm:9.0.1" dependencies: - escape-string-regexp: "npm:^2.0.0" - checksum: 10/a6d64e5dd24d321289ebefdff2e210ece75fdf20dbcdb702b86da1f7b730743fae3e9337adae4a5cc00d4970d748ff758387df3ea7c71c45b466c43c7359bc00 + minipass: "npm:^3.1.1" + checksum: 10/7638a61e91432510718e9265d48d0438a17d53065e5184f1336f234ef6aa3479663942e41e97df56cda06bb24d9d0b5ef342c10685add3cac7267a82d7fa6718 languageName: node linkType: hard @@ -17469,16 +15202,6 @@ __metadata: languageName: node linkType: hard -"string-length@npm:^4.0.1": - version: 4.0.2 - resolution: "string-length@npm:4.0.2" - dependencies: - char-regex: "npm:^1.0.2" - strip-ansi: "npm:^6.0.0" - checksum: 10/ce85533ef5113fcb7e522bcf9e62cb33871aa99b3729cec5595f4447f660b0cefd542ca6df4150c97a677d58b0cb727a3fe09ac1de94071d05526c73579bf505 - languageName: node - linkType: hard - "string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.0.0, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.2, string-width@npm:^4.2.3": version: 4.2.3 resolution: "string-width@npm:4.2.3" @@ -17660,7 +15383,7 @@ __metadata: languageName: node linkType: hard -"strip-json-comments@npm:^3.1.0, strip-json-comments@npm:^3.1.1": +"strip-json-comments@npm:^3.1.1": version: 3.1.1 resolution: "strip-json-comments@npm:3.1.1" checksum: 10/492f73e27268f9b1c122733f28ecb0e7e8d8a531a6662efbd08e22cccb3f9475e90a1b82cab06a392f6afae6d2de636f977e231296400d0ec5304ba70f166443 @@ -17681,7 +15404,7 @@ __metadata: languageName: node linkType: hard -"strong-log-transformer@npm:^2.1.0": +"strong-log-transformer@npm:2.1.0, strong-log-transformer@npm:^2.1.0": version: 2.1.0 resolution: "strong-log-transformer@npm:2.1.0" dependencies: @@ -17726,7 +15449,7 @@ __metadata: languageName: node linkType: hard -"supports-color@npm:^8.0.0, supports-color@npm:^8.1.0": +"supports-color@npm:^8.1.0": version: 8.1.1 resolution: "supports-color@npm:8.1.1" dependencies: @@ -17821,6 +15544,16 @@ __metadata: languageName: node linkType: hard +"synckit@npm:^0.9.1": + version: 0.9.1 + resolution: "synckit@npm:0.9.1" + dependencies: + "@pkgr/core": "npm:^0.1.0" + tslib: "npm:^2.6.2" + checksum: 10/bff3903976baf8b699b5483228116d70223781a93b17c70e685c277ee960cdfd1a09cb5a741e6a9ec35e2428f14f4664baec41ccc99a598f267608b2a54f529b + languageName: node + linkType: hard + "tar-stream@npm:~2.2.0": version: 2.2.0 resolution: "tar-stream@npm:2.2.0" @@ -17834,7 +15567,7 @@ __metadata: languageName: node linkType: hard -"tar@npm:^6.1.0, tar@npm:^6.1.11, tar@npm:^6.1.2, tar@npm:^6.2.0": +"tar@npm:6.2.1, tar@npm:^6.1.11, tar@npm:^6.1.2, tar@npm:^6.2.0": version: 6.2.1 resolution: "tar@npm:6.2.1" dependencies: @@ -17848,7 +15581,7 @@ __metadata: languageName: node linkType: hard -"temp-dir@npm:^1.0.0": +"temp-dir@npm:1.0.0": version: 1.0.0 resolution: "temp-dir@npm:1.0.0" checksum: 10/cb2b58ddfb12efa83e939091386ad73b425c9a8487ea0095fe4653192a40d49184a771a1beba99045fbd011e389fd563122d79f54f82be86a55620667e08a6b2 @@ -17909,17 +15642,6 @@ __metadata: languageName: node linkType: hard -"test-exclude@npm:^6.0.0": - version: 6.0.0 - resolution: "test-exclude@npm:6.0.0" - dependencies: - "@istanbuljs/schema": "npm:^0.1.2" - glob: "npm:^7.1.4" - minimatch: "npm:^3.0.4" - checksum: 10/8fccb2cb6c8fcb6bb4115394feb833f8b6cf4b9503ec2485c2c90febf435cac62abe882a0c5c51a37b9bbe70640cdd05acf5f45e486ac4583389f4b0855f69e5 - languageName: node - linkType: hard - "test-exclude@npm:^7.0.1": version: 7.0.1 resolution: "test-exclude@npm:7.0.1" @@ -18063,13 +15785,6 @@ __metadata: languageName: node linkType: hard -"tmpl@npm:1.0.5": - version: 1.0.5 - resolution: "tmpl@npm:1.0.5" - checksum: 10/cd922d9b853c00fe414c5a774817be65b058d54a2d01ebb415840960406c669a0fc632f66df885e24cb022ec812739199ccbdb8d1164c3e513f85bfca5ab2873 - languageName: node - linkType: hard - "to-fast-properties@npm:^2.0.0": version: 2.0.0 resolution: "to-fast-properties@npm:2.0.0" @@ -18141,15 +15856,6 @@ __metadata: languageName: node linkType: hard -"tr46@npm:^2.1.0": - version: 2.1.0 - resolution: "tr46@npm:2.1.0" - dependencies: - punycode: "npm:^2.1.1" - checksum: 10/302b13f458da713b2a6ff779a0c1d27361d369fdca6c19330536d31db61789b06b246968fc879fdac818a92d02643dca1a0f4da5618df86aea4a79fb3243d3f3 - languageName: node - linkType: hard - "tr46@npm:~0.0.3": version: 0.0.3 resolution: "tr46@npm:0.0.3" @@ -18173,13 +15879,6 @@ __metadata: languageName: node linkType: hard -"treeverse@npm:^2.0.0": - version: 2.0.0 - resolution: "treeverse@npm:2.0.0" - checksum: 10/361864801907dc08edb1b83ea61dc5a776decab0597bfa08d7b3155e451c0ec88a889f85213ed29517bac8ca9a52011a05f951b5a8c6196fcfdd868d3ee5d01a - languageName: node - linkType: hard - "treeverse@npm:^3.0.0": version: 3.0.0 resolution: "treeverse@npm:3.0.0" @@ -18210,6 +15909,15 @@ __metadata: languageName: node linkType: hard +"ts-api-utils@npm:^1.3.0": + version: 1.3.0 + resolution: "ts-api-utils@npm:1.3.0" + peerDependencies: + typescript: ">=4.2.0" + checksum: 10/3ee44faa24410cd649b5c864e068d438aa437ef64e9e4a66a41646a6d3024d3097a695eeb3fb26ee364705d3cb9653a65756d009e6a53badb6066a5f447bf7ed + languageName: node + linkType: hard + "ts-jest@npm:28.0.8": version: 28.0.8 resolution: "ts-jest@npm:28.0.8" @@ -18317,7 +16025,7 @@ __metadata: languageName: node linkType: hard -"tslib@npm:^1.8.1, tslib@npm:^1.9.0": +"tslib@npm:^1.9.0": version: 1.14.1 resolution: "tslib@npm:1.14.1" checksum: 10/7dbf34e6f55c6492637adb81b555af5e3b4f9cc6b998fb440dac82d3b42bdc91560a35a5fb75e20e24a076c651438234da6743d139e4feabf0783f3cdfe1dddb @@ -18345,14 +16053,10 @@ __metadata: languageName: node linkType: hard -"tsutils@npm:^3.21.0": - version: 3.21.0 - resolution: "tsutils@npm:3.21.0" - dependencies: - tslib: "npm:^1.8.1" - 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" - checksum: 10/ea036bec1dd024e309939ffd49fda7a351c0e87a1b8eb049570dd119d447250e2c56e0e6c00554e8205760e7417793fdebff752a46e573fbe07d4f375502a5b2 +"tslib@npm:^2.6.2": + version: 2.7.0 + resolution: "tslib@npm:2.7.0" + checksum: 10/9a5b47ddac65874fa011c20ff76db69f97cf90c78cff5934799ab8894a5342db2d17b4e7613a087046bc1d133d21547ddff87ac558abeec31ffa929c88b7fce6 languageName: node linkType: hard @@ -18546,6 +16250,16 @@ __metadata: languageName: node linkType: hard +"typescript@npm:>=3 < 6": + version: 5.6.2 + resolution: "typescript@npm:5.6.2" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 10/f95365d4898f357823e93d334ecda9fcade54f009b397c7d05b7621cd9e865981033cf89ccde0f3e3a7b73b1fdbae18e92bc77db237b43e912f053fef0f9a53b + languageName: node + linkType: hard + "typescript@npm:>=5.3.3": version: 5.3.3 resolution: "typescript@npm:5.3.3" @@ -18566,6 +16280,16 @@ __metadata: languageName: node linkType: hard +"typescript@patch:typescript@npm%3A>=3 < 6#optional!builtin": + version: 5.6.2 + resolution: "typescript@patch:typescript@npm%3A5.6.2#optional!builtin::version=5.6.2&hash=d69c25" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 10/060a7349adf698477b411be4ace470aee6c2c1bd99917fdf5d33697c17ec55c64fe724eb10399387530b50e9913b41528dd8bfcca0a5fc8f8bac63fbb4580a2e + languageName: node + linkType: hard + "typescript@patch:typescript@npm%3A>=5.3.3#optional!builtin": version: 5.3.3 resolution: "typescript@patch:typescript@npm%3A5.3.3#optional!builtin::version=5.3.3&hash=e012d7" @@ -18641,15 +16365,6 @@ __metadata: languageName: node linkType: hard -"unique-filename@npm:^2.0.0": - version: 2.0.1 - resolution: "unique-filename@npm:2.0.1" - dependencies: - unique-slug: "npm:^3.0.0" - checksum: 10/807acf3381aff319086b64dc7125a9a37c09c44af7620bd4f7f3247fcd5565660ac12d8b80534dcbfd067e6fe88a67e621386dd796a8af828d1337a8420a255f - languageName: node - linkType: hard - "unique-filename@npm:^3.0.0": version: 3.0.0 resolution: "unique-filename@npm:3.0.0" @@ -18668,15 +16383,6 @@ __metadata: languageName: node linkType: hard -"unique-slug@npm:^3.0.0": - version: 3.0.0 - resolution: "unique-slug@npm:3.0.0" - dependencies: - imurmurhash: "npm:^0.1.4" - checksum: 10/26fc5bc209a875956dd5e84ca39b89bc3be777b112504667c35c861f9547df95afc80439358d836b878b6d91f6ee21fe5ba1a966e9ec2e9f071ddf3fd67d45ee - languageName: node - linkType: hard - "unique-slug@npm:^4.0.0": version: 4.0.0 resolution: "unique-slug@npm:4.0.0" @@ -18818,27 +16524,13 @@ __metadata: languageName: node linkType: hard -"upath@npm:^2.0.1": +"upath@npm:2.0.1": version: 2.0.1 resolution: "upath@npm:2.0.1" checksum: 10/7b98a83559a295d59f87f7a8d615c7549d19e4aec4dd9d52be2bf1ba93e1d6ee7d8f2188cdecbf303a22cea3768abff4268b960350152a0264125f577d9ed79e languageName: node linkType: hard -"update-browserslist-db@npm:^1.0.0": - version: 1.0.4 - resolution: "update-browserslist-db@npm:1.0.4" - dependencies: - escalade: "npm:^3.1.1" - picocolors: "npm:^1.0.0" - peerDependencies: - browserslist: ">= 4.21.0" - bin: - browserslist-lint: cli.js - checksum: 10/0f676446b1b3c19d0f40f570b4692c2d801437f105d072e428637c8b4ffdb07d5f9668898323576ea9b80e115f902b33add5aa433a2877f6a6314ac49a799646 - languageName: node - linkType: hard - "update-notifier@npm:5.1.0": version: 5.1.0 resolution: "update-notifier@npm:5.1.0" @@ -18975,6 +16667,15 @@ __metadata: languageName: node linkType: hard +"uuid@npm:^10.0.0": + version: 10.0.0 + resolution: "uuid@npm:10.0.0" + bin: + uuid: dist/bin/uuid + checksum: 10/35aa60614811a201ff90f8ca5e9ecb7076a75c3821e17f0f5ff72d44e36c2d35fcbc2ceee9c4ac7317f4cc41895da30e74f3885e30313bee48fda6338f250538 + languageName: node + linkType: hard + "uuid@npm:^3.3.2": version: 3.4.0 resolution: "uuid@npm:3.4.0" @@ -19000,25 +16701,7 @@ __metadata: languageName: node linkType: hard -"v8-compile-cache@npm:2.3.0, v8-compile-cache@npm:^2.0.3": - version: 2.3.0 - resolution: "v8-compile-cache@npm:2.3.0" - checksum: 10/7de7423db6f48d76cffae93d70d503e160c97fc85e55945036d719111e20b33c4be5c21aa8b123a3da203bbb3bc4c8180f9667d5ccafcff11d749fae204ec7be - languageName: node - linkType: hard - -"v8-to-istanbul@npm:^9.0.1": - version: 9.0.1 - resolution: "v8-to-istanbul@npm:9.0.1" - dependencies: - "@jridgewell/trace-mapping": "npm:^0.3.12" - "@types/istanbul-lib-coverage": "npm:^2.0.1" - convert-source-map: "npm:^1.6.0" - checksum: 10/0bbaffbb344af7172884a6f9868fa55df96230caf7100fa250b63d95ad0e24848141b35731d16607ae0d0023baa064b75c8e4197f6071f3bd3b09540c98490a1 - languageName: node - linkType: hard - -"validate-npm-package-license@npm:^3.0.1, validate-npm-package-license@npm:^3.0.4": +"validate-npm-package-license@npm:3.0.4, validate-npm-package-license@npm:^3.0.1, validate-npm-package-license@npm:^3.0.4": version: 3.0.4 resolution: "validate-npm-package-license@npm:3.0.4" dependencies: @@ -19028,21 +16711,10 @@ __metadata: languageName: node linkType: hard -"validate-npm-package-name@npm:^3.0.0": - version: 3.0.0 - resolution: "validate-npm-package-name@npm:3.0.0" - dependencies: - builtins: "npm:^1.0.3" - checksum: 10/6f89bcc91bb0d46e3c756eec2fd33887eeb76c85d20e5d3e452b69fe3ffbd37062704a4e8422735ea82d69fd963451b4f85501a4dc856f384138411ec42608fa - languageName: node - linkType: hard - -"validate-npm-package-name@npm:^4.0.0": - version: 4.0.0 - resolution: "validate-npm-package-name@npm:4.0.0" - dependencies: - builtins: "npm:^5.0.0" - checksum: 10/a32fd537bad17fcb59cfd58ae95a414d443866020d448ec3b22e8d40550cb585026582a57efbe1f132b882eea4da8ac38ee35f7be0dd72988a3cb55d305a20c1 +"validate-npm-package-name@npm:5.0.1": + version: 5.0.1 + resolution: "validate-npm-package-name@npm:5.0.1" + checksum: 10/0d583a1af23aeffea7748742cf22b6802458736fb8b60323ba5949763824d46f796474b0e1b9206beb716f9d75269e19dbd7795d6b038b29d561be95dd827381 languageName: node linkType: hard @@ -19258,13 +16930,6 @@ __metadata: languageName: node linkType: hard -"walk-up-path@npm:^1.0.0": - version: 1.0.0 - resolution: "walk-up-path@npm:1.0.0" - checksum: 10/b8019ac4fb9ba1576839ec66d2217f62ab773c1cc4c704bfd1c79b1359fef5366f1382d3ab230a66a14c3adb1bf0fe102d1fdaa3437881e69154dfd1432abd32 - languageName: node - linkType: hard - "walk-up-path@npm:^3.0.1": version: 3.0.1 resolution: "walk-up-path@npm:3.0.1" @@ -19272,15 +16937,6 @@ __metadata: languageName: node linkType: hard -"walker@npm:^1.0.8": - version: 1.0.8 - resolution: "walker@npm:1.0.8" - dependencies: - makeerror: "npm:1.0.12" - checksum: 10/ad7a257ea1e662e57ef2e018f97b3c02a7240ad5093c392186ce0bcf1f1a60bbadd520d073b9beb921ed99f64f065efb63dfc8eec689a80e569f93c1c5d5e16c - languageName: node - linkType: hard - "warning-symbol@npm:^0.1.0": version: 0.1.0 resolution: "warning-symbol@npm:0.1.0" @@ -19304,13 +16960,6 @@ __metadata: languageName: node linkType: hard -"webidl-conversions@npm:^6.1.0": - version: 6.1.0 - resolution: "webidl-conversions@npm:6.1.0" - checksum: 10/4454b73060a6d83f7ec1f1db24c480b7ecda33880306dd32a3d62d85b36df4789a383489f1248387e5451737dca17054b8cbf2e792ba89e49d76247f0f4f6380 - languageName: node - linkType: hard - "webpack-virtual-modules@npm:^0.6.2": version: 0.6.2 resolution: "webpack-virtual-modules@npm:0.6.2" @@ -19328,17 +16977,6 @@ __metadata: languageName: node linkType: hard -"whatwg-url@npm:^8.4.0": - version: 8.7.0 - resolution: "whatwg-url@npm:8.7.0" - dependencies: - lodash: "npm:^4.7.0" - tr46: "npm:^2.1.0" - webidl-conversions: "npm:^6.1.0" - checksum: 10/512a8b2703dffbf13a9a247bf2fb27c3048a3ceb5ece09f88b737c8260afaba4b2f6775c2f1cfc29c2ba4859f2454a9de73fac08e239b00ae2b42cd6b8bb0d35 - languageName: node - linkType: hard - "which@npm:^1.2.9": version: 1.3.1 resolution: "which@npm:1.3.1" @@ -19384,7 +17022,7 @@ __metadata: languageName: node linkType: hard -"wide-align@npm:^1.1.5": +"wide-align@npm:1.1.5, wide-align@npm:^1.1.5": version: 1.1.5 resolution: "wide-align@npm:1.1.5" dependencies: @@ -19420,10 +17058,10 @@ __metadata: languageName: node linkType: hard -"word-wrap@npm:^1.2.3": - version: 1.2.3 - resolution: "word-wrap@npm:1.2.3" - checksum: 10/08a677e1578b9cc367a03d52bc51b6869fec06303f68d29439e4ed647257411f857469990c31066c1874678937dac737c9f8f20d3fd59918fb86b7d926a76b15 +"word-wrap@npm:^1.2.5": + version: 1.2.5 + resolution: "word-wrap@npm:1.2.5" + checksum: 10/1ec6f6089f205f83037be10d0c4b34c9183b0b63fca0834a5b3cee55dd321429d73d40bb44c8fc8471b5203d6e8f8275717f49a8ff4b2b0ab41d7e1b563e0854 languageName: node linkType: hard @@ -19495,6 +17133,16 @@ __metadata: languageName: node linkType: hard +"write-file-atomic@npm:5.0.1, write-file-atomic@npm:^5.0.0, write-file-atomic@npm:^5.0.1": + version: 5.0.1 + resolution: "write-file-atomic@npm:5.0.1" + dependencies: + imurmurhash: "npm:^0.1.4" + signal-exit: "npm:^4.0.1" + checksum: 10/648efddba54d478d0e4330ab6f239976df3b9752b123db5dc9405d9b5af768fa9d70ce60c52fdbe61d1200d24350bc4fbcbaf09288496c2be050de126bd95b7e + languageName: node + linkType: hard + "write-file-atomic@npm:^2.0.0, write-file-atomic@npm:^2.4.2": version: 2.4.3 resolution: "write-file-atomic@npm:2.4.3" @@ -19518,26 +17166,6 @@ __metadata: languageName: node linkType: hard -"write-file-atomic@npm:^4.0.0, write-file-atomic@npm:^4.0.1, write-file-atomic@npm:^4.0.2": - version: 4.0.2 - resolution: "write-file-atomic@npm:4.0.2" - dependencies: - imurmurhash: "npm:^0.1.4" - signal-exit: "npm:^3.0.7" - checksum: 10/3be1f5508a46c190619d5386b1ac8f3af3dbe951ed0f7b0b4a0961eed6fc626bd84b50cf4be768dabc0a05b672f5d0c5ee7f42daa557b14415d18c3a13c7d246 - languageName: node - linkType: hard - -"write-file-atomic@npm:^5.0.0, write-file-atomic@npm:^5.0.1": - version: 5.0.1 - resolution: "write-file-atomic@npm:5.0.1" - dependencies: - imurmurhash: "npm:^0.1.4" - signal-exit: "npm:^4.0.1" - checksum: 10/648efddba54d478d0e4330ab6f239976df3b9752b123db5dc9405d9b5af768fa9d70ce60c52fdbe61d1200d24350bc4fbcbaf09288496c2be050de126bd95b7e - languageName: node - linkType: hard - "write-json-file@npm:^3.2.0": version: 3.2.0 resolution: "write-json-file@npm:3.2.0" @@ -19552,21 +17180,7 @@ __metadata: languageName: node linkType: hard -"write-json-file@npm:^4.3.0": - version: 4.3.0 - resolution: "write-json-file@npm:4.3.0" - dependencies: - detect-indent: "npm:^6.0.0" - graceful-fs: "npm:^4.1.15" - is-plain-obj: "npm:^2.0.0" - make-dir: "npm:^3.0.0" - sort-keys: "npm:^4.0.0" - write-file-atomic: "npm:^3.0.0" - checksum: 10/33908c591923dc273e6574e7c0e2df157acfcf498e3a87c5615ced006a465c4058877df6abce6fc1acd2844fa3cf4518ace4a34d5d82ab28bcf896317ba1db6f - languageName: node - linkType: hard - -"write-pkg@npm:^4.0.0": +"write-pkg@npm:4.0.0": version: 4.0.0 resolution: "write-pkg@npm:4.0.0" dependencies: @@ -19647,13 +17261,6 @@ __metadata: languageName: node linkType: hard -"yargs-parser@npm:20.2.4": - version: 20.2.4 - resolution: "yargs-parser@npm:20.2.4" - checksum: 10/db8f251ae40e24782d5c089ed86883ba3c0ce7f3c174002a67ec500802f928df9d505fea5d04829769221ce20b0f69f6fb1138fbb2e2fb102e3e9d426d20edab - languageName: node - linkType: hard - "yargs-parser@npm:21.1.1, yargs-parser@npm:^21.1.1": version: 21.1.1 resolution: "yargs-parser@npm:21.1.1" @@ -19675,6 +17282,21 @@ __metadata: languageName: node linkType: hard +"yargs@npm:17.7.2, yargs@npm:^17.5.1, yargs@npm:^17.6.2": + version: 17.7.2 + resolution: "yargs@npm:17.7.2" + dependencies: + cliui: "npm:^8.0.1" + escalade: "npm:^3.1.1" + get-caller-file: "npm:^2.0.5" + require-directory: "npm:^2.1.1" + string-width: "npm:^4.2.3" + y18n: "npm:^5.0.5" + yargs-parser: "npm:^21.1.1" + checksum: 10/abb3e37678d6e38ea85485ed86ebe0d1e3464c640d7d9069805ea0da12f69d5a32df8e5625e370f9c96dd1c2dc088ab2d0a4dd32af18222ef3c4224a19471576 + languageName: node + linkType: hard + "yargs@npm:^16.0.0, yargs@npm:^16.2.0": version: 16.2.0 resolution: "yargs@npm:16.2.0" @@ -19705,21 +17327,6 @@ __metadata: languageName: node linkType: hard -"yargs@npm:^17.5.1, yargs@npm:^17.6.2": - version: 17.7.2 - resolution: "yargs@npm:17.7.2" - dependencies: - cliui: "npm:^8.0.1" - escalade: "npm:^3.1.1" - get-caller-file: "npm:^2.0.5" - require-directory: "npm:^2.1.1" - string-width: "npm:^4.2.3" - y18n: "npm:^5.0.5" - yargs-parser: "npm:^21.1.1" - checksum: 10/abb3e37678d6e38ea85485ed86ebe0d1e3464c640d7d9069805ea0da12f69d5a32df8e5625e370f9c96dd1c2dc088ab2d0a4dd32af18222ef3c4224a19471576 - languageName: node - linkType: hard - "year@npm:^0.2.1": version: 0.2.1 resolution: "year@npm:0.2.1" From a5cb34f6668a22a5063e1c431fb44501fdcf7e0e Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Sat, 14 Sep 2024 20:15:02 +0200 Subject: [PATCH 03/69] chore: fix lint --- .husky/pre-commit | 2 +- docs/.vuepress/config.js | 153 +++++++++--------- docs/.vuepress/enhanceApp.js | 18 ++- eslint.config.mjs | 12 +- packages/cli-core/src/CliCore.spec.ts | 9 +- packages/cli-core/src/CliCore.ts | 7 +- packages/cli-core/src/decorators/command.ts | 1 + .../cli-core/src/decorators/onAdd.spec.ts | 1 + .../cli-core/src/decorators/onExec.spec.ts | 1 + .../src/decorators/onPostInstall.spec.ts | 1 + .../cli-core/src/decorators/onPrompt.spec.ts | 1 + packages/cli-core/src/index.ts | 40 ++--- .../src/interfaces/CommandProvider.ts | 1 + packages/cli-core/src/interfaces/index.ts | 9 +- .../PackageManagersModule.spec.ts | 7 +- .../packageManagers/PackageManagersModule.ts | 15 +- .../cli-core/src/packageManagers/index.ts | 4 +- .../packageManagers/supports/BaseManager.ts | 4 +- .../supports/BunManager.spec.ts | 1 + .../packageManagers/supports/BunManager.ts | 1 + .../supports/NpmManager.spec.ts | 3 +- .../packageManagers/supports/NpmManager.ts | 3 +- .../supports/PNpmManager.spec.ts | 3 +- .../packageManagers/supports/PNpmManager.ts | 1 + .../supports/YarnBerryManager.spec.ts | 3 +- .../supports/YarnBerryManager.ts | 5 +- .../supports/YarnManager.spec.ts | 3 +- .../packageManagers/supports/YarnManager.ts | 1 + .../src/services/CliDockerComposeYaml.ts | 5 +- packages/cli-core/src/services/CliExeca.ts | 2 +- packages/cli-core/src/services/CliFs.ts | 2 +- .../src/services/CliHttpClient.spec.ts | 3 +- .../cli-core/src/services/CliHttpClient.ts | 7 +- .../cli-core/src/services/CliHttpLogClient.ts | 6 +- .../cli-core/src/services/CliLoadFile.spec.ts | 3 +- packages/cli-core/src/services/CliLoadFile.ts | 5 +- .../cli-core/src/services/CliPackageJson.ts | 1 + .../cli-core/src/services/CliPlugins.spec.ts | 1 + packages/cli-core/src/services/CliPlugins.ts | 9 +- .../src/services/CliProxyAgent.spec.ts | 12 +- .../cli-core/src/services/CliProxyAgent.ts | 5 +- .../src/services/CliRunScript.spec.ts | 5 +- .../cli-core/src/services/CliRunScript.ts | 2 +- packages/cli-core/src/services/CliService.ts | 15 +- packages/cli-core/src/services/CliYaml.ts | 1 + .../src/services/NpmRegistryClient.spec.ts | 1 + .../src/services/NpmRegistryClient.ts | 3 +- .../src/services/ProjectPackageJson.spec.ts | 5 +- .../src/services/ProjectPackageJson.ts | 8 +- .../cli-core/src/services/Renderer.spec.ts | 15 +- packages/cli-core/src/services/Renderer.ts | 39 +++-- packages/cli-core/src/services/index.ts | 18 +-- .../cli-core/src/utils/createInjector.spec.ts | 3 +- packages/cli-core/src/utils/createInjector.ts | 1 + .../cli-core/src/utils/createTasksRunner.ts | 3 +- .../src/utils/getCommandMetadata.spec.ts | 2 +- .../cli-core/src/utils/getCommandMetadata.ts | 3 +- .../src/utils/getTemplateDirectory.ts | 2 +- packages/cli-core/src/utils/hbs/array.ts | 2 - packages/cli-core/src/utils/hbs/collection.ts | 4 +- packages/cli-core/src/utils/hbs/comparison.ts | 1 - packages/cli-core/src/utils/hbs/index.ts | 5 +- packages/cli-core/src/utils/hbs/object.ts | 11 +- packages/cli-core/src/utils/index.ts | 4 +- packages/cli-core/src/utils/loadPlugins.ts | 3 +- .../cli-core/src/utils/mapCommanderArgs.ts | 3 +- packages/cli-core/src/utils/patchCommander.ts | 1 - .../src/utils/resolveConfiguration.ts | 3 +- .../cli-core/src/utils/streamToObservable.ts | 2 +- .../integrations/command.integration.spec.ts | 29 ++-- .../src/commands/GenerateHttpClientCmd.ts | 2 +- .../scripts/templateDir.esm.js | 3 +- .../src/CliPluginEslintModule.ts | 1 + .../src/hooks/EslintInitHook.ts | 1 + .../scripts/templateDir.esm.js | 3 +- .../src/CliPluginJestModule.ts | 3 +- .../src/hooks/JestGenerateHook.ts | 2 +- .../cli-plugin-jest/src/hooks/JestInitHook.ts | 1 + .../generate.controller.integration.spec.ts | 3 +- .../scripts/templateDir.esm.js | 3 +- .../src/CliPluginMochaModule.ts | 3 +- .../src/hooks/MochaGenerateHook.ts | 1 + .../src/hooks/MochaInitHook.ts | 1 + .../scripts/templateDir.esm.js | 3 +- .../src/CliPluginMongooseModule.ts | 1 + .../src/hooks/MongooseGenerateHook.ts | 4 +- .../src/hooks/MongooseInitHook.ts | 1 + packages/cli-plugin-mongoose/src/index.ts | 2 +- .../src/services/CliMongoose.ts | 1 + .../generate.model.integration.spec.ts | 7 +- .../generate.schema.integration.spec.ts | 5 +- .../scripts/templateDir.esm.js | 3 +- .../src/CliPluginOidcProviderModule.ts | 1 + .../src/hooks/OidcProviderInitHook.ts | 1 + .../test/init/init.integration.spec.ts | 17 +- .../scripts/templateDir.esm.js | 3 +- .../src/CliPluginPassportModule.ts | 1 + .../src/hooks/PassportGenerateHook.ts | 1 + .../scripts/templateDir.esm.js | 3 +- .../src/CliPluginPrismaModule.ts | 1 + .../src/commands/PrismaCmd.ts | 3 +- .../src/hooks/PrismaInitHook.ts | 1 + .../src/services/CliPrisma.spec.ts | 9 +- .../scripts/templateDir.esm.js | 3 +- .../src/TypeGraphqlModule.ts | 1 + .../src/hooks/TypeGraphqlInitHook.ts | 1 + .../test/init/init.integration.spec.ts | 11 +- .../scripts/templateDir.esm.js | 3 +- .../src/CliPluginTypeORMModule.ts | 1 + .../src/hooks/TypeORMGenerateHook.ts | 1 + packages/cli-plugin-typeorm/src/index.ts | 2 +- .../generate.controller.integration.spec.ts | 3 +- .../init/init.integration.spec.ts | 5 +- .../scripts/templateDir.esm.js | 3 +- .../src/CliPluginVitestModule.ts | 3 +- .../src/hooks/VitestGenerateHook.ts | 2 +- .../src/hooks/VitestInitHook.ts | 1 + .../generate.controller.integration.spec.ts | 3 +- packages/cli-testing/src/CliPlatformTest.ts | 5 +- packages/cli-testing/src/FakeCliExeca.ts | 3 - packages/cli-testing/src/FakeCliFs.ts | 10 +- packages/cli/scripts/index.esm.js | 9 +- packages/cli/src/Cli.ts | 4 +- packages/cli/src/commands/add/AddCmd.ts | 2 +- .../src/commands/generate/GenerateCmd.spec.ts | 3 +- .../cli/src/commands/generate/GenerateCmd.ts | 7 +- packages/cli/src/commands/index.ts | 6 +- .../cli/src/commands/init/InitCmd.spec.ts | 9 +- packages/cli/src/commands/init/InitCmd.ts | 19 +-- .../commands/init/config/FeaturesPrompt.ts | 6 +- .../commands/init/config/InitFileSchema.ts | 1 + .../init/interfaces/InitCmdContext.ts | 1 + .../commands/init/interfaces/InitOptions.ts | 3 +- .../init/interfaces/InitPromptAnswers.ts | 1 + .../init/mappers/mapToContext.spec.ts | 5 +- .../src/commands/init/mappers/mapToContext.ts | 1 + .../commands/init/mappers/mapUniqFeatures.ts | 4 +- .../init/prompts/getFeaturesPrompt.ts | 1 + packages/cli/src/commands/run/RunCmd.spec.ts | 3 +- packages/cli/src/commands/run/RunCmd.ts | 2 +- .../cli/src/commands/update/UpdateCmd.spec.ts | 3 +- packages/cli/src/commands/update/UpdateCmd.ts | 1 + packages/cli/src/index.ts | 16 +- packages/cli/src/interfaces/index.ts | 4 +- packages/cli/src/pipes/ClassNamePipe.spec.ts | 2 +- packages/cli/src/pipes/ClassNamePipe.ts | 3 +- .../cli/src/pipes/OutputFilePathPipe.spec.ts | 7 +- packages/cli/src/pipes/OutputFilePathPipe.ts | 3 +- .../cli/src/platforms/InitPlatformsModule.ts | 5 +- .../platforms/supports/InitExpressPlatform.ts | 1 + .../src/platforms/supports/InitKoaPlatform.ts | 1 + packages/cli/src/runtimes/RuntimesModule.ts | 7 +- .../cli/src/runtimes/supports/BabelRuntime.ts | 3 +- .../cli/src/runtimes/supports/BaseRuntime.ts | 2 +- .../cli/src/runtimes/supports/BunRuntime.ts | 3 +- .../cli/src/runtimes/supports/NodeRuntime.ts | 3 +- .../cli/src/runtimes/supports/SWCRuntime.ts | 1 + .../src/runtimes/supports/WebpackRuntime.ts | 3 +- packages/cli/src/utils/fillImport.spec.ts | 2 +- ...generate.async-factory.integration.spec.ts | 3 +- .../generate.controller.integration.spec.ts | 13 +- ...nerate.decorator-class.integration.spec.ts | 1 + ...ate.decorator-endpoint.integration.spec.ts | 3 +- ...rate.decorator-generic.integration.spec.ts | 4 +- ...erate.decorator-method.integration.spec.ts | 1 + ...e.decorator-middleware.integration.spec.ts | 5 +- ...erate.exception-filter.integration.spec.ts | 5 +- ...nerate.response-filter.integration.spec.ts | 7 +- .../init/init.integration.spec.ts | 78 ++++----- tools/typescript/index.js | 7 +- tools/vitest/index.js | 4 +- tools/vitest/presets/alias.js | 3 +- tools/vitest/presets/index.js | 5 +- tsdoc.config.js | 8 +- 174 files changed, 553 insertions(+), 472 deletions(-) diff --git a/.husky/pre-commit b/.husky/pre-commit index 50e6d6ae2..49088de75 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,4 +1,4 @@ #!/bin/sh . "$(dirname "$0")/_/husky.sh" -#npx lint-staged $1 +npx lint-staged $1 diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js index 89b99f2e0..75eb7f46a 100644 --- a/docs/.vuepress/config.js +++ b/docs/.vuepress/config.js @@ -1,16 +1,16 @@ const generated = require("@tsed/markdown-it-symbols"); -const team = require('../../team.json') -const api = require('./public/api.json') +const team = require("../../team.json"); +const api = require("./public/api.json"); const {version} = require("../../package.json"); const url = "https://cli.tsed.io"; -const title = 'Ts.ED CLI - CLI to bootstrap your Ts.ED project' +const title = "Ts.ED CLI - CLI to bootstrap your Ts.ED project"; module.exports = { title, - description: 'A Node.js CLI to bootstrap and manage a Ts.ED project.', + description: "A Node.js CLI to bootstrap and manage a Ts.ED project.", serviceWorker: false, - theme: 'tsed', + theme: "tsed", head: [ ["link", {canonical: url}], ["link", {rel: "shortcut icon", href: "/favicon.ico", type: "image/x-icon"}], @@ -23,12 +23,12 @@ module.exports = { ["meta", {property: "og:type", content: "website"}], ["meta", {property: "og:site_name", content: title}], ["meta", {property: "og:title", content: title}], - ["meta", {property: "og:description", content: 'A Node.js CLI to bootstrap and manage a Ts.ED project.'}], + ["meta", {property: "og:description", content: "A Node.js CLI to bootstrap and manage a Ts.ED project."}], ["meta", {property: "og:image", content: "https://tsed.io/tsed-og.png"}], ["meta", {property: "og:image:width", content: "1024"}], ["meta", {property: "og:image:height", content: "1024"}], ["meta", {name: "twitter:title", content: title}], - ["meta", {name: "twitter:description", content: 'A Node.js CLI to bootstrap and manage a Ts.ED project.'}], + ["meta", {name: "twitter:description", content: "A Node.js CLI to bootstrap and manage a Ts.ED project."}], ["meta", {name: "twitter:card", content: "summary"}] // ["script", { @@ -38,51 +38,51 @@ module.exports = { // }] ], themeConfig: { - shortTitle: 'Ts.ED CLI', - htmlTitle: 'Ts.ED CLI', + shortTitle: "Ts.ED CLI", + htmlTitle: "Ts.ED CLI", version, team, - licenseType: 'MIT', - author: 'Lenzotti Romain', + licenseType: "MIT", + author: "Lenzotti Romain", copyrightDates: { - start: '2016', + start: "2016", end: new Date().getFullYear() }, - repo: 'tsedio/tsed-cli', - githubProxyUrl: 'https://api.tsed.io/rest/github/tsedio/tsed-cli', - openCollective: 'https://api.tsed.io/rest/opencollective', + repo: "tsedio/tsed-cli", + githubProxyUrl: "https://api.tsed.io/rest/github/tsedio/tsed-cli", + openCollective: "https://api.tsed.io/rest/opencollective", slackUrl: "https://api.tsed.io/rest/slack/tsedio/tsed", - stackoverflowUrl: 'https://stackoverflow.com/search?q=tsed', - sponsorUrl: 'https://tsed.io/support.html', + stackoverflowUrl: "https://stackoverflow.com/search?q=tsed", + sponsorUrl: "https://tsed.io/support.html", twitterUrl: "https://twitter.com/TsED_io", editLinks: true, - docsDir: 'docs', - sidebar: 'auto', - docsBranch: 'master', + docsDir: "docs", + sidebar: "auto", + docsBranch: "master", api, smoothScroll: true, - lastUpdated: 'Last updated', + lastUpdated: "Last updated", // algolia: { // apiKey: "f8a038207e461aaac0e2fd16403c2b01", // indexName: "ts_ed" // }, locales: { - '/': { - label: 'English', - selectText: 'Languages', - editLinkText: 'Edit this page on GitHub', - lastUpdated: 'Last Updated', + "/": { + label: "English", + selectText: "Languages", + editLinkText: "Edit this page on GitHub", + lastUpdated: "Last Updated", serviceWorker: { updatePopup: { - message: 'New content is available.', - buttonText: 'Refresh' + message: "New content is available.", + buttonText: "Refresh" } }, nav: [ { - text: 'Getting started', + text: "Getting started", title: `Getting started | ${title}`, - link: '/getting-started.html' + link: "/getting-started.html" }, { title: `Warehouse | ${title}`, @@ -94,36 +94,36 @@ module.exports = { link: "https://tsed.io/warehouse/" }, { - text: 'Eslint', - link: 'https://github.com/tsedio/tsed-cli/tree/master/packages/cli-plugin-eslint' + text: "Eslint", + link: "https://github.com/tsedio/tsed-cli/tree/master/packages/cli-plugin-eslint" }, { - text: 'Vitest', - link: 'https://github.com/tsedio/tsed-cli/tree/master/packages/cli-plugin-vitest' + text: "Vitest", + link: "https://github.com/tsedio/tsed-cli/tree/master/packages/cli-plugin-vitest" }, { - text: 'Jest', - link: 'https://github.com/tsedio/tsed-cli/tree/master/packages/cli-plugin-jest' + text: "Jest", + link: "https://github.com/tsedio/tsed-cli/tree/master/packages/cli-plugin-jest" }, { - text: 'Mocha', - link: 'https://github.com/tsedio/tsed-cli/tree/master/packages/cli-plugin-mocha' + text: "Mocha", + link: "https://github.com/tsedio/tsed-cli/tree/master/packages/cli-plugin-mocha" }, { - text: 'Mongoose', - link: 'https://github.com/tsedio/tsed-cli/tree/master/packages/cli-plugin-mongoose' + text: "Mongoose", + link: "https://github.com/tsedio/tsed-cli/tree/master/packages/cli-plugin-mongoose" }, { - text: 'Passport.js', - link: 'https://github.com/tsedio/tsed-cli/tree/master/packages/cli-plugin-passport' + text: "Passport.js", + link: "https://github.com/tsedio/tsed-cli/tree/master/packages/cli-plugin-passport" }, { - text: 'TsLint', - link: 'https://github.com/tsedio/tsed-cli/tree/master/packages/cli-plugin-tslint' + text: "TsLint", + link: "https://github.com/tsedio/tsed-cli/tree/master/packages/cli-plugin-tslint" }, { - text: 'TypeORM', - link: 'https://github.com/tsedio/tsed-cli/tree/master/packages/cli-plugin-typeorm' + text: "TypeORM", + link: "https://github.com/tsedio/tsed-cli/tree/master/packages/cli-plugin-typeorm" } ] }, @@ -160,32 +160,31 @@ module.exports = { link: "/api.html" } ] - }, - + } ], sidebar: [ { - title: 'Getting started', // required - path: '/getting-started.html', + title: "Getting started", // required + path: "/getting-started.html", collapsable: true // optional, defaults to true }, { - title: 'Api reference', // required - path: '/api.html', + title: "Api reference", // required + path: "/api.html", collapsable: true // optional, defaults to true }, { - title: 'Team', // required - path: 'https://tsed.io/team.html', + title: "Team", // required + path: "https://tsed.io/team.html", collapsable: true // optional, defaults to true }, { - title: 'Contributing', // required - path: '/contributing.html', + title: "Contributing", // required + path: "/contributing.html", collapsable: true // optional, defaults to true }, { - title: 'Support us', // required + title: "Support us", // required link: "https://tsed.io/support.html", collapsable: true // optional, defaults to true } @@ -194,45 +193,45 @@ module.exports = { footer: { sections: [ { - title: 'Discover', + title: "Discover", items: [ { - label: 'Our team', - url: 'https://tsed.io/team.html' + label: "Our team", + url: "https://tsed.io/team.html" }, { - label: 'Contact us', - url: 'https://form.typeform.com/to/uJLP7anG' + label: "Contact us", + url: "https://form.typeform.com/to/uJLP7anG" } ] }, { - title: 'Help', + title: "Help", items: [ { - label: 'Resources', - url: 'https://tsed.io/tutorials/index.html' + label: "Resources", + url: "https://tsed.io/tutorials/index.html" }, { - label: 'Chat with us', - url: 'https://api.tsed.io/rest/slack/tsedio/tsed' + label: "Chat with us", + url: "https://api.tsed.io/rest/slack/tsedio/tsed" }, { - label: 'Contribution guide', - url: '/contributing.html' + label: "Contribution guide", + url: "/contributing.html" } ] }, { - title: 'Support', + title: "Support", items: [ { - label: 'Issues', - url: 'https://github.com/tsedio/tsed/issues' + label: "Issues", + url: "https://github.com/tsedio/tsed/issues" }, { - label: 'Sponsoring & donations', - url: 'https://tsed.io/support.html' + label: "Sponsoring & donations", + url: "https://tsed.io/support.html" } ] } @@ -242,16 +241,16 @@ module.exports = { }, plugins: [ [ - '@vuepress/google-analytics', + "@vuepress/google-analytics", { - ga: 'UA-35240348-4' + ga: "UA-35240348-4" } ] ] }, markdown: { lineNumbers: true, - extendMarkdown: md => { + extendMarkdown: (md) => { md.use(generated); } } diff --git a/docs/.vuepress/enhanceApp.js b/docs/.vuepress/enhanceApp.js index 2f8bf0a15..6b6cd27d4 100644 --- a/docs/.vuepress/enhanceApp.js +++ b/docs/.vuepress/enhanceApp.js @@ -1,17 +1,19 @@ -import "./window-boot" +import "./window-boot"; + import VueAnalytics from "vue-analytics"; import VueTsED from "vuepress-theme-tsed/src/install"; + import SupportUsBlock from "./components/SupportUsBlock"; export default ({ - Vue, // the version of Vue being used in the VuePress app - options, // the options for the root Vue instance - router, // the router instance for the app - siteData // site metadata - }) => { + Vue, // the version of Vue being used in the VuePress app + options, // the options for the root Vue instance + router, // the router instance for the app + siteData // site metadata +}) => { try { Vue.use(VueTsED); - Vue.component('SupportUsBlock', SupportUsBlock) + Vue.component("SupportUsBlock", SupportUsBlock); Vue.use(VueAnalytics, { id: siteData.themeConfig.plugins[0][1].ga, router @@ -19,4 +21,4 @@ export default ({ } catch (er) { console.warn("====", er); } -} +}; diff --git a/eslint.config.mjs b/eslint.config.mjs index ab5b302b4..19424b771 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -8,7 +8,7 @@ import globals from "globals"; export default [ { - ignores: ["coverage", "dist", "processes.config.js"] + ignores: ["coverage", "dist", "processes.config.js", "**/templates"] }, { files: ["**/*.{js,mjs,cjs,jsx,mjsx,ts,tsx,mtsx}"], @@ -28,11 +28,6 @@ export default [ "@typescript-eslint": typescriptEslint }, rules: { - // "@typescript-eslint/lines-between-class-members": [ - // "error", - // "always", - // { exceptAfterOverload: true } - // ], "@typescript-eslint/ban-ts-comment": 0, "@typescript-eslint/camelcase": 0, "@typescript-eslint/no-inferrable-types": 0, @@ -50,10 +45,7 @@ export default [ }, rules: { ...vitest.configs.recommended.rules, // you can also use vitest.configs.all.rules to enable all rules - "vitest/consistent-test-it": [ - "error", - { fn: "it", withinDescribe: "it" } - ], + "vitest/consistent-test-it": ["error", {fn: "it", withinDescribe: "it"}], "vitest/no-alias-methods": "error" } }, diff --git a/packages/cli-core/src/CliCore.spec.ts b/packages/cli-core/src/CliCore.spec.ts index 71b9e23f3..f73788a97 100644 --- a/packages/cli-core/src/CliCore.spec.ts +++ b/packages/cli-core/src/CliCore.spec.ts @@ -1,8 +1,9 @@ -import {CliCore} from "./CliCore"; -import {CliService} from "./services"; import {normalizePath} from "@tsed/normalize-path"; import execa from "execa"; +import {CliCore} from "./CliCore"; +import {CliService} from "./services"; + vi.mock("./utils/loadPlugins"); vi.mock("execa"); @@ -12,28 +13,24 @@ describe("CliCore", () => { }); describe("getProjectRoot()", () => { it("should return project root (-r)", () => { - // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore const root = CliCore.getProjectRoot(["tsed", "do", "-r", "/path/to/root"]); expect(normalizePath(root)).toEqual(normalizePath(process.cwd(), "path/to/root")); }); it("should return project root (--root-dir)", () => { - // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore const root = CliCore.getProjectRoot(["tsed", "do", "--root-dir", "/path/to/root"]); expect(normalizePath(root)).toEqual(normalizePath(process.cwd(), "path/to/root")); }); it("should return project root (-h)", () => { - // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore const root = CliCore.getProjectRoot(["tsed", "do", "-h"]); expect(normalizePath(root)).toEqual(normalizePath(process.cwd())); }); it("should return project root (--help)", () => { - // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore const root = CliCore.getProjectRoot(["tsed", "do", "--help"]); diff --git a/packages/cli-core/src/CliCore.ts b/packages/cli-core/src/CliCore.ts index 8b86a14b5..16853dbc6 100644 --- a/packages/cli-core/src/CliCore.ts +++ b/packages/cli-core/src/CliCore.ts @@ -1,17 +1,17 @@ -import {Inject, InjectorService, Module} from "@tsed/di"; import {Type} from "@tsed/core"; +import {Inject, InjectorService, Module} from "@tsed/di"; import chalk from "chalk"; import {Command} from "commander"; import {join, resolve} from "path"; +import semver from "semver"; +import {CliError} from "./domains/CliError"; import {CliConfiguration} from "./services/CliConfiguration"; import {CliPackageJson} from "./services/CliPackageJson"; import {CliService} from "./services/CliService"; import {ProjectPackageJson} from "./services/ProjectPackageJson"; import {createInjector} from "./utils/createInjector"; import {loadPlugins} from "./utils/loadPlugins"; -import {CliError} from "./domains/CliError"; -import semver from "semver"; import {resolveConfiguration} from "./utils/resolveConfiguration"; function isHelpManual(argv: string[]) { @@ -81,7 +81,6 @@ export class CliCore { injector.settings.set("loaded", true); } - // eslint-disable-next-line require-await static async updateNotifier(pkg: any) { // const {default: updateNotifier} = await import("update-notifier"); // diff --git a/packages/cli-core/src/decorators/command.ts b/packages/cli-core/src/decorators/command.ts index 2ba238aef..99df530a1 100644 --- a/packages/cli-core/src/decorators/command.ts +++ b/packages/cli-core/src/decorators/command.ts @@ -1,5 +1,6 @@ import {StoreSet, useDecorators} from "@tsed/core"; import {Injectable} from "@tsed/di"; + import {CommandStoreKeys} from "../domains/CommandStoreKeys"; import {CommandParameters} from "../interfaces/CommandParameters"; diff --git a/packages/cli-core/src/decorators/onAdd.spec.ts b/packages/cli-core/src/decorators/onAdd.spec.ts index cbdce9e27..5dba1089a 100644 --- a/packages/cli-core/src/decorators/onAdd.spec.ts +++ b/packages/cli-core/src/decorators/onAdd.spec.ts @@ -1,4 +1,5 @@ import {Store} from "@tsed/core"; + import {CommandStoreKeys} from "../domains/CommandStoreKeys"; import {OnAdd} from "./onAdd"; diff --git a/packages/cli-core/src/decorators/onExec.spec.ts b/packages/cli-core/src/decorators/onExec.spec.ts index e011f56d7..4b4eda6f8 100644 --- a/packages/cli-core/src/decorators/onExec.spec.ts +++ b/packages/cli-core/src/decorators/onExec.spec.ts @@ -1,4 +1,5 @@ import {Store} from "@tsed/core"; + import {CommandStoreKeys} from "../domains/CommandStoreKeys"; import {OnExec} from "./onExec"; diff --git a/packages/cli-core/src/decorators/onPostInstall.spec.ts b/packages/cli-core/src/decorators/onPostInstall.spec.ts index bc970b928..c7cbd5d6f 100644 --- a/packages/cli-core/src/decorators/onPostInstall.spec.ts +++ b/packages/cli-core/src/decorators/onPostInstall.spec.ts @@ -1,4 +1,5 @@ import {Store} from "@tsed/core"; + import {CommandStoreKeys} from "../domains/CommandStoreKeys"; import {OnPostInstall} from "./onPostInstall"; diff --git a/packages/cli-core/src/decorators/onPrompt.spec.ts b/packages/cli-core/src/decorators/onPrompt.spec.ts index e013e8779..cf78f4dc8 100644 --- a/packages/cli-core/src/decorators/onPrompt.spec.ts +++ b/packages/cli-core/src/decorators/onPrompt.spec.ts @@ -1,4 +1,5 @@ import {Store} from "@tsed/core"; + import {CommandStoreKeys} from "../domains/CommandStoreKeys"; import {OnPrompt} from "./onPrompt"; diff --git a/packages/cli-core/src/index.ts b/packages/cli-core/src/index.ts index 681274044..1182b1abe 100644 --- a/packages/cli-core/src/index.ts +++ b/packages/cli-core/src/index.ts @@ -1,33 +1,33 @@ import Inquirer from "inquirer"; +export * from "./CliCore"; +export * from "./decorators/index"; +export * from "./interfaces/index"; +export * from "./packageManagers/index"; +export * from "./services/index"; +export * from "./utils/index"; export * from "@tsed/core"; -export * from "@tsed/logger"; -export * from "@tsed/normalize-path"; export { + Configuration, + Constant, + Container, + DITest, Inject, - registerProvider, Injectable, - Constant, - Value, - Configuration, - LocalsContainer, - TokenProvider, + InjectorService, InvokeOptions, + LocalsContainer, Module, - Opts, - UseOpts, - OverrideProvider, - InjectorService, OnDestroy, OnInit, - Container, - DITest + Opts, + OverrideProvider, + registerProvider, + TokenProvider, + UseOpts, + Value } from "@tsed/di"; -export * from "./interfaces/index"; -export * from "./decorators/index"; -export * from "./services/index"; -export * from "./packageManagers/index"; -export * from "./utils/index"; -export * from "./CliCore"; +export * from "@tsed/logger"; +export * from "@tsed/normalize-path"; export {Inquirer}; import "./utils/patchCommander"; diff --git a/packages/cli-core/src/interfaces/CommandProvider.ts b/packages/cli-core/src/interfaces/CommandProvider.ts index 554a6957a..fcd9557ae 100644 --- a/packages/cli-core/src/interfaces/CommandProvider.ts +++ b/packages/cli-core/src/interfaces/CommandProvider.ts @@ -1,4 +1,5 @@ import {Answers, QuestionCollection} from "inquirer"; + import {Tasks} from "./Tasks"; export type QuestionOptions = QuestionCollection; diff --git a/packages/cli-core/src/interfaces/index.ts b/packages/cli-core/src/interfaces/index.ts index a7c20b1f2..ac93193c5 100644 --- a/packages/cli-core/src/interfaces/index.ts +++ b/packages/cli-core/src/interfaces/index.ts @@ -1,13 +1,14 @@ import {Type} from "@tsed/core"; + import {CommandProvider} from "./CommandProvider"; import {PackageJson} from "./PackageJson"; -export * from "./CommandProvider"; -export * from "./CommandParameters"; -export * from "./CommandMetadata"; export * from "./CliDefaultOptions"; -export * from "./ProjectPreferences"; +export * from "./CommandMetadata"; +export * from "./CommandParameters"; +export * from "./CommandProvider"; export * from "./PackageJson"; +export * from "./ProjectPreferences"; export * from "./Tasks"; declare global { diff --git a/packages/cli-core/src/packageManagers/PackageManagersModule.spec.ts b/packages/cli-core/src/packageManagers/PackageManagersModule.spec.ts index 588d4ac0c..5c672f97b 100644 --- a/packages/cli-core/src/packageManagers/PackageManagersModule.spec.ts +++ b/packages/cli-core/src/packageManagers/PackageManagersModule.spec.ts @@ -1,12 +1,13 @@ // @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; + +import {CliFs} from "../services"; import {PackageManagersModule} from "./PackageManagersModule"; -import {YarnManager} from "./supports/YarnManager"; +import {BunManager} from "./supports/BunManager"; import {NpmManager} from "./supports/NpmManager"; -import {CliFs} from "../services"; import {PNpmManager} from "./supports/PNpmManager"; import {YarnBerryManager} from "./supports/YarnBerryManager"; -import {BunManager} from "./supports/BunManager"; +import {YarnManager} from "./supports/YarnManager"; async function getModuleFixture() { const yarnManager = { diff --git a/packages/cli-core/src/packageManagers/PackageManagersModule.ts b/packages/cli-core/src/packageManagers/PackageManagersModule.ts index 5c583eb4d..315521c1c 100644 --- a/packages/cli-core/src/packageManagers/PackageManagersModule.ts +++ b/packages/cli-core/src/packageManagers/PackageManagersModule.ts @@ -1,15 +1,16 @@ import {Inject, Injectable} from "@tsed/di"; -import {BaseManager} from "./supports/BaseManager"; -import {YarnManager} from "./supports/YarnManager"; -import {YarnBerryManager} from "./supports/YarnBerryManager"; -import {NpmManager} from "./supports/NpmManager"; -import {PNpmManager} from "./supports/PNpmManager"; -import {catchError} from "rxjs/operators"; +import {Options} from "execa"; import {EMPTY, throwError} from "rxjs"; +import {catchError} from "rxjs/operators"; + import {ProjectPackageJson} from "../services/ProjectPackageJson"; import {isValidVersion} from "../utils/isValidVersion"; -import {Options} from "execa"; +import {BaseManager} from "./supports/BaseManager"; import {BunManager} from "./supports/BunManager"; +import {NpmManager} from "./supports/NpmManager"; +import {PNpmManager} from "./supports/PNpmManager"; +import {YarnBerryManager} from "./supports/YarnBerryManager"; +import {YarnManager} from "./supports/YarnManager"; function mapPackagesWithInvalidVersion(deps: any) { const toString = (info: [string, string]) => { diff --git a/packages/cli-core/src/packageManagers/index.ts b/packages/cli-core/src/packageManagers/index.ts index 2d9ee3cb2..fd994a173 100644 --- a/packages/cli-core/src/packageManagers/index.ts +++ b/packages/cli-core/src/packageManagers/index.ts @@ -1,5 +1,5 @@ +export * from "./PackageManagersModule"; export * from "./supports/BaseManager"; export * from "./supports/NpmManager"; -export * from "./supports/YarnManager"; export * from "./supports/PNpmManager"; -export * from "./PackageManagersModule"; +export * from "./supports/YarnManager"; diff --git a/packages/cli-core/src/packageManagers/supports/BaseManager.ts b/packages/cli-core/src/packageManagers/supports/BaseManager.ts index 32f07037c..28183f4c4 100644 --- a/packages/cli-core/src/packageManagers/supports/BaseManager.ts +++ b/packages/cli-core/src/packageManagers/supports/BaseManager.ts @@ -1,6 +1,7 @@ import {Inject} from "@tsed/di"; -import {Observable} from "rxjs"; import execa from "execa"; +import {Observable} from "rxjs"; + import {CliExeca} from "../../services/CliExeca"; export type ManagerCmdOpts = {verbose?: boolean} & execa.Options; @@ -25,7 +26,6 @@ export abstract class BaseManager { } } - // eslint-disable-next-line @typescript-eslint/no-unused-vars async init(opts: ManagerCmdSyncOpts): Promise {} abstract install(options: ManagerCmdOpts): Observable; diff --git a/packages/cli-core/src/packageManagers/supports/BunManager.spec.ts b/packages/cli-core/src/packageManagers/supports/BunManager.spec.ts index bdefa8a36..8a081c966 100644 --- a/packages/cli-core/src/packageManagers/supports/BunManager.spec.ts +++ b/packages/cli-core/src/packageManagers/supports/BunManager.spec.ts @@ -1,5 +1,6 @@ // @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; + import {CliExeca} from "../../services"; import {BunManager} from "./BunManager"; diff --git a/packages/cli-core/src/packageManagers/supports/BunManager.ts b/packages/cli-core/src/packageManagers/supports/BunManager.ts index 7f6976dfc..78f9dc760 100644 --- a/packages/cli-core/src/packageManagers/supports/BunManager.ts +++ b/packages/cli-core/src/packageManagers/supports/BunManager.ts @@ -1,6 +1,7 @@ import {Injectable} from "@tsed/di"; import execa from "execa"; import {Observable} from "rxjs"; + import {BaseManager, ManagerCmdOpts} from "./BaseManager"; @Injectable({ diff --git a/packages/cli-core/src/packageManagers/supports/NpmManager.spec.ts b/packages/cli-core/src/packageManagers/supports/NpmManager.spec.ts index b6150e09d..c70c65c6d 100644 --- a/packages/cli-core/src/packageManagers/supports/NpmManager.spec.ts +++ b/packages/cli-core/src/packageManagers/supports/NpmManager.spec.ts @@ -1,7 +1,8 @@ // @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; -import {NpmManager} from "./NpmManager"; + import {CliExeca} from "../../services"; +import {NpmManager} from "./NpmManager"; async function getManagerFixture() { const cliExeca = { diff --git a/packages/cli-core/src/packageManagers/supports/NpmManager.ts b/packages/cli-core/src/packageManagers/supports/NpmManager.ts index 65701a606..5571771f0 100644 --- a/packages/cli-core/src/packageManagers/supports/NpmManager.ts +++ b/packages/cli-core/src/packageManagers/supports/NpmManager.ts @@ -1,7 +1,8 @@ -import {BaseManager, ManagerCmdOpts} from "./BaseManager"; import {Injectable} from "@tsed/di"; import {Observable} from "rxjs"; +import {BaseManager, ManagerCmdOpts} from "./BaseManager"; + @Injectable({ type: "package:manager" }) diff --git a/packages/cli-core/src/packageManagers/supports/PNpmManager.spec.ts b/packages/cli-core/src/packageManagers/supports/PNpmManager.spec.ts index d02a626d7..3d49c78b1 100644 --- a/packages/cli-core/src/packageManagers/supports/PNpmManager.spec.ts +++ b/packages/cli-core/src/packageManagers/supports/PNpmManager.spec.ts @@ -1,7 +1,8 @@ // @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; -import {PNpmManager} from "./PNpmManager"; + import {CliExeca} from "../../services"; +import {PNpmManager} from "./PNpmManager"; async function getManagerFixture() { const cliExeca = { diff --git a/packages/cli-core/src/packageManagers/supports/PNpmManager.ts b/packages/cli-core/src/packageManagers/supports/PNpmManager.ts index 6520f064e..95f910167 100644 --- a/packages/cli-core/src/packageManagers/supports/PNpmManager.ts +++ b/packages/cli-core/src/packageManagers/supports/PNpmManager.ts @@ -1,5 +1,6 @@ import {Injectable} from "@tsed/di"; import {Observable} from "rxjs"; + import {BaseManager, ManagerCmdOpts} from "./BaseManager"; @Injectable({ diff --git a/packages/cli-core/src/packageManagers/supports/YarnBerryManager.spec.ts b/packages/cli-core/src/packageManagers/supports/YarnBerryManager.spec.ts index 7287a32f8..85ee73e14 100644 --- a/packages/cli-core/src/packageManagers/supports/YarnBerryManager.spec.ts +++ b/packages/cli-core/src/packageManagers/supports/YarnBerryManager.spec.ts @@ -1,7 +1,8 @@ // @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; -import {YarnBerryManager} from "./YarnBerryManager"; + import {CliExeca, CliYaml} from "../../services"; +import {YarnBerryManager} from "./YarnBerryManager"; async function getManagerFixture() { const cliExeca = { diff --git a/packages/cli-core/src/packageManagers/supports/YarnBerryManager.ts b/packages/cli-core/src/packageManagers/supports/YarnBerryManager.ts index 0a9edede2..2ebd442fe 100644 --- a/packages/cli-core/src/packageManagers/supports/YarnBerryManager.ts +++ b/packages/cli-core/src/packageManagers/supports/YarnBerryManager.ts @@ -1,9 +1,10 @@ import {Inject, Injectable} from "@tsed/di"; import execa from "execa"; -import {Observable} from "rxjs"; -import {BaseManager, ManagerCmdOpts, ManagerCmdSyncOpts} from "./BaseManager"; import {join} from "path"; +import {Observable} from "rxjs"; + import {CliYaml} from "../../services/CliYaml"; +import {BaseManager, ManagerCmdOpts, ManagerCmdSyncOpts} from "./BaseManager"; @Injectable({ type: "package:manager" diff --git a/packages/cli-core/src/packageManagers/supports/YarnManager.spec.ts b/packages/cli-core/src/packageManagers/supports/YarnManager.spec.ts index 3188f7d98..5bf0c522a 100644 --- a/packages/cli-core/src/packageManagers/supports/YarnManager.spec.ts +++ b/packages/cli-core/src/packageManagers/supports/YarnManager.spec.ts @@ -1,7 +1,8 @@ // @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; -import {YarnManager} from "./YarnManager"; + import {CliExeca} from "../../services"; +import {YarnManager} from "./YarnManager"; async function getManagerFixture() { const cliExeca = { diff --git a/packages/cli-core/src/packageManagers/supports/YarnManager.ts b/packages/cli-core/src/packageManagers/supports/YarnManager.ts index 92f521cd9..d87b628b8 100644 --- a/packages/cli-core/src/packageManagers/supports/YarnManager.ts +++ b/packages/cli-core/src/packageManagers/supports/YarnManager.ts @@ -1,6 +1,7 @@ import {Injectable} from "@tsed/di"; import execa from "execa"; import {Observable} from "rxjs"; + import {BaseManager, ManagerCmdOpts} from "./BaseManager"; @Injectable({ diff --git a/packages/cli-core/src/services/CliDockerComposeYaml.ts b/packages/cli-core/src/services/CliDockerComposeYaml.ts index 2d1a160ed..514e375ea 100644 --- a/packages/cli-core/src/services/CliDockerComposeYaml.ts +++ b/packages/cli-core/src/services/CliDockerComposeYaml.ts @@ -1,9 +1,10 @@ +import {setValue} from "@tsed/core"; import {Inject, Injectable} from "@tsed/di"; import {snakeCase} from "change-case"; -import {CliYaml} from "./CliYaml"; -import {setValue} from "@tsed/core"; import {join} from "path"; + import {CliFs} from "./CliFs"; +import {CliYaml} from "./CliYaml"; import {ProjectPackageJson} from "./ProjectPackageJson"; @Injectable() diff --git a/packages/cli-core/src/services/CliExeca.ts b/packages/cli-core/src/services/CliExeca.ts index c51e2df7e..44b6ecec0 100644 --- a/packages/cli-core/src/services/CliExeca.ts +++ b/packages/cli-core/src/services/CliExeca.ts @@ -2,9 +2,9 @@ import {Injectable} from "@tsed/di"; import type {Options, SyncOptions} from "execa"; import execa from "execa"; import {filter, mergeWith} from "rxjs/operators"; -// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore import split from "split"; + import {streamToObservable} from "../utils/streamToObservable"; @Injectable() diff --git a/packages/cli-core/src/services/CliFs.ts b/packages/cli-core/src/services/CliFs.ts index 6e55aa8ff..9ed646ba5 100644 --- a/packages/cli-core/src/services/CliFs.ts +++ b/packages/cli-core/src/services/CliFs.ts @@ -1,9 +1,9 @@ import {Injectable} from "@tsed/di"; +import {normalizePath} from "@tsed/normalize-path"; import {PathLike, WriteFileOptions} from "fs"; import Fs from "fs-extra"; import {EnsureOptions} from "fs-extra"; import {join} from "path"; -import {normalizePath} from "@tsed/normalize-path"; @Injectable() export class CliFs { diff --git a/packages/cli-core/src/services/CliHttpClient.spec.ts b/packages/cli-core/src/services/CliHttpClient.spec.ts index 9e1d9a2a0..1e3a3d641 100644 --- a/packages/cli-core/src/services/CliHttpClient.spec.ts +++ b/packages/cli-core/src/services/CliHttpClient.spec.ts @@ -1,5 +1,6 @@ -import axios from "axios"; import {DITest} from "@tsed/di"; +import axios from "axios"; + import {CliHttpClient} from "./CliHttpClient"; import {CliProxyAgent} from "./CliProxyAgent"; diff --git a/packages/cli-core/src/services/CliHttpClient.ts b/packages/cli-core/src/services/CliHttpClient.ts index 55ebb5f75..25b7dc0dd 100644 --- a/packages/cli-core/src/services/CliHttpClient.ts +++ b/packages/cli-core/src/services/CliHttpClient.ts @@ -1,11 +1,12 @@ +import {cleanObject} from "@tsed/core"; import {Inject, Injectable} from "@tsed/di"; import axios, {AxiosRequestConfig, Method} from "axios"; -import {cleanObject} from "@tsed/core"; import {stringify} from "querystring"; -import {CliProxyAgent} from "./CliProxyAgent"; -import {CliHttpLogClient} from "./CliHttpLogClient"; import {URL} from "url"; +import {CliHttpLogClient} from "./CliHttpLogClient"; +import {CliProxyAgent} from "./CliProxyAgent"; + export interface CliHttpClientOptions extends AxiosRequestConfig, Record { qs?: Record; withHeaders?: boolean; diff --git a/packages/cli-core/src/services/CliHttpLogClient.ts b/packages/cli-core/src/services/CliHttpLogClient.ts index 99953a770..47982567a 100644 --- a/packages/cli-core/src/services/CliHttpLogClient.ts +++ b/packages/cli-core/src/services/CliHttpLogClient.ts @@ -1,8 +1,8 @@ -// eslint-disable-next-line @typescript-eslint/no-unused-vars -import querystring from "querystring"; +import {getValue} from "@tsed/core"; import {Inject, Opts} from "@tsed/di"; import {Logger} from "@tsed/logger"; -import {getValue} from "@tsed/core"; +import querystring from "querystring"; + import {logToCurl} from "../utils/logToCurl"; export interface BaseLogClientOptions { diff --git a/packages/cli-core/src/services/CliLoadFile.spec.ts b/packages/cli-core/src/services/CliLoadFile.spec.ts index 411a2f737..2f16a567b 100644 --- a/packages/cli-core/src/services/CliLoadFile.spec.ts +++ b/packages/cli-core/src/services/CliLoadFile.spec.ts @@ -1,5 +1,6 @@ -import {DITest} from "@tsed/di"; import {catchAsyncError} from "@tsed/core"; +import {DITest} from "@tsed/di"; + import {CliLoadFile} from "./CliLoadFile"; describe("CliLoadFile", () => { diff --git a/packages/cli-core/src/services/CliLoadFile.ts b/packages/cli-core/src/services/CliLoadFile.ts index 6a10dd93d..fb6d044e0 100644 --- a/packages/cli-core/src/services/CliLoadFile.ts +++ b/packages/cli-core/src/services/CliLoadFile.ts @@ -1,8 +1,9 @@ import {Inject, Injectable} from "@tsed/di"; -import {extname} from "path"; import Ajv, {Schema} from "ajv"; -import {CliYaml} from "./CliYaml"; +import {extname} from "path"; + import {CliFs} from "./CliFs"; +import {CliYaml} from "./CliYaml"; @Injectable() export class CliLoadFile { diff --git a/packages/cli-core/src/services/CliPackageJson.ts b/packages/cli-core/src/services/CliPackageJson.ts index 3787a4777..4148a6941 100644 --- a/packages/cli-core/src/services/CliPackageJson.ts +++ b/packages/cli-core/src/services/CliPackageJson.ts @@ -1,4 +1,5 @@ import {Configuration, Inject, registerProvider} from "@tsed/di"; + import {PackageJson} from "../interfaces/PackageJson"; export type CliPackageJson = PackageJson; diff --git a/packages/cli-core/src/services/CliPlugins.spec.ts b/packages/cli-core/src/services/CliPlugins.spec.ts index 3d9dd4422..0653f53d0 100644 --- a/packages/cli-core/src/services/CliPlugins.spec.ts +++ b/packages/cli-core/src/services/CliPlugins.spec.ts @@ -1,5 +1,6 @@ // @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; + import {CliPlugins} from "./CliPlugins"; import {NpmRegistryClient} from "./NpmRegistryClient"; diff --git a/packages/cli-core/src/services/CliPlugins.ts b/packages/cli-core/src/services/CliPlugins.ts index 7968e4c75..eecc54dba 100644 --- a/packages/cli-core/src/services/CliPlugins.ts +++ b/packages/cli-core/src/services/CliPlugins.ts @@ -1,13 +1,14 @@ -import {createSubTasks} from "../utils/createTasksRunner"; -import chalk from "chalk"; import {Constant, Inject, Injectable, InjectorService} from "@tsed/di"; +import chalk from "chalk"; + import {CommandStoreKeys} from "../domains/CommandStoreKeys"; +import {Task} from "../interfaces"; +import {PackageManagersModule} from "../packageManagers/PackageManagersModule"; +import {createSubTasks} from "../utils/createTasksRunner"; import {loadPlugins} from "../utils/loadPlugins"; import {CliHooks} from "./CliHooks"; import {NpmRegistryClient} from "./NpmRegistryClient"; import {ProjectPackageJson} from "./ProjectPackageJson"; -import {PackageManagersModule} from "../packageManagers/PackageManagersModule"; -import {Task} from "../interfaces"; function mapPlugins({package: {name, description = "", ...otherProps}}: any) { return { diff --git a/packages/cli-core/src/services/CliProxyAgent.spec.ts b/packages/cli-core/src/services/CliProxyAgent.spec.ts index 3ee330e6a..a861c5b6f 100644 --- a/packages/cli-core/src/services/CliProxyAgent.spec.ts +++ b/packages/cli-core/src/services/CliProxyAgent.spec.ts @@ -1,10 +1,12 @@ // @ts-ignore +import "../index"; + import {CliPlatformTest} from "@tsed/cli-testing"; import tunnel from "tunnel"; -import {CliProxyAgent} from "./CliProxyAgent"; + import {CliConfiguration} from "./CliConfiguration"; import {CliExeca} from "./CliExeca"; -import "../index"; +import {CliProxyAgent} from "./CliProxyAgent"; vi.mock("tunnel"); @@ -32,7 +34,7 @@ describe("CliPlugins", () => { expect(cliProxyAgent.proxySettings).toEqual({url: "http://login:password@host:3000"}); }); - it("should get proxy url from env (HTTP_PROXY)", async () => { + it("should get proxy url from env (HTTP_PROXY -2)", async () => { const settings = CliPlatformTest.get(CliConfiguration); settings.set("proxy", { @@ -70,7 +72,6 @@ describe("CliPlugins", () => { } ]); - // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore cliProxyAgent.proxySettings.url = undefined; @@ -103,7 +104,6 @@ describe("CliPlugins", () => { } ]); - // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore cliProxyAgent.proxySettings.url = undefined; @@ -136,7 +136,6 @@ describe("CliPlugins", () => { } ]); - // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore cliProxyAgent.proxySettings.url = undefined; @@ -169,7 +168,6 @@ describe("CliPlugins", () => { } ]); - // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore cliProxyAgent.proxySettings.url = undefined; diff --git a/packages/cli-core/src/services/CliProxyAgent.ts b/packages/cli-core/src/services/CliProxyAgent.ts index b071e0178..9470535cc 100644 --- a/packages/cli-core/src/services/CliProxyAgent.ts +++ b/packages/cli-core/src/services/CliProxyAgent.ts @@ -1,9 +1,10 @@ -import tunnel from "tunnel"; import {Configuration, Inject, Injectable, Value} from "@tsed/di"; -import {CliExeca} from "./CliExeca"; import {camelCase} from "change-case"; +import tunnel from "tunnel"; import {URL} from "url"; + import {coerce} from "../utils/coerce"; +import {CliExeca} from "./CliExeca"; import {ProjectPackageJson} from "./ProjectPackageJson"; export interface CliProxySettings { diff --git a/packages/cli-core/src/services/CliRunScript.spec.ts b/packages/cli-core/src/services/CliRunScript.spec.ts index dd742c87f..5670741f0 100644 --- a/packages/cli-core/src/services/CliRunScript.spec.ts +++ b/packages/cli-core/src/services/CliRunScript.spec.ts @@ -1,8 +1,9 @@ // @ts-ignore -import {CliPlatformTest} from "@tsed/cli-testing"; -// eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore import runScript from "@npmcli/run-script"; +import {CliPlatformTest} from "@tsed/cli-testing"; + import {CliRunScript} from "./CliRunScript"; vi.mock("@npmcli/run-script"); diff --git a/packages/cli-core/src/services/CliRunScript.ts b/packages/cli-core/src/services/CliRunScript.ts index 4dfa0e850..85e84a2d9 100644 --- a/packages/cli-core/src/services/CliRunScript.ts +++ b/packages/cli-core/src/services/CliRunScript.ts @@ -1,7 +1,7 @@ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore import runScript from "@npmcli/run-script"; import {Inject, Injectable} from "@tsed/di"; + import {ProjectPackageJson} from "./ProjectPackageJson"; @Injectable() diff --git a/packages/cli-core/src/services/CliService.ts b/packages/cli-core/src/services/CliService.ts index b1432c60c..61fc416f1 100644 --- a/packages/cli-core/src/services/CliService.ts +++ b/packages/cli-core/src/services/CliService.ts @@ -2,22 +2,22 @@ import {classOf} from "@tsed/core"; import {Constant, DIContext, getContext, Inject, Injectable, InjectorService, Provider, runInContext} from "@tsed/di"; import {Argument, Command} from "commander"; import Inquirer from "inquirer"; +// @ts-ignore +import inquirer_autocomplete_prompt from "inquirer-autocomplete-prompt"; import {v4} from "uuid"; + import {CommandStoreKeys} from "../domains/CommandStoreKeys"; -import {CommandProvider} from "../interfaces/CommandProvider"; +import {CommandMetadata} from "../interfaces/CommandMetadata"; import {CommandArg, CommandOptions} from "../interfaces/CommandParameters"; +import {CommandProvider} from "../interfaces/CommandProvider"; +import {PackageManagersModule} from "../packageManagers/index"; import {createSubTasks, createTasksRunner} from "../utils/createTasksRunner"; import {getCommandMetadata} from "../utils/getCommandMetadata"; import {mapCommanderArgs} from "../utils/mapCommanderArgs"; +import {mapCommanderOptions} from "../utils/mapCommanderOptions"; import {parseOption} from "../utils/parseOption"; import {CliHooks} from "./CliHooks"; import {ProjectPackageJson} from "./ProjectPackageJson"; -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore -import inquirer_autocomplete_prompt from "inquirer-autocomplete-prompt"; -import {mapCommanderOptions} from "../utils/mapCommanderOptions"; -import {CommandMetadata} from "../interfaces/CommandMetadata"; -import {PackageManagersModule} from "../packageManagers/index"; Inquirer.registerPrompt("autocomplete", inquirer_autocomplete_prompt); @@ -295,7 +295,6 @@ export class CliService { * @param allowUnknownOptions */ private buildOption(subCommand: Command, options: {[key: string]: CommandOptions}, allowUnknownOptions: boolean) { - // eslint-disable-next-line @typescript-eslint/no-unused-vars Object.entries(options).reduce((subCommand, [flags, {description, required, customParser, defaultValue, ...options}]) => { const fn = (v: any) => { return parseOption(v, options); diff --git a/packages/cli-core/src/services/CliYaml.ts b/packages/cli-core/src/services/CliYaml.ts index 766205646..6ca74d942 100644 --- a/packages/cli-core/src/services/CliYaml.ts +++ b/packages/cli-core/src/services/CliYaml.ts @@ -1,5 +1,6 @@ import {Inject, Injectable} from "@tsed/di"; import JsYaml from "js-yaml"; + import {CliFs} from "./CliFs"; @Injectable() diff --git a/packages/cli-core/src/services/NpmRegistryClient.spec.ts b/packages/cli-core/src/services/NpmRegistryClient.spec.ts index cf1a324e9..7cc5bcc9f 100644 --- a/packages/cli-core/src/services/NpmRegistryClient.spec.ts +++ b/packages/cli-core/src/services/NpmRegistryClient.spec.ts @@ -1,5 +1,6 @@ // @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; + import {CliHttpClient} from "./CliHttpClient"; import {NpmRegistryClient} from "./NpmRegistryClient"; diff --git a/packages/cli-core/src/services/NpmRegistryClient.ts b/packages/cli-core/src/services/NpmRegistryClient.ts index a366d8131..3858c941b 100644 --- a/packages/cli-core/src/services/NpmRegistryClient.ts +++ b/packages/cli-core/src/services/NpmRegistryClient.ts @@ -1,6 +1,7 @@ import {Inject, Injectable} from "@tsed/di"; -import url from "url"; import registry_url from "registry-url"; +import url from "url"; + import {PackageInfo} from "../interfaces/PackageJson"; import {CliHttpClient} from "./CliHttpClient"; diff --git a/packages/cli-core/src/services/ProjectPackageJson.spec.ts b/packages/cli-core/src/services/ProjectPackageJson.spec.ts index 58a4a6113..23138e6b7 100644 --- a/packages/cli-core/src/services/ProjectPackageJson.spec.ts +++ b/packages/cli-core/src/services/ProjectPackageJson.spec.ts @@ -1,9 +1,10 @@ // @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; import {join, resolve} from "path"; -import {ProjectPackageJson} from "./ProjectPackageJson"; -import {CliFs} from "./CliFs"; + import {CliExeca} from "./CliExeca"; +import {CliFs} from "./CliFs"; +import {ProjectPackageJson} from "./ProjectPackageJson"; const dir = __dirname; diff --git a/packages/cli-core/src/services/ProjectPackageJson.ts b/packages/cli-core/src/services/ProjectPackageJson.ts index 6127bf1a6..77c536162 100644 --- a/packages/cli-core/src/services/ProjectPackageJson.ts +++ b/packages/cli-core/src/services/ProjectPackageJson.ts @@ -2,10 +2,11 @@ import {getValue, setValue} from "@tsed/core"; import {Configuration, Injectable} from "@tsed/di"; import {dirname, join} from "path"; import readPkgUp from "read-pkg-up"; + import {PackageJson} from "../interfaces/PackageJson"; import {ProjectPreferences} from "../interfaces/ProjectPreferences"; -import {CliFs} from "./CliFs"; import {isValidVersion} from "../utils/isValidVersion"; +import {CliFs} from "./CliFs"; function sortKeys(obj: any) { return Object.entries(obj) @@ -43,7 +44,10 @@ export class ProjectPackageJson { public GH_TOKEN: string; private raw: PackageJson; - constructor(@Configuration() private configuration: Configuration, protected fs: CliFs) { + constructor( + @Configuration() private configuration: Configuration, + protected fs: CliFs + ) { this.setRaw({ name: "", version: "1.0.0", diff --git a/packages/cli-core/src/services/Renderer.spec.ts b/packages/cli-core/src/services/Renderer.spec.ts index 054929948..3c9c5dae8 100644 --- a/packages/cli-core/src/services/Renderer.spec.ts +++ b/packages/cli-core/src/services/Renderer.spec.ts @@ -3,6 +3,7 @@ import {FakeCliFs, normalizePath} from "@tsed/cli-testing"; import Consolidate from "consolidate"; import globby from "globby"; import handlebars from "handlebars"; + import {TEMPLATE_DIR} from "../../../cli-plugin-jest/src/utils/templateDir"; import {RootRendererService, SrcRendererService} from "./Renderer"; @@ -19,7 +20,7 @@ describe("Renderer", () => { describe("relativeFrom()", () => { it("should return the valid path from", () => { const service = new SrcRendererService(); - // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore service.configuration = { project: { @@ -43,7 +44,6 @@ describe("Renderer", () => { baseDir: "/init" }; - // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore service.configuration = { project: { @@ -54,7 +54,6 @@ describe("Renderer", () => { service.templateDir = "/tmpl"; - // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore Consolidate.handlebars.mockReturnValue("content"); @@ -74,7 +73,6 @@ describe("Renderer", () => { templateDir: TEMPLATE_DIR }; - // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore service.configuration = { project: { @@ -85,7 +83,6 @@ describe("Renderer", () => { service.templateDir = "/tmpl"; - // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore Consolidate.handlebars.mockReturnValue("content"); @@ -104,7 +101,6 @@ describe("Renderer", () => { templateDir: `${TEMPLATE_DIR}/init` }; - // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore service.configuration = { project: { @@ -115,7 +111,6 @@ describe("Renderer", () => { service.templateDir = "/tmpl"; - // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore Consolidate.handlebars.mockReturnValue("content"); @@ -134,7 +129,6 @@ describe("Renderer", () => { baseDir: "/init" }; - // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore service.configuration = { project: { @@ -145,7 +139,6 @@ describe("Renderer", () => { service.templateDir = "/tmpl"; - // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore Consolidate.handlebars.mockReturnValue("content"); @@ -165,7 +158,6 @@ describe("Renderer", () => { basename: "myFile.controller.ts" }; - // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore service.configuration = { project: { @@ -176,7 +168,6 @@ describe("Renderer", () => { service.templateDir = "/tmpl"; - // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore Consolidate.handlebars.mockReturnValue("content"); @@ -204,7 +195,6 @@ describe("Renderer", () => { ...props }; - // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore service.configuration = { project: { @@ -215,7 +205,6 @@ describe("Renderer", () => { service.templateDir = "/tmpl"; - // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore Consolidate.handlebars.mockReturnValue("content"); diff --git a/packages/cli-core/src/services/Renderer.ts b/packages/cli-core/src/services/Renderer.ts index e84ca1a14..c0185f67f 100644 --- a/packages/cli-core/src/services/Renderer.ts +++ b/packages/cli-core/src/services/Renderer.ts @@ -1,16 +1,18 @@ +import "../utils/hbs/index"; + import {isString} from "@tsed/core"; import {Configuration, Constant, Inject, Injectable} from "@tsed/di"; import Consolidate from "consolidate"; import fs from "fs-extra"; -import normalizePath from "normalize-path"; import globby from "globby"; +import handlebars from "handlebars"; +import normalizePath from "normalize-path"; import {basename, dirname, join, relative} from "path"; import {Observable} from "rxjs"; -import {CliFs} from "./CliFs"; -import "../utils/hbs/index"; -import handlebars from "handlebars"; -import {insertImport} from "../utils/renderer/insertImport"; + import {insertAfter} from "../utils/renderer/insertAfter"; +import {insertImport} from "../utils/renderer/insertImport"; +import {CliFs} from "./CliFs"; export interface RenderOptions { path: string; @@ -147,18 +149,21 @@ export abstract class Renderer { return; } - const content: string = actions.reduce((fileContent, action) => { - switch (action.type) { - case "import": - return insertImport(fileContent, action.content); - case "insert-after": - return insertAfter(fileContent, action.content, action.pattern!); - default: - break; - } - - return fileContent; - }, await this.fs.readFile(path, {encoding: "utf8"})); + const content: string = actions.reduce( + (fileContent, action) => { + switch (action.type) { + case "import": + return insertImport(fileContent, action.content); + case "insert-after": + return insertAfter(fileContent, action.content, action.pattern!); + default: + break; + } + + return fileContent; + }, + await this.fs.readFile(path, {encoding: "utf8"}) + ); return this.fs.writeFile(path, content, {encoding: "utf8"}); } diff --git a/packages/cli-core/src/services/index.ts b/packages/cli-core/src/services/index.ts index 42ddcc64b..a5144945c 100644 --- a/packages/cli-core/src/services/index.ts +++ b/packages/cli-core/src/services/index.ts @@ -1,15 +1,15 @@ export * from "./CliConfiguration"; -export * from "./CliService"; -export * from "./CliPackageJson"; +export * from "./CliDockerComposeYaml"; +export * from "./CliExeca"; +export * from "./CliFs"; export * from "./CliHttpClient"; +export * from "./CliLoadFile"; +export * from "./CliPackageJson"; export * from "./CliPlugins"; +export * from "./CliProxyAgent"; export * from "./CliRunScript"; -export * from "./CliFs"; -export * from "./ProjectPackageJson"; -export * from "./Renderer"; -export * from "./CliExeca"; -export * from "./CliLoadFile"; +export * from "./CliService"; export * from "./CliYaml"; -export * from "./CliDockerComposeYaml"; export * from "./NpmRegistryClient"; -export * from "./CliProxyAgent"; +export * from "./ProjectPackageJson"; +export * from "./Renderer"; diff --git a/packages/cli-core/src/utils/createInjector.spec.ts b/packages/cli-core/src/utils/createInjector.spec.ts index 9b5ce14eb..7481f1ec6 100644 --- a/packages/cli-core/src/utils/createInjector.spec.ts +++ b/packages/cli-core/src/utils/createInjector.spec.ts @@ -1,7 +1,8 @@ import {InjectorService} from "@tsed/di"; import {Logger} from "@tsed/logger"; -import {createInjector} from "./createInjector"; + import {CliConfiguration} from "../services"; +import {createInjector} from "./createInjector"; describe("createInjector", () => { it("should create the injector", () => { diff --git a/packages/cli-core/src/utils/createInjector.ts b/packages/cli-core/src/utils/createInjector.ts index f3c7d198a..58f54b35b 100644 --- a/packages/cli-core/src/utils/createInjector.ts +++ b/packages/cli-core/src/utils/createInjector.ts @@ -1,5 +1,6 @@ import {DIConfigurationOptions, InjectorService} from "@tsed/di"; import {Logger} from "@tsed/logger"; + import {CliConfiguration} from "../services/CliConfiguration"; import {ProjectPackageJson} from "../services/ProjectPackageJson"; diff --git a/packages/cli-core/src/utils/createTasksRunner.ts b/packages/cli-core/src/utils/createTasksRunner.ts index 8994b8cd2..6f5f5a272 100644 --- a/packages/cli-core/src/utils/createTasksRunner.ts +++ b/packages/cli-core/src/utils/createTasksRunner.ts @@ -1,7 +1,8 @@ // @ts-ignore +import {isFunction} from "@tsed/core"; import {Listr, ListrTaskWrapper, Logger} from "listr2"; + import type {TaskOptions, Tasks} from "../interfaces/Tasks"; -import {isFunction} from "@tsed/core"; import {getLogger} from "./createInjector"; class CustomLogger extends Logger { diff --git a/packages/cli-core/src/utils/getCommandMetadata.spec.ts b/packages/cli-core/src/utils/getCommandMetadata.spec.ts index a69bd40fa..78e3f7704 100644 --- a/packages/cli-core/src/utils/getCommandMetadata.spec.ts +++ b/packages/cli-core/src/utils/getCommandMetadata.spec.ts @@ -1,5 +1,5 @@ -import {getCommandMetadata} from "./getCommandMetadata"; import {Command} from "../decorators"; +import {getCommandMetadata} from "./getCommandMetadata"; @Command({ name: "name", diff --git a/packages/cli-core/src/utils/getCommandMetadata.ts b/packages/cli-core/src/utils/getCommandMetadata.ts index 775d23acb..1710d0206 100644 --- a/packages/cli-core/src/utils/getCommandMetadata.ts +++ b/packages/cli-core/src/utils/getCommandMetadata.ts @@ -1,7 +1,8 @@ import {Store, Type} from "@tsed/core"; + import {CommandStoreKeys} from "../domains/CommandStoreKeys"; -import {CommandParameters} from "../interfaces/CommandParameters"; import {CommandMetadata} from "../interfaces/CommandMetadata"; +import {CommandParameters} from "../interfaces/CommandParameters"; export function getCommandMetadata(token: Type): CommandMetadata { const { diff --git a/packages/cli-core/src/utils/getTemplateDirectory.ts b/packages/cli-core/src/utils/getTemplateDirectory.ts index 6b8ca6fbf..001bafb2c 100644 --- a/packages/cli-core/src/utils/getTemplateDirectory.ts +++ b/packages/cli-core/src/utils/getTemplateDirectory.ts @@ -1,5 +1,5 @@ -import readPkgUp from "read-pkg-up"; import {dirname, join} from "path"; +import readPkgUp from "read-pkg-up"; export function getTemplateDirectory(cwd: string) { const {path} = readPkgUp.sync({ diff --git a/packages/cli-core/src/utils/hbs/array.ts b/packages/cli-core/src/utils/hbs/array.ts index a14ec67c6..ecdf25a0d 100644 --- a/packages/cli-core/src/utils/hbs/array.ts +++ b/packages/cli-core/src/utils/hbs/array.ts @@ -1,8 +1,6 @@ import {getValue, isArray, isNumber, isObject, isString} from "@tsed/core"; -// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore import createFrame from "create-frame"; -// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore import util from "handlebars-utils"; diff --git a/packages/cli-core/src/utils/hbs/collection.ts b/packages/cli-core/src/utils/hbs/collection.ts index 01f874f3a..e73257678 100644 --- a/packages/cli-core/src/utils/hbs/collection.ts +++ b/packages/cli-core/src/utils/hbs/collection.ts @@ -1,8 +1,8 @@ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore import util from "handlebars-utils"; -import {helpers as object} from "./object"; + import {helpers as array} from "./array"; +import {helpers as object} from "./object"; const forEach = array.forEach; const forOwn = object.forOwn; diff --git a/packages/cli-core/src/utils/hbs/comparison.ts b/packages/cli-core/src/utils/hbs/comparison.ts index 39bf2f2a0..321b2293d 100644 --- a/packages/cli-core/src/utils/hbs/comparison.ts +++ b/packages/cli-core/src/utils/hbs/comparison.ts @@ -1,5 +1,4 @@ import {isNumber} from "@tsed/core"; -// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore import util from "handlebars-utils"; diff --git a/packages/cli-core/src/utils/hbs/index.ts b/packages/cli-core/src/utils/hbs/index.ts index 5555d978c..d2ff60261 100644 --- a/packages/cli-core/src/utils/hbs/index.ts +++ b/packages/cli-core/src/utils/hbs/index.ts @@ -1,8 +1,9 @@ import handlebars from "handlebars"; -import {helpers as comparison} from "./comparison"; + import {helpers as array} from "./array"; -import {helpers as object} from "./object"; import {helpers as collection} from "./collection"; +import {helpers as comparison} from "./comparison"; +import {helpers as object} from "./object"; import {helpers as switchHelpers} from "./switch"; handlebars.registerHelper(array); diff --git a/packages/cli-core/src/utils/hbs/object.ts b/packages/cli-core/src/utils/hbs/object.ts index 64e51103e..fd2dd4409 100644 --- a/packages/cli-core/src/utils/hbs/object.ts +++ b/packages/cli-core/src/utils/hbs/object.ts @@ -1,11 +1,10 @@ import {getValue, isNumber, isObject} from "@tsed/core"; -import {helpers as array} from "./array"; -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore -import util from "handlebars-utils"; -// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore import createFrame from "create-frame"; +// @ts-ignore +import util from "handlebars-utils"; + +import {helpers as array} from "./array"; const hasOwn = Object.hasOwnProperty; export const helpers: any = {}; @@ -18,7 +17,6 @@ export const helpers: any = {}; * @api public */ helpers.extend = function (/*objects*/) { - // eslint-disable-next-line prefer-rest-params const args = [].slice.call(arguments); let opts = {}; @@ -216,7 +214,6 @@ helpers.JSONstringify = function (obj: any, indent: string | number | undefined) * @api public */ helpers.merge = function (...args1: any) { - // eslint-disable-next-line prefer-rest-params const args = [].slice.call(args1); let opts = {}; diff --git a/packages/cli-core/src/utils/index.ts b/packages/cli-core/src/utils/index.ts index f9ee5ed36..76b31eb61 100644 --- a/packages/cli-core/src/utils/index.ts +++ b/packages/cli-core/src/utils/index.ts @@ -1,10 +1,10 @@ export * from "./createInjector"; +export * from "./createTasksRunner"; export * from "./getCommandMetadata"; +export * from "./getTemplateDirectory"; export * from "./loadPlugins"; export * from "./logToCurl"; export * from "./mapCommanderArgs"; export * from "./mapCommanderOptions"; export * from "./parseOption"; -export * from "./createTasksRunner"; export * from "./resolveConfiguration"; -export * from "./getTemplateDirectory"; diff --git a/packages/cli-core/src/utils/loadPlugins.ts b/packages/cli-core/src/utils/loadPlugins.ts index f43f02226..707b2ba13 100644 --- a/packages/cli-core/src/utils/loadPlugins.ts +++ b/packages/cli-core/src/utils/loadPlugins.ts @@ -1,7 +1,8 @@ import {GlobalProviders, InjectorService} from "@tsed/di"; +import chalk from "chalk"; // @ts-ignore import {figures} from "listr2"; -import chalk from "chalk"; + import {CliFs} from "../services/CliFs"; import {ProjectPackageJson} from "../services/ProjectPackageJson"; diff --git a/packages/cli-core/src/utils/mapCommanderArgs.ts b/packages/cli-core/src/utils/mapCommanderArgs.ts index ef95053b6..a6fa74d34 100644 --- a/packages/cli-core/src/utils/mapCommanderArgs.ts +++ b/packages/cli-core/src/utils/mapCommanderArgs.ts @@ -1,4 +1,5 @@ -import {isClass, Type, isArray} from "@tsed/core"; +import {isArray, isClass, Type} from "@tsed/core"; + import {CommandArg} from "../interfaces/CommandParameters"; function mapValue(value: any, {type, itemType}: {type?: Type; itemType?: Type}) { diff --git a/packages/cli-core/src/utils/patchCommander.ts b/packages/cli-core/src/utils/patchCommander.ts index cc8d075a7..e02de4f25 100644 --- a/packages/cli-core/src/utils/patchCommander.ts +++ b/packages/cli-core/src/utils/patchCommander.ts @@ -22,7 +22,6 @@ for (const C of [Array, String, TypedArray]) { const helpInformation = Command.prototype.helpInformation; function colorizeSection(str: any, section: string) { - // eslint-disable-next-line prefer-const let [before, after] = str.split(section); after = after .split("\n") diff --git a/packages/cli-core/src/utils/resolveConfiguration.ts b/packages/cli-core/src/utils/resolveConfiguration.ts index 385266af4..2c520d030 100644 --- a/packages/cli-core/src/utils/resolveConfiguration.ts +++ b/packages/cli-core/src/utils/resolveConfiguration.ts @@ -1,5 +1,6 @@ -import {TokenProvider} from "@tsed/di"; import {getValue} from "@tsed/core"; +import {TokenProvider} from "@tsed/di"; + import {getCommandMetadata} from "./getCommandMetadata"; export function resolveConfiguration(settings: any) { diff --git a/packages/cli-core/src/utils/streamToObservable.ts b/packages/cli-core/src/utils/streamToObservable.ts index b995c29b4..9bc7dccd2 100644 --- a/packages/cli-core/src/utils/streamToObservable.ts +++ b/packages/cli-core/src/utils/streamToObservable.ts @@ -1,5 +1,5 @@ -import type {Stream} from "stream"; import {Observable} from "rxjs"; +import type {Stream} from "stream"; function or(option: false | any, alternate: string, required?: boolean) { const result = option === false ? false : option || alternate; diff --git a/packages/cli-core/test/integrations/command.integration.spec.ts b/packages/cli-core/test/integrations/command.integration.spec.ts index 0d583ece3..aa87d4fb3 100644 --- a/packages/cli-core/test/integrations/command.integration.spec.ts +++ b/packages/cli-core/test/integrations/command.integration.spec.ts @@ -1,12 +1,13 @@ -import {CliCore, Command, CommandProvider, Tasks} from "../../src"; import execa from "execa"; -vi.mock("execa") +import {CliCore, Command, CommandProvider, Tasks} from "../../src"; + +vi.mock("execa"); describe("Command", () => { beforeEach(() => { - (execa as any as vi.Mock).mockReturnValue({}) - }) + (execa as any as vi.Mock).mockReturnValue({}); + }); it("should exec a command with expected parsed argument", async () => { @Command({ name: "test", @@ -30,20 +31,20 @@ describe("Command", () => { } } - vi.spyOn(TestCommand.prototype, "$exec").mockResolvedValue([]) + vi.spyOn(TestCommand.prototype, "$exec").mockResolvedValue([]); await CliCore.bootstrap({ name: "tsed", commands: [TestCommand], argv: [require.resolve("ts-node"), "src/bin/tsed.ts", "test", "subcmd"] - }) + }); expect(TestCommand.prototype.$exec).toHaveBeenCalledWith({ - "bindLogger": true, - "command": "subcmd", - "rawArgs": [], - "rootDir": undefined, - "verbose": false - }) - }) -}) + bindLogger: true, + command: "subcmd", + rawArgs: [], + rootDir: undefined, + verbose: false + }); + }); +}); diff --git a/packages/cli-generate-http-client/src/commands/GenerateHttpClientCmd.ts b/packages/cli-generate-http-client/src/commands/GenerateHttpClientCmd.ts index 1c00e0a70..2d8f638d8 100644 --- a/packages/cli-generate-http-client/src/commands/GenerateHttpClientCmd.ts +++ b/packages/cli-generate-http-client/src/commands/GenerateHttpClientCmd.ts @@ -1,6 +1,6 @@ import {CliFs, Command, CommandProvider, Inject, Type} from "@tsed/cli-core"; -import {Constant, InjectorService} from "@tsed/di"; import {isString} from "@tsed/core"; +import {Constant, InjectorService} from "@tsed/di"; import {camelCase} from "change-case"; import path, {join, resolve} from "path"; import {generateApi, Hooks, RawRouteInfo, RouteNameInfo} from "swagger-typescript-api"; diff --git a/packages/cli-plugin-eslint/scripts/templateDir.esm.js b/packages/cli-plugin-eslint/scripts/templateDir.esm.js index e6cd43d32..7fa172434 100644 --- a/packages/cli-plugin-eslint/scripts/templateDir.esm.js +++ b/packages/cli-plugin-eslint/scripts/templateDir.esm.js @@ -1,5 +1,6 @@ -import {getTemplateDirectory} from "@tsed/cli-core"; import path from "node:path"; import {fileURLToPath} from "node:url"; +import {getTemplateDirectory} from "@tsed/cli-core"; + export const TEMPLATE_DIR = getTemplateDirectory(path.dirname(fileURLToPath(import.meta.url))); diff --git a/packages/cli-plugin-eslint/src/CliPluginEslintModule.ts b/packages/cli-plugin-eslint/src/CliPluginEslintModule.ts index 5a30bdc9c..5762e2cf0 100644 --- a/packages/cli-plugin-eslint/src/CliPluginEslintModule.ts +++ b/packages/cli-plugin-eslint/src/CliPluginEslintModule.ts @@ -1,4 +1,5 @@ import {Module} from "@tsed/cli-core"; + import {EslintInitHook} from "./hooks/EslintInitHook"; @Module({ diff --git a/packages/cli-plugin-eslint/src/hooks/EslintInitHook.ts b/packages/cli-plugin-eslint/src/hooks/EslintInitHook.ts index f94eae49d..5105a7cf6 100644 --- a/packages/cli-plugin-eslint/src/hooks/EslintInitHook.ts +++ b/packages/cli-plugin-eslint/src/hooks/EslintInitHook.ts @@ -1,5 +1,6 @@ import {InitCmdContext} from "@tsed/cli"; import {Inject, Injectable, OnExec, OnPostInstall, PackageManagersModule, ProjectPackageJson, RootRendererService} from "@tsed/cli-core"; + import {TEMPLATE_DIR} from "../utils/templateDir"; @Injectable() diff --git a/packages/cli-plugin-jest/scripts/templateDir.esm.js b/packages/cli-plugin-jest/scripts/templateDir.esm.js index e6cd43d32..7fa172434 100644 --- a/packages/cli-plugin-jest/scripts/templateDir.esm.js +++ b/packages/cli-plugin-jest/scripts/templateDir.esm.js @@ -1,5 +1,6 @@ -import {getTemplateDirectory} from "@tsed/cli-core"; import path from "node:path"; import {fileURLToPath} from "node:url"; +import {getTemplateDirectory} from "@tsed/cli-core"; + export const TEMPLATE_DIR = getTemplateDirectory(path.dirname(fileURLToPath(import.meta.url))); diff --git a/packages/cli-plugin-jest/src/CliPluginJestModule.ts b/packages/cli-plugin-jest/src/CliPluginJestModule.ts index e9fde9b2c..3085f2e96 100644 --- a/packages/cli-plugin-jest/src/CliPluginJestModule.ts +++ b/packages/cli-plugin-jest/src/CliPluginJestModule.ts @@ -1,6 +1,7 @@ -import {Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core"; import {RuntimesModule} from "@tsed/cli"; +import {Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core"; import {Inject} from "@tsed/di"; + import {JestGenerateHook} from "./hooks/JestGenerateHook"; import {JestInitHook} from "./hooks/JestInitHook"; diff --git a/packages/cli-plugin-jest/src/hooks/JestGenerateHook.ts b/packages/cli-plugin-jest/src/hooks/JestGenerateHook.ts index fef23740d..24d5c4971 100644 --- a/packages/cli-plugin-jest/src/hooks/JestGenerateHook.ts +++ b/packages/cli-plugin-jest/src/hooks/JestGenerateHook.ts @@ -1,6 +1,6 @@ import {GenerateCmdContext} from "@tsed/cli"; -import normalizePath from "normalize-path"; import {Inject, Injectable, OnExec, SrcRendererService, Tasks} from "@tsed/cli-core"; +import normalizePath from "normalize-path"; import {TEMPLATE_DIR} from "../utils/templateDir"; diff --git a/packages/cli-plugin-jest/src/hooks/JestInitHook.ts b/packages/cli-plugin-jest/src/hooks/JestInitHook.ts index a14739b08..920e9f8e7 100644 --- a/packages/cli-plugin-jest/src/hooks/JestInitHook.ts +++ b/packages/cli-plugin-jest/src/hooks/JestInitHook.ts @@ -7,6 +7,7 @@ import { ScriptsRendererService, SrcRendererService } from "@tsed/cli-core"; + import {TEMPLATE_DIR} from "../utils/templateDir"; @Injectable() diff --git a/packages/cli-plugin-jest/test/integrations/generate/generate.controller.integration.spec.ts b/packages/cli-plugin-jest/test/integrations/generate/generate.controller.integration.spec.ts index 9e7165adc..6b0f3f2a8 100644 --- a/packages/cli-plugin-jest/test/integrations/generate/generate.controller.integration.spec.ts +++ b/packages/cli-plugin-jest/test/integrations/generate/generate.controller.integration.spec.ts @@ -1,7 +1,8 @@ +import "../../../src"; + import {GenerateCmd, TEMPLATE_DIR} from "@tsed/cli"; import {CliService, ProjectPackageJson} from "@tsed/cli-core"; import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; -import "../../../src"; describe("Generate Controller", () => { beforeEach(() => diff --git a/packages/cli-plugin-mocha/scripts/templateDir.esm.js b/packages/cli-plugin-mocha/scripts/templateDir.esm.js index e6cd43d32..7fa172434 100644 --- a/packages/cli-plugin-mocha/scripts/templateDir.esm.js +++ b/packages/cli-plugin-mocha/scripts/templateDir.esm.js @@ -1,5 +1,6 @@ -import {getTemplateDirectory} from "@tsed/cli-core"; import path from "node:path"; import {fileURLToPath} from "node:url"; +import {getTemplateDirectory} from "@tsed/cli-core"; + export const TEMPLATE_DIR = getTemplateDirectory(path.dirname(fileURLToPath(import.meta.url))); diff --git a/packages/cli-plugin-mocha/src/CliPluginMochaModule.ts b/packages/cli-plugin-mocha/src/CliPluginMochaModule.ts index 0cbb9604d..ec1be6b5f 100644 --- a/packages/cli-plugin-mocha/src/CliPluginMochaModule.ts +++ b/packages/cli-plugin-mocha/src/CliPluginMochaModule.ts @@ -1,8 +1,9 @@ +import {RuntimesModule} from "@tsed/cli"; import {Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core"; import {Inject} from "@tsed/di"; + import {MochaGenerateHook} from "./hooks/MochaGenerateHook"; import {MochaInitHook} from "./hooks/MochaInitHook"; -import {RuntimesModule} from "@tsed/cli"; @Module({ imports: [MochaInitHook, MochaGenerateHook] diff --git a/packages/cli-plugin-mocha/src/hooks/MochaGenerateHook.ts b/packages/cli-plugin-mocha/src/hooks/MochaGenerateHook.ts index 3edc3dc9d..0daee5054 100644 --- a/packages/cli-plugin-mocha/src/hooks/MochaGenerateHook.ts +++ b/packages/cli-plugin-mocha/src/hooks/MochaGenerateHook.ts @@ -1,6 +1,7 @@ import {GenerateCmdContext} from "@tsed/cli"; import {Inject, Injectable, OnExec, SrcRendererService, Tasks} from "@tsed/cli-core"; import normalizePath from "normalize-path"; + import {TEMPLATE_DIR} from "../utils/templateDir"; @Injectable() diff --git a/packages/cli-plugin-mocha/src/hooks/MochaInitHook.ts b/packages/cli-plugin-mocha/src/hooks/MochaInitHook.ts index 7b025c78f..628c127b3 100644 --- a/packages/cli-plugin-mocha/src/hooks/MochaInitHook.ts +++ b/packages/cli-plugin-mocha/src/hooks/MochaInitHook.ts @@ -8,6 +8,7 @@ import { SrcRendererService } from "@tsed/cli-core"; import {join} from "path"; + import {TEMPLATE_DIR} from "../utils/templateDir"; @Injectable() diff --git a/packages/cli-plugin-mongoose/scripts/templateDir.esm.js b/packages/cli-plugin-mongoose/scripts/templateDir.esm.js index e6cd43d32..7fa172434 100644 --- a/packages/cli-plugin-mongoose/scripts/templateDir.esm.js +++ b/packages/cli-plugin-mongoose/scripts/templateDir.esm.js @@ -1,5 +1,6 @@ -import {getTemplateDirectory} from "@tsed/cli-core"; import path from "node:path"; import {fileURLToPath} from "node:url"; +import {getTemplateDirectory} from "@tsed/cli-core"; + export const TEMPLATE_DIR = getTemplateDirectory(path.dirname(fileURLToPath(import.meta.url))); diff --git a/packages/cli-plugin-mongoose/src/CliPluginMongooseModule.ts b/packages/cli-plugin-mongoose/src/CliPluginMongooseModule.ts index 351ff81ce..9f7becde3 100644 --- a/packages/cli-plugin-mongoose/src/CliPluginMongooseModule.ts +++ b/packages/cli-plugin-mongoose/src/CliPluginMongooseModule.ts @@ -1,5 +1,6 @@ import {Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core"; import {Inject} from "@tsed/di"; + import {MongooseGenerateHook} from "./hooks/MongooseGenerateHook"; import {MongooseInitHook} from "./hooks/MongooseInitHook"; import {CliMongoose} from "./services/CliMongoose"; diff --git a/packages/cli-plugin-mongoose/src/hooks/MongooseGenerateHook.ts b/packages/cli-plugin-mongoose/src/hooks/MongooseGenerateHook.ts index be4505587..d928a94cd 100644 --- a/packages/cli-plugin-mongoose/src/hooks/MongooseGenerateHook.ts +++ b/packages/cli-plugin-mongoose/src/hooks/MongooseGenerateHook.ts @@ -1,10 +1,10 @@ import {GenerateCmdContext, ProvidersInfoService} from "@tsed/cli"; import {CliDockerComposeYaml, Inject, OnExec, ProjectPackageJson, SrcRendererService, Tasks} from "@tsed/cli-core"; import {Injectable} from "@tsed/di"; -// eslint-disable-next-line @typescript-eslint/ban-ts-comment +import {camelCase, paramCase} from "change-case"; // @ts-ignore import {plural} from "pluralize"; -import {camelCase, paramCase} from "change-case"; + import {CliMongoose} from "../services/CliMongoose"; import {TEMPLATE_DIR} from "../utils/templateDir"; diff --git a/packages/cli-plugin-mongoose/src/hooks/MongooseInitHook.ts b/packages/cli-plugin-mongoose/src/hooks/MongooseInitHook.ts index 7845d7b05..176e9a7ac 100644 --- a/packages/cli-plugin-mongoose/src/hooks/MongooseInitHook.ts +++ b/packages/cli-plugin-mongoose/src/hooks/MongooseInitHook.ts @@ -1,6 +1,7 @@ import {InitCmdContext} from "@tsed/cli"; import {CliDockerComposeYaml, Inject, OnExec, ProjectPackageJson, RootRendererService, SrcRendererService} from "@tsed/cli-core"; import {Injectable} from "@tsed/di"; + import {CliMongoose} from "../services/CliMongoose"; @Injectable() diff --git a/packages/cli-plugin-mongoose/src/index.ts b/packages/cli-plugin-mongoose/src/index.ts index 4fafd6beb..b5a13828d 100644 --- a/packages/cli-plugin-mongoose/src/index.ts +++ b/packages/cli-plugin-mongoose/src/index.ts @@ -1,7 +1,7 @@ import {CliPluginMongooseModule} from "./CliPluginMongooseModule"; -export * from "./hooks/MongooseInitHook"; export * from "./hooks/MongooseGenerateHook"; +export * from "./hooks/MongooseInitHook"; export * from "./services/CliMongoose"; export * from "./utils/templateDir"; diff --git a/packages/cli-plugin-mongoose/src/services/CliMongoose.ts b/packages/cli-plugin-mongoose/src/services/CliMongoose.ts index a10eb7fd2..6256b0691 100644 --- a/packages/cli-plugin-mongoose/src/services/CliMongoose.ts +++ b/packages/cli-plugin-mongoose/src/services/CliMongoose.ts @@ -1,6 +1,7 @@ import {Inject, Injectable, ProjectPackageJson, SrcRendererService} from "@tsed/cli-core"; import {camelCase, constantCase, paramCase} from "change-case"; import {basename, join} from "path"; + import {TEMPLATE_DIR} from "../utils/templateDir"; @Injectable() diff --git a/packages/cli-plugin-mongoose/test/integrations/generate/generate.model.integration.spec.ts b/packages/cli-plugin-mongoose/test/integrations/generate/generate.model.integration.spec.ts index 015dd1ce4..0f4cf8184 100644 --- a/packages/cli-plugin-mongoose/test/integrations/generate/generate.model.integration.spec.ts +++ b/packages/cli-plugin-mongoose/test/integrations/generate/generate.model.integration.spec.ts @@ -1,7 +1,8 @@ +import "../../../src"; + import {GenerateCmd, TEMPLATE_DIR} from "@tsed/cli"; import {CliService, ProjectPackageJson} from "@tsed/cli-core"; import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; -import "../../../src"; describe("Generate Model", () => { beforeEach(() => @@ -31,9 +32,9 @@ describe("Generate Model", () => { expect(FakeCliFs.getKeys()).toEqual(["project-name/src/models", "project-name/src/models/ProductModel.ts"]); const result = FakeCliFs.entries.get("project-name/src/models/ProductModel.ts"); - expect(result).toContain("import { Model, ObjectID } from \"@tsed/mongoose\";"); + expect(result).toContain('import { Model, ObjectID } from "@tsed/mongoose";'); expect(result).toContain("@Model"); - expect(result).toContain("name: \"products\""); + expect(result).toContain('name: "products"'); expect(result).toContain("export class ProductModel"); }); }); diff --git a/packages/cli-plugin-mongoose/test/integrations/generate/generate.schema.integration.spec.ts b/packages/cli-plugin-mongoose/test/integrations/generate/generate.schema.integration.spec.ts index e54ab4fa4..7dd9e42fd 100644 --- a/packages/cli-plugin-mongoose/test/integrations/generate/generate.schema.integration.spec.ts +++ b/packages/cli-plugin-mongoose/test/integrations/generate/generate.schema.integration.spec.ts @@ -1,5 +1,6 @@ import {GenerateCmd} from "@tsed/cli"; import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; + import {TEMPLATE_DIR} from "../../../src"; describe("Generate Schema", () => { @@ -30,8 +31,8 @@ describe("Generate Schema", () => { expect(FakeCliFs.getKeys()).toEqual(["project-name/src/models", "project-name/src/models/ProductSchema.ts"]); const result = FakeCliFs.entries.get("project-name/src/models/ProductSchema.ts"); - expect(result).toContain("import { Property } from \"@tsed/schema\";"); - expect(result).toContain("import { Schema } from \"@tsed/mongoose\";"); + expect(result).toContain('import { Property } from "@tsed/schema";'); + expect(result).toContain('import { Schema } from "@tsed/mongoose";'); expect(result).toContain("@Schema()"); expect(result).toContain("export class ProductSchema {"); }); diff --git a/packages/cli-plugin-oidc-provider/scripts/templateDir.esm.js b/packages/cli-plugin-oidc-provider/scripts/templateDir.esm.js index e6cd43d32..7fa172434 100644 --- a/packages/cli-plugin-oidc-provider/scripts/templateDir.esm.js +++ b/packages/cli-plugin-oidc-provider/scripts/templateDir.esm.js @@ -1,5 +1,6 @@ -import {getTemplateDirectory} from "@tsed/cli-core"; import path from "node:path"; import {fileURLToPath} from "node:url"; +import {getTemplateDirectory} from "@tsed/cli-core"; + export const TEMPLATE_DIR = getTemplateDirectory(path.dirname(fileURLToPath(import.meta.url))); diff --git a/packages/cli-plugin-oidc-provider/src/CliPluginOidcProviderModule.ts b/packages/cli-plugin-oidc-provider/src/CliPluginOidcProviderModule.ts index eaee82524..26ba4f602 100644 --- a/packages/cli-plugin-oidc-provider/src/CliPluginOidcProviderModule.ts +++ b/packages/cli-plugin-oidc-provider/src/CliPluginOidcProviderModule.ts @@ -1,5 +1,6 @@ import {Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core"; import {Inject} from "@tsed/di"; + import {OidcProviderInitHook} from "./hooks/OidcProviderInitHook"; @Module({ diff --git a/packages/cli-plugin-oidc-provider/src/hooks/OidcProviderInitHook.ts b/packages/cli-plugin-oidc-provider/src/hooks/OidcProviderInitHook.ts index 655799d00..bf474589c 100644 --- a/packages/cli-plugin-oidc-provider/src/hooks/OidcProviderInitHook.ts +++ b/packages/cli-plugin-oidc-provider/src/hooks/OidcProviderInitHook.ts @@ -1,6 +1,7 @@ import {InitCmdContext} from "@tsed/cli"; import {CliDockerComposeYaml, Inject, OnExec, ProjectPackageJson, RootRendererService, SrcRendererService} from "@tsed/cli-core"; import {Injectable} from "@tsed/di"; + import {TEMPLATE_DIR} from "../utils/templateDir"; @Injectable() diff --git a/packages/cli-plugin-oidc-provider/test/init/init.integration.spec.ts b/packages/cli-plugin-oidc-provider/test/init/init.integration.spec.ts index 600e117da..6627efc33 100644 --- a/packages/cli-plugin-oidc-provider/test/init/init.integration.spec.ts +++ b/packages/cli-plugin-oidc-provider/test/init/init.integration.spec.ts @@ -1,6 +1,7 @@ -import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; +import "../.."; + import {InitCmd, TEMPLATE_DIR} from "@tsed/cli"; -import "@tsed/cli-plugin-oidc-provider"; +import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; describe("Init OIDC Provider project", () => { beforeEach(() => @@ -36,13 +37,13 @@ describe("Init OIDC Provider project", () => { const content = FakeCliFs.entries.get("project-name/src/Server.ts")!; - expect(content).toContain("import \"@tsed/oidc-provider\""); - expect(content).toContain("import {InteractionsController} from \"./controllers/oidc/InteractionsController\";"); + expect(content).toContain('import "@tsed/oidc-provider"'); + expect(content).toContain('import {InteractionsController} from "./controllers/oidc/InteractionsController";'); expect(content).toMatchSnapshot(); const configContent = FakeCliFs.entries.get("project-name/src/config/oidc/index.ts")!; - expect(configContent).toContain("path: \"/oidc\""); + expect(configContent).toContain('path: "/oidc"'); }); it("should generate a project with oidc and swagger", async () => { CliPlatformTest.setPackageJson({ @@ -68,12 +69,12 @@ describe("Init OIDC Provider project", () => { const content = FakeCliFs.entries.get("project-name/src/Server.ts")!; - expect(content).toContain("import \"@tsed/oidc-provider\""); - expect(content).toContain("import {InteractionsController} from \"./controllers/oidc/InteractionsController\";"); + expect(content).toContain('import "@tsed/oidc-provider"'); + expect(content).toContain('import {InteractionsController} from "./controllers/oidc/InteractionsController";'); expect(content).toMatchSnapshot(); const configContent = FakeCliFs.entries.get("project-name/src/config/oidc/index.ts")!; - expect(configContent).toContain("path: \"/oidc\""); + expect(configContent).toContain('path: "/oidc"'); }); }); diff --git a/packages/cli-plugin-passport/scripts/templateDir.esm.js b/packages/cli-plugin-passport/scripts/templateDir.esm.js index e6cd43d32..7fa172434 100644 --- a/packages/cli-plugin-passport/scripts/templateDir.esm.js +++ b/packages/cli-plugin-passport/scripts/templateDir.esm.js @@ -1,5 +1,6 @@ -import {getTemplateDirectory} from "@tsed/cli-core"; import path from "node:path"; import {fileURLToPath} from "node:url"; +import {getTemplateDirectory} from "@tsed/cli-core"; + export const TEMPLATE_DIR = getTemplateDirectory(path.dirname(fileURLToPath(import.meta.url))); diff --git a/packages/cli-plugin-passport/src/CliPluginPassportModule.ts b/packages/cli-plugin-passport/src/CliPluginPassportModule.ts index 36b1b47ca..87dae40d7 100644 --- a/packages/cli-plugin-passport/src/CliPluginPassportModule.ts +++ b/packages/cli-plugin-passport/src/CliPluginPassportModule.ts @@ -1,5 +1,6 @@ import {Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core"; import {Inject} from "@tsed/di"; + import {PassportGenerateHook} from "./hooks/PassportGenerateHook"; @Module({ diff --git a/packages/cli-plugin-passport/src/hooks/PassportGenerateHook.ts b/packages/cli-plugin-passport/src/hooks/PassportGenerateHook.ts index 3a64ce9f2..0b1298d3e 100644 --- a/packages/cli-plugin-passport/src/hooks/PassportGenerateHook.ts +++ b/packages/cli-plugin-passport/src/hooks/PassportGenerateHook.ts @@ -2,6 +2,7 @@ import {GenerateCmdContext, ProvidersInfoService} from "@tsed/cli"; import {Inject, OnExec, OnPrompt, ProjectPackageJson, SrcRendererService, Tasks} from "@tsed/cli-core"; import {Injectable} from "@tsed/di"; import {paramCase} from "change-case"; + import {PassportClient} from "../services/PassportClient"; import {TEMPLATE_DIR} from "../utils/templateDir"; diff --git a/packages/cli-plugin-prisma/scripts/templateDir.esm.js b/packages/cli-plugin-prisma/scripts/templateDir.esm.js index e6cd43d32..7fa172434 100644 --- a/packages/cli-plugin-prisma/scripts/templateDir.esm.js +++ b/packages/cli-plugin-prisma/scripts/templateDir.esm.js @@ -1,5 +1,6 @@ -import {getTemplateDirectory} from "@tsed/cli-core"; import path from "node:path"; import {fileURLToPath} from "node:url"; +import {getTemplateDirectory} from "@tsed/cli-core"; + export const TEMPLATE_DIR = getTemplateDirectory(path.dirname(fileURLToPath(import.meta.url))); diff --git a/packages/cli-plugin-prisma/src/CliPluginPrismaModule.ts b/packages/cli-plugin-prisma/src/CliPluginPrismaModule.ts index 21dfdb184..e500c749f 100644 --- a/packages/cli-plugin-prisma/src/CliPluginPrismaModule.ts +++ b/packages/cli-plugin-prisma/src/CliPluginPrismaModule.ts @@ -1,5 +1,6 @@ import {Module, ProjectPackageJson} from "@tsed/cli-core"; import {Inject} from "@tsed/di"; + import {PrismaCmd} from "./commands/PrismaCmd"; import {PrismaInitHook} from "./hooks/PrismaInitHook"; diff --git a/packages/cli-plugin-prisma/src/commands/PrismaCmd.ts b/packages/cli-plugin-prisma/src/commands/PrismaCmd.ts index 5b11ecb31..02bd4918b 100644 --- a/packages/cli-plugin-prisma/src/commands/PrismaCmd.ts +++ b/packages/cli-plugin-prisma/src/commands/PrismaCmd.ts @@ -1,4 +1,5 @@ -import {Command, CliDefaultOptions, CommandProvider, Inject} from "@tsed/cli-core"; +import {CliDefaultOptions, Command, CommandProvider, Inject} from "@tsed/cli-core"; + import {CliPrisma} from "../services/CliPrisma"; export interface PrismaContext extends CliDefaultOptions { diff --git a/packages/cli-plugin-prisma/src/hooks/PrismaInitHook.ts b/packages/cli-plugin-prisma/src/hooks/PrismaInitHook.ts index f006e549b..d16d44af0 100644 --- a/packages/cli-plugin-prisma/src/hooks/PrismaInitHook.ts +++ b/packages/cli-plugin-prisma/src/hooks/PrismaInitHook.ts @@ -1,6 +1,7 @@ import {InitCmdContext} from "@tsed/cli"; import {CliService, Inject, OnExec, PackageManagersModule, ProjectPackageJson} from "@tsed/cli-core"; import {Injectable} from "@tsed/di"; + import {CliPrisma} from "../services/CliPrisma"; @Injectable() diff --git a/packages/cli-plugin-prisma/src/services/CliPrisma.spec.ts b/packages/cli-plugin-prisma/src/services/CliPrisma.spec.ts index 4b115db35..eec3e1092 100644 --- a/packages/cli-plugin-prisma/src/services/CliPrisma.spec.ts +++ b/packages/cli-plugin-prisma/src/services/CliPrisma.spec.ts @@ -1,9 +1,10 @@ // @ts-ignore -import {CliPlatformTest} from "@tsed/cli-testing"; -import {CliPrisma} from "./CliPrisma"; import {CliFs, normalizePath} from "@tsed/cli-core"; +import {CliPlatformTest} from "@tsed/cli-testing"; import {join} from "path"; +import {CliPrisma} from "./CliPrisma"; + async function createServiceFixture() { const cliFs = { join: (...args: string[]) => normalizePath(join(...args)), @@ -69,7 +70,7 @@ describe("CliPrisma", () => { await service.patchPrismaSchema(); - expect(cliFs.writeFile).not.toBeCalled(); + expect(cliFs.writeFile).not.toHaveBeenCalled(); }); it("should do nothing", async () => { const {service, cliFs} = await createServiceFixture(); @@ -88,7 +89,7 @@ describe("CliPrisma", () => { await service.patchPrismaSchema(); - expect(cliFs.writeFile).not.toBeCalled(); + expect(cliFs.writeFile).not.toHaveBeenCalled(); }); }); }); diff --git a/packages/cli-plugin-typegraphql/scripts/templateDir.esm.js b/packages/cli-plugin-typegraphql/scripts/templateDir.esm.js index e6cd43d32..7fa172434 100644 --- a/packages/cli-plugin-typegraphql/scripts/templateDir.esm.js +++ b/packages/cli-plugin-typegraphql/scripts/templateDir.esm.js @@ -1,5 +1,6 @@ -import {getTemplateDirectory} from "@tsed/cli-core"; import path from "node:path"; import {fileURLToPath} from "node:url"; +import {getTemplateDirectory} from "@tsed/cli-core"; + export const TEMPLATE_DIR = getTemplateDirectory(path.dirname(fileURLToPath(import.meta.url))); diff --git a/packages/cli-plugin-typegraphql/src/TypeGraphqlModule.ts b/packages/cli-plugin-typegraphql/src/TypeGraphqlModule.ts index 52ff6c39d..f9a195d39 100644 --- a/packages/cli-plugin-typegraphql/src/TypeGraphqlModule.ts +++ b/packages/cli-plugin-typegraphql/src/TypeGraphqlModule.ts @@ -1,5 +1,6 @@ import {Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core"; import {Inject} from "@tsed/di"; + import {TypeGraphqlInitHook} from "./hooks/TypeGraphqlInitHook"; @Module({ diff --git a/packages/cli-plugin-typegraphql/src/hooks/TypeGraphqlInitHook.ts b/packages/cli-plugin-typegraphql/src/hooks/TypeGraphqlInitHook.ts index ab8982b62..a55d7f71a 100644 --- a/packages/cli-plugin-typegraphql/src/hooks/TypeGraphqlInitHook.ts +++ b/packages/cli-plugin-typegraphql/src/hooks/TypeGraphqlInitHook.ts @@ -1,6 +1,7 @@ import {InitCmdContext} from "@tsed/cli"; import {Inject, OnExec, ProjectPackageJson, RootRendererService, SrcRendererService} from "@tsed/cli-core"; import {Injectable} from "@tsed/di"; + import {TEMPLATE_DIR} from "../utils/templateDir"; @Injectable() diff --git a/packages/cli-plugin-typegraphql/test/init/init.integration.spec.ts b/packages/cli-plugin-typegraphql/test/init/init.integration.spec.ts index c1c147f29..3ed4aa2d5 100644 --- a/packages/cli-plugin-typegraphql/test/init/init.integration.spec.ts +++ b/packages/cli-plugin-typegraphql/test/init/init.integration.spec.ts @@ -1,6 +1,7 @@ -import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; +import "../.."; + import {InitCmd, TEMPLATE_DIR} from "@tsed/cli"; -import "@tsed/cli-plugin-typegraphql"; +import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; describe("Init TypeGraphQL project", () => { beforeEach(() => @@ -71,9 +72,9 @@ describe("Init TypeGraphQL project", () => { const content = FakeCliFs.entries.get("project-name/src/Server.ts")!; expect(content).toMatchSnapshot(); - expect(content).toContain("import \"@tsed/typegraphql\""); - expect(content).toContain("import \"./datasources/index\";"); - expect(content).toContain("import \"./resolvers/index\";"); + expect(content).toContain('import "@tsed/typegraphql"'); + expect(content).toContain('import "./datasources/index";'); + expect(content).toContain('import "./resolvers/index";'); const configContent = FakeCliFs.entries.get("project-name/src/config/index.ts")!; expect(configContent).toMatchSnapshot(); diff --git a/packages/cli-plugin-typeorm/scripts/templateDir.esm.js b/packages/cli-plugin-typeorm/scripts/templateDir.esm.js index e6cd43d32..7fa172434 100644 --- a/packages/cli-plugin-typeorm/scripts/templateDir.esm.js +++ b/packages/cli-plugin-typeorm/scripts/templateDir.esm.js @@ -1,5 +1,6 @@ -import {getTemplateDirectory} from "@tsed/cli-core"; import path from "node:path"; import {fileURLToPath} from "node:url"; +import {getTemplateDirectory} from "@tsed/cli-core"; + export const TEMPLATE_DIR = getTemplateDirectory(path.dirname(fileURLToPath(import.meta.url))); diff --git a/packages/cli-plugin-typeorm/src/CliPluginTypeORMModule.ts b/packages/cli-plugin-typeorm/src/CliPluginTypeORMModule.ts index e273218ba..02aaa0e6c 100644 --- a/packages/cli-plugin-typeorm/src/CliPluginTypeORMModule.ts +++ b/packages/cli-plugin-typeorm/src/CliPluginTypeORMModule.ts @@ -1,5 +1,6 @@ import {Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core"; import {Inject} from "@tsed/di"; + import {TypeORMGenerateHook} from "./hooks/TypeORMGenerateHook"; import {TypeORMInitHook} from "./hooks/TypeORMInitHook"; diff --git a/packages/cli-plugin-typeorm/src/hooks/TypeORMGenerateHook.ts b/packages/cli-plugin-typeorm/src/hooks/TypeORMGenerateHook.ts index a230f3362..d45ed8e1d 100644 --- a/packages/cli-plugin-typeorm/src/hooks/TypeORMGenerateHook.ts +++ b/packages/cli-plugin-typeorm/src/hooks/TypeORMGenerateHook.ts @@ -2,6 +2,7 @@ import {FeaturesMap, GenerateCmdContext, ProvidersInfoService} from "@tsed/cli"; import {CliDockerComposeYaml, Inject, OnExec, OnPrompt, ProjectPackageJson, SrcRendererService, Tasks} from "@tsed/cli-core"; import {Injectable} from "@tsed/di"; import {camelCase} from "change-case"; + import {TEMPLATE_DIR} from "../utils/templateDir"; export interface TypeORMGenerateOptions extends GenerateCmdContext { diff --git a/packages/cli-plugin-typeorm/src/index.ts b/packages/cli-plugin-typeorm/src/index.ts index c9ba885f2..e84d29e06 100644 --- a/packages/cli-plugin-typeorm/src/index.ts +++ b/packages/cli-plugin-typeorm/src/index.ts @@ -1,7 +1,7 @@ import {CliPluginTypeORMModule} from "./CliPluginTypeORMModule"; -export * from "./hooks/TypeORMInitHook"; export * from "./hooks/TypeORMGenerateHook"; +export * from "./hooks/TypeORMInitHook"; export * from "./utils/templateDir"; export default CliPluginTypeORMModule; diff --git a/packages/cli-plugin-typeorm/test/integrations/generate/generate.controller.integration.spec.ts b/packages/cli-plugin-typeorm/test/integrations/generate/generate.controller.integration.spec.ts index b222543bc..f84d7a208 100644 --- a/packages/cli-plugin-typeorm/test/integrations/generate/generate.controller.integration.spec.ts +++ b/packages/cli-plugin-typeorm/test/integrations/generate/generate.controller.integration.spec.ts @@ -1,6 +1,7 @@ +import "../../../src"; + import {GenerateCmd, TEMPLATE_DIR} from "@tsed/cli"; import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; -import "../../../src"; describe("Generate DataSource", () => { beforeEach(() => diff --git a/packages/cli-plugin-typeorm/test/integrations/init/init.integration.spec.ts b/packages/cli-plugin-typeorm/test/integrations/init/init.integration.spec.ts index b6baa8315..7ba264a13 100644 --- a/packages/cli-plugin-typeorm/test/integrations/init/init.integration.spec.ts +++ b/packages/cli-plugin-typeorm/test/integrations/init/init.integration.spec.ts @@ -1,7 +1,8 @@ +import "../../../src"; + +import {ArchitectureConvention, FeatureType, InitCmd, PlatformType, ProjectConvention, TEMPLATE_DIR} from "@tsed/cli"; import {PackageManager} from "@tsed/cli-core"; import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; -import {ArchitectureConvention, FeatureType, InitCmd, PlatformType, ProjectConvention, TEMPLATE_DIR} from "@tsed/cli"; -import "../../../src"; describe("TypeORM: Init cmd", () => { beforeEach(() => { diff --git a/packages/cli-plugin-vitest/scripts/templateDir.esm.js b/packages/cli-plugin-vitest/scripts/templateDir.esm.js index e6cd43d32..7fa172434 100644 --- a/packages/cli-plugin-vitest/scripts/templateDir.esm.js +++ b/packages/cli-plugin-vitest/scripts/templateDir.esm.js @@ -1,5 +1,6 @@ -import {getTemplateDirectory} from "@tsed/cli-core"; import path from "node:path"; import {fileURLToPath} from "node:url"; +import {getTemplateDirectory} from "@tsed/cli-core"; + export const TEMPLATE_DIR = getTemplateDirectory(path.dirname(fileURLToPath(import.meta.url))); diff --git a/packages/cli-plugin-vitest/src/CliPluginVitestModule.ts b/packages/cli-plugin-vitest/src/CliPluginVitestModule.ts index 919a74e3e..be3fd40fa 100644 --- a/packages/cli-plugin-vitest/src/CliPluginVitestModule.ts +++ b/packages/cli-plugin-vitest/src/CliPluginVitestModule.ts @@ -1,6 +1,7 @@ -import {Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core"; import {RuntimesModule} from "@tsed/cli"; +import {Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core"; import {Inject} from "@tsed/di"; + import {VitestGenerateHook} from "./hooks/VitestGenerateHook"; import {VitestInitHook} from "./hooks/VitestInitHook"; diff --git a/packages/cli-plugin-vitest/src/hooks/VitestGenerateHook.ts b/packages/cli-plugin-vitest/src/hooks/VitestGenerateHook.ts index 1fd683b22..0653e9d34 100644 --- a/packages/cli-plugin-vitest/src/hooks/VitestGenerateHook.ts +++ b/packages/cli-plugin-vitest/src/hooks/VitestGenerateHook.ts @@ -1,6 +1,6 @@ import {GenerateCmdContext} from "@tsed/cli"; -import normalizePath from "normalize-path"; import {Inject, Injectable, OnExec, SrcRendererService, Tasks} from "@tsed/cli-core"; +import normalizePath from "normalize-path"; import {TEMPLATE_DIR} from "../utils/templateDir"; diff --git a/packages/cli-plugin-vitest/src/hooks/VitestInitHook.ts b/packages/cli-plugin-vitest/src/hooks/VitestInitHook.ts index bb5851b6a..5400d193d 100644 --- a/packages/cli-plugin-vitest/src/hooks/VitestInitHook.ts +++ b/packages/cli-plugin-vitest/src/hooks/VitestInitHook.ts @@ -7,6 +7,7 @@ import { ScriptsRendererService, SrcRendererService } from "@tsed/cli-core"; + import {TEMPLATE_DIR} from "../utils/templateDir"; @Injectable() diff --git a/packages/cli-plugin-vitest/test/integrations/generate/generate.controller.integration.spec.ts b/packages/cli-plugin-vitest/test/integrations/generate/generate.controller.integration.spec.ts index 9e7165adc..6b0f3f2a8 100644 --- a/packages/cli-plugin-vitest/test/integrations/generate/generate.controller.integration.spec.ts +++ b/packages/cli-plugin-vitest/test/integrations/generate/generate.controller.integration.spec.ts @@ -1,7 +1,8 @@ +import "../../../src"; + import {GenerateCmd, TEMPLATE_DIR} from "@tsed/cli"; import {CliService, ProjectPackageJson} from "@tsed/cli-core"; import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; -import "../../../src"; describe("Generate Controller", () => { beforeEach(() => diff --git a/packages/cli-testing/src/CliPlatformTest.ts b/packages/cli-testing/src/CliPlatformTest.ts index 59831a654..9d9f4b2ce 100644 --- a/packages/cli-testing/src/CliPlatformTest.ts +++ b/packages/cli-testing/src/CliPlatformTest.ts @@ -14,11 +14,12 @@ import { TokenProvider } from "@tsed/cli-core"; import {Type} from "@tsed/core"; +import {DIContext, runInContext} from "@tsed/di"; +import {v4} from "uuid"; + import {FakeCliExeca} from "./FakeCliExeca"; import {FakeCliFs} from "./FakeCliFs"; import {FakeCliHttpClient} from "./FakeCliHttpClient"; -import {DIContext, runInContext} from "@tsed/di"; -import {v4} from "uuid"; export interface InvokeOptions { token: TokenProvider; diff --git a/packages/cli-testing/src/FakeCliExeca.ts b/packages/cli-testing/src/FakeCliExeca.ts index 844a10c32..485522244 100644 --- a/packages/cli-testing/src/FakeCliExeca.ts +++ b/packages/cli-testing/src/FakeCliExeca.ts @@ -4,7 +4,6 @@ import {Observable} from "rxjs"; export class FakeCliExeca extends CliExeca { static entries = new Map(); - // eslint-disable-next-line @typescript-eslint/no-unused-vars run(cmd: string, args: string[], opts?: any): any { const result = FakeCliExeca.entries.get(cmd + " " + args.join(" ")); @@ -14,7 +13,6 @@ export class FakeCliExeca extends CliExeca { }); } - // eslint-disable-next-line @typescript-eslint/no-unused-vars getAsync(cmd: string, args: string[], opts?: any): Promise { if (["npm"].includes(cmd) && args.includes("view")) { return Promise.resolve( @@ -29,7 +27,6 @@ export class FakeCliExeca extends CliExeca { return Promise.resolve(FakeCliExeca.entries.get(cmd + " " + args.join(" "))); } - // eslint-disable-next-line @typescript-eslint/no-unused-vars runSync(cmd: string, args: string[], opts?: any): any { return { stdout: FakeCliExeca.entries.get(cmd + " " + args.join(" ")) diff --git a/packages/cli-testing/src/FakeCliFs.ts b/packages/cli-testing/src/FakeCliFs.ts index 167174d09..9296b36a3 100644 --- a/packages/cli-testing/src/FakeCliFs.ts +++ b/packages/cli-testing/src/FakeCliFs.ts @@ -1,8 +1,9 @@ +import {isString} from "@tsed/core"; import * as fs from "fs"; import {PathLike} from "fs"; import {EnsureOptions, WriteFileOptions} from "fs-extra"; + import {normalizePath} from "./normalizePath"; -import {isString} from "@tsed/core"; export class FakeCliFs { static entries = new Map(); @@ -11,7 +12,6 @@ export class FakeCliFs { return normalizePath(Array.from(FakeCliFs.entries.keys()).sort((a, b) => (a < b ? -1 : 1))); } - // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore findUpFile() { return null; @@ -21,12 +21,10 @@ export class FakeCliFs { return FakeCliFs.entries.has(normalizePath(path)); } - // eslint-disable-next-line @typescript-eslint/no-unused-vars readFile(file: string | Buffer | number, encoding?: any): Promise { return Promise.resolve(FakeCliFs.entries.get(normalizePath(file))!); } - // eslint-disable-next-line @typescript-eslint/no-unused-vars readFileSync(file: string | Buffer | number, encoding?: any): string { try { if (isString(file) && file.match(/_partials/)) { @@ -49,23 +47,19 @@ export class FakeCliFs { return content ? JSON.parse(content) : {}; } - // eslint-disable-next-line @typescript-eslint/no-unused-vars writeFileSync(path: PathLike | number, data: any, options?: WriteFileOptions): void { FakeCliFs.entries.set(normalizePath(path), data); } - // eslint-disable-next-line @typescript-eslint/no-unused-vars writeFile(file: string | Buffer | number, data: any, options?: WriteFileOptions | string): void { FakeCliFs.entries.set(normalizePath(file), data); } - // eslint-disable-next-line @typescript-eslint/no-unused-vars ensureDir(path: string, options?: EnsureOptions | number): Promise { FakeCliFs.entries.set(normalizePath(path), path); return Promise.resolve(); } - // eslint-disable-next-line @typescript-eslint/no-unused-vars ensureDirSync(path: string, options?: EnsureOptions | number) { FakeCliFs.entries.set(normalizePath(path), path); } diff --git a/packages/cli/scripts/index.esm.js b/packages/cli/scripts/index.esm.js index 041b0a4f2..96073bdf0 100644 --- a/packages/cli/scripts/index.esm.js +++ b/packages/cli/scripts/index.esm.js @@ -1,9 +1,10 @@ -import { dirname, join } from "path"; +import {fileURLToPath} from "node:url"; + +import {dirname, join} from "path"; import readPkgUp from "read-pkg-up"; -import { fileURLToPath } from "node:url"; -const { path, packageJson } = readPkgUp.sync({ - cwd: join(fileURLToPath(import.meta.url), "..", "..") +const {path, packageJson} = readPkgUp.sync({ + cwd: join(fileURLToPath(import.meta.url), "..", "..") }); export const PKG = packageJson; export const MINIMAL_TSED_VERSION = "7"; diff --git a/packages/cli/src/Cli.ts b/packages/cli/src/Cli.ts index 172042668..fd6e1397e 100644 --- a/packages/cli/src/Cli.ts +++ b/packages/cli/src/Cli.ts @@ -1,10 +1,10 @@ import {CliCore} from "@tsed/cli-core"; import chalk from "chalk"; -// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore import alias from "module-alias"; -import {PKG, TEMPLATE_DIR} from "./constants"; + import commands from "./commands"; +import {PKG, TEMPLATE_DIR} from "./constants"; import {ArchitectureConvention, ProjectConvention} from "./interfaces"; export class Cli extends CliCore { diff --git a/packages/cli/src/commands/add/AddCmd.ts b/packages/cli/src/commands/add/AddCmd.ts index 1ab3b95ce..f5c01ffa4 100644 --- a/packages/cli/src/commands/add/AddCmd.ts +++ b/packages/cli/src/commands/add/AddCmd.ts @@ -1,4 +1,3 @@ -import {Inject} from "@tsed/di"; import { CliDefaultOptions, CliPlugins, @@ -10,6 +9,7 @@ import { QuestionOptions, Task } from "@tsed/cli-core"; +import {Inject} from "@tsed/di"; export interface AddCmdOptions extends CliDefaultOptions { name: string; diff --git a/packages/cli/src/commands/generate/GenerateCmd.spec.ts b/packages/cli/src/commands/generate/GenerateCmd.spec.ts index 07a745831..44ca28a6c 100644 --- a/packages/cli/src/commands/generate/GenerateCmd.spec.ts +++ b/packages/cli/src/commands/generate/GenerateCmd.spec.ts @@ -1,6 +1,7 @@ // @ts-ignore -import {CliPlatformTest} from "@tsed/cli-testing"; import {SrcRendererService} from "@tsed/cli-core"; +import {CliPlatformTest} from "@tsed/cli-testing"; + import {GenerateCmd} from "./GenerateCmd"; describe("GenerateCmd", () => { diff --git a/packages/cli/src/commands/generate/GenerateCmd.ts b/packages/cli/src/commands/generate/GenerateCmd.ts index 1f3b005b0..1c8acc5b1 100644 --- a/packages/cli/src/commands/generate/GenerateCmd.ts +++ b/packages/cli/src/commands/generate/GenerateCmd.ts @@ -1,15 +1,16 @@ import {CliDefaultOptions, Command, CommandProvider, Inject, ProjectPackageJson, SrcRendererService} from "@tsed/cli-core"; import {paramCase, pascalCase} from "change-case"; -import {basename, dirname, join} from "path"; import globby from "globby"; import normalizePath from "normalize-path"; +import {basename, dirname, join} from "path"; + +import {ProjectConvention} from "../../interfaces/ProjectConvention"; import {ClassNamePipe} from "../../pipes/ClassNamePipe"; import {OutputFilePathPipe} from "../../pipes/OutputFilePathPipe"; import {RoutePipe} from "../../pipes/RoutePipe"; import {ProvidersInfoService} from "../../services/ProvidersInfoService"; -import {PROVIDER_TYPES} from "./ProviderTypes"; -import {ProjectConvention} from "../../interfaces/ProjectConvention"; import {fillImports} from "../../utils/fillImports"; +import {PROVIDER_TYPES} from "./ProviderTypes"; export interface GenerateCmdContext extends CliDefaultOptions { type: string; diff --git a/packages/cli/src/commands/index.ts b/packages/cli/src/commands/index.ts index 29cd7f3a0..f6e03e94c 100644 --- a/packages/cli/src/commands/index.ts +++ b/packages/cli/src/commands/index.ts @@ -1,7 +1,7 @@ -import {InitCmd} from "./init/InitCmd"; -import {GenerateCmd} from "./generate/GenerateCmd"; -import {UpdateCmd} from "./update/UpdateCmd"; import {AddCmd} from "./add/AddCmd"; +import {GenerateCmd} from "./generate/GenerateCmd"; +import {InitCmd} from "./init/InitCmd"; import {RunCmd} from "./run/RunCmd"; +import {UpdateCmd} from "./update/UpdateCmd"; export default [AddCmd, InitCmd, GenerateCmd, UpdateCmd, RunCmd]; diff --git a/packages/cli/src/commands/init/InitCmd.spec.ts b/packages/cli/src/commands/init/InitCmd.spec.ts index 4ce21ffd0..4d68fcda3 100644 --- a/packages/cli/src/commands/init/InitCmd.spec.ts +++ b/packages/cli/src/commands/init/InitCmd.spec.ts @@ -1,8 +1,9 @@ -import {catchError} from "@tsed/core"; -import {InitCmd} from "../../../src/commands/init/InitCmd"; +import {PackageManagersModule} from "@tsed/cli-core"; // @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; -import {PackageManagersModule} from "@tsed/cli-core"; +import {catchError} from "@tsed/core"; + +import {InitCmd} from "../../../src/commands/init/InitCmd"; import {RuntimesModule} from "../../runtimes/RuntimesModule"; async function getServiceFixture() { @@ -106,7 +107,7 @@ describe("InitCmd", () => { expect(result?.message).toEqual("Invalid selected runtime: undefined. Possible values: node."); }); - it("should throw error (runtime)", async () => { + it("should throw error (runtime-2)", async () => { const {service, packageManagers} = await getServiceFixture(); packageManagers.list.mockReturnValue(["yarn", "npm", "pnpm"]); diff --git a/packages/cli/src/commands/init/InitCmd.ts b/packages/cli/src/commands/init/InitCmd.ts index 4a604842b..582036ceb 100644 --- a/packages/cli/src/commands/init/InitCmd.ts +++ b/packages/cli/src/commands/init/InitCmd.ts @@ -20,22 +20,23 @@ import { } from "@tsed/cli-core"; import {paramCase, pascalCase} from "change-case"; import {basename, join} from "path"; + import {DEFAULT_TSED_TAGS} from "../../constants"; +import {PlatformType} from "../../interfaces"; import {ArchitectureConvention} from "../../interfaces/ArchitectureConvention"; import {ProjectConvention} from "../../interfaces/ProjectConvention"; import {OutputFilePathPipe} from "../../pipes/OutputFilePathPipe"; -import {InitCmdContext} from "./interfaces/InitCmdContext"; -import {InitFileSchema} from "./config/InitFileSchema"; -import {mapToContext} from "./mappers/mapToContext"; +import {InitPlatformsModule} from "../../platforms/InitPlatformsModule"; +import {RuntimesModule} from "../../runtimes/RuntimesModule"; +import {BunRuntime} from "../../runtimes/supports/BunRuntime"; +import {NodeRuntime} from "../../runtimes/supports/NodeRuntime"; +import {fillImports} from "../../utils/fillImports"; import {FeaturesMap, FeatureType} from "./config/FeaturesPrompt"; +import {InitFileSchema} from "./config/InitFileSchema"; +import {InitCmdContext} from "./interfaces/InitCmdContext"; import {InitOptions} from "./interfaces/InitOptions"; +import {mapToContext} from "./mappers/mapToContext"; import {getFeaturesPrompt} from "./prompts/getFeaturesPrompt"; -import {PlatformType} from "../../interfaces"; -import {fillImports} from "../../utils/fillImports"; -import {RuntimesModule} from "../../runtimes/RuntimesModule"; -import {NodeRuntime} from "../../runtimes/supports/NodeRuntime"; -import {BunRuntime} from "../../runtimes/supports/BunRuntime"; -import {InitPlatformsModule} from "../../platforms/InitPlatformsModule"; @Command({ name: "init", diff --git a/packages/cli/src/commands/init/config/FeaturesPrompt.ts b/packages/cli/src/commands/init/config/FeaturesPrompt.ts index 922d26c23..d9a09a6a7 100644 --- a/packages/cli/src/commands/init/config/FeaturesPrompt.ts +++ b/packages/cli/src/commands/init/config/FeaturesPrompt.ts @@ -1,7 +1,7 @@ -import {isPlatform} from "../utils/isPlatform"; -import {hasFeature, hasValue} from "../utils/hasFeature"; -import {InitOptions} from "../interfaces/InitOptions"; import {ArchitectureConvention, PlatformType, ProjectConvention} from "../../../interfaces"; +import {InitOptions} from "../interfaces/InitOptions"; +import {hasFeature, hasValue} from "../utils/hasFeature"; +import {isPlatform} from "../utils/isPlatform"; export interface Feature { name: string; diff --git a/packages/cli/src/commands/init/config/InitFileSchema.ts b/packages/cli/src/commands/init/config/InitFileSchema.ts index 436d74f7c..bc5bf3d34 100644 --- a/packages/cli/src/commands/init/config/InitFileSchema.ts +++ b/packages/cli/src/commands/init/config/InitFileSchema.ts @@ -1,4 +1,5 @@ import {PackageManager} from "@tsed/cli-core"; + import {ArchitectureConvention, PlatformType, ProjectConvention} from "../../../interfaces"; import {FeatureType} from "./FeaturesPrompt"; diff --git a/packages/cli/src/commands/init/interfaces/InitCmdContext.ts b/packages/cli/src/commands/init/interfaces/InitCmdContext.ts index 92876ef7c..62a99f879 100644 --- a/packages/cli/src/commands/init/interfaces/InitCmdContext.ts +++ b/packages/cli/src/commands/init/interfaces/InitCmdContext.ts @@ -1,4 +1,5 @@ import {CliDefaultOptions} from "@tsed/cli-core"; + import {InitOptions} from "./InitOptions"; export interface InitCmdContext extends InitOptions, CliDefaultOptions, Record { diff --git a/packages/cli/src/commands/init/interfaces/InitOptions.ts b/packages/cli/src/commands/init/interfaces/InitOptions.ts index e975c25f2..4461c6cf0 100644 --- a/packages/cli/src/commands/init/interfaces/InitOptions.ts +++ b/packages/cli/src/commands/init/interfaces/InitOptions.ts @@ -1,6 +1,7 @@ import {PackageManager} from "@tsed/cli-core"; -import {PlatformType} from "../../../interfaces/PlatformType"; + import {ArchitectureConvention} from "../../../interfaces/ArchitectureConvention"; +import {PlatformType} from "../../../interfaces/PlatformType"; import {ProjectConvention} from "../../../interfaces/ProjectConvention"; import {FeatureType} from "../config/FeaturesPrompt"; diff --git a/packages/cli/src/commands/init/interfaces/InitPromptAnswers.ts b/packages/cli/src/commands/init/interfaces/InitPromptAnswers.ts index aa767e571..e5a8ca38b 100644 --- a/packages/cli/src/commands/init/interfaces/InitPromptAnswers.ts +++ b/packages/cli/src/commands/init/interfaces/InitPromptAnswers.ts @@ -1,4 +1,5 @@ import {PackageManager} from "@tsed/cli-core"; + import {ArchitectureConvention, PlatformType, ProjectConvention} from "../../../interfaces"; export interface InitPromptAnswers { diff --git a/packages/cli/src/commands/init/mappers/mapToContext.spec.ts b/packages/cli/src/commands/init/mappers/mapToContext.spec.ts index 4b7066566..2eee1cdca 100644 --- a/packages/cli/src/commands/init/mappers/mapToContext.spec.ts +++ b/packages/cli/src/commands/init/mappers/mapToContext.spec.ts @@ -1,7 +1,8 @@ -import {ArchitectureConvention, PlatformType, ProjectConvention} from "../../../../src/index"; import {PackageManager} from "@tsed/cli-core"; -import {mapToContext} from "./mapToContext"; + +import {ArchitectureConvention, PlatformType, ProjectConvention} from "../../../../src/index"; import {FeatureType} from "../config/FeaturesPrompt"; +import {mapToContext} from "./mapToContext"; describe("mapToContext", () => { it("should map to final object", () => { diff --git a/packages/cli/src/commands/init/mappers/mapToContext.ts b/packages/cli/src/commands/init/mappers/mapToContext.ts index 77cf6d381..608f8aa4c 100644 --- a/packages/cli/src/commands/init/mappers/mapToContext.ts +++ b/packages/cli/src/commands/init/mappers/mapToContext.ts @@ -1,4 +1,5 @@ import {camelCase} from "change-case"; + import {InitCmdContext} from "../interfaces/InitCmdContext"; import {mapUniqFeatures} from "./mapUniqFeatures"; diff --git a/packages/cli/src/commands/init/mappers/mapUniqFeatures.ts b/packages/cli/src/commands/init/mappers/mapUniqFeatures.ts index 1a16fba4f..9453116ba 100644 --- a/packages/cli/src/commands/init/mappers/mapUniqFeatures.ts +++ b/packages/cli/src/commands/init/mappers/mapUniqFeatures.ts @@ -1,6 +1,6 @@ -import {InitPromptAnswers} from "../interfaces/InitPromptAnswers"; -import {InitOptions} from "../interfaces/InitOptions"; import {FeatureType} from "../config/FeaturesPrompt"; +import {InitOptions} from "../interfaces/InitOptions"; +import {InitPromptAnswers} from "../interfaces/InitPromptAnswers"; export function mapUniqFeatures(answers: InitPromptAnswers & any): InitOptions { const features: string[] = []; diff --git a/packages/cli/src/commands/init/prompts/getFeaturesPrompt.ts b/packages/cli/src/commands/init/prompts/getFeaturesPrompt.ts index fddc68f13..dda1b7dd2 100644 --- a/packages/cli/src/commands/init/prompts/getFeaturesPrompt.ts +++ b/packages/cli/src/commands/init/prompts/getFeaturesPrompt.ts @@ -1,4 +1,5 @@ import {cleanObject, isFunction} from "@tsed/core"; + import {FeaturesMap, FeaturesPrompt} from "../config/FeaturesPrompt"; import {InitOptions} from "../interfaces/InitOptions"; diff --git a/packages/cli/src/commands/run/RunCmd.spec.ts b/packages/cli/src/commands/run/RunCmd.spec.ts index 0c58d4ee7..1d3f19198 100644 --- a/packages/cli/src/commands/run/RunCmd.spec.ts +++ b/packages/cli/src/commands/run/RunCmd.spec.ts @@ -1,7 +1,8 @@ // @ts-ignore +import {CliFs, CliRunScript} from "@tsed/cli-core"; import {CliPlatformTest} from "@tsed/cli-testing"; + import {RunCmd} from "./RunCmd"; -import {CliFs, CliRunScript} from "@tsed/cli-core"; describe("RunCmd", () => { beforeEach(() => CliPlatformTest.create()); diff --git a/packages/cli/src/commands/run/RunCmd.ts b/packages/cli/src/commands/run/RunCmd.ts index fa44729f0..3d5104a2f 100644 --- a/packages/cli/src/commands/run/RunCmd.ts +++ b/packages/cli/src/commands/run/RunCmd.ts @@ -1,4 +1,4 @@ -import {CliFs, CliRunScript, Command, CommandProvider, ProjectPackageJson, Tasks, normalizePath} from "@tsed/cli-core"; +import {CliFs, CliRunScript, Command, CommandProvider, normalizePath, ProjectPackageJson, Tasks} from "@tsed/cli-core"; import {Inject} from "@tsed/di"; import {join} from "path"; diff --git a/packages/cli/src/commands/update/UpdateCmd.spec.ts b/packages/cli/src/commands/update/UpdateCmd.spec.ts index a672e5e05..20802cdfc 100644 --- a/packages/cli/src/commands/update/UpdateCmd.spec.ts +++ b/packages/cli/src/commands/update/UpdateCmd.spec.ts @@ -1,6 +1,7 @@ import {NpmRegistryClient, ProjectPackageJson} from "@tsed/cli-core"; // @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; + import {UpdateCmd} from "./UpdateCmd"; const versions = { @@ -27,7 +28,6 @@ describe("UpdateCmd", () => { describe("$prompt()", () => { it("should return prompts", async () => { const projectPkg = CliPlatformTest.get(ProjectPackageJson); - // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore projectPkg.raw = { name: "project", @@ -130,7 +130,6 @@ describe("UpdateCmd", () => { } ]); - // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore command.versions = versions; diff --git a/packages/cli/src/commands/update/UpdateCmd.ts b/packages/cli/src/commands/update/UpdateCmd.ts index 128e9e571..4ac9f47c3 100644 --- a/packages/cli/src/commands/update/UpdateCmd.ts +++ b/packages/cli/src/commands/update/UpdateCmd.ts @@ -13,6 +13,7 @@ import { } from "@tsed/cli-core"; import {getValue} from "@tsed/core"; import semver from "semver"; + import {IGNORE_TAGS, IGNORE_VERSIONS, MINIMAL_TSED_VERSION} from "../../constants"; export interface UpdateCmdContext extends CliDefaultOptions { diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts index 6ed27b81b..3cd15d969 100644 --- a/packages/cli/src/index.ts +++ b/packages/cli/src/index.ts @@ -1,15 +1,15 @@ +export * from "./Cli"; export * from "./commands/add/AddCmd"; +export * from "./commands/generate/GenerateCmd"; +export * from "./commands/init/config/FeaturesPrompt"; +export * from "./commands/init/config/FeaturesPrompt"; export * from "./commands/init/InitCmd"; export * from "./commands/init/interfaces/InitCmdContext"; export * from "./commands/init/interfaces/InitOptions"; -export * from "./commands/init/config/FeaturesPrompt"; -export * from "./commands/init/config/FeaturesPrompt"; -export * from "./commands/generate/GenerateCmd"; -export * from "./commands/update/UpdateCmd"; export * from "./commands/init/prompts/getFeaturesPrompt"; -export * from "./runtimes/index"; +export * from "./commands/update/UpdateCmd"; +export * from "./constants"; export * from "./interfaces"; -export * from "./services/ProvidersInfoService"; export * from "./pipes"; -export * from "./constants"; -export * from "./Cli"; +export * from "./runtimes/index"; +export * from "./services/ProvidersInfoService"; diff --git a/packages/cli/src/interfaces/index.ts b/packages/cli/src/interfaces/index.ts index f3f2bb0f6..4fdd9cf89 100644 --- a/packages/cli/src/interfaces/index.ts +++ b/packages/cli/src/interfaces/index.ts @@ -1,3 +1,3 @@ -export * from "./ProjectConvention"; -export * from "./PlatformType"; export * from "./ArchitectureConvention"; +export * from "./PlatformType"; +export * from "./ProjectConvention"; diff --git a/packages/cli/src/pipes/ClassNamePipe.spec.ts b/packages/cli/src/pipes/ClassNamePipe.spec.ts index 2e23b6a33..0633d15d7 100644 --- a/packages/cli/src/pipes/ClassNamePipe.spec.ts +++ b/packages/cli/src/pipes/ClassNamePipe.spec.ts @@ -1,6 +1,6 @@ +import {ProjectConvention} from "../interfaces"; import {ProvidersInfoService} from "../services/ProvidersInfoService"; import {ClassNamePipe} from "./ClassNamePipe"; -import {ProjectConvention} from "../interfaces"; describe("ClassNamePipe", () => { it("should return the className", () => { diff --git a/packages/cli/src/pipes/ClassNamePipe.ts b/packages/cli/src/pipes/ClassNamePipe.ts index 433e63e99..e3e0d3793 100644 --- a/packages/cli/src/pipes/ClassNamePipe.ts +++ b/packages/cli/src/pipes/ClassNamePipe.ts @@ -2,8 +2,9 @@ import {Injectable, ProjectPackageJson} from "@tsed/cli-core"; import {Inject} from "@tsed/di"; import {paramCase, pascalCase} from "change-case"; import {basename} from "path"; -import {ProvidersInfoService} from "../services/ProvidersInfoService"; + import {ProjectConvention} from "../interfaces/ProjectConvention"; +import {ProvidersInfoService} from "../services/ProvidersInfoService"; @Injectable() export class ClassNamePipe { diff --git a/packages/cli/src/pipes/OutputFilePathPipe.spec.ts b/packages/cli/src/pipes/OutputFilePathPipe.spec.ts index 03131465b..e475ed471 100644 --- a/packages/cli/src/pipes/OutputFilePathPipe.spec.ts +++ b/packages/cli/src/pipes/OutputFilePathPipe.spec.ts @@ -1,9 +1,10 @@ -import {ArchitectureConvention} from "./../interfaces/ArchitectureConvention"; +// @ts-ignore +import {normalizePath} from "@tsed/cli-testing"; + import {ProvidersInfoService} from "../services/ProvidersInfoService"; +import {ArchitectureConvention} from "./../interfaces/ArchitectureConvention"; import {ClassNamePipe} from "./ClassNamePipe"; import {OutputFilePathPipe} from "./OutputFilePathPipe"; -// @ts-ignore -import {normalizePath} from "@tsed/cli-testing"; describe("OutputFilePathPipe", () => { describe("Ts.ED architecture", () => { diff --git a/packages/cli/src/pipes/OutputFilePathPipe.ts b/packages/cli/src/pipes/OutputFilePathPipe.ts index 736facf59..2c38e8201 100644 --- a/packages/cli/src/pipes/OutputFilePathPipe.ts +++ b/packages/cli/src/pipes/OutputFilePathPipe.ts @@ -1,9 +1,10 @@ import {Injectable, ProjectPackageJson} from "@tsed/cli-core"; import {Inject} from "@tsed/di"; import {dirname, join} from "path"; + +import {ArchitectureConvention, ProjectConvention} from "../interfaces"; import {ProvidersInfoService} from "../services/ProvidersInfoService"; import {ClassNamePipe} from "./ClassNamePipe"; -import {ProjectConvention, ArchitectureConvention} from "../interfaces"; @Injectable() export class OutputFilePathPipe { diff --git a/packages/cli/src/platforms/InitPlatformsModule.ts b/packages/cli/src/platforms/InitPlatformsModule.ts index bd610d8a8..5df3a304b 100644 --- a/packages/cli/src/platforms/InitPlatformsModule.ts +++ b/packages/cli/src/platforms/InitPlatformsModule.ts @@ -1,8 +1,9 @@ +import {Inject} from "@tsed/cli-core"; import {Module} from "@tsed/di"; + +import {InitBasePlatform} from "./supports/InitBasePlatform"; import {InitExpressPlatform} from "./supports/InitExpressPlatform"; import {InitKoaPlatform} from "./supports/InitKoaPlatform"; -import {InitBasePlatform} from "./supports/InitBasePlatform"; -import {Inject} from "@tsed/cli-core"; @Module({ imports: [InitExpressPlatform, InitKoaPlatform] diff --git a/packages/cli/src/platforms/supports/InitExpressPlatform.ts b/packages/cli/src/platforms/supports/InitExpressPlatform.ts index 8d2c28fb4..6e28a2099 100644 --- a/packages/cli/src/platforms/supports/InitExpressPlatform.ts +++ b/packages/cli/src/platforms/supports/InitExpressPlatform.ts @@ -1,4 +1,5 @@ import {Injectable} from "@tsed/cli-core"; + import {InitBasePlatform} from "./InitBasePlatform"; @Injectable({ diff --git a/packages/cli/src/platforms/supports/InitKoaPlatform.ts b/packages/cli/src/platforms/supports/InitKoaPlatform.ts index 3a0a12096..863bc79c4 100644 --- a/packages/cli/src/platforms/supports/InitKoaPlatform.ts +++ b/packages/cli/src/platforms/supports/InitKoaPlatform.ts @@ -1,4 +1,5 @@ import {Injectable} from "@tsed/cli-core"; + import {InitBasePlatform} from "./InitBasePlatform"; @Injectable({ diff --git a/packages/cli/src/runtimes/RuntimesModule.ts b/packages/cli/src/runtimes/RuntimesModule.ts index 0d79db780..ffbc14ec5 100644 --- a/packages/cli/src/runtimes/RuntimesModule.ts +++ b/packages/cli/src/runtimes/RuntimesModule.ts @@ -1,11 +1,12 @@ import {PackageManagersModule, ProjectPackageJson} from "@tsed/cli-core"; import {Inject, Module} from "@tsed/di"; -import {NodeRuntime} from "./supports/NodeRuntime"; + import {BabelRuntime} from "./supports/BabelRuntime"; -import {WebpackRuntime} from "./supports/WebpackRuntime"; +import {BaseRuntime} from "./supports/BaseRuntime"; import {BunRuntime} from "./supports/BunRuntime"; +import {NodeRuntime} from "./supports/NodeRuntime"; import {SWCRuntime} from "./supports/SWCRuntime"; -import {BaseRuntime} from "./supports/BaseRuntime"; +import {WebpackRuntime} from "./supports/WebpackRuntime"; export interface RuntimeInitOptions extends Record { runtime?: string; diff --git a/packages/cli/src/runtimes/supports/BabelRuntime.ts b/packages/cli/src/runtimes/supports/BabelRuntime.ts index b2e53bdd2..7e4f506f5 100644 --- a/packages/cli/src/runtimes/supports/BabelRuntime.ts +++ b/packages/cli/src/runtimes/supports/BabelRuntime.ts @@ -1,7 +1,8 @@ import {Injectable} from "@tsed/di"; -import {NodeRuntime} from "./NodeRuntime"; import {dirname} from "path"; +import {NodeRuntime} from "./NodeRuntime"; + @Injectable({ type: "runtime" }) diff --git a/packages/cli/src/runtimes/supports/BaseRuntime.ts b/packages/cli/src/runtimes/supports/BaseRuntime.ts index 9fa82b56f..e56cca762 100644 --- a/packages/cli/src/runtimes/supports/BaseRuntime.ts +++ b/packages/cli/src/runtimes/supports/BaseRuntime.ts @@ -1,5 +1,5 @@ -import {Inject} from "@tsed/di"; import {CliExeca, PackageManagersModule} from "@tsed/cli-core"; +import {Inject} from "@tsed/di"; export abstract class BaseRuntime { abstract readonly name: string; diff --git a/packages/cli/src/runtimes/supports/BunRuntime.ts b/packages/cli/src/runtimes/supports/BunRuntime.ts index a28f599c5..dcb3fe16a 100644 --- a/packages/cli/src/runtimes/supports/BunRuntime.ts +++ b/packages/cli/src/runtimes/supports/BunRuntime.ts @@ -1,6 +1,7 @@ -import {BaseRuntime} from "./BaseRuntime"; import {Injectable} from "@tsed/di"; +import {BaseRuntime} from "./BaseRuntime"; + @Injectable({ type: "runtime" }) diff --git a/packages/cli/src/runtimes/supports/NodeRuntime.ts b/packages/cli/src/runtimes/supports/NodeRuntime.ts index 2924bb050..0e2fb8376 100644 --- a/packages/cli/src/runtimes/supports/NodeRuntime.ts +++ b/packages/cli/src/runtimes/supports/NodeRuntime.ts @@ -1,6 +1,7 @@ -import {BaseRuntime} from "./BaseRuntime"; import {Injectable} from "@tsed/di"; +import {BaseRuntime} from "./BaseRuntime"; + @Injectable({ type: "runtime" }) diff --git a/packages/cli/src/runtimes/supports/SWCRuntime.ts b/packages/cli/src/runtimes/supports/SWCRuntime.ts index c7fc1d42f..030f49f7c 100644 --- a/packages/cli/src/runtimes/supports/SWCRuntime.ts +++ b/packages/cli/src/runtimes/supports/SWCRuntime.ts @@ -1,4 +1,5 @@ import {Injectable} from "@tsed/di"; + import {NodeRuntime} from "./NodeRuntime"; @Injectable({ diff --git a/packages/cli/src/runtimes/supports/WebpackRuntime.ts b/packages/cli/src/runtimes/supports/WebpackRuntime.ts index 928a321aa..ccb22e9da 100644 --- a/packages/cli/src/runtimes/supports/WebpackRuntime.ts +++ b/packages/cli/src/runtimes/supports/WebpackRuntime.ts @@ -1,5 +1,6 @@ -import {dirname} from "path"; import {Injectable} from "@tsed/di"; +import {dirname} from "path"; + import {BabelRuntime} from "./BabelRuntime"; @Injectable({ diff --git a/packages/cli/src/utils/fillImport.spec.ts b/packages/cli/src/utils/fillImport.spec.ts index 9aa8f2cb5..fe9fe66b6 100644 --- a/packages/cli/src/utils/fillImport.spec.ts +++ b/packages/cli/src/utils/fillImport.spec.ts @@ -74,7 +74,7 @@ describe("fillImports()", () => { mongoose: true } ])( - "it should return barrels and imports files for ($architecture, oidc: $oidc, graphql: $graphql, swagger: $swagger, passportjs: $passportjs, express: $express, koa: $koa, mongoose: $mongoose)", + "should return barrels and imports files for ($architecture, oidc: $oidc, graphql: $graphql, swagger: $swagger, passportjs: $passportjs, express: $express, koa: $koa, mongoose: $mongoose)", (ctx) => { expect(fillImports(ctx)).toMatchSnapshot(); } diff --git a/packages/cli/test/integrations/generate/generate.async-factory.integration.spec.ts b/packages/cli/test/integrations/generate/generate.async-factory.integration.spec.ts index b10d8f90d..9f2d49828 100644 --- a/packages/cli/test/integrations/generate/generate.async-factory.integration.spec.ts +++ b/packages/cli/test/integrations/generate/generate.async-factory.integration.spec.ts @@ -1,4 +1,5 @@ import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; + import {GenerateCmd, TEMPLATE_DIR} from "../../../src"; describe("Generate AsyncFactory", () => { @@ -30,7 +31,7 @@ describe("Generate AsyncFactory", () => { const result = FakeCliFs.entries.get("project-name/src/services/Test.ts"); - expect(result).toContain("import {Configuration, Inject, registerProvider} from \"@tsed/di\";"); + expect(result).toContain('import {Configuration, Inject, registerProvider} from "@tsed/di";'); expect(result).toContain("export function Test()"); expect(result).toContain("Inject(Test)"); expect(result).toContain("registerProvider"); diff --git a/packages/cli/test/integrations/generate/generate.controller.integration.spec.ts b/packages/cli/test/integrations/generate/generate.controller.integration.spec.ts index 14b5a3a06..3cc1a2117 100644 --- a/packages/cli/test/integrations/generate/generate.controller.integration.spec.ts +++ b/packages/cli/test/integrations/generate/generate.controller.integration.spec.ts @@ -1,5 +1,6 @@ import {CliService, ProjectPackageJson} from "@tsed/cli-core"; import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; + import {GenerateCmd, TEMPLATE_DIR} from "../../../src"; describe("Generate Controller", () => { @@ -31,9 +32,9 @@ describe("Generate Controller", () => { expect(FakeCliFs.getKeys()).toEqual(["project-name/src/controllers", "project-name/src/controllers/TestController.ts"]); const result = FakeCliFs.entries.get("project-name/src/controllers/TestController.ts"); - expect(result).toContain("import {Controller} from \"@tsed/di\";"); - expect(result).toContain("import {Get} from \"@tsed/schema\";"); - expect(result).toContain("@Controller(\"/tests\")"); + expect(result).toContain('import {Controller} from "@tsed/di";'); + expect(result).toContain('import {Get} from "@tsed/schema";'); + expect(result).toContain('@Controller("/tests")'); expect(result).toContain("TestController"); }); it("should generate the template with the right options (complex path)", async () => { @@ -56,9 +57,9 @@ describe("Generate Controller", () => { expect(FakeCliFs.getKeys()).toEqual(["project-name/src/controllers/users", "project-name/src/controllers/users/UserController.ts"]); const result = FakeCliFs.entries.get("project-name/src/controllers/users/UserController.ts"); - expect(result).toContain("import {Controller} from \"@tsed/di\";"); - expect(result).toContain("import {Get} from \"@tsed/schema\";"); - expect(result).toContain("@Controller(\"/users\")"); + expect(result).toContain('import {Controller} from "@tsed/di";'); + expect(result).toContain('import {Get} from "@tsed/schema";'); + expect(result).toContain('@Controller("/users")'); expect(result).toContain("UserController"); }); }); diff --git a/packages/cli/test/integrations/generate/generate.decorator-class.integration.spec.ts b/packages/cli/test/integrations/generate/generate.decorator-class.integration.spec.ts index 4d7296f52..900022273 100644 --- a/packages/cli/test/integrations/generate/generate.decorator-class.integration.spec.ts +++ b/packages/cli/test/integrations/generate/generate.decorator-class.integration.spec.ts @@ -1,5 +1,6 @@ import {CliService, ProjectPackageJson} from "@tsed/cli-core"; import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; + import {GenerateCmd, TEMPLATE_DIR} from "../../../src"; describe("Generate class decorator", () => { diff --git a/packages/cli/test/integrations/generate/generate.decorator-endpoint.integration.spec.ts b/packages/cli/test/integrations/generate/generate.decorator-endpoint.integration.spec.ts index 7fbda17d9..67f786064 100644 --- a/packages/cli/test/integrations/generate/generate.decorator-endpoint.integration.spec.ts +++ b/packages/cli/test/integrations/generate/generate.decorator-endpoint.integration.spec.ts @@ -1,6 +1,7 @@ import {CliService, ProjectPackageJson} from "@tsed/cli-core"; import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; import {resolve} from "path"; + import {GenerateCmd, TEMPLATE_DIR} from "../../../src"; describe("Generate endpoint decorator", () => { @@ -13,7 +14,7 @@ describe("Generate endpoint decorator", () => { afterEach(() => CliPlatformTest.reset()); it("should generate a template with the right options", async () => { - CliPlatformTest.setPackageJson({ + CliPlatformTest.setPackageJson({ name: "", version: "1.0.0", description: "", diff --git a/packages/cli/test/integrations/generate/generate.decorator-generic.integration.spec.ts b/packages/cli/test/integrations/generate/generate.decorator-generic.integration.spec.ts index d82d043d1..e072f6a48 100644 --- a/packages/cli/test/integrations/generate/generate.decorator-generic.integration.spec.ts +++ b/packages/cli/test/integrations/generate/generate.decorator-generic.integration.spec.ts @@ -1,7 +1,7 @@ import {CliService, ProjectPackageJson} from "@tsed/cli-core"; import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; -import {GenerateCmd, TEMPLATE_DIR} from "../../../src"; +import {GenerateCmd, TEMPLATE_DIR} from "../../../src"; describe("Generate generic decorator", () => { beforeEach(() => @@ -35,7 +35,7 @@ describe("Generate generic decorator", () => { const result = FakeCliFs.entries.get("project-name/src/decorators/Test.ts"); - expect(result).toContain("import {DecoratorTypes, UnsupportedDecoratorType, decoratorTypeOf} from \"@tsed/core\""); + expect(result).toContain('import {DecoratorTypes, UnsupportedDecoratorType, decoratorTypeOf} from "@tsed/core"'); expect(result).toContain("export interface TestOptions {"); expect(result).toContain("export function Test(options: TestOptions): any"); expect(result).toContain("(...args: DecoratorParameters): any =>"); diff --git a/packages/cli/test/integrations/generate/generate.decorator-method.integration.spec.ts b/packages/cli/test/integrations/generate/generate.decorator-method.integration.spec.ts index 12b6a723b..e38953a2d 100644 --- a/packages/cli/test/integrations/generate/generate.decorator-method.integration.spec.ts +++ b/packages/cli/test/integrations/generate/generate.decorator-method.integration.spec.ts @@ -1,5 +1,6 @@ import {CliService, ProjectPackageJson} from "@tsed/cli-core"; import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; + import {GenerateCmd, TEMPLATE_DIR} from "../../../src"; describe("Generate method decorator", () => { diff --git a/packages/cli/test/integrations/generate/generate.decorator-middleware.integration.spec.ts b/packages/cli/test/integrations/generate/generate.decorator-middleware.integration.spec.ts index 0815a644b..7c978bb46 100644 --- a/packages/cli/test/integrations/generate/generate.decorator-middleware.integration.spec.ts +++ b/packages/cli/test/integrations/generate/generate.decorator-middleware.integration.spec.ts @@ -1,5 +1,6 @@ import {CliService, ProjectPackageJson} from "@tsed/cli-core"; import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; + import {GenerateCmd, TEMPLATE_DIR} from "../../../src"; describe("Generate middleware decorator", () => { @@ -36,7 +37,7 @@ describe("Generate middleware decorator", () => { const result = FakeCliFs.entries.get("project-name/src/decorators/Test.ts"); - expect(result).toContain("import {useDecorators, StoreSet} from \"@tsed/core\""); + expect(result).toContain('import {useDecorators, StoreSet} from "@tsed/core"'); expect(result).toContain("export interface TestOptions {"); expect(result).toContain("@Middleware()"); expect(result).toContain("export function Test(options: TestOptions): MethodDecorator"); @@ -68,7 +69,7 @@ describe("Generate middleware decorator", () => { const result = FakeCliFs.entries.get("project-name/src/decorators/Test.ts"); - expect(result).toContain("import {useDecorators, StoreSet} from \"@tsed/core\""); + expect(result).toContain('import {useDecorators, StoreSet} from "@tsed/core"'); expect(result).toContain("export interface TestOptions {"); expect(result).toContain("@Middleware()"); expect(result).toContain("export function Test(options: TestOptions): MethodDecorator"); diff --git a/packages/cli/test/integrations/generate/generate.exception-filter.integration.spec.ts b/packages/cli/test/integrations/generate/generate.exception-filter.integration.spec.ts index 85adba81c..afcaa81e2 100644 --- a/packages/cli/test/integrations/generate/generate.exception-filter.integration.spec.ts +++ b/packages/cli/test/integrations/generate/generate.exception-filter.integration.spec.ts @@ -1,5 +1,6 @@ import {CliService, ProjectPackageJson} from "@tsed/cli-core"; import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; + import {GenerateCmd, TEMPLATE_DIR} from "../../../src"; describe("Generate Exception Filter", () => { @@ -33,8 +34,8 @@ describe("Generate Exception Filter", () => { const result = FakeCliFs.entries.get("project-name/src/filters/HttpExceptionFilter.ts"); - expect(result).toContain("import {BaseContext} from \"@tsed/di\";"); - expect(result).toContain("import {Catch, ExceptionFilterMethods} from \"@tsed/platform-exceptions\";"); + expect(result).toContain('import {BaseContext} from "@tsed/di";'); + expect(result).toContain('import {Catch, ExceptionFilterMethods} from "@tsed/platform-exceptions";'); expect(result).toContain("@Catch(Error)"); expect(result).toContain("export class HttpExceptionFilter implements ExceptionFilterMethods"); expect(result).toContain("catch(exception: Exception, ctx: BaseContext) {"); diff --git a/packages/cli/test/integrations/generate/generate.response-filter.integration.spec.ts b/packages/cli/test/integrations/generate/generate.response-filter.integration.spec.ts index 02e4c764b..2dce14ac1 100644 --- a/packages/cli/test/integrations/generate/generate.response-filter.integration.spec.ts +++ b/packages/cli/test/integrations/generate/generate.response-filter.integration.spec.ts @@ -1,5 +1,6 @@ import {CliService, ProjectPackageJson} from "@tsed/cli-core"; import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; + import {GenerateCmd, TEMPLATE_DIR} from "../../../src"; describe("Generate Response Filter", () => { @@ -31,9 +32,9 @@ describe("Generate Response Filter", () => { const result = FakeCliFs.entries.get("project-name/src/filters/JsonResponseFilter.ts"); - expect(result).toContain("import {ResponseFilter, ResponseFilterMethods} from \"@tsed/platform-response-filter\";"); - expect(result).toContain("import {BaseContext} from \"@tsed/di\";"); - expect(result).toContain("@ResponseFilter(\"text/xml\")"); + expect(result).toContain('import {ResponseFilter, ResponseFilterMethods} from "@tsed/platform-response-filter";'); + expect(result).toContain('import {BaseContext} from "@tsed/di";'); + expect(result).toContain('@ResponseFilter("text/xml")'); expect(result).toContain("export class XmlResponseFilter implements ResponseFilterMethods"); expect(result).toContain("transform(data: any, ctx: BaseContext)"); }); diff --git a/packages/cli/test/integrations/init/init.integration.spec.ts b/packages/cli/test/integrations/init/init.integration.spec.ts index 73b645c05..6f237608c 100644 --- a/packages/cli/test/integrations/init/init.integration.spec.ts +++ b/packages/cli/test/integrations/init/init.integration.spec.ts @@ -2,9 +2,10 @@ import {PackageManager} from "@tsed/cli-core"; import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; import {ensureDirSync, writeFileSync} from "fs-extra"; import {join} from "path"; + import {ArchitectureConvention, InitCmd, ProjectConvention, TEMPLATE_DIR} from "../../../src"; -const dir = __dirname +const dir = __dirname; describe("Init cmd", () => { beforeEach(() => { @@ -65,9 +66,9 @@ describe("Init cmd", () => { `); const content = FakeCliFs.entries.get("project-name/src/Server.ts")!; - expect(content).toContain("import {Configuration, Inject} from \"@tsed/di\""); - expect(content).toContain("import \"@tsed/platform-express\""); - expect(content).toContain("import \"@tsed/ajv\""); + expect(content).toContain('import {Configuration, Inject} from "@tsed/di"'); + expect(content).toContain('import "@tsed/platform-express"'); + expect(content).toContain('import "@tsed/ajv"'); expect(content).toMatchSnapshot(); const pkg = JSON.parse(FakeCliFs.entries.get("project-name/package.json")!); @@ -115,7 +116,7 @@ describe("Init cmd", () => { expect(dockerFile).toContain("RUN yarn install --pure-lockfile"); const indexContent = FakeCliFs.entries.get("project-name/src/index.ts")!; - expect(indexContent).toContain("import {Server} from \"./Server\""); + expect(indexContent).toContain('import {Server} from "./Server"'); }); it("should generate a project with swagger", async () => { CliPlatformTest.setPackageJson({ @@ -169,10 +170,10 @@ describe("Init cmd", () => { const content = FakeCliFs.entries.get("project-name/src/Server.ts")!; - expect(content).toContain("import {Configuration, Inject} from \"@tsed/di\""); - expect(content).toContain("import \"@tsed/platform-express\""); - expect(content).toContain("import \"@tsed/ajv\""); - expect(content).toContain("import * as pages from \"./controllers/pages/index\""); + expect(content).toContain('import {Configuration, Inject} from "@tsed/di"'); + expect(content).toContain('import "@tsed/platform-express"'); + expect(content).toContain('import "@tsed/ajv"'); + expect(content).toContain('import * as pages from "./controllers/pages/index"'); expect(content).toMatchSnapshot(); const pkg = JSON.parse(FakeCliFs.entries.get("project-name/package.json")!); @@ -260,9 +261,9 @@ describe("Init cmd", () => { `); const content = FakeCliFs.entries.get("project-name/src/Server.ts")!; - expect(content).toContain("import {Configuration, Inject} from \"@tsed/di\""); - expect(content).toContain("import \"@tsed/platform-express\""); - expect(content).toContain("import \"@tsed/ajv\""); + expect(content).toContain('import {Configuration, Inject} from "@tsed/di"'); + expect(content).toContain('import "@tsed/platform-express"'); + expect(content).toContain('import "@tsed/ajv"'); expect(content).toMatchSnapshot(); const pkg = JSON.parse(FakeCliFs.entries.get("project-name/package.json")!); @@ -351,9 +352,9 @@ describe("Init cmd", () => { `); const content = FakeCliFs.entries.get("project-name/src/Server.ts")!; - expect(content).toContain("import {Configuration, Inject} from \"@tsed/di\""); - expect(content).toContain("import \"@tsed/platform-express\""); - expect(content).toContain("import \"@tsed/ajv\""); + expect(content).toContain('import {Configuration, Inject} from "@tsed/di"'); + expect(content).toContain('import "@tsed/platform-express"'); + expect(content).toContain('import "@tsed/ajv"'); expect(content).toMatchSnapshot(); const pkg = JSON.parse(FakeCliFs.entries.get("project-name/package.json")!); @@ -443,9 +444,9 @@ describe("Init cmd", () => { `); const content = FakeCliFs.entries.get("project-name/src/Server.ts")!; - expect(content).toContain("import {Configuration, Inject} from \"@tsed/di\""); - expect(content).toContain("import \"@tsed/platform-express\""); - expect(content).toContain("import \"@tsed/ajv\""); + expect(content).toContain('import {Configuration, Inject} from "@tsed/di"'); + expect(content).toContain('import "@tsed/platform-express"'); + expect(content).toContain('import "@tsed/ajv"'); expect(content).toMatchSnapshot(); const pkg = JSON.parse(FakeCliFs.entries.get("project-name/package.json")!); @@ -535,9 +536,9 @@ describe("Init cmd", () => { `); const content = FakeCliFs.entries.get("project-name/src/Server.ts")!; - expect(content).toContain("import {Configuration, Inject} from \"@tsed/di\""); - expect(content).toContain("import \"@tsed/platform-express\""); - expect(content).toContain("import \"@tsed/ajv\""); + expect(content).toContain('import {Configuration, Inject} from "@tsed/di"'); + expect(content).toContain('import "@tsed/platform-express"'); + expect(content).toContain('import "@tsed/ajv"'); expect(content).toMatchSnapshot(); const pkg = JSON.parse(FakeCliFs.entries.get("project-name/package.json")!); @@ -625,9 +626,9 @@ describe("Init cmd", () => { `); const content = FakeCliFs.entries.get("project-name/src/Server.ts")!; - expect(content).toContain("import {Configuration, Inject} from \"@tsed/di\""); - expect(content).toContain("import \"@tsed/platform-express\""); - expect(content).toContain("import \"@tsed/ajv\""); + expect(content).toContain('import {Configuration, Inject} from "@tsed/di"'); + expect(content).toContain('import "@tsed/platform-express"'); + expect(content).toContain('import "@tsed/ajv"'); expect(content).toMatchSnapshot(); const pkg = JSON.parse(FakeCliFs.entries.get("project-name/package.json")!); @@ -723,15 +724,15 @@ describe("Init cmd", () => { `); const content = FakeCliFs.entries.get("project-name/src/server.ts")!; - expect(content).toContain("import {Configuration, Inject} from \"@tsed/di\""); - expect(content).toContain("import \"@tsed/platform-express\""); - expect(content).toContain("import \"@tsed/ajv\""); + expect(content).toContain('import {Configuration, Inject} from "@tsed/di"'); + expect(content).toContain('import "@tsed/platform-express"'); + expect(content).toContain('import "@tsed/ajv"'); expect(content).toMatchSnapshot(); - expect(content).toContain("import * as pages from \"./controllers/pages/index\""); + expect(content).toContain('import * as pages from "./controllers/pages/index"'); expect(content).toContain("export class Server {"); const indexContent = FakeCliFs.entries.get("project-name/src/index.ts")!; - expect(indexContent).toContain("import {Server} from \"./server\""); + expect(indexContent).toContain('import {Server} from "./server"'); }); it("should generate a project with Arch FEATURE", async () => { CliPlatformTest.setPackageJson({ @@ -787,15 +788,15 @@ describe("Init cmd", () => { `); const content = FakeCliFs.entries.get("project-name/src/server.ts")!; - expect(content).toContain("import {Configuration, Inject} from \"@tsed/di\""); - expect(content).toContain("import \"@tsed/platform-express\""); - expect(content).toContain("import \"@tsed/ajv\""); + expect(content).toContain('import {Configuration, Inject} from "@tsed/di"'); + expect(content).toContain('import "@tsed/platform-express"'); + expect(content).toContain('import "@tsed/ajv"'); expect(content).toMatchSnapshot(); - expect(content).toContain("import * as pages from \"./pages/index\""); + expect(content).toContain('import * as pages from "./pages/index"'); expect(content).toContain("export class Server {"); const indexContent = FakeCliFs.entries.get("project-name/src/index.ts")!; - expect(indexContent).toContain("import {Server} from \"./server\""); + expect(indexContent).toContain('import {Server} from "./server"'); }); }); @@ -847,9 +848,9 @@ describe("Init cmd", () => { const content = FakeCliFs.entries.get("project-name/src/Server.ts")!; - expect(content).toContain("import {Configuration, Inject} from \"@tsed/di\""); - expect(content).toContain("import \"@tsed/platform-koa\""); - expect(content).toContain("import \"@tsed/ajv\""); + expect(content).toContain('import {Configuration, Inject} from "@tsed/di"'); + expect(content).toContain('import "@tsed/platform-koa"'); + expect(content).toContain('import "@tsed/ajv"'); expect(content).toMatchSnapshot(); const pkg = JSON.parse(FakeCliFs.entries.get("project-name/package.json")!); @@ -920,8 +921,7 @@ describe("Init cmd", () => { ensureDirSync(join(dir, "data", key)); } }); - } catch (er) { - } + } catch (er) {} expect(FakeCliFs.getKeys()).toMatchInlineSnapshot(` [ diff --git a/tools/typescript/index.js b/tools/typescript/index.js index a332a55c4..3fa86fc84 100644 --- a/tools/typescript/index.js +++ b/tools/typescript/index.js @@ -1,9 +1,10 @@ -import {findPackages, MonoRepo} from "@tsed/monorepo-utils"; import {dirname, join, relative} from "node:path"; -import cloneDeep from "lodash/cloneDeep.js"; -import omit from "lodash/omit.js"; + +import {findPackages, MonoRepo} from "@tsed/monorepo-utils"; import fs from "fs-extra"; import globby from "globby"; +import cloneDeep from "lodash/cloneDeep.js"; +import omit from "lodash/omit.js"; const scriptDir = import.meta.dirname; diff --git a/tools/vitest/index.js b/tools/vitest/index.js index 5b9ffa6ab..f4b8507e1 100644 --- a/tools/vitest/index.js +++ b/tools/vitest/index.js @@ -1,6 +1,7 @@ +import {dirname, join} from "node:path"; + import {findPackages, MonoRepo} from "@tsed/monorepo-utils"; import fs from "fs-extra"; -import {dirname, join} from "node:path"; const rootDir = import.meta.dirname; const workspaceDir = join(rootDir, "../.."); @@ -31,7 +32,6 @@ async function main() { await fs.removeSync(jestFile); } } - }); await Promise.all(promises); diff --git a/tools/vitest/presets/alias.js b/tools/vitest/presets/alias.js index d9485ca8f..8823ddee5 100644 --- a/tools/vitest/presets/alias.js +++ b/tools/vitest/presets/alias.js @@ -1,7 +1,8 @@ -import {sync} from "globby"; import {readFileSync} from "node:fs"; import {basename, dirname, join} from "node:path"; +import {sync} from "globby"; + const root = join(import.meta.dirname, "../../.."); function deps(pkg, pkgs, set = new Set()) { diff --git a/tools/vitest/presets/index.js b/tools/vitest/presets/index.js index d7964d08b..8ba97be28 100644 --- a/tools/vitest/presets/index.js +++ b/tools/vitest/presets/index.js @@ -1,5 +1,6 @@ import swc from "unplugin-swc"; import {defineConfig} from "vitest/config"; + import {resolveWorkspaceFiles} from "../plugins/resolveWorkspaceFiles.js"; import {alias} from "./alias.js"; @@ -10,9 +11,7 @@ export const presets = defineConfig({ test: { globals: true, environment: "node", - exclude:[ - "**/templates/**" - ], + exclude: ["**/templates/**"], coverage: { enabled: true, provider: "v8", diff --git a/tsdoc.config.js b/tsdoc.config.js index 3405b2e0c..25b7aa3ff 100644 --- a/tsdoc.config.js +++ b/tsdoc.config.js @@ -1,13 +1,7 @@ - module.exports = { rootDir: process.cwd(), packagesDir: "packages/", - scanPatterns: [ - "/packages/{cli,cli-core}/lib/types/**/*.d.ts", - "!**/*.spec.ts", - "!**/node_modules", - "!**/__mock__/**" - ], + scanPatterns: ["/packages/{cli,cli-core}/lib/types/**/*.d.ts", "!**/*.spec.ts", "!**/node_modules", "!**/__mock__/**"], outputDir: "/docs/api", baseUrl: "/api", jsonOutputDir: "/docs/.vuepress/public", From 128b7c3fde3983247daf5e866299f082c44e1003 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Sat, 14 Sep 2024 20:18:47 +0200 Subject: [PATCH 04/69] chore: fix snapshots --- .../utils/__snapshots__/fillImport.spec.ts.snap | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/cli/src/utils/__snapshots__/fillImport.spec.ts.snap b/packages/cli/src/utils/__snapshots__/fillImport.spec.ts.snap index f770e1bca..c7d3d30c8 100644 --- a/packages/cli/src/utils/__snapshots__/fillImport.spec.ts.snap +++ b/packages/cli/src/utils/__snapshots__/fillImport.spec.ts.snap @@ -1,6 +1,6 @@ // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html -exports[`fillImports() > it should return barrels and imports files for ('arc_default', oidc: false, graphql: false, swagger: true, passportjs: false, express: false, koa: false, mongoose: false) 1`] = ` +exports[`fillImports() > should return barrels and imports files for ('arc_default', oidc: false, graphql: false, swagger: true, passportjs: false, express: false, koa: false, mongoose: false) 1`] = ` { "architecture": "arc_default", "barrels": "["./src/controllers/rest","./src/controllers/pages"]", @@ -34,7 +34,7 @@ exports[`fillImports() > it should return barrels and imports files for ('arc_de } `; -exports[`fillImports() > it should return barrels and imports files for ('arc_default', oidc: true, graphql: false, swagger: false, passportjs: false, express: false, koa: true, mongoose: false) 1`] = ` +exports[`fillImports() > should return barrels and imports files for ('arc_default', oidc: true, graphql: false, swagger: false, passportjs: false, express: false, koa: true, mongoose: false) 1`] = ` { "architecture": "arc_default", "barrels": "["./src/controllers/rest","./src/interactions"]", @@ -72,7 +72,7 @@ exports[`fillImports() > it should return barrels and imports files for ('arc_de } `; -exports[`fillImports() > it should return barrels and imports files for ('arc_default', oidc: true, graphql: true, swagger: true, passportjs: true, express: false, koa: true, mongoose: true) 1`] = ` +exports[`fillImports() > should return barrels and imports files for ('arc_default', oidc: true, graphql: true, swagger: true, passportjs: true, express: false, koa: true, mongoose: true) 1`] = ` { "architecture": "arc_default", "barrels": "["./src/controllers/rest","./src/controllers/pages","./src/interactions","./src/datasources","./src/resolvers"]", @@ -128,7 +128,7 @@ exports[`fillImports() > it should return barrels and imports files for ('arc_de } `; -exports[`fillImports() > it should return barrels and imports files for ('feature', oidc: false, graphql: false, swagger: false, passportjs: false, express: false, koa: false, mongoose: false) 1`] = ` +exports[`fillImports() > should return barrels and imports files for ('feature', oidc: false, graphql: false, swagger: false, passportjs: false, express: false, koa: false, mongoose: false) 1`] = ` { "architecture": "feature", "barrels": "["./src/rest"]", @@ -155,7 +155,7 @@ exports[`fillImports() > it should return barrels and imports files for ('featur } `; -exports[`fillImports() > it should return barrels and imports files for ('feature', oidc: false, graphql: false, swagger: true, passportjs: false, express: false, koa: false, mongoose: false) 1`] = ` +exports[`fillImports() > should return barrels and imports files for ('feature', oidc: false, graphql: false, swagger: true, passportjs: false, express: false, koa: false, mongoose: false) 1`] = ` { "architecture": "feature", "barrels": "["./src/rest","./src/pages"]", @@ -189,7 +189,7 @@ exports[`fillImports() > it should return barrels and imports files for ('featur } `; -exports[`fillImports() > it should return barrels and imports files for ('feature', oidc: true, graphql: false, swagger: false, passportjs: false, express: true, koa: false, mongoose: false) 1`] = ` +exports[`fillImports() > should return barrels and imports files for ('feature', oidc: true, graphql: false, swagger: false, passportjs: false, express: true, koa: false, mongoose: false) 1`] = ` { "architecture": "feature", "barrels": "["./src/rest","./src/interactions"]", @@ -227,7 +227,7 @@ exports[`fillImports() > it should return barrels and imports files for ('featur } `; -exports[`fillImports() > it should return barrels and imports files for ('feature', oidc: true, graphql: true, swagger: true, passportjs: true, express: true, koa: false, mongoose: true) 1`] = ` +exports[`fillImports() > should return barrels and imports files for ('feature', oidc: true, graphql: true, swagger: true, passportjs: true, express: true, koa: false, mongoose: true) 1`] = ` { "architecture": "feature", "barrels": "["./src/rest","./src/pages","./src/interactions","./src/datasources","./src/resolvers"]", From 8972a65515160aacfa4c835bae0c2cb04a26d82a Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Sat, 14 Sep 2024 20:25:59 +0200 Subject: [PATCH 05/69] feat(cli-plugin-eslint): generate configuration for eslint 9 --- packages/cli-plugin-eslint/package.json | 4 +- .../src/hooks/EslintInitHook.ts | 12 ++-- .../templates/init/.eslintignore.hbs | 1 - .../templates/init/.eslintrc.hbs | 22 ------- .../templates/init/eslint.config.mjs.hbs | 66 +++++++++++++++++++ 5 files changed, 73 insertions(+), 32 deletions(-) delete mode 100644 packages/cli-plugin-eslint/templates/init/.eslintignore.hbs delete mode 100644 packages/cli-plugin-eslint/templates/init/.eslintrc.hbs create mode 100644 packages/cli-plugin-eslint/templates/init/eslint.config.mjs.hbs diff --git a/packages/cli-plugin-eslint/package.json b/packages/cli-plugin-eslint/package.json index af260ae94..427fba9d3 100644 --- a/packages/cli-plugin-eslint/package.json +++ b/packages/cli-plugin-eslint/package.json @@ -17,9 +17,7 @@ }, "scripts": { "build": "yarn build:ts", - "build:ts": "tsc --build tsconfig.json", - "/test": "vitest run", - "/test:ci": "vitest run --coverage.thresholds.autoUpdate=true" + "build:ts": "tsc --build tsconfig.json" }, "devDependencies": { "@tsed/cli": "5.2.10", diff --git a/packages/cli-plugin-eslint/src/hooks/EslintInitHook.ts b/packages/cli-plugin-eslint/src/hooks/EslintInitHook.ts index 5105a7cf6..da6a5e5d4 100644 --- a/packages/cli-plugin-eslint/src/hooks/EslintInitHook.ts +++ b/packages/cli-plugin-eslint/src/hooks/EslintInitHook.ts @@ -26,8 +26,7 @@ export class EslintInitHook { task: (ctx: any) => { return this.rootRenderer.renderAll( [ - ".eslintrc.hbs", - ".eslintignore.hbs", + "eslint.config.mjs", ctx.lintstaged && ".husky/_/.gitignore.hbs", ctx.lintstaged && ".husky/_/husky.sh.hbs", ctx.lintstaged && ".husky/.gitignore.hbs", @@ -83,7 +82,7 @@ export class EslintInitHook { if (ctx.prettier) { this.packageJson.addScripts({ - prettier: "prettier '**/*.{ts,js,json,md,yml,yaml}' --write" + prettier: "prettier '**/*.{json,md,yml,yaml}' --write" }); } } @@ -95,11 +94,12 @@ export class EslintInitHook { addDevDependencies(ctx: InitCmdContext) { this.packageJson.addDevDependencies( { - eslint: "8", + "@typescript-eslint/parser": "latest", + "@typescript-eslint/eslint-plugin": "latest", + eslint: "latest", "eslint-config-prettier": "latest", "eslint-plugin-prettier": "latest", - "@typescript-eslint/parser": "latest", - "@typescript-eslint/eslint-plugin": "latest" + "eslint-plugin-simple-import-sort": "latest" }, ctx ); diff --git a/packages/cli-plugin-eslint/templates/init/.eslintignore.hbs b/packages/cli-plugin-eslint/templates/init/.eslintignore.hbs deleted file mode 100644 index 1521c8b76..000000000 --- a/packages/cli-plugin-eslint/templates/init/.eslintignore.hbs +++ /dev/null @@ -1 +0,0 @@ -dist diff --git a/packages/cli-plugin-eslint/templates/init/.eslintrc.hbs b/packages/cli-plugin-eslint/templates/init/.eslintrc.hbs deleted file mode 100644 index cb517f361..000000000 --- a/packages/cli-plugin-eslint/templates/init/.eslintrc.hbs +++ /dev/null @@ -1,22 +0,0 @@ -{ - "parser": "@typescript-eslint/parser", - "extends": [{{#if prettier}} - "prettier",{{/if}} - "plugin:@typescript-eslint/recommended" - ], - "plugins": ["@typescript-eslint"], - "parserOptions": { - "ecmaVersion": 2018, - "sourceType": "module", - "project": "./tsconfig.json" - }, - "env": { - "node": true, - "es6": true - }, - "rules": { - "@typescript-eslint/no-inferrable-types": 0, - "@typescript-eslint/no-unused-vars": 2, - "@typescript-eslint/no-var-requires": 0 - } -} diff --git a/packages/cli-plugin-eslint/templates/init/eslint.config.mjs.hbs b/packages/cli-plugin-eslint/templates/init/eslint.config.mjs.hbs new file mode 100644 index 000000000..705f34168 --- /dev/null +++ b/packages/cli-plugin-eslint/templates/init/eslint.config.mjs.hbs @@ -0,0 +1,66 @@ +import typescriptEslint from "@typescript-eslint/eslint-plugin"; +import typescriptParser from "@typescript-eslint/parser"; +{{#if prettier}}import pluginPrettierRecommended from "eslint-plugin-prettier/recommended"; +{{/if}}import pluginSimpleImportSort from "eslint-plugin-simple-import-sort"; +{{#if vitest}}import vitest from "eslint-plugin-vitest"; +i{{/if}}import globals from "globals"; + +export default [ + { + ignores: ["coverage", "dist", "processes.config.js", "**/templates"] + }, + { + files: ["**/*.{js,mjs,cjs,jsx,mjsx,ts,tsx,mtsx}"], + languageOptions: { + ecmaVersion: "latest", + sourceType: "module", + parser: typescriptParser, + parserOptions: { + ecmaVersion: "latest", + sourceType: "module" + }, + globals: { + ...globals.node + } + }, + plugins: { + "@typescript-eslint": typescriptEslint + }, + rules: { + "@typescript-eslint/ban-ts-comment": 0, + "@typescript-eslint/camelcase": 0, + "@typescript-eslint/no-inferrable-types": 0, + "@typescript-eslint/explicit-function-return-type": 0, + "@typescript-eslint/explicit-module-boundary-types": 0, + "@typescript-eslint/no-unused-vars": 0, + "@typescript-eslint/no-explicit-any": 0, + "@typescript-eslint/no-non-null-assertion": 0 + } + },{{#if vitest}} + { + files: ["**/*.spec.{js,mjs,cjs,jsx,mjsx,ts,tsx,mtsx}"], // or any other pattern + plugins: { + vitest + }, + rules: { + ...vitest.configs.recommended.rules, // you can also use vitest.configs.all.rules to enable all rules + "vitest/consistent-test-it": ["error", {fn: "it", withinDescribe: "it"}], + "vitest/no-alias-methods": "error" + } + },{{/if}} + { + files: ["**/*.{js,mjs,cjs,jsx,mjsx,ts,tsx,mtsx}"], + languageOptions: { + parserOptions: {} + }, + plugins: { + "simple-import-sort": pluginSimpleImportSort + }, + rules: { + "simple-import-sort/imports": "error", + "simple-import-sort/exports": "error", + "workspaces/no-absolute-imports": "error" + } + }{{#if prettier}}, + pluginPrettierRecommended{{/if}} +]; From 937287f323968a61998c9560b413d7342ce58876 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Mon, 16 Sep 2024 02:48:57 +0200 Subject: [PATCH 06/69] feat(cli): migrate all project on ESM BREAKING CHANGE: CLI generate a full ESM project --- commitlint.config.js | 2 +- eslint.config.mjs => eslint.config.js | 0 lerna.json | 1 - package.json | 11 +- packages/cli-core/package.json | 7 +- packages/cli-core/src/CliCore.spec.ts | 4 +- packages/cli-core/src/CliCore.ts | 16 +- packages/cli-core/src/decorators/command.ts | 4 +- packages/cli-core/src/decorators/index.ts | 10 +- .../cli-core/src/decorators/onAdd.spec.ts | 4 +- packages/cli-core/src/decorators/onAdd.ts | 4 +- .../cli-core/src/decorators/onExec.spec.ts | 4 +- packages/cli-core/src/decorators/onExec.ts | 4 +- .../src/decorators/onPostInstall.spec.ts | 4 +- .../cli-core/src/decorators/onPostInstall.ts | 4 +- .../cli-core/src/decorators/onPrompt.spec.ts | 4 +- packages/cli-core/src/decorators/onPrompt.ts | 4 +- packages/cli-core/src/domains/CliError.ts | 2 +- packages/cli-core/src/index.ts | 12 +- .../src/interfaces/CommandMetadata.ts | 2 +- .../src/interfaces/CommandProvider.ts | 2 +- packages/cli-core/src/interfaces/index.ts | 18 +- .../PackageManagersModule.spec.ts | 14 +- .../packageManagers/PackageManagersModule.ts | 16 +- .../cli-core/src/packageManagers/index.ts | 10 +- .../packageManagers/supports/BaseManager.ts | 2 +- .../supports/BunManager.spec.ts | 4 +- .../packageManagers/supports/BunManager.ts | 2 +- .../supports/NpmManager.spec.ts | 4 +- .../packageManagers/supports/NpmManager.ts | 2 +- .../supports/PNpmManager.spec.ts | 4 +- .../packageManagers/supports/PNpmManager.ts | 2 +- .../supports/YarnBerryManager.spec.ts | 4 +- .../supports/YarnBerryManager.ts | 4 +- .../supports/YarnManager.spec.ts | 4 +- .../packageManagers/supports/YarnManager.ts | 2 +- .../src/services/CliDockerComposeYaml.ts | 6 +- packages/cli-core/src/services/CliExeca.ts | 2 +- .../src/services/CliHttpClient.spec.ts | 4 +- .../cli-core/src/services/CliHttpClient.ts | 4 +- .../cli-core/src/services/CliHttpLogClient.ts | 2 +- .../cli-core/src/services/CliLoadFile.spec.ts | 8 +- packages/cli-core/src/services/CliLoadFile.ts | 8 +- .../cli-core/src/services/CliPackageJson.ts | 2 +- .../cli-core/src/services/CliPlugins.spec.ts | 4 +- packages/cli-core/src/services/CliPlugins.ts | 16 +- .../src/services/CliProxyAgent.spec.ts | 10 +- .../cli-core/src/services/CliProxyAgent.ts | 6 +- .../src/services/CliRunScript.spec.ts | 5 +- .../cli-core/src/services/CliRunScript.ts | 2 +- packages/cli-core/src/services/CliService.ts | 24 +- packages/cli-core/src/services/CliYaml.ts | 2 +- .../src/services/NpmRegistryClient.spec.ts | 4 +- .../src/services/NpmRegistryClient.ts | 4 +- .../src/services/ProjectPackageJson.spec.ts | 9 +- .../src/services/ProjectPackageJson.ts | 9 +- .../cli-core/src/services/Renderer.spec.ts | 8 +- packages/cli-core/src/services/Renderer.ts | 6 +- packages/cli-core/src/services/index.ts | 30 +- packages/cli-core/src/utils/coerce.spec.ts | 2 +- .../cli-core/src/utils/createInjector.spec.ts | 4 +- packages/cli-core/src/utils/createInjector.ts | 4 +- .../cli-core/src/utils/createTasksRunner.ts | 4 +- .../src/utils/getCommandMetadata.spec.ts | 4 +- .../cli-core/src/utils/getCommandMetadata.ts | 6 +- packages/cli-core/src/utils/hbs/collection.ts | 4 +- packages/cli-core/src/utils/hbs/index.ts | 10 +- packages/cli-core/src/utils/hbs/object.ts | 2 +- .../cli-core/src/utils/hbs/switch.spec.ts | 2 +- packages/cli-core/src/utils/index.ts | 20 +- .../cli-core/src/utils/isValidVersion.spec.ts | 2 +- packages/cli-core/src/utils/loadPlugins.ts | 4 +- .../src/utils/mapCommanderArgs.spec.ts | 2 +- .../cli-core/src/utils/mapCommanderArgs.ts | 2 +- .../cli-core/src/utils/parseOption.spec.ts | 2 +- .../src/utils/renderer/insertAfter.spec.ts | 6 +- .../src/utils/renderer/insertImport.spec.ts | 10 +- .../src/utils/resolveConfiguration.ts | 2 +- .../integrations/command.integration.spec.ts | 4 +- packages/cli-core/tsconfig.cjs.json | 28 - packages/cli-core/tsconfig.esm.json | 4 +- packages/cli-core/tsconfig.json | 3 - packages/cli-core/tsconfig.spec.json | 2 - .../cli-generate-http-client/package.json | 8 +- .../cli-generate-http-client/src/index.ts | 2 +- .../tsconfig.cjs.json | 28 - .../tsconfig.esm.json | 4 +- .../cli-generate-http-client/tsconfig.json | 3 - packages/cli-generate-swagger/package.json | 8 +- packages/cli-generate-swagger/src/index.ts | 2 +- .../cli-generate-swagger/tsconfig.cjs.json | 28 - .../cli-generate-swagger/tsconfig.esm.json | 4 +- packages/cli-generate-swagger/tsconfig.json | 3 - packages/cli-plugin-eslint/package.json | 8 +- .../src/CliPluginEslintModule.ts | 2 +- .../src/hooks/EslintInitHook.ts | 2 +- packages/cli-plugin-eslint/src/index.ts | 4 +- .../src/utils/templateDir.ts | 2 +- packages/cli-plugin-eslint/tsconfig.cjs.json | 28 - packages/cli-plugin-eslint/tsconfig.esm.json | 4 +- packages/cli-plugin-eslint/tsconfig.json | 3 - packages/cli-plugin-jest/package.json | 8 +- .../src/CliPluginJestModule.ts | 4 +- .../src/hooks/JestGenerateHook.ts | 2 +- .../cli-plugin-jest/src/hooks/JestInitHook.ts | 2 +- packages/cli-plugin-jest/src/index.ts | 4 +- .../cli-plugin-jest/src/utils/templateDir.ts | 2 +- .../generate/decorator.class.spec.hbs | 2 +- .../generate/decorator.endpoint.spec.hbs | 2 +- .../generate/decorator.method.spec.hbs | 2 +- .../generate/decorator.param.spec.hbs | 2 +- .../generate/decorator.parameter.spec.hbs | 2 +- .../generate/decorator.prop.spec.hbs | 2 +- .../generate/decorator.property.spec.hbs | 2 +- .../generate/generic.integration.hbs | 4 +- .../templates/generate/generic.spec.hbs | 2 +- .../templates/generate/server.integration.hbs | 2 +- .../generate.controller.integration.spec.ts | 8 +- packages/cli-plugin-jest/tsconfig.cjs.json | 28 - packages/cli-plugin-jest/tsconfig.esm.json | 4 +- packages/cli-plugin-jest/tsconfig.json | 3 - packages/cli-plugin-jest/tsconfig.spec.json | 2 - packages/cli-plugin-mocha/package.json | 8 +- .../src/CliPluginMochaModule.ts | 4 +- .../src/hooks/MochaGenerateHook.ts | 2 +- .../src/hooks/MochaInitHook.ts | 2 +- packages/cli-plugin-mocha/src/index.ts | 4 +- .../cli-plugin-mocha/src/utils/templateDir.ts | 2 +- .../generate/decorator.class.spec.hbs | 2 +- .../generate/decorator.endpoint.spec.hbs | 2 +- .../generate/decorator.method.spec.hbs | 2 +- .../generate/decorator.param.spec.hbs | 2 +- .../generate/decorator.parameter.spec.hbs | 2 +- .../generate/decorator.prop.spec.hbs | 2 +- .../generate/decorator.property.spec.hbs | 2 +- .../generate/generic.integration.hbs | 4 +- .../templates/generate/generic.spec.hbs | 2 +- .../templates/generate/model.spec.hbs | 2 +- .../templates/generate/server.integration.hbs | 2 +- packages/cli-plugin-mocha/tsconfig.cjs.json | 28 - packages/cli-plugin-mocha/tsconfig.esm.json | 4 +- packages/cli-plugin-mocha/tsconfig.json | 3 - packages/cli-plugin-mongoose/package.json | 8 +- .../src/CliPluginMongooseModule.ts | 6 +- .../src/hooks/MongooseGenerateHook.ts | 4 +- .../src/hooks/MongooseInitHook.ts | 2 +- packages/cli-plugin-mongoose/src/index.ts | 10 +- .../src/services/CliMongoose.ts | 2 +- .../src/utils/templateDir.ts | 2 +- .../generate.schema.integration.spec.ts | 2 +- .../cli-plugin-mongoose/tsconfig.esm.json | 4 +- packages/cli-plugin-mongoose/tsconfig.json | 3 - .../cli-plugin-mongoose/tsconfig.spec.json | 2 - .../cli-plugin-oidc-provider/package.json | 12 +- .../src/CliPluginOidcProviderModule.ts | 2 +- .../src/hooks/OidcProviderInitHook.ts | 2 +- .../cli-plugin-oidc-provider/src/index.ts | 6 +- .../src/utils/templateDir.ts | 2 +- .../init/src/config/oidc/index.ts.hbs | 4 +- .../oidc/InteractionsController.spec.ts | 4 +- .../oidc/InteractionsController.ts | 2 +- .../interactions/ConsentInteraction.spec.ts | 4 +- .../src/interactions/LoginInteraction.spec.ts | 6 +- .../init/src/interactions/LoginInteraction.ts | 2 +- .../templates/init/src/services/Accounts.ts | 2 +- .../init.integration.spec.ts.snap | 28 +- .../test/init/init.integration.spec.ts | 14 +- .../tsconfig.cjs.json | 28 - .../tsconfig.esm.json | 4 +- .../cli-plugin-oidc-provider/tsconfig.json | 3 - .../tsconfig.spec.json | 2 - packages/cli-plugin-passport/package.json | 8 +- .../src/CliPluginPassportModule.ts | 2 +- .../src/hooks/PassportGenerateHook.ts | 4 +- packages/cli-plugin-passport/src/index.ts | 8 +- .../src/utils/templateDir.ts | 2 +- .../cli-plugin-passport/tsconfig.cjs.json | 28 - .../cli-plugin-passport/tsconfig.esm.json | 4 +- packages/cli-plugin-passport/tsconfig.json | 3 - packages/cli-plugin-prisma/package.json | 8 +- .../src/CliPluginPrismaModule.ts | 4 +- .../src/commands/PrismaCmd.ts | 2 +- .../src/hooks/PrismaInitHook.ts | 2 +- packages/cli-plugin-prisma/src/index.ts | 8 +- .../src/services/CliPrisma.spec.ts | 4 +- .../src/utils/templateDir.ts | 2 +- packages/cli-plugin-prisma/tsconfig.cjs.json | 28 - packages/cli-plugin-prisma/tsconfig.esm.json | 4 +- packages/cli-plugin-prisma/tsconfig.json | 3 - packages/cli-plugin-prisma/tsconfig.spec.json | 2 - packages/cli-plugin-typegraphql/package.json | 14 +- .../src/TypeGraphqlModule.ts | 2 +- .../src/hooks/TypeGraphqlInitHook.ts | 2 +- packages/cli-plugin-typegraphql/src/index.ts | 6 +- .../src/utils/templateDir.ts | 2 +- .../templates/init/src/datasources/index.ts | 2 +- .../templates/init/src/resolvers/index.ts | 6 +- .../src/resolvers/recipes/RecipeResolver.ts | 6 +- .../init/src/services/RecipeService.ts | 2 +- .../init.integration.spec.ts.snap | 12 +- .../test/init/init.integration.spec.ts | 10 +- .../cli-plugin-typegraphql/tsconfig.cjs.json | 28 - .../cli-plugin-typegraphql/tsconfig.esm.json | 4 +- packages/cli-plugin-typegraphql/tsconfig.json | 3 - .../cli-plugin-typegraphql/tsconfig.spec.json | 2 - packages/cli-plugin-typeorm/package.json | 8 +- .../src/CliPluginTypeORMModule.ts | 4 +- .../src/hooks/TypeORMGenerateHook.ts | 2 +- packages/cli-plugin-typeorm/src/index.ts | 8 +- .../src/utils/templateDir.ts | 2 +- .../init.integration.spec.ts.snap | 4 +- .../init/init.integration.spec.ts | 12 +- packages/cli-plugin-typeorm/tsconfig.cjs.json | 28 - packages/cli-plugin-typeorm/tsconfig.esm.json | 4 +- packages/cli-plugin-typeorm/tsconfig.json | 3 - .../cli-plugin-typeorm/tsconfig.spec.json | 2 - packages/cli-plugin-vitest/package.json | 8 +- .../src/CliPluginVitestModule.ts | 4 +- .../src/hooks/VitestGenerateHook.ts | 2 +- .../src/hooks/VitestInitHook.ts | 2 +- packages/cli-plugin-vitest/src/index.ts | 4 +- .../src/utils/templateDir.ts | 2 +- .../generate/decorator.class.spec.hbs | 2 +- .../generate/decorator.endpoint.spec.hbs | 2 +- .../generate/decorator.method.spec.hbs | 2 +- .../generate/decorator.param.spec.hbs | 2 +- .../generate/decorator.parameter.spec.hbs | 2 +- .../generate/decorator.prop.spec.hbs | 2 +- .../generate/decorator.property.spec.hbs | 2 +- .../generate/generic.integration.hbs | 4 +- .../templates/generate/generic.spec.hbs | 2 +- .../templates/generate/server.integration.hbs | 2 +- .../generate.controller.integration.spec.ts | 11 +- packages/cli-plugin-vitest/tsconfig.cjs.json | 28 - packages/cli-plugin-vitest/tsconfig.esm.json | 4 +- packages/cli-plugin-vitest/tsconfig.json | 3 - packages/cli-plugin-vitest/tsconfig.spec.json | 2 - packages/cli-testing/package.json | 10 +- packages/cli-testing/src/CliPlatformTest.ts | 6 +- packages/cli-testing/src/FakeCliFs.ts | 2 +- packages/cli-testing/src/index.ts | 8 +- packages/cli-testing/tsconfig.esm.json | 4 +- packages/cli-testing/tsconfig.json | 3 - packages/cli/package.json | 8 +- packages/cli/src/Cli.ts | 6 +- packages/cli/src/bin/tsed.ts | 2 +- .../src/commands/generate/GenerateCmd.spec.ts | 15 +- .../cli/src/commands/generate/GenerateCmd.ts | 16 +- packages/cli/src/commands/index.ts | 10 +- .../cli/src/commands/init/InitCmd.spec.ts | 4 +- packages/cli/src/commands/init/InitCmd.ts | 39 +- .../commands/init/config/FeaturesPrompt.ts | 8 +- .../commands/init/config/InitFileSchema.ts | 4 +- .../init/interfaces/InitCmdContext.ts | 2 +- .../commands/init/interfaces/InitOptions.ts | 8 +- .../init/interfaces/InitPromptAnswers.ts | 2 +- .../init/mappers/mapToContext.spec.ts | 6 +- .../src/commands/init/mappers/mapToContext.ts | 4 +- .../commands/init/mappers/mapUniqFeatures.ts | 6 +- .../init/prompts/getFeaturesPrompt.spec.ts | 2 +- .../init/prompts/getFeaturesPrompt.ts | 4 +- .../commands/init/utils/hasFeature.spec.ts | 2 +- packages/cli/src/commands/run/RunCmd.spec.ts | 3 +- .../cli/src/commands/update/UpdateCmd.spec.ts | 2 +- packages/cli/src/commands/update/UpdateCmd.ts | 2 +- packages/cli/src/constants/index.ts | 2 +- packages/cli/src/index.ts | 30 +- packages/cli/src/interfaces/index.ts | 6 +- packages/cli/src/pipes/ClassNamePipe.spec.ts | 6 +- packages/cli/src/pipes/ClassNamePipe.ts | 4 +- .../cli/src/pipes/OutputFilePathPipe.spec.ts | 8 +- packages/cli/src/pipes/OutputFilePathPipe.ts | 6 +- packages/cli/src/pipes/RoutePipe.spec.ts | 2 +- packages/cli/src/pipes/index.ts | 6 +- .../cli/src/platforms/InitPlatformsModule.ts | 6 +- .../platforms/supports/InitExpressPlatform.ts | 2 +- .../src/platforms/supports/InitKoaPlatform.ts | 2 +- packages/cli/src/runtimes/RuntimesModule.ts | 12 +- packages/cli/src/runtimes/index.ts | 14 +- .../cli/src/runtimes/supports/BabelRuntime.ts | 2 +- .../cli/src/runtimes/supports/BunRuntime.ts | 2 +- .../cli/src/runtimes/supports/NodeRuntime.ts | 2 +- .../cli/src/runtimes/supports/SWCRuntime.ts | 2 +- .../src/runtimes/supports/WebpackRuntime.ts | 2 +- .../src/services/ProvidersInfoService.spec.ts | 2 +- .../__snapshots__/fillImport.spec.ts.snap | 70 +- packages/cli/src/utils/fillImport.spec.ts | 4 +- packages/cli/src/utils/fillImports.ts | 24 +- ...config.js.hbs => processes.config.cjs.hbs} | 0 .../cli/templates/init/src/bin/index.ts.hbs | 4 +- .../templates/init/src/config/index.ts.hbs | 8 +- packages/cli/templates/init/src/index.ts.hbs | 2 +- .../cli/templates/init/tsconfig.base.json.hbs | 29 + .../templates/init/tsconfig.compile.json.hbs | 15 - packages/cli/templates/init/tsconfig.json.hbs | 46 +- .../cli/templates/init/tsconfig.node.json.hbs | 20 + .../cli/templates/init/tsconfig.spec.json.hbs | 24 + ...generate.async-factory.integration.spec.ts | 2 +- .../generate.controller.integration.spec.ts | 2 +- ...nerate.decorator-class.integration.spec.ts | 2 +- ...ate.decorator-endpoint.integration.spec.ts | 2 +- ...rate.decorator-generic.integration.spec.ts | 2 +- ...erate.decorator-method.integration.spec.ts | 2 +- ...e.decorator-middleware.integration.spec.ts | 2 +- ...erate.exception-filter.integration.spec.ts | 2 +- ...nerate.response-filter.integration.spec.ts | 2 +- .../init.integration.spec.ts.snap | 46 +- .../init/init.integration.spec.ts | 82 +- packages/cli/tsconfig.cjs.json | 28 - packages/cli/tsconfig.esm.json | 4 +- packages/cli/tsconfig.json | 3 - packages/cli/tsconfig.spec.json | 2 - release.config.js | 2 +- tools/typescript/index.js | 46 +- tools/typescript/package.json | 1 + tools/typescript/swc.node.json | 2 +- tools/typescript/tsconfig.node.json | 6 +- tools/typescript/tsconfig.template.cjs.json | 28 - tools/typescript/tsconfig.template.esm.json | 4 +- tools/typescript/tsconfig.template.spec.json | 2 - tsconfig.json | 12 +- tsdoc.config.js => tsdoc.config.cjs | 0 yarn.lock | 1454 ++++++++--------- 323 files changed, 1566 insertions(+), 2112 deletions(-) rename eslint.config.mjs => eslint.config.js (100%) delete mode 100644 packages/cli-core/tsconfig.cjs.json delete mode 100644 packages/cli-generate-http-client/tsconfig.cjs.json delete mode 100644 packages/cli-generate-swagger/tsconfig.cjs.json delete mode 100644 packages/cli-plugin-eslint/tsconfig.cjs.json delete mode 100644 packages/cli-plugin-jest/tsconfig.cjs.json delete mode 100644 packages/cli-plugin-mocha/tsconfig.cjs.json delete mode 100644 packages/cli-plugin-oidc-provider/tsconfig.cjs.json delete mode 100644 packages/cli-plugin-passport/tsconfig.cjs.json delete mode 100644 packages/cli-plugin-prisma/tsconfig.cjs.json delete mode 100644 packages/cli-plugin-typegraphql/tsconfig.cjs.json delete mode 100644 packages/cli-plugin-typeorm/tsconfig.cjs.json delete mode 100644 packages/cli-plugin-vitest/tsconfig.cjs.json rename packages/cli/templates/init/{processes.config.js.hbs => processes.config.cjs.hbs} (100%) create mode 100644 packages/cli/templates/init/tsconfig.base.json.hbs delete mode 100644 packages/cli/templates/init/tsconfig.compile.json.hbs create mode 100644 packages/cli/templates/init/tsconfig.node.json.hbs create mode 100644 packages/cli/templates/init/tsconfig.spec.json.hbs delete mode 100644 packages/cli/tsconfig.cjs.json delete mode 100644 tools/typescript/tsconfig.template.cjs.json rename tsdoc.config.js => tsdoc.config.cjs (100%) diff --git a/commitlint.config.js b/commitlint.config.js index e2b5db2e6..57736bf8e 100644 --- a/commitlint.config.js +++ b/commitlint.config.js @@ -1 +1 @@ -module.exports = {extends: ["@commitlint/config-conventional"]}; +export default {extends: ["@commitlint/config-conventional"]}; diff --git a/eslint.config.mjs b/eslint.config.js similarity index 100% rename from eslint.config.mjs rename to eslint.config.js diff --git a/lerna.json b/lerna.json index 135c27f7b..7ee144738 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,5 @@ { "npmClient": "yarn", - "useWorkspaces": true, "packages": [ "packages/*" ], diff --git a/package.json b/package.json index 1f93f2ff1..5a45fe7b0 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "version": "5.2.10", "description": "CLI to bootstrap your Ts.ED project", "private": true, + "type": "module", "scripts": { "postinstall": "cd docs && yarn install", "configure": "monorepo ci configure", @@ -10,7 +11,6 @@ "test": "vitest run", "lint": "eslint '**/*.{ts,js}'", "lint:fix": "eslint '**/*.{ts,js}' --fix", - "coveralls": "nyc report --reporter=text-lcov | coveralls", "build": "monorepo build --verbose", "build:references": "node ./tools/typescript", "build:eslint": "node ./tools/eslint", @@ -74,19 +74,18 @@ "update-notifier": "5.1.0" }, "devDependencies": { - "@commitlint/cli": "^17.0.3", - "@commitlint/config-conventional": "^17.0.3", + "@commitlint/cli": "19.5.0", + "@commitlint/config-conventional": "19.5.0", "@swc/core": "1.7.26", "@swc/helpers": "0.5.13", "@tsed/markdown-it-symbols": "3.20.4", "@tsed/monorepo-utils": "2.3.5", "@tsed/ts-doc": "^4.1.0", - "@types/node": "18.7.8", + "@types/node": "20.14.8", "@typescript-eslint/eslint-plugin": "8.5.0", "@typescript-eslint/parser": "8.5.0", "@vitest/coverage-v8": "^2.1.1", "concurrently": "7.6.0", - "coveralls": "3.1.1", "cross-env": "7.0.3", "entities": "1.1.2", "eslint": "9.10.0", @@ -101,7 +100,7 @@ "lint-staged": "13.0.3", "markdown-it": "13.0.1", "prettier": "3.3.3", - "semantic-release": "23.0.2", + "semantic-release": "24.1.1", "semantic-release-slack-bot": "4.0.2", "sinon": "14.0.0", "sinon-chai": "3.7.0", diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index 598fe8355..30d6f3388 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -1,17 +1,16 @@ { "name": "@tsed/cli-core", "description": "Build your CLI with TypeScript and Decorators", - "type": "commonjs", "version": "5.2.10", + "type": "module", + "main": "./lib/esm/index.js", "source": "./src/index.ts", - "main": "./lib/cjs/index.js", "module": "./lib/esm/index.js", "typings": "./lib/types/index.d.ts", "exports": { ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "require": "./lib/cjs/index.js", "default": "./lib/esm/index.js" } }, @@ -37,7 +36,7 @@ "@tsed/normalize-path": ">=7.14.2", "@types/fs-extra": "^9.0.13", "@types/inquirer": "^8.2.4", - "ajv": "8.11.0", + "ajv": "8.17.1", "axios": "1.6.7", "chalk": "4.1.2", "change-case": "^4.1.2", diff --git a/packages/cli-core/src/CliCore.spec.ts b/packages/cli-core/src/CliCore.spec.ts index f73788a97..0a74ac232 100644 --- a/packages/cli-core/src/CliCore.spec.ts +++ b/packages/cli-core/src/CliCore.spec.ts @@ -1,8 +1,8 @@ import {normalizePath} from "@tsed/normalize-path"; import execa from "execa"; -import {CliCore} from "./CliCore"; -import {CliService} from "./services"; +import {CliCore} from "./CliCore.js"; +import {CliService} from "./services/index.js"; vi.mock("./utils/loadPlugins"); vi.mock("execa"); diff --git a/packages/cli-core/src/CliCore.ts b/packages/cli-core/src/CliCore.ts index 16853dbc6..6ba95accf 100644 --- a/packages/cli-core/src/CliCore.ts +++ b/packages/cli-core/src/CliCore.ts @@ -5,14 +5,14 @@ import {Command} from "commander"; import {join, resolve} from "path"; import semver from "semver"; -import {CliError} from "./domains/CliError"; -import {CliConfiguration} from "./services/CliConfiguration"; -import {CliPackageJson} from "./services/CliPackageJson"; -import {CliService} from "./services/CliService"; -import {ProjectPackageJson} from "./services/ProjectPackageJson"; -import {createInjector} from "./utils/createInjector"; -import {loadPlugins} from "./utils/loadPlugins"; -import {resolveConfiguration} from "./utils/resolveConfiguration"; +import {CliError} from "./domains/CliError.js"; +import {CliConfiguration} from "./services/CliConfiguration.js"; +import {CliPackageJson} from "./services/CliPackageJson.js"; +import {CliService} from "./services/CliService.js"; +import {ProjectPackageJson} from "./services/ProjectPackageJson.js"; +import {createInjector} from "./utils/createInjector.js"; +import {loadPlugins} from "./utils/loadPlugins.js"; +import {resolveConfiguration} from "./utils/resolveConfiguration.js"; function isHelpManual(argv: string[]) { return argv.includes("-h") || argv.includes("--help"); diff --git a/packages/cli-core/src/decorators/command.ts b/packages/cli-core/src/decorators/command.ts index 99df530a1..730dd2f63 100644 --- a/packages/cli-core/src/decorators/command.ts +++ b/packages/cli-core/src/decorators/command.ts @@ -1,8 +1,8 @@ import {StoreSet, useDecorators} from "@tsed/core"; import {Injectable} from "@tsed/di"; -import {CommandStoreKeys} from "../domains/CommandStoreKeys"; -import {CommandParameters} from "../interfaces/CommandParameters"; +import {CommandStoreKeys} from "../domains/CommandStoreKeys.js"; +import {CommandParameters} from "../interfaces/CommandParameters.js"; export function Command(options: CommandParameters): ClassDecorator { return useDecorators(Injectable({type: "command"}), StoreSet(CommandStoreKeys.COMMAND, options)) as any; diff --git a/packages/cli-core/src/decorators/index.ts b/packages/cli-core/src/decorators/index.ts index b20527e16..8c69362e8 100644 --- a/packages/cli-core/src/decorators/index.ts +++ b/packages/cli-core/src/decorators/index.ts @@ -1,5 +1,5 @@ -export * from "./command"; -export * from "./onAdd"; -export * from "./onExec"; -export * from "./onPostInstall"; -export * from "./onPrompt"; +export * from "./command.js"; +export * from "./onAdd.js"; +export * from "./onExec.js"; +export * from "./onPostInstall.js"; +export * from "./onPrompt.js"; diff --git a/packages/cli-core/src/decorators/onAdd.spec.ts b/packages/cli-core/src/decorators/onAdd.spec.ts index 5dba1089a..8ea1c0bb3 100644 --- a/packages/cli-core/src/decorators/onAdd.spec.ts +++ b/packages/cli-core/src/decorators/onAdd.spec.ts @@ -1,7 +1,7 @@ import {Store} from "@tsed/core"; -import {CommandStoreKeys} from "../domains/CommandStoreKeys"; -import {OnAdd} from "./onAdd"; +import {CommandStoreKeys} from "../domains/CommandStoreKeys.js"; +import {OnAdd} from "./onAdd.js"; class Test { @OnAdd("@tsed/cli-plugin") diff --git a/packages/cli-core/src/decorators/onAdd.ts b/packages/cli-core/src/decorators/onAdd.ts index fb565e94d..3eb693b7b 100644 --- a/packages/cli-core/src/decorators/onAdd.ts +++ b/packages/cli-core/src/decorators/onAdd.ts @@ -1,5 +1,5 @@ -import {CommandStoreKeys} from "../domains/CommandStoreKeys"; -import {On} from "./on"; +import {CommandStoreKeys} from "../domains/CommandStoreKeys.js"; +import {On} from "./on.js"; export function OnAdd(cliPlugin: string): MethodDecorator { return On(CommandStoreKeys.ADD, cliPlugin); diff --git a/packages/cli-core/src/decorators/onExec.spec.ts b/packages/cli-core/src/decorators/onExec.spec.ts index 4b4eda6f8..861571fc3 100644 --- a/packages/cli-core/src/decorators/onExec.spec.ts +++ b/packages/cli-core/src/decorators/onExec.spec.ts @@ -1,7 +1,7 @@ import {Store} from "@tsed/core"; -import {CommandStoreKeys} from "../domains/CommandStoreKeys"; -import {OnExec} from "./onExec"; +import {CommandStoreKeys} from "../domains/CommandStoreKeys.js"; +import {OnExec} from "./onExec.js"; class Test { @OnExec("cmd") diff --git a/packages/cli-core/src/decorators/onExec.ts b/packages/cli-core/src/decorators/onExec.ts index bff621613..460c68810 100644 --- a/packages/cli-core/src/decorators/onExec.ts +++ b/packages/cli-core/src/decorators/onExec.ts @@ -1,5 +1,5 @@ -import {CommandStoreKeys} from "../domains/CommandStoreKeys"; -import {On} from "./on"; +import {CommandStoreKeys} from "../domains/CommandStoreKeys.js"; +import {On} from "./on.js"; export function OnExec(cmdName: string): MethodDecorator { return On(CommandStoreKeys.EXEC_HOOKS, cmdName); diff --git a/packages/cli-core/src/decorators/onPostInstall.spec.ts b/packages/cli-core/src/decorators/onPostInstall.spec.ts index c7cbd5d6f..a170d501b 100644 --- a/packages/cli-core/src/decorators/onPostInstall.spec.ts +++ b/packages/cli-core/src/decorators/onPostInstall.spec.ts @@ -1,7 +1,7 @@ import {Store} from "@tsed/core"; -import {CommandStoreKeys} from "../domains/CommandStoreKeys"; -import {OnPostInstall} from "./onPostInstall"; +import {CommandStoreKeys} from "../domains/CommandStoreKeys.js"; +import {OnPostInstall} from "./onPostInstall.js"; class Test { @OnPostInstall("cmd") diff --git a/packages/cli-core/src/decorators/onPostInstall.ts b/packages/cli-core/src/decorators/onPostInstall.ts index c522d830a..a30facf7f 100644 --- a/packages/cli-core/src/decorators/onPostInstall.ts +++ b/packages/cli-core/src/decorators/onPostInstall.ts @@ -1,5 +1,5 @@ -import {CommandStoreKeys} from "../domains/CommandStoreKeys"; -import {On} from "./on"; +import {CommandStoreKeys} from "../domains/CommandStoreKeys.js"; +import {On} from "./on.js"; export function OnPostInstall(cmdName: string): MethodDecorator { return On(CommandStoreKeys.POST_INSTALL_HOOKS, cmdName); diff --git a/packages/cli-core/src/decorators/onPrompt.spec.ts b/packages/cli-core/src/decorators/onPrompt.spec.ts index cf78f4dc8..b510e4933 100644 --- a/packages/cli-core/src/decorators/onPrompt.spec.ts +++ b/packages/cli-core/src/decorators/onPrompt.spec.ts @@ -1,7 +1,7 @@ import {Store} from "@tsed/core"; -import {CommandStoreKeys} from "../domains/CommandStoreKeys"; -import {OnPrompt} from "./onPrompt"; +import {CommandStoreKeys} from "../domains/CommandStoreKeys.js"; +import {OnPrompt} from "./onPrompt.js"; class Test { @OnPrompt("cmd") diff --git a/packages/cli-core/src/decorators/onPrompt.ts b/packages/cli-core/src/decorators/onPrompt.ts index 7cfc488f5..c2a656307 100644 --- a/packages/cli-core/src/decorators/onPrompt.ts +++ b/packages/cli-core/src/decorators/onPrompt.ts @@ -1,5 +1,5 @@ -import {CommandStoreKeys} from "../domains/CommandStoreKeys"; -import {On} from "./on"; +import {CommandStoreKeys} from "../domains/CommandStoreKeys.js"; +import {On} from "./on.js"; export function OnPrompt(cmdName: string): MethodDecorator { return On(CommandStoreKeys.PROMPT_HOOKS, cmdName); diff --git a/packages/cli-core/src/domains/CliError.ts b/packages/cli-core/src/domains/CliError.ts index 749569ef0..3ebb92061 100644 --- a/packages/cli-core/src/domains/CliError.ts +++ b/packages/cli-core/src/domains/CliError.ts @@ -1,4 +1,4 @@ -import type {CliCore} from "../CliCore"; +import type {CliCore} from "../CliCore.js"; export class CliError extends Error { name = "CLI_ERROR"; diff --git a/packages/cli-core/src/index.ts b/packages/cli-core/src/index.ts index 1182b1abe..5b63eef70 100644 --- a/packages/cli-core/src/index.ts +++ b/packages/cli-core/src/index.ts @@ -1,10 +1,10 @@ import Inquirer from "inquirer"; -export * from "./CliCore"; -export * from "./decorators/index"; -export * from "./interfaces/index"; -export * from "./packageManagers/index"; -export * from "./services/index"; -export * from "./utils/index"; +export * from "./CliCore.js"; +export * from "./decorators/index.js"; +export * from "./interfaces/index.js"; +export * from "./packageManagers/index.js"; +export * from "./services/index.js"; +export * from "./utils/index.js"; export * from "@tsed/core"; export { Configuration, diff --git a/packages/cli-core/src/interfaces/CommandMetadata.ts b/packages/cli-core/src/interfaces/CommandMetadata.ts index 44f4a85b8..78b810852 100644 --- a/packages/cli-core/src/interfaces/CommandMetadata.ts +++ b/packages/cli-core/src/interfaces/CommandMetadata.ts @@ -1,4 +1,4 @@ -import {CommandArg, CommandOptions, CommandParameters} from "./CommandParameters"; +import {CommandArg, CommandOptions, CommandParameters} from "./CommandParameters.js"; export interface CommandMetadata extends CommandParameters { /** diff --git a/packages/cli-core/src/interfaces/CommandProvider.ts b/packages/cli-core/src/interfaces/CommandProvider.ts index fcd9557ae..96793674a 100644 --- a/packages/cli-core/src/interfaces/CommandProvider.ts +++ b/packages/cli-core/src/interfaces/CommandProvider.ts @@ -1,6 +1,6 @@ import {Answers, QuestionCollection} from "inquirer"; -import {Tasks} from "./Tasks"; +import {Tasks} from "./Tasks.js"; export type QuestionOptions = QuestionCollection; diff --git a/packages/cli-core/src/interfaces/index.ts b/packages/cli-core/src/interfaces/index.ts index ac93193c5..ebbfdd721 100644 --- a/packages/cli-core/src/interfaces/index.ts +++ b/packages/cli-core/src/interfaces/index.ts @@ -1,15 +1,15 @@ import {Type} from "@tsed/core"; -import {CommandProvider} from "./CommandProvider"; -import {PackageJson} from "./PackageJson"; +import {CommandProvider} from "./CommandProvider.js"; +import {PackageJson} from "./PackageJson.js"; -export * from "./CliDefaultOptions"; -export * from "./CommandMetadata"; -export * from "./CommandParameters"; -export * from "./CommandProvider"; -export * from "./PackageJson"; -export * from "./ProjectPreferences"; -export * from "./Tasks"; +export * from "./CliDefaultOptions.js"; +export * from "./CommandMetadata.js"; +export * from "./CommandParameters.js"; +export * from "./CommandProvider.js"; +export * from "./PackageJson.js"; +export * from "./ProjectPreferences.js"; +export * from "./Tasks.js"; declare global { namespace TsED { diff --git a/packages/cli-core/src/packageManagers/PackageManagersModule.spec.ts b/packages/cli-core/src/packageManagers/PackageManagersModule.spec.ts index 5c672f97b..9a381a1ab 100644 --- a/packages/cli-core/src/packageManagers/PackageManagersModule.spec.ts +++ b/packages/cli-core/src/packageManagers/PackageManagersModule.spec.ts @@ -1,13 +1,13 @@ // @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; -import {CliFs} from "../services"; -import {PackageManagersModule} from "./PackageManagersModule"; -import {BunManager} from "./supports/BunManager"; -import {NpmManager} from "./supports/NpmManager"; -import {PNpmManager} from "./supports/PNpmManager"; -import {YarnBerryManager} from "./supports/YarnBerryManager"; -import {YarnManager} from "./supports/YarnManager"; +import {CliFs} from "../services/index.js"; +import {PackageManagersModule} from "./PackageManagersModule.js"; +import {BunManager} from "./supports/BunManager.js"; +import {NpmManager} from "./supports/NpmManager.js"; +import {PNpmManager} from "./supports/PNpmManager.js"; +import {YarnBerryManager} from "./supports/YarnBerryManager.js"; +import {YarnManager} from "./supports/YarnManager.js"; async function getModuleFixture() { const yarnManager = { diff --git a/packages/cli-core/src/packageManagers/PackageManagersModule.ts b/packages/cli-core/src/packageManagers/PackageManagersModule.ts index 315521c1c..d68ecdb72 100644 --- a/packages/cli-core/src/packageManagers/PackageManagersModule.ts +++ b/packages/cli-core/src/packageManagers/PackageManagersModule.ts @@ -3,14 +3,14 @@ import {Options} from "execa"; import {EMPTY, throwError} from "rxjs"; import {catchError} from "rxjs/operators"; -import {ProjectPackageJson} from "../services/ProjectPackageJson"; -import {isValidVersion} from "../utils/isValidVersion"; -import {BaseManager} from "./supports/BaseManager"; -import {BunManager} from "./supports/BunManager"; -import {NpmManager} from "./supports/NpmManager"; -import {PNpmManager} from "./supports/PNpmManager"; -import {YarnBerryManager} from "./supports/YarnBerryManager"; -import {YarnManager} from "./supports/YarnManager"; +import {ProjectPackageJson} from "../services/ProjectPackageJson.js"; +import {isValidVersion} from "../utils/isValidVersion.js"; +import {BaseManager} from "./supports/BaseManager.js"; +import {BunManager} from "./supports/BunManager.js"; +import {NpmManager} from "./supports/NpmManager.js"; +import {PNpmManager} from "./supports/PNpmManager.js"; +import {YarnBerryManager} from "./supports/YarnBerryManager.js"; +import {YarnManager} from "./supports/YarnManager.js"; function mapPackagesWithInvalidVersion(deps: any) { const toString = (info: [string, string]) => { diff --git a/packages/cli-core/src/packageManagers/index.ts b/packages/cli-core/src/packageManagers/index.ts index fd994a173..e9a943032 100644 --- a/packages/cli-core/src/packageManagers/index.ts +++ b/packages/cli-core/src/packageManagers/index.ts @@ -1,5 +1,5 @@ -export * from "./PackageManagersModule"; -export * from "./supports/BaseManager"; -export * from "./supports/NpmManager"; -export * from "./supports/PNpmManager"; -export * from "./supports/YarnManager"; +export * from "./PackageManagersModule.js"; +export * from "./supports/BaseManager.js"; +export * from "./supports/NpmManager.js"; +export * from "./supports/PNpmManager.js"; +export * from "./supports/YarnManager.js"; diff --git a/packages/cli-core/src/packageManagers/supports/BaseManager.ts b/packages/cli-core/src/packageManagers/supports/BaseManager.ts index 28183f4c4..8a7d442d1 100644 --- a/packages/cli-core/src/packageManagers/supports/BaseManager.ts +++ b/packages/cli-core/src/packageManagers/supports/BaseManager.ts @@ -2,7 +2,7 @@ import {Inject} from "@tsed/di"; import execa from "execa"; import {Observable} from "rxjs"; -import {CliExeca} from "../../services/CliExeca"; +import {CliExeca} from "../../services/CliExeca.js"; export type ManagerCmdOpts = {verbose?: boolean} & execa.Options; export type ManagerCmdSyncOpts = {verbose?: boolean} & execa.SyncOptions; diff --git a/packages/cli-core/src/packageManagers/supports/BunManager.spec.ts b/packages/cli-core/src/packageManagers/supports/BunManager.spec.ts index 8a081c966..136a8b961 100644 --- a/packages/cli-core/src/packageManagers/supports/BunManager.spec.ts +++ b/packages/cli-core/src/packageManagers/supports/BunManager.spec.ts @@ -1,8 +1,8 @@ // @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; -import {CliExeca} from "../../services"; -import {BunManager} from "./BunManager"; +import {CliExeca} from "../../services/index.js"; +import {BunManager} from "./BunManager.js"; async function getManagerFixture() { const cliExeca = { diff --git a/packages/cli-core/src/packageManagers/supports/BunManager.ts b/packages/cli-core/src/packageManagers/supports/BunManager.ts index 78f9dc760..c82f8e58f 100644 --- a/packages/cli-core/src/packageManagers/supports/BunManager.ts +++ b/packages/cli-core/src/packageManagers/supports/BunManager.ts @@ -2,7 +2,7 @@ import {Injectable} from "@tsed/di"; import execa from "execa"; import {Observable} from "rxjs"; -import {BaseManager, ManagerCmdOpts} from "./BaseManager"; +import {BaseManager, ManagerCmdOpts} from "./BaseManager.js"; @Injectable({ type: "package:manager" diff --git a/packages/cli-core/src/packageManagers/supports/NpmManager.spec.ts b/packages/cli-core/src/packageManagers/supports/NpmManager.spec.ts index c70c65c6d..dac0a6b74 100644 --- a/packages/cli-core/src/packageManagers/supports/NpmManager.spec.ts +++ b/packages/cli-core/src/packageManagers/supports/NpmManager.spec.ts @@ -1,8 +1,8 @@ // @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; -import {CliExeca} from "../../services"; -import {NpmManager} from "./NpmManager"; +import {CliExeca} from "../../services/index.js"; +import {NpmManager} from "./NpmManager.js"; async function getManagerFixture() { const cliExeca = { diff --git a/packages/cli-core/src/packageManagers/supports/NpmManager.ts b/packages/cli-core/src/packageManagers/supports/NpmManager.ts index 5571771f0..436630e88 100644 --- a/packages/cli-core/src/packageManagers/supports/NpmManager.ts +++ b/packages/cli-core/src/packageManagers/supports/NpmManager.ts @@ -1,7 +1,7 @@ import {Injectable} from "@tsed/di"; import {Observable} from "rxjs"; -import {BaseManager, ManagerCmdOpts} from "./BaseManager"; +import {BaseManager, ManagerCmdOpts} from "./BaseManager.js"; @Injectable({ type: "package:manager" diff --git a/packages/cli-core/src/packageManagers/supports/PNpmManager.spec.ts b/packages/cli-core/src/packageManagers/supports/PNpmManager.spec.ts index 3d49c78b1..88bd18d81 100644 --- a/packages/cli-core/src/packageManagers/supports/PNpmManager.spec.ts +++ b/packages/cli-core/src/packageManagers/supports/PNpmManager.spec.ts @@ -1,8 +1,8 @@ // @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; -import {CliExeca} from "../../services"; -import {PNpmManager} from "./PNpmManager"; +import {CliExeca} from "../../services/index.js"; +import {PNpmManager} from "./PNpmManager.js"; async function getManagerFixture() { const cliExeca = { diff --git a/packages/cli-core/src/packageManagers/supports/PNpmManager.ts b/packages/cli-core/src/packageManagers/supports/PNpmManager.ts index 95f910167..fc4261841 100644 --- a/packages/cli-core/src/packageManagers/supports/PNpmManager.ts +++ b/packages/cli-core/src/packageManagers/supports/PNpmManager.ts @@ -1,7 +1,7 @@ import {Injectable} from "@tsed/di"; import {Observable} from "rxjs"; -import {BaseManager, ManagerCmdOpts} from "./BaseManager"; +import {BaseManager, ManagerCmdOpts} from "./BaseManager.js"; @Injectable({ type: "package:manager" diff --git a/packages/cli-core/src/packageManagers/supports/YarnBerryManager.spec.ts b/packages/cli-core/src/packageManagers/supports/YarnBerryManager.spec.ts index 85ee73e14..fc0aca8cc 100644 --- a/packages/cli-core/src/packageManagers/supports/YarnBerryManager.spec.ts +++ b/packages/cli-core/src/packageManagers/supports/YarnBerryManager.spec.ts @@ -1,8 +1,8 @@ // @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; -import {CliExeca, CliYaml} from "../../services"; -import {YarnBerryManager} from "./YarnBerryManager"; +import {CliExeca, CliYaml} from "../../services/index.js"; +import {YarnBerryManager} from "./YarnBerryManager.js"; async function getManagerFixture() { const cliExeca = { diff --git a/packages/cli-core/src/packageManagers/supports/YarnBerryManager.ts b/packages/cli-core/src/packageManagers/supports/YarnBerryManager.ts index 2ebd442fe..f0d30c32a 100644 --- a/packages/cli-core/src/packageManagers/supports/YarnBerryManager.ts +++ b/packages/cli-core/src/packageManagers/supports/YarnBerryManager.ts @@ -3,8 +3,8 @@ import execa from "execa"; import {join} from "path"; import {Observable} from "rxjs"; -import {CliYaml} from "../../services/CliYaml"; -import {BaseManager, ManagerCmdOpts, ManagerCmdSyncOpts} from "./BaseManager"; +import {CliYaml} from "../../services/CliYaml.js"; +import {BaseManager, ManagerCmdOpts, ManagerCmdSyncOpts} from "./BaseManager.js"; @Injectable({ type: "package:manager" diff --git a/packages/cli-core/src/packageManagers/supports/YarnManager.spec.ts b/packages/cli-core/src/packageManagers/supports/YarnManager.spec.ts index 5bf0c522a..a83c6579d 100644 --- a/packages/cli-core/src/packageManagers/supports/YarnManager.spec.ts +++ b/packages/cli-core/src/packageManagers/supports/YarnManager.spec.ts @@ -1,8 +1,8 @@ // @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; -import {CliExeca} from "../../services"; -import {YarnManager} from "./YarnManager"; +import {CliExeca} from "../../services/index.js"; +import {YarnManager} from "./YarnManager.js"; async function getManagerFixture() { const cliExeca = { diff --git a/packages/cli-core/src/packageManagers/supports/YarnManager.ts b/packages/cli-core/src/packageManagers/supports/YarnManager.ts index d87b628b8..954084682 100644 --- a/packages/cli-core/src/packageManagers/supports/YarnManager.ts +++ b/packages/cli-core/src/packageManagers/supports/YarnManager.ts @@ -2,7 +2,7 @@ import {Injectable} from "@tsed/di"; import execa from "execa"; import {Observable} from "rxjs"; -import {BaseManager, ManagerCmdOpts} from "./BaseManager"; +import {BaseManager, ManagerCmdOpts} from "./BaseManager.js"; @Injectable({ type: "package:manager" diff --git a/packages/cli-core/src/services/CliDockerComposeYaml.ts b/packages/cli-core/src/services/CliDockerComposeYaml.ts index 514e375ea..39442a921 100644 --- a/packages/cli-core/src/services/CliDockerComposeYaml.ts +++ b/packages/cli-core/src/services/CliDockerComposeYaml.ts @@ -3,9 +3,9 @@ import {Inject, Injectable} from "@tsed/di"; import {snakeCase} from "change-case"; import {join} from "path"; -import {CliFs} from "./CliFs"; -import {CliYaml} from "./CliYaml"; -import {ProjectPackageJson} from "./ProjectPackageJson"; +import {CliFs} from "./CliFs.js"; +import {CliYaml} from "./CliYaml.js"; +import {ProjectPackageJson} from "./ProjectPackageJson.js"; @Injectable() export class CliDockerComposeYaml { diff --git a/packages/cli-core/src/services/CliExeca.ts b/packages/cli-core/src/services/CliExeca.ts index 44b6ecec0..96d98ee60 100644 --- a/packages/cli-core/src/services/CliExeca.ts +++ b/packages/cli-core/src/services/CliExeca.ts @@ -5,7 +5,7 @@ import {filter, mergeWith} from "rxjs/operators"; // @ts-ignore import split from "split"; -import {streamToObservable} from "../utils/streamToObservable"; +import {streamToObservable} from "../utils/streamToObservable.js"; @Injectable() export class CliExeca { diff --git a/packages/cli-core/src/services/CliHttpClient.spec.ts b/packages/cli-core/src/services/CliHttpClient.spec.ts index 1e3a3d641..be095758f 100644 --- a/packages/cli-core/src/services/CliHttpClient.spec.ts +++ b/packages/cli-core/src/services/CliHttpClient.spec.ts @@ -1,8 +1,8 @@ import {DITest} from "@tsed/di"; import axios from "axios"; -import {CliHttpClient} from "./CliHttpClient"; -import {CliProxyAgent} from "./CliProxyAgent"; +import {CliHttpClient} from "./CliHttpClient.js"; +import {CliProxyAgent} from "./CliProxyAgent.js"; vi.mock("axios"); describe("CliHttpClient", () => { diff --git a/packages/cli-core/src/services/CliHttpClient.ts b/packages/cli-core/src/services/CliHttpClient.ts index 25b7dc0dd..5b048d704 100644 --- a/packages/cli-core/src/services/CliHttpClient.ts +++ b/packages/cli-core/src/services/CliHttpClient.ts @@ -4,8 +4,8 @@ import axios, {AxiosRequestConfig, Method} from "axios"; import {stringify} from "querystring"; import {URL} from "url"; -import {CliHttpLogClient} from "./CliHttpLogClient"; -import {CliProxyAgent} from "./CliProxyAgent"; +import {CliHttpLogClient} from "./CliHttpLogClient.js"; +import {CliProxyAgent} from "./CliProxyAgent.js"; export interface CliHttpClientOptions extends AxiosRequestConfig, Record { qs?: Record; diff --git a/packages/cli-core/src/services/CliHttpLogClient.ts b/packages/cli-core/src/services/CliHttpLogClient.ts index 47982567a..1a9ead967 100644 --- a/packages/cli-core/src/services/CliHttpLogClient.ts +++ b/packages/cli-core/src/services/CliHttpLogClient.ts @@ -3,7 +3,7 @@ import {Inject, Opts} from "@tsed/di"; import {Logger} from "@tsed/logger"; import querystring from "querystring"; -import {logToCurl} from "../utils/logToCurl"; +import {logToCurl} from "../utils/logToCurl.js"; export interface BaseLogClientOptions { callee: string; diff --git a/packages/cli-core/src/services/CliLoadFile.spec.ts b/packages/cli-core/src/services/CliLoadFile.spec.ts index 2f16a567b..30c05a98e 100644 --- a/packages/cli-core/src/services/CliLoadFile.spec.ts +++ b/packages/cli-core/src/services/CliLoadFile.spec.ts @@ -1,7 +1,7 @@ import {catchAsyncError} from "@tsed/core"; import {DITest} from "@tsed/di"; -import {CliLoadFile} from "./CliLoadFile"; +import {CliLoadFile} from "./CliLoadFile.js"; describe("CliLoadFile", () => { beforeEach(() => DITest.create()); @@ -10,7 +10,7 @@ describe("CliLoadFile", () => { it("should load yaml file", async () => { const service = DITest.get(CliLoadFile); - const result = await service.loadFile(__dirname + "/__mock__/settings.yml"); + const result = await service.loadFile(import.meta.dirname + "/__mock__/settings.yml"); expect(result).toEqual({ architecture: "default", @@ -25,7 +25,7 @@ describe("CliLoadFile", () => { const service = DITest.get(CliLoadFile); const error = await catchAsyncError(() => - service.loadFile(__dirname + "/__mock__/settings.yml", { + service.loadFile(import.meta.dirname + "/__mock__/settings.yml", { type: "object", additionalProperties: true, properties: { @@ -43,7 +43,7 @@ describe("CliLoadFile", () => { it("should load json file", async () => { const service = DITest.get(CliLoadFile); - const result = await service.loadFile(__dirname + "/__mock__/settings.json"); + const result = await service.loadFile(import.meta.dirname + "/__mock__/settings.json"); expect(result).toEqual({ architecture: "default", convention: "default", diff --git a/packages/cli-core/src/services/CliLoadFile.ts b/packages/cli-core/src/services/CliLoadFile.ts index fb6d044e0..6635e1577 100644 --- a/packages/cli-core/src/services/CliLoadFile.ts +++ b/packages/cli-core/src/services/CliLoadFile.ts @@ -1,9 +1,9 @@ import {Inject, Injectable} from "@tsed/di"; -import Ajv, {Schema} from "ajv"; +import {default as Ajv, Schema} from "ajv"; import {extname} from "path"; -import {CliFs} from "./CliFs"; -import {CliYaml} from "./CliYaml"; +import {CliFs} from "./CliFs.js"; +import {CliYaml} from "./CliYaml.js"; @Injectable() export class CliLoadFile { @@ -13,6 +13,7 @@ export class CliLoadFile { @Inject() protected cliFs: CliFs; + // @ts-ignore #ajv: Ajv; constructor() { @@ -22,6 +23,7 @@ export class CliLoadFile { strict: false }; + // @ts-ignore this.#ajv = new Ajv(options); } diff --git a/packages/cli-core/src/services/CliPackageJson.ts b/packages/cli-core/src/services/CliPackageJson.ts index 4148a6941..06d55da6d 100644 --- a/packages/cli-core/src/services/CliPackageJson.ts +++ b/packages/cli-core/src/services/CliPackageJson.ts @@ -1,6 +1,6 @@ import {Configuration, Inject, registerProvider} from "@tsed/di"; -import {PackageJson} from "../interfaces/PackageJson"; +import {PackageJson} from "../interfaces/PackageJson.js"; export type CliPackageJson = PackageJson; diff --git a/packages/cli-core/src/services/CliPlugins.spec.ts b/packages/cli-core/src/services/CliPlugins.spec.ts index 0653f53d0..41f2836bb 100644 --- a/packages/cli-core/src/services/CliPlugins.spec.ts +++ b/packages/cli-core/src/services/CliPlugins.spec.ts @@ -1,8 +1,8 @@ // @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; -import {CliPlugins} from "./CliPlugins"; -import {NpmRegistryClient} from "./NpmRegistryClient"; +import {CliPlugins} from "./CliPlugins.js"; +import {NpmRegistryClient} from "./NpmRegistryClient.js"; describe("CliPlugins", () => { beforeEach(() => diff --git a/packages/cli-core/src/services/CliPlugins.ts b/packages/cli-core/src/services/CliPlugins.ts index eecc54dba..72078b37b 100644 --- a/packages/cli-core/src/services/CliPlugins.ts +++ b/packages/cli-core/src/services/CliPlugins.ts @@ -1,14 +1,14 @@ import {Constant, Inject, Injectable, InjectorService} from "@tsed/di"; import chalk from "chalk"; -import {CommandStoreKeys} from "../domains/CommandStoreKeys"; -import {Task} from "../interfaces"; -import {PackageManagersModule} from "../packageManagers/PackageManagersModule"; -import {createSubTasks} from "../utils/createTasksRunner"; -import {loadPlugins} from "../utils/loadPlugins"; -import {CliHooks} from "./CliHooks"; -import {NpmRegistryClient} from "./NpmRegistryClient"; -import {ProjectPackageJson} from "./ProjectPackageJson"; +import {CommandStoreKeys} from "../domains/CommandStoreKeys.js"; +import {Task} from "../interfaces/index.js"; +import {PackageManagersModule} from "../packageManagers/PackageManagersModule.js"; +import {createSubTasks} from "../utils/createTasksRunner.js"; +import {loadPlugins} from "../utils/loadPlugins.js"; +import {CliHooks} from "./CliHooks.js"; +import {NpmRegistryClient} from "./NpmRegistryClient.js"; +import {ProjectPackageJson} from "./ProjectPackageJson.js"; function mapPlugins({package: {name, description = "", ...otherProps}}: any) { return { diff --git a/packages/cli-core/src/services/CliProxyAgent.spec.ts b/packages/cli-core/src/services/CliProxyAgent.spec.ts index a861c5b6f..8fc91ef1e 100644 --- a/packages/cli-core/src/services/CliProxyAgent.spec.ts +++ b/packages/cli-core/src/services/CliProxyAgent.spec.ts @@ -1,12 +1,12 @@ -// @ts-ignore -import "../index"; +import "../index.js"; +// @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; import tunnel from "tunnel"; -import {CliConfiguration} from "./CliConfiguration"; -import {CliExeca} from "./CliExeca"; -import {CliProxyAgent} from "./CliProxyAgent"; +import {CliConfiguration} from "./CliConfiguration.js"; +import {CliExeca} from "./CliExeca.js"; +import {CliProxyAgent} from "./CliProxyAgent.js"; vi.mock("tunnel"); diff --git a/packages/cli-core/src/services/CliProxyAgent.ts b/packages/cli-core/src/services/CliProxyAgent.ts index 9470535cc..43825cbc4 100644 --- a/packages/cli-core/src/services/CliProxyAgent.ts +++ b/packages/cli-core/src/services/CliProxyAgent.ts @@ -3,9 +3,9 @@ import {camelCase} from "change-case"; import tunnel from "tunnel"; import {URL} from "url"; -import {coerce} from "../utils/coerce"; -import {CliExeca} from "./CliExeca"; -import {ProjectPackageJson} from "./ProjectPackageJson"; +import {coerce} from "../utils/coerce.js"; +import {CliExeca} from "./CliExeca.js"; +import {ProjectPackageJson} from "./ProjectPackageJson.js"; export interface CliProxySettings { url: string; diff --git a/packages/cli-core/src/services/CliRunScript.spec.ts b/packages/cli-core/src/services/CliRunScript.spec.ts index 5670741f0..8527a41a3 100644 --- a/packages/cli-core/src/services/CliRunScript.spec.ts +++ b/packages/cli-core/src/services/CliRunScript.spec.ts @@ -1,10 +1,9 @@ -// @ts-ignore - // @ts-ignore import runScript from "@npmcli/run-script"; +// @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; -import {CliRunScript} from "./CliRunScript"; +import {CliRunScript} from "./CliRunScript.js"; vi.mock("@npmcli/run-script"); diff --git a/packages/cli-core/src/services/CliRunScript.ts b/packages/cli-core/src/services/CliRunScript.ts index 85e84a2d9..356560e25 100644 --- a/packages/cli-core/src/services/CliRunScript.ts +++ b/packages/cli-core/src/services/CliRunScript.ts @@ -2,7 +2,7 @@ import runScript from "@npmcli/run-script"; import {Inject, Injectable} from "@tsed/di"; -import {ProjectPackageJson} from "./ProjectPackageJson"; +import {ProjectPackageJson} from "./ProjectPackageJson.js"; @Injectable() export class CliRunScript { diff --git a/packages/cli-core/src/services/CliService.ts b/packages/cli-core/src/services/CliService.ts index 61fc416f1..0f36f783f 100644 --- a/packages/cli-core/src/services/CliService.ts +++ b/packages/cli-core/src/services/CliService.ts @@ -6,18 +6,18 @@ import Inquirer from "inquirer"; import inquirer_autocomplete_prompt from "inquirer-autocomplete-prompt"; import {v4} from "uuid"; -import {CommandStoreKeys} from "../domains/CommandStoreKeys"; -import {CommandMetadata} from "../interfaces/CommandMetadata"; -import {CommandArg, CommandOptions} from "../interfaces/CommandParameters"; -import {CommandProvider} from "../interfaces/CommandProvider"; -import {PackageManagersModule} from "../packageManagers/index"; -import {createSubTasks, createTasksRunner} from "../utils/createTasksRunner"; -import {getCommandMetadata} from "../utils/getCommandMetadata"; -import {mapCommanderArgs} from "../utils/mapCommanderArgs"; -import {mapCommanderOptions} from "../utils/mapCommanderOptions"; -import {parseOption} from "../utils/parseOption"; -import {CliHooks} from "./CliHooks"; -import {ProjectPackageJson} from "./ProjectPackageJson"; +import {CommandStoreKeys} from "../domains/CommandStoreKeys.js"; +import {CommandMetadata} from "../interfaces/CommandMetadata.js"; +import {CommandArg, CommandOptions} from "../interfaces/CommandParameters.js"; +import {CommandProvider} from "../interfaces/CommandProvider.js"; +import {PackageManagersModule} from "../packageManagers/index.js"; +import {createSubTasks, createTasksRunner} from "../utils/createTasksRunner.js"; +import {getCommandMetadata} from "../utils/getCommandMetadata.js"; +import {mapCommanderArgs} from "../utils/mapCommanderArgs.js"; +import {mapCommanderOptions} from "../utils/mapCommanderOptions.js"; +import {parseOption} from "../utils/parseOption.js"; +import {CliHooks} from "./CliHooks.js"; +import {ProjectPackageJson} from "./ProjectPackageJson.js"; Inquirer.registerPrompt("autocomplete", inquirer_autocomplete_prompt); diff --git a/packages/cli-core/src/services/CliYaml.ts b/packages/cli-core/src/services/CliYaml.ts index 6ca74d942..c7a18cfea 100644 --- a/packages/cli-core/src/services/CliYaml.ts +++ b/packages/cli-core/src/services/CliYaml.ts @@ -1,7 +1,7 @@ import {Inject, Injectable} from "@tsed/di"; import JsYaml from "js-yaml"; -import {CliFs} from "./CliFs"; +import {CliFs} from "./CliFs.js"; @Injectable() export class CliYaml { diff --git a/packages/cli-core/src/services/NpmRegistryClient.spec.ts b/packages/cli-core/src/services/NpmRegistryClient.spec.ts index 7cc5bcc9f..5bfc58691 100644 --- a/packages/cli-core/src/services/NpmRegistryClient.spec.ts +++ b/packages/cli-core/src/services/NpmRegistryClient.spec.ts @@ -1,8 +1,8 @@ // @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; -import {CliHttpClient} from "./CliHttpClient"; -import {NpmRegistryClient} from "./NpmRegistryClient"; +import {CliHttpClient} from "./CliHttpClient.js"; +import {NpmRegistryClient} from "./NpmRegistryClient.js"; describe("NpmRegistryClient", () => { beforeEach(() => CliPlatformTest.create()); diff --git a/packages/cli-core/src/services/NpmRegistryClient.ts b/packages/cli-core/src/services/NpmRegistryClient.ts index 3858c941b..c7a1e724c 100644 --- a/packages/cli-core/src/services/NpmRegistryClient.ts +++ b/packages/cli-core/src/services/NpmRegistryClient.ts @@ -2,8 +2,8 @@ import {Inject, Injectable} from "@tsed/di"; import registry_url from "registry-url"; import url from "url"; -import {PackageInfo} from "../interfaces/PackageJson"; -import {CliHttpClient} from "./CliHttpClient"; +import {PackageInfo} from "../interfaces/PackageJson.js"; +import {CliHttpClient} from "./CliHttpClient.js"; const HOST = registry_url(); const REGEX_REGISTRY_ENFORCED_HTTPS = /^https?:\/\/([^\/]+\.)?(yarnpkg\.com|npmjs\.(org|com))(\/|$)/; diff --git a/packages/cli-core/src/services/ProjectPackageJson.spec.ts b/packages/cli-core/src/services/ProjectPackageJson.spec.ts index 23138e6b7..41a8334a4 100644 --- a/packages/cli-core/src/services/ProjectPackageJson.spec.ts +++ b/packages/cli-core/src/services/ProjectPackageJson.spec.ts @@ -2,11 +2,11 @@ import {CliPlatformTest} from "@tsed/cli-testing"; import {join, resolve} from "path"; -import {CliExeca} from "./CliExeca"; -import {CliFs} from "./CliFs"; -import {ProjectPackageJson} from "./ProjectPackageJson"; +import {CliExeca} from "./CliExeca.js"; +import {CliFs} from "./CliFs.js"; +import {ProjectPackageJson} from "./ProjectPackageJson.js"; -const dir = __dirname; +const dir = import.meta.dirname; async function getProjectPackageJsonFixture() { const cliFs = { @@ -91,6 +91,7 @@ describe("ProjectPackageJson", () => { devDependencies: { "dev-module3": "6.0.0" }, + type: "module", tsed: { packageManager: "npm", runtime: "node" diff --git a/packages/cli-core/src/services/ProjectPackageJson.ts b/packages/cli-core/src/services/ProjectPackageJson.ts index 77c536162..8ff016dfb 100644 --- a/packages/cli-core/src/services/ProjectPackageJson.ts +++ b/packages/cli-core/src/services/ProjectPackageJson.ts @@ -3,10 +3,10 @@ import {Configuration, Injectable} from "@tsed/di"; import {dirname, join} from "path"; import readPkgUp from "read-pkg-up"; -import {PackageJson} from "../interfaces/PackageJson"; -import {ProjectPreferences} from "../interfaces/ProjectPreferences"; -import {isValidVersion} from "../utils/isValidVersion"; -import {CliFs} from "./CliFs"; +import {PackageJson} from "../interfaces/PackageJson.js"; +import {ProjectPreferences} from "../interfaces/ProjectPreferences.js"; +import {isValidVersion} from "../utils/isValidVersion.js"; +import {CliFs} from "./CliFs.js"; function sortKeys(obj: any) { return Object.entries(obj) @@ -52,6 +52,7 @@ export class ProjectPackageJson { name: "", version: "1.0.0", description: "", + type: "module", scripts: {}, dependencies: {}, devDependencies: {} diff --git a/packages/cli-core/src/services/Renderer.spec.ts b/packages/cli-core/src/services/Renderer.spec.ts index 3c9c5dae8..c4354cb53 100644 --- a/packages/cli-core/src/services/Renderer.spec.ts +++ b/packages/cli-core/src/services/Renderer.spec.ts @@ -1,11 +1,15 @@ // @ts-ignore +import {join} from "node:path"; + import {FakeCliFs, normalizePath} from "@tsed/cli-testing"; import Consolidate from "consolidate"; import globby from "globby"; import handlebars from "handlebars"; -import {TEMPLATE_DIR} from "../../../cli-plugin-jest/src/utils/templateDir"; -import {RootRendererService, SrcRendererService} from "./Renderer"; +import {getTemplateDirectory} from "../utils/index.js"; +import {RootRendererService, SrcRendererService} from "./Renderer.js"; + +const TEMPLATE_DIR = getTemplateDirectory(join(import.meta.url, "../../../cli-plugin-jest/src/utils")); vi.mock("consolidate"); vi.mock("globby"); diff --git a/packages/cli-core/src/services/Renderer.ts b/packages/cli-core/src/services/Renderer.ts index c0185f67f..57bc8c025 100644 --- a/packages/cli-core/src/services/Renderer.ts +++ b/packages/cli-core/src/services/Renderer.ts @@ -10,9 +10,9 @@ import normalizePath from "normalize-path"; import {basename, dirname, join, relative} from "path"; import {Observable} from "rxjs"; -import {insertAfter} from "../utils/renderer/insertAfter"; -import {insertImport} from "../utils/renderer/insertImport"; -import {CliFs} from "./CliFs"; +import {insertAfter} from "../utils/renderer/insertAfter.js"; +import {insertImport} from "../utils/renderer/insertImport.js"; +import {CliFs} from "./CliFs.js"; export interface RenderOptions { path: string; diff --git a/packages/cli-core/src/services/index.ts b/packages/cli-core/src/services/index.ts index a5144945c..28bddc8a4 100644 --- a/packages/cli-core/src/services/index.ts +++ b/packages/cli-core/src/services/index.ts @@ -1,15 +1,15 @@ -export * from "./CliConfiguration"; -export * from "./CliDockerComposeYaml"; -export * from "./CliExeca"; -export * from "./CliFs"; -export * from "./CliHttpClient"; -export * from "./CliLoadFile"; -export * from "./CliPackageJson"; -export * from "./CliPlugins"; -export * from "./CliProxyAgent"; -export * from "./CliRunScript"; -export * from "./CliService"; -export * from "./CliYaml"; -export * from "./NpmRegistryClient"; -export * from "./ProjectPackageJson"; -export * from "./Renderer"; +export * from "./CliConfiguration.js"; +export * from "./CliDockerComposeYaml.js"; +export * from "./CliExeca.js"; +export * from "./CliFs.js"; +export * from "./CliHttpClient.js"; +export * from "./CliLoadFile.js"; +export * from "./CliPackageJson.js"; +export * from "./CliPlugins.js"; +export * from "./CliProxyAgent.js"; +export * from "./CliRunScript.js"; +export * from "./CliService.js"; +export * from "./CliYaml.js"; +export * from "./NpmRegistryClient.js"; +export * from "./ProjectPackageJson.js"; +export * from "./Renderer.js"; diff --git a/packages/cli-core/src/utils/coerce.spec.ts b/packages/cli-core/src/utils/coerce.spec.ts index b14533688..cfea7210b 100644 --- a/packages/cli-core/src/utils/coerce.spec.ts +++ b/packages/cli-core/src/utils/coerce.spec.ts @@ -1,4 +1,4 @@ -import {coerce} from "./coerce"; +import {coerce} from "./coerce.js"; describe("coerce", () => { it("should coerce given value", () => { diff --git a/packages/cli-core/src/utils/createInjector.spec.ts b/packages/cli-core/src/utils/createInjector.spec.ts index 7481f1ec6..ce3281af5 100644 --- a/packages/cli-core/src/utils/createInjector.spec.ts +++ b/packages/cli-core/src/utils/createInjector.spec.ts @@ -1,8 +1,8 @@ import {InjectorService} from "@tsed/di"; import {Logger} from "@tsed/logger"; -import {CliConfiguration} from "../services"; -import {createInjector} from "./createInjector"; +import {CliConfiguration} from "../services/index.js"; +import {createInjector} from "./createInjector.js"; describe("createInjector", () => { it("should create the injector", () => { diff --git a/packages/cli-core/src/utils/createInjector.ts b/packages/cli-core/src/utils/createInjector.ts index 58f54b35b..856938978 100644 --- a/packages/cli-core/src/utils/createInjector.ts +++ b/packages/cli-core/src/utils/createInjector.ts @@ -1,8 +1,8 @@ import {DIConfigurationOptions, InjectorService} from "@tsed/di"; import {Logger} from "@tsed/logger"; -import {CliConfiguration} from "../services/CliConfiguration"; -import {ProjectPackageJson} from "../services/ProjectPackageJson"; +import {CliConfiguration} from "../services/CliConfiguration.js"; +import {ProjectPackageJson} from "../services/ProjectPackageJson.js"; let logger: Logger; diff --git a/packages/cli-core/src/utils/createTasksRunner.ts b/packages/cli-core/src/utils/createTasksRunner.ts index 6f5f5a272..420f3d6e6 100644 --- a/packages/cli-core/src/utils/createTasksRunner.ts +++ b/packages/cli-core/src/utils/createTasksRunner.ts @@ -2,8 +2,8 @@ import {isFunction} from "@tsed/core"; import {Listr, ListrTaskWrapper, Logger} from "listr2"; -import type {TaskOptions, Tasks} from "../interfaces/Tasks"; -import {getLogger} from "./createInjector"; +import type {TaskOptions, Tasks} from "../interfaces/Tasks.js"; +import {getLogger} from "./createInjector.js"; class CustomLogger extends Logger { fail(message: string) { diff --git a/packages/cli-core/src/utils/getCommandMetadata.spec.ts b/packages/cli-core/src/utils/getCommandMetadata.spec.ts index 78e3f7704..c63b7f3bb 100644 --- a/packages/cli-core/src/utils/getCommandMetadata.spec.ts +++ b/packages/cli-core/src/utils/getCommandMetadata.spec.ts @@ -1,5 +1,5 @@ -import {Command} from "../decorators"; -import {getCommandMetadata} from "./getCommandMetadata"; +import {Command} from "../decorators/index.js"; +import {getCommandMetadata} from "./getCommandMetadata.js"; @Command({ name: "name", diff --git a/packages/cli-core/src/utils/getCommandMetadata.ts b/packages/cli-core/src/utils/getCommandMetadata.ts index 1710d0206..864b76ec3 100644 --- a/packages/cli-core/src/utils/getCommandMetadata.ts +++ b/packages/cli-core/src/utils/getCommandMetadata.ts @@ -1,8 +1,8 @@ import {Store, Type} from "@tsed/core"; -import {CommandStoreKeys} from "../domains/CommandStoreKeys"; -import {CommandMetadata} from "../interfaces/CommandMetadata"; -import {CommandParameters} from "../interfaces/CommandParameters"; +import {CommandStoreKeys} from "../domains/CommandStoreKeys.js"; +import {CommandMetadata} from "../interfaces/CommandMetadata.js"; +import {CommandParameters} from "../interfaces/CommandParameters.js"; export function getCommandMetadata(token: Type): CommandMetadata { const { diff --git a/packages/cli-core/src/utils/hbs/collection.ts b/packages/cli-core/src/utils/hbs/collection.ts index e73257678..edc99d9ee 100644 --- a/packages/cli-core/src/utils/hbs/collection.ts +++ b/packages/cli-core/src/utils/hbs/collection.ts @@ -1,8 +1,8 @@ // @ts-ignore import util from "handlebars-utils"; -import {helpers as array} from "./array"; -import {helpers as object} from "./object"; +import {helpers as array} from "./array.js"; +import {helpers as object} from "./object.js"; const forEach = array.forEach; const forOwn = object.forOwn; diff --git a/packages/cli-core/src/utils/hbs/index.ts b/packages/cli-core/src/utils/hbs/index.ts index d2ff60261..b64c5b699 100644 --- a/packages/cli-core/src/utils/hbs/index.ts +++ b/packages/cli-core/src/utils/hbs/index.ts @@ -1,10 +1,10 @@ import handlebars from "handlebars"; -import {helpers as array} from "./array"; -import {helpers as collection} from "./collection"; -import {helpers as comparison} from "./comparison"; -import {helpers as object} from "./object"; -import {helpers as switchHelpers} from "./switch"; +import {helpers as array} from "./array.js"; +import {helpers as collection} from "./collection.js"; +import {helpers as comparison} from "./comparison.js"; +import {helpers as object} from "./object.js"; +import {helpers as switchHelpers} from "./switch.js"; handlebars.registerHelper(array); handlebars.registerHelper(object); diff --git a/packages/cli-core/src/utils/hbs/object.ts b/packages/cli-core/src/utils/hbs/object.ts index fd2dd4409..a071dc0e4 100644 --- a/packages/cli-core/src/utils/hbs/object.ts +++ b/packages/cli-core/src/utils/hbs/object.ts @@ -4,7 +4,7 @@ import createFrame from "create-frame"; // @ts-ignore import util from "handlebars-utils"; -import {helpers as array} from "./array"; +import {helpers as array} from "./array.js"; const hasOwn = Object.hasOwnProperty; export const helpers: any = {}; diff --git a/packages/cli-core/src/utils/hbs/switch.spec.ts b/packages/cli-core/src/utils/hbs/switch.spec.ts index f615aabf6..5b5b70439 100644 --- a/packages/cli-core/src/utils/hbs/switch.spec.ts +++ b/packages/cli-core/src/utils/hbs/switch.spec.ts @@ -1,4 +1,4 @@ -import {helpers} from "./switch"; +import {helpers} from "./switch.js"; describe("switch", () => { it("should use switch statement", () => { diff --git a/packages/cli-core/src/utils/index.ts b/packages/cli-core/src/utils/index.ts index 76b31eb61..2383494cc 100644 --- a/packages/cli-core/src/utils/index.ts +++ b/packages/cli-core/src/utils/index.ts @@ -1,10 +1,10 @@ -export * from "./createInjector"; -export * from "./createTasksRunner"; -export * from "./getCommandMetadata"; -export * from "./getTemplateDirectory"; -export * from "./loadPlugins"; -export * from "./logToCurl"; -export * from "./mapCommanderArgs"; -export * from "./mapCommanderOptions"; -export * from "./parseOption"; -export * from "./resolveConfiguration"; +export * from "./createInjector.js"; +export * from "./createTasksRunner.js"; +export * from "./getCommandMetadata.js"; +export * from "./getTemplateDirectory.js"; +export * from "./loadPlugins.js"; +export * from "./logToCurl.js"; +export * from "./mapCommanderArgs.js"; +export * from "./mapCommanderOptions.js"; +export * from "./parseOption.js"; +export * from "./resolveConfiguration.js"; diff --git a/packages/cli-core/src/utils/isValidVersion.spec.ts b/packages/cli-core/src/utils/isValidVersion.spec.ts index b217b2e9a..141640cf0 100644 --- a/packages/cli-core/src/utils/isValidVersion.spec.ts +++ b/packages/cli-core/src/utils/isValidVersion.spec.ts @@ -1,4 +1,4 @@ -import {isValidVersion} from "./isValidVersion"; +import {isValidVersion} from "./isValidVersion.js"; describe("isValidVersion", () => { it("should validate version", () => { diff --git a/packages/cli-core/src/utils/loadPlugins.ts b/packages/cli-core/src/utils/loadPlugins.ts index 707b2ba13..13d7c0eda 100644 --- a/packages/cli-core/src/utils/loadPlugins.ts +++ b/packages/cli-core/src/utils/loadPlugins.ts @@ -3,8 +3,8 @@ import chalk from "chalk"; // @ts-ignore import {figures} from "listr2"; -import {CliFs} from "../services/CliFs"; -import {ProjectPackageJson} from "../services/ProjectPackageJson"; +import {CliFs} from "../services/CliFs.js"; +import {ProjectPackageJson} from "../services/ProjectPackageJson.js"; const all = (promises: any[]) => Promise.all(promises); diff --git a/packages/cli-core/src/utils/mapCommanderArgs.spec.ts b/packages/cli-core/src/utils/mapCommanderArgs.spec.ts index 4ec170ca4..fc0fb7b77 100644 --- a/packages/cli-core/src/utils/mapCommanderArgs.spec.ts +++ b/packages/cli-core/src/utils/mapCommanderArgs.spec.ts @@ -1,4 +1,4 @@ -import {mapCommanderArgs} from "./mapCommanderArgs"; +import {mapCommanderArgs} from "./mapCommanderArgs.js"; describe("mapCommanderArgs", () => { it("should map args", () => { diff --git a/packages/cli-core/src/utils/mapCommanderArgs.ts b/packages/cli-core/src/utils/mapCommanderArgs.ts index a6fa74d34..43bbaf413 100644 --- a/packages/cli-core/src/utils/mapCommanderArgs.ts +++ b/packages/cli-core/src/utils/mapCommanderArgs.ts @@ -1,6 +1,6 @@ import {isArray, isClass, Type} from "@tsed/core"; -import {CommandArg} from "../interfaces/CommandParameters"; +import {CommandArg} from "../interfaces/CommandParameters.js"; function mapValue(value: any, {type, itemType}: {type?: Type; itemType?: Type}) { if (!value) { diff --git a/packages/cli-core/src/utils/parseOption.spec.ts b/packages/cli-core/src/utils/parseOption.spec.ts index efe064c9e..7416651f2 100644 --- a/packages/cli-core/src/utils/parseOption.spec.ts +++ b/packages/cli-core/src/utils/parseOption.spec.ts @@ -1,4 +1,4 @@ -import {parseOption} from "./parseOption"; +import {parseOption} from "./parseOption.js"; describe("parseOptions", () => { it("should parse string --path ", () => { diff --git a/packages/cli-core/src/utils/renderer/insertAfter.spec.ts b/packages/cli-core/src/utils/renderer/insertAfter.spec.ts index 3e7a10cfd..a2fceda63 100644 --- a/packages/cli-core/src/utils/renderer/insertAfter.spec.ts +++ b/packages/cli-core/src/utils/renderer/insertAfter.spec.ts @@ -1,11 +1,11 @@ -import {insertAfter} from "./insertAfter"; +import {insertAfter} from "./insertAfter.js"; describe("insertAfter", () => { it("should inject content after pattern", () => { const fileContent = "#!/usr/bin/env node\n" + 'import {CliCore} from "@tsed/cli-core";\n' + - 'import {config} from "../config";\n' + + 'import {config} from "../config.js";\n' + "\n" + "CliCore.bootstrap({\n" + " ...config,\n" + @@ -19,7 +19,7 @@ describe("insertAfter", () => { expect(result2).toEqual( "#!/usr/bin/env node\n" + 'import {CliCore} from "@tsed/cli-core";\n' + - 'import {config} from "../config";\n' + + 'import {config} from "../config.js";\n' + "\n" + "CliCore.bootstrap({\n" + " ...config,\n" + diff --git a/packages/cli-core/src/utils/renderer/insertImport.spec.ts b/packages/cli-core/src/utils/renderer/insertImport.spec.ts index bb3458fdd..d72163ac2 100644 --- a/packages/cli-core/src/utils/renderer/insertImport.spec.ts +++ b/packages/cli-core/src/utils/renderer/insertImport.spec.ts @@ -1,11 +1,11 @@ -import {insertImport} from "./insertImport"; +import {insertImport} from "./insertImport.js"; describe("insertImport", () => { it("should inject import", () => { const fileContent = "#!/usr/bin/env node\n" + 'import {CliCore} from "@tsed/cli-core";\n' + - 'import {config} from "../config";\n' + + 'import {config} from "../config.js";\n' + "\n" + "CliCore.bootstrap({\n" + " ...config,\n" + @@ -13,13 +13,13 @@ describe("insertImport", () => { " ]\n" + "}).catch(console.error);"; - const result = insertImport(fileContent, 'import {HelloCmd} from "./HelloCmd";'); + const result = insertImport(fileContent, 'import {HelloCmd} from "./HelloCmd.js";'); expect(result).toEqual( "#!/usr/bin/env node\n" + 'import {CliCore} from "@tsed/cli-core";\n' + - 'import {config} from "../config";\n' + - 'import {HelloCmd} from "./HelloCmd";\n' + + 'import {config} from "../config.js";\n' + + 'import {HelloCmd} from "./HelloCmd.js";\n' + "\n" + "CliCore.bootstrap({\n" + " ...config,\n" + diff --git a/packages/cli-core/src/utils/resolveConfiguration.ts b/packages/cli-core/src/utils/resolveConfiguration.ts index 2c520d030..cae02c1b8 100644 --- a/packages/cli-core/src/utils/resolveConfiguration.ts +++ b/packages/cli-core/src/utils/resolveConfiguration.ts @@ -1,7 +1,7 @@ import {getValue} from "@tsed/core"; import {TokenProvider} from "@tsed/di"; -import {getCommandMetadata} from "./getCommandMetadata"; +import {getCommandMetadata} from "./getCommandMetadata.js"; export function resolveConfiguration(settings: any) { const argv = getValue(settings, "argv", process.argv); diff --git a/packages/cli-core/test/integrations/command.integration.spec.ts b/packages/cli-core/test/integrations/command.integration.spec.ts index aa87d4fb3..e4be43b37 100644 --- a/packages/cli-core/test/integrations/command.integration.spec.ts +++ b/packages/cli-core/test/integrations/command.integration.spec.ts @@ -1,12 +1,12 @@ import execa from "execa"; -import {CliCore, Command, CommandProvider, Tasks} from "../../src"; +import {CliCore, Command, CommandProvider, Tasks} from "../../src/index.js"; vi.mock("execa"); describe("Command", () => { beforeEach(() => { - (execa as any as vi.Mock).mockReturnValue({}); + vi.mocked(execa).mockReturnValue({} as never); }); it("should exec a command with expected parsed argument", async () => { @Command({ diff --git a/packages/cli-core/tsconfig.cjs.json b/packages/cli-core/tsconfig.cjs.json deleted file mode 100644 index 7f23b116d..000000000 --- a/packages/cli-core/tsconfig.cjs.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "extends": "@tsed/typescript/tsconfig.node.json", - "compilerOptions": { - "baseUrl": ".", - "module": "commonjs", - "moduleResolution": "Node16", - "rootDir": "src", - "outDir": "./lib/cjs", - "declaration": true, - "declarationDir": "./lib/types", - "composite": true, - "noEmit": false - }, - "include": ["src", "src/**/*.json"], - "exclude": [ - "node_modules", - "test", - "lib", - "benchmark", - "coverage", - "spec", - "**/*.benchmark.ts", - "**/*.spec.ts", - "keys", - "**/__mock__/**", - "webpack.config.js" - ] -} diff --git a/packages/cli-core/tsconfig.esm.json b/packages/cli-core/tsconfig.esm.json index ce32a9e07..45d441a7d 100644 --- a/packages/cli-core/tsconfig.esm.json +++ b/packages/cli-core/tsconfig.esm.json @@ -2,11 +2,9 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", - "declarationDir": "./lib/types-esm", + "declarationDir": "./lib/types", "declaration": true, "composite": true, "noEmit": false diff --git a/packages/cli-core/tsconfig.json b/packages/cli-core/tsconfig.json index d2f0c1fcd..ffa3a8cd7 100644 --- a/packages/cli-core/tsconfig.json +++ b/packages/cli-core/tsconfig.json @@ -6,9 +6,6 @@ }, "include": [], "references": [ - { - "path": "./tsconfig.cjs.json" - }, { "path": "./tsconfig.esm.json" }, diff --git a/packages/cli-core/tsconfig.spec.json b/packages/cli-core/tsconfig.spec.json index 75fcfa09d..0f06288a8 100644 --- a/packages/cli-core/tsconfig.spec.json +++ b/packages/cli-core/tsconfig.spec.json @@ -3,8 +3,6 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, diff --git a/packages/cli-generate-http-client/package.json b/packages/cli-generate-http-client/package.json index 88303d716..778c265fb 100644 --- a/packages/cli-generate-http-client/package.json +++ b/packages/cli-generate-http-client/package.json @@ -1,10 +1,10 @@ { "name": "@tsed/cli-generate-http-client", "description": "Ts.ED CLI plugin. Export a command that generate an HTTP Client (axios or fetch) from your Ts.ED controllers and OS3 spec.", - "type": "commonjs", "version": "5.2.10", + "type": "module", + "main": "./lib/esm/index.js", "source": "./src/index.ts", - "main": "./lib/cjs/index.js", "module": "./lib/esm/index.js", "typings": "./lib/types/index.d.ts", "exports": { @@ -26,8 +26,8 @@ "tslib": "2.3.1" }, "devDependencies": { - "@tsed/cli": "5.2.10", - "@tsed/cli-core": "5.2.10", + "@tsed/cli": "workspace:*", + "@tsed/cli-core": "workspace:*", "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", "swagger-typescript-api": "^9.3.1", diff --git a/packages/cli-generate-http-client/src/index.ts b/packages/cli-generate-http-client/src/index.ts index 3fe90dcab..d5a8baf0f 100644 --- a/packages/cli-generate-http-client/src/index.ts +++ b/packages/cli-generate-http-client/src/index.ts @@ -1,3 +1,3 @@ -export * from "./commands/GenerateHttpClientCmd"; +export * from "./commands/GenerateHttpClientCmd.js"; export default {}; diff --git a/packages/cli-generate-http-client/tsconfig.cjs.json b/packages/cli-generate-http-client/tsconfig.cjs.json deleted file mode 100644 index 7f23b116d..000000000 --- a/packages/cli-generate-http-client/tsconfig.cjs.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "extends": "@tsed/typescript/tsconfig.node.json", - "compilerOptions": { - "baseUrl": ".", - "module": "commonjs", - "moduleResolution": "Node16", - "rootDir": "src", - "outDir": "./lib/cjs", - "declaration": true, - "declarationDir": "./lib/types", - "composite": true, - "noEmit": false - }, - "include": ["src", "src/**/*.json"], - "exclude": [ - "node_modules", - "test", - "lib", - "benchmark", - "coverage", - "spec", - "**/*.benchmark.ts", - "**/*.spec.ts", - "keys", - "**/__mock__/**", - "webpack.config.js" - ] -} diff --git a/packages/cli-generate-http-client/tsconfig.esm.json b/packages/cli-generate-http-client/tsconfig.esm.json index ce32a9e07..45d441a7d 100644 --- a/packages/cli-generate-http-client/tsconfig.esm.json +++ b/packages/cli-generate-http-client/tsconfig.esm.json @@ -2,11 +2,9 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", - "declarationDir": "./lib/types-esm", + "declarationDir": "./lib/types", "declaration": true, "composite": true, "noEmit": false diff --git a/packages/cli-generate-http-client/tsconfig.json b/packages/cli-generate-http-client/tsconfig.json index 8c80e7e4f..cf03b6beb 100644 --- a/packages/cli-generate-http-client/tsconfig.json +++ b/packages/cli-generate-http-client/tsconfig.json @@ -12,9 +12,6 @@ { "path": "../cli-core/tsconfig.json" }, - { - "path": "./tsconfig.cjs.json" - }, { "path": "./tsconfig.esm.json" } diff --git a/packages/cli-generate-swagger/package.json b/packages/cli-generate-swagger/package.json index d50281eea..07347b0b1 100644 --- a/packages/cli-generate-swagger/package.json +++ b/packages/cli-generate-swagger/package.json @@ -1,10 +1,10 @@ { "name": "@tsed/cli-generate-swagger", "description": "Ts.ED CLI plugin. Export a command that generate the swagger.json from your Ts.ED controllers and OS3 spec.", - "type": "commonjs", "version": "5.2.10", + "type": "module", + "main": "./lib/esm/index.js", "source": "./src/index.ts", - "main": "./lib/cjs/index.js", "module": "./lib/esm/index.js", "typings": "./lib/types/index.d.ts", "exports": { @@ -26,8 +26,8 @@ "tslib": "2.3.1" }, "devDependencies": { - "@tsed/cli": "5.2.10", - "@tsed/cli-core": "5.2.10", + "@tsed/cli": "workspace:*", + "@tsed/cli-core": "workspace:*", "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", "typescript": "4.9.5", diff --git a/packages/cli-generate-swagger/src/index.ts b/packages/cli-generate-swagger/src/index.ts index 1aaed9dd3..28deeb4ac 100644 --- a/packages/cli-generate-swagger/src/index.ts +++ b/packages/cli-generate-swagger/src/index.ts @@ -1,3 +1,3 @@ -export * from "./commands/GenerateSwaggerCmd"; +export * from "./commands/GenerateSwaggerCmd.js"; export default {}; diff --git a/packages/cli-generate-swagger/tsconfig.cjs.json b/packages/cli-generate-swagger/tsconfig.cjs.json deleted file mode 100644 index 7f23b116d..000000000 --- a/packages/cli-generate-swagger/tsconfig.cjs.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "extends": "@tsed/typescript/tsconfig.node.json", - "compilerOptions": { - "baseUrl": ".", - "module": "commonjs", - "moduleResolution": "Node16", - "rootDir": "src", - "outDir": "./lib/cjs", - "declaration": true, - "declarationDir": "./lib/types", - "composite": true, - "noEmit": false - }, - "include": ["src", "src/**/*.json"], - "exclude": [ - "node_modules", - "test", - "lib", - "benchmark", - "coverage", - "spec", - "**/*.benchmark.ts", - "**/*.spec.ts", - "keys", - "**/__mock__/**", - "webpack.config.js" - ] -} diff --git a/packages/cli-generate-swagger/tsconfig.esm.json b/packages/cli-generate-swagger/tsconfig.esm.json index ce32a9e07..45d441a7d 100644 --- a/packages/cli-generate-swagger/tsconfig.esm.json +++ b/packages/cli-generate-swagger/tsconfig.esm.json @@ -2,11 +2,9 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", - "declarationDir": "./lib/types-esm", + "declarationDir": "./lib/types", "declaration": true, "composite": true, "noEmit": false diff --git a/packages/cli-generate-swagger/tsconfig.json b/packages/cli-generate-swagger/tsconfig.json index 8c80e7e4f..cf03b6beb 100644 --- a/packages/cli-generate-swagger/tsconfig.json +++ b/packages/cli-generate-swagger/tsconfig.json @@ -12,9 +12,6 @@ { "path": "../cli-core/tsconfig.json" }, - { - "path": "./tsconfig.cjs.json" - }, { "path": "./tsconfig.esm.json" } diff --git a/packages/cli-plugin-eslint/package.json b/packages/cli-plugin-eslint/package.json index 427fba9d3..ffc60a172 100644 --- a/packages/cli-plugin-eslint/package.json +++ b/packages/cli-plugin-eslint/package.json @@ -1,10 +1,10 @@ { "name": "@tsed/cli-plugin-eslint", "description": "Ts.ED CLI plugin. Add EsLint support", - "type": "commonjs", "version": "5.2.10", + "type": "module", + "main": "./lib/esm/index.js", "source": "./src/index.ts", - "main": "./lib/cjs/index.js", "module": "./lib/esm/index.js", "typings": "./lib/types/index.d.ts", "exports": { @@ -20,8 +20,8 @@ "build:ts": "tsc --build tsconfig.json" }, "devDependencies": { - "@tsed/cli": "5.2.10", - "@tsed/cli-core": "5.2.10", + "@tsed/cli": "workspace:*", + "@tsed/cli-core": "workspace:*", "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", "typescript": "4.9.5", diff --git a/packages/cli-plugin-eslint/src/CliPluginEslintModule.ts b/packages/cli-plugin-eslint/src/CliPluginEslintModule.ts index 5762e2cf0..47408f35d 100644 --- a/packages/cli-plugin-eslint/src/CliPluginEslintModule.ts +++ b/packages/cli-plugin-eslint/src/CliPluginEslintModule.ts @@ -1,6 +1,6 @@ import {Module} from "@tsed/cli-core"; -import {EslintInitHook} from "./hooks/EslintInitHook"; +import {EslintInitHook} from "./hooks/EslintInitHook.js"; @Module({ imports: [EslintInitHook] diff --git a/packages/cli-plugin-eslint/src/hooks/EslintInitHook.ts b/packages/cli-plugin-eslint/src/hooks/EslintInitHook.ts index da6a5e5d4..f7dd4ff46 100644 --- a/packages/cli-plugin-eslint/src/hooks/EslintInitHook.ts +++ b/packages/cli-plugin-eslint/src/hooks/EslintInitHook.ts @@ -1,7 +1,7 @@ import {InitCmdContext} from "@tsed/cli"; import {Inject, Injectable, OnExec, OnPostInstall, PackageManagersModule, ProjectPackageJson, RootRendererService} from "@tsed/cli-core"; -import {TEMPLATE_DIR} from "../utils/templateDir"; +import {TEMPLATE_DIR} from "../utils/templateDir.js"; @Injectable() export class EslintInitHook { diff --git a/packages/cli-plugin-eslint/src/index.ts b/packages/cli-plugin-eslint/src/index.ts index c0b290ec3..89f790b38 100644 --- a/packages/cli-plugin-eslint/src/index.ts +++ b/packages/cli-plugin-eslint/src/index.ts @@ -1,5 +1,5 @@ -import {CliPluginEslintModule} from "./CliPluginEslintModule"; +import {CliPluginEslintModule} from "./CliPluginEslintModule.js"; -export * from "./utils/templateDir"; +export * from "./utils/templateDir.js"; export default CliPluginEslintModule; diff --git a/packages/cli-plugin-eslint/src/utils/templateDir.ts b/packages/cli-plugin-eslint/src/utils/templateDir.ts index 911a16584..2ccfa6ef6 100644 --- a/packages/cli-plugin-eslint/src/utils/templateDir.ts +++ b/packages/cli-plugin-eslint/src/utils/templateDir.ts @@ -1,3 +1,3 @@ import {getTemplateDirectory} from "@tsed/cli-core"; -export const TEMPLATE_DIR = getTemplateDirectory(__dirname); +export const TEMPLATE_DIR = getTemplateDirectory(import.meta.dirname); diff --git a/packages/cli-plugin-eslint/tsconfig.cjs.json b/packages/cli-plugin-eslint/tsconfig.cjs.json deleted file mode 100644 index 7f23b116d..000000000 --- a/packages/cli-plugin-eslint/tsconfig.cjs.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "extends": "@tsed/typescript/tsconfig.node.json", - "compilerOptions": { - "baseUrl": ".", - "module": "commonjs", - "moduleResolution": "Node16", - "rootDir": "src", - "outDir": "./lib/cjs", - "declaration": true, - "declarationDir": "./lib/types", - "composite": true, - "noEmit": false - }, - "include": ["src", "src/**/*.json"], - "exclude": [ - "node_modules", - "test", - "lib", - "benchmark", - "coverage", - "spec", - "**/*.benchmark.ts", - "**/*.spec.ts", - "keys", - "**/__mock__/**", - "webpack.config.js" - ] -} diff --git a/packages/cli-plugin-eslint/tsconfig.esm.json b/packages/cli-plugin-eslint/tsconfig.esm.json index ce32a9e07..45d441a7d 100644 --- a/packages/cli-plugin-eslint/tsconfig.esm.json +++ b/packages/cli-plugin-eslint/tsconfig.esm.json @@ -2,11 +2,9 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", - "declarationDir": "./lib/types-esm", + "declarationDir": "./lib/types", "declaration": true, "composite": true, "noEmit": false diff --git a/packages/cli-plugin-eslint/tsconfig.json b/packages/cli-plugin-eslint/tsconfig.json index 8c80e7e4f..cf03b6beb 100644 --- a/packages/cli-plugin-eslint/tsconfig.json +++ b/packages/cli-plugin-eslint/tsconfig.json @@ -12,9 +12,6 @@ { "path": "../cli-core/tsconfig.json" }, - { - "path": "./tsconfig.cjs.json" - }, { "path": "./tsconfig.esm.json" } diff --git a/packages/cli-plugin-jest/package.json b/packages/cli-plugin-jest/package.json index f771cad9e..84f67b02e 100644 --- a/packages/cli-plugin-jest/package.json +++ b/packages/cli-plugin-jest/package.json @@ -1,10 +1,10 @@ { "name": "@tsed/cli-plugin-jest", "description": "Ts.ED CLI plugin. Add Jest support", - "type": "commonjs", "version": "5.2.10", + "type": "module", + "main": "./lib/esm/index.js", "source": "./src/index.ts", - "main": "./lib/cjs/index.js", "module": "./lib/esm/index.js", "typings": "./lib/types/index.d.ts", "exports": { @@ -22,8 +22,8 @@ "test:ci": "vitest run --coverage.thresholds.autoUpdate=true" }, "devDependencies": { - "@tsed/cli": "5.2.10", - "@tsed/cli-core": "5.2.10", + "@tsed/cli": "workspace:*", + "@tsed/cli-core": "workspace:*", "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", "typescript": "4.9.5", diff --git a/packages/cli-plugin-jest/src/CliPluginJestModule.ts b/packages/cli-plugin-jest/src/CliPluginJestModule.ts index 3085f2e96..d7f2662b5 100644 --- a/packages/cli-plugin-jest/src/CliPluginJestModule.ts +++ b/packages/cli-plugin-jest/src/CliPluginJestModule.ts @@ -2,8 +2,8 @@ import {RuntimesModule} from "@tsed/cli"; import {Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core"; import {Inject} from "@tsed/di"; -import {JestGenerateHook} from "./hooks/JestGenerateHook"; -import {JestInitHook} from "./hooks/JestInitHook"; +import {JestGenerateHook} from "./hooks/JestGenerateHook.js"; +import {JestInitHook} from "./hooks/JestInitHook.js"; @Module({ imports: [JestInitHook, JestGenerateHook] diff --git a/packages/cli-plugin-jest/src/hooks/JestGenerateHook.ts b/packages/cli-plugin-jest/src/hooks/JestGenerateHook.ts index 24d5c4971..1664e50ba 100644 --- a/packages/cli-plugin-jest/src/hooks/JestGenerateHook.ts +++ b/packages/cli-plugin-jest/src/hooks/JestGenerateHook.ts @@ -2,7 +2,7 @@ import {GenerateCmdContext} from "@tsed/cli"; import {Inject, Injectable, OnExec, SrcRendererService, Tasks} from "@tsed/cli-core"; import normalizePath from "normalize-path"; -import {TEMPLATE_DIR} from "../utils/templateDir"; +import {TEMPLATE_DIR} from "../utils/templateDir.js"; @Injectable() export class JestGenerateHook { diff --git a/packages/cli-plugin-jest/src/hooks/JestInitHook.ts b/packages/cli-plugin-jest/src/hooks/JestInitHook.ts index 920e9f8e7..60b692886 100644 --- a/packages/cli-plugin-jest/src/hooks/JestInitHook.ts +++ b/packages/cli-plugin-jest/src/hooks/JestInitHook.ts @@ -8,7 +8,7 @@ import { SrcRendererService } from "@tsed/cli-core"; -import {TEMPLATE_DIR} from "../utils/templateDir"; +import {TEMPLATE_DIR} from "../utils/templateDir.js"; @Injectable() export class JestInitHook { diff --git a/packages/cli-plugin-jest/src/index.ts b/packages/cli-plugin-jest/src/index.ts index 888f840c2..ed91c2a2b 100644 --- a/packages/cli-plugin-jest/src/index.ts +++ b/packages/cli-plugin-jest/src/index.ts @@ -1,5 +1,5 @@ -import {CliPluginJestModule} from "./CliPluginJestModule"; +import {CliPluginJestModule} from "./CliPluginJestModule.js"; -export * from "./utils/templateDir"; +export * from "./utils/templateDir.js"; export default CliPluginJestModule; diff --git a/packages/cli-plugin-jest/src/utils/templateDir.ts b/packages/cli-plugin-jest/src/utils/templateDir.ts index 911a16584..2ccfa6ef6 100644 --- a/packages/cli-plugin-jest/src/utils/templateDir.ts +++ b/packages/cli-plugin-jest/src/utils/templateDir.ts @@ -1,3 +1,3 @@ import {getTemplateDirectory} from "@tsed/cli-core"; -export const TEMPLATE_DIR = getTemplateDirectory(__dirname); +export const TEMPLATE_DIR = getTemplateDirectory(import.meta.dirname); diff --git a/packages/cli-plugin-jest/templates/generate/decorator.class.spec.hbs b/packages/cli-plugin-jest/templates/generate/decorator.class.spec.hbs index bfe6862a1..ce0eb637a 100644 --- a/packages/cli-plugin-jest/templates/generate/decorator.class.spec.hbs +++ b/packages/cli-plugin-jest/templates/generate/decorator.class.spec.hbs @@ -1,4 +1,4 @@ -import { {{symbolName}} } from "./{{symbolPathBasename}}"; +import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; describe("{{symbolName}}", () => { it("should do something", () => { diff --git a/packages/cli-plugin-jest/templates/generate/decorator.endpoint.spec.hbs b/packages/cli-plugin-jest/templates/generate/decorator.endpoint.spec.hbs index 1ca037972..20dde8406 100644 --- a/packages/cli-plugin-jest/templates/generate/decorator.endpoint.spec.hbs +++ b/packages/cli-plugin-jest/templates/generate/decorator.endpoint.spec.hbs @@ -1,5 +1,5 @@ import { Store } from "@tsed/core"; -import { {{symbolName}} } from "./{{symbolPathBasename}}"; +import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; describe("{{symbolName}}", () => { it("should store options", () => { diff --git a/packages/cli-plugin-jest/templates/generate/decorator.method.spec.hbs b/packages/cli-plugin-jest/templates/generate/decorator.method.spec.hbs index 7931ec877..92de8a7da 100644 --- a/packages/cli-plugin-jest/templates/generate/decorator.method.spec.hbs +++ b/packages/cli-plugin-jest/templates/generate/decorator.method.spec.hbs @@ -1,4 +1,4 @@ -import { {{symbolName}} } from "./{{symbolPathBasename}}"; +import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; describe("{{symbolName}}", () => { it("should do something", () => { diff --git a/packages/cli-plugin-jest/templates/generate/decorator.param.spec.hbs b/packages/cli-plugin-jest/templates/generate/decorator.param.spec.hbs index e8e9e1eb8..00c993479 100644 --- a/packages/cli-plugin-jest/templates/generate/decorator.param.spec.hbs +++ b/packages/cli-plugin-jest/templates/generate/decorator.param.spec.hbs @@ -1,5 +1,5 @@ import { Store } from "@tsed/core"; -import { {{symbolName}} } from "./{{symbolPathBasename}}"; +import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; describe("{{symbolName}}", () => { it("should store options", () => { diff --git a/packages/cli-plugin-jest/templates/generate/decorator.parameter.spec.hbs b/packages/cli-plugin-jest/templates/generate/decorator.parameter.spec.hbs index e4570e1e3..2a56312d5 100644 --- a/packages/cli-plugin-jest/templates/generate/decorator.parameter.spec.hbs +++ b/packages/cli-plugin-jest/templates/generate/decorator.parameter.spec.hbs @@ -1,4 +1,4 @@ -import { {{symbolName}} } from "./{{symbolPathBasename}}"; +import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; describe("{{symbolName}}", () => { it("should do something", () => { diff --git a/packages/cli-plugin-jest/templates/generate/decorator.prop.spec.hbs b/packages/cli-plugin-jest/templates/generate/decorator.prop.spec.hbs index cbccdb0c5..c5e6f5c5b 100644 --- a/packages/cli-plugin-jest/templates/generate/decorator.prop.spec.hbs +++ b/packages/cli-plugin-jest/templates/generate/decorator.prop.spec.hbs @@ -1,5 +1,5 @@ import { Store } from "@tsed/core"; -import { {{symbolName}} } from "./{{symbolPathBasename}}"; +import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; describe("{{symbolName}}", () => { it("should store options", () => { diff --git a/packages/cli-plugin-jest/templates/generate/decorator.property.spec.hbs b/packages/cli-plugin-jest/templates/generate/decorator.property.spec.hbs index 2f3bf8041..dc35b1ccb 100644 --- a/packages/cli-plugin-jest/templates/generate/decorator.property.spec.hbs +++ b/packages/cli-plugin-jest/templates/generate/decorator.property.spec.hbs @@ -1,4 +1,4 @@ -import { {{symbolName}} } from "./{{symbolPathBasename}}"; +import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; describe("{{symbolName}}", () => { it("should do something", () => { diff --git a/packages/cli-plugin-jest/templates/generate/generic.integration.hbs b/packages/cli-plugin-jest/templates/generate/generic.integration.hbs index 068ea0427..8e10288f7 100644 --- a/packages/cli-plugin-jest/templates/generate/generic.integration.hbs +++ b/packages/cli-plugin-jest/templates/generate/generic.integration.hbs @@ -1,7 +1,7 @@ import { PlatformTest } from "@tsed/common"; import SuperTest from "supertest"; -import { {{symbolName}} } from "./{{symbolPathBasename}}"; -import { Server } from "{{relativeSrcPath}}/Server"; +import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; +import { Server } from "{{relativeSrcPath}}/Server.js"; describe("{{symbolName}}", () => { beforeEach(PlatformTest.bootstrap(Server, { diff --git a/packages/cli-plugin-jest/templates/generate/generic.spec.hbs b/packages/cli-plugin-jest/templates/generate/generic.spec.hbs index 8a78da857..5b6fea37d 100644 --- a/packages/cli-plugin-jest/templates/generate/generic.spec.hbs +++ b/packages/cli-plugin-jest/templates/generate/generic.spec.hbs @@ -1,5 +1,5 @@ import { PlatformTest } from "@tsed/common"; -import { {{symbolName}} } from "./{{symbolPathBasename}}"; +import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; describe("{{symbolName}}", () => { beforeEach(PlatformTest.create); diff --git a/packages/cli-plugin-jest/templates/generate/server.integration.hbs b/packages/cli-plugin-jest/templates/generate/server.integration.hbs index 575007b60..3d38a1943 100644 --- a/packages/cli-plugin-jest/templates/generate/server.integration.hbs +++ b/packages/cli-plugin-jest/templates/generate/server.integration.hbs @@ -1,6 +1,6 @@ import { PlatformTest } from "@tsed/common"; import SuperTest from "supertest"; -import { {{symbolName}} } from "./{{symbolPathBasename}}"; +import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; describe("{{symbolName}}", () => { beforeEach(PlatformTest.bootstrap({{symbolName}})); diff --git a/packages/cli-plugin-jest/test/integrations/generate/generate.controller.integration.spec.ts b/packages/cli-plugin-jest/test/integrations/generate/generate.controller.integration.spec.ts index 6b0f3f2a8..31009820c 100644 --- a/packages/cli-plugin-jest/test/integrations/generate/generate.controller.integration.spec.ts +++ b/packages/cli-plugin-jest/test/integrations/generate/generate.controller.integration.spec.ts @@ -40,8 +40,8 @@ describe("Generate Controller", () => { const result = FakeCliFs.entries.get("project-name/src/controllers/TestController.integration.spec.ts"); expect(result).toContain('import { PlatformTest } from "@tsed/common";'); expect(result).toContain('import SuperTest from "supertest";'); - expect(result).toContain('import { Server } from "../Server";'); - expect(result).toContain('import { TestController } from "./TestController";'); + expect(result).toContain('import { Server } from "../Server.js";'); + expect(result).toContain('import { TestController } from "./TestController.js";'); }); it("should generate the template with the right options (complex path)", async () => { CliPlatformTest.setPackageJson({ @@ -70,7 +70,7 @@ describe("Generate Controller", () => { const result = FakeCliFs.entries.get("project-name/src/controllers/users/UserController.integration.spec.ts"); expect(result).toContain('import { PlatformTest } from "@tsed/common";'); expect(result).toContain('import SuperTest from "supertest";'); - expect(result).toContain('import { Server } from "../../Server";'); - expect(result).toContain('import { UserController } from "./UserController";'); + expect(result).toContain('import { Server } from "../../Server.js";'); + expect(result).toContain('import { UserController } from "./UserController.js";'); }); }); diff --git a/packages/cli-plugin-jest/tsconfig.cjs.json b/packages/cli-plugin-jest/tsconfig.cjs.json deleted file mode 100644 index 7f23b116d..000000000 --- a/packages/cli-plugin-jest/tsconfig.cjs.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "extends": "@tsed/typescript/tsconfig.node.json", - "compilerOptions": { - "baseUrl": ".", - "module": "commonjs", - "moduleResolution": "Node16", - "rootDir": "src", - "outDir": "./lib/cjs", - "declaration": true, - "declarationDir": "./lib/types", - "composite": true, - "noEmit": false - }, - "include": ["src", "src/**/*.json"], - "exclude": [ - "node_modules", - "test", - "lib", - "benchmark", - "coverage", - "spec", - "**/*.benchmark.ts", - "**/*.spec.ts", - "keys", - "**/__mock__/**", - "webpack.config.js" - ] -} diff --git a/packages/cli-plugin-jest/tsconfig.esm.json b/packages/cli-plugin-jest/tsconfig.esm.json index ce32a9e07..45d441a7d 100644 --- a/packages/cli-plugin-jest/tsconfig.esm.json +++ b/packages/cli-plugin-jest/tsconfig.esm.json @@ -2,11 +2,9 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", - "declarationDir": "./lib/types-esm", + "declarationDir": "./lib/types", "declaration": true, "composite": true, "noEmit": false diff --git a/packages/cli-plugin-jest/tsconfig.json b/packages/cli-plugin-jest/tsconfig.json index 705b5ce35..f42860e1e 100644 --- a/packages/cli-plugin-jest/tsconfig.json +++ b/packages/cli-plugin-jest/tsconfig.json @@ -12,9 +12,6 @@ { "path": "../cli-core/tsconfig.json" }, - { - "path": "./tsconfig.cjs.json" - }, { "path": "./tsconfig.esm.json" }, diff --git a/packages/cli-plugin-jest/tsconfig.spec.json b/packages/cli-plugin-jest/tsconfig.spec.json index 75fcfa09d..0f06288a8 100644 --- a/packages/cli-plugin-jest/tsconfig.spec.json +++ b/packages/cli-plugin-jest/tsconfig.spec.json @@ -3,8 +3,6 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, diff --git a/packages/cli-plugin-mocha/package.json b/packages/cli-plugin-mocha/package.json index 4654c96cc..2f6388251 100644 --- a/packages/cli-plugin-mocha/package.json +++ b/packages/cli-plugin-mocha/package.json @@ -1,10 +1,10 @@ { "name": "@tsed/cli-plugin-mocha", "description": "Ts.ED CLI plugin. Add Mocha support", - "type": "commonjs", "version": "5.2.10", + "type": "module", + "main": "./lib/esm/index.js", "source": "./src/index.ts", - "main": "./lib/cjs/index.js", "module": "./lib/esm/index.js", "typings": "./lib/types/index.d.ts", "exports": { @@ -22,8 +22,8 @@ "test:ci": "vitest run --coverage.thresholds.autoUpdate=true" }, "devDependencies": { - "@tsed/cli": "5.2.10", - "@tsed/cli-core": "5.2.10", + "@tsed/cli": "workspace:*", + "@tsed/cli-core": "workspace:*", "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", "typescript": "4.9.5", diff --git a/packages/cli-plugin-mocha/src/CliPluginMochaModule.ts b/packages/cli-plugin-mocha/src/CliPluginMochaModule.ts index ec1be6b5f..47fd3e327 100644 --- a/packages/cli-plugin-mocha/src/CliPluginMochaModule.ts +++ b/packages/cli-plugin-mocha/src/CliPluginMochaModule.ts @@ -2,8 +2,8 @@ import {RuntimesModule} from "@tsed/cli"; import {Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core"; import {Inject} from "@tsed/di"; -import {MochaGenerateHook} from "./hooks/MochaGenerateHook"; -import {MochaInitHook} from "./hooks/MochaInitHook"; +import {MochaGenerateHook} from "./hooks/MochaGenerateHook.js"; +import {MochaInitHook} from "./hooks/MochaInitHook.js"; @Module({ imports: [MochaInitHook, MochaGenerateHook] diff --git a/packages/cli-plugin-mocha/src/hooks/MochaGenerateHook.ts b/packages/cli-plugin-mocha/src/hooks/MochaGenerateHook.ts index 0daee5054..28ce4c995 100644 --- a/packages/cli-plugin-mocha/src/hooks/MochaGenerateHook.ts +++ b/packages/cli-plugin-mocha/src/hooks/MochaGenerateHook.ts @@ -2,7 +2,7 @@ import {GenerateCmdContext} from "@tsed/cli"; import {Inject, Injectable, OnExec, SrcRendererService, Tasks} from "@tsed/cli-core"; import normalizePath from "normalize-path"; -import {TEMPLATE_DIR} from "../utils/templateDir"; +import {TEMPLATE_DIR} from "../utils/templateDir.js"; @Injectable() export class MochaGenerateHook { diff --git a/packages/cli-plugin-mocha/src/hooks/MochaInitHook.ts b/packages/cli-plugin-mocha/src/hooks/MochaInitHook.ts index 628c127b3..1e1934c6d 100644 --- a/packages/cli-plugin-mocha/src/hooks/MochaInitHook.ts +++ b/packages/cli-plugin-mocha/src/hooks/MochaInitHook.ts @@ -9,7 +9,7 @@ import { } from "@tsed/cli-core"; import {join} from "path"; -import {TEMPLATE_DIR} from "../utils/templateDir"; +import {TEMPLATE_DIR} from "../utils/templateDir.js"; @Injectable() export class MochaInitHook { diff --git a/packages/cli-plugin-mocha/src/index.ts b/packages/cli-plugin-mocha/src/index.ts index 427cccd7a..d924931db 100644 --- a/packages/cli-plugin-mocha/src/index.ts +++ b/packages/cli-plugin-mocha/src/index.ts @@ -1,5 +1,5 @@ -import {CliPluginMochaModule} from "./CliPluginMochaModule"; +import {CliPluginMochaModule} from "./CliPluginMochaModule.js"; -export * from "./utils/templateDir"; +export * from "./utils/templateDir.js"; export default CliPluginMochaModule; diff --git a/packages/cli-plugin-mocha/src/utils/templateDir.ts b/packages/cli-plugin-mocha/src/utils/templateDir.ts index 911a16584..2ccfa6ef6 100644 --- a/packages/cli-plugin-mocha/src/utils/templateDir.ts +++ b/packages/cli-plugin-mocha/src/utils/templateDir.ts @@ -1,3 +1,3 @@ import {getTemplateDirectory} from "@tsed/cli-core"; -export const TEMPLATE_DIR = getTemplateDirectory(__dirname); +export const TEMPLATE_DIR = getTemplateDirectory(import.meta.dirname); diff --git a/packages/cli-plugin-mocha/templates/generate/decorator.class.spec.hbs b/packages/cli-plugin-mocha/templates/generate/decorator.class.spec.hbs index 3797d0530..f7d546501 100644 --- a/packages/cli-plugin-mocha/templates/generate/decorator.class.spec.hbs +++ b/packages/cli-plugin-mocha/templates/generate/decorator.class.spec.hbs @@ -1,5 +1,5 @@ import { expect } from "chai"; -import { {{symbolName}} } from "./{{symbolPathBasename}}"; +import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; describe("{{symbolName}}", () => { it("should do something", () => { diff --git a/packages/cli-plugin-mocha/templates/generate/decorator.endpoint.spec.hbs b/packages/cli-plugin-mocha/templates/generate/decorator.endpoint.spec.hbs index 2604354f0..40ec80b58 100644 --- a/packages/cli-plugin-mocha/templates/generate/decorator.endpoint.spec.hbs +++ b/packages/cli-plugin-mocha/templates/generate/decorator.endpoint.spec.hbs @@ -1,6 +1,6 @@ import { expect } from "chai"; import { Store } from "@tsed/core"; -import { {{symbolName}} } from "./{{symbolPathBasename}}"; +import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; describe("{{symbolName}}", () => { it("should store options", () => { diff --git a/packages/cli-plugin-mocha/templates/generate/decorator.method.spec.hbs b/packages/cli-plugin-mocha/templates/generate/decorator.method.spec.hbs index ea9e4217c..ff6530ccd 100644 --- a/packages/cli-plugin-mocha/templates/generate/decorator.method.spec.hbs +++ b/packages/cli-plugin-mocha/templates/generate/decorator.method.spec.hbs @@ -1,5 +1,5 @@ import { expect } from "chai"; -import { {{symbolName}} } from "./{{symbolPathBasename}}"; +import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; describe("{{symbolName}}", () => { it("should do something", () => { diff --git a/packages/cli-plugin-mocha/templates/generate/decorator.param.spec.hbs b/packages/cli-plugin-mocha/templates/generate/decorator.param.spec.hbs index dd356ea8f..85120a5bb 100644 --- a/packages/cli-plugin-mocha/templates/generate/decorator.param.spec.hbs +++ b/packages/cli-plugin-mocha/templates/generate/decorator.param.spec.hbs @@ -1,6 +1,6 @@ import { expect } from "chai"; import { Store } from "@tsed/core"; -import { {{symbolName}} } from "./{{symbolPathBasename}}"; +import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; describe("{{symbolName}}", () => { it("should store options", () => { diff --git a/packages/cli-plugin-mocha/templates/generate/decorator.parameter.spec.hbs b/packages/cli-plugin-mocha/templates/generate/decorator.parameter.spec.hbs index ef2e2f244..2d5d05bed 100644 --- a/packages/cli-plugin-mocha/templates/generate/decorator.parameter.spec.hbs +++ b/packages/cli-plugin-mocha/templates/generate/decorator.parameter.spec.hbs @@ -1,5 +1,5 @@ import { expect } from "chai"; -import { {{symbolName}} } from "./{{symbolPathBasename}}"; +import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; describe("{{symbolName}}", () => { it("should do something", () => { diff --git a/packages/cli-plugin-mocha/templates/generate/decorator.prop.spec.hbs b/packages/cli-plugin-mocha/templates/generate/decorator.prop.spec.hbs index a0aa73972..35b0581b9 100644 --- a/packages/cli-plugin-mocha/templates/generate/decorator.prop.spec.hbs +++ b/packages/cli-plugin-mocha/templates/generate/decorator.prop.spec.hbs @@ -1,6 +1,6 @@ import { expect } from "chai"; import { Store } from "@tsed/core"; -import { {{symbolName}} } from "./{{symbolPathBasename}}"; +import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; describe("{{symbolName}}", () => { it("should store options", () => { diff --git a/packages/cli-plugin-mocha/templates/generate/decorator.property.spec.hbs b/packages/cli-plugin-mocha/templates/generate/decorator.property.spec.hbs index ef4cd67aa..97bda53e2 100644 --- a/packages/cli-plugin-mocha/templates/generate/decorator.property.spec.hbs +++ b/packages/cli-plugin-mocha/templates/generate/decorator.property.spec.hbs @@ -1,5 +1,5 @@ import { expect } from "chai"; -import { {{symbolName}} } from "./{{symbolPathBasename}}"; +import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; describe("{{symbolName}}", () => { it("should do something", () => { diff --git a/packages/cli-plugin-mocha/templates/generate/generic.integration.hbs b/packages/cli-plugin-mocha/templates/generate/generic.integration.hbs index f3b6238f5..d5330375f 100644 --- a/packages/cli-plugin-mocha/templates/generate/generic.integration.hbs +++ b/packages/cli-plugin-mocha/templates/generate/generic.integration.hbs @@ -1,8 +1,8 @@ import { expect } from "chai"; import { PlatformTest } from "@tsed/common"; import SuperTest from "supertest"; -import { {{symbolName}} } from "./{{symbolPathBasename}}"; -import { Server } from "{{relativeSrcPath}}/Server"; +import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; +import { Server } from "{{relativeSrcPath}}/Server.js"; describe("{{symbolName}}", () => { beforeEach(PlatformTest.bootstrap(Server, { diff --git a/packages/cli-plugin-mocha/templates/generate/generic.spec.hbs b/packages/cli-plugin-mocha/templates/generate/generic.spec.hbs index 1c232cec9..02670764a 100644 --- a/packages/cli-plugin-mocha/templates/generate/generic.spec.hbs +++ b/packages/cli-plugin-mocha/templates/generate/generic.spec.hbs @@ -1,6 +1,6 @@ import { expect } from "chai"; import { PlatformTest } from "@tsed/common"; -import { {{symbolName}} } from "./{{symbolPathBasename}}"; +import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; describe("{{symbolName}}", () => { beforeEach(PlatformTest.create); diff --git a/packages/cli-plugin-mocha/templates/generate/model.spec.hbs b/packages/cli-plugin-mocha/templates/generate/model.spec.hbs index 6974fa01c..2dd3d9211 100644 --- a/packages/cli-plugin-mocha/templates/generate/model.spec.hbs +++ b/packages/cli-plugin-mocha/templates/generate/model.spec.hbs @@ -1,5 +1,5 @@ import { expect } from "chai"; -import { {{symbolName}} } from "./{{symbolPathBasename}}"; +import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; describe("{{symbolName}}", () => { it("should do something", () => { diff --git a/packages/cli-plugin-mocha/templates/generate/server.integration.hbs b/packages/cli-plugin-mocha/templates/generate/server.integration.hbs index 56ae37ca2..a31db5cd1 100644 --- a/packages/cli-plugin-mocha/templates/generate/server.integration.hbs +++ b/packages/cli-plugin-mocha/templates/generate/server.integration.hbs @@ -1,7 +1,7 @@ import { PlatformTest } from "@tsed/common"; import SuperTest from "supertest"; import {expect} from "chai"; -import { {{symbolName}} } from "./{{symbolPathBasename}}"; +import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; describe("{{symbolName}}", () => { beforeEach(PlatformTest.bootstrap({{symbolName}})); diff --git a/packages/cli-plugin-mocha/tsconfig.cjs.json b/packages/cli-plugin-mocha/tsconfig.cjs.json deleted file mode 100644 index 7f23b116d..000000000 --- a/packages/cli-plugin-mocha/tsconfig.cjs.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "extends": "@tsed/typescript/tsconfig.node.json", - "compilerOptions": { - "baseUrl": ".", - "module": "commonjs", - "moduleResolution": "Node16", - "rootDir": "src", - "outDir": "./lib/cjs", - "declaration": true, - "declarationDir": "./lib/types", - "composite": true, - "noEmit": false - }, - "include": ["src", "src/**/*.json"], - "exclude": [ - "node_modules", - "test", - "lib", - "benchmark", - "coverage", - "spec", - "**/*.benchmark.ts", - "**/*.spec.ts", - "keys", - "**/__mock__/**", - "webpack.config.js" - ] -} diff --git a/packages/cli-plugin-mocha/tsconfig.esm.json b/packages/cli-plugin-mocha/tsconfig.esm.json index ce32a9e07..45d441a7d 100644 --- a/packages/cli-plugin-mocha/tsconfig.esm.json +++ b/packages/cli-plugin-mocha/tsconfig.esm.json @@ -2,11 +2,9 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", - "declarationDir": "./lib/types-esm", + "declarationDir": "./lib/types", "declaration": true, "composite": true, "noEmit": false diff --git a/packages/cli-plugin-mocha/tsconfig.json b/packages/cli-plugin-mocha/tsconfig.json index 8c80e7e4f..cf03b6beb 100644 --- a/packages/cli-plugin-mocha/tsconfig.json +++ b/packages/cli-plugin-mocha/tsconfig.json @@ -12,9 +12,6 @@ { "path": "../cli-core/tsconfig.json" }, - { - "path": "./tsconfig.cjs.json" - }, { "path": "./tsconfig.esm.json" } diff --git a/packages/cli-plugin-mongoose/package.json b/packages/cli-plugin-mongoose/package.json index 84ccfeefd..a2cac5b7c 100644 --- a/packages/cli-plugin-mongoose/package.json +++ b/packages/cli-plugin-mongoose/package.json @@ -1,10 +1,10 @@ { "name": "@tsed/cli-plugin-mongoose", "description": "Ts.ED CLI plugin. Add Mongoose support", - "type": "commonjs", "version": "5.2.10", + "type": "module", + "main": "./lib/esm/index.js", "source": "./src/index.ts", - "main": "./lib/cjs/index.js", "module": "./lib/esm/index.js", "typings": "./lib/types/index.d.ts", "exports": { @@ -27,8 +27,8 @@ "tslib": "2.3.1" }, "devDependencies": { - "@tsed/cli": "5.2.10", - "@tsed/cli-core": "5.2.10", + "@tsed/cli": "workspace:*", + "@tsed/cli-core": "workspace:*", "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", "typescript": "4.9.5", diff --git a/packages/cli-plugin-mongoose/src/CliPluginMongooseModule.ts b/packages/cli-plugin-mongoose/src/CliPluginMongooseModule.ts index 9f7becde3..b62048b66 100644 --- a/packages/cli-plugin-mongoose/src/CliPluginMongooseModule.ts +++ b/packages/cli-plugin-mongoose/src/CliPluginMongooseModule.ts @@ -1,9 +1,9 @@ import {Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core"; import {Inject} from "@tsed/di"; -import {MongooseGenerateHook} from "./hooks/MongooseGenerateHook"; -import {MongooseInitHook} from "./hooks/MongooseInitHook"; -import {CliMongoose} from "./services/CliMongoose"; +import {MongooseGenerateHook} from "./hooks/MongooseGenerateHook.js"; +import {MongooseInitHook} from "./hooks/MongooseInitHook.js"; +import {CliMongoose} from "./services/CliMongoose.js"; @Module({ imports: [MongooseInitHook, MongooseGenerateHook, CliMongoose] diff --git a/packages/cli-plugin-mongoose/src/hooks/MongooseGenerateHook.ts b/packages/cli-plugin-mongoose/src/hooks/MongooseGenerateHook.ts index d928a94cd..482e4049a 100644 --- a/packages/cli-plugin-mongoose/src/hooks/MongooseGenerateHook.ts +++ b/packages/cli-plugin-mongoose/src/hooks/MongooseGenerateHook.ts @@ -5,8 +5,8 @@ import {camelCase, paramCase} from "change-case"; // @ts-ignore import {plural} from "pluralize"; -import {CliMongoose} from "../services/CliMongoose"; -import {TEMPLATE_DIR} from "../utils/templateDir"; +import {CliMongoose} from "../services/CliMongoose.js"; +import {TEMPLATE_DIR} from "../utils/templateDir.js"; @Injectable() export class MongooseGenerateHook { diff --git a/packages/cli-plugin-mongoose/src/hooks/MongooseInitHook.ts b/packages/cli-plugin-mongoose/src/hooks/MongooseInitHook.ts index 176e9a7ac..dc916cc4b 100644 --- a/packages/cli-plugin-mongoose/src/hooks/MongooseInitHook.ts +++ b/packages/cli-plugin-mongoose/src/hooks/MongooseInitHook.ts @@ -2,7 +2,7 @@ import {InitCmdContext} from "@tsed/cli"; import {CliDockerComposeYaml, Inject, OnExec, ProjectPackageJson, RootRendererService, SrcRendererService} from "@tsed/cli-core"; import {Injectable} from "@tsed/di"; -import {CliMongoose} from "../services/CliMongoose"; +import {CliMongoose} from "../services/CliMongoose.js"; @Injectable() export class MongooseInitHook { diff --git a/packages/cli-plugin-mongoose/src/index.ts b/packages/cli-plugin-mongoose/src/index.ts index b5a13828d..19f903c79 100644 --- a/packages/cli-plugin-mongoose/src/index.ts +++ b/packages/cli-plugin-mongoose/src/index.ts @@ -1,8 +1,8 @@ -import {CliPluginMongooseModule} from "./CliPluginMongooseModule"; +import {CliPluginMongooseModule} from "./CliPluginMongooseModule.js"; -export * from "./hooks/MongooseGenerateHook"; -export * from "./hooks/MongooseInitHook"; -export * from "./services/CliMongoose"; -export * from "./utils/templateDir"; +export * from "./hooks/MongooseGenerateHook.js"; +export * from "./hooks/MongooseInitHook.js"; +export * from "./services/CliMongoose.js"; +export * from "./utils/templateDir.js"; export default CliPluginMongooseModule; diff --git a/packages/cli-plugin-mongoose/src/services/CliMongoose.ts b/packages/cli-plugin-mongoose/src/services/CliMongoose.ts index 6256b0691..065d6a95f 100644 --- a/packages/cli-plugin-mongoose/src/services/CliMongoose.ts +++ b/packages/cli-plugin-mongoose/src/services/CliMongoose.ts @@ -2,7 +2,7 @@ import {Inject, Injectable, ProjectPackageJson, SrcRendererService} from "@tsed/ import {camelCase, constantCase, paramCase} from "change-case"; import {basename, join} from "path"; -import {TEMPLATE_DIR} from "../utils/templateDir"; +import {TEMPLATE_DIR} from "../utils/templateDir.js"; @Injectable() export class CliMongoose { diff --git a/packages/cli-plugin-mongoose/src/utils/templateDir.ts b/packages/cli-plugin-mongoose/src/utils/templateDir.ts index 911a16584..2ccfa6ef6 100644 --- a/packages/cli-plugin-mongoose/src/utils/templateDir.ts +++ b/packages/cli-plugin-mongoose/src/utils/templateDir.ts @@ -1,3 +1,3 @@ import {getTemplateDirectory} from "@tsed/cli-core"; -export const TEMPLATE_DIR = getTemplateDirectory(__dirname); +export const TEMPLATE_DIR = getTemplateDirectory(import.meta.dirname); diff --git a/packages/cli-plugin-mongoose/test/integrations/generate/generate.schema.integration.spec.ts b/packages/cli-plugin-mongoose/test/integrations/generate/generate.schema.integration.spec.ts index 7dd9e42fd..34dd77a0c 100644 --- a/packages/cli-plugin-mongoose/test/integrations/generate/generate.schema.integration.spec.ts +++ b/packages/cli-plugin-mongoose/test/integrations/generate/generate.schema.integration.spec.ts @@ -1,7 +1,7 @@ import {GenerateCmd} from "@tsed/cli"; import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; -import {TEMPLATE_DIR} from "../../../src"; +import {TEMPLATE_DIR} from "../../../src/index.js"; describe("Generate Schema", () => { beforeEach(() => diff --git a/packages/cli-plugin-mongoose/tsconfig.esm.json b/packages/cli-plugin-mongoose/tsconfig.esm.json index ce32a9e07..45d441a7d 100644 --- a/packages/cli-plugin-mongoose/tsconfig.esm.json +++ b/packages/cli-plugin-mongoose/tsconfig.esm.json @@ -2,11 +2,9 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", - "declarationDir": "./lib/types-esm", + "declarationDir": "./lib/types", "declaration": true, "composite": true, "noEmit": false diff --git a/packages/cli-plugin-mongoose/tsconfig.json b/packages/cli-plugin-mongoose/tsconfig.json index 705b5ce35..f42860e1e 100644 --- a/packages/cli-plugin-mongoose/tsconfig.json +++ b/packages/cli-plugin-mongoose/tsconfig.json @@ -12,9 +12,6 @@ { "path": "../cli-core/tsconfig.json" }, - { - "path": "./tsconfig.cjs.json" - }, { "path": "./tsconfig.esm.json" }, diff --git a/packages/cli-plugin-mongoose/tsconfig.spec.json b/packages/cli-plugin-mongoose/tsconfig.spec.json index 75fcfa09d..0f06288a8 100644 --- a/packages/cli-plugin-mongoose/tsconfig.spec.json +++ b/packages/cli-plugin-mongoose/tsconfig.spec.json @@ -3,8 +3,6 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, diff --git a/packages/cli-plugin-oidc-provider/package.json b/packages/cli-plugin-oidc-provider/package.json index 3e1e0923c..8c79080b6 100644 --- a/packages/cli-plugin-oidc-provider/package.json +++ b/packages/cli-plugin-oidc-provider/package.json @@ -1,10 +1,10 @@ { "name": "@tsed/cli-plugin-oidc-provider", "description": "Ts.ED CLI plugin. Add OIDC Provider", - "type": "commonjs", "version": "5.2.10", + "type": "module", + "main": "./lib/esm/index.js", "source": "./src/index.ts", - "main": "./lib/cjs/index.js", "module": "./lib/esm/index.js", "typings": "./lib/types/index.d.ts", "exports": { @@ -29,15 +29,15 @@ "tslib": "2.3.1" }, "devDependencies": { - "@tsed/cli": "5.2.10", - "@tsed/cli-core": "5.2.10", + "@tsed/cli": "workspace:*", + "@tsed/cli-core": "workspace:*", "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", "typescript": "4.9.5", "vitest": "2.1.1" }, "peerDependencies": { - "@tsed/cli": "5.2.10", - "@tsed/cli-core": "5.2.10" + "@tsed/cli": "workspace:*", + "@tsed/cli-core": "workspace:*" } } diff --git a/packages/cli-plugin-oidc-provider/src/CliPluginOidcProviderModule.ts b/packages/cli-plugin-oidc-provider/src/CliPluginOidcProviderModule.ts index 26ba4f602..16b4c3390 100644 --- a/packages/cli-plugin-oidc-provider/src/CliPluginOidcProviderModule.ts +++ b/packages/cli-plugin-oidc-provider/src/CliPluginOidcProviderModule.ts @@ -1,7 +1,7 @@ import {Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core"; import {Inject} from "@tsed/di"; -import {OidcProviderInitHook} from "./hooks/OidcProviderInitHook"; +import {OidcProviderInitHook} from "./hooks/OidcProviderInitHook.js"; @Module({ imports: [OidcProviderInitHook] diff --git a/packages/cli-plugin-oidc-provider/src/hooks/OidcProviderInitHook.ts b/packages/cli-plugin-oidc-provider/src/hooks/OidcProviderInitHook.ts index bf474589c..c0d114ae8 100644 --- a/packages/cli-plugin-oidc-provider/src/hooks/OidcProviderInitHook.ts +++ b/packages/cli-plugin-oidc-provider/src/hooks/OidcProviderInitHook.ts @@ -2,7 +2,7 @@ import {InitCmdContext} from "@tsed/cli"; import {CliDockerComposeYaml, Inject, OnExec, ProjectPackageJson, RootRendererService, SrcRendererService} from "@tsed/cli-core"; import {Injectable} from "@tsed/di"; -import {TEMPLATE_DIR} from "../utils/templateDir"; +import {TEMPLATE_DIR} from "../utils/templateDir.js"; @Injectable() export class OidcProviderInitHook { diff --git a/packages/cli-plugin-oidc-provider/src/index.ts b/packages/cli-plugin-oidc-provider/src/index.ts index 80618ace6..18f68c6f2 100644 --- a/packages/cli-plugin-oidc-provider/src/index.ts +++ b/packages/cli-plugin-oidc-provider/src/index.ts @@ -1,6 +1,6 @@ -import {CliPluginOidcProviderModule} from "./CliPluginOidcProviderModule"; +import {CliPluginOidcProviderModule} from "./CliPluginOidcProviderModule.js"; -export * from "./hooks/OidcProviderInitHook"; -export * from "./utils/templateDir"; +export * from "./hooks/OidcProviderInitHook.js"; +export * from "./utils/templateDir.js"; export default CliPluginOidcProviderModule; diff --git a/packages/cli-plugin-oidc-provider/src/utils/templateDir.ts b/packages/cli-plugin-oidc-provider/src/utils/templateDir.ts index 911a16584..2ccfa6ef6 100644 --- a/packages/cli-plugin-oidc-provider/src/utils/templateDir.ts +++ b/packages/cli-plugin-oidc-provider/src/utils/templateDir.ts @@ -1,3 +1,3 @@ import {getTemplateDirectory} from "@tsed/cli-core"; -export const TEMPLATE_DIR = getTemplateDirectory(__dirname); +export const TEMPLATE_DIR = getTemplateDirectory(import.meta.dirname); diff --git a/packages/cli-plugin-oidc-provider/templates/init/src/config/oidc/index.ts.hbs b/packages/cli-plugin-oidc-provider/templates/init/src/config/oidc/index.ts.hbs index 619d40e9b..99221bfdb 100644 --- a/packages/cli-plugin-oidc-provider/templates/init/src/config/oidc/index.ts.hbs +++ b/packages/cli-plugin-oidc-provider/templates/init/src/config/oidc/index.ts.hbs @@ -1,5 +1,5 @@ import {OidcSettings} from "@tsed/oidc-provider"; -import {Accounts} from "../../services/Accounts"; +import {Accounts} from "../../services/Accounts.js"; const settings: OidcSettings = { path: "{{oidcBasePath}}", @@ -30,4 +30,4 @@ const settings: OidcSettings = { } } -export default settings \ No newline at end of file +export default settings diff --git a/packages/cli-plugin-oidc-provider/templates/init/src/controllers/oidc/InteractionsController.spec.ts b/packages/cli-plugin-oidc-provider/templates/init/src/controllers/oidc/InteractionsController.spec.ts index da7825cc6..37c29372d 100644 --- a/packages/cli-plugin-oidc-provider/templates/init/src/controllers/oidc/InteractionsController.spec.ts +++ b/packages/cli-plugin-oidc-provider/templates/init/src/controllers/oidc/InteractionsController.spec.ts @@ -1,7 +1,7 @@ import { PlatformTest } from "@tsed/common"; -import { getOidcContextFixture } from "../../interactions/__mock__/oidcContext.fixture"; -import { InteractionsController } from "./InteractionsController"; +import { getOidcContextFixture } from "../../interactions/__mock__/oidcContext.fixture.js"; +import { InteractionsController } from "./InteractionsController.js"; describe("InteractionsController", () => { beforeEach(() => PlatformTest.create()); diff --git a/packages/cli-plugin-oidc-provider/templates/init/src/controllers/oidc/InteractionsController.ts b/packages/cli-plugin-oidc-provider/templates/init/src/controllers/oidc/InteractionsController.ts index 48906548d..2b1c0bcd1 100644 --- a/packages/cli-plugin-oidc-provider/templates/init/src/controllers/oidc/InteractionsController.ts +++ b/packages/cli-plugin-oidc-provider/templates/init/src/controllers/oidc/InteractionsController.ts @@ -1,7 +1,7 @@ import {Get, PathParams} from "@tsed/common"; import {Interactions, OidcCtx} from "@tsed/oidc-provider"; import {Name} from "@tsed/schema"; -import * as interactions from "../../interactions/index"; +import * as interactions from "../../interactions/index.js"; @Name("Oidc") @Interactions({ diff --git a/packages/cli-plugin-oidc-provider/templates/init/src/interactions/ConsentInteraction.spec.ts b/packages/cli-plugin-oidc-provider/templates/init/src/interactions/ConsentInteraction.spec.ts index 909793f9c..f5c8cd918 100644 --- a/packages/cli-plugin-oidc-provider/templates/init/src/interactions/ConsentInteraction.spec.ts +++ b/packages/cli-plugin-oidc-provider/templates/init/src/interactions/ConsentInteraction.spec.ts @@ -1,7 +1,7 @@ import { PlatformTest } from "@tsed/common"; -import { getOidcContextFixture } from "./__mock__/oidcContext.fixture"; -import { ConsentInteraction } from "./ConsentInteraction"; +import { getOidcContextFixture } from "./__mock__/oidcContext.fixture.js"; +import { ConsentInteraction } from "./ConsentInteraction.js"; async function createInteractionFixture() { const interaction = await PlatformTest.invoke(ConsentInteraction, []); diff --git a/packages/cli-plugin-oidc-provider/templates/init/src/interactions/LoginInteraction.spec.ts b/packages/cli-plugin-oidc-provider/templates/init/src/interactions/LoginInteraction.spec.ts index 26d5269f4..7413380e7 100644 --- a/packages/cli-plugin-oidc-provider/templates/init/src/interactions/LoginInteraction.spec.ts +++ b/packages/cli-plugin-oidc-provider/templates/init/src/interactions/LoginInteraction.spec.ts @@ -2,9 +2,9 @@ import { PlatformTest } from "@tsed/common"; import { catchAsyncError } from "@tsed/core"; import { BadRequest } from "@tsed/exceptions"; -import { Accounts } from "../services/Accounts"; -import { getOidcContextFixture } from "./__mock__/oidcContext.fixture"; -import { LoginInteraction } from "./LoginInteraction"; +import { Accounts } from "../services/Accounts.js"; +import { getOidcContextFixture } from "./__mock__/oidcContext.fixture.js"; +import { LoginInteraction } from "./LoginInteraction.js"; async function createInteractionFixture() { const accounts = { diff --git a/packages/cli-plugin-oidc-provider/templates/init/src/interactions/LoginInteraction.ts b/packages/cli-plugin-oidc-provider/templates/init/src/interactions/LoginInteraction.ts index 47473f6e3..753047038 100644 --- a/packages/cli-plugin-oidc-provider/templates/init/src/interactions/LoginInteraction.ts +++ b/packages/cli-plugin-oidc-provider/templates/init/src/interactions/LoginInteraction.ts @@ -3,7 +3,7 @@ import {Env} from "@tsed/core"; import {Constant} from "@tsed/di"; import {Interaction, OidcCtx} from "@tsed/oidc-provider"; import {Name} from "@tsed/schema"; -import {Accounts} from "../services/Accounts"; +import {Accounts} from "../services/Accounts.js"; @Interaction({ name: "login", diff --git a/packages/cli-plugin-oidc-provider/templates/init/src/services/Accounts.ts b/packages/cli-plugin-oidc-provider/templates/init/src/services/Accounts.ts index 14226b46e..3eed1593a 100644 --- a/packages/cli-plugin-oidc-provider/templates/init/src/services/Accounts.ts +++ b/packages/cli-plugin-oidc-provider/templates/init/src/services/Accounts.ts @@ -2,7 +2,7 @@ import {Adapter, InjectAdapter} from "@tsed/adapters"; import {Injectable} from "@tsed/di"; import {deserialize} from "@tsed/json-mapper"; import {OidcAccountsMethods} from "@tsed/oidc-provider"; -import {Account} from "../models/Account"; +import {Account} from "../models/Account.js"; @Injectable() export class Accounts implements OidcAccountsMethods { diff --git a/packages/cli-plugin-oidc-provider/test/init/__snapshots__/init.integration.spec.ts.snap b/packages/cli-plugin-oidc-provider/test/init/__snapshots__/init.integration.spec.ts.snap index e18697677..006756011 100644 --- a/packages/cli-plugin-oidc-provider/test/init/__snapshots__/init.integration.spec.ts.snap +++ b/packages/cli-plugin-oidc-provider/test/init/__snapshots__/init.integration.spec.ts.snap @@ -11,7 +11,7 @@ exports[`Init OIDC Provider project > should generate a project with oidc 1`] = "project-name/README.md", "project-name/docker-compose.yml", "project-name/package.json", - "project-name/processes.config.js", + "project-name/processes.config.cjs", "project-name/src", "project-name/src/Server.ts", "project-name/src/config", @@ -40,8 +40,8 @@ exports[`Init OIDC Provider project > should generate a project with oidc 1`] = "project-name/src/models/Account.ts", "project-name/src/services", "project-name/src/services/Accounts.ts", - "project-name/tsconfig.compile.json", - "project-name/tsconfig.json", + "project-name/tsconfig.base.json", + "project-name/tsconfig.node.json", "project-name/views", "project-name/views/consent.ejs", "project-name/views/forms", @@ -65,10 +65,10 @@ import {PlatformApplication} from "@tsed/common"; import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; import "@tsed/oidc-provider"; -import {config} from "./config/index"; -import * as rest from "./controllers/rest/index"; -import * as pages from "./controllers/pages/index"; -import {InteractionsController} from "./controllers/oidc/InteractionsController"; +import {config} from "./config/index.js"; +import * as rest from "./controllers/rest/index.js"; +import * as pages from "./controllers/pages/index.js"; +import {InteractionsController} from "./controllers/oidc/InteractionsController.js"; @Configuration({ ...config, @@ -126,7 +126,7 @@ exports[`Init OIDC Provider project > should generate a project with oidc and sw "project-name/README.md", "project-name/docker-compose.yml", "project-name/package.json", - "project-name/processes.config.js", + "project-name/processes.config.cjs", "project-name/src", "project-name/src/Server.ts", "project-name/src/config", @@ -152,8 +152,8 @@ exports[`Init OIDC Provider project > should generate a project with oidc and sw "project-name/src/models/Account.ts", "project-name/src/services", "project-name/src/services/Accounts.ts", - "project-name/tsconfig.compile.json", - "project-name/tsconfig.json", + "project-name/tsconfig.base.json", + "project-name/tsconfig.node.json", "project-name/views", "project-name/views/consent.ejs", "project-name/views/forms", @@ -179,10 +179,10 @@ import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; import "@tsed/swagger"; import "@tsed/oidc-provider"; -import {config} from "./config/index"; -import * as rest from "./controllers/rest/index"; -import * as pages from "./controllers/pages/index"; -import {InteractionsController} from "./controllers/oidc/InteractionsController"; +import {config} from "./config/index.js"; +import * as rest from "./controllers/rest/index.js"; +import * as pages from "./controllers/pages/index.js"; +import {InteractionsController} from "./controllers/oidc/InteractionsController.js"; @Configuration({ ...config, diff --git a/packages/cli-plugin-oidc-provider/test/init/init.integration.spec.ts b/packages/cli-plugin-oidc-provider/test/init/init.integration.spec.ts index 6627efc33..379bd1187 100644 --- a/packages/cli-plugin-oidc-provider/test/init/init.integration.spec.ts +++ b/packages/cli-plugin-oidc-provider/test/init/init.integration.spec.ts @@ -1,4 +1,4 @@ -import "../.."; +import "../../src/index.js"; import {InitCmd, TEMPLATE_DIR} from "@tsed/cli"; import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; @@ -37,13 +37,13 @@ describe("Init OIDC Provider project", () => { const content = FakeCliFs.entries.get("project-name/src/Server.ts")!; - expect(content).toContain('import "@tsed/oidc-provider"'); - expect(content).toContain('import {InteractionsController} from "./controllers/oidc/InteractionsController";'); + expect(content).toContain("import \"@tsed/oidc-provider\""); + expect(content).toContain("import {InteractionsController} from \"./controllers/oidc/InteractionsController.js\";"); expect(content).toMatchSnapshot(); const configContent = FakeCliFs.entries.get("project-name/src/config/oidc/index.ts")!; - expect(configContent).toContain('path: "/oidc"'); + expect(configContent).toContain("path: \"/oidc\""); }); it("should generate a project with oidc and swagger", async () => { CliPlatformTest.setPackageJson({ @@ -69,12 +69,12 @@ describe("Init OIDC Provider project", () => { const content = FakeCliFs.entries.get("project-name/src/Server.ts")!; - expect(content).toContain('import "@tsed/oidc-provider"'); - expect(content).toContain('import {InteractionsController} from "./controllers/oidc/InteractionsController";'); + expect(content).toContain("import \"@tsed/oidc-provider\""); + expect(content).toContain("import {InteractionsController} from \"./controllers/oidc/InteractionsController.js\";"); expect(content).toMatchSnapshot(); const configContent = FakeCliFs.entries.get("project-name/src/config/oidc/index.ts")!; - expect(configContent).toContain('path: "/oidc"'); + expect(configContent).toContain("path: \"/oidc\""); }); }); diff --git a/packages/cli-plugin-oidc-provider/tsconfig.cjs.json b/packages/cli-plugin-oidc-provider/tsconfig.cjs.json deleted file mode 100644 index 7f23b116d..000000000 --- a/packages/cli-plugin-oidc-provider/tsconfig.cjs.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "extends": "@tsed/typescript/tsconfig.node.json", - "compilerOptions": { - "baseUrl": ".", - "module": "commonjs", - "moduleResolution": "Node16", - "rootDir": "src", - "outDir": "./lib/cjs", - "declaration": true, - "declarationDir": "./lib/types", - "composite": true, - "noEmit": false - }, - "include": ["src", "src/**/*.json"], - "exclude": [ - "node_modules", - "test", - "lib", - "benchmark", - "coverage", - "spec", - "**/*.benchmark.ts", - "**/*.spec.ts", - "keys", - "**/__mock__/**", - "webpack.config.js" - ] -} diff --git a/packages/cli-plugin-oidc-provider/tsconfig.esm.json b/packages/cli-plugin-oidc-provider/tsconfig.esm.json index ce32a9e07..45d441a7d 100644 --- a/packages/cli-plugin-oidc-provider/tsconfig.esm.json +++ b/packages/cli-plugin-oidc-provider/tsconfig.esm.json @@ -2,11 +2,9 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", - "declarationDir": "./lib/types-esm", + "declarationDir": "./lib/types", "declaration": true, "composite": true, "noEmit": false diff --git a/packages/cli-plugin-oidc-provider/tsconfig.json b/packages/cli-plugin-oidc-provider/tsconfig.json index 705b5ce35..f42860e1e 100644 --- a/packages/cli-plugin-oidc-provider/tsconfig.json +++ b/packages/cli-plugin-oidc-provider/tsconfig.json @@ -12,9 +12,6 @@ { "path": "../cli-core/tsconfig.json" }, - { - "path": "./tsconfig.cjs.json" - }, { "path": "./tsconfig.esm.json" }, diff --git a/packages/cli-plugin-oidc-provider/tsconfig.spec.json b/packages/cli-plugin-oidc-provider/tsconfig.spec.json index 75fcfa09d..0f06288a8 100644 --- a/packages/cli-plugin-oidc-provider/tsconfig.spec.json +++ b/packages/cli-plugin-oidc-provider/tsconfig.spec.json @@ -3,8 +3,6 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, diff --git a/packages/cli-plugin-passport/package.json b/packages/cli-plugin-passport/package.json index 9290c480f..80a0b81d1 100644 --- a/packages/cli-plugin-passport/package.json +++ b/packages/cli-plugin-passport/package.json @@ -1,10 +1,10 @@ { "name": "@tsed/cli-plugin-passport", "description": "Ts.ED CLI plugin. Add Passport.js support", - "type": "commonjs", "version": "5.2.10", + "type": "module", + "main": "./lib/esm/index.js", "source": "./src/index.ts", - "main": "./lib/cjs/index.js", "module": "./lib/esm/index.js", "typings": "./lib/types/index.d.ts", "exports": { @@ -26,8 +26,8 @@ "tslib": "2.3.1" }, "devDependencies": { - "@tsed/cli": "5.2.10", - "@tsed/cli-core": "5.2.10", + "@tsed/cli": "workspace:*", + "@tsed/cli-core": "workspace:*", "@tsed/typescript": "workspace:*", "@types/change-case": "^2.3.1", "cross-env": "7.0.3", diff --git a/packages/cli-plugin-passport/src/CliPluginPassportModule.ts b/packages/cli-plugin-passport/src/CliPluginPassportModule.ts index 87dae40d7..e889861c5 100644 --- a/packages/cli-plugin-passport/src/CliPluginPassportModule.ts +++ b/packages/cli-plugin-passport/src/CliPluginPassportModule.ts @@ -1,7 +1,7 @@ import {Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core"; import {Inject} from "@tsed/di"; -import {PassportGenerateHook} from "./hooks/PassportGenerateHook"; +import {PassportGenerateHook} from "./hooks/PassportGenerateHook.js"; @Module({ imports: [PassportGenerateHook] diff --git a/packages/cli-plugin-passport/src/hooks/PassportGenerateHook.ts b/packages/cli-plugin-passport/src/hooks/PassportGenerateHook.ts index 0b1298d3e..743c8932f 100644 --- a/packages/cli-plugin-passport/src/hooks/PassportGenerateHook.ts +++ b/packages/cli-plugin-passport/src/hooks/PassportGenerateHook.ts @@ -3,8 +3,8 @@ import {Inject, OnExec, OnPrompt, ProjectPackageJson, SrcRendererService, Tasks} import {Injectable} from "@tsed/di"; import {paramCase} from "change-case"; -import {PassportClient} from "../services/PassportClient"; -import {TEMPLATE_DIR} from "../utils/templateDir"; +import {PassportClient} from "../services/PassportClient.js"; +import {TEMPLATE_DIR} from "../utils/templateDir.js"; export interface PassportGenerateOptions extends GenerateCmdContext { passportPackage: string; diff --git a/packages/cli-plugin-passport/src/index.ts b/packages/cli-plugin-passport/src/index.ts index 6580d7f4f..e33f16f8f 100644 --- a/packages/cli-plugin-passport/src/index.ts +++ b/packages/cli-plugin-passport/src/index.ts @@ -1,7 +1,7 @@ -import {CliPluginPassportModule} from "./CliPluginPassportModule"; +import {CliPluginPassportModule} from "./CliPluginPassportModule.js"; -export * from "./hooks/PassportGenerateHook"; -export * from "./services/PassportClient"; -export * from "./utils/templateDir"; +export * from "./hooks/PassportGenerateHook.js"; +export * from "./services/PassportClient.js"; +export * from "./utils/templateDir.js"; export default CliPluginPassportModule; diff --git a/packages/cli-plugin-passport/src/utils/templateDir.ts b/packages/cli-plugin-passport/src/utils/templateDir.ts index 911a16584..2ccfa6ef6 100644 --- a/packages/cli-plugin-passport/src/utils/templateDir.ts +++ b/packages/cli-plugin-passport/src/utils/templateDir.ts @@ -1,3 +1,3 @@ import {getTemplateDirectory} from "@tsed/cli-core"; -export const TEMPLATE_DIR = getTemplateDirectory(__dirname); +export const TEMPLATE_DIR = getTemplateDirectory(import.meta.dirname); diff --git a/packages/cli-plugin-passport/tsconfig.cjs.json b/packages/cli-plugin-passport/tsconfig.cjs.json deleted file mode 100644 index 7f23b116d..000000000 --- a/packages/cli-plugin-passport/tsconfig.cjs.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "extends": "@tsed/typescript/tsconfig.node.json", - "compilerOptions": { - "baseUrl": ".", - "module": "commonjs", - "moduleResolution": "Node16", - "rootDir": "src", - "outDir": "./lib/cjs", - "declaration": true, - "declarationDir": "./lib/types", - "composite": true, - "noEmit": false - }, - "include": ["src", "src/**/*.json"], - "exclude": [ - "node_modules", - "test", - "lib", - "benchmark", - "coverage", - "spec", - "**/*.benchmark.ts", - "**/*.spec.ts", - "keys", - "**/__mock__/**", - "webpack.config.js" - ] -} diff --git a/packages/cli-plugin-passport/tsconfig.esm.json b/packages/cli-plugin-passport/tsconfig.esm.json index ce32a9e07..45d441a7d 100644 --- a/packages/cli-plugin-passport/tsconfig.esm.json +++ b/packages/cli-plugin-passport/tsconfig.esm.json @@ -2,11 +2,9 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", - "declarationDir": "./lib/types-esm", + "declarationDir": "./lib/types", "declaration": true, "composite": true, "noEmit": false diff --git a/packages/cli-plugin-passport/tsconfig.json b/packages/cli-plugin-passport/tsconfig.json index 8c80e7e4f..cf03b6beb 100644 --- a/packages/cli-plugin-passport/tsconfig.json +++ b/packages/cli-plugin-passport/tsconfig.json @@ -12,9 +12,6 @@ { "path": "../cli-core/tsconfig.json" }, - { - "path": "./tsconfig.cjs.json" - }, { "path": "./tsconfig.esm.json" } diff --git a/packages/cli-plugin-prisma/package.json b/packages/cli-plugin-prisma/package.json index 180a73116..319f9d4b9 100644 --- a/packages/cli-plugin-prisma/package.json +++ b/packages/cli-plugin-prisma/package.json @@ -1,10 +1,10 @@ { "name": "@tsed/cli-plugin-prisma", "description": "Ts.ED CLI plugin. Add Prisma project initialisation support.", - "type": "commonjs", "version": "5.2.10", + "type": "module", + "main": "./lib/esm/index.js", "source": "./src/index.ts", - "main": "./lib/cjs/index.js", "module": "./lib/esm/index.js", "typings": "./lib/types/index.d.ts", "exports": { @@ -26,8 +26,8 @@ "tslib": "2.3.1" }, "devDependencies": { - "@tsed/cli": "5.2.10", - "@tsed/cli-core": "5.2.10", + "@tsed/cli": "workspace:*", + "@tsed/cli-core": "workspace:*", "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", "typescript": "4.9.5", diff --git a/packages/cli-plugin-prisma/src/CliPluginPrismaModule.ts b/packages/cli-plugin-prisma/src/CliPluginPrismaModule.ts index e500c749f..08488e654 100644 --- a/packages/cli-plugin-prisma/src/CliPluginPrismaModule.ts +++ b/packages/cli-plugin-prisma/src/CliPluginPrismaModule.ts @@ -1,8 +1,8 @@ import {Module, ProjectPackageJson} from "@tsed/cli-core"; import {Inject} from "@tsed/di"; -import {PrismaCmd} from "./commands/PrismaCmd"; -import {PrismaInitHook} from "./hooks/PrismaInitHook"; +import {PrismaCmd} from "./commands/PrismaCmd.js"; +import {PrismaInitHook} from "./hooks/PrismaInitHook.js"; @Module({ imports: [PrismaInitHook, PrismaCmd] diff --git a/packages/cli-plugin-prisma/src/commands/PrismaCmd.ts b/packages/cli-plugin-prisma/src/commands/PrismaCmd.ts index 02bd4918b..0c9b6ace2 100644 --- a/packages/cli-plugin-prisma/src/commands/PrismaCmd.ts +++ b/packages/cli-plugin-prisma/src/commands/PrismaCmd.ts @@ -1,6 +1,6 @@ import {CliDefaultOptions, Command, CommandProvider, Inject} from "@tsed/cli-core"; -import {CliPrisma} from "../services/CliPrisma"; +import {CliPrisma} from "../services/CliPrisma.js"; export interface PrismaContext extends CliDefaultOptions { command: string; diff --git a/packages/cli-plugin-prisma/src/hooks/PrismaInitHook.ts b/packages/cli-plugin-prisma/src/hooks/PrismaInitHook.ts index d16d44af0..c49bffef6 100644 --- a/packages/cli-plugin-prisma/src/hooks/PrismaInitHook.ts +++ b/packages/cli-plugin-prisma/src/hooks/PrismaInitHook.ts @@ -2,7 +2,7 @@ import {InitCmdContext} from "@tsed/cli"; import {CliService, Inject, OnExec, PackageManagersModule, ProjectPackageJson} from "@tsed/cli-core"; import {Injectable} from "@tsed/di"; -import {CliPrisma} from "../services/CliPrisma"; +import {CliPrisma} from "../services/CliPrisma.js"; @Injectable() export class PrismaInitHook { diff --git a/packages/cli-plugin-prisma/src/index.ts b/packages/cli-plugin-prisma/src/index.ts index d22b08a0e..8a3e942f7 100644 --- a/packages/cli-plugin-prisma/src/index.ts +++ b/packages/cli-plugin-prisma/src/index.ts @@ -1,7 +1,7 @@ -import {CliPluginPrismaModule} from "./CliPluginPrismaModule"; +import {CliPluginPrismaModule} from "./CliPluginPrismaModule.js"; -export * from "./hooks/PrismaInitHook"; -export * from "./services/CliPrisma"; -export * from "./utils/templateDir"; +export * from "./hooks/PrismaInitHook.js"; +export * from "./services/CliPrisma.js"; +export * from "./utils/templateDir.js"; export default CliPluginPrismaModule; diff --git a/packages/cli-plugin-prisma/src/services/CliPrisma.spec.ts b/packages/cli-plugin-prisma/src/services/CliPrisma.spec.ts index eec3e1092..147afac0b 100644 --- a/packages/cli-plugin-prisma/src/services/CliPrisma.spec.ts +++ b/packages/cli-plugin-prisma/src/services/CliPrisma.spec.ts @@ -1,9 +1,9 @@ -// @ts-ignore import {CliFs, normalizePath} from "@tsed/cli-core"; +// @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; import {join} from "path"; -import {CliPrisma} from "./CliPrisma"; +import {CliPrisma} from "./CliPrisma.js"; async function createServiceFixture() { const cliFs = { diff --git a/packages/cli-plugin-prisma/src/utils/templateDir.ts b/packages/cli-plugin-prisma/src/utils/templateDir.ts index 911a16584..2ccfa6ef6 100644 --- a/packages/cli-plugin-prisma/src/utils/templateDir.ts +++ b/packages/cli-plugin-prisma/src/utils/templateDir.ts @@ -1,3 +1,3 @@ import {getTemplateDirectory} from "@tsed/cli-core"; -export const TEMPLATE_DIR = getTemplateDirectory(__dirname); +export const TEMPLATE_DIR = getTemplateDirectory(import.meta.dirname); diff --git a/packages/cli-plugin-prisma/tsconfig.cjs.json b/packages/cli-plugin-prisma/tsconfig.cjs.json deleted file mode 100644 index 7f23b116d..000000000 --- a/packages/cli-plugin-prisma/tsconfig.cjs.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "extends": "@tsed/typescript/tsconfig.node.json", - "compilerOptions": { - "baseUrl": ".", - "module": "commonjs", - "moduleResolution": "Node16", - "rootDir": "src", - "outDir": "./lib/cjs", - "declaration": true, - "declarationDir": "./lib/types", - "composite": true, - "noEmit": false - }, - "include": ["src", "src/**/*.json"], - "exclude": [ - "node_modules", - "test", - "lib", - "benchmark", - "coverage", - "spec", - "**/*.benchmark.ts", - "**/*.spec.ts", - "keys", - "**/__mock__/**", - "webpack.config.js" - ] -} diff --git a/packages/cli-plugin-prisma/tsconfig.esm.json b/packages/cli-plugin-prisma/tsconfig.esm.json index ce32a9e07..45d441a7d 100644 --- a/packages/cli-plugin-prisma/tsconfig.esm.json +++ b/packages/cli-plugin-prisma/tsconfig.esm.json @@ -2,11 +2,9 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", - "declarationDir": "./lib/types-esm", + "declarationDir": "./lib/types", "declaration": true, "composite": true, "noEmit": false diff --git a/packages/cli-plugin-prisma/tsconfig.json b/packages/cli-plugin-prisma/tsconfig.json index 705b5ce35..f42860e1e 100644 --- a/packages/cli-plugin-prisma/tsconfig.json +++ b/packages/cli-plugin-prisma/tsconfig.json @@ -12,9 +12,6 @@ { "path": "../cli-core/tsconfig.json" }, - { - "path": "./tsconfig.cjs.json" - }, { "path": "./tsconfig.esm.json" }, diff --git a/packages/cli-plugin-prisma/tsconfig.spec.json b/packages/cli-plugin-prisma/tsconfig.spec.json index 75fcfa09d..0f06288a8 100644 --- a/packages/cli-plugin-prisma/tsconfig.spec.json +++ b/packages/cli-plugin-prisma/tsconfig.spec.json @@ -3,8 +3,6 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, diff --git a/packages/cli-plugin-typegraphql/package.json b/packages/cli-plugin-typegraphql/package.json index 75d83f638..5c64acd01 100644 --- a/packages/cli-plugin-typegraphql/package.json +++ b/packages/cli-plugin-typegraphql/package.json @@ -1,10 +1,10 @@ { "name": "@tsed/cli-plugin-typegraphql", "description": "Ts.ED CLI plugin. Add TypeGraphql support.", - "type": "commonjs", "version": "5.2.10", + "type": "module", + "main": "./lib/esm/index.js", "source": "./src/index.ts", - "main": "./lib/cjs/index.js", "module": "./lib/esm/index.js", "typings": "./lib/types/index.d.ts", "exports": { @@ -18,7 +18,7 @@ "scripts": { "build": "yarn build:ts", "build:ts": "tsc --build tsconfig.json", - "test": "vitest run", + "test": "vitest run -u", "test:ci": "vitest run --coverage.thresholds.autoUpdate=true" }, "files": [ @@ -29,15 +29,15 @@ "tslib": "2.3.1" }, "devDependencies": { - "@tsed/cli": "5.2.10", - "@tsed/cli-core": "5.2.10", + "@tsed/cli": "workspace:*", + "@tsed/cli-core": "workspace:*", "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", "typescript": "4.9.5", "vitest": "2.1.1" }, "peerDependencies": { - "@tsed/cli": "5.2.10", - "@tsed/cli-core": "5.2.10" + "@tsed/cli": "workspace:*", + "@tsed/cli-core": "workspace:*" } } diff --git a/packages/cli-plugin-typegraphql/src/TypeGraphqlModule.ts b/packages/cli-plugin-typegraphql/src/TypeGraphqlModule.ts index f9a195d39..271508b44 100644 --- a/packages/cli-plugin-typegraphql/src/TypeGraphqlModule.ts +++ b/packages/cli-plugin-typegraphql/src/TypeGraphqlModule.ts @@ -1,7 +1,7 @@ import {Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core"; import {Inject} from "@tsed/di"; -import {TypeGraphqlInitHook} from "./hooks/TypeGraphqlInitHook"; +import {TypeGraphqlInitHook} from "./hooks/TypeGraphqlInitHook.js"; @Module({ imports: [TypeGraphqlInitHook] diff --git a/packages/cli-plugin-typegraphql/src/hooks/TypeGraphqlInitHook.ts b/packages/cli-plugin-typegraphql/src/hooks/TypeGraphqlInitHook.ts index a55d7f71a..2453b7ef6 100644 --- a/packages/cli-plugin-typegraphql/src/hooks/TypeGraphqlInitHook.ts +++ b/packages/cli-plugin-typegraphql/src/hooks/TypeGraphqlInitHook.ts @@ -2,7 +2,7 @@ import {InitCmdContext} from "@tsed/cli"; import {Inject, OnExec, ProjectPackageJson, RootRendererService, SrcRendererService} from "@tsed/cli-core"; import {Injectable} from "@tsed/di"; -import {TEMPLATE_DIR} from "../utils/templateDir"; +import {TEMPLATE_DIR} from "../utils/templateDir.js"; @Injectable() export class TypeGraphqlInitHook { diff --git a/packages/cli-plugin-typegraphql/src/index.ts b/packages/cli-plugin-typegraphql/src/index.ts index e56c9abcf..062691de5 100644 --- a/packages/cli-plugin-typegraphql/src/index.ts +++ b/packages/cli-plugin-typegraphql/src/index.ts @@ -1,6 +1,6 @@ -import {TypeGraphqlModule} from "./TypeGraphqlModule"; +import {TypeGraphqlModule} from "./TypeGraphqlModule.js"; -export * from "./hooks/TypeGraphqlInitHook"; -export * from "./utils/templateDir"; +export * from "./hooks/TypeGraphqlInitHook.js"; +export * from "./utils/templateDir.js"; export default TypeGraphqlModule; diff --git a/packages/cli-plugin-typegraphql/src/utils/templateDir.ts b/packages/cli-plugin-typegraphql/src/utils/templateDir.ts index 911a16584..2ccfa6ef6 100644 --- a/packages/cli-plugin-typegraphql/src/utils/templateDir.ts +++ b/packages/cli-plugin-typegraphql/src/utils/templateDir.ts @@ -1,3 +1,3 @@ import {getTemplateDirectory} from "@tsed/cli-core"; -export const TEMPLATE_DIR = getTemplateDirectory(__dirname); +export const TEMPLATE_DIR = getTemplateDirectory(import.meta.dirname); diff --git a/packages/cli-plugin-typegraphql/templates/init/src/datasources/index.ts b/packages/cli-plugin-typegraphql/templates/init/src/datasources/index.ts index 25fad7f40..aff966775 100644 --- a/packages/cli-plugin-typegraphql/templates/init/src/datasources/index.ts +++ b/packages/cli-plugin-typegraphql/templates/init/src/datasources/index.ts @@ -1 +1 @@ -export * from "./MyDataSource"; +export * from "./MyDataSource.js"; diff --git a/packages/cli-plugin-typegraphql/templates/init/src/resolvers/index.ts b/packages/cli-plugin-typegraphql/templates/init/src/resolvers/index.ts index cad96e66a..8b30169cc 100644 --- a/packages/cli-plugin-typegraphql/templates/init/src/resolvers/index.ts +++ b/packages/cli-plugin-typegraphql/templates/init/src/resolvers/index.ts @@ -1,3 +1,3 @@ -export * from "./recipes/Recipe"; -export * from "./recipes/RecipeNotFoundError"; -export * from "./recipes/RecipeResolver"; +export * from "./recipes/Recipe.js"; +export * from "./recipes/RecipeNotFoundError.js"; +export * from "./recipes/RecipeResolver.js"; diff --git a/packages/cli-plugin-typegraphql/templates/init/src/resolvers/recipes/RecipeResolver.ts b/packages/cli-plugin-typegraphql/templates/init/src/resolvers/recipes/RecipeResolver.ts index 3faed6942..0eb04044a 100644 --- a/packages/cli-plugin-typegraphql/templates/init/src/resolvers/recipes/RecipeResolver.ts +++ b/packages/cli-plugin-typegraphql/templates/init/src/resolvers/recipes/RecipeResolver.ts @@ -1,8 +1,8 @@ import {ResolverService} from "@tsed/typegraphql"; import {Arg, Query} from "type-graphql"; -import {RecipeService} from "../../services/RecipeService"; -import {Recipe} from "./Recipe"; -import {RecipeNotFoundError} from "./RecipeNotFoundError"; +import {RecipeService} from "../../services/RecipeService.js"; +import {Recipe} from "./Recipe.js"; +import {RecipeNotFoundError} from "./RecipeNotFoundError.js"; @ResolverService(Recipe) export class RecipeResolver { diff --git a/packages/cli-plugin-typegraphql/templates/init/src/services/RecipeService.ts b/packages/cli-plugin-typegraphql/templates/init/src/services/RecipeService.ts index d1a9b3995..99c65eaa5 100644 --- a/packages/cli-plugin-typegraphql/templates/init/src/services/RecipeService.ts +++ b/packages/cli-plugin-typegraphql/templates/init/src/services/RecipeService.ts @@ -1,5 +1,5 @@ import {Injectable} from "@tsed/di"; -import {Recipe} from "../resolvers"; +import {Recipe} from "../resolvers.js"; @Injectable() export class RecipeService { diff --git a/packages/cli-plugin-typegraphql/test/init/__snapshots__/init.integration.spec.ts.snap b/packages/cli-plugin-typegraphql/test/init/__snapshots__/init.integration.spec.ts.snap index e45c3d49c..69ea17cd6 100644 --- a/packages/cli-plugin-typegraphql/test/init/__snapshots__/init.integration.spec.ts.snap +++ b/packages/cli-plugin-typegraphql/test/init/__snapshots__/init.integration.spec.ts.snap @@ -7,10 +7,10 @@ import {PlatformApplication} from "@tsed/common"; import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; import "@tsed/typegraphql"; -import "./datasources/index"; -import "./resolvers/index"; -import {config} from "./config/index"; -import * as rest from "./controllers/rest/index"; +import "./datasources/index.js"; +import "./resolvers/index.js"; +import {config} from "./config/index.js"; +import * as rest from "./controllers/rest/index.js"; @Configuration({ ...config, @@ -56,8 +56,8 @@ export class Server { exports[`Init TypeGraphQL project > should generate a project with typegraphql 3`] = ` "import {readFileSync} from "fs"; -import {envs} from "./envs/index"; -import loggerConfig from "./logger/index"; +import {envs} from "./envs/index.js"; +import loggerConfig from "./logger/index.js"; const pkg = JSON.parse(readFileSync("./package.json", {encoding: "utf8"})); export const config: Partial = { diff --git a/packages/cli-plugin-typegraphql/test/init/init.integration.spec.ts b/packages/cli-plugin-typegraphql/test/init/init.integration.spec.ts index 3ed4aa2d5..159e134f7 100644 --- a/packages/cli-plugin-typegraphql/test/init/init.integration.spec.ts +++ b/packages/cli-plugin-typegraphql/test/init/init.integration.spec.ts @@ -42,7 +42,7 @@ describe("Init TypeGraphQL project", () => { "project-name/README.md", "project-name/docker-compose.yml", "project-name/package.json", - "project-name/processes.config.js", + "project-name/processes.config.cjs", "project-name/src", "project-name/src/Server.ts", "project-name/src/config", @@ -65,16 +65,16 @@ describe("Init TypeGraphQL project", () => { "project-name/src/resolvers/recipes/RecipeResolver.ts", "project-name/src/services", "project-name/src/services/RecipeService.ts", - "project-name/tsconfig.compile.json", - "project-name/tsconfig.json", + "project-name/tsconfig.base.json", + "project-name/tsconfig.node.json", ] `); const content = FakeCliFs.entries.get("project-name/src/Server.ts")!; expect(content).toMatchSnapshot(); expect(content).toContain('import "@tsed/typegraphql"'); - expect(content).toContain('import "./datasources/index";'); - expect(content).toContain('import "./resolvers/index";'); + expect(content).toContain('import "./datasources/index.js";'); + expect(content).toContain('import "./resolvers/index.js";'); const configContent = FakeCliFs.entries.get("project-name/src/config/index.ts")!; expect(configContent).toMatchSnapshot(); diff --git a/packages/cli-plugin-typegraphql/tsconfig.cjs.json b/packages/cli-plugin-typegraphql/tsconfig.cjs.json deleted file mode 100644 index 7f23b116d..000000000 --- a/packages/cli-plugin-typegraphql/tsconfig.cjs.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "extends": "@tsed/typescript/tsconfig.node.json", - "compilerOptions": { - "baseUrl": ".", - "module": "commonjs", - "moduleResolution": "Node16", - "rootDir": "src", - "outDir": "./lib/cjs", - "declaration": true, - "declarationDir": "./lib/types", - "composite": true, - "noEmit": false - }, - "include": ["src", "src/**/*.json"], - "exclude": [ - "node_modules", - "test", - "lib", - "benchmark", - "coverage", - "spec", - "**/*.benchmark.ts", - "**/*.spec.ts", - "keys", - "**/__mock__/**", - "webpack.config.js" - ] -} diff --git a/packages/cli-plugin-typegraphql/tsconfig.esm.json b/packages/cli-plugin-typegraphql/tsconfig.esm.json index ce32a9e07..45d441a7d 100644 --- a/packages/cli-plugin-typegraphql/tsconfig.esm.json +++ b/packages/cli-plugin-typegraphql/tsconfig.esm.json @@ -2,11 +2,9 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", - "declarationDir": "./lib/types-esm", + "declarationDir": "./lib/types", "declaration": true, "composite": true, "noEmit": false diff --git a/packages/cli-plugin-typegraphql/tsconfig.json b/packages/cli-plugin-typegraphql/tsconfig.json index 705b5ce35..f42860e1e 100644 --- a/packages/cli-plugin-typegraphql/tsconfig.json +++ b/packages/cli-plugin-typegraphql/tsconfig.json @@ -12,9 +12,6 @@ { "path": "../cli-core/tsconfig.json" }, - { - "path": "./tsconfig.cjs.json" - }, { "path": "./tsconfig.esm.json" }, diff --git a/packages/cli-plugin-typegraphql/tsconfig.spec.json b/packages/cli-plugin-typegraphql/tsconfig.spec.json index 75fcfa09d..0f06288a8 100644 --- a/packages/cli-plugin-typegraphql/tsconfig.spec.json +++ b/packages/cli-plugin-typegraphql/tsconfig.spec.json @@ -3,8 +3,6 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, diff --git a/packages/cli-plugin-typeorm/package.json b/packages/cli-plugin-typeorm/package.json index 30973f0e7..674b21626 100644 --- a/packages/cli-plugin-typeorm/package.json +++ b/packages/cli-plugin-typeorm/package.json @@ -1,10 +1,10 @@ { "name": "@tsed/cli-plugin-typeorm", "description": "Ts.ED CLI plugin. Add TypeORM support", - "type": "commonjs", "version": "5.2.10", + "type": "module", + "main": "./lib/esm/index.js", "source": "./src/index.ts", - "main": "./lib/cjs/index.js", "module": "./lib/esm/index.js", "typings": "./lib/types/index.d.ts", "exports": { @@ -26,8 +26,8 @@ "tslib": "2.3.1" }, "devDependencies": { - "@tsed/cli": "5.2.10", - "@tsed/cli-core": "5.2.10", + "@tsed/cli": "workspace:*", + "@tsed/cli-core": "workspace:*", "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", "typescript": "4.9.5", diff --git a/packages/cli-plugin-typeorm/src/CliPluginTypeORMModule.ts b/packages/cli-plugin-typeorm/src/CliPluginTypeORMModule.ts index 02aaa0e6c..123359b73 100644 --- a/packages/cli-plugin-typeorm/src/CliPluginTypeORMModule.ts +++ b/packages/cli-plugin-typeorm/src/CliPluginTypeORMModule.ts @@ -1,8 +1,8 @@ import {Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core"; import {Inject} from "@tsed/di"; -import {TypeORMGenerateHook} from "./hooks/TypeORMGenerateHook"; -import {TypeORMInitHook} from "./hooks/TypeORMInitHook"; +import {TypeORMGenerateHook} from "./hooks/TypeORMGenerateHook.js"; +import {TypeORMInitHook} from "./hooks/TypeORMInitHook.js"; @Module({ imports: [TypeORMInitHook, TypeORMGenerateHook] diff --git a/packages/cli-plugin-typeorm/src/hooks/TypeORMGenerateHook.ts b/packages/cli-plugin-typeorm/src/hooks/TypeORMGenerateHook.ts index d45ed8e1d..40c3c39ff 100644 --- a/packages/cli-plugin-typeorm/src/hooks/TypeORMGenerateHook.ts +++ b/packages/cli-plugin-typeorm/src/hooks/TypeORMGenerateHook.ts @@ -3,7 +3,7 @@ import {CliDockerComposeYaml, Inject, OnExec, OnPrompt, ProjectPackageJson, SrcR import {Injectable} from "@tsed/di"; import {camelCase} from "change-case"; -import {TEMPLATE_DIR} from "../utils/templateDir"; +import {TEMPLATE_DIR} from "../utils/templateDir.js"; export interface TypeORMGenerateOptions extends GenerateCmdContext { typeormDataSource: string; diff --git a/packages/cli-plugin-typeorm/src/index.ts b/packages/cli-plugin-typeorm/src/index.ts index e84d29e06..5c53721bb 100644 --- a/packages/cli-plugin-typeorm/src/index.ts +++ b/packages/cli-plugin-typeorm/src/index.ts @@ -1,7 +1,7 @@ -import {CliPluginTypeORMModule} from "./CliPluginTypeORMModule"; +import {CliPluginTypeORMModule} from "./CliPluginTypeORMModule.js"; -export * from "./hooks/TypeORMGenerateHook"; -export * from "./hooks/TypeORMInitHook"; -export * from "./utils/templateDir"; +export * from "./hooks/TypeORMGenerateHook.js"; +export * from "./hooks/TypeORMInitHook.js"; +export * from "./utils/templateDir.js"; export default CliPluginTypeORMModule; diff --git a/packages/cli-plugin-typeorm/src/utils/templateDir.ts b/packages/cli-plugin-typeorm/src/utils/templateDir.ts index 911a16584..2ccfa6ef6 100644 --- a/packages/cli-plugin-typeorm/src/utils/templateDir.ts +++ b/packages/cli-plugin-typeorm/src/utils/templateDir.ts @@ -1,3 +1,3 @@ import {getTemplateDirectory} from "@tsed/cli-core"; -export const TEMPLATE_DIR = getTemplateDirectory(__dirname); +export const TEMPLATE_DIR = getTemplateDirectory(import.meta.dirname); diff --git a/packages/cli-plugin-typeorm/test/integrations/init/__snapshots__/init.integration.spec.ts.snap b/packages/cli-plugin-typeorm/test/integrations/init/__snapshots__/init.integration.spec.ts.snap index 0e01f2501..1b1b81e2e 100644 --- a/packages/cli-plugin-typeorm/test/integrations/init/__snapshots__/init.integration.spec.ts.snap +++ b/packages/cli-plugin-typeorm/test/integrations/init/__snapshots__/init.integration.spec.ts.snap @@ -6,8 +6,8 @@ import {Configuration, Inject} from "@tsed/di"; import {PlatformApplication} from "@tsed/common"; import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; -import {config} from "./config/index"; -import * as rest from "./controllers/rest/index"; +import {config} from "./config/index.js"; +import * as rest from "./controllers/rest/index.js"; @Configuration({ ...config, diff --git a/packages/cli-plugin-typeorm/test/integrations/init/init.integration.spec.ts b/packages/cli-plugin-typeorm/test/integrations/init/init.integration.spec.ts index 7ba264a13..eab5c5c1d 100644 --- a/packages/cli-plugin-typeorm/test/integrations/init/init.integration.spec.ts +++ b/packages/cli-plugin-typeorm/test/integrations/init/init.integration.spec.ts @@ -60,7 +60,7 @@ describe("TypeORM: Init cmd", () => { "project-name/README.md", "project-name/docker-compose.yml", "project-name/package.json", - "project-name/processes.config.js", + "project-name/processes.config.cjs", "project-name/src", "project-name/src/Server.ts", "project-name/src/config", @@ -74,8 +74,8 @@ describe("TypeORM: Init cmd", () => { "project-name/src/datasources", "project-name/src/datasources/MysqlDatasource.ts", "project-name/src/index.ts", - "project-name/tsconfig.compile.json", - "project-name/tsconfig.json", + "project-name/tsconfig.base.json", + "project-name/tsconfig.node.json", ] `); @@ -134,7 +134,7 @@ describe("TypeORM: Init cmd", () => { "project-name/README.md", "project-name/docker-compose.yml", "project-name/package.json", - "project-name/processes.config.js", + "project-name/processes.config.cjs", "project-name/src", "project-name/src/Server.ts", "project-name/src/config", @@ -146,8 +146,8 @@ describe("TypeORM: Init cmd", () => { "project-name/src/controllers/rest", "project-name/src/controllers/rest/HelloWorldController.ts", "project-name/src/index.ts", - "project-name/tsconfig.compile.json", - "project-name/tsconfig.json", + "project-name/tsconfig.base.json", + "project-name/tsconfig.node.json", ] `); }); diff --git a/packages/cli-plugin-typeorm/tsconfig.cjs.json b/packages/cli-plugin-typeorm/tsconfig.cjs.json deleted file mode 100644 index 7f23b116d..000000000 --- a/packages/cli-plugin-typeorm/tsconfig.cjs.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "extends": "@tsed/typescript/tsconfig.node.json", - "compilerOptions": { - "baseUrl": ".", - "module": "commonjs", - "moduleResolution": "Node16", - "rootDir": "src", - "outDir": "./lib/cjs", - "declaration": true, - "declarationDir": "./lib/types", - "composite": true, - "noEmit": false - }, - "include": ["src", "src/**/*.json"], - "exclude": [ - "node_modules", - "test", - "lib", - "benchmark", - "coverage", - "spec", - "**/*.benchmark.ts", - "**/*.spec.ts", - "keys", - "**/__mock__/**", - "webpack.config.js" - ] -} diff --git a/packages/cli-plugin-typeorm/tsconfig.esm.json b/packages/cli-plugin-typeorm/tsconfig.esm.json index ce32a9e07..45d441a7d 100644 --- a/packages/cli-plugin-typeorm/tsconfig.esm.json +++ b/packages/cli-plugin-typeorm/tsconfig.esm.json @@ -2,11 +2,9 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", - "declarationDir": "./lib/types-esm", + "declarationDir": "./lib/types", "declaration": true, "composite": true, "noEmit": false diff --git a/packages/cli-plugin-typeorm/tsconfig.json b/packages/cli-plugin-typeorm/tsconfig.json index 705b5ce35..f42860e1e 100644 --- a/packages/cli-plugin-typeorm/tsconfig.json +++ b/packages/cli-plugin-typeorm/tsconfig.json @@ -12,9 +12,6 @@ { "path": "../cli-core/tsconfig.json" }, - { - "path": "./tsconfig.cjs.json" - }, { "path": "./tsconfig.esm.json" }, diff --git a/packages/cli-plugin-typeorm/tsconfig.spec.json b/packages/cli-plugin-typeorm/tsconfig.spec.json index 75fcfa09d..0f06288a8 100644 --- a/packages/cli-plugin-typeorm/tsconfig.spec.json +++ b/packages/cli-plugin-typeorm/tsconfig.spec.json @@ -3,8 +3,6 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, diff --git a/packages/cli-plugin-vitest/package.json b/packages/cli-plugin-vitest/package.json index e95926593..feb30c042 100644 --- a/packages/cli-plugin-vitest/package.json +++ b/packages/cli-plugin-vitest/package.json @@ -1,10 +1,10 @@ { "name": "@tsed/cli-plugin-vitest", "description": "Ts.ED CLI plugin. Add Jest support", - "type": "commonjs", "version": "5.2.10", + "type": "module", + "main": "./lib/esm/index.js", "source": "./src/index.ts", - "main": "./lib/cjs/index.js", "module": "./lib/esm/index.js", "typings": "./lib/types/index.d.ts", "exports": { @@ -22,8 +22,8 @@ "test:ci": "vitest run --coverage.thresholds.autoUpdate=true" }, "devDependencies": { - "@tsed/cli": "5.2.10", - "@tsed/cli-core": "5.2.10", + "@tsed/cli": "workspace:*", + "@tsed/cli-core": "workspace:*", "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", "typescript": "4.9.5", diff --git a/packages/cli-plugin-vitest/src/CliPluginVitestModule.ts b/packages/cli-plugin-vitest/src/CliPluginVitestModule.ts index be3fd40fa..ce6f47afd 100644 --- a/packages/cli-plugin-vitest/src/CliPluginVitestModule.ts +++ b/packages/cli-plugin-vitest/src/CliPluginVitestModule.ts @@ -2,8 +2,8 @@ import {RuntimesModule} from "@tsed/cli"; import {Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core"; import {Inject} from "@tsed/di"; -import {VitestGenerateHook} from "./hooks/VitestGenerateHook"; -import {VitestInitHook} from "./hooks/VitestInitHook"; +import {VitestGenerateHook} from "./hooks/VitestGenerateHook.js"; +import {VitestInitHook} from "./hooks/VitestInitHook.js"; @Module({ imports: [VitestInitHook, VitestGenerateHook] diff --git a/packages/cli-plugin-vitest/src/hooks/VitestGenerateHook.ts b/packages/cli-plugin-vitest/src/hooks/VitestGenerateHook.ts index 0653e9d34..bb392d77a 100644 --- a/packages/cli-plugin-vitest/src/hooks/VitestGenerateHook.ts +++ b/packages/cli-plugin-vitest/src/hooks/VitestGenerateHook.ts @@ -2,7 +2,7 @@ import {GenerateCmdContext} from "@tsed/cli"; import {Inject, Injectable, OnExec, SrcRendererService, Tasks} from "@tsed/cli-core"; import normalizePath from "normalize-path"; -import {TEMPLATE_DIR} from "../utils/templateDir"; +import {TEMPLATE_DIR} from "../utils/templateDir.js"; @Injectable() export class VitestGenerateHook { diff --git a/packages/cli-plugin-vitest/src/hooks/VitestInitHook.ts b/packages/cli-plugin-vitest/src/hooks/VitestInitHook.ts index 5400d193d..0a86511ca 100644 --- a/packages/cli-plugin-vitest/src/hooks/VitestInitHook.ts +++ b/packages/cli-plugin-vitest/src/hooks/VitestInitHook.ts @@ -8,7 +8,7 @@ import { SrcRendererService } from "@tsed/cli-core"; -import {TEMPLATE_DIR} from "../utils/templateDir"; +import {TEMPLATE_DIR} from "../utils/templateDir.js"; @Injectable() export class VitestInitHook { diff --git a/packages/cli-plugin-vitest/src/index.ts b/packages/cli-plugin-vitest/src/index.ts index f866a8f1a..79b8f11a8 100644 --- a/packages/cli-plugin-vitest/src/index.ts +++ b/packages/cli-plugin-vitest/src/index.ts @@ -1,5 +1,5 @@ -import {CliPluginVitestModule} from "./CliPluginVitestModule"; +import {CliPluginVitestModule} from "./CliPluginVitestModule.js"; -export * from "./utils/templateDir"; +export * from "./utils/templateDir.js"; export default CliPluginVitestModule; diff --git a/packages/cli-plugin-vitest/src/utils/templateDir.ts b/packages/cli-plugin-vitest/src/utils/templateDir.ts index 911a16584..2ccfa6ef6 100644 --- a/packages/cli-plugin-vitest/src/utils/templateDir.ts +++ b/packages/cli-plugin-vitest/src/utils/templateDir.ts @@ -1,3 +1,3 @@ import {getTemplateDirectory} from "@tsed/cli-core"; -export const TEMPLATE_DIR = getTemplateDirectory(__dirname); +export const TEMPLATE_DIR = getTemplateDirectory(import.meta.dirname); diff --git a/packages/cli-plugin-vitest/templates/generate/decorator.class.spec.hbs b/packages/cli-plugin-vitest/templates/generate/decorator.class.spec.hbs index 69c1d45d6..50b94eec3 100644 --- a/packages/cli-plugin-vitest/templates/generate/decorator.class.spec.hbs +++ b/packages/cli-plugin-vitest/templates/generate/decorator.class.spec.hbs @@ -1,5 +1,5 @@ import { expect, describe, it } from "vitest"; -import { {{symbolName}} } from "./{{symbolPathBasename}}"; +import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; describe("{{symbolName}}", () => { it("should do something", () => { diff --git a/packages/cli-plugin-vitest/templates/generate/decorator.endpoint.spec.hbs b/packages/cli-plugin-vitest/templates/generate/decorator.endpoint.spec.hbs index fa00c7db3..039032672 100644 --- a/packages/cli-plugin-vitest/templates/generate/decorator.endpoint.spec.hbs +++ b/packages/cli-plugin-vitest/templates/generate/decorator.endpoint.spec.hbs @@ -1,6 +1,6 @@ import { expect, describe, it } from "vitest"; import { Store } from "@tsed/core"; -import { {{symbolName}} } from "./{{symbolPathBasename}}"; +import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; describe("{{symbolName}}", () => { it("should store options", () => { diff --git a/packages/cli-plugin-vitest/templates/generate/decorator.method.spec.hbs b/packages/cli-plugin-vitest/templates/generate/decorator.method.spec.hbs index c92062193..df94fe786 100644 --- a/packages/cli-plugin-vitest/templates/generate/decorator.method.spec.hbs +++ b/packages/cli-plugin-vitest/templates/generate/decorator.method.spec.hbs @@ -1,5 +1,5 @@ import { expect, describe, it } from "vitest"; -import { {{symbolName}} } from "./{{symbolPathBasename}}"; +import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; describe("{{symbolName}}", () => { it("should do something", () => { diff --git a/packages/cli-plugin-vitest/templates/generate/decorator.param.spec.hbs b/packages/cli-plugin-vitest/templates/generate/decorator.param.spec.hbs index 05b86fb04..ac85e6858 100644 --- a/packages/cli-plugin-vitest/templates/generate/decorator.param.spec.hbs +++ b/packages/cli-plugin-vitest/templates/generate/decorator.param.spec.hbs @@ -1,6 +1,6 @@ import { expect, describe, it } from "vitest"; import { Store } from "@tsed/core"; -import { {{symbolName}} } from "./{{symbolPathBasename}}"; +import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; describe("{{symbolName}}", () => { it("should store options", () => { diff --git a/packages/cli-plugin-vitest/templates/generate/decorator.parameter.spec.hbs b/packages/cli-plugin-vitest/templates/generate/decorator.parameter.spec.hbs index 70dff120b..f0fded36f 100644 --- a/packages/cli-plugin-vitest/templates/generate/decorator.parameter.spec.hbs +++ b/packages/cli-plugin-vitest/templates/generate/decorator.parameter.spec.hbs @@ -1,5 +1,5 @@ import { expect, describe, it } from "vitest"; -import { {{symbolName}} } from "./{{symbolPathBasename}}"; +import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; describe("{{symbolName}}", () => { it("should do something", () => { diff --git a/packages/cli-plugin-vitest/templates/generate/decorator.prop.spec.hbs b/packages/cli-plugin-vitest/templates/generate/decorator.prop.spec.hbs index 71def6a63..ba03d52d9 100644 --- a/packages/cli-plugin-vitest/templates/generate/decorator.prop.spec.hbs +++ b/packages/cli-plugin-vitest/templates/generate/decorator.prop.spec.hbs @@ -1,6 +1,6 @@ import { expect, describe, it } from "vitest"; import { Store } from "@tsed/core"; -import { {{symbolName}} } from "./{{symbolPathBasename}}"; +import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; describe("{{symbolName}}", () => { it("should store options", () => { diff --git a/packages/cli-plugin-vitest/templates/generate/decorator.property.spec.hbs b/packages/cli-plugin-vitest/templates/generate/decorator.property.spec.hbs index a5feeef6b..8abf4c73f 100644 --- a/packages/cli-plugin-vitest/templates/generate/decorator.property.spec.hbs +++ b/packages/cli-plugin-vitest/templates/generate/decorator.property.spec.hbs @@ -1,5 +1,5 @@ import { expect, describe, it } from "vitest"; -import { {{symbolName}} } from "./{{symbolPathBasename}}"; +import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; describe("{{symbolName}}", () => { it("should do something", () => { diff --git a/packages/cli-plugin-vitest/templates/generate/generic.integration.hbs b/packages/cli-plugin-vitest/templates/generate/generic.integration.hbs index 731697c62..7ae889373 100644 --- a/packages/cli-plugin-vitest/templates/generate/generic.integration.hbs +++ b/packages/cli-plugin-vitest/templates/generate/generic.integration.hbs @@ -1,8 +1,8 @@ import { expect, describe, it, afterAll, beforeAll } from "vitest"; import { PlatformTest } from "@tsed/common"; import SuperTest from "supertest"; -import { {{symbolName}} } from "./{{symbolPathBasename}}"; -import { Server } from "{{relativeSrcPath}}/Server"; +import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; +import { Server } from "{{relativeSrcPath}}/Server.js"; describe("{{symbolName}}", () => { beforeAll(PlatformTest.bootstrap(Server, { diff --git a/packages/cli-plugin-vitest/templates/generate/generic.spec.hbs b/packages/cli-plugin-vitest/templates/generate/generic.spec.hbs index 830b5ad6d..d4b0f0e40 100644 --- a/packages/cli-plugin-vitest/templates/generate/generic.spec.hbs +++ b/packages/cli-plugin-vitest/templates/generate/generic.spec.hbs @@ -1,6 +1,6 @@ import { expect, describe, it, beforeEach, afterEach } from "vitest"; import { PlatformTest } from "@tsed/common"; -import { {{symbolName}} } from "./{{symbolPathBasename}}"; +import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; describe("{{symbolName}}", () => { beforeEach(PlatformTest.create); diff --git a/packages/cli-plugin-vitest/templates/generate/server.integration.hbs b/packages/cli-plugin-vitest/templates/generate/server.integration.hbs index 4aa7fc5dc..56a775546 100644 --- a/packages/cli-plugin-vitest/templates/generate/server.integration.hbs +++ b/packages/cli-plugin-vitest/templates/generate/server.integration.hbs @@ -1,7 +1,7 @@ import { expect, describe, it, beforeAll, afterAll } from "vitest"; import { PlatformTest } from "@tsed/common"; import SuperTest from "supertest"; -import { {{symbolName}} } from "./{{symbolPathBasename}}"; +import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; describe("{{symbolName}}", () => { beforeAll(PlatformTest.bootstrap({{symbolName}})); diff --git a/packages/cli-plugin-vitest/test/integrations/generate/generate.controller.integration.spec.ts b/packages/cli-plugin-vitest/test/integrations/generate/generate.controller.integration.spec.ts index 6b0f3f2a8..c35a6a620 100644 --- a/packages/cli-plugin-vitest/test/integrations/generate/generate.controller.integration.spec.ts +++ b/packages/cli-plugin-vitest/test/integrations/generate/generate.controller.integration.spec.ts @@ -1,7 +1,6 @@ -import "../../../src"; +import "../../../src/index.js"; import {GenerateCmd, TEMPLATE_DIR} from "@tsed/cli"; -import {CliService, ProjectPackageJson} from "@tsed/cli-core"; import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; describe("Generate Controller", () => { @@ -40,8 +39,8 @@ describe("Generate Controller", () => { const result = FakeCliFs.entries.get("project-name/src/controllers/TestController.integration.spec.ts"); expect(result).toContain('import { PlatformTest } from "@tsed/common";'); expect(result).toContain('import SuperTest from "supertest";'); - expect(result).toContain('import { Server } from "../Server";'); - expect(result).toContain('import { TestController } from "./TestController";'); + expect(result).toContain('import { Server } from "../Server.js";'); + expect(result).toContain('import { TestController } from "./TestController.js";'); }); it("should generate the template with the right options (complex path)", async () => { CliPlatformTest.setPackageJson({ @@ -70,7 +69,7 @@ describe("Generate Controller", () => { const result = FakeCliFs.entries.get("project-name/src/controllers/users/UserController.integration.spec.ts"); expect(result).toContain('import { PlatformTest } from "@tsed/common";'); expect(result).toContain('import SuperTest from "supertest";'); - expect(result).toContain('import { Server } from "../../Server";'); - expect(result).toContain('import { UserController } from "./UserController";'); + expect(result).toContain('import { Server } from "../../Server.js";'); + expect(result).toContain('import { UserController } from "./UserController.js";'); }); }); diff --git a/packages/cli-plugin-vitest/tsconfig.cjs.json b/packages/cli-plugin-vitest/tsconfig.cjs.json deleted file mode 100644 index 7f23b116d..000000000 --- a/packages/cli-plugin-vitest/tsconfig.cjs.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "extends": "@tsed/typescript/tsconfig.node.json", - "compilerOptions": { - "baseUrl": ".", - "module": "commonjs", - "moduleResolution": "Node16", - "rootDir": "src", - "outDir": "./lib/cjs", - "declaration": true, - "declarationDir": "./lib/types", - "composite": true, - "noEmit": false - }, - "include": ["src", "src/**/*.json"], - "exclude": [ - "node_modules", - "test", - "lib", - "benchmark", - "coverage", - "spec", - "**/*.benchmark.ts", - "**/*.spec.ts", - "keys", - "**/__mock__/**", - "webpack.config.js" - ] -} diff --git a/packages/cli-plugin-vitest/tsconfig.esm.json b/packages/cli-plugin-vitest/tsconfig.esm.json index ce32a9e07..45d441a7d 100644 --- a/packages/cli-plugin-vitest/tsconfig.esm.json +++ b/packages/cli-plugin-vitest/tsconfig.esm.json @@ -2,11 +2,9 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", - "declarationDir": "./lib/types-esm", + "declarationDir": "./lib/types", "declaration": true, "composite": true, "noEmit": false diff --git a/packages/cli-plugin-vitest/tsconfig.json b/packages/cli-plugin-vitest/tsconfig.json index 705b5ce35..f42860e1e 100644 --- a/packages/cli-plugin-vitest/tsconfig.json +++ b/packages/cli-plugin-vitest/tsconfig.json @@ -12,9 +12,6 @@ { "path": "../cli-core/tsconfig.json" }, - { - "path": "./tsconfig.cjs.json" - }, { "path": "./tsconfig.esm.json" }, diff --git a/packages/cli-plugin-vitest/tsconfig.spec.json b/packages/cli-plugin-vitest/tsconfig.spec.json index 75fcfa09d..0f06288a8 100644 --- a/packages/cli-plugin-vitest/tsconfig.spec.json +++ b/packages/cli-plugin-vitest/tsconfig.spec.json @@ -3,8 +3,6 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, diff --git a/packages/cli-testing/package.json b/packages/cli-testing/package.json index 1a9cf2255..bdcee63d6 100644 --- a/packages/cli-testing/package.json +++ b/packages/cli-testing/package.json @@ -1,10 +1,10 @@ { "name": "@tsed/cli-testing", "description": "Utils to test you CLI based on Ts.ED CLI", - "type": "commonjs", "version": "5.2.10", + "type": "module", + "main": "./lib/esm/index.js", "source": "./src/index.ts", - "main": "./lib/cjs/index.js", "module": "./lib/esm/index.js", "typings": "./lib/types/index.d.ts", "exports": { @@ -17,9 +17,7 @@ }, "scripts": { "build": "yarn build:ts", - "build:ts": "tsc --build tsconfig.json", - "test": "vitest run", - "test:ci": "vitest run --coverage.thresholds.autoUpdate=true" + "build:ts": "tsc --build tsconfig.json" }, "keywords": [ "Ts.ED", @@ -32,7 +30,7 @@ "decorators" ], "dependencies": { - "@tsed/cli-core": "5.2.10", + "@tsed/cli-core": "workspace:*", "tslib": "2.3.1" }, "devDependencies": { diff --git a/packages/cli-testing/src/CliPlatformTest.ts b/packages/cli-testing/src/CliPlatformTest.ts index 9d9f4b2ce..cf978ff37 100644 --- a/packages/cli-testing/src/CliPlatformTest.ts +++ b/packages/cli-testing/src/CliPlatformTest.ts @@ -17,9 +17,9 @@ import {Type} from "@tsed/core"; import {DIContext, runInContext} from "@tsed/di"; import {v4} from "uuid"; -import {FakeCliExeca} from "./FakeCliExeca"; -import {FakeCliFs} from "./FakeCliFs"; -import {FakeCliHttpClient} from "./FakeCliHttpClient"; +import {FakeCliExeca} from "./FakeCliExeca.js"; +import {FakeCliFs} from "./FakeCliFs.js"; +import {FakeCliHttpClient} from "./FakeCliHttpClient.js"; export interface InvokeOptions { token: TokenProvider; diff --git a/packages/cli-testing/src/FakeCliFs.ts b/packages/cli-testing/src/FakeCliFs.ts index 9296b36a3..b230167c7 100644 --- a/packages/cli-testing/src/FakeCliFs.ts +++ b/packages/cli-testing/src/FakeCliFs.ts @@ -3,7 +3,7 @@ import * as fs from "fs"; import {PathLike} from "fs"; import {EnsureOptions, WriteFileOptions} from "fs-extra"; -import {normalizePath} from "./normalizePath"; +import {normalizePath} from "./normalizePath.js"; export class FakeCliFs { static entries = new Map(); diff --git a/packages/cli-testing/src/index.ts b/packages/cli-testing/src/index.ts index 358ba6d9b..0bc466d57 100644 --- a/packages/cli-testing/src/index.ts +++ b/packages/cli-testing/src/index.ts @@ -1,4 +1,4 @@ -export * from "./CliPlatformTest"; -export * from "./FakeCliFs"; -export * from "./FakeCliHttpClient"; -export * from "./normalizePath"; +export * from "./CliPlatformTest.js"; +export * from "./FakeCliFs.js"; +export * from "./FakeCliHttpClient.js"; +export * from "./normalizePath.js"; diff --git a/packages/cli-testing/tsconfig.esm.json b/packages/cli-testing/tsconfig.esm.json index ce32a9e07..45d441a7d 100644 --- a/packages/cli-testing/tsconfig.esm.json +++ b/packages/cli-testing/tsconfig.esm.json @@ -2,11 +2,9 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", - "declarationDir": "./lib/types-esm", + "declarationDir": "./lib/types", "declaration": true, "composite": true, "noEmit": false diff --git a/packages/cli-testing/tsconfig.json b/packages/cli-testing/tsconfig.json index 3b5108a39..c404569b3 100644 --- a/packages/cli-testing/tsconfig.json +++ b/packages/cli-testing/tsconfig.json @@ -9,9 +9,6 @@ { "path": "../cli-core/tsconfig.json" }, - { - "path": "./tsconfig.cjs.json" - }, { "path": "./tsconfig.esm.json" } diff --git a/packages/cli/package.json b/packages/cli/package.json index 865aa3f41..f5020d3a4 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,10 +1,10 @@ { "name": "@tsed/cli", "description": "CLI to bootstrap your Ts.ED project", - "type": "commonjs", "version": "5.2.10", + "type": "module", + "main": "./lib/esm/index.js", "source": "./src/index.ts", - "main": "./lib/cjs/index.js", "module": "./lib/esm/index.js", "typings": "./lib/types/index.d.ts", "exports": { @@ -65,7 +65,7 @@ "node": ">=14" }, "dependencies": { - "@tsed/cli-core": "5.2.10", + "@tsed/cli-core": "workspace:*", "@tsed/core": ">=7.14.2", "@tsed/di": ">=7.14.2", "@tsed/logger": ">=6.2.1", @@ -88,7 +88,7 @@ "vitest": "2.1.1" }, "peerDependencies": { - "@tsed/cli-core": "5.2.10", + "@tsed/cli-core": "workspace:*", "@tsed/core": ">=7.14.2", "@tsed/di": ">=7.14.2", "@tsed/logger": ">=6.2.1", diff --git a/packages/cli/src/Cli.ts b/packages/cli/src/Cli.ts index fd6e1397e..25e6772ae 100644 --- a/packages/cli/src/Cli.ts +++ b/packages/cli/src/Cli.ts @@ -3,9 +3,9 @@ import chalk from "chalk"; // @ts-ignore import alias from "module-alias"; -import commands from "./commands"; -import {PKG, TEMPLATE_DIR} from "./constants"; -import {ArchitectureConvention, ProjectConvention} from "./interfaces"; +import commands from "./commands/index.js"; +import {PKG, TEMPLATE_DIR} from "./constants/index.js"; +import {ArchitectureConvention, ProjectConvention} from "./interfaces/index.js"; export class Cli extends CliCore { static defaults = { diff --git a/packages/cli/src/bin/tsed.ts b/packages/cli/src/bin/tsed.ts index d5b058631..b75d07131 100644 --- a/packages/cli/src/bin/tsed.ts +++ b/packages/cli/src/bin/tsed.ts @@ -1,5 +1,5 @@ #!/usr/bin/env node -import {Cli} from "../Cli"; +import {Cli} from "../Cli.js"; Cli.bootstrap({}).catch((error) => { console.error(error); diff --git a/packages/cli/src/commands/generate/GenerateCmd.spec.ts b/packages/cli/src/commands/generate/GenerateCmd.spec.ts index 44ca28a6c..d3e66cf2a 100644 --- a/packages/cli/src/commands/generate/GenerateCmd.spec.ts +++ b/packages/cli/src/commands/generate/GenerateCmd.spec.ts @@ -1,8 +1,9 @@ // @ts-ignore import {SrcRendererService} from "@tsed/cli-core"; +// @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; -import {GenerateCmd} from "./GenerateCmd"; +import {GenerateCmd} from "./GenerateCmd.js"; describe("GenerateCmd", () => { beforeEach(() => CliPlatformTest.create()); @@ -114,11 +115,11 @@ describe("GenerateCmd", () => { express: false, koa: false, platformSymbol: undefined, - barrels: '["./src/controllers/rest"]', + barrels: '["./src/controllers/rest/index.js"]', imports: [ {from: "@tsed/ajv"}, - {symbols: "{config}", from: "./config/index"}, - {symbols: "* as rest", from: "./controllers/rest/index"} + {symbols: "{config}", from: "./config/index.js"}, + {symbols: "* as rest", from: "./controllers/rest/index.js"} ] }, { @@ -168,11 +169,11 @@ describe("GenerateCmd", () => { express: false, koa: false, platformSymbol: undefined, - barrels: '["./src/controllers/rest"]', + barrels: '["./src/controllers/rest/index.js"]', imports: [ {from: "@tsed/ajv"}, - {symbols: "{config}", from: "./config/index"}, - {symbols: "* as rest", from: "./controllers/rest/index"} + {symbols: "{config}", from: "./config/index.js"}, + {symbols: "* as rest", from: "./controllers/rest/index.js"} ] }, { diff --git a/packages/cli/src/commands/generate/GenerateCmd.ts b/packages/cli/src/commands/generate/GenerateCmd.ts index 1c8acc5b1..7db033878 100644 --- a/packages/cli/src/commands/generate/GenerateCmd.ts +++ b/packages/cli/src/commands/generate/GenerateCmd.ts @@ -4,13 +4,13 @@ import globby from "globby"; import normalizePath from "normalize-path"; import {basename, dirname, join} from "path"; -import {ProjectConvention} from "../../interfaces/ProjectConvention"; -import {ClassNamePipe} from "../../pipes/ClassNamePipe"; -import {OutputFilePathPipe} from "../../pipes/OutputFilePathPipe"; -import {RoutePipe} from "../../pipes/RoutePipe"; -import {ProvidersInfoService} from "../../services/ProvidersInfoService"; -import {fillImports} from "../../utils/fillImports"; -import {PROVIDER_TYPES} from "./ProviderTypes"; +import {ProjectConvention} from "../../interfaces/ProjectConvention.js"; +import {ClassNamePipe} from "../../pipes/ClassNamePipe.js"; +import {OutputFilePathPipe} from "../../pipes/OutputFilePathPipe.js"; +import {RoutePipe} from "../../pipes/RoutePipe.js"; +import {ProvidersInfoService} from "../../services/ProvidersInfoService.js"; +import {fillImports} from "../../utils/fillImports.js"; +import {PROVIDER_TYPES} from "./ProviderTypes.js"; export interface GenerateCmdContext extends CliDefaultOptions { type: string; @@ -252,7 +252,7 @@ export class GenerateCmd implements CommandProvider { return this.srcRenderService.update("bin/index.ts", [ { type: "import", - content: `import {${ctx.symbolName}} from "./${basename(symbolPath)}";` + content: `import {${ctx.symbolName}} from "./${basename(symbolPath)}.js";` }, { type: "insert-after", diff --git a/packages/cli/src/commands/index.ts b/packages/cli/src/commands/index.ts index f6e03e94c..ce150a1b2 100644 --- a/packages/cli/src/commands/index.ts +++ b/packages/cli/src/commands/index.ts @@ -1,7 +1,7 @@ -import {AddCmd} from "./add/AddCmd"; -import {GenerateCmd} from "./generate/GenerateCmd"; -import {InitCmd} from "./init/InitCmd"; -import {RunCmd} from "./run/RunCmd"; -import {UpdateCmd} from "./update/UpdateCmd"; +import {AddCmd} from "./add/AddCmd.js"; +import {GenerateCmd} from "./generate/GenerateCmd.js"; +import {InitCmd} from "./init/InitCmd.js"; +import {RunCmd} from "./run/RunCmd.js"; +import {UpdateCmd} from "./update/UpdateCmd.js"; export default [AddCmd, InitCmd, GenerateCmd, UpdateCmd, RunCmd]; diff --git a/packages/cli/src/commands/init/InitCmd.spec.ts b/packages/cli/src/commands/init/InitCmd.spec.ts index 4d68fcda3..fe2027359 100644 --- a/packages/cli/src/commands/init/InitCmd.spec.ts +++ b/packages/cli/src/commands/init/InitCmd.spec.ts @@ -3,8 +3,8 @@ import {PackageManagersModule} from "@tsed/cli-core"; import {CliPlatformTest} from "@tsed/cli-testing"; import {catchError} from "@tsed/core"; -import {InitCmd} from "../../../src/commands/init/InitCmd"; -import {RuntimesModule} from "../../runtimes/RuntimesModule"; +import {InitCmd} from "../../../src/commands/init/InitCmd.js"; +import {RuntimesModule} from "../../runtimes/RuntimesModule.js"; async function getServiceFixture() { const packageManagers = { diff --git a/packages/cli/src/commands/init/InitCmd.ts b/packages/cli/src/commands/init/InitCmd.ts index 582036ceb..1534ecd01 100644 --- a/packages/cli/src/commands/init/InitCmd.ts +++ b/packages/cli/src/commands/init/InitCmd.ts @@ -21,22 +21,22 @@ import { import {paramCase, pascalCase} from "change-case"; import {basename, join} from "path"; -import {DEFAULT_TSED_TAGS} from "../../constants"; -import {PlatformType} from "../../interfaces"; -import {ArchitectureConvention} from "../../interfaces/ArchitectureConvention"; -import {ProjectConvention} from "../../interfaces/ProjectConvention"; -import {OutputFilePathPipe} from "../../pipes/OutputFilePathPipe"; -import {InitPlatformsModule} from "../../platforms/InitPlatformsModule"; -import {RuntimesModule} from "../../runtimes/RuntimesModule"; -import {BunRuntime} from "../../runtimes/supports/BunRuntime"; -import {NodeRuntime} from "../../runtimes/supports/NodeRuntime"; -import {fillImports} from "../../utils/fillImports"; -import {FeaturesMap, FeatureType} from "./config/FeaturesPrompt"; -import {InitFileSchema} from "./config/InitFileSchema"; -import {InitCmdContext} from "./interfaces/InitCmdContext"; -import {InitOptions} from "./interfaces/InitOptions"; -import {mapToContext} from "./mappers/mapToContext"; -import {getFeaturesPrompt} from "./prompts/getFeaturesPrompt"; +import {DEFAULT_TSED_TAGS} from "../../constants/index.js"; +import {ArchitectureConvention} from "../../interfaces/ArchitectureConvention.js"; +import {PlatformType} from "../../interfaces/index.js"; +import {ProjectConvention} from "../../interfaces/ProjectConvention.js"; +import {OutputFilePathPipe} from "../../pipes/OutputFilePathPipe.js"; +import {InitPlatformsModule} from "../../platforms/InitPlatformsModule.js"; +import {RuntimesModule} from "../../runtimes/RuntimesModule.js"; +import {BunRuntime} from "../../runtimes/supports/BunRuntime.js"; +import {NodeRuntime} from "../../runtimes/supports/NodeRuntime.js"; +import {fillImports} from "../../utils/fillImports.js"; +import {FeaturesMap, FeatureType} from "./config/FeaturesPrompt.js"; +import {InitFileSchema} from "./config/InitFileSchema.js"; +import {InitCmdContext} from "./interfaces/InitCmdContext.js"; +import {InitOptions} from "./interfaces/InitOptions.js"; +import {mapToContext} from "./mappers/mapToContext.js"; +import {getFeaturesPrompt} from "./prompts/getFeaturesPrompt.js"; @Command({ name: "init", @@ -463,7 +463,7 @@ export class InitCmd implements CommandProvider { "/init/.dockerignore.hbs", "/init/.gitignore.hbs", "/init/.barrelsby.json.hbs", - "/init/processes.config.js.hbs", + "/init/processes.config.cjs.hbs", "/init/docker-compose.yml.hbs", { path: `/init/docker/${packageManager.name}/Dockerfile.hbs`, @@ -471,8 +471,9 @@ export class InitCmd implements CommandProvider { replaces: [`docker/${packageManager.name}`] }, "/init/README.md.hbs", - "/init/tsconfig.compile.json.hbs", - "/init/tsconfig.json.hbs", + "/init/tsconfig.base.json.hbs", + "/init/tsconfig.node.json.hbs", + ctx.testing && "/init/tsconfig.spec.json.hbs", "/init/src/index.ts.hbs", "/init/src/config/envs/index.ts.hbs", "/init/src/config/logger/index.ts.hbs", diff --git a/packages/cli/src/commands/init/config/FeaturesPrompt.ts b/packages/cli/src/commands/init/config/FeaturesPrompt.ts index d9a09a6a7..7d28d12e7 100644 --- a/packages/cli/src/commands/init/config/FeaturesPrompt.ts +++ b/packages/cli/src/commands/init/config/FeaturesPrompt.ts @@ -1,7 +1,7 @@ -import {ArchitectureConvention, PlatformType, ProjectConvention} from "../../../interfaces"; -import {InitOptions} from "../interfaces/InitOptions"; -import {hasFeature, hasValue} from "../utils/hasFeature"; -import {isPlatform} from "../utils/isPlatform"; +import {ArchitectureConvention, PlatformType, ProjectConvention} from "../../../interfaces/index.js"; +import {InitOptions} from "../interfaces/InitOptions.js"; +import {hasFeature, hasValue} from "../utils/hasFeature.js"; +import {isPlatform} from "../utils/isPlatform.js"; export interface Feature { name: string; diff --git a/packages/cli/src/commands/init/config/InitFileSchema.ts b/packages/cli/src/commands/init/config/InitFileSchema.ts index bc5bf3d34..1dcd7609a 100644 --- a/packages/cli/src/commands/init/config/InitFileSchema.ts +++ b/packages/cli/src/commands/init/config/InitFileSchema.ts @@ -1,7 +1,7 @@ import {PackageManager} from "@tsed/cli-core"; -import {ArchitectureConvention, PlatformType, ProjectConvention} from "../../../interfaces"; -import {FeatureType} from "./FeaturesPrompt"; +import {ArchitectureConvention, PlatformType, ProjectConvention} from "../../../interfaces/index.js"; +import {FeatureType} from "./FeaturesPrompt.js"; export const InitFileSchema = { type: "object", diff --git a/packages/cli/src/commands/init/interfaces/InitCmdContext.ts b/packages/cli/src/commands/init/interfaces/InitCmdContext.ts index 62a99f879..e14921319 100644 --- a/packages/cli/src/commands/init/interfaces/InitCmdContext.ts +++ b/packages/cli/src/commands/init/interfaces/InitCmdContext.ts @@ -1,6 +1,6 @@ import {CliDefaultOptions} from "@tsed/cli-core"; -import {InitOptions} from "./InitOptions"; +import {InitOptions} from "./InitOptions.js"; export interface InitCmdContext extends InitOptions, CliDefaultOptions, Record { root: string; diff --git a/packages/cli/src/commands/init/interfaces/InitOptions.ts b/packages/cli/src/commands/init/interfaces/InitOptions.ts index 4461c6cf0..27d546cc2 100644 --- a/packages/cli/src/commands/init/interfaces/InitOptions.ts +++ b/packages/cli/src/commands/init/interfaces/InitOptions.ts @@ -1,9 +1,9 @@ import {PackageManager} from "@tsed/cli-core"; -import {ArchitectureConvention} from "../../../interfaces/ArchitectureConvention"; -import {PlatformType} from "../../../interfaces/PlatformType"; -import {ProjectConvention} from "../../../interfaces/ProjectConvention"; -import {FeatureType} from "../config/FeaturesPrompt"; +import {ArchitectureConvention} from "../../../interfaces/ArchitectureConvention.js"; +import {PlatformType} from "../../../interfaces/PlatformType.js"; +import {ProjectConvention} from "../../../interfaces/ProjectConvention.js"; +import {FeatureType} from "../config/FeaturesPrompt.js"; export interface InitOptions { root: string; diff --git a/packages/cli/src/commands/init/interfaces/InitPromptAnswers.ts b/packages/cli/src/commands/init/interfaces/InitPromptAnswers.ts index e5a8ca38b..d8d199ba2 100644 --- a/packages/cli/src/commands/init/interfaces/InitPromptAnswers.ts +++ b/packages/cli/src/commands/init/interfaces/InitPromptAnswers.ts @@ -1,6 +1,6 @@ import {PackageManager} from "@tsed/cli-core"; -import {ArchitectureConvention, PlatformType, ProjectConvention} from "../../../interfaces"; +import {ArchitectureConvention, PlatformType, ProjectConvention} from "../../../interfaces/index.js"; export interface InitPromptAnswers { projectName: string; diff --git a/packages/cli/src/commands/init/mappers/mapToContext.spec.ts b/packages/cli/src/commands/init/mappers/mapToContext.spec.ts index 2eee1cdca..149ead6b0 100644 --- a/packages/cli/src/commands/init/mappers/mapToContext.spec.ts +++ b/packages/cli/src/commands/init/mappers/mapToContext.spec.ts @@ -1,8 +1,8 @@ import {PackageManager} from "@tsed/cli-core"; -import {ArchitectureConvention, PlatformType, ProjectConvention} from "../../../../src/index"; -import {FeatureType} from "../config/FeaturesPrompt"; -import {mapToContext} from "./mapToContext"; +import {ArchitectureConvention, PlatformType, ProjectConvention} from "../../../../src/index.js"; +import {FeatureType} from "../config/FeaturesPrompt.js"; +import {mapToContext} from "./mapToContext.js"; describe("mapToContext", () => { it("should map to final object", () => { diff --git a/packages/cli/src/commands/init/mappers/mapToContext.ts b/packages/cli/src/commands/init/mappers/mapToContext.ts index 608f8aa4c..fc2d041e8 100644 --- a/packages/cli/src/commands/init/mappers/mapToContext.ts +++ b/packages/cli/src/commands/init/mappers/mapToContext.ts @@ -1,7 +1,7 @@ import {camelCase} from "change-case"; -import {InitCmdContext} from "../interfaces/InitCmdContext"; -import {mapUniqFeatures} from "./mapUniqFeatures"; +import {InitCmdContext} from "../interfaces/InitCmdContext.js"; +import {mapUniqFeatures} from "./mapUniqFeatures.js"; export function mapToContext(options: any): InitCmdContext { options = mapUniqFeatures(options); diff --git a/packages/cli/src/commands/init/mappers/mapUniqFeatures.ts b/packages/cli/src/commands/init/mappers/mapUniqFeatures.ts index 9453116ba..681abcb97 100644 --- a/packages/cli/src/commands/init/mappers/mapUniqFeatures.ts +++ b/packages/cli/src/commands/init/mappers/mapUniqFeatures.ts @@ -1,6 +1,6 @@ -import {FeatureType} from "../config/FeaturesPrompt"; -import {InitOptions} from "../interfaces/InitOptions"; -import {InitPromptAnswers} from "../interfaces/InitPromptAnswers"; +import {FeatureType} from "../config/FeaturesPrompt.js"; +import {InitOptions} from "../interfaces/InitOptions.js"; +import {InitPromptAnswers} from "../interfaces/InitPromptAnswers.js"; export function mapUniqFeatures(answers: InitPromptAnswers & any): InitOptions { const features: string[] = []; diff --git a/packages/cli/src/commands/init/prompts/getFeaturesPrompt.spec.ts b/packages/cli/src/commands/init/prompts/getFeaturesPrompt.spec.ts index 91d761638..71bd6e50e 100644 --- a/packages/cli/src/commands/init/prompts/getFeaturesPrompt.spec.ts +++ b/packages/cli/src/commands/init/prompts/getFeaturesPrompt.spec.ts @@ -1,4 +1,4 @@ -import {getFeaturesPrompt} from "./getFeaturesPrompt"; +import {getFeaturesPrompt} from "./getFeaturesPrompt.js"; describe("getFeaturesPrompt", () => { it("should add a provider info", () => { diff --git a/packages/cli/src/commands/init/prompts/getFeaturesPrompt.ts b/packages/cli/src/commands/init/prompts/getFeaturesPrompt.ts index dda1b7dd2..52406afcc 100644 --- a/packages/cli/src/commands/init/prompts/getFeaturesPrompt.ts +++ b/packages/cli/src/commands/init/prompts/getFeaturesPrompt.ts @@ -1,7 +1,7 @@ import {cleanObject, isFunction} from "@tsed/core"; -import {FeaturesMap, FeaturesPrompt} from "../config/FeaturesPrompt"; -import {InitOptions} from "../interfaces/InitOptions"; +import {FeaturesMap, FeaturesPrompt} from "../config/FeaturesPrompt.js"; +import {InitOptions} from "../interfaces/InitOptions.js"; function mapChoices(item: any, options: Partial) { return item.choices.map((choice: string) => { diff --git a/packages/cli/src/commands/init/utils/hasFeature.spec.ts b/packages/cli/src/commands/init/utils/hasFeature.spec.ts index 8d19735f1..eb2f8c906 100644 --- a/packages/cli/src/commands/init/utils/hasFeature.spec.ts +++ b/packages/cli/src/commands/init/utils/hasFeature.spec.ts @@ -1,4 +1,4 @@ -import {hasFeature, hasValue} from "./hasFeature"; +import {hasFeature, hasValue} from "./hasFeature.js"; describe("hasValue", () => { it("should return false", () => { diff --git a/packages/cli/src/commands/run/RunCmd.spec.ts b/packages/cli/src/commands/run/RunCmd.spec.ts index 1d3f19198..992902a8e 100644 --- a/packages/cli/src/commands/run/RunCmd.spec.ts +++ b/packages/cli/src/commands/run/RunCmd.spec.ts @@ -1,8 +1,9 @@ // @ts-ignore import {CliFs, CliRunScript} from "@tsed/cli-core"; +// @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; -import {RunCmd} from "./RunCmd"; +import {RunCmd} from "./RunCmd.js"; describe("RunCmd", () => { beforeEach(() => CliPlatformTest.create()); diff --git a/packages/cli/src/commands/update/UpdateCmd.spec.ts b/packages/cli/src/commands/update/UpdateCmd.spec.ts index 20802cdfc..ba9aef0ea 100644 --- a/packages/cli/src/commands/update/UpdateCmd.spec.ts +++ b/packages/cli/src/commands/update/UpdateCmd.spec.ts @@ -2,7 +2,7 @@ import {NpmRegistryClient, ProjectPackageJson} from "@tsed/cli-core"; // @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; -import {UpdateCmd} from "./UpdateCmd"; +import {UpdateCmd} from "./UpdateCmd.js"; const versions = { "7.0.0-alpha.4": { diff --git a/packages/cli/src/commands/update/UpdateCmd.ts b/packages/cli/src/commands/update/UpdateCmd.ts index 4ac9f47c3..2fb9aadea 100644 --- a/packages/cli/src/commands/update/UpdateCmd.ts +++ b/packages/cli/src/commands/update/UpdateCmd.ts @@ -14,7 +14,7 @@ import { import {getValue} from "@tsed/core"; import semver from "semver"; -import {IGNORE_TAGS, IGNORE_VERSIONS, MINIMAL_TSED_VERSION} from "../../constants"; +import {IGNORE_TAGS, IGNORE_VERSIONS, MINIMAL_TSED_VERSION} from "../../constants/index.js"; export interface UpdateCmdContext extends CliDefaultOptions { version: string; diff --git a/packages/cli/src/constants/index.ts b/packages/cli/src/constants/index.ts index 8235fe5d0..fcf35949a 100644 --- a/packages/cli/src/constants/index.ts +++ b/packages/cli/src/constants/index.ts @@ -2,7 +2,7 @@ import {dirname, join} from "path"; import readPkgUp from "read-pkg-up"; const {path, packageJson} = readPkgUp.sync({ - cwd: join(__dirname, "..", "..") + cwd: join(import.meta.dirname, "..", "..") })!; export const PKG = packageJson; diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts index 3cd15d969..c0b1a1972 100644 --- a/packages/cli/src/index.ts +++ b/packages/cli/src/index.ts @@ -1,15 +1,15 @@ -export * from "./Cli"; -export * from "./commands/add/AddCmd"; -export * from "./commands/generate/GenerateCmd"; -export * from "./commands/init/config/FeaturesPrompt"; -export * from "./commands/init/config/FeaturesPrompt"; -export * from "./commands/init/InitCmd"; -export * from "./commands/init/interfaces/InitCmdContext"; -export * from "./commands/init/interfaces/InitOptions"; -export * from "./commands/init/prompts/getFeaturesPrompt"; -export * from "./commands/update/UpdateCmd"; -export * from "./constants"; -export * from "./interfaces"; -export * from "./pipes"; -export * from "./runtimes/index"; -export * from "./services/ProvidersInfoService"; +export * from "./Cli.js"; +export * from "./commands/add/AddCmd.js"; +export * from "./commands/generate/GenerateCmd.js"; +export * from "./commands/init/config/FeaturesPrompt.js"; +export * from "./commands/init/config/FeaturesPrompt.js"; +export * from "./commands/init/InitCmd.js"; +export * from "./commands/init/interfaces/InitCmdContext.js"; +export * from "./commands/init/interfaces/InitOptions.js"; +export * from "./commands/init/prompts/getFeaturesPrompt.js"; +export * from "./commands/update/UpdateCmd.js"; +export * from "./constants/index.js"; +export * from "./interfaces/index.js"; +export * from "./pipes/index.js"; +export * from "./runtimes/index.js"; +export * from "./services/ProvidersInfoService.js"; diff --git a/packages/cli/src/interfaces/index.ts b/packages/cli/src/interfaces/index.ts index 4fdd9cf89..44d349bc4 100644 --- a/packages/cli/src/interfaces/index.ts +++ b/packages/cli/src/interfaces/index.ts @@ -1,3 +1,3 @@ -export * from "./ArchitectureConvention"; -export * from "./PlatformType"; -export * from "./ProjectConvention"; +export * from "./ArchitectureConvention.js"; +export * from "./PlatformType.js"; +export * from "./ProjectConvention.js"; diff --git a/packages/cli/src/pipes/ClassNamePipe.spec.ts b/packages/cli/src/pipes/ClassNamePipe.spec.ts index 0633d15d7..d172f6d2e 100644 --- a/packages/cli/src/pipes/ClassNamePipe.spec.ts +++ b/packages/cli/src/pipes/ClassNamePipe.spec.ts @@ -1,6 +1,6 @@ -import {ProjectConvention} from "../interfaces"; -import {ProvidersInfoService} from "../services/ProvidersInfoService"; -import {ClassNamePipe} from "./ClassNamePipe"; +import {ProjectConvention} from "../interfaces/index.js"; +import {ProvidersInfoService} from "../services/ProvidersInfoService.js"; +import {ClassNamePipe} from "./ClassNamePipe.js"; describe("ClassNamePipe", () => { it("should return the className", () => { diff --git a/packages/cli/src/pipes/ClassNamePipe.ts b/packages/cli/src/pipes/ClassNamePipe.ts index e3e0d3793..74330c9b5 100644 --- a/packages/cli/src/pipes/ClassNamePipe.ts +++ b/packages/cli/src/pipes/ClassNamePipe.ts @@ -3,8 +3,8 @@ import {Inject} from "@tsed/di"; import {paramCase, pascalCase} from "change-case"; import {basename} from "path"; -import {ProjectConvention} from "../interfaces/ProjectConvention"; -import {ProvidersInfoService} from "../services/ProvidersInfoService"; +import {ProjectConvention} from "../interfaces/ProjectConvention.js"; +import {ProvidersInfoService} from "../services/ProvidersInfoService.js"; @Injectable() export class ClassNamePipe { diff --git a/packages/cli/src/pipes/OutputFilePathPipe.spec.ts b/packages/cli/src/pipes/OutputFilePathPipe.spec.ts index e475ed471..cb795b4f9 100644 --- a/packages/cli/src/pipes/OutputFilePathPipe.spec.ts +++ b/packages/cli/src/pipes/OutputFilePathPipe.spec.ts @@ -1,10 +1,10 @@ // @ts-ignore import {normalizePath} from "@tsed/cli-testing"; -import {ProvidersInfoService} from "../services/ProvidersInfoService"; -import {ArchitectureConvention} from "./../interfaces/ArchitectureConvention"; -import {ClassNamePipe} from "./ClassNamePipe"; -import {OutputFilePathPipe} from "./OutputFilePathPipe"; +import {ProvidersInfoService} from "../services/ProvidersInfoService.js"; +import {ArchitectureConvention} from "./../interfaces/ArchitectureConvention.js"; +import {ClassNamePipe} from "./ClassNamePipe.js"; +import {OutputFilePathPipe} from "./OutputFilePathPipe.js"; describe("OutputFilePathPipe", () => { describe("Ts.ED architecture", () => { diff --git a/packages/cli/src/pipes/OutputFilePathPipe.ts b/packages/cli/src/pipes/OutputFilePathPipe.ts index 2c38e8201..5259e5836 100644 --- a/packages/cli/src/pipes/OutputFilePathPipe.ts +++ b/packages/cli/src/pipes/OutputFilePathPipe.ts @@ -2,9 +2,9 @@ import {Injectable, ProjectPackageJson} from "@tsed/cli-core"; import {Inject} from "@tsed/di"; import {dirname, join} from "path"; -import {ArchitectureConvention, ProjectConvention} from "../interfaces"; -import {ProvidersInfoService} from "../services/ProvidersInfoService"; -import {ClassNamePipe} from "./ClassNamePipe"; +import {ArchitectureConvention, ProjectConvention} from "../interfaces/index.js"; +import {ProvidersInfoService} from "../services/ProvidersInfoService.js"; +import {ClassNamePipe} from "./ClassNamePipe.js"; @Injectable() export class OutputFilePathPipe { diff --git a/packages/cli/src/pipes/RoutePipe.spec.ts b/packages/cli/src/pipes/RoutePipe.spec.ts index 441dc5659..448487b06 100644 --- a/packages/cli/src/pipes/RoutePipe.spec.ts +++ b/packages/cli/src/pipes/RoutePipe.spec.ts @@ -1,4 +1,4 @@ -import {RoutePipe} from "./RoutePipe"; +import {RoutePipe} from "./RoutePipe.js"; describe("RoutePipe", () => { it("should return the output file", () => { diff --git a/packages/cli/src/pipes/index.ts b/packages/cli/src/pipes/index.ts index 767f80705..0a646a6eb 100644 --- a/packages/cli/src/pipes/index.ts +++ b/packages/cli/src/pipes/index.ts @@ -1,3 +1,3 @@ -export * from "./ClassNamePipe"; -export * from "./OutputFilePathPipe"; -export * from "./RoutePipe"; +export * from "./ClassNamePipe.js"; +export * from "./OutputFilePathPipe.js"; +export * from "./RoutePipe.js"; diff --git a/packages/cli/src/platforms/InitPlatformsModule.ts b/packages/cli/src/platforms/InitPlatformsModule.ts index 5df3a304b..1e855f34a 100644 --- a/packages/cli/src/platforms/InitPlatformsModule.ts +++ b/packages/cli/src/platforms/InitPlatformsModule.ts @@ -1,9 +1,9 @@ import {Inject} from "@tsed/cli-core"; import {Module} from "@tsed/di"; -import {InitBasePlatform} from "./supports/InitBasePlatform"; -import {InitExpressPlatform} from "./supports/InitExpressPlatform"; -import {InitKoaPlatform} from "./supports/InitKoaPlatform"; +import {InitBasePlatform} from "./supports/InitBasePlatform.js"; +import {InitExpressPlatform} from "./supports/InitExpressPlatform.js"; +import {InitKoaPlatform} from "./supports/InitKoaPlatform.js"; @Module({ imports: [InitExpressPlatform, InitKoaPlatform] diff --git a/packages/cli/src/platforms/supports/InitExpressPlatform.ts b/packages/cli/src/platforms/supports/InitExpressPlatform.ts index 6e28a2099..cce8ad8d7 100644 --- a/packages/cli/src/platforms/supports/InitExpressPlatform.ts +++ b/packages/cli/src/platforms/supports/InitExpressPlatform.ts @@ -1,6 +1,6 @@ import {Injectable} from "@tsed/cli-core"; -import {InitBasePlatform} from "./InitBasePlatform"; +import {InitBasePlatform} from "./InitBasePlatform.js"; @Injectable({ type: "platform:init" diff --git a/packages/cli/src/platforms/supports/InitKoaPlatform.ts b/packages/cli/src/platforms/supports/InitKoaPlatform.ts index 863bc79c4..b1e0fdc01 100644 --- a/packages/cli/src/platforms/supports/InitKoaPlatform.ts +++ b/packages/cli/src/platforms/supports/InitKoaPlatform.ts @@ -1,6 +1,6 @@ import {Injectable} from "@tsed/cli-core"; -import {InitBasePlatform} from "./InitBasePlatform"; +import {InitBasePlatform} from "./InitBasePlatform.js"; @Injectable({ type: "platform:init" diff --git a/packages/cli/src/runtimes/RuntimesModule.ts b/packages/cli/src/runtimes/RuntimesModule.ts index ffbc14ec5..1f8cbee69 100644 --- a/packages/cli/src/runtimes/RuntimesModule.ts +++ b/packages/cli/src/runtimes/RuntimesModule.ts @@ -1,12 +1,12 @@ import {PackageManagersModule, ProjectPackageJson} from "@tsed/cli-core"; import {Inject, Module} from "@tsed/di"; -import {BabelRuntime} from "./supports/BabelRuntime"; -import {BaseRuntime} from "./supports/BaseRuntime"; -import {BunRuntime} from "./supports/BunRuntime"; -import {NodeRuntime} from "./supports/NodeRuntime"; -import {SWCRuntime} from "./supports/SWCRuntime"; -import {WebpackRuntime} from "./supports/WebpackRuntime"; +import {BabelRuntime} from "./supports/BabelRuntime.js"; +import {BaseRuntime} from "./supports/BaseRuntime.js"; +import {BunRuntime} from "./supports/BunRuntime.js"; +import {NodeRuntime} from "./supports/NodeRuntime.js"; +import {SWCRuntime} from "./supports/SWCRuntime.js"; +import {WebpackRuntime} from "./supports/WebpackRuntime.js"; export interface RuntimeInitOptions extends Record { runtime?: string; diff --git a/packages/cli/src/runtimes/index.ts b/packages/cli/src/runtimes/index.ts index 7a8d23e8c..5596e9051 100644 --- a/packages/cli/src/runtimes/index.ts +++ b/packages/cli/src/runtimes/index.ts @@ -1,7 +1,7 @@ -export * from "./RuntimesModule"; -export * from "./supports/BabelRuntime"; -export * from "./supports/BaseRuntime"; -export * from "./supports/BunRuntime"; -export * from "./supports/NodeRuntime"; -export * from "./supports/SWCRuntime"; -export * from "./supports/WebpackRuntime"; +export * from "./RuntimesModule.js"; +export * from "./supports/BabelRuntime.js"; +export * from "./supports/BaseRuntime.js"; +export * from "./supports/BunRuntime.js"; +export * from "./supports/NodeRuntime.js"; +export * from "./supports/SWCRuntime.js"; +export * from "./supports/WebpackRuntime.js"; diff --git a/packages/cli/src/runtimes/supports/BabelRuntime.ts b/packages/cli/src/runtimes/supports/BabelRuntime.ts index 7e4f506f5..821bce450 100644 --- a/packages/cli/src/runtimes/supports/BabelRuntime.ts +++ b/packages/cli/src/runtimes/supports/BabelRuntime.ts @@ -1,7 +1,7 @@ import {Injectable} from "@tsed/di"; import {dirname} from "path"; -import {NodeRuntime} from "./NodeRuntime"; +import {NodeRuntime} from "./NodeRuntime.js"; @Injectable({ type: "runtime" diff --git a/packages/cli/src/runtimes/supports/BunRuntime.ts b/packages/cli/src/runtimes/supports/BunRuntime.ts index dcb3fe16a..e1f291977 100644 --- a/packages/cli/src/runtimes/supports/BunRuntime.ts +++ b/packages/cli/src/runtimes/supports/BunRuntime.ts @@ -1,6 +1,6 @@ import {Injectable} from "@tsed/di"; -import {BaseRuntime} from "./BaseRuntime"; +import {BaseRuntime} from "./BaseRuntime.js"; @Injectable({ type: "runtime" diff --git a/packages/cli/src/runtimes/supports/NodeRuntime.ts b/packages/cli/src/runtimes/supports/NodeRuntime.ts index 0e2fb8376..006adb44f 100644 --- a/packages/cli/src/runtimes/supports/NodeRuntime.ts +++ b/packages/cli/src/runtimes/supports/NodeRuntime.ts @@ -1,6 +1,6 @@ import {Injectable} from "@tsed/di"; -import {BaseRuntime} from "./BaseRuntime"; +import {BaseRuntime} from "./BaseRuntime.js"; @Injectable({ type: "runtime" diff --git a/packages/cli/src/runtimes/supports/SWCRuntime.ts b/packages/cli/src/runtimes/supports/SWCRuntime.ts index 030f49f7c..82b056e61 100644 --- a/packages/cli/src/runtimes/supports/SWCRuntime.ts +++ b/packages/cli/src/runtimes/supports/SWCRuntime.ts @@ -1,6 +1,6 @@ import {Injectable} from "@tsed/di"; -import {NodeRuntime} from "./NodeRuntime"; +import {NodeRuntime} from "./NodeRuntime.js"; @Injectable({ type: "runtime" diff --git a/packages/cli/src/runtimes/supports/WebpackRuntime.ts b/packages/cli/src/runtimes/supports/WebpackRuntime.ts index ccb22e9da..829d2ef3d 100644 --- a/packages/cli/src/runtimes/supports/WebpackRuntime.ts +++ b/packages/cli/src/runtimes/supports/WebpackRuntime.ts @@ -1,7 +1,7 @@ import {Injectable} from "@tsed/di"; import {dirname} from "path"; -import {BabelRuntime} from "./BabelRuntime"; +import {BabelRuntime} from "./BabelRuntime.js"; @Injectable({ type: "runtime" diff --git a/packages/cli/src/services/ProvidersInfoService.spec.ts b/packages/cli/src/services/ProvidersInfoService.spec.ts index 94ffbd735..0705bdf04 100644 --- a/packages/cli/src/services/ProvidersInfoService.spec.ts +++ b/packages/cli/src/services/ProvidersInfoService.spec.ts @@ -1,4 +1,4 @@ -import {ProvidersInfoService} from "./ProvidersInfoService"; +import {ProvidersInfoService} from "./ProvidersInfoService.js"; describe("ProvidersInfoService", () => { describe("add()", () => { diff --git a/packages/cli/src/utils/__snapshots__/fillImport.spec.ts.snap b/packages/cli/src/utils/__snapshots__/fillImport.spec.ts.snap index c7d3d30c8..4448675ca 100644 --- a/packages/cli/src/utils/__snapshots__/fillImport.spec.ts.snap +++ b/packages/cli/src/utils/__snapshots__/fillImport.spec.ts.snap @@ -3,7 +3,7 @@ exports[`fillImports() > should return barrels and imports files for ('arc_default', oidc: false, graphql: false, swagger: true, passportjs: false, express: false, koa: false, mongoose: false) 1`] = ` { "architecture": "arc_default", - "barrels": "["./src/controllers/rest","./src/controllers/pages"]", + "barrels": "["./src/controllers/rest/index.js","./src/controllers/pages/index.js"]", "express": false, "graphql": false, "imports": [ @@ -14,15 +14,15 @@ exports[`fillImports() > should return barrels and imports files for ('arc_defau "from": "@tsed/swagger", }, { - "from": "./config/index", + "from": "./config/index.js", "symbols": "{config}", }, { - "from": "./controllers/rest/index", + "from": "./controllers/rest/index.js", "symbols": "* as rest", }, { - "from": "./controllers/pages/index", + "from": "./controllers/pages/index.js", "symbols": "* as pages", }, ], @@ -37,7 +37,7 @@ exports[`fillImports() > should return barrels and imports files for ('arc_defau exports[`fillImports() > should return barrels and imports files for ('arc_default', oidc: true, graphql: false, swagger: false, passportjs: false, express: false, koa: true, mongoose: false) 1`] = ` { "architecture": "arc_default", - "barrels": "["./src/controllers/rest","./src/interactions"]", + "barrels": "["./src/controllers/rest/index.js","./src/interactions/index.js"]", "express": false, "graphql": false, "imports": [ @@ -48,19 +48,19 @@ exports[`fillImports() > should return barrels and imports files for ('arc_defau "from": "@tsed/oidc-provider", }, { - "from": "./config/index", + "from": "./config/index.js", "symbols": "{config}", }, { - "from": "./controllers/rest/index", + "from": "./controllers/rest/index.js", "symbols": "* as rest", }, { - "from": "./controllers/pages/index", + "from": "./controllers/pages/index.js", "symbols": "* as pages", }, { - "from": "./controllers/oidc/InteractionsController", + "from": "./controllers/oidc/InteractionsController.js", "symbols": "{InteractionsController}", }, ], @@ -75,7 +75,7 @@ exports[`fillImports() > should return barrels and imports files for ('arc_defau exports[`fillImports() > should return barrels and imports files for ('arc_default', oidc: true, graphql: true, swagger: true, passportjs: true, express: false, koa: true, mongoose: true) 1`] = ` { "architecture": "arc_default", - "barrels": "["./src/controllers/rest","./src/controllers/pages","./src/interactions","./src/datasources","./src/resolvers"]", + "barrels": "["./src/controllers/rest/index.js","./src/controllers/pages/index.js","./src/interactions/index.js","./src/datasources/index.js","./src/resolvers/index.js"]", "express": false, "graphql": true, "imports": [ @@ -98,25 +98,25 @@ exports[`fillImports() > should return barrels and imports files for ('arc_defau "from": "@tsed/typegraphql", }, { - "from": "./datasources/index", + "from": "./datasources/index.js", }, { - "from": "./resolvers/index", + "from": "./resolvers/index.js", }, { - "from": "./config/index", + "from": "./config/index.js", "symbols": "{config}", }, { - "from": "./controllers/rest/index", + "from": "./controllers/rest/index.js", "symbols": "* as rest", }, { - "from": "./controllers/pages/index", + "from": "./controllers/pages/index.js", "symbols": "* as pages", }, { - "from": "./controllers/oidc/InteractionsController", + "from": "./controllers/oidc/InteractionsController.js", "symbols": "{InteractionsController}", }, ], @@ -131,7 +131,7 @@ exports[`fillImports() > should return barrels and imports files for ('arc_defau exports[`fillImports() > should return barrels and imports files for ('feature', oidc: false, graphql: false, swagger: false, passportjs: false, express: false, koa: false, mongoose: false) 1`] = ` { "architecture": "feature", - "barrels": "["./src/rest"]", + "barrels": "["./src/rest/index.js"]", "express": false, "graphql": false, "imports": [ @@ -139,11 +139,11 @@ exports[`fillImports() > should return barrels and imports files for ('feature', "from": "@tsed/ajv", }, { - "from": "./config/index", + "from": "./config/index.js", "symbols": "{config}", }, { - "from": "./rest/index", + "from": "./rest/index.js", "symbols": "* as rest", }, ], @@ -158,7 +158,7 @@ exports[`fillImports() > should return barrels and imports files for ('feature', exports[`fillImports() > should return barrels and imports files for ('feature', oidc: false, graphql: false, swagger: true, passportjs: false, express: false, koa: false, mongoose: false) 1`] = ` { "architecture": "feature", - "barrels": "["./src/rest","./src/pages"]", + "barrels": "["./src/rest/index.js","./src/pages/index.js"]", "express": false, "graphql": false, "imports": [ @@ -169,15 +169,15 @@ exports[`fillImports() > should return barrels and imports files for ('feature', "from": "@tsed/swagger", }, { - "from": "./config/index", + "from": "./config/index.js", "symbols": "{config}", }, { - "from": "./rest/index", + "from": "./rest/index.js", "symbols": "* as rest", }, { - "from": "./pages/index", + "from": "./pages/index.js", "symbols": "* as pages", }, ], @@ -192,7 +192,7 @@ exports[`fillImports() > should return barrels and imports files for ('feature', exports[`fillImports() > should return barrels and imports files for ('feature', oidc: true, graphql: false, swagger: false, passportjs: false, express: true, koa: false, mongoose: false) 1`] = ` { "architecture": "feature", - "barrels": "["./src/rest","./src/interactions"]", + "barrels": "["./src/rest/index.js","./src/interactions/index.js"]", "express": false, "graphql": false, "imports": [ @@ -203,19 +203,19 @@ exports[`fillImports() > should return barrels and imports files for ('feature', "from": "@tsed/oidc-provider", }, { - "from": "./config/index", + "from": "./config/index.js", "symbols": "{config}", }, { - "from": "./rest/index", + "from": "./rest/index.js", "symbols": "* as rest", }, { - "from": "./pages/index", + "from": "./pages/index.js", "symbols": "* as pages", }, { - "from": "./controllers/oidc/InteractionsController", + "from": "./controllers/oidc/InteractionsController.js", "symbols": "{InteractionsController}", }, ], @@ -230,7 +230,7 @@ exports[`fillImports() > should return barrels and imports files for ('feature', exports[`fillImports() > should return barrels and imports files for ('feature', oidc: true, graphql: true, swagger: true, passportjs: true, express: true, koa: false, mongoose: true) 1`] = ` { "architecture": "feature", - "barrels": "["./src/rest","./src/pages","./src/interactions","./src/datasources","./src/resolvers"]", + "barrels": "["./src/rest/index.js","./src/pages/index.js","./src/interactions/index.js","./src/datasources/index.js","./src/resolvers/index.js"]", "express": false, "graphql": true, "imports": [ @@ -253,25 +253,25 @@ exports[`fillImports() > should return barrels and imports files for ('feature', "from": "@tsed/typegraphql", }, { - "from": "./datasources/index", + "from": "./datasources/index.js", }, { - "from": "./resolvers/index", + "from": "./resolvers/index.js", }, { - "from": "./config/index", + "from": "./config/index.js", "symbols": "{config}", }, { - "from": "./rest/index", + "from": "./rest/index.js", "symbols": "* as rest", }, { - "from": "./pages/index", + "from": "./pages/index.js", "symbols": "* as pages", }, { - "from": "./controllers/oidc/InteractionsController", + "from": "./controllers/oidc/InteractionsController.js", "symbols": "{InteractionsController}", }, ], diff --git a/packages/cli/src/utils/fillImport.spec.ts b/packages/cli/src/utils/fillImport.spec.ts index fe9fe66b6..58761d388 100644 --- a/packages/cli/src/utils/fillImport.spec.ts +++ b/packages/cli/src/utils/fillImport.spec.ts @@ -1,5 +1,5 @@ -import {ArchitectureConvention} from "../interfaces"; -import {fillImports} from "./fillImports"; +import {ArchitectureConvention} from "../interfaces/index.js"; +import {fillImports} from "./fillImports.js"; describe("fillImports()", () => { it.each([ diff --git a/packages/cli/src/utils/fillImports.ts b/packages/cli/src/utils/fillImports.ts index 0339142a1..4296412e7 100644 --- a/packages/cli/src/utils/fillImports.ts +++ b/packages/cli/src/utils/fillImports.ts @@ -1,4 +1,4 @@ -import {ArchitectureConvention, PlatformType} from "../interfaces"; +import {ArchitectureConvention, PlatformType} from "../interfaces/index.js"; export function fillImports(ctx: any) { ctx = {...ctx}; @@ -10,11 +10,11 @@ export function fillImports(ctx: any) { ctx.barrels = JSON.stringify( [ - isFeature ? "./src/rest" : "./src/controllers/rest", - ctx.swagger && (isFeature ? "./src/pages" : "./src/controllers/pages"), - ctx.oidc && "./src/interactions", - ctx.graphql && "./src/datasources", - ctx.graphql && "./src/resolvers" + isFeature ? "./src/rest/index.js" : "./src/controllers/rest/index.js", + ctx.swagger && (isFeature ? "./src/pages/index.js" : "./src/controllers/pages/index.js"), + ctx.oidc && "./src/interactions/index.js", + ctx.graphql && "./src/datasources/index.js", + ctx.graphql && "./src/resolvers/index.js" ].filter(Boolean) ); @@ -27,15 +27,15 @@ export function fillImports(ctx: any) { ctx.oidc && {from: "@tsed/oidc-provider"}, ctx.passportjs && {from: "@tsed/passport"}, ctx.graphql && {from: "@tsed/typegraphql"}, - ctx.graphql && {from: "./datasources/index"}, - ctx.graphql && {from: "./resolvers/index"}, - {symbols: "{config}", from: "./config/index"}, - {symbols: "* as rest", from: isFeature ? "./rest/index" : "./controllers/rest/index"}, + ctx.graphql && {from: "./datasources/index.js"}, + ctx.graphql && {from: "./resolvers/index.js"}, + {symbols: "{config}", from: "./config/index.js"}, + {symbols: "* as rest", from: isFeature ? "./rest/index.js" : "./controllers/rest/index.js"}, (ctx.swagger || ctx.oidc) && { symbols: "* as pages", - from: isFeature ? "./pages/index" : "./controllers/pages/index" + from: isFeature ? "./pages/index.js" : "./controllers/pages/index.js" }, - ctx.oidc && {symbols: "{InteractionsController}", from: "./controllers/oidc/InteractionsController"} + ctx.oidc && {symbols: "{InteractionsController}", from: "./controllers/oidc/InteractionsController.js"} ].filter(Boolean); return ctx; diff --git a/packages/cli/templates/init/processes.config.js.hbs b/packages/cli/templates/init/processes.config.cjs.hbs similarity index 100% rename from packages/cli/templates/init/processes.config.js.hbs rename to packages/cli/templates/init/processes.config.cjs.hbs diff --git a/packages/cli/templates/init/src/bin/index.ts.hbs b/packages/cli/templates/init/src/bin/index.ts.hbs index ce43ef10f..318f8c801 100644 --- a/packages/cli/templates/init/src/bin/index.ts.hbs +++ b/packages/cli/templates/init/src/bin/index.ts.hbs @@ -1,9 +1,9 @@ #!/usr/bin/env node import {CliCore} from "@tsed/cli-core"; -import {config} from "../config"; +import {config} from "../config/index.js"; CliCore.bootstrap({ ...config, commands: [ ] -}).catch(console.error); \ No newline at end of file +}).catch(console.error); diff --git a/packages/cli/templates/init/src/config/index.ts.hbs b/packages/cli/templates/init/src/config/index.ts.hbs index cdaedcc62..b0d58cd3d 100644 --- a/packages/cli/templates/init/src/config/index.ts.hbs +++ b/packages/cli/templates/init/src/config/index.ts.hbs @@ -1,9 +1,9 @@ import {readFileSync} from "fs"; -import {envs} from "./envs/index"; -import loggerConfig from "./logger/index";{{#if mongoose}} -import mongooseConfig from "./mongoose/index"; +import {envs} from "./envs/index.js"; +import loggerConfig from "./logger/index.js";{{#if mongoose}} +import mongooseConfig from "./mongoose/index.js"; {{/if}}{{#if oidc}} -import oidcConfig from "./oidc/index"; +import oidcConfig from "./oidc/index.js"; import {FileSyncAdapter} from "@tsed/adapters"; {{/if}} diff --git a/packages/cli/templates/init/src/index.ts.hbs b/packages/cli/templates/init/src/index.ts.hbs index 4c8d0fbea..a95058e99 100644 --- a/packages/cli/templates/init/src/index.ts.hbs +++ b/packages/cli/templates/init/src/index.ts.hbs @@ -1,6 +1,6 @@ import {$log} from "@tsed/common"; import { {{platformSymbol}} } from "@tsed/platform-{{platform}}"; -import {Server} from "./{{entryServer}}"; +import {Server} from "./{{entryServer}}.js"; async function bootstrap() { try { diff --git a/packages/cli/templates/init/tsconfig.base.json.hbs b/packages/cli/templates/init/tsconfig.base.json.hbs new file mode 100644 index 000000000..17a1ccf23 --- /dev/null +++ b/packages/cli/templates/init/tsconfig.base.json.hbs @@ -0,0 +1,29 @@ +{ + "compilerOptions": { + "module": "NodeNext", + "target": "ESNext", + "experimentalDecorators": true, + "emitDecoratorMetadata": true, + "moduleResolution": "NodeNext", + "downlevelIteration": false, + "isolatedModules": false, + "suppressImplicitAnyIndexErrors": false, + "noImplicitAny": true, + "strictNullChecks": true, + "noUnusedLocals": false, + "noUnusedParameters": false, + "esModuleInterop": true, + "allowSyntheticDefaultImports": true, + "useDefineForClassFields": false, + "importHelpers": true, + "resolveJsonModule": true, + "newLine": "LF", + "skipLibCheck": true, + "lib": ["ESNext", "esnext.asynciterable"], + "declaration": false, + "noResolve": false, + "preserveConstEnums": true, + "sourceMap": true, + "noEmit": true + } +} diff --git a/packages/cli/templates/init/tsconfig.compile.json.hbs b/packages/cli/templates/init/tsconfig.compile.json.hbs deleted file mode 100644 index 7f999b259..000000000 --- a/packages/cli/templates/init/tsconfig.compile.json.hbs +++ /dev/null @@ -1,15 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "baseUrl": ".", - "outDir": "./dist", - "moduleResolution": "node", - "declaration": true, - "noResolve": false, - "preserveConstEnums": true, - "sourceMap": true, - "noEmit": false, - "emitDeclarationOnly": {{#if babel }}true{{else}}false{{/if}}, - "inlineSources": true - } -} diff --git a/packages/cli/templates/init/tsconfig.json.hbs b/packages/cli/templates/init/tsconfig.json.hbs index 9c05d7706..2fe37569a 100644 --- a/packages/cli/templates/init/tsconfig.json.hbs +++ b/packages/cli/templates/init/tsconfig.json.hbs @@ -1,40 +1,16 @@ { + "extends": "./tsconfig.base.json", "compilerOptions": { "baseUrl": ".", - "sourceRoot": "src", - "module": "commonjs", - "target": "esnext", - "sourceMap": true, - "declaration": false, - "experimentalDecorators": true, - "emitDecoratorMetadata": true, - "moduleResolution": "node", - "isolatedModules": false, - "suppressImplicitAnyIndexErrors": false, - "noImplicitAny": true, - "strictNullChecks": true, - "noUnusedLocals": false, - "noUnusedParameters": false, - "allowSyntheticDefaultImports": true, - "importHelpers": true, - "newLine": "LF", - "noEmit": true, - "esModuleInterop": true, - "resolveJsonModule": true, - "useDefineForClassFields": false, - "lib": [ - "es7", - "dom", - "ESNext.AsyncIterable" - ], - "typeRoots": [ - "./node_modules/@types" - ] + "noEmit": true }, - "include": [ - "src" - ], - "linterOptions": { - "exclude": [] - } + "include": [], + "references": [ + { + "path": "./tsconfig.node.json" + }{{#if testing}}, + { + "path": "./tsconfig.spec.json" + }{{/if}} + ] } diff --git a/packages/cli/templates/init/tsconfig.node.json.hbs b/packages/cli/templates/init/tsconfig.node.json.hbs new file mode 100644 index 000000000..78a2b7f9f --- /dev/null +++ b/packages/cli/templates/init/tsconfig.node.json.hbs @@ -0,0 +1,20 @@ +{ + "extends": "./tsconfig.base.json", + "compilerOptions": { + "baseUrl": "." + }, + "include": [ + "src/**/*" + ], + "exclude": [ + "src/**/*.spec.ts", + "dist", + "node_modules", + "**/helpers/*Fixture.ts", + "**/__mock__/**", + "coverage" + ], + "linterOptions": { + "exclude": [] + } +} diff --git a/packages/cli/templates/init/tsconfig.spec.json.hbs b/packages/cli/templates/init/tsconfig.spec.json.hbs new file mode 100644 index 000000000..2aa8bff84 --- /dev/null +++ b/packages/cli/templates/init/tsconfig.spec.json.hbs @@ -0,0 +1,24 @@ +{ + "extends": "./tsconfig.base.json", + "compilerOptions": { + "baseUrl": ".", + "rootDir": ".", + "noEmit": true, + "types": [{{#if vitest}} + "vitest/globals", + "vitest/importMeta", + "vite/client",{{/if}} + "node", + "vitest" + ] + }, + "include": [{{#if vitest}} + "vitest.config.mts",{{/if}} + "src/**/*" + ], + "exclude": [ + "dist", + "coverage", + "node_modules" + ] +} diff --git a/packages/cli/test/integrations/generate/generate.async-factory.integration.spec.ts b/packages/cli/test/integrations/generate/generate.async-factory.integration.spec.ts index 9f2d49828..ac56b98a5 100644 --- a/packages/cli/test/integrations/generate/generate.async-factory.integration.spec.ts +++ b/packages/cli/test/integrations/generate/generate.async-factory.integration.spec.ts @@ -1,6 +1,6 @@ import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; -import {GenerateCmd, TEMPLATE_DIR} from "../../../src"; +import {GenerateCmd, TEMPLATE_DIR} from "../../../src/index.js"; describe("Generate AsyncFactory", () => { beforeEach(() => diff --git a/packages/cli/test/integrations/generate/generate.controller.integration.spec.ts b/packages/cli/test/integrations/generate/generate.controller.integration.spec.ts index 3cc1a2117..ec762b579 100644 --- a/packages/cli/test/integrations/generate/generate.controller.integration.spec.ts +++ b/packages/cli/test/integrations/generate/generate.controller.integration.spec.ts @@ -1,7 +1,7 @@ import {CliService, ProjectPackageJson} from "@tsed/cli-core"; import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; -import {GenerateCmd, TEMPLATE_DIR} from "../../../src"; +import {GenerateCmd, TEMPLATE_DIR} from "../../../src/index.js"; describe("Generate Controller", () => { beforeEach(() => diff --git a/packages/cli/test/integrations/generate/generate.decorator-class.integration.spec.ts b/packages/cli/test/integrations/generate/generate.decorator-class.integration.spec.ts index 900022273..294824244 100644 --- a/packages/cli/test/integrations/generate/generate.decorator-class.integration.spec.ts +++ b/packages/cli/test/integrations/generate/generate.decorator-class.integration.spec.ts @@ -1,7 +1,7 @@ import {CliService, ProjectPackageJson} from "@tsed/cli-core"; import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; -import {GenerateCmd, TEMPLATE_DIR} from "../../../src"; +import {GenerateCmd, TEMPLATE_DIR} from "../../../src/index.js"; describe("Generate class decorator", () => { beforeEach(() => diff --git a/packages/cli/test/integrations/generate/generate.decorator-endpoint.integration.spec.ts b/packages/cli/test/integrations/generate/generate.decorator-endpoint.integration.spec.ts index 67f786064..84d9a5bfa 100644 --- a/packages/cli/test/integrations/generate/generate.decorator-endpoint.integration.spec.ts +++ b/packages/cli/test/integrations/generate/generate.decorator-endpoint.integration.spec.ts @@ -2,7 +2,7 @@ import {CliService, ProjectPackageJson} from "@tsed/cli-core"; import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; import {resolve} from "path"; -import {GenerateCmd, TEMPLATE_DIR} from "../../../src"; +import {GenerateCmd, TEMPLATE_DIR} from "../../../src/index.js"; describe("Generate endpoint decorator", () => { beforeEach(() => diff --git a/packages/cli/test/integrations/generate/generate.decorator-generic.integration.spec.ts b/packages/cli/test/integrations/generate/generate.decorator-generic.integration.spec.ts index e072f6a48..a865cb667 100644 --- a/packages/cli/test/integrations/generate/generate.decorator-generic.integration.spec.ts +++ b/packages/cli/test/integrations/generate/generate.decorator-generic.integration.spec.ts @@ -1,7 +1,7 @@ import {CliService, ProjectPackageJson} from "@tsed/cli-core"; import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; -import {GenerateCmd, TEMPLATE_DIR} from "../../../src"; +import {GenerateCmd, TEMPLATE_DIR} from "../../../src/index.js"; describe("Generate generic decorator", () => { beforeEach(() => diff --git a/packages/cli/test/integrations/generate/generate.decorator-method.integration.spec.ts b/packages/cli/test/integrations/generate/generate.decorator-method.integration.spec.ts index e38953a2d..d1bcd6506 100644 --- a/packages/cli/test/integrations/generate/generate.decorator-method.integration.spec.ts +++ b/packages/cli/test/integrations/generate/generate.decorator-method.integration.spec.ts @@ -1,7 +1,7 @@ import {CliService, ProjectPackageJson} from "@tsed/cli-core"; import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; -import {GenerateCmd, TEMPLATE_DIR} from "../../../src"; +import {GenerateCmd, TEMPLATE_DIR} from "../../../src/index.js"; describe("Generate method decorator", () => { beforeEach(() => diff --git a/packages/cli/test/integrations/generate/generate.decorator-middleware.integration.spec.ts b/packages/cli/test/integrations/generate/generate.decorator-middleware.integration.spec.ts index 7c978bb46..d8f4cf046 100644 --- a/packages/cli/test/integrations/generate/generate.decorator-middleware.integration.spec.ts +++ b/packages/cli/test/integrations/generate/generate.decorator-middleware.integration.spec.ts @@ -1,7 +1,7 @@ import {CliService, ProjectPackageJson} from "@tsed/cli-core"; import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; -import {GenerateCmd, TEMPLATE_DIR} from "../../../src"; +import {GenerateCmd, TEMPLATE_DIR} from "../../../src/index.js"; describe("Generate middleware decorator", () => { beforeEach(() => diff --git a/packages/cli/test/integrations/generate/generate.exception-filter.integration.spec.ts b/packages/cli/test/integrations/generate/generate.exception-filter.integration.spec.ts index afcaa81e2..213dabc85 100644 --- a/packages/cli/test/integrations/generate/generate.exception-filter.integration.spec.ts +++ b/packages/cli/test/integrations/generate/generate.exception-filter.integration.spec.ts @@ -1,7 +1,7 @@ import {CliService, ProjectPackageJson} from "@tsed/cli-core"; import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; -import {GenerateCmd, TEMPLATE_DIR} from "../../../src"; +import {GenerateCmd, TEMPLATE_DIR} from "../../../src/index.js"; describe("Generate Exception Filter", () => { beforeEach(() => diff --git a/packages/cli/test/integrations/generate/generate.response-filter.integration.spec.ts b/packages/cli/test/integrations/generate/generate.response-filter.integration.spec.ts index 2dce14ac1..e904bee73 100644 --- a/packages/cli/test/integrations/generate/generate.response-filter.integration.spec.ts +++ b/packages/cli/test/integrations/generate/generate.response-filter.integration.spec.ts @@ -1,7 +1,7 @@ import {CliService, ProjectPackageJson} from "@tsed/cli-core"; import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; -import {GenerateCmd, TEMPLATE_DIR} from "../../../src"; +import {GenerateCmd, TEMPLATE_DIR} from "../../../src/index.js"; describe("Generate Response Filter", () => { beforeEach(() => diff --git a/packages/cli/test/integrations/init/__snapshots__/init.integration.spec.ts.snap b/packages/cli/test/integrations/init/__snapshots__/init.integration.spec.ts.snap index 703525400..8cc8429c0 100644 --- a/packages/cli/test/integrations/init/__snapshots__/init.integration.spec.ts.snap +++ b/packages/cli/test/integrations/init/__snapshots__/init.integration.spec.ts.snap @@ -7,9 +7,9 @@ import {PlatformApplication} from "@tsed/common"; import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; import "@tsed/swagger"; -import {config} from "./config/index"; -import * as rest from "./rest/index"; -import * as pages from "./pages/index"; +import {config} from "./config/index.js"; +import * as rest from "./rest/index.js"; +import * as pages from "./pages/index.js"; @Configuration({ ...config, @@ -68,8 +68,8 @@ import {Configuration, Inject} from "@tsed/di"; import {PlatformApplication} from "@tsed/common"; import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; -import {config} from "./config/index"; -import * as rest from "./controllers/rest/index"; +import {config} from "./config/index.js"; +import * as rest from "./controllers/rest/index.js"; @Configuration({ ...config, @@ -119,8 +119,8 @@ import {Configuration, Inject} from "@tsed/di"; import {PlatformApplication} from "@tsed/common"; import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; -import {config} from "./config/index"; -import * as rest from "./controllers/rest/index"; +import {config} from "./config/index.js"; +import * as rest from "./controllers/rest/index.js"; @Configuration({ ...config, @@ -171,9 +171,9 @@ import {PlatformApplication} from "@tsed/common"; import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; import "@tsed/swagger"; -import {config} from "./config/index"; -import * as rest from "./controllers/rest/index"; -import * as pages from "./controllers/pages/index"; +import {config} from "./config/index.js"; +import * as rest from "./controllers/rest/index.js"; +import * as pages from "./controllers/pages/index.js"; @Configuration({ ...config, @@ -232,8 +232,8 @@ import {Configuration, Inject} from "@tsed/di"; import {PlatformApplication} from "@tsed/common"; import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; -import {config} from "./config/index"; -import * as rest from "./controllers/rest/index"; +import {config} from "./config/index.js"; +import * as rest from "./controllers/rest/index.js"; @Configuration({ ...config, @@ -283,8 +283,8 @@ import {Configuration, Inject} from "@tsed/di"; import {PlatformApplication} from "@tsed/common"; import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; -import {config} from "./config/index"; -import * as rest from "./controllers/rest/index"; +import {config} from "./config/index.js"; +import * as rest from "./controllers/rest/index.js"; @Configuration({ ...config, @@ -334,8 +334,8 @@ import {Configuration, Inject} from "@tsed/di"; import {PlatformApplication} from "@tsed/common"; import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; -import {config} from "./config/index"; -import * as rest from "./controllers/rest/index"; +import {config} from "./config/index.js"; +import * as rest from "./controllers/rest/index.js"; @Configuration({ ...config, @@ -386,9 +386,9 @@ import {PlatformApplication} from "@tsed/common"; import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; import "@tsed/swagger"; -import {config} from "./config/index"; -import * as rest from "./controllers/rest/index"; -import * as pages from "./controllers/pages/index"; +import {config} from "./config/index.js"; +import * as rest from "./controllers/rest/index.js"; +import * as pages from "./controllers/pages/index.js"; @Configuration({ ...config, @@ -447,8 +447,8 @@ import {Configuration, Inject} from "@tsed/di"; import {PlatformApplication} from "@tsed/common"; import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; -import {config} from "./config/index"; -import * as rest from "./controllers/rest/index"; +import {config} from "./config/index.js"; +import * as rest from "./controllers/rest/index.js"; @Configuration({ ...config, @@ -498,8 +498,8 @@ import {Configuration, Inject} from "@tsed/di"; import {PlatformApplication} from "@tsed/common"; import "@tsed/platform-koa"; // /!\\ keep this import import "@tsed/ajv"; -import {config} from "./config/index"; -import * as rest from "./controllers/rest/index"; +import {config} from "./config/index.js"; +import * as rest from "./controllers/rest/index.js"; @Configuration({ ...config, diff --git a/packages/cli/test/integrations/init/init.integration.spec.ts b/packages/cli/test/integrations/init/init.integration.spec.ts index 6f237608c..0007fcb2a 100644 --- a/packages/cli/test/integrations/init/init.integration.spec.ts +++ b/packages/cli/test/integrations/init/init.integration.spec.ts @@ -3,9 +3,9 @@ import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; import {ensureDirSync, writeFileSync} from "fs-extra"; import {join} from "path"; -import {ArchitectureConvention, InitCmd, ProjectConvention, TEMPLATE_DIR} from "../../../src"; +import {ArchitectureConvention, InitCmd, ProjectConvention, TEMPLATE_DIR} from "../../../src/index.js"; -const dir = __dirname; +const dir = import.meta.dirname; describe("Init cmd", () => { beforeEach(() => { @@ -48,7 +48,7 @@ describe("Init cmd", () => { "project-name/README.md", "project-name/docker-compose.yml", "project-name/package.json", - "project-name/processes.config.js", + "project-name/processes.config.cjs", "project-name/src", "project-name/src/Server.ts", "project-name/src/config", @@ -60,8 +60,8 @@ describe("Init cmd", () => { "project-name/src/controllers/rest", "project-name/src/controllers/rest/HelloWorldController.ts", "project-name/src/index.ts", - "project-name/tsconfig.compile.json", - "project-name/tsconfig.json", + "project-name/tsconfig.base.json", + "project-name/tsconfig.node.json", ] `); @@ -116,7 +116,7 @@ describe("Init cmd", () => { expect(dockerFile).toContain("RUN yarn install --pure-lockfile"); const indexContent = FakeCliFs.entries.get("project-name/src/index.ts")!; - expect(indexContent).toContain('import {Server} from "./Server"'); + expect(indexContent).toContain('import {Server} from "./Server.js"'); }); it("should generate a project with swagger", async () => { CliPlatformTest.setPackageJson({ @@ -147,7 +147,7 @@ describe("Init cmd", () => { "project-name/README.md", "project-name/docker-compose.yml", "project-name/package.json", - "project-name/processes.config.js", + "project-name/processes.config.cjs", "project-name/src", "project-name/src/Server.ts", "project-name/src/config", @@ -161,8 +161,8 @@ describe("Init cmd", () => { "project-name/src/controllers/rest", "project-name/src/controllers/rest/HelloWorldController.ts", "project-name/src/index.ts", - "project-name/tsconfig.compile.json", - "project-name/tsconfig.json", + "project-name/tsconfig.base.json", + "project-name/tsconfig.node.json", "project-name/views", "project-name/views/swagger.ejs", ] @@ -173,7 +173,7 @@ describe("Init cmd", () => { expect(content).toContain('import {Configuration, Inject} from "@tsed/di"'); expect(content).toContain('import "@tsed/platform-express"'); expect(content).toContain('import "@tsed/ajv"'); - expect(content).toContain('import * as pages from "./controllers/pages/index"'); + expect(content).toContain('import * as pages from "./controllers/pages/index.js"'); expect(content).toMatchSnapshot(); const pkg = JSON.parse(FakeCliFs.entries.get("project-name/package.json")!); @@ -243,7 +243,7 @@ describe("Init cmd", () => { "project-name/README.md", "project-name/docker-compose.yml", "project-name/package.json", - "project-name/processes.config.js", + "project-name/processes.config.cjs", "project-name/src", "project-name/src/Server.ts", "project-name/src/config", @@ -255,8 +255,8 @@ describe("Init cmd", () => { "project-name/src/controllers/rest", "project-name/src/controllers/rest/HelloWorldController.ts", "project-name/src/index.ts", - "project-name/tsconfig.compile.json", - "project-name/tsconfig.json", + "project-name/tsconfig.base.json", + "project-name/tsconfig.node.json", ] `); @@ -334,7 +334,7 @@ describe("Init cmd", () => { "project-name/README.md", "project-name/docker-compose.yml", "project-name/package.json", - "project-name/processes.config.js", + "project-name/processes.config.cjs", "project-name/src", "project-name/src/Server.ts", "project-name/src/config", @@ -346,8 +346,8 @@ describe("Init cmd", () => { "project-name/src/controllers/rest", "project-name/src/controllers/rest/HelloWorldController.ts", "project-name/src/index.ts", - "project-name/tsconfig.compile.json", - "project-name/tsconfig.json", + "project-name/tsconfig.base.json", + "project-name/tsconfig.node.json", ] `); @@ -425,7 +425,7 @@ describe("Init cmd", () => { "project-name/README.md", "project-name/docker-compose.yml", "project-name/package.json", - "project-name/processes.config.js", + "project-name/processes.config.cjs", "project-name/src", "project-name/src/Server.ts", "project-name/src/config", @@ -437,8 +437,8 @@ describe("Init cmd", () => { "project-name/src/controllers/rest", "project-name/src/controllers/rest/HelloWorldController.ts", "project-name/src/index.ts", - "project-name/tsconfig.compile.json", - "project-name/tsconfig.json", + "project-name/tsconfig.base.json", + "project-name/tsconfig.node.json", "project-name/webpack.config.js", ] `); @@ -518,7 +518,7 @@ describe("Init cmd", () => { "project-name/README.md", "project-name/docker-compose.yml", "project-name/package.json", - "project-name/processes.config.js", + "project-name/processes.config.cjs", "project-name/src", "project-name/src/Server.ts", "project-name/src/config", @@ -530,8 +530,8 @@ describe("Init cmd", () => { "project-name/src/controllers/rest", "project-name/src/controllers/rest/HelloWorldController.ts", "project-name/src/index.ts", - "project-name/tsconfig.compile.json", - "project-name/tsconfig.json", + "project-name/tsconfig.base.json", + "project-name/tsconfig.node.json", ] `); @@ -608,7 +608,7 @@ describe("Init cmd", () => { "project-name/README.md", "project-name/docker-compose.yml", "project-name/package.json", - "project-name/processes.config.js", + "project-name/processes.config.cjs", "project-name/src", "project-name/src/Server.ts", "project-name/src/config", @@ -620,8 +620,8 @@ describe("Init cmd", () => { "project-name/src/controllers/rest", "project-name/src/controllers/rest/HelloWorldController.ts", "project-name/src/index.ts", - "project-name/tsconfig.compile.json", - "project-name/tsconfig.json", + "project-name/tsconfig.base.json", + "project-name/tsconfig.node.json", ] `); @@ -702,7 +702,7 @@ describe("Init cmd", () => { "project-name/README.md", "project-name/docker-compose.yml", "project-name/package.json", - "project-name/processes.config.js", + "project-name/processes.config.cjs", "project-name/src", "project-name/src/config", "project-name/src/config/envs", @@ -716,8 +716,8 @@ describe("Init cmd", () => { "project-name/src/controllers/rest/hello-world.controller.ts", "project-name/src/index.ts", "project-name/src/server.ts", - "project-name/tsconfig.compile.json", - "project-name/tsconfig.json", + "project-name/tsconfig.base.json", + "project-name/tsconfig.node.json", "project-name/views", "project-name/views/swagger.ejs", ] @@ -728,11 +728,11 @@ describe("Init cmd", () => { expect(content).toContain('import "@tsed/platform-express"'); expect(content).toContain('import "@tsed/ajv"'); expect(content).toMatchSnapshot(); - expect(content).toContain('import * as pages from "./controllers/pages/index"'); + expect(content).toContain('import * as pages from "./controllers/pages/index.js"'); expect(content).toContain("export class Server {"); const indexContent = FakeCliFs.entries.get("project-name/src/index.ts")!; - expect(indexContent).toContain('import {Server} from "./server"'); + expect(indexContent).toContain('import {Server} from "./server.js"'); }); it("should generate a project with Arch FEATURE", async () => { CliPlatformTest.setPackageJson({ @@ -766,7 +766,7 @@ describe("Init cmd", () => { "project-name/README.md", "project-name/docker-compose.yml", "project-name/package.json", - "project-name/processes.config.js", + "project-name/processes.config.cjs", "project-name/src", "project-name/src/config", "project-name/src/config/envs", @@ -780,8 +780,8 @@ describe("Init cmd", () => { "project-name/src/rest", "project-name/src/rest/hello-world.controller.ts", "project-name/src/server.ts", - "project-name/tsconfig.compile.json", - "project-name/tsconfig.json", + "project-name/tsconfig.base.json", + "project-name/tsconfig.node.json", "project-name/views", "project-name/views/swagger.ejs", ] @@ -792,11 +792,11 @@ describe("Init cmd", () => { expect(content).toContain('import "@tsed/platform-express"'); expect(content).toContain('import "@tsed/ajv"'); expect(content).toMatchSnapshot(); - expect(content).toContain('import * as pages from "./pages/index"'); + expect(content).toContain('import * as pages from "./pages/index.js"'); expect(content).toContain("export class Server {"); const indexContent = FakeCliFs.entries.get("project-name/src/index.ts")!; - expect(indexContent).toContain('import {Server} from "./server"'); + expect(indexContent).toContain('import {Server} from "./server.js"'); }); }); @@ -829,7 +829,7 @@ describe("Init cmd", () => { "project-name/README.md", "project-name/docker-compose.yml", "project-name/package.json", - "project-name/processes.config.js", + "project-name/processes.config.cjs", "project-name/src", "project-name/src/Server.ts", "project-name/src/config", @@ -841,8 +841,8 @@ describe("Init cmd", () => { "project-name/src/controllers/rest", "project-name/src/controllers/rest/HelloWorldController.ts", "project-name/src/index.ts", - "project-name/tsconfig.compile.json", - "project-name/tsconfig.json", + "project-name/tsconfig.base.json", + "project-name/tsconfig.node.json", ] `); @@ -934,7 +934,7 @@ describe("Init cmd", () => { "project-name/README.md", "project-name/docker-compose.yml", "project-name/package.json", - "project-name/processes.config.js", + "project-name/processes.config.cjs", "project-name/src", "project-name/src/Server.ts", "project-name/src/bin", @@ -949,8 +949,8 @@ describe("Init cmd", () => { "project-name/src/controllers/rest", "project-name/src/controllers/rest/HelloWorldController.ts", "project-name/src/index.ts", - "project-name/tsconfig.compile.json", - "project-name/tsconfig.json", + "project-name/tsconfig.base.json", + "project-name/tsconfig.node.json", ] `); }); diff --git a/packages/cli/tsconfig.cjs.json b/packages/cli/tsconfig.cjs.json deleted file mode 100644 index 7f23b116d..000000000 --- a/packages/cli/tsconfig.cjs.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "extends": "@tsed/typescript/tsconfig.node.json", - "compilerOptions": { - "baseUrl": ".", - "module": "commonjs", - "moduleResolution": "Node16", - "rootDir": "src", - "outDir": "./lib/cjs", - "declaration": true, - "declarationDir": "./lib/types", - "composite": true, - "noEmit": false - }, - "include": ["src", "src/**/*.json"], - "exclude": [ - "node_modules", - "test", - "lib", - "benchmark", - "coverage", - "spec", - "**/*.benchmark.ts", - "**/*.spec.ts", - "keys", - "**/__mock__/**", - "webpack.config.js" - ] -} diff --git a/packages/cli/tsconfig.esm.json b/packages/cli/tsconfig.esm.json index ce32a9e07..45d441a7d 100644 --- a/packages/cli/tsconfig.esm.json +++ b/packages/cli/tsconfig.esm.json @@ -2,11 +2,9 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", - "declarationDir": "./lib/types-esm", + "declarationDir": "./lib/types", "declaration": true, "composite": true, "noEmit": false diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json index c92ac778d..1dd7d4ca9 100644 --- a/packages/cli/tsconfig.json +++ b/packages/cli/tsconfig.json @@ -9,9 +9,6 @@ { "path": "../cli-core/tsconfig.json" }, - { - "path": "./tsconfig.cjs.json" - }, { "path": "./tsconfig.esm.json" }, diff --git a/packages/cli/tsconfig.spec.json b/packages/cli/tsconfig.spec.json index 75fcfa09d..0f06288a8 100644 --- a/packages/cli/tsconfig.spec.json +++ b/packages/cli/tsconfig.spec.json @@ -3,8 +3,6 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, diff --git a/release.config.js b/release.config.js index 2a17a3d55..85c2e73bd 100644 --- a/release.config.js +++ b/release.config.js @@ -1,6 +1,6 @@ process.env.SEMANTIC_RELEASE_PACKAGE = "Ts.ED CLI"; -module.exports = { +export default { branches: [ "master", {name: "alpha", prerelease: true, channel: "alpha"}, diff --git a/tools/typescript/index.js b/tools/typescript/index.js index 3fa86fc84..6ad68cbd6 100644 --- a/tools/typescript/index.js +++ b/tools/typescript/index.js @@ -19,12 +19,10 @@ async function main() { const tsConfigRootPath = join(monoRepo.rootDir, "tsconfig.json"); const tsConfigTemplate = await fs.readJson(join(scriptDir, "./tsconfig.template.json")); - const tsConfigTemplateCjsPath = join(scriptDir, "./tsconfig.template.cjs.json"); const tsConfigTemplateEsmPath = join(scriptDir, "./tsconfig.template.esm.json"); const tsConfigTemplateSpecPath = join(scriptDir, "./tsconfig.template.spec.json"); const tsConfigTemplateSpec = await fs.readJson(tsConfigTemplateSpecPath); const npmIgnoreTemplatePath = join(scriptDir, "./.npmignore.template"); - //const viteConfig = fs.readFileSync(join(scriptDir, "./vite.config.mts"), {encoding: "utf8"}); const tsConfigRoot = await fs.readJson(tsConfigRootPath); tsConfigRoot.references = []; @@ -45,7 +43,6 @@ async function main() { const tsConfig = cloneDeep(tsConfigTemplate); const tsConfigPath = join(path, "tsconfig.json"); const tsConfigBuildEsmPath = join(path, "tsconfig.esm.json"); - const tsConfigBuildCjsPath = join(path, "tsconfig.cjs.json"); const tsConfigBuildSpecPath = join(path, "tsconfig.spec.json"); const npmignore = join(path, ".npmignore"); const vitestPath = join(path, "vitest.config.mts"); @@ -74,14 +71,9 @@ async function main() { }); }); - tsConfig.references.push( - { - path: "./tsconfig.cjs.json" - }, - { - path: "./tsconfig.esm.json" - } - ); + tsConfig.references.push({ + path: "./tsconfig.esm.json" + }); if (hasFiles.length) { tsConfig.references.push({ @@ -122,7 +114,6 @@ async function main() { await fs.writeJson(tsConfigPath, tsConfig, {spaces: 2}); await fs.copy(tsConfigTemplateEsmPath, tsConfigBuildEsmPath); - await fs.copy(tsConfigTemplateCjsPath, tsConfigBuildCjsPath); await fs.copy(npmIgnoreTemplatePath, npmignore); tsConfigRoot.references.push({ @@ -140,8 +131,10 @@ async function main() { pkg.pkg = { name: pkg.pkg.name, description: pkg.pkg.description, - type: "commonjs", - ...omit(pkg.pkg, ["name", "description"]) + version: pkg.pkg.version, + type: "module", + main: "./lib/esm/index.js", + ...omit(pkg.pkg, ["name", "description", "version", "main"]) }; pkg.pkg.scripts = { ...pkg.pkg.scripts, @@ -151,33 +144,10 @@ async function main() { pkg.pkg.devDependencies["@tsed/typescript"] = "workspace:*"; pkg.pkg.devDependencies["typescript"] = pkgRoot.devDependencies["typescript"]; - // migrate task - // if (pkg.pkg.scripts["build:browser"] === "webpack") { - // delete pkg.pkg.devDependencies["webpack"]; - // - // pkg.pkg.scripts["build:browser"] = "vite build"; - // - // await fs.writeFile( - // viteConfigPath, - // viteConfig.replace("__PACKAGE__", pkg.pkg.name).replace("__NAME__", pkg.pkg.name.split("/")[1]), - // { - // encoding: "utf-8" - // } - // ); - // } - // - // if (pkg.pkg.scripts["build:browser"]) { - // pkg.pkg.devDependencies["vite"] = pkgRoot.devDependencies["vite"]; - // } - - // prepare exports - - // pkg.pkg.main = pkg.pkg.main.replace("cjs/", "esm/"); - if (pkg.pkg.exports && !pkg.pkg.exports["."]) { pkg.pkg.exports = { ".": { - ...pkg.pkg.exports + ...omit(pkg.pkg.exports, ["require"]) } }; } diff --git a/tools/typescript/package.json b/tools/typescript/package.json index a39a0d912..20241ab36 100644 --- a/tools/typescript/package.json +++ b/tools/typescript/package.json @@ -2,6 +2,7 @@ "name": "@tsed/typescript", "version": "5.2.10", "description": "Util to compile source", + "type": "module", "private": true, "main": "index.js", "exports": { diff --git a/tools/typescript/swc.node.json b/tools/typescript/swc.node.json index 1321bf010..49b7d23d2 100644 --- a/tools/typescript/swc.node.json +++ b/tools/typescript/swc.node.json @@ -23,7 +23,7 @@ } }, "module": { - "type": "commonjs", + "type": "es6", "strict": false, "strictMode": true, "lazy": false, diff --git a/tools/typescript/tsconfig.node.json b/tools/typescript/tsconfig.node.json index 672ed6224..17a1ccf23 100644 --- a/tools/typescript/tsconfig.node.json +++ b/tools/typescript/tsconfig.node.json @@ -1,10 +1,10 @@ { "compilerOptions": { - "module": "commonjs", - "target": "esnext", + "module": "NodeNext", + "target": "ESNext", "experimentalDecorators": true, "emitDecoratorMetadata": true, - "moduleResolution": "node", + "moduleResolution": "NodeNext", "downlevelIteration": false, "isolatedModules": false, "suppressImplicitAnyIndexErrors": false, diff --git a/tools/typescript/tsconfig.template.cjs.json b/tools/typescript/tsconfig.template.cjs.json deleted file mode 100644 index 7f23b116d..000000000 --- a/tools/typescript/tsconfig.template.cjs.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "extends": "@tsed/typescript/tsconfig.node.json", - "compilerOptions": { - "baseUrl": ".", - "module": "commonjs", - "moduleResolution": "Node16", - "rootDir": "src", - "outDir": "./lib/cjs", - "declaration": true, - "declarationDir": "./lib/types", - "composite": true, - "noEmit": false - }, - "include": ["src", "src/**/*.json"], - "exclude": [ - "node_modules", - "test", - "lib", - "benchmark", - "coverage", - "spec", - "**/*.benchmark.ts", - "**/*.spec.ts", - "keys", - "**/__mock__/**", - "webpack.config.js" - ] -} diff --git a/tools/typescript/tsconfig.template.esm.json b/tools/typescript/tsconfig.template.esm.json index ce32a9e07..45d441a7d 100644 --- a/tools/typescript/tsconfig.template.esm.json +++ b/tools/typescript/tsconfig.template.esm.json @@ -2,11 +2,9 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "ESNext", - "moduleResolution": "nodenext", "rootDir": "src", "outDir": "./lib/esm", - "declarationDir": "./lib/types-esm", + "declarationDir": "./lib/types", "declaration": true, "composite": true, "noEmit": false diff --git a/tools/typescript/tsconfig.template.spec.json b/tools/typescript/tsconfig.template.spec.json index 50ffc4b33..79d6f7bf2 100644 --- a/tools/typescript/tsconfig.template.spec.json +++ b/tools/typescript/tsconfig.template.spec.json @@ -3,8 +3,6 @@ "compilerOptions": { "baseUrl": ".", "rootDir": ".", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true diff --git a/tsconfig.json b/tsconfig.json index 61781135e..8c9699a12 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,15 +1,15 @@ { "files": [], "compilerOptions": { - "module": "ES2020", - "target": "ES2020", + "module": "NodeNext", + "target": "ESNext", "noEmit": true, "experimentalDecorators": true, "emitDecoratorMetadata": true, "resolveJsonModule": true, "esModuleInterop": true, "allowJs": true, - "moduleResolution": "node" + "moduleResolution": "NodeNext" }, "references": [ { @@ -39,15 +39,15 @@ { "path": "./packages/cli-plugin-oidc-provider/tsconfig.json" }, - { - "path": "./packages/cli-plugin-passport/tsconfig.json" - }, { "path": "./packages/cli-plugin-prisma/tsconfig.json" }, { "path": "./packages/cli-plugin-typegraphql/tsconfig.json" }, + { + "path": "./packages/cli-plugin-passport/tsconfig.json" + }, { "path": "./packages/cli-plugin-typeorm/tsconfig.json" }, diff --git a/tsdoc.config.js b/tsdoc.config.cjs similarity index 100% rename from tsdoc.config.js rename to tsdoc.config.cjs diff --git a/yarn.lock b/yarn.lock index bfb951379..f0117a9e3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -120,194 +120,194 @@ __metadata: languageName: node linkType: hard -"@commitlint/cli@npm:^17.0.3": - version: 17.1.2 - resolution: "@commitlint/cli@npm:17.1.2" - dependencies: - "@commitlint/format": "npm:^17.0.0" - "@commitlint/lint": "npm:^17.1.0" - "@commitlint/load": "npm:^17.1.2" - "@commitlint/read": "npm:^17.1.0" - "@commitlint/types": "npm:^17.0.0" - execa: "npm:^5.0.0" - lodash: "npm:^4.17.19" - resolve-from: "npm:5.0.0" - resolve-global: "npm:1.0.0" +"@commitlint/cli@npm:19.5.0": + version: 19.5.0 + resolution: "@commitlint/cli@npm:19.5.0" + dependencies: + "@commitlint/format": "npm:^19.5.0" + "@commitlint/lint": "npm:^19.5.0" + "@commitlint/load": "npm:^19.5.0" + "@commitlint/read": "npm:^19.5.0" + "@commitlint/types": "npm:^19.5.0" + tinyexec: "npm:^0.3.0" yargs: "npm:^17.0.0" bin: commitlint: cli.js - checksum: 10/84b1723c62d0b491814d04d8274252774379d54f1be22711187f8ec6da83b16cdbfc67bad78b81a2d0f218c686d50b95a10fcffffbb71cda495493a53645a19b + checksum: 10/1d3384cc9823462da3a35308a145dc4fcf92025f7af976e1ceb9cbe9cbd7b7b83703fe0e9ca12fc7f4903ea2fe68c8c1492c18409ba301894c01cb2264a00795 languageName: node linkType: hard -"@commitlint/config-conventional@npm:^17.0.3": - version: 17.0.3 - resolution: "@commitlint/config-conventional@npm:17.0.3" +"@commitlint/config-conventional@npm:19.5.0": + version: 19.5.0 + resolution: "@commitlint/config-conventional@npm:19.5.0" dependencies: - conventional-changelog-conventionalcommits: "npm:^5.0.0" - checksum: 10/634ba31ee960b71b05163543f7af565f017c6c89d06efdf816aef2dd71df6eef67d635249b22d191e27ea3acc48c302f999aa37b4938beffdb46b56e10ea0db5 + "@commitlint/types": "npm:^19.5.0" + conventional-changelog-conventionalcommits: "npm:^7.0.2" + checksum: 10/5844fb51347677dd28f970a50528fbc44b9b415a8a5fd6fea6c7f6a2a11357956748eda9d1d6ae499430659b0aa78bfa7dcf8abf599951e7f34a581e60bf57da languageName: node linkType: hard -"@commitlint/config-validator@npm:^17.1.0": - version: 17.1.0 - resolution: "@commitlint/config-validator@npm:17.1.0" +"@commitlint/config-validator@npm:^19.5.0": + version: 19.5.0 + resolution: "@commitlint/config-validator@npm:19.5.0" dependencies: - "@commitlint/types": "npm:^17.0.0" + "@commitlint/types": "npm:^19.5.0" ajv: "npm:^8.11.0" - checksum: 10/18b4779837979bf9e240de689c49b9d0dc1e053e677ec13826204594edc052510f37a30bcd8826a054cbcb42a7285fc23e160082b281e0089f18039958ec6a53 + checksum: 10/681bfdcabcb0ff794ea65d95128083869c97039c3a352219d6d88a2d4f3d0412b8ec515db77433fc6b0fce072051beb103d16889d42e76ea97873191ec191b23 languageName: node linkType: hard -"@commitlint/ensure@npm:^17.0.0": - version: 17.0.0 - resolution: "@commitlint/ensure@npm:17.0.0" +"@commitlint/ensure@npm:^19.5.0": + version: 19.5.0 + resolution: "@commitlint/ensure@npm:19.5.0" dependencies: - "@commitlint/types": "npm:^17.0.0" - lodash: "npm:^4.17.19" - checksum: 10/0f26e565d05e6ed5de2dc395ba582a8361f7c7d255871159a5132a6031ed94e8621e8903dbb091923bb788ece73dfa6a437729f0aa2357ecc73fb66446daa420 + "@commitlint/types": "npm:^19.5.0" + lodash.camelcase: "npm:^4.3.0" + lodash.kebabcase: "npm:^4.1.1" + lodash.snakecase: "npm:^4.1.1" + lodash.startcase: "npm:^4.4.0" + lodash.upperfirst: "npm:^4.3.1" + checksum: 10/a9d575637121221cb63232ee96024a63614052ccc205ec8fdab53feed70104b85608e31b4632f280d2876f10a2243474191d96e448b222abfc8d8ab48f9f8e7e languageName: node linkType: hard -"@commitlint/execute-rule@npm:^17.0.0": - version: 17.0.0 - resolution: "@commitlint/execute-rule@npm:17.0.0" - checksum: 10/084800d8935477e5407ab090c9504cbc93e727fb2697dd8072610fd83efd78b612060a07ca93c1b6e4779d98ae23bf51b4597387a0b4d002fa30b59bf0b51333 +"@commitlint/execute-rule@npm:^19.5.0": + version: 19.5.0 + resolution: "@commitlint/execute-rule@npm:19.5.0" + checksum: 10/ff05568c3a287ef8564171d5bc5d4510b2e00b552e4703f79db3d62f3cba9d669710717695d199e04c2117d41f9e72d7e43a342d5c1b62d456bc8e8bb7dda1e9 languageName: node linkType: hard -"@commitlint/format@npm:^17.0.0": - version: 17.0.0 - resolution: "@commitlint/format@npm:17.0.0" +"@commitlint/format@npm:^19.5.0": + version: 19.5.0 + resolution: "@commitlint/format@npm:19.5.0" dependencies: - "@commitlint/types": "npm:^17.0.0" - chalk: "npm:^4.1.0" - checksum: 10/b154e0a050ae40e74cd28f532f4dc76ba8958e69e4a88417a30ed8c6762f439eedaf6906b8a6ccfb80f5d450a416d7c2340c8834dbea52d31d62fdc7b5a72239 + "@commitlint/types": "npm:^19.5.0" + chalk: "npm:^5.3.0" + checksum: 10/685b64ebee936d71bbbf66276b11d50b0227f2ad0df3c00317d5b7e25bce8b1b8dbc65cc7c5c7fafc76cad11a83ad4378a666bf8f12a3eb1c7d6a2a6c6cb25aa languageName: node linkType: hard -"@commitlint/is-ignored@npm:^17.1.0": - version: 17.1.0 - resolution: "@commitlint/is-ignored@npm:17.1.0" +"@commitlint/is-ignored@npm:^19.5.0": + version: 19.5.0 + resolution: "@commitlint/is-ignored@npm:19.5.0" dependencies: - "@commitlint/types": "npm:^17.0.0" - semver: "npm:7.3.7" - checksum: 10/d371e7dbf137dee40d06b54f7edd1ac079d6ff696d756fb8b6a9c1a69b12a92295ecd2cf6d7079db229783c510b57a5f88080f486d3810177aef85b098f2464d + "@commitlint/types": "npm:^19.5.0" + semver: "npm:^7.6.0" + checksum: 10/1c7ee34686fd098587f9717763473477d49e847f470a317903f922d13091271d013a046f61b43b31b34eba4e4b0f76369b7427588269bbdc4c5f622d3ace2c95 languageName: node linkType: hard -"@commitlint/lint@npm:^17.1.0": - version: 17.1.0 - resolution: "@commitlint/lint@npm:17.1.0" +"@commitlint/lint@npm:^19.5.0": + version: 19.5.0 + resolution: "@commitlint/lint@npm:19.5.0" dependencies: - "@commitlint/is-ignored": "npm:^17.1.0" - "@commitlint/parse": "npm:^17.0.0" - "@commitlint/rules": "npm:^17.0.0" - "@commitlint/types": "npm:^17.0.0" - checksum: 10/8a9d501b99e7dbea700043450fcf0471b48b2ea69abd8c4512d106d9ad268fd013e9dc236280544f0b777cbb9e13de1aea0a0e3d4ef7284fd4ca9101b0bb8c7b + "@commitlint/is-ignored": "npm:^19.5.0" + "@commitlint/parse": "npm:^19.5.0" + "@commitlint/rules": "npm:^19.5.0" + "@commitlint/types": "npm:^19.5.0" + checksum: 10/bba8cd17a90876b6b2cd2f869ee4d08cd3e5ad8a10f2c273d379d3b6602da30c46c2d9d0925710d7b9ebf180b3d1f02409adfc0f1a888cc566d88c9ee5862bdd languageName: node linkType: hard -"@commitlint/load@npm:^17.1.2": - version: 17.1.2 - resolution: "@commitlint/load@npm:17.1.2" +"@commitlint/load@npm:^19.5.0": + version: 19.5.0 + resolution: "@commitlint/load@npm:19.5.0" dependencies: - "@commitlint/config-validator": "npm:^17.1.0" - "@commitlint/execute-rule": "npm:^17.0.0" - "@commitlint/resolve-extends": "npm:^17.1.0" - "@commitlint/types": "npm:^17.0.0" - "@types/node": "npm:^14.0.0" - chalk: "npm:^4.1.0" - cosmiconfig: "npm:^7.0.0" - cosmiconfig-typescript-loader: "npm:^4.0.0" - lodash: "npm:^4.17.19" - resolve-from: "npm:^5.0.0" - ts-node: "npm:^10.8.1" - typescript: "npm:^4.6.4" - checksum: 10/c01e2d8a5b9b20706d91d7930f960b901450aa1e306d597eb0fca56f60d692bd1f63495914614bd59b0a6bcc51e11036a2291c79beb96ab7e8463034c5c5ecbb + "@commitlint/config-validator": "npm:^19.5.0" + "@commitlint/execute-rule": "npm:^19.5.0" + "@commitlint/resolve-extends": "npm:^19.5.0" + "@commitlint/types": "npm:^19.5.0" + chalk: "npm:^5.3.0" + cosmiconfig: "npm:^9.0.0" + cosmiconfig-typescript-loader: "npm:^5.0.0" + lodash.isplainobject: "npm:^4.0.6" + lodash.merge: "npm:^4.6.2" + lodash.uniq: "npm:^4.5.0" + checksum: 10/87a9450c768632c09e9d98993752a5622aee698642eee5a9b31c3c48625455e043406b7ea6e02a8f41d86c524c9ecbdb9b823caf67da3048f0d96531177fda28 languageName: node linkType: hard -"@commitlint/message@npm:^17.0.0": - version: 17.0.0 - resolution: "@commitlint/message@npm:17.0.0" - checksum: 10/c4e028079e79ebf3524b83508336e957008ab89beeebd9faba2a4d4d9b54f81e520b68133c2074b34ae3f0ca08adc4eb340854961f9defa0a18b85799e999d8c +"@commitlint/message@npm:^19.5.0": + version: 19.5.0 + resolution: "@commitlint/message@npm:19.5.0" + checksum: 10/ad6993476ce3e6ed6ed7ae5327ac8d5116ca70168d9de6dff656a7e6f2b9f01a1c3ac7a13418831b5cdc3148ea9bcd78c32bdb7aa863280108e176ff803f7a51 languageName: node linkType: hard -"@commitlint/parse@npm:^17.0.0": - version: 17.0.0 - resolution: "@commitlint/parse@npm:17.0.0" +"@commitlint/parse@npm:^19.5.0": + version: 19.5.0 + resolution: "@commitlint/parse@npm:19.5.0" dependencies: - "@commitlint/types": "npm:^17.0.0" - conventional-changelog-angular: "npm:^5.0.11" - conventional-commits-parser: "npm:^3.2.2" - checksum: 10/032c2e2e1964524e7afa62dfa075621d2df1e1afe08c275f07c09d730447abffd1db82d5836827d0c0b5efecb055724baca43850c2d15e4fb417da5d0798b666 + "@commitlint/types": "npm:^19.5.0" + conventional-changelog-angular: "npm:^7.0.0" + conventional-commits-parser: "npm:^5.0.0" + checksum: 10/2a6f8bbbd79aa36a7e1128c60cecb322557110aa4aa8757c741c2f79071c540ba56957cef81fb64f4a304535e462d0c48b5c1ef1b2766fea7971d38ec5ad6384 languageName: node linkType: hard -"@commitlint/read@npm:^17.1.0": - version: 17.1.0 - resolution: "@commitlint/read@npm:17.1.0" +"@commitlint/read@npm:^19.5.0": + version: 19.5.0 + resolution: "@commitlint/read@npm:19.5.0" dependencies: - "@commitlint/top-level": "npm:^17.0.0" - "@commitlint/types": "npm:^17.0.0" - fs-extra: "npm:^10.0.0" - git-raw-commits: "npm:^2.0.0" - minimist: "npm:^1.2.6" - checksum: 10/b9f728860a17db3e6c2e7872eca788b83192e1b83fbed3c4acdc0a83674573576df40041ca136eec9e19c1d0964efe31cfa98ec3f0907ccdefa80f6b5e7eeca4 + "@commitlint/top-level": "npm:^19.5.0" + "@commitlint/types": "npm:^19.5.0" + git-raw-commits: "npm:^4.0.0" + minimist: "npm:^1.2.8" + tinyexec: "npm:^0.3.0" + checksum: 10/0ea2da48ae1bab9add9e831a1659306567755c20ec74cf04e6e50ef1e520970decd259af652995f55eef422a3f1382f0e64e5fbc23606176f766f71076ad872b languageName: node linkType: hard -"@commitlint/resolve-extends@npm:^17.1.0": - version: 17.1.0 - resolution: "@commitlint/resolve-extends@npm:17.1.0" +"@commitlint/resolve-extends@npm:^19.5.0": + version: 19.5.0 + resolution: "@commitlint/resolve-extends@npm:19.5.0" dependencies: - "@commitlint/config-validator": "npm:^17.1.0" - "@commitlint/types": "npm:^17.0.0" - import-fresh: "npm:^3.0.0" - lodash: "npm:^4.17.19" + "@commitlint/config-validator": "npm:^19.5.0" + "@commitlint/types": "npm:^19.5.0" + global-directory: "npm:^4.0.1" + import-meta-resolve: "npm:^4.0.0" + lodash.mergewith: "npm:^4.6.2" resolve-from: "npm:^5.0.0" - resolve-global: "npm:^1.0.0" - checksum: 10/cc50ed7ca987dc9e308d49b8620d014a84b26f2354b247dddd74e40406c3554946c4565d978e63538527fa46c6be2ca73c05b29e5c6d6f4c4c6f97bd1d0d29fb + checksum: 10/71a1c9423570dedb55809f4ad7c35962607cb06921364116e8f2d8c3d37a7ff2a43747ad5a9cd924b58614e6880a42a3fa1510244748bb6997469b52b0fecd78 languageName: node linkType: hard -"@commitlint/rules@npm:^17.0.0": - version: 17.0.0 - resolution: "@commitlint/rules@npm:17.0.0" +"@commitlint/rules@npm:^19.5.0": + version: 19.5.0 + resolution: "@commitlint/rules@npm:19.5.0" dependencies: - "@commitlint/ensure": "npm:^17.0.0" - "@commitlint/message": "npm:^17.0.0" - "@commitlint/to-lines": "npm:^17.0.0" - "@commitlint/types": "npm:^17.0.0" - execa: "npm:^5.0.0" - checksum: 10/921e0ab70b0b31a7a5feaabd72848b1c2c42f15b4389bab4dc250c77b2f2bddf10e3e2ee6fad9f6e2290a12141ef3ae91ec673da26bccdddd4315d3ba65d44c7 + "@commitlint/ensure": "npm:^19.5.0" + "@commitlint/message": "npm:^19.5.0" + "@commitlint/to-lines": "npm:^19.5.0" + "@commitlint/types": "npm:^19.5.0" + checksum: 10/2c879d2cd50a3b4572cea41f044cc3091f0a11ef5ead0bb54bfa564ea637e0d93e08ae322ec4c99bb5b379b82835ace595d1c8dab6e35c1b68b63292160a61b3 languageName: node linkType: hard -"@commitlint/to-lines@npm:^17.0.0": - version: 17.0.0 - resolution: "@commitlint/to-lines@npm:17.0.0" - checksum: 10/5a95f1757dfe643c6dc6c5414db43764651b7b5fd618ebe668aaa8a22a986b6f8d8887e1f8a50c2b48d2c98c49c34d93b22d9adbfe6500b2ffac101495576989 +"@commitlint/to-lines@npm:^19.5.0": + version: 19.5.0 + resolution: "@commitlint/to-lines@npm:19.5.0" + checksum: 10/68aaca7bf1331b5f2f604e814d57f483ead81a8296f8cff5667249510a5601825dfbbaccade3d02e0aca580b973c01419276d693cc9aa888cbe11022daa9dce6 languageName: node linkType: hard -"@commitlint/top-level@npm:^17.0.0": - version: 17.0.0 - resolution: "@commitlint/top-level@npm:17.0.0" +"@commitlint/top-level@npm:^19.5.0": + version: 19.5.0 + resolution: "@commitlint/top-level@npm:19.5.0" dependencies: - find-up: "npm:^5.0.0" - checksum: 10/39c86222f2faf386dc6a6d4426d6719405570904cc7a41ab62b30bf1ca16ec216a63bfddb07a01f513af159d662eea09d82a8af3f48ab985dbafe4e3b6a67e52 + find-up: "npm:^7.0.0" + checksum: 10/f6b5a3746c458e12c7a9e93f7c856ba90fba6e61db614ea1201e6b6e92cb8161dd13e88d8c9b408709ea0c19bc949cffcd1dd356cb6f51fc2ede8df48c1fd410 languageName: node linkType: hard -"@commitlint/types@npm:^17.0.0": - version: 17.0.0 - resolution: "@commitlint/types@npm:17.0.0" +"@commitlint/types@npm:^19.5.0": + version: 19.5.0 + resolution: "@commitlint/types@npm:19.5.0" dependencies: - chalk: "npm:^4.1.0" - checksum: 10/0e5811ef0742608f4f17b7daff4115a7f60af517519a572c9e4855984f70427b4f1a1211961ba1ca52306a70b42c30e51dfffcd00b7f6b5dd243f84f2ad47c60 + "@types/conventional-commits-parser": "npm:^5.0.0" + chalk: "npm:^5.3.0" + checksum: 10/a26f33ec6987d7d93bdbd7e1b177cfac30ca056ea383faf343c6a09c0441aa057a24be1459c3d4e7e91edd2ecf8d6c4dd670948c9d22646d64767137c6db098a languageName: node linkType: hard @@ -1366,10 +1366,10 @@ __metadata: languageName: node linkType: hard -"@octokit/auth-token@npm:^4.0.0": - version: 4.0.0 - resolution: "@octokit/auth-token@npm:4.0.0" - checksum: 10/60e42701e341d700f73c518c7a35675d36d79fa9d5e838cc3ade96d147e49f5ba74db2e07b2337c2b95aaa540aa42088116df2122daa25633f9e70a2c8785c44 +"@octokit/auth-token@npm:^5.0.0": + version: 5.1.1 + resolution: "@octokit/auth-token@npm:5.1.1" + checksum: 10/956ee8166ad1b623478ac5168529a081658bceb16e267102b149b44366a9280b5104a0346a4f1c5de12981d2dedb767f7b71d7e1b1ddd1ccb591efa8c6c06f94 languageName: node linkType: hard @@ -1388,18 +1388,28 @@ __metadata: languageName: node linkType: hard -"@octokit/core@npm:^5.0.0": - version: 5.1.0 - resolution: "@octokit/core@npm:5.1.0" +"@octokit/core@npm:^6.0.0": + version: 6.1.2 + resolution: "@octokit/core@npm:6.1.2" dependencies: - "@octokit/auth-token": "npm:^4.0.0" - "@octokit/graphql": "npm:^7.0.0" - "@octokit/request": "npm:^8.0.2" - "@octokit/request-error": "npm:^5.0.0" - "@octokit/types": "npm:^12.0.0" - before-after-hook: "npm:^2.2.0" - universal-user-agent: "npm:^6.0.0" - checksum: 10/8062e86a3088f24a691b36d2c3e9f33e864cefcb5f544b0633650358bce280708b111551cbe855ecf6a5190d6fc4fec1220117c329a2c27525940dd97b868614 + "@octokit/auth-token": "npm:^5.0.0" + "@octokit/graphql": "npm:^8.0.0" + "@octokit/request": "npm:^9.0.0" + "@octokit/request-error": "npm:^6.0.1" + "@octokit/types": "npm:^13.0.0" + before-after-hook: "npm:^3.0.2" + universal-user-agent: "npm:^7.0.0" + checksum: 10/ef8cc502790142d892b97b92a6e398323f1e4be777e5675681d5985d4681855f4e6f02a7b16466984af702ecdffed0ab923610d59c07c540c3e243160818eaec + languageName: node + linkType: hard + +"@octokit/endpoint@npm:^10.0.0": + version: 10.1.1 + resolution: "@octokit/endpoint@npm:10.1.1" + dependencies: + "@octokit/types": "npm:^13.0.0" + universal-user-agent: "npm:^7.0.2" + checksum: 10/6b8991b278ba7e63ddf95e7396f54e5f1347237f11fb845322ec25101764336ed0994ccb197c449b4fd4bc00ec5b78780ccbc3a0b48ba0620dcc115027a3add1 languageName: node linkType: hard @@ -1414,16 +1424,6 @@ __metadata: languageName: node linkType: hard -"@octokit/endpoint@npm:^9.0.0": - version: 9.0.4 - resolution: "@octokit/endpoint@npm:9.0.4" - dependencies: - "@octokit/types": "npm:^12.0.0" - universal-user-agent: "npm:^6.0.0" - checksum: 10/7df35c96f2b5628fe5b3f44a72614be9b439779c06b4dd1bb72283b3cb2ea53e59e1f9a108798efe5404b6856f4380a4c5be12d93255d854f0683cd6e22f3a27 - languageName: node - linkType: hard - "@octokit/graphql@npm:^5.0.0": version: 5.0.1 resolution: "@octokit/graphql@npm:5.0.1" @@ -1435,14 +1435,14 @@ __metadata: languageName: node linkType: hard -"@octokit/graphql@npm:^7.0.0": - version: 7.0.2 - resolution: "@octokit/graphql@npm:7.0.2" +"@octokit/graphql@npm:^8.0.0": + version: 8.1.1 + resolution: "@octokit/graphql@npm:8.1.1" dependencies: - "@octokit/request": "npm:^8.0.1" - "@octokit/types": "npm:^12.0.0" - universal-user-agent: "npm:^6.0.0" - checksum: 10/f5dcc51fed5304f65dab83fcea4c2a569107d3b71e8d084199dc44f0d0cfc852c9e1f341b06ae66601f9da4af3aad416b0c62dcd0567ac7568f072d8d90d502e + "@octokit/request": "npm:^9.0.0" + "@octokit/types": "npm:^13.0.0" + universal-user-agent: "npm:^7.0.0" + checksum: 10/d8b3941e6afa724fba0cff79c71c839971aed6f87777833e1f6facc816c5fcd9a5b637dad779462cd723aa7490151f69fc6634758ca5bfe76f2cce298df934a1 languageName: node linkType: hard @@ -1460,10 +1460,10 @@ __metadata: languageName: node linkType: hard -"@octokit/openapi-types@npm:^20.0.0": - version: 20.0.0 - resolution: "@octokit/openapi-types@npm:20.0.0" - checksum: 10/9f60572af1201dd92626c412253d83d986b8ab1956250b95f417013ee8e7baf25870eeb801d16672cabc2c420544bc9c2f0a979e07603ff5997eff038c71a8c3 +"@octokit/openapi-types@npm:^22.2.0": + version: 22.2.0 + resolution: "@octokit/openapi-types@npm:22.2.0" + checksum: 10/0471b0c789fada5aa2390e6f82ba477738228ef7d2d986dda9aab0cb625d1562bd178ba0ba4d2655ce841079cd5efff9e58ece2077c27e569ea22109ea301830 languageName: node linkType: hard @@ -1474,6 +1474,17 @@ __metadata: languageName: node linkType: hard +"@octokit/plugin-paginate-rest@npm:^11.0.0": + version: 11.3.3 + resolution: "@octokit/plugin-paginate-rest@npm:11.3.3" + dependencies: + "@octokit/types": "npm:^13.5.0" + peerDependencies: + "@octokit/core": ">=6" + checksum: 10/87eeb4dd68a8207e669989cdbf9de3717b74038d630c2b803cbc7a9c44c3ff74771ce1cf45fa056b7172aaaa80fd9a0e4bf5eca06aabc19f30e7e29898f1f69e + languageName: node + linkType: hard + "@octokit/plugin-paginate-rest@npm:^6.1.2": version: 6.1.2 resolution: "@octokit/plugin-paginate-rest@npm:6.1.2" @@ -1486,17 +1497,6 @@ __metadata: languageName: node linkType: hard -"@octokit/plugin-paginate-rest@npm:^9.0.0": - version: 9.2.1 - resolution: "@octokit/plugin-paginate-rest@npm:9.2.1" - dependencies: - "@octokit/types": "npm:^12.6.0" - peerDependencies: - "@octokit/core": 5 - checksum: 10/1528ab17eedb6705e30ad8576493f06b40f29a87c920a4affeb9715fe5f386e064b79eadd401c0cd1e7ec22287a461da4f5353a4ee57bc614fd890b0aa139d77 - languageName: node - linkType: hard - "@octokit/plugin-request-log@npm:^1.0.4": version: 1.0.4 resolution: "@octokit/plugin-request-log@npm:1.0.4" @@ -1517,28 +1517,28 @@ __metadata: languageName: node linkType: hard -"@octokit/plugin-retry@npm:^6.0.0": - version: 6.0.1 - resolution: "@octokit/plugin-retry@npm:6.0.1" +"@octokit/plugin-retry@npm:^7.0.0": + version: 7.1.1 + resolution: "@octokit/plugin-retry@npm:7.1.1" dependencies: - "@octokit/request-error": "npm:^5.0.0" - "@octokit/types": "npm:^12.0.0" + "@octokit/request-error": "npm:^6.0.0" + "@octokit/types": "npm:^13.0.0" bottleneck: "npm:^2.15.3" peerDependencies: - "@octokit/core": ">=5" - checksum: 10/2f5cd8b2215caad967df39ae6d915898eaaa95413ceebe70c4ed237e8f6dce3f238ef215040056c51a8335a78cbcc9ca1c43d471c37316833c38bfab510165d3 + "@octokit/core": ">=6" + checksum: 10/ff7d2f0b45e61ff688c213ad28670fceffa8d56603850beabab21cbb79021d91d8bf40cdc2062949eeb6b031c6e5ad39bcbbc40b0caa7924c81d3c90b8fb0843 languageName: node linkType: hard -"@octokit/plugin-throttling@npm:^8.0.0": - version: 8.2.0 - resolution: "@octokit/plugin-throttling@npm:8.2.0" +"@octokit/plugin-throttling@npm:^9.0.0": + version: 9.3.1 + resolution: "@octokit/plugin-throttling@npm:9.3.1" dependencies: - "@octokit/types": "npm:^12.2.0" + "@octokit/types": "npm:^13.0.0" bottleneck: "npm:^2.15.3" peerDependencies: - "@octokit/core": ^5.0.0 - checksum: 10/7e95461c168c166f7101e27117499d5a84fd8185465965ca006ef43646015b1dce4accff234418666e3f55eadb01f6bc022d89eec2b71d95355b0f88224f4cd7 + "@octokit/core": ^6.0.0 + checksum: 10/5471a23547e3d326828bed89cd0f9c55625e68603a93daa5b7a1faea41013c47967cd53f44c3bf0433bcd78d1e99ea3595f2166a243db46d8ff6ce262380f34f languageName: node linkType: hard @@ -1553,14 +1553,12 @@ __metadata: languageName: node linkType: hard -"@octokit/request-error@npm:^5.0.0": - version: 5.0.1 - resolution: "@octokit/request-error@npm:5.0.1" +"@octokit/request-error@npm:^6.0.0, @octokit/request-error@npm:^6.0.1": + version: 6.1.4 + resolution: "@octokit/request-error@npm:6.1.4" dependencies: - "@octokit/types": "npm:^12.0.0" - deprecation: "npm:^2.0.0" - once: "npm:^1.4.0" - checksum: 10/a21a4614c46cb173e4ba73fa048576204f1ddc541dee3e7c938ef36088566e3b25e04ca1f96f375ec2e3cc29b7ba970b3b078a89a20bc50cdcdbed879db94573 + "@octokit/types": "npm:^13.0.0" + checksum: 10/e4e475ec50cef8e271f39e69667d0f8eaccb2367aa56b81638c629b5bbfa2b697b40207301e5c797a63051a82d8698e7c792b4050b84e383c54300a49a01304a languageName: node linkType: hard @@ -1578,15 +1576,15 @@ __metadata: languageName: node linkType: hard -"@octokit/request@npm:^8.0.1, @octokit/request@npm:^8.0.2": - version: 8.2.0 - resolution: "@octokit/request@npm:8.2.0" +"@octokit/request@npm:^9.0.0": + version: 9.1.3 + resolution: "@octokit/request@npm:9.1.3" dependencies: - "@octokit/endpoint": "npm:^9.0.0" - "@octokit/request-error": "npm:^5.0.0" - "@octokit/types": "npm:^12.0.0" - universal-user-agent: "npm:^6.0.0" - checksum: 10/553ba8b99ea6fe2d3b66b2be6df06f7fe62a0b81e441d334ef25388cf0fcdab4a888fcfe2c1fb1ada262c233bcf7169da3ad5e03f024060ea5723f7753b0de3e + "@octokit/endpoint": "npm:^10.0.0" + "@octokit/request-error": "npm:^6.0.1" + "@octokit/types": "npm:^13.1.0" + universal-user-agent: "npm:^7.0.2" + checksum: 10/b445f263157a2c608d8cfa89162be5f5d39551607d0ec973c3fdf9d3fd3753e33861c4e34942f5dbf47576ac91a99238ed482f2d6c6af3f9070e0b190b3f07a2 languageName: node linkType: hard @@ -1618,12 +1616,12 @@ __metadata: languageName: node linkType: hard -"@octokit/types@npm:^12.0.0, @octokit/types@npm:^12.2.0, @octokit/types@npm:^12.6.0": - version: 12.6.0 - resolution: "@octokit/types@npm:12.6.0" +"@octokit/types@npm:^13.0.0, @octokit/types@npm:^13.1.0, @octokit/types@npm:^13.5.0": + version: 13.5.0 + resolution: "@octokit/types@npm:13.5.0" dependencies: - "@octokit/openapi-types": "npm:^20.0.0" - checksum: 10/19b77a8d25af2a5df4561f8750f807edfc9fca5b07cfa9fb21dce4665e1b188c966688f5ed5e08089404428100dfe44ad353f8d8532f1d30fe47e61c5faa1440 + "@octokit/openapi-types": "npm:^22.2.0" + checksum: 10/d2aeebc1d8684c4e950f054a52b484e898b72d9f5f8433bcf010161716eea20d1132820d922212f19557a8f147354f2674d1a27b22941308b7c298bdd2674ffa languageName: node linkType: hard @@ -1828,20 +1826,28 @@ __metadata: languageName: node linkType: hard -"@semantic-release/commit-analyzer@npm:^11.0.0": - version: 11.1.0 - resolution: "@semantic-release/commit-analyzer@npm:11.1.0" +"@sec-ant/readable-stream@npm:^0.4.1": + version: 0.4.1 + resolution: "@sec-ant/readable-stream@npm:0.4.1" + checksum: 10/aac89581652ac85debe7c5303451c2ebf8bf25ca25db680e4b9b73168f6940616d9a4bbe3348981827b1159b14e2f2e6af4b7bd5735cac898c12d5c51909c102 + languageName: node + linkType: hard + +"@semantic-release/commit-analyzer@npm:^13.0.0-beta.1": + version: 13.0.0 + resolution: "@semantic-release/commit-analyzer@npm:13.0.0" dependencies: - conventional-changelog-angular: "npm:^7.0.0" - conventional-commits-filter: "npm:^4.0.0" - conventional-commits-parser: "npm:^5.0.0" + conventional-changelog-angular: "npm:^8.0.0" + conventional-changelog-writer: "npm:^8.0.0" + conventional-commits-filter: "npm:^5.0.0" + conventional-commits-parser: "npm:^6.0.0" debug: "npm:^4.0.0" import-from-esm: "npm:^1.0.3" lodash-es: "npm:^4.17.21" micromatch: "npm:^4.0.2" peerDependencies: semantic-release: ">=20.1.0" - checksum: 10/de693f1565c305c15349a6dceb3d17e62d7f07f36718fd4a9639f6599f1cceeb5255fcb37d8f50b47778aaeb9a2d1e303e8923ef5a7df57b31f2937d1a323085 + checksum: 10/d76463143aed73ec75cf66fb2b6b0649ed6f6d0864823f47ba907a25f3617190354b6abe05c44b19a8a5165181e35fc704c788becb958c64e5218a353a1fa189 languageName: node linkType: hard @@ -1859,14 +1865,14 @@ __metadata: languageName: node linkType: hard -"@semantic-release/github@npm:^9.0.0": - version: 9.2.6 - resolution: "@semantic-release/github@npm:9.2.6" +"@semantic-release/github@npm:^10.0.0": + version: 10.3.4 + resolution: "@semantic-release/github@npm:10.3.4" dependencies: - "@octokit/core": "npm:^5.0.0" - "@octokit/plugin-paginate-rest": "npm:^9.0.0" - "@octokit/plugin-retry": "npm:^6.0.0" - "@octokit/plugin-throttling": "npm:^8.0.0" + "@octokit/core": "npm:^6.0.0" + "@octokit/plugin-paginate-rest": "npm:^11.0.0" + "@octokit/plugin-retry": "npm:^7.0.0" + "@octokit/plugin-throttling": "npm:^9.0.0" "@semantic-release/error": "npm:^4.0.0" aggregate-error: "npm:^5.0.0" debug: "npm:^4.3.4" @@ -1874,24 +1880,24 @@ __metadata: globby: "npm:^14.0.0" http-proxy-agent: "npm:^7.0.0" https-proxy-agent: "npm:^7.0.0" - issue-parser: "npm:^6.0.0" + issue-parser: "npm:^7.0.0" lodash-es: "npm:^4.17.21" mime: "npm:^4.0.0" p-filter: "npm:^4.0.0" url-join: "npm:^5.0.0" peerDependencies: semantic-release: ">=20.1.0" - checksum: 10/699131327d5280581ef1f300c905d6565b3d730a08eb43473a58b3802aa53cd2d0be4561a121840f66d93c4eac630c9563877b430b191848412a39a7651f2244 + checksum: 10/56df8a29c67dacfe2dc17fbb1772a0b975353a60bc1257f39f6cd3f011e7a45d1f393777d41358a126259c4df849cda360600b59738a189d08d48512a4540a3f languageName: node linkType: hard -"@semantic-release/npm@npm:^11.0.0": - version: 11.0.3 - resolution: "@semantic-release/npm@npm:11.0.3" +"@semantic-release/npm@npm:^12.0.0": + version: 12.0.1 + resolution: "@semantic-release/npm@npm:12.0.1" dependencies: "@semantic-release/error": "npm:^4.0.0" aggregate-error: "npm:^5.0.0" - execa: "npm:^8.0.0" + execa: "npm:^9.0.0" fs-extra: "npm:^11.0.0" lodash-es: "npm:^4.17.21" nerf-dart: "npm:^1.0.0" @@ -1904,27 +1910,27 @@ __metadata: tempy: "npm:^3.0.0" peerDependencies: semantic-release: ">=20.1.0" - checksum: 10/d34c7a15a3c5ccf309b57c4a617fc9c0b687b5de3cd19c7014e7e92c6db0594e068f274651ecb425c0a85a5e1fc2d56d5ed1deea1774d75c975bb66d32e7cab2 + checksum: 10/2ee16bc408253f5acad901e22e9023926a56684200aa7af00e68cf3e8ce852e36f360db11f6a71e398d24894c54ffb294bbdd665dc065c2527b498747bfcdb38 languageName: node linkType: hard -"@semantic-release/release-notes-generator@npm:^12.0.0": - version: 12.1.0 - resolution: "@semantic-release/release-notes-generator@npm:12.1.0" +"@semantic-release/release-notes-generator@npm:^14.0.0-beta.1": + version: 14.0.1 + resolution: "@semantic-release/release-notes-generator@npm:14.0.1" dependencies: - conventional-changelog-angular: "npm:^7.0.0" - conventional-changelog-writer: "npm:^7.0.0" - conventional-commits-filter: "npm:^4.0.0" - conventional-commits-parser: "npm:^5.0.0" + conventional-changelog-angular: "npm:^8.0.0" + conventional-changelog-writer: "npm:^8.0.0" + conventional-commits-filter: "npm:^5.0.0" + conventional-commits-parser: "npm:^6.0.0" debug: "npm:^4.0.0" get-stream: "npm:^7.0.0" import-from-esm: "npm:^1.0.3" into-stream: "npm:^7.0.0" lodash-es: "npm:^4.17.21" - read-pkg-up: "npm:^11.0.0" + read-package-up: "npm:^11.0.0" peerDependencies: semantic-release: ">=20.1.0" - checksum: 10/ff8c5e3b5889f370f73c0da345f7ffe9f5c85a2804dd2a362040b438fdf20be12f5244d118d67991ff17e1b62f505718a7446a9cc8318e79395b9dbaf9d31bbe + checksum: 10/3312392cdd47deccc3cff812f42fc6b3f3bfffbe3e5af256f9e37b276a88f5878ce77556faf85f90669d82850a42ca3f1f996bf282952becfe2f0b23d947683b languageName: node linkType: hard @@ -2026,6 +2032,13 @@ __metadata: languageName: node linkType: hard +"@sindresorhus/merge-streams@npm:^4.0.0": + version: 4.0.0 + resolution: "@sindresorhus/merge-streams@npm:4.0.0" + checksum: 10/16551c787f5328c8ef05fd9831ade64369ccc992df78deb635ec6c44af217d2f1b43f8728c348cdc4e00585ff2fad6e00d8155199cbf6b154acc45fe65cbf0aa + languageName: node + linkType: hard + "@sinonjs/commons@npm:^1.6.0, @sinonjs/commons@npm:^1.7.0, @sinonjs/commons@npm:^1.8.3": version: 1.8.3 resolution: "@sinonjs/commons@npm:1.8.3" @@ -2247,7 +2260,7 @@ __metadata: languageName: node linkType: hard -"@tsed/cli-core@npm:5.2.10, @tsed/cli-core@workspace:packages/cli-core": +"@tsed/cli-core@workspace:*, @tsed/cli-core@workspace:packages/cli-core": version: 0.0.0-use.local resolution: "@tsed/cli-core@workspace:packages/cli-core" dependencies: @@ -2270,7 +2283,7 @@ __metadata: "@types/update-notifier": "npm:5.1.0" "@types/url-parse": "npm:^1.4.3" "@types/uuid": "npm:8.3.4" - ajv: "npm:8.11.0" + ajv: "npm:8.17.1" axios: "npm:1.6.7" chalk: "npm:4.1.2" change-case: "npm:^4.1.2" @@ -2314,8 +2327,8 @@ __metadata: version: 0.0.0-use.local resolution: "@tsed/cli-generate-http-client@workspace:packages/cli-generate-http-client" dependencies: - "@tsed/cli": "npm:5.2.10" - "@tsed/cli-core": "npm:5.2.10" + "@tsed/cli": "workspace:*" + "@tsed/cli-core": "workspace:*" "@tsed/typescript": "workspace:*" change-case: "npm:4.1.2" cross-env: "npm:7.0.3" @@ -2339,8 +2352,8 @@ __metadata: version: 0.0.0-use.local resolution: "@tsed/cli-generate-swagger@workspace:packages/cli-generate-swagger" dependencies: - "@tsed/cli": "npm:5.2.10" - "@tsed/cli-core": "npm:5.2.10" + "@tsed/cli": "workspace:*" + "@tsed/cli-core": "workspace:*" "@tsed/typescript": "workspace:*" change-case: "npm:4.1.2" cross-env: "npm:7.0.3" @@ -2362,8 +2375,8 @@ __metadata: version: 0.0.0-use.local resolution: "@tsed/cli-plugin-eslint@workspace:packages/cli-plugin-eslint" dependencies: - "@tsed/cli": "npm:5.2.10" - "@tsed/cli-core": "npm:5.2.10" + "@tsed/cli": "workspace:*" + "@tsed/cli-core": "workspace:*" "@tsed/typescript": "workspace:*" cross-env: "npm:7.0.3" tslib: "npm:2.3.1" @@ -2376,8 +2389,8 @@ __metadata: version: 0.0.0-use.local resolution: "@tsed/cli-plugin-jest@workspace:packages/cli-plugin-jest" dependencies: - "@tsed/cli": "npm:5.2.10" - "@tsed/cli-core": "npm:5.2.10" + "@tsed/cli": "workspace:*" + "@tsed/cli-core": "workspace:*" "@tsed/typescript": "workspace:*" cross-env: "npm:7.0.3" tslib: "npm:2.3.1" @@ -2390,8 +2403,8 @@ __metadata: version: 0.0.0-use.local resolution: "@tsed/cli-plugin-mocha@workspace:packages/cli-plugin-mocha" dependencies: - "@tsed/cli": "npm:5.2.10" - "@tsed/cli-core": "npm:5.2.10" + "@tsed/cli": "workspace:*" + "@tsed/cli-core": "workspace:*" "@tsed/typescript": "workspace:*" cross-env: "npm:7.0.3" tslib: "npm:2.3.1" @@ -2404,8 +2417,8 @@ __metadata: version: 0.0.0-use.local resolution: "@tsed/cli-plugin-mongoose@workspace:packages/cli-plugin-mongoose" dependencies: - "@tsed/cli": "npm:5.2.10" - "@tsed/cli-core": "npm:5.2.10" + "@tsed/cli": "workspace:*" + "@tsed/cli-core": "workspace:*" "@tsed/typescript": "workspace:*" change-case: "npm:4.1.2" cross-env: "npm:7.0.3" @@ -2420,16 +2433,16 @@ __metadata: version: 0.0.0-use.local resolution: "@tsed/cli-plugin-oidc-provider@workspace:packages/cli-plugin-oidc-provider" dependencies: - "@tsed/cli": "npm:5.2.10" - "@tsed/cli-core": "npm:5.2.10" + "@tsed/cli": "workspace:*" + "@tsed/cli-core": "workspace:*" "@tsed/typescript": "workspace:*" cross-env: "npm:7.0.3" tslib: "npm:2.3.1" typescript: "npm:4.9.5" vitest: "npm:2.1.1" peerDependencies: - "@tsed/cli": 5.2.10 - "@tsed/cli-core": 5.2.10 + "@tsed/cli": "workspace:*" + "@tsed/cli-core": "workspace:*" languageName: unknown linkType: soft @@ -2437,8 +2450,8 @@ __metadata: version: 0.0.0-use.local resolution: "@tsed/cli-plugin-passport@workspace:packages/cli-plugin-passport" dependencies: - "@tsed/cli": "npm:5.2.10" - "@tsed/cli-core": "npm:5.2.10" + "@tsed/cli": "workspace:*" + "@tsed/cli-core": "workspace:*" "@tsed/typescript": "workspace:*" "@types/change-case": "npm:^2.3.1" change-case: "npm:^4.1.2" @@ -2453,8 +2466,8 @@ __metadata: version: 0.0.0-use.local resolution: "@tsed/cli-plugin-prisma@workspace:packages/cli-plugin-prisma" dependencies: - "@tsed/cli": "npm:5.2.10" - "@tsed/cli-core": "npm:5.2.10" + "@tsed/cli": "workspace:*" + "@tsed/cli-core": "workspace:*" "@tsed/typescript": "workspace:*" change-case: "npm:4.1.2" cross-env: "npm:7.0.3" @@ -2468,16 +2481,16 @@ __metadata: version: 0.0.0-use.local resolution: "@tsed/cli-plugin-typegraphql@workspace:packages/cli-plugin-typegraphql" dependencies: - "@tsed/cli": "npm:5.2.10" - "@tsed/cli-core": "npm:5.2.10" + "@tsed/cli": "workspace:*" + "@tsed/cli-core": "workspace:*" "@tsed/typescript": "workspace:*" cross-env: "npm:7.0.3" tslib: "npm:2.3.1" typescript: "npm:4.9.5" vitest: "npm:2.1.1" peerDependencies: - "@tsed/cli": 5.2.10 - "@tsed/cli-core": 5.2.10 + "@tsed/cli": "workspace:*" + "@tsed/cli-core": "workspace:*" languageName: unknown linkType: soft @@ -2485,8 +2498,8 @@ __metadata: version: 0.0.0-use.local resolution: "@tsed/cli-plugin-typeorm@workspace:packages/cli-plugin-typeorm" dependencies: - "@tsed/cli": "npm:5.2.10" - "@tsed/cli-core": "npm:5.2.10" + "@tsed/cli": "workspace:*" + "@tsed/cli-core": "workspace:*" "@tsed/typescript": "workspace:*" change-case: "npm:4.1.2" cross-env: "npm:7.0.3" @@ -2500,8 +2513,8 @@ __metadata: version: 0.0.0-use.local resolution: "@tsed/cli-plugin-vitest@workspace:packages/cli-plugin-vitest" dependencies: - "@tsed/cli": "npm:5.2.10" - "@tsed/cli-core": "npm:5.2.10" + "@tsed/cli": "workspace:*" + "@tsed/cli-core": "workspace:*" "@tsed/typescript": "workspace:*" cross-env: "npm:7.0.3" tslib: "npm:2.3.1" @@ -2514,8 +2527,8 @@ __metadata: version: 0.0.0-use.local resolution: "@tsed/cli-root@workspace:." dependencies: - "@commitlint/cli": "npm:^17.0.3" - "@commitlint/config-conventional": "npm:^17.0.3" + "@commitlint/cli": "npm:19.5.0" + "@commitlint/config-conventional": "npm:19.5.0" "@samverschueren/stream-to-observable": "npm:0.3.1" "@swc/core": "npm:1.7.26" "@swc/helpers": "npm:0.5.13" @@ -2526,7 +2539,7 @@ __metadata: "@tsed/monorepo-utils": "npm:2.3.5" "@tsed/normalize-path": "npm:>=7.14.2" "@tsed/ts-doc": "npm:^4.1.0" - "@types/node": "npm:18.7.8" + "@types/node": "npm:20.14.8" "@typescript-eslint/eslint-plugin": "npm:8.5.0" "@typescript-eslint/parser": "npm:8.5.0" "@vitest/coverage-v8": "npm:^2.1.1" @@ -2536,7 +2549,6 @@ __metadata: commander: "npm:9.3.0" concurrently: "npm:7.6.0" consolidate: "npm:0.16.0" - coveralls: "npm:3.1.1" cross-env: "npm:7.0.3" entities: "npm:1.1.2" eslint: "npm:9.10.0" @@ -2565,7 +2577,7 @@ __metadata: read-pkg-up: "npm:7.0.1" registry-url: "npm:5.1.0" rxjs: "npm:^7.5.5" - semantic-release: "npm:23.0.2" + semantic-release: "npm:24.1.1" semantic-release-slack-bot: "npm:4.0.2" semver: "npm:7.3.5" sinon: "npm:14.0.0" @@ -2586,7 +2598,7 @@ __metadata: version: 0.0.0-use.local resolution: "@tsed/cli-testing@workspace:packages/cli-testing" dependencies: - "@tsed/cli-core": "npm:5.2.10" + "@tsed/cli-core": "workspace:*" "@tsed/typescript": "workspace:*" cross-env: "npm:7.0.3" tslib: "npm:2.3.1" @@ -2595,11 +2607,11 @@ __metadata: languageName: unknown linkType: soft -"@tsed/cli@npm:5.2.10, @tsed/cli@workspace:packages/cli": +"@tsed/cli@workspace:*, @tsed/cli@workspace:packages/cli": version: 0.0.0-use.local resolution: "@tsed/cli@workspace:packages/cli" dependencies: - "@tsed/cli-core": "npm:5.2.10" + "@tsed/cli-core": "workspace:*" "@tsed/core": "npm:>=7.14.2" "@tsed/di": "npm:>=7.14.2" "@tsed/logger": "npm:>=6.2.1" @@ -2619,7 +2631,7 @@ __metadata: typescript: "npm:4.9.5" vitest: "npm:2.1.1" peerDependencies: - "@tsed/cli-core": 5.2.10 + "@tsed/cli-core": "workspace:*" "@tsed/core": ">=7.14.2" "@tsed/di": ">=7.14.2" "@tsed/logger": ">=6.2.1" @@ -2862,6 +2874,15 @@ __metadata: languageName: node linkType: hard +"@types/conventional-commits-parser@npm:^5.0.0": + version: 5.0.0 + resolution: "@types/conventional-commits-parser@npm:5.0.0" + dependencies: + "@types/node": "npm:*" + checksum: 10/0992617c7274e9ddcbdb30cc5b735fa067343c40e16f539615b3ad9213cacbe9a32483bc8e0302d297c6de9cc7fd3794549635761a66bd9dc220d609822d86e7 + languageName: node + linkType: hard + "@types/estree@npm:1.0.5, @types/estree@npm:^1.0.0": version: 1.0.5 resolution: "@types/estree@npm:1.0.5" @@ -2979,17 +3000,19 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:*, @types/node@npm:18.7.8": +"@types/node@npm:*": version: 18.7.8 resolution: "@types/node@npm:18.7.8" checksum: 10/2d76f9a2d016d38983b4749d637a9a88bfbdeff6694efedd93da9b6c0c4fb713b6f60af2bedb3643785edb9c739ee58cfe7727a9d9d0eb8c803a35a93a54e6c4 languageName: node linkType: hard -"@types/node@npm:^14.0.0": - version: 14.18.26 - resolution: "@types/node@npm:14.18.26" - checksum: 10/84b749402688091865aa90b145a833ba40842bd5750373457fd48e0c35fec5b9079a6eee9472fa7d935ca497b1b695c9cac9c273bc01d2232856c4b641632ede +"@types/node@npm:20.14.8": + version: 20.14.8 + resolution: "@types/node@npm:20.14.8" + dependencies: + undici-types: "npm:~5.26.4" + checksum: 10/73822f66f269ce865df7e2f586787ac7444bd1169fd265cbed1e851b72787f1170517c5b616e0308ec2fbc0934ec6403b0f28d4152acbb0486071aec41167d51 languageName: node linkType: hard @@ -3046,6 +3069,13 @@ __metadata: languageName: node linkType: hard +"@types/semver@npm:^7.5.5": + version: 7.5.8 + resolution: "@types/semver@npm:7.5.8" + checksum: 10/3496808818ddb36deabfe4974fd343a78101fa242c4690044ccdc3b95dcf8785b494f5d628f2f47f38a702f8db9c53c67f47d7818f2be1b79f2efb09692e1178 + languageName: node + linkType: hard + "@types/swagger-schema-official@npm:2.0.21": version: 2.0.21 resolution: "@types/swagger-schema-official@npm:2.0.21" @@ -3529,7 +3559,7 @@ __metadata: languageName: node linkType: hard -"JSONStream@npm:^1.0.4, JSONStream@npm:^1.3.5": +"JSONStream@npm:^1.3.5": version: 1.3.5 resolution: "JSONStream@npm:1.3.5" dependencies: @@ -3645,19 +3675,19 @@ __metadata: languageName: node linkType: hard -"ajv@npm:8.11.0, ajv@npm:^8.11.0": - version: 8.11.0 - resolution: "ajv@npm:8.11.0" +"ajv@npm:8.17.1, ajv@npm:^8.11.0": + version: 8.17.1 + resolution: "ajv@npm:8.17.1" dependencies: - fast-deep-equal: "npm:^3.1.1" + fast-deep-equal: "npm:^3.1.3" + fast-uri: "npm:^3.0.1" json-schema-traverse: "npm:^1.0.0" require-from-string: "npm:^2.0.2" - uri-js: "npm:^4.2.2" - checksum: 10/aa0dfd6cebdedde8e77747e84e7b7c55921930974b8547f54b4156164ff70445819398face32dafda4bd4c61bbc7513d308d4c2bf769f8ea6cb9c8449f9faf54 + checksum: 10/ee3c62162c953e91986c838f004132b6a253d700f1e51253b99791e2dbfdb39161bc950ebdc2f156f8568035bb5ed8be7bd78289cd9ecbf3381fe8f5b82e3f33 languageName: node linkType: hard -"ajv@npm:^6.12.3, ajv@npm:^6.12.4": +"ajv@npm:^6.12.4": version: 6.12.6 resolution: "ajv@npm:6.12.6" dependencies: @@ -4251,22 +4281,6 @@ __metadata: languageName: node linkType: hard -"asn1@npm:~0.2.3": - version: 0.2.6 - resolution: "asn1@npm:0.2.6" - dependencies: - safer-buffer: "npm:~2.1.0" - checksum: 10/cf629291fee6c1a6f530549939433ebf32200d7849f38b810ff26ee74235e845c0c12b2ed0f1607ac17383d19b219b69cefa009b920dab57924c5c544e495078 - languageName: node - linkType: hard - -"assert-plus@npm:1.0.0, assert-plus@npm:^1.0.0": - version: 1.0.0 - resolution: "assert-plus@npm:1.0.0" - checksum: 10/f4f991ae2df849cc678b1afba52d512a7cbf0d09613ba111e72255409ff9158550c775162a47b12d015d1b82b3c273e8e25df0e4783d3ddb008a293486d00a07 - languageName: node - linkType: hard - "assertion-error@npm:^2.0.1": version: 2.0.1 resolution: "assertion-error@npm:2.0.1" @@ -4320,20 +4334,6 @@ __metadata: languageName: node linkType: hard -"aws-sign2@npm:~0.7.0": - version: 0.7.0 - resolution: "aws-sign2@npm:0.7.0" - checksum: 10/2ac497d739f71be3264cf096a33ab256a1fea7fe80b87dc51ec29374505bd5a661279ef1c22989d68528ea61ed634021ca63b31cf1d3c2a3682ffc106f7d0e96 - languageName: node - linkType: hard - -"aws4@npm:^1.8.0": - version: 1.11.0 - resolution: "aws4@npm:1.11.0" - checksum: 10/54886f07b3f9555f7f3ae9fb2aef7abbac302e892263ec4d9901f4502e667bb302a0639672f6bc8453033102ddd2512b79886a7de417dc0c24ecce003a888297 - languageName: node - linkType: hard - "axios@npm:*": version: 0.26.1 resolution: "axios@npm:0.26.1" @@ -4410,15 +4410,6 @@ __metadata: languageName: node linkType: hard -"bcrypt-pbkdf@npm:^1.0.0": - version: 1.0.2 - resolution: "bcrypt-pbkdf@npm:1.0.2" - dependencies: - tweetnacl: "npm:^0.14.3" - checksum: 10/13a4cde058250dbf1fa77a4f1b9a07d32ae2e3b9e28e88a0c7a1827835bc3482f3e478c4a0cfd4da6ff0c46dae07da1061123a995372b32cc563d9975f975404 - languageName: node - linkType: hard - "before-after-hook@npm:^2.2.0": version: 2.2.2 resolution: "before-after-hook@npm:2.2.2" @@ -4426,6 +4417,13 @@ __metadata: languageName: node linkType: hard +"before-after-hook@npm:^3.0.2": + version: 3.0.2 + resolution: "before-after-hook@npm:3.0.2" + checksum: 10/57dfee78930276a740559552460a83f31c605e0164f02f170f71352aa1f4f5fb2c1632ac3bcba06ba711c32bd88b7e3c82431428e0c4984fbd2336faa78cf08c + languageName: node + linkType: hard + "bin-links@npm:^4.0.1": version: 4.0.3 resolution: "bin-links@npm:4.0.3" @@ -4817,13 +4815,6 @@ __metadata: languageName: node linkType: hard -"caseless@npm:~0.12.0": - version: 0.12.0 - resolution: "caseless@npm:0.12.0" - checksum: 10/ea1efdf430975fdbac3505cdd21007f7ac5aa29b6d4d1c091f965853cd1bf87e4b08ea07b31a6d688b038872b7cdf0589d9262d59c699d199585daad052aeb20 - languageName: node - linkType: hard - "ccount@npm:^1.0.0": version: 1.1.0 resolution: "ccount@npm:1.1.0" @@ -5343,7 +5334,7 @@ __metadata: languageName: node linkType: hard -"combined-stream@npm:^1.0.6, combined-stream@npm:^1.0.8, combined-stream@npm:~1.0.6": +"combined-stream@npm:^1.0.8": version: 1.0.8 resolution: "combined-stream@npm:1.0.8" dependencies: @@ -5699,24 +5690,21 @@ __metadata: languageName: node linkType: hard -"conventional-changelog-angular@npm:^5.0.11": - version: 5.0.13 - resolution: "conventional-changelog-angular@npm:5.0.13" +"conventional-changelog-angular@npm:^8.0.0": + version: 8.0.0 + resolution: "conventional-changelog-angular@npm:8.0.0" dependencies: compare-func: "npm:^2.0.0" - q: "npm:^1.5.1" - checksum: 10/e7ee31ac703bc139552a735185f330d1b2e53d7c1ff40a78bf43339e563d95c290a4f57e68b76bb223345524702d80bf18dc955417cd0852d9457595c04ad8ce + checksum: 10/856e4652015d6ff5a192e2051efe4eb0d57534da304a3bfa6eb1e1ed06c995fe6d7c91d46e7a6de95baea52f7ccaad3ffe18260c972d40bad862f85d00c7b437 languageName: node linkType: hard -"conventional-changelog-conventionalcommits@npm:^5.0.0": - version: 5.0.0 - resolution: "conventional-changelog-conventionalcommits@npm:5.0.0" +"conventional-changelog-conventionalcommits@npm:^7.0.2": + version: 7.0.2 + resolution: "conventional-changelog-conventionalcommits@npm:7.0.2" dependencies: compare-func: "npm:^2.0.0" - lodash: "npm:^4.17.15" - q: "npm:^1.5.1" - checksum: 10/cf67329999ed5798fcca243a5d66479f6f8f2122e61a3144186ae3fd15481e9d6647ed7ca74d59d5cfdc568f8c4298ae4cd90b389aecd285cc6a1ba823d85a96 + checksum: 10/3cc6586ac57cc54c0595b28ae22e8b674c970034bad35e467f71aba395278a6ef43351cfbf782a5fc33eb13ed4ad843a145b89ad1444f5fa571e3bf9c1d5519b languageName: node linkType: hard @@ -5763,19 +5751,18 @@ __metadata: languageName: node linkType: hard -"conventional-changelog-writer@npm:^7.0.0": - version: 7.0.1 - resolution: "conventional-changelog-writer@npm:7.0.1" +"conventional-changelog-writer@npm:^8.0.0": + version: 8.0.0 + resolution: "conventional-changelog-writer@npm:8.0.0" dependencies: - conventional-commits-filter: "npm:^4.0.0" + "@types/semver": "npm:^7.5.5" + conventional-commits-filter: "npm:^5.0.0" handlebars: "npm:^4.7.7" - json-stringify-safe: "npm:^5.0.1" - meow: "npm:^12.0.1" + meow: "npm:^13.0.0" semver: "npm:^7.5.2" - split2: "npm:^4.0.0" bin: - conventional-changelog-writer: cli.mjs - checksum: 10/fdb13864104eb0df33bb21397091837177da2e24afe1380b4c48921db01d59b3016254d6d6f2de663a86fc7eac8537fcd1fa924354d478d9f2d5eec026b5f554 + conventional-changelog-writer: dist/cli/index.js + checksum: 10/42daf5e8bf12474a8cffb0b2244ada5939d70a0158b23eeea13250f1710f269cd99f60652eb5a6f86b852a7d93a0368da20ea42163ec3b6041d3b76ce16c497a languageName: node linkType: hard @@ -5789,26 +5776,10 @@ __metadata: languageName: node linkType: hard -"conventional-commits-filter@npm:^4.0.0": - version: 4.0.0 - resolution: "conventional-commits-filter@npm:4.0.0" - checksum: 10/46d2d90531f024d596f61d353876276e5357adb5c4684e042467bb7d159feb0a2831b74656bd3038ac9ec38d99b0b24ac39f319ad511861e1299c4cdfb5a119a - languageName: node - linkType: hard - -"conventional-commits-parser@npm:^3.2.2": - version: 3.2.4 - resolution: "conventional-commits-parser@npm:3.2.4" - dependencies: - JSONStream: "npm:^1.0.4" - is-text-path: "npm:^1.0.1" - lodash: "npm:^4.17.15" - meow: "npm:^8.0.0" - split2: "npm:^3.0.0" - through2: "npm:^4.0.0" - bin: - conventional-commits-parser: cli.js - checksum: 10/2f9d31bade60ae68c1296ae67e47099c547a9452e1670fc5bfa64b572cadc9f305797c88a855f064dd899cc4eb4f15dd5a860064cdd8c52085066538019fe2a5 +"conventional-commits-filter@npm:^5.0.0": + version: 5.0.0 + resolution: "conventional-commits-filter@npm:5.0.0" + checksum: 10/2345546ea9e40412558d508311d7729b38f8d4c0fd554837c10721a432e8598ec1152320f6b601a9c11c023a31bccbb5a12067736b2227de8591f4de707e11a7 languageName: node linkType: hard @@ -5840,6 +5811,17 @@ __metadata: languageName: node linkType: hard +"conventional-commits-parser@npm:^6.0.0": + version: 6.0.0 + resolution: "conventional-commits-parser@npm:6.0.0" + dependencies: + meow: "npm:^13.0.0" + bin: + conventional-commits-parser: dist/cli/index.js + checksum: 10/ba754fb5784afff7f265bac1c0e408755174f1a04103e23a9d8f246102f7a7d043da9f67b19e7df93851901446a80c678a40cf5f9b49af153f60a528bdb507ce + languageName: node + linkType: hard + "conventional-recommended-bump@npm:7.0.1": version: 7.0.1 resolution: "conventional-recommended-bump@npm:7.0.1" @@ -5857,6 +5839,13 @@ __metadata: languageName: node linkType: hard +"convert-hrtime@npm:^5.0.0": + version: 5.0.0 + resolution: "convert-hrtime@npm:5.0.0" + checksum: 10/5245ad1ac6dd57b2d87624ae0eeac1d2a74812a6631208c09368bef787a28e7dbfa736cddaa9c8a0c425cb240437ea506afec7b9684ff617004d06a551f26c87 + languageName: node + linkType: hard + "copy-descriptor@npm:^0.1.0": version: 0.1.1 resolution: "copy-descriptor@npm:0.1.1" @@ -5864,13 +5853,6 @@ __metadata: languageName: node linkType: hard -"core-util-is@npm:1.0.2": - version: 1.0.2 - resolution: "core-util-is@npm:1.0.2" - checksum: 10/d0f7587346b44a1fe6c269267e037dd34b4787191e473c3e685f507229d88561c40eb18872fabfff02977301815d474300b7bfbd15396c13c5377393f7e87ec3 - languageName: node - linkType: hard - "core-util-is@npm:~1.0.0": version: 1.0.3 resolution: "core-util-is@npm:1.0.3" @@ -5878,15 +5860,16 @@ __metadata: languageName: node linkType: hard -"cosmiconfig-typescript-loader@npm:^4.0.0": - version: 4.0.0 - resolution: "cosmiconfig-typescript-loader@npm:4.0.0" +"cosmiconfig-typescript-loader@npm:^5.0.0": + version: 5.0.0 + resolution: "cosmiconfig-typescript-loader@npm:5.0.0" + dependencies: + jiti: "npm:^1.19.1" peerDependencies: "@types/node": "*" - cosmiconfig: ">=7" - ts-node: ">=10" - typescript: ">=3" - checksum: 10/994d448ca93598cc2c6a99179548e19dab88d8999b95a024212b638ef02c0b84c9ca10321b52f4aa45f3174027b1df43ee812a4b7eff6aab35c84cbd3592438f + cosmiconfig: ">=8.2" + typescript: ">=4" + checksum: 10/ccbb367fe92e623207cb33a85c1fe2e2b592e2af845b38c39c0781e0b05c1a72642eec9bea1ed589d0ac95b47c5d1f232f43cbbe0f68b6218f7d887d9813f850 languageName: node linkType: hard @@ -5937,21 +5920,6 @@ __metadata: languageName: node linkType: hard -"coveralls@npm:3.1.1": - version: 3.1.1 - resolution: "coveralls@npm:3.1.1" - dependencies: - js-yaml: "npm:^3.13.1" - lcov-parse: "npm:^1.0.0" - log-driver: "npm:^1.2.7" - minimist: "npm:^1.2.5" - request: "npm:^2.88.2" - bin: - coveralls: bin/coveralls.js - checksum: 10/2508710c0b29a92e45c1cd401f55da0ac1a1b57b3ccf8b359690648e50f4f13fd34c53eeda7fd8e6817ce285f70f666b972937c959785b1b82bd00450011445d - languageName: node - linkType: hard - "create-frame@npm:1.0.0, create-frame@npm:^1.0.0": version: 1.0.0 resolution: "create-frame@npm:1.0.0" @@ -6051,12 +6019,10 @@ __metadata: languageName: node linkType: hard -"dashdash@npm:^1.12.0": - version: 1.14.1 - resolution: "dashdash@npm:1.14.1" - dependencies: - assert-plus: "npm:^1.0.0" - checksum: 10/137b287fa021201ce100cef772c8eeeaaafdd2aa7282864022acf3b873021e54cb809e9c060fa164840bf54ff72d00d6e2d8da1ee5a86d7200eeefa1123a8f7f +"dargs@npm:^8.0.0": + version: 8.1.0 + resolution: "dargs@npm:8.1.0" + checksum: 10/33f1b8f5f08e72c8a28355a87c0e1a9b6a0fec99252ecd9cf4735e65dd5f2e19747c860251ed5747b38e7204c7915fd7a7146aee5aaef5882c69169aae8b1d09 languageName: node linkType: hard @@ -6477,16 +6443,6 @@ __metadata: languageName: node linkType: hard -"ecc-jsbn@npm:~0.1.1": - version: 0.1.2 - resolution: "ecc-jsbn@npm:0.1.2" - dependencies: - jsbn: "npm:~0.1.0" - safer-buffer: "npm:^2.1.0" - checksum: 10/d43591f2396196266e186e6d6928038cc11c76c3699a912cb9c13757060f7bbc7f17f47c4cb16168cdeacffc7965aef021142577e646fb3cb88810c15173eb57 - languageName: node - linkType: hard - "ejs@npm:2.7.1": version: 2.7.1 resolution: "ejs@npm:2.7.1" @@ -7026,7 +6982,7 @@ __metadata: languageName: node linkType: hard -"execa@npm:5.1.1, execa@npm:^5.0.0": +"execa@npm:5.1.1": version: 5.1.1 resolution: "execa@npm:5.1.1" dependencies: @@ -7126,6 +7082,26 @@ __metadata: languageName: node linkType: hard +"execa@npm:^9.0.0": + version: 9.3.1 + resolution: "execa@npm:9.3.1" + dependencies: + "@sindresorhus/merge-streams": "npm:^4.0.0" + cross-spawn: "npm:^7.0.3" + figures: "npm:^6.1.0" + get-stream: "npm:^9.0.0" + human-signals: "npm:^8.0.0" + is-plain-obj: "npm:^4.1.0" + is-stream: "npm:^4.0.1" + npm-run-path: "npm:^5.2.0" + pretty-ms: "npm:^9.0.0" + signal-exit: "npm:^4.1.0" + strip-final-newline: "npm:^4.0.0" + yoctocolors: "npm:^2.0.0" + checksum: 10/ec4a5aec9660cd990cb6f850159945a25f50ab24e1dc5333700299ed874d8a0e7306c6a870121f0eb83662562c49d5009abf01ae5c1d81d425290c5ca49c0f4f + languageName: node + linkType: hard + "expand-brackets@npm:^2.1.4": version: 2.1.4 resolution: "expand-brackets@npm:2.1.4" @@ -7167,7 +7143,7 @@ __metadata: languageName: node linkType: hard -"extend@npm:^3.0.0, extend@npm:~3.0.2": +"extend@npm:^3.0.0": version: 3.0.2 resolution: "extend@npm:3.0.2" checksum: 10/59e89e2dc798ec0f54b36d82f32a27d5f6472c53974f61ca098db5d4648430b725387b53449a34df38fd0392045434426b012f302b3cc049a6500ccf82877e4e @@ -7201,20 +7177,6 @@ __metadata: languageName: node linkType: hard -"extsprintf@npm:1.3.0": - version: 1.3.0 - resolution: "extsprintf@npm:1.3.0" - checksum: 10/26967d6c7ecbfb5bc5b7a6c43503dc5fafd9454802037e9fa1665e41f615da4ff5918bd6cb871a3beabed01a31eca1ccd0bdfb41231f50ad50d405a430f78377 - languageName: node - linkType: hard - -"extsprintf@npm:^1.2.0": - version: 1.4.1 - resolution: "extsprintf@npm:1.4.1" - checksum: 10/bfd6d55f3c0c04d826fe0213264b383c03f32825af6b1ff777f3f2dc49467e599361993568d75b7b19a8ea1bb08c8e7cd8c3d87d179ced91bb0dcf81ca6938e0 - languageName: node - linkType: hard - "falsey@npm:^0.3.2": version: 0.3.2 resolution: "falsey@npm:0.3.2" @@ -7333,6 +7295,13 @@ __metadata: languageName: node linkType: hard +"fast-uri@npm:^3.0.1": + version: 3.0.1 + resolution: "fast-uri@npm:3.0.1" + checksum: 10/e8ee4712270de0d29eb0fbf41ffad0ac80952e8797be760e8bb62c4707f08f50a86fe2d7829681ca133c07d6eb4b4a75389a5fc36674c5b254a3ac0891a68fc7 + languageName: node + linkType: hard + "fastest-levenshtein@npm:^1.0.16": version: 1.0.16 resolution: "fastest-levenshtein@npm:1.0.16" @@ -7396,6 +7365,15 @@ __metadata: languageName: node linkType: hard +"figures@npm:^6.1.0": + version: 6.1.0 + resolution: "figures@npm:6.1.0" + dependencies: + is-unicode-supported: "npm:^2.0.0" + checksum: 10/9822d13630bee8e6a9f2da866713adf13854b07e0bfde042defa8bba32d47a1c0b2afa627ce73837c674cf9a5e3edce7e879ea72cb9ea7960b2390432d8e1167 + languageName: node + linkType: hard + "file-entry-cache@npm:^8.0.0": version: 8.0.0 resolution: "file-entry-cache@npm:8.0.0" @@ -7481,12 +7459,24 @@ __metadata: languageName: node linkType: hard -"find-versions@npm:^5.1.0": - version: 5.1.0 - resolution: "find-versions@npm:5.1.0" +"find-up@npm:^7.0.0": + version: 7.0.0 + resolution: "find-up@npm:7.0.0" + dependencies: + locate-path: "npm:^7.2.0" + path-exists: "npm:^5.0.0" + unicorn-magic: "npm:^0.1.0" + checksum: 10/7e6b08fbc05a10677e25e74bb0a020054a86b31d1806c5e6a9e32e75472bbf177210bc16e5f97453be8bda7ae2e3d97669dbb2901f8c30b39ce53929cbea6746 + languageName: node + linkType: hard + +"find-versions@npm:^6.0.0": + version: 6.0.0 + resolution: "find-versions@npm:6.0.0" dependencies: semver-regex: "npm:^4.0.5" - checksum: 10/680bdb0081f631f7bfb6f0f8edcfa0b74ab8cabc82097a4527a37b0d042aabc56685bf459ff27991eab0baddc04eb8e3bba8a2869f5004ecf7cdd2779b6e51de + super-regex: "npm:^1.0.0" + checksum: 10/d622e711bd17099015506bafd18b13e51fcc54f80ad073cf819ce4598d6b485774f55708ca356235770bed0148ae55a7daf3ef6deb72730c5b1e2f32b432fed5 languageName: node linkType: hard @@ -7583,13 +7573,6 @@ __metadata: languageName: node linkType: hard -"forever-agent@npm:~0.6.1": - version: 0.6.1 - resolution: "forever-agent@npm:0.6.1" - checksum: 10/c1e1644d5e074ac063ecbc3fb8582013ef91fff0e3fa41e76db23d2f62bc6d9677aac86db950917deed4fe1fdd772df780cfaa352075f23deec9c015313afb97 - languageName: node - linkType: hard - "form-data@npm:^4.0.0": version: 4.0.0 resolution: "form-data@npm:4.0.0" @@ -7601,17 +7584,6 @@ __metadata: languageName: node linkType: hard -"form-data@npm:~2.3.2": - version: 2.3.3 - resolution: "form-data@npm:2.3.3" - dependencies: - asynckit: "npm:^0.4.0" - combined-stream: "npm:^1.0.6" - mime-types: "npm:^2.1.12" - checksum: 10/1b6f3ccbf4540e535887b42218a2431a3f6cfdea320119c2affa2a7a374ad8fdd1e60166fc865181f45d49b1684c3e90e7b2190d3fe016692957afb9cf0d0d02 - languageName: node - linkType: hard - "fragment-cache@npm:^0.2.1": version: 0.2.1 resolution: "fragment-cache@npm:0.2.1" @@ -7687,7 +7659,7 @@ __metadata: languageName: node linkType: hard -"fs-extra@npm:^10.0.0, fs-extra@npm:^10.0.1": +"fs-extra@npm:^10.0.1": version: 10.1.0 resolution: "fs-extra@npm:10.1.0" dependencies: @@ -7756,6 +7728,13 @@ __metadata: languageName: node linkType: hard +"function-timeout@npm:^1.0.1": + version: 1.0.2 + resolution: "function-timeout@npm:1.0.2" + checksum: 10/3afedebacaaf237ba9aaef925886fcf5abd434ca12a18c1c7cecb001e57bf9b30434278edcc977a127baeb5b6361f7c278243c1dbf8bf349aa8b30500c57a699 + languageName: node + linkType: hard + "gauge@npm:^4.0.3": version: 4.0.4 resolution: "gauge@npm:4.0.4" @@ -7916,6 +7895,16 @@ __metadata: languageName: node linkType: hard +"get-stream@npm:^9.0.0": + version: 9.0.1 + resolution: "get-stream@npm:9.0.1" + dependencies: + "@sec-ant/readable-stream": "npm:^0.4.1" + is-stream: "npm:^4.0.1" + checksum: 10/ce56e6db6bcd29ca9027b0546af035c3e93dcd154ca456b54c298901eb0e5b2ce799c5d727341a100c99e14c523f267f1205f46f153f7b75b1f4da6d98a21c5e + languageName: node + linkType: hard + "get-value@npm:^2.0.3, get-value@npm:^2.0.6": version: 2.0.6 resolution: "get-value@npm:2.0.6" @@ -7923,15 +7912,6 @@ __metadata: languageName: node linkType: hard -"getpass@npm:^0.1.1": - version: 0.1.7 - resolution: "getpass@npm:0.1.7" - dependencies: - assert-plus: "npm:^1.0.0" - checksum: 10/ab18d55661db264e3eac6012c2d3daeafaab7a501c035ae0ccb193c3c23e9849c6e29b6ac762b9c2adae460266f925d55a3a2a3a3c8b94be2f222df94d70c046 - languageName: node - linkType: hard - "gflow@npm:^5.1.2": version: 5.1.3 resolution: "gflow@npm:5.1.3" @@ -7974,21 +7954,6 @@ __metadata: languageName: node linkType: hard -"git-raw-commits@npm:^2.0.0": - version: 2.0.11 - resolution: "git-raw-commits@npm:2.0.11" - dependencies: - dargs: "npm:^7.0.0" - lodash: "npm:^4.17.15" - meow: "npm:^8.0.0" - split2: "npm:^3.0.0" - through2: "npm:^4.0.0" - bin: - git-raw-commits: cli.js - checksum: 10/04e02b3da7c0e13a55f3e6fa8c1c5f06f7d0d641a9f90d896393ef0144bfcf91aa59beede68d14d61ed56aaf09f2c8dba175563c47ec000a8cf70f9df4877577 - languageName: node - linkType: hard - "git-raw-commits@npm:^3.0.0": version: 3.0.0 resolution: "git-raw-commits@npm:3.0.0" @@ -8002,6 +7967,19 @@ __metadata: languageName: node linkType: hard +"git-raw-commits@npm:^4.0.0": + version: 4.0.0 + resolution: "git-raw-commits@npm:4.0.0" + dependencies: + dargs: "npm:^8.0.0" + meow: "npm:^12.0.1" + split2: "npm:^4.0.0" + bin: + git-raw-commits: cli.mjs + checksum: 10/95546f4afcb33cf00ff638f7fec55ad61d4d927447737900e1f6fcbbdbb341b3f150908424cc62acb6d9faaea6f1e8f55d0697b899f0589af9d2733afb20abfb + languageName: node + linkType: hard + "git-remote-origin-url@npm:^2.0.0": version: 2.0.0 resolution: "git-remote-origin-url@npm:2.0.0" @@ -8180,7 +8158,7 @@ __metadata: languageName: node linkType: hard -"global-dirs@npm:^0.1.0, global-dirs@npm:^0.1.1": +"global-dirs@npm:^0.1.0": version: 0.1.1 resolution: "global-dirs@npm:0.1.1" dependencies: @@ -8425,23 +8403,6 @@ __metadata: languageName: node linkType: hard -"har-schema@npm:^2.0.0": - version: 2.0.0 - resolution: "har-schema@npm:2.0.0" - checksum: 10/d8946348f333fb09e2bf24cc4c67eabb47c8e1d1aa1c14184c7ffec1140a49ec8aa78aa93677ae452d71d5fc0fdeec20f0c8c1237291fc2bcb3f502a5d204f9b - languageName: node - linkType: hard - -"har-validator@npm:~5.1.3": - version: 5.1.5 - resolution: "har-validator@npm:5.1.5" - dependencies: - ajv: "npm:^6.12.3" - har-schema: "npm:^2.0.0" - checksum: 10/b998a7269ca560d7f219eedc53e2c664cd87d487e428ae854a6af4573fc94f182fe9d2e3b92ab968249baec7ebaf9ead69cf975c931dc2ab282ec182ee988280 - languageName: node - linkType: hard - "hard-rejection@npm:^2.1.0": version: 2.1.0 resolution: "hard-rejection@npm:2.1.0" @@ -8681,6 +8642,15 @@ __metadata: languageName: node linkType: hard +"hosted-git-info@npm:^8.0.0": + version: 8.0.0 + resolution: "hosted-git-info@npm:8.0.0" + dependencies: + lru-cache: "npm:^10.0.1" + checksum: 10/fb1e5600a57dbebfc4d708ccd6256facabb1cdfb182ac20ab7c900c311bda91f71b2129d3e15b4d1faaef82d1acb5f7c3558e50c4249402020f866a4f9958b8b + languageName: node + linkType: hard + "html-escaper@npm:^2.0.0": version: 2.0.2 resolution: "html-escaper@npm:2.0.2" @@ -8733,17 +8703,6 @@ __metadata: languageName: node linkType: hard -"http-signature@npm:~1.2.0": - version: 1.2.0 - resolution: "http-signature@npm:1.2.0" - dependencies: - assert-plus: "npm:^1.0.0" - jsprim: "npm:^1.2.2" - sshpk: "npm:^1.7.0" - checksum: 10/2ff7112e6b0d8f08b382dfe705078c655501f2ddd76cf589d108445a9dd388a0a9be928c37108261519a7f53e6bbd1651048d74057b804807cce1ec49e87a95b - languageName: node - linkType: hard - "http2-client@npm:^1.2.5": version: 1.3.5 resolution: "http2-client@npm:1.3.5" @@ -8809,6 +8768,13 @@ __metadata: languageName: node linkType: hard +"human-signals@npm:^8.0.0": + version: 8.0.0 + resolution: "human-signals@npm:8.0.0" + checksum: 10/89acdc7081ac2a065e41cca7351c4b0fe2382e213b7372f90df6a554e340f31b49388a307adc1d6f4c60b2b4fe81eeff0bc1f44be6f5d844311cd92ccc7831c6 + languageName: node + linkType: hard + "humanize-ms@npm:^1.2.1": version: 1.2.1 resolution: "humanize-ms@npm:1.2.1" @@ -8889,7 +8855,7 @@ __metadata: languageName: node linkType: hard -"import-fresh@npm:^3.0.0, import-fresh@npm:^3.2.1, import-fresh@npm:^3.3.0": +"import-fresh@npm:^3.2.1, import-fresh@npm:^3.3.0": version: 3.3.0 resolution: "import-fresh@npm:3.3.0" dependencies: @@ -9602,6 +9568,13 @@ __metadata: languageName: node linkType: hard +"is-plain-obj@npm:^4.1.0": + version: 4.1.0 + resolution: "is-plain-obj@npm:4.1.0" + checksum: 10/6dc45da70d04a81f35c9310971e78a6a3c7a63547ef782e3a07ee3674695081b6ca4e977fbb8efc48dae3375e0b34558d2bcd722aec9bddfa2d7db5b041be8ce + languageName: node + linkType: hard + "is-plain-object@npm:^2.0.3, is-plain-object@npm:^2.0.4": version: 2.0.4 resolution: "is-plain-object@npm:2.0.4" @@ -9671,6 +9644,13 @@ __metadata: languageName: node linkType: hard +"is-stream@npm:^4.0.1": + version: 4.0.1 + resolution: "is-stream@npm:4.0.1" + checksum: 10/cbea3f1fc271b21ceb228819d0c12a0965a02b57f39423925f99530b4eb86935235f258f06310b67cd02b2d10b49e9a0998f5ececf110ab7d3760bae4055ad23 + languageName: node + linkType: hard + "is-text-path@npm:^1.0.1": version: 1.0.1 resolution: "is-text-path@npm:1.0.1" @@ -9689,7 +9669,7 @@ __metadata: languageName: node linkType: hard -"is-typedarray@npm:^1.0.0, is-typedarray@npm:~1.0.0": +"is-typedarray@npm:^1.0.0": version: 1.0.0 resolution: "is-typedarray@npm:1.0.0" checksum: 10/4b433bfb0f9026f079f4eb3fbaa4ed2de17c9995c3a0b5c800bec40799b4b2a8b4e051b1ada77749deb9ded4ae52fe2096973f3a93ff83df1a5a7184a669478c @@ -9791,23 +9771,16 @@ __metadata: languageName: node linkType: hard -"isstream@npm:~0.1.2": - version: 0.1.2 - resolution: "isstream@npm:0.1.2" - checksum: 10/22d9c181015226d4534a227539256897bbbcb7edd1066ca4fc4d3a06dbd976325dfdd16b3983c7d236a89f256805c1a685a772e0364e98873d3819b064ad35a1 - languageName: node - linkType: hard - -"issue-parser@npm:^6.0.0": - version: 6.0.0 - resolution: "issue-parser@npm:6.0.0" +"issue-parser@npm:^7.0.0": + version: 7.0.1 + resolution: "issue-parser@npm:7.0.1" dependencies: lodash.capitalize: "npm:^4.2.1" lodash.escaperegexp: "npm:^4.1.2" lodash.isplainobject: "npm:^4.0.6" lodash.isstring: "npm:^4.0.1" lodash.uniqby: "npm:^4.7.0" - checksum: 10/dfa82df9abde032ab6d5e8b70013d6530b8b9fd5a8af3be938024814f9a47bc5bba1fed3371a3468931787bf3ba79d335c8e85eef695a5a103f978d0c985fa01 + checksum: 10/04d14d987567008a270f5ed165e9464e131faf9c1d373b13c53bc7a1fe78b4e3aa91fcf2a1be2bac73983624084260b72957926fa35a1df4d60afbb61b645c95 languageName: node linkType: hard @@ -9948,6 +9921,15 @@ __metadata: languageName: node linkType: hard +"jiti@npm:^1.19.1": + version: 1.21.6 + resolution: "jiti@npm:1.21.6" + bin: + jiti: bin/jiti.js + checksum: 10/289b124cea411c130a14ffe88e3d38376ab44b6695616dfa0a1f32176a8f20ec90cdd6d2b9d81450fc6467cfa4d865f04f49b98452bff0f812bc400fd0ae78d6 + languageName: node + linkType: hard + "js-tokens@npm:^4.0.0": version: 4.0.0 resolution: "js-tokens@npm:4.0.0" @@ -9978,13 +9960,6 @@ __metadata: languageName: node linkType: hard -"jsbn@npm:~0.1.0": - version: 0.1.1 - resolution: "jsbn@npm:0.1.1" - checksum: 10/5450133242845100e694f0ef9175f44c012691a9b770b2571e677314e6f70600abb10777cdfc9a0c6a9f2ac6d134577403633de73e2fcd0f97875a67744e2d14 - languageName: node - linkType: hard - "json-buffer@npm:3.0.0": version: 3.0.0 resolution: "json-buffer@npm:3.0.0" @@ -10062,7 +10037,7 @@ __metadata: languageName: node linkType: hard -"json-stringify-safe@npm:^5.0.1, json-stringify-safe@npm:~5.0.1": +"json-stringify-safe@npm:^5.0.1": version: 5.0.1 resolution: "json-stringify-safe@npm:5.0.1" checksum: 10/59169a081e4eeb6f9559ae1f938f656191c000e0512aa6df9f3c8b2437a4ab1823819c6b9fd1818a4e39593ccfd72e9a051fdd3e2d1e340ed913679e888ded8c @@ -10117,18 +10092,6 @@ __metadata: languageName: node linkType: hard -"jsprim@npm:^1.2.2": - version: 1.4.2 - resolution: "jsprim@npm:1.4.2" - dependencies: - assert-plus: "npm:1.0.0" - extsprintf: "npm:1.3.0" - json-schema: "npm:0.4.0" - verror: "npm:1.10.0" - checksum: 10/df2bf234eab1b5078d01bcbff3553d50a243f7b5c10a169745efeda6344d62798bd1d85bcca6a8446f3b5d0495e989db45f9de8dae219f0f9796e70e0c776089 - languageName: node - linkType: hard - "just-diff-apply@npm:^5.2.0": version: 5.3.1 resolution: "just-diff-apply@npm:5.3.1" @@ -10234,15 +10197,6 @@ __metadata: languageName: node linkType: hard -"lcov-parse@npm:^1.0.0": - version: 1.0.0 - resolution: "lcov-parse@npm:1.0.0" - bin: - lcov-parse: ./bin/cli.js - checksum: 10/a30674716c5819ceb2e0119f50069ab7cfa11452dbb555119ac72b12d53744de8ebba3c21130ed9eab091d43a9d1f11c094ad9eefb27866f79ee0d40fc3a779c - languageName: node - linkType: hard - "lerna@npm:8.1.8": version: 8.1.8 resolution: "lerna@npm:8.1.8" @@ -10727,7 +10681,7 @@ __metadata: languageName: node linkType: hard -"locate-path@npm:^7.1.0": +"locate-path@npm:^7.1.0, locate-path@npm:^7.2.0": version: 7.2.0 resolution: "locate-path@npm:7.2.0" dependencies: @@ -10750,6 +10704,13 @@ __metadata: languageName: node linkType: hard +"lodash.camelcase@npm:^4.3.0": + version: 4.3.0 + resolution: "lodash.camelcase@npm:4.3.0" + checksum: 10/c301cc379310441dc73cd6cebeb91fb254bea74e6ad3027f9346fc43b4174385153df420ffa521654e502fd34c40ef69ca4e7d40ee7129a99e06f306032bfc65 + languageName: node + linkType: hard + "lodash.capitalize@npm:^4.2.1": version: 4.2.1 resolution: "lodash.capitalize@npm:4.2.1" @@ -10792,6 +10753,13 @@ __metadata: languageName: node linkType: hard +"lodash.kebabcase@npm:^4.1.1": + version: 4.1.1 + resolution: "lodash.kebabcase@npm:4.1.1" + checksum: 10/d84ec5441ef8e5c718c50315f35b0a045a77c7e8ee3e54472c06dc31f6f3602e95551a16c0923d689198b51deb8902c4bbc54fc9b965b26c1f86e21df3a05f34 + languageName: node + linkType: hard + "lodash.memoize@npm:4.x": version: 4.1.2 resolution: "lodash.memoize@npm:4.1.2" @@ -10806,6 +10774,27 @@ __metadata: languageName: node linkType: hard +"lodash.mergewith@npm:^4.6.2": + version: 4.6.2 + resolution: "lodash.mergewith@npm:4.6.2" + checksum: 10/aea75a4492541a4902ac7e551dc6c54b722da0c187f84385d02e8fc33a7ae3454b837822446e5f63fcd5ad1671534ea408740b776670ea4d9c7890b10105fce0 + languageName: node + linkType: hard + +"lodash.snakecase@npm:^4.1.1": + version: 4.1.1 + resolution: "lodash.snakecase@npm:4.1.1" + checksum: 10/82ed40935d840477ef8fee64f9f263f75989c6cde36b84aae817246d95826228e1b5a7f6093c51de324084f86433634c7af244cb89496633cacfe443071450d0 + languageName: node + linkType: hard + +"lodash.startcase@npm:^4.4.0": + version: 4.4.0 + resolution: "lodash.startcase@npm:4.4.0" + checksum: 10/3091048a54a2f92bcf2c6441d2bd9a706fb133d5f461ae7c310d6dca1530338a06c91e9e42a5b14b12e875ddae1814d448050dc02afe2cec09b3995d8e836837 + languageName: node + linkType: hard + "lodash.template@npm:^4.4.0": version: 4.5.0 resolution: "lodash.template@npm:4.5.0" @@ -10825,6 +10814,13 @@ __metadata: languageName: node linkType: hard +"lodash.uniq@npm:^4.5.0": + version: 4.5.0 + resolution: "lodash.uniq@npm:4.5.0" + checksum: 10/86246ca64ac0755c612e5df6d93cfe92f9ecac2e5ff054b965efbbb1d9a647b6310969e78545006f70f52760554b03233ad0103324121ae31474c20d5f7a2812 + languageName: node + linkType: hard + "lodash.uniqby@npm:^4.7.0": version: 4.7.0 resolution: "lodash.uniqby@npm:4.7.0" @@ -10832,17 +10828,17 @@ __metadata: languageName: node linkType: hard -"lodash@npm:>=4.17.21, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.21, lodash@npm:^4.17.4": - version: 4.17.21 - resolution: "lodash@npm:4.17.21" - checksum: 10/c08619c038846ea6ac754abd6dd29d2568aa705feb69339e836dfa8d8b09abbb2f859371e86863eda41848221f9af43714491467b5b0299122431e202bb0c532 +"lodash.upperfirst@npm:^4.3.1": + version: 4.3.1 + resolution: "lodash.upperfirst@npm:4.3.1" + checksum: 10/3e849d4eb4dbf26faee6435edda8e707b65a5dbd2f10f8def5a16a57bbbf38d3b7506950f0dd455e9c46ba73af35f1de75df4ef83952106949413d64eed59333 languageName: node linkType: hard -"log-driver@npm:^1.2.7": - version: 1.2.7 - resolution: "log-driver@npm:1.2.7" - checksum: 10/0cd54adf0de8a3e28affc862550634855a1a66a3e5feb1e93c0900a3330634217e00c086e2e54aa60d92c4dd4bc67d4a00a899d97865d0025777a2d8e0a9ac90 +"lodash@npm:>=4.17.21, lodash@npm:^4.17.19, lodash@npm:^4.17.21, lodash@npm:^4.17.4": + version: 4.17.21 + resolution: "lodash@npm:4.17.21" + checksum: 10/c08619c038846ea6ac754abd6dd29d2568aa705feb69339e836dfa8d8b09abbb2f859371e86863eda41848221f9af43714491467b5b0299122431e202bb0c532 languageName: node linkType: hard @@ -11323,7 +11319,14 @@ __metadata: languageName: node linkType: hard -"meow@npm:^8.0.0, meow@npm:^8.1.2": +"meow@npm:^13.0.0": + version: 13.2.0 + resolution: "meow@npm:13.2.0" + checksum: 10/4eff5bc921fed0b8a471ad79069d741a0210036d717547d0c7f36fdaf84ef7a3036225f38b6a53830d84dc9cbf8b944b097fde62381b8b5b215119e735ce1063 + languageName: node + linkType: hard + +"meow@npm:^8.1.2": version: 8.1.2 resolution: "meow@npm:8.1.2" dependencies: @@ -11471,7 +11474,7 @@ __metadata: languageName: node linkType: hard -"mime-types@npm:^2.1.12, mime-types@npm:~2.1.19": +"mime-types@npm:^2.1.12": version: 2.1.35 resolution: "mime-types@npm:2.1.35" dependencies: @@ -11596,6 +11599,13 @@ __metadata: languageName: node linkType: hard +"minimist@npm:^1.2.8": + version: 1.2.8 + resolution: "minimist@npm:1.2.8" + checksum: 10/908491b6cc15a6c440ba5b22780a0ba89b9810e1aea684e253e43c4e3b8d56ec1dcdd7ea96dde119c29df59c936cde16062159eae4225c691e19c70b432b6e6f + languageName: node + linkType: hard + "minipass-collect@npm:^1.0.2": version: 1.0.2 resolution: "minipass-collect@npm:1.0.2" @@ -12301,6 +12311,15 @@ __metadata: languageName: node linkType: hard +"npm-run-path@npm:^5.2.0": + version: 5.3.0 + resolution: "npm-run-path@npm:5.3.0" + dependencies: + path-key: "npm:^4.0.0" + checksum: 10/ae8e7a89da9594fb9c308f6555c73f618152340dcaae423e5fb3620026fefbec463618a8b761920382d666fa7a2d8d240b6fe320e8a6cdd54dc3687e2b659d25 + languageName: node + linkType: hard + "npm-user-validate@npm:^2.0.0": version: 2.0.0 resolution: "npm-user-validate@npm:2.0.0" @@ -12563,13 +12582,6 @@ __metadata: languageName: node linkType: hard -"oauth-sign@npm:~0.9.0": - version: 0.9.0 - resolution: "oauth-sign@npm:0.9.0" - checksum: 10/1809a366d258f41fdf4ab5310cff3d1e15f96b187503bc7333cef4351de7bd0f52cb269bc95800f1fae5fb04dd886287df1471985fd67e8484729fdbcf857119 - languageName: node - linkType: hard - "object-assign@npm:^4.0.1, object-assign@npm:^4.1.0": version: 4.1.1 resolution: "object-assign@npm:4.1.1" @@ -13095,6 +13107,13 @@ __metadata: languageName: node linkType: hard +"parse-ms@npm:^4.0.0": + version: 4.0.0 + resolution: "parse-ms@npm:4.0.0" + checksum: 10/673c801d9f957ff79962d71ed5a24850163f4181a90dd30c4e3666b3a804f53b77f1f0556792e8b2adbb5d58757907d1aa51d7d7dc75997c2a56d72937cbc8b7 + languageName: node + linkType: hard + "parse-node-version@npm:^1.0.0": version: 1.0.1 resolution: "parse-node-version@npm:1.0.1" @@ -13306,13 +13325,6 @@ __metadata: languageName: node linkType: hard -"performance-now@npm:^2.1.0": - version: 2.1.0 - resolution: "performance-now@npm:2.1.0" - checksum: 10/534e641aa8f7cba160f0afec0599b6cecefbb516a2e837b512be0adbe6c1da5550e89c78059c7fabc5c9ffdf6627edabe23eb7c518c4500067a898fa65c2b550 - languageName: node - linkType: hard - "picocolors@npm:^1.0.0": version: 1.0.0 resolution: "picocolors@npm:1.0.0" @@ -13477,6 +13489,15 @@ __metadata: languageName: node linkType: hard +"pretty-ms@npm:^9.0.0": + version: 9.1.0 + resolution: "pretty-ms@npm:9.1.0" + dependencies: + parse-ms: "npm:^4.0.0" + checksum: 10/3622a8999e4b2aa05ff64bf48c7e58143b3ede6e3434f8ce5588def90ebcf6af98edf79532344c4c9e14d5ad25deb3f0f5ca9f9b91e5d2d1ac26dad9cf428fc0 + languageName: node + linkType: hard + "proc-log@npm:^3.0.0": version: 3.0.0 resolution: "proc-log@npm:3.0.0" @@ -13573,13 +13594,6 @@ __metadata: languageName: node linkType: hard -"psl@npm:^1.1.28": - version: 1.8.0 - resolution: "psl@npm:1.8.0" - checksum: 10/5f62a8eca06cb4a017983d15b92b0d38dc8699d637eabc8cb482c59b4106c9760f59cc8afabcb8bb7b98f0322907680d8f0f59226386fffab5248d180bc04578 - languageName: node - linkType: hard - "pump@npm:^3.0.0": version: 3.0.0 resolution: "pump@npm:3.0.0" @@ -13590,10 +13604,10 @@ __metadata: languageName: node linkType: hard -"punycode@npm:^2.1.0, punycode@npm:^2.1.1": - version: 2.1.1 - resolution: "punycode@npm:2.1.1" - checksum: 10/939daa010c2cacebdb060c40ecb52fef0a739324a66f7fffe0f94353a1ee83e3b455e9032054c4a0c4977b0a28e27086f2171c392832b59a01bd948fd8e20914 +"punycode@npm:^2.1.0": + version: 2.3.1 + resolution: "punycode@npm:2.3.1" + checksum: 10/febdc4362bead22f9e2608ff0171713230b57aff9dddc1c273aa2a651fbd366f94b7d6a71d78342a7c0819906750351ca7f2edd26ea41b626d87d6a13d1bd059 languageName: node linkType: hard @@ -13615,13 +13629,6 @@ __metadata: languageName: node linkType: hard -"q@npm:^1.5.1": - version: 1.5.1 - resolution: "q@npm:1.5.1" - checksum: 10/70c4a30b300277165cd855889cd3aa681929840a5940413297645c5691e00a3549a2a4153131efdf43fe8277ee8cf5a34c9636dcb649d83ad47f311a015fd380 - languageName: node - linkType: hard - "qrcode-terminal@npm:^0.12.0": version: 0.12.0 resolution: "qrcode-terminal@npm:0.12.0" @@ -13631,13 +13638,6 @@ __metadata: languageName: node linkType: hard -"qs@npm:~6.5.2": - version: 6.5.3 - resolution: "qs@npm:6.5.3" - checksum: 10/485c990fba7ad17671e16c92715fb064c1600337738f5d140024eb33a49fbc1ed31890d3db850117c760caeb9c9cc9f4ba22a15c20dd119968e41e3d3fe60b28 - languageName: node - linkType: hard - "querystringify@npm:^2.1.1": version: 2.2.0 resolution: "querystringify@npm:2.2.0" @@ -13719,6 +13719,17 @@ __metadata: languageName: node linkType: hard +"read-package-up@npm:^11.0.0": + version: 11.0.0 + resolution: "read-package-up@npm:11.0.0" + dependencies: + find-up-simple: "npm:^1.0.0" + read-pkg: "npm:^9.0.0" + type-fest: "npm:^4.6.0" + checksum: 10/535b7554d47fae5fb5c2e7aceebd48b5de4142cdfe7b21f942fa9a0f56db03d3b53cce298e19438e1149292279c285e6ba6722eca741d590fd242519c4bdbc17 + languageName: node + linkType: hard + "read-pkg-up@npm:*": version: 9.1.0 resolution: "read-pkg-up@npm:9.1.0" @@ -13752,17 +13763,6 @@ __metadata: languageName: node linkType: hard -"read-pkg-up@npm:^11.0.0": - version: 11.0.0 - resolution: "read-pkg-up@npm:11.0.0" - dependencies: - find-up-simple: "npm:^1.0.0" - read-pkg: "npm:^9.0.0" - type-fest: "npm:^4.6.0" - checksum: 10/c08fe324a6d8cb3f1f4533074db8a4ef222c85af74bc30e7a98117c578e5d6b2dd8868fded660386167c95ffaf5d566f95743a621581df332573bc989c19cf45 - languageName: node - linkType: hard - "read-pkg-up@npm:^3.0.0": version: 3.0.0 resolution: "read-pkg-up@npm:3.0.0" @@ -13850,17 +13850,6 @@ __metadata: languageName: node linkType: hard -"readable-stream@npm:3, readable-stream@npm:^3.0.0, readable-stream@npm:^3.0.2, readable-stream@npm:^3.1.1, readable-stream@npm:^3.4.0, readable-stream@npm:^3.6.0": - version: 3.6.0 - resolution: "readable-stream@npm:3.6.0" - dependencies: - inherits: "npm:^2.0.3" - string_decoder: "npm:^1.1.1" - util-deprecate: "npm:^1.0.1" - checksum: 10/b80b3e6a7fafb1c79de7db541de357f4a5ee73bd70c21672f5a7c840d27bb27bdb0151e7ba2fd82c4a888df22ce0c501b0d9f3e4dfe51688876701c437d59536 - languageName: node - linkType: hard - "readable-stream@npm:^2.0.0, readable-stream@npm:^2.0.2, readable-stream@npm:~2.3.6": version: 2.3.7 resolution: "readable-stream@npm:2.3.7" @@ -13876,6 +13865,17 @@ __metadata: languageName: node linkType: hard +"readable-stream@npm:^3.0.0, readable-stream@npm:^3.0.2, readable-stream@npm:^3.1.1, readable-stream@npm:^3.4.0, readable-stream@npm:^3.6.0": + version: 3.6.0 + resolution: "readable-stream@npm:3.6.0" + dependencies: + inherits: "npm:^2.0.3" + string_decoder: "npm:^1.1.1" + util-deprecate: "npm:^1.0.1" + checksum: 10/b80b3e6a7fafb1c79de7db541de357f4a5ee73bd70c21672f5a7c840d27bb27bdb0151e7ba2fd82c4a888df22ce0c501b0d9f3e4dfe51688876701c437d59536 + languageName: node + linkType: hard + "redent@npm:^3.0.0": version: 3.0.0 resolution: "redent@npm:3.0.0" @@ -14009,34 +14009,6 @@ __metadata: languageName: node linkType: hard -"request@npm:^2.88.2": - version: 2.88.2 - resolution: "request@npm:2.88.2" - dependencies: - aws-sign2: "npm:~0.7.0" - aws4: "npm:^1.8.0" - caseless: "npm:~0.12.0" - combined-stream: "npm:~1.0.6" - extend: "npm:~3.0.2" - forever-agent: "npm:~0.6.1" - form-data: "npm:~2.3.2" - har-validator: "npm:~5.1.3" - http-signature: "npm:~1.2.0" - is-typedarray: "npm:~1.0.0" - isstream: "npm:~0.1.2" - json-stringify-safe: "npm:~5.0.1" - mime-types: "npm:~2.1.19" - oauth-sign: "npm:~0.9.0" - performance-now: "npm:^2.1.0" - qs: "npm:~6.5.2" - safe-buffer: "npm:^5.1.2" - tough-cookie: "npm:~2.5.0" - tunnel-agent: "npm:^0.6.0" - uuid: "npm:^3.3.2" - checksum: 10/005b8b237b56f1571cfd4ecc09772adaa2e82dcb884fc14ea2bb25e23dbf7c2009f9929e0b6d3fd5802e33ed8ee705a3b594c8f9467c1458cd973872bf89db8e - languageName: node - linkType: hard - "require-directory@npm:^2.1.1": version: 2.1.1 resolution: "require-directory@npm:2.1.1" @@ -14081,15 +14053,6 @@ __metadata: languageName: node linkType: hard -"resolve-global@npm:1.0.0, resolve-global@npm:^1.0.0": - version: 1.0.0 - resolution: "resolve-global@npm:1.0.0" - dependencies: - global-dirs: "npm:^0.1.1" - checksum: 10/c4e11d33e84bde7516b824503ffbe4b6cce863d5ce485680fd3db997b7c64da1df98321b1fd0703b58be8bc9bc83bc96bd83043f96194386b45eb47229efb6b6 - languageName: node - linkType: hard - "resolve-url@npm:^0.2.1": version: 0.2.1 resolution: "resolve-url@npm:0.2.1" @@ -14332,13 +14295,6 @@ __metadata: languageName: node linkType: hard -"safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.2, safe-buffer@npm:~5.2.0": - version: 5.2.1 - resolution: "safe-buffer@npm:5.2.1" - checksum: 10/32872cd0ff68a3ddade7a7617b8f4c2ae8764d8b7d884c651b74457967a9e0e886267d3ecc781220629c44a865167b61c375d2da6c720c840ecd73f45d5d9451 - languageName: node - linkType: hard - "safe-buffer@npm:~5.1.0, safe-buffer@npm:~5.1.1": version: 5.1.2 resolution: "safe-buffer@npm:5.1.2" @@ -14346,6 +14302,13 @@ __metadata: languageName: node linkType: hard +"safe-buffer@npm:~5.2.0": + version: 5.2.1 + resolution: "safe-buffer@npm:5.2.1" + checksum: 10/32872cd0ff68a3ddade7a7617b8f4c2ae8764d8b7d884c651b74457967a9e0e886267d3ecc781220629c44a865167b61c375d2da6c720c840ecd73f45d5d9451 + languageName: node + linkType: hard + "safe-regex@npm:^1.1.0": version: 1.1.0 resolution: "safe-regex@npm:1.1.0" @@ -14355,7 +14318,7 @@ __metadata: languageName: node linkType: hard -"safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:>= 2.1.2 < 3.0.0, safer-buffer@npm:^2.0.2, safer-buffer@npm:^2.1.0, safer-buffer@npm:~2.1.0": +"safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:>= 2.1.2 < 3.0.0": version: 2.1.2 resolution: "safer-buffer@npm:2.1.2" checksum: 10/7eaf7a0cf37cc27b42fb3ef6a9b1df6e93a1c6d98c6c6702b02fe262d5fcbd89db63320793b99b21cb5348097d0a53de81bd5f4e8b86e20cc9412e3f1cfb4e83 @@ -14383,26 +14346,26 @@ __metadata: languageName: node linkType: hard -"semantic-release@npm:23.0.2": - version: 23.0.2 - resolution: "semantic-release@npm:23.0.2" +"semantic-release@npm:24.1.1": + version: 24.1.1 + resolution: "semantic-release@npm:24.1.1" dependencies: - "@semantic-release/commit-analyzer": "npm:^11.0.0" + "@semantic-release/commit-analyzer": "npm:^13.0.0-beta.1" "@semantic-release/error": "npm:^4.0.0" - "@semantic-release/github": "npm:^9.0.0" - "@semantic-release/npm": "npm:^11.0.0" - "@semantic-release/release-notes-generator": "npm:^12.0.0" + "@semantic-release/github": "npm:^10.0.0" + "@semantic-release/npm": "npm:^12.0.0" + "@semantic-release/release-notes-generator": "npm:^14.0.0-beta.1" aggregate-error: "npm:^5.0.0" cosmiconfig: "npm:^9.0.0" debug: "npm:^4.0.0" env-ci: "npm:^11.0.0" - execa: "npm:^8.0.0" + execa: "npm:^9.0.0" figures: "npm:^6.0.0" - find-versions: "npm:^5.1.0" + find-versions: "npm:^6.0.0" get-stream: "npm:^6.0.0" git-log-parser: "npm:^1.2.0" hook-std: "npm:^3.0.0" - hosted-git-info: "npm:^7.0.0" + hosted-git-info: "npm:^8.0.0" import-from-esm: "npm:^1.3.1" lodash-es: "npm:^4.17.21" marked: "npm:^12.0.0" @@ -14410,7 +14373,7 @@ __metadata: micromatch: "npm:^4.0.2" p-each-series: "npm:^3.0.0" p-reduce: "npm:^3.0.0" - read-pkg-up: "npm:^11.0.0" + read-package-up: "npm:^11.0.0" resolve-from: "npm:^5.0.0" semver: "npm:^7.3.2" semver-diff: "npm:^4.0.0" @@ -14418,7 +14381,7 @@ __metadata: yargs: "npm:^17.5.1" bin: semantic-release: bin/semantic-release.js - checksum: 10/a0d1ff971f4e6fc9ad56d88908f2ab4b03a95989aa06d845d3a77dbeeb6f6177cbe7d6b9604ab45fbb37ef229ab9c236e88737c7e72f20d3eb50be61edc28457 + checksum: 10/194a560c152755b95c50eb786ff98949e04fba1222c5c9312b0e847bd0c0bade291fda99469d4a36f1e790bfbc597f2fd5e4b32b7b1c3c82c6ba54297bec56a2 languageName: node linkType: hard @@ -14476,7 +14439,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:7.3.7, semver@npm:7.x, semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.1.2, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7": +"semver@npm:7.x, semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.1.2, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7": version: 7.3.7 resolution: "semver@npm:7.3.7" dependencies: @@ -15065,7 +15028,7 @@ __metadata: languageName: node linkType: hard -"split2@npm:^3.0.0, split2@npm:^3.2.2": +"split2@npm:^3.2.2": version: 3.2.2 resolution: "split2@npm:3.2.2" dependencies: @@ -15106,27 +15069,6 @@ __metadata: languageName: node linkType: hard -"sshpk@npm:^1.7.0": - version: 1.17.0 - resolution: "sshpk@npm:1.17.0" - dependencies: - asn1: "npm:~0.2.3" - assert-plus: "npm:^1.0.0" - bcrypt-pbkdf: "npm:^1.0.0" - dashdash: "npm:^1.12.0" - ecc-jsbn: "npm:~0.1.1" - getpass: "npm:^0.1.1" - jsbn: "npm:~0.1.0" - safer-buffer: "npm:^2.0.2" - tweetnacl: "npm:~0.14.0" - bin: - sshpk-conv: bin/sshpk-conv - sshpk-sign: bin/sshpk-sign - sshpk-verify: bin/sshpk-verify - checksum: 10/668c2a279a6ce66fd739ce5684e37927dd75427cc020c828a208f85890a4c400705d4ba09f32fa44efca894339dc6931941664f6f6ba36dfa543de6d006cbe9c - languageName: node - linkType: hard - "ssri@npm:^10.0.0, ssri@npm:^10.0.5": version: 10.0.5 resolution: "ssri@npm:10.0.5" @@ -15374,6 +15316,13 @@ __metadata: languageName: node linkType: hard +"strip-final-newline@npm:^4.0.0": + version: 4.0.0 + resolution: "strip-final-newline@npm:4.0.0" + checksum: 10/b5fe48f695d74863153a3b3155220e6e9bf51f4447832998c8edec38e6559b3af87a9fe5ac0df95570a78a26f5fa91701358842eab3c15480e27980b154a145f + languageName: node + linkType: hard + "strip-indent@npm:^3.0.0": version: 3.0.0 resolution: "strip-indent@npm:3.0.0" @@ -15424,6 +15373,16 @@ __metadata: languageName: node linkType: hard +"super-regex@npm:^1.0.0": + version: 1.0.0 + resolution: "super-regex@npm:1.0.0" + dependencies: + function-timeout: "npm:^1.0.1" + time-span: "npm:^5.1.0" + checksum: 10/d99e90ee0950356b86b01ad327605080e72ee0712c7e5c66335e7e4e3bd2919206caea929fa2d5ca97c2afc1d1ab91466d09eadcf1101196edcfb94bebfea388 + languageName: node + linkType: hard + "supports-color@npm:^2.0.0": version: 2.0.0 resolution: "supports-color@npm:2.0.0" @@ -15702,15 +15661,6 @@ __metadata: languageName: node linkType: hard -"through2@npm:^4.0.0": - version: 4.0.2 - resolution: "through2@npm:4.0.2" - dependencies: - readable-stream: "npm:3" - checksum: 10/72c246233d9a989bbebeb6b698ef0b7b9064cb1c47930f79b25d87b6c867e075432811f69b7b2ac8da00ca308191c507bdab913944be8019ac43b036ce88f6ba - languageName: node - linkType: hard - "through@npm:2, through@npm:>=2.2.7 <3, through@npm:^2.3.4, through@npm:^2.3.6, through@npm:^2.3.8": version: 2.3.8 resolution: "through@npm:2.3.8" @@ -15718,6 +15668,15 @@ __metadata: languageName: node linkType: hard +"time-span@npm:^5.1.0": + version: 5.1.0 + resolution: "time-span@npm:5.1.0" + dependencies: + convert-hrtime: "npm:^5.0.0" + checksum: 10/949c45fcb873f2d26fda3db1b7f7161ce65206f6e94a7c6c9bf3a5a07a373570dba57ca5c1f816efa6326adbc3f9e93bb6ef19a7a220f4259a917e1192d49418 + languageName: node + linkType: hard + "time-stamp@npm:^1.0.0, time-stamp@npm:^1.0.1": version: 1.1.0 resolution: "time-stamp@npm:1.1.0" @@ -15846,16 +15805,6 @@ __metadata: languageName: node linkType: hard -"tough-cookie@npm:~2.5.0": - version: 2.5.0 - resolution: "tough-cookie@npm:2.5.0" - dependencies: - psl: "npm:^1.1.28" - punycode: "npm:^2.1.1" - checksum: 10/024cb13a4d1fe9af57f4323dff765dd9b217cc2a69be77e3b8a1ca45600aa33a097b6ad949f225d885e904f4bd3ceccef104741ef202d8378e6ca78e850ff82f - languageName: node - linkType: hard - "tr46@npm:~0.0.3": version: 0.0.3 resolution: "tr46@npm:0.0.3" @@ -15951,7 +15900,7 @@ __metadata: languageName: node linkType: hard -"ts-node@npm:10.9.1, ts-node@npm:^10.8.1": +"ts-node@npm:10.9.1": version: 10.9.1 resolution: "ts-node@npm:10.9.1" dependencies: @@ -16071,15 +16020,6 @@ __metadata: languageName: node linkType: hard -"tunnel-agent@npm:^0.6.0": - version: 0.6.0 - resolution: "tunnel-agent@npm:0.6.0" - dependencies: - safe-buffer: "npm:^5.0.1" - checksum: 10/7f0d9ed5c22404072b2ae8edc45c071772affd2ed14a74f03b4e71b4dd1a14c3714d85aed64abcaaee5fec2efc79002ba81155c708f4df65821b444abb0cfade - languageName: node - linkType: hard - "tunnel@npm:0.0.6": version: 0.0.6 resolution: "tunnel@npm:0.0.6" @@ -16087,13 +16027,6 @@ __metadata: languageName: node linkType: hard -"tweetnacl@npm:^0.14.3, tweetnacl@npm:~0.14.0": - version: 0.14.5 - resolution: "tweetnacl@npm:0.14.5" - checksum: 10/04ee27901cde46c1c0a64b9584e04c96c5fe45b38c0d74930710751ea991408b405747d01dfae72f80fc158137018aea94f9c38c651cb9c318f0861a310c3679 - languageName: node - linkType: hard - "type-check@npm:^0.4.0, type-check@npm:~0.4.0": version: 0.4.0 resolution: "type-check@npm:0.4.0" @@ -16240,7 +16173,7 @@ __metadata: languageName: node linkType: hard -"typescript@npm:4.9.5, typescript@npm:^4.2.4, typescript@npm:^4.6.4": +"typescript@npm:4.9.5, typescript@npm:^4.2.4": version: 4.9.5 resolution: "typescript@npm:4.9.5" bin: @@ -16270,7 +16203,7 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@npm%3A4.9.5#optional!builtin, typescript@patch:typescript@npm%3A^4.2.4#optional!builtin, typescript@patch:typescript@npm%3A^4.6.4#optional!builtin": +"typescript@patch:typescript@npm%3A4.9.5#optional!builtin, typescript@patch:typescript@npm%3A^4.2.4#optional!builtin": version: 4.9.5 resolution: "typescript@patch:typescript@npm%3A4.9.5#optional!builtin::version=4.9.5&hash=289587" bin: @@ -16316,6 +16249,13 @@ __metadata: languageName: node linkType: hard +"undici-types@npm:~5.26.4": + version: 5.26.5 + resolution: "undici-types@npm:5.26.5" + checksum: 10/0097779d94bc0fd26f0418b3a05472410408877279141ded2bd449167be1aed7ea5b76f756562cb3586a07f251b90799bab22d9019ceba49c037c76445f7cddd + languageName: node + linkType: hard + "unicode-emoji-modifier-base@npm:^1.0.0": version: 1.0.0 resolution: "unicode-emoji-modifier-base@npm:1.0.0" @@ -16472,6 +16412,13 @@ __metadata: languageName: node linkType: hard +"universal-user-agent@npm:^7.0.0, universal-user-agent@npm:^7.0.2": + version: 7.0.2 + resolution: "universal-user-agent@npm:7.0.2" + checksum: 10/3f02cb6de0bb9fbaf379566bd0320d8e46af6e4358a2e88fce7e70687ed7b48b37f479d728bb22f4204a518e363f3038ac4841c033af1ee2253f6428a6c67e53 + languageName: node + linkType: hard + "universalify@npm:^0.1.0": version: 0.1.2 resolution: "universalify@npm:0.1.2" @@ -16676,15 +16623,6 @@ __metadata: languageName: node linkType: hard -"uuid@npm:^3.3.2": - version: 3.4.0 - resolution: "uuid@npm:3.4.0" - bin: - uuid: ./bin/uuid - checksum: 10/4f2b86432b04cc7c73a0dd1bcf11f1fc18349d65d2e4e32dd0fc658909329a1e0cc9244aa93f34c0cccfdd5ae1af60a149251a5f420ec3ac4223a3dab198fb2e - languageName: node - linkType: hard - "uuid@npm:^8.3.2": version: 8.3.2 resolution: "uuid@npm:8.3.2" @@ -16727,17 +16665,6 @@ __metadata: languageName: node linkType: hard -"verror@npm:1.10.0": - version: 1.10.0 - resolution: "verror@npm:1.10.0" - dependencies: - assert-plus: "npm:^1.0.0" - core-util-is: "npm:1.0.2" - extsprintf: "npm:^1.2.0" - checksum: 10/da548149dd9c130a8a2587c9ee71ea30128d1526925707e2d01ed9c5c45c9e9f86733c66a328247cdd5f7c1516fb25b0f959ba754bfbe15072aa99ff96468a29 - languageName: node - linkType: hard - "vfile-message@npm:^2.0.0": version: 2.0.4 resolution: "vfile-message@npm:2.0.4" @@ -17355,6 +17282,13 @@ __metadata: languageName: node linkType: hard +"yoctocolors@npm:^2.0.0": + version: 2.1.1 + resolution: "yoctocolors@npm:2.1.1" + checksum: 10/563fbec88bce9716d1044bc98c96c329e1d7a7c503e6f1af68f1ff914adc3ba55ce953c871395e2efecad329f85f1632f51a99c362032940321ff80c42a6f74d + languageName: node + linkType: hard + "zwitch@npm:^1.0.0": version: 1.0.5 resolution: "zwitch@npm:1.0.5" From c542a5883c859fb4556d3f034ecb0d5fc9187108 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Mon, 16 Sep 2024 03:28:03 +0200 Subject: [PATCH 07/69] fix(cli): remove mocha plugin BREAKING CHANGE: remove mocha plugin. use jest or vitest instead. --- packages/cli-plugin-mocha/.npmignore | 8 --- packages/cli-plugin-mocha/package.json | 35 ---------- packages/cli-plugin-mocha/readme.md | 31 --------- .../scripts/templateDir.esm.js | 6 -- .../src/CliPluginMochaModule.ts | 49 ------------- .../src/hooks/MochaGenerateHook.ts | 68 ------------------- .../src/hooks/MochaInitHook.ts | 50 -------------- packages/cli-plugin-mocha/src/index.ts | 5 -- .../cli-plugin-mocha/src/utils/templateDir.ts | 3 - .../generate/decorator.class.spec.hbs | 12 ---- .../generate/decorator.endpoint.spec.hbs | 16 ----- .../generate/decorator.method.spec.hbs | 14 ---- .../generate/decorator.param.spec.hbs | 15 ---- .../generate/decorator.parameter.spec.hbs | 13 ---- .../generate/decorator.prop.spec.hbs | 16 ----- .../generate/decorator.property.spec.hbs | 14 ---- .../generate/generic.integration.hbs | 21 ------ .../templates/generate/generic.spec.hbs | 15 ---- .../templates/generate/model.spec.hbs | 8 --- .../templates/generate/server.integration.hbs | 21 ------ .../templates/init/.mocharc.js.hbs | 11 --- .../templates/init/.nycrc.hbs | 26 ------- .../templates/init/register.js.hbs | 12 ---- packages/cli-plugin-mocha/tsconfig.esm.json | 26 ------- packages/cli-plugin-mocha/tsconfig.json | 19 ------ packages/cli-plugin-mocha/tsconfig.spec.json | 36 ---------- packages/cli-plugin-mocha/vitest.config.mts | 21 ------ .../commands/init/config/FeaturesPrompt.ts | 9 +-- .../init/prompts/getFeaturesPrompt.spec.ts | 7 -- 29 files changed, 1 insertion(+), 586 deletions(-) delete mode 100644 packages/cli-plugin-mocha/.npmignore delete mode 100644 packages/cli-plugin-mocha/package.json delete mode 100644 packages/cli-plugin-mocha/readme.md delete mode 100644 packages/cli-plugin-mocha/scripts/templateDir.esm.js delete mode 100644 packages/cli-plugin-mocha/src/CliPluginMochaModule.ts delete mode 100644 packages/cli-plugin-mocha/src/hooks/MochaGenerateHook.ts delete mode 100644 packages/cli-plugin-mocha/src/hooks/MochaInitHook.ts delete mode 100644 packages/cli-plugin-mocha/src/index.ts delete mode 100644 packages/cli-plugin-mocha/src/utils/templateDir.ts delete mode 100644 packages/cli-plugin-mocha/templates/generate/decorator.class.spec.hbs delete mode 100644 packages/cli-plugin-mocha/templates/generate/decorator.endpoint.spec.hbs delete mode 100644 packages/cli-plugin-mocha/templates/generate/decorator.method.spec.hbs delete mode 100644 packages/cli-plugin-mocha/templates/generate/decorator.param.spec.hbs delete mode 100644 packages/cli-plugin-mocha/templates/generate/decorator.parameter.spec.hbs delete mode 100644 packages/cli-plugin-mocha/templates/generate/decorator.prop.spec.hbs delete mode 100644 packages/cli-plugin-mocha/templates/generate/decorator.property.spec.hbs delete mode 100644 packages/cli-plugin-mocha/templates/generate/generic.integration.hbs delete mode 100644 packages/cli-plugin-mocha/templates/generate/generic.spec.hbs delete mode 100644 packages/cli-plugin-mocha/templates/generate/model.spec.hbs delete mode 100644 packages/cli-plugin-mocha/templates/generate/server.integration.hbs delete mode 100644 packages/cli-plugin-mocha/templates/init/.mocharc.js.hbs delete mode 100644 packages/cli-plugin-mocha/templates/init/.nycrc.hbs delete mode 100644 packages/cli-plugin-mocha/templates/init/register.js.hbs delete mode 100644 packages/cli-plugin-mocha/tsconfig.esm.json delete mode 100644 packages/cli-plugin-mocha/tsconfig.json delete mode 100644 packages/cli-plugin-mocha/tsconfig.spec.json delete mode 100644 packages/cli-plugin-mocha/vitest.config.mts diff --git a/packages/cli-plugin-mocha/.npmignore b/packages/cli-plugin-mocha/.npmignore deleted file mode 100644 index 672ed7652..000000000 --- a/packages/cli-plugin-mocha/.npmignore +++ /dev/null @@ -1,8 +0,0 @@ -src -test -coverage -tsconfig.json -tsconfig.*.json -__mock__ -*.spec.js -*.tsbuildinfo diff --git a/packages/cli-plugin-mocha/package.json b/packages/cli-plugin-mocha/package.json deleted file mode 100644 index 2f6388251..000000000 --- a/packages/cli-plugin-mocha/package.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "name": "@tsed/cli-plugin-mocha", - "description": "Ts.ED CLI plugin. Add Mocha support", - "version": "5.2.10", - "type": "module", - "main": "./lib/esm/index.js", - "source": "./src/index.ts", - "module": "./lib/esm/index.js", - "typings": "./lib/types/index.d.ts", - "exports": { - ".": { - "types": "./lib/types/index.d.ts", - "import": "./lib/esm/index.js", - "require": "./lib/cjs/index.js", - "default": "./lib/esm/index.js" - } - }, - "scripts": { - "build": "yarn build:ts", - "build:ts": "tsc --build tsconfig.json", - "test": "vitest run", - "test:ci": "vitest run --coverage.thresholds.autoUpdate=true" - }, - "devDependencies": { - "@tsed/cli": "workspace:*", - "@tsed/cli-core": "workspace:*", - "@tsed/typescript": "workspace:*", - "cross-env": "7.0.3", - "typescript": "4.9.5", - "vitest": "2.1.1" - }, - "dependencies": { - "tslib": "2.3.1" - } -} diff --git a/packages/cli-plugin-mocha/readme.md b/packages/cli-plugin-mocha/readme.md deleted file mode 100644 index db8d7ac0d..000000000 --- a/packages/cli-plugin-mocha/readme.md +++ /dev/null @@ -1,31 +0,0 @@ -# @tsed/cli-plugin-mocha - -

- Ts.ED logo -

- -[![Build & Release](https://github.com/tsedio/tsed-cli/workflows/Build%20&%20Release/badge.svg?branch=master)](https://github.com/tsedio/tsed-cli/actions?query=workflow%3A%22Build+%26+Release%22) - -> Ts.ED CLI plugin. Add Mocha support - -## Features - -Please refer to the [documentation](https://cli.tsed.io/) for more details. - -## Installation - -```bash -npm install -g @tsed/cli-plugin-mocha -``` - -## Contributors -Please read [contributing guidelines here](https://tsed.io/CONTRIBUTING.html) - - - - -## Backers - -Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/tsed#backer)] - - diff --git a/packages/cli-plugin-mocha/scripts/templateDir.esm.js b/packages/cli-plugin-mocha/scripts/templateDir.esm.js deleted file mode 100644 index 7fa172434..000000000 --- a/packages/cli-plugin-mocha/scripts/templateDir.esm.js +++ /dev/null @@ -1,6 +0,0 @@ -import path from "node:path"; -import {fileURLToPath} from "node:url"; - -import {getTemplateDirectory} from "@tsed/cli-core"; - -export const TEMPLATE_DIR = getTemplateDirectory(path.dirname(fileURLToPath(import.meta.url))); diff --git a/packages/cli-plugin-mocha/src/CliPluginMochaModule.ts b/packages/cli-plugin-mocha/src/CliPluginMochaModule.ts deleted file mode 100644 index 47fd3e327..000000000 --- a/packages/cli-plugin-mocha/src/CliPluginMochaModule.ts +++ /dev/null @@ -1,49 +0,0 @@ -import {RuntimesModule} from "@tsed/cli"; -import {Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core"; -import {Inject} from "@tsed/di"; - -import {MochaGenerateHook} from "./hooks/MochaGenerateHook.js"; -import {MochaInitHook} from "./hooks/MochaInitHook.js"; - -@Module({ - imports: [MochaInitHook, MochaGenerateHook] -}) -export class CliPluginMochaModule { - @Inject() - runtimes: RuntimesModule; - - @Inject() - packageJson: ProjectPackageJson; - - @OnAdd("@tsed/cli-plugin-mocha") - install() { - this.addScripts(); - this.addDevDependencies(); - } - - addScripts() { - const runtime = this.runtimes.get(); - - this.packageJson.addScripts({ - test: `${runtime.run("test:unit")} && ${runtime.run("test:coverage")} `, - "test:unit": "cross-env NODE_ENV=test mocha", - "test:coverage": "cross-env NODE_ENV=test nyc mocha" - }); - } - - addDevDependencies() { - this.packageJson.addDevDependencies({ - "@types/chai": "latest", - "@types/chai-as-promised": "latest", - "@types/mocha": "latest", - "@types/sinon": "latest", - "@types/sinon-chai": "latest", - chai: "latest", - "chai-as-promised": "latest", - mocha: "latest", - nyc: "latest", - sinon: "latest", - "sinon-chai": "latest" - }); - } -} diff --git a/packages/cli-plugin-mocha/src/hooks/MochaGenerateHook.ts b/packages/cli-plugin-mocha/src/hooks/MochaGenerateHook.ts deleted file mode 100644 index 28ce4c995..000000000 --- a/packages/cli-plugin-mocha/src/hooks/MochaGenerateHook.ts +++ /dev/null @@ -1,68 +0,0 @@ -import {GenerateCmdContext} from "@tsed/cli"; -import {Inject, Injectable, OnExec, SrcRendererService, Tasks} from "@tsed/cli-core"; -import normalizePath from "normalize-path"; - -import {TEMPLATE_DIR} from "../utils/templateDir.js"; - -@Injectable() -export class MochaGenerateHook { - @Inject() - srcRenderService: SrcRendererService; - - @OnExec("generate") - onExec(ctx: GenerateCmdContext): Tasks { - const {symbolPath} = ctx; - const {specTemplate, integrationTemplate, relativeSrcPath} = this.mapOptions(ctx); - - return [ - { - title: `Generate ${ctx.type} spec file to '${symbolPath}.spec.ts'`, - enabled() { - return !(ctx.type === "server" || ctx.type.includes(":dataSource") || ctx.type.includes(":connection")); - }, - task: () => - this.srcRenderService.render( - specTemplate, - {...ctx, relativeSrcPath}, - { - output: `${symbolPath}.spec.ts`, - templateDir: TEMPLATE_DIR - } - ) - }, - { - title: `Generate ${ctx.type} integration file '${symbolPath}.integration.spec.ts'`, - enabled() { - return ["controller", "server"].includes(ctx.type); - }, - task: () => - this.srcRenderService.render( - integrationTemplate, - {...ctx, relativeSrcPath}, - { - output: `${symbolPath}.integration.spec.ts`, - templateDir: TEMPLATE_DIR - } - ) - } - ]; - } - - private mapOptions(options: GenerateCmdContext) { - const type = [options.type, options.templateType].filter(Boolean).join("."); - - const specTemplate = this.srcRenderService.templateExists(`generate/${type}.spec.hbs`, {templateDir: TEMPLATE_DIR}) - ? `generate/${type}.spec.hbs` - : "generate/generic.spec.hbs"; - - const integrationTemplate = this.srcRenderService.templateExists(`generate/${type}.integration.hbs`, {templateDir: TEMPLATE_DIR}) - ? `generate/${type}.integration.hbs` - : "generate/generic.integration.hbs"; - - return { - specTemplate, - integrationTemplate, - relativeSrcPath: normalizePath(this.srcRenderService.relativeFrom(`${options.symbolPath}.integration.spec.ts`)) - }; - } -} diff --git a/packages/cli-plugin-mocha/src/hooks/MochaInitHook.ts b/packages/cli-plugin-mocha/src/hooks/MochaInitHook.ts deleted file mode 100644 index 1e1934c6d..000000000 --- a/packages/cli-plugin-mocha/src/hooks/MochaInitHook.ts +++ /dev/null @@ -1,50 +0,0 @@ -import { - Inject, - Injectable, - OnExec, - ProjectPackageJson, - RootRendererService, - ScriptsRendererService, - SrcRendererService -} from "@tsed/cli-core"; -import {join} from "path"; - -import {TEMPLATE_DIR} from "../utils/templateDir.js"; - -@Injectable() -export class MochaInitHook { - @Inject() - protected packageJson: ProjectPackageJson; - - @Inject() - protected srcRenderer: SrcRendererService; - - @Inject() - protected rootRenderer: RootRendererService; - - @Inject() - protected scriptsRenderer: ScriptsRendererService; - - @OnExec("init") - onExec() { - return [ - { - title: "Generate files for mocha", - task: (ctx: any) => { - return this.rootRenderer.renderAll([".mocharc.js.hbs", ".nycrc.hbs"], ctx, { - templateDir: `${TEMPLATE_DIR}/init` - }); - } - }, - { - title: "Generate scripts files for mocha", - task: (ctx: any) => { - return this.scriptsRenderer.renderAll(["register.js.hbs"], ctx, { - templateDir: `${TEMPLATE_DIR}/init`, - rootDir: join(this.scriptsRenderer.rootDir, "mocha") - }); - } - } - ]; - } -} diff --git a/packages/cli-plugin-mocha/src/index.ts b/packages/cli-plugin-mocha/src/index.ts deleted file mode 100644 index d924931db..000000000 --- a/packages/cli-plugin-mocha/src/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -import {CliPluginMochaModule} from "./CliPluginMochaModule.js"; - -export * from "./utils/templateDir.js"; - -export default CliPluginMochaModule; diff --git a/packages/cli-plugin-mocha/src/utils/templateDir.ts b/packages/cli-plugin-mocha/src/utils/templateDir.ts deleted file mode 100644 index 2ccfa6ef6..000000000 --- a/packages/cli-plugin-mocha/src/utils/templateDir.ts +++ /dev/null @@ -1,3 +0,0 @@ -import {getTemplateDirectory} from "@tsed/cli-core"; - -export const TEMPLATE_DIR = getTemplateDirectory(import.meta.dirname); diff --git a/packages/cli-plugin-mocha/templates/generate/decorator.class.spec.hbs b/packages/cli-plugin-mocha/templates/generate/decorator.class.spec.hbs deleted file mode 100644 index f7d546501..000000000 --- a/packages/cli-plugin-mocha/templates/generate/decorator.class.spec.hbs +++ /dev/null @@ -1,12 +0,0 @@ -import { expect } from "chai"; -import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; - -describe("{{symbolName}}", () => { - it("should do something", () => { - @{{symbolName}}() - class Test { - } - - expect({{symbolName}}).to.be.a("function") - }); -}); diff --git a/packages/cli-plugin-mocha/templates/generate/decorator.endpoint.spec.hbs b/packages/cli-plugin-mocha/templates/generate/decorator.endpoint.spec.hbs deleted file mode 100644 index 40ec80b58..000000000 --- a/packages/cli-plugin-mocha/templates/generate/decorator.endpoint.spec.hbs +++ /dev/null @@ -1,16 +0,0 @@ -import { expect } from "chai"; -import { Store } from "@tsed/core"; -import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; - -describe("{{symbolName}}", () => { - it("should store options", () => { - class Test { - @{{symbolName}}({options: "options"}) - method() param: string){} - } - - const store = Store.fromMethod(Test, "method"); - - expect(store.get({{symbolName}})).to.deep.eq({options: "options"}); - }); -}); diff --git a/packages/cli-plugin-mocha/templates/generate/decorator.method.spec.hbs b/packages/cli-plugin-mocha/templates/generate/decorator.method.spec.hbs deleted file mode 100644 index ff6530ccd..000000000 --- a/packages/cli-plugin-mocha/templates/generate/decorator.method.spec.hbs +++ /dev/null @@ -1,14 +0,0 @@ -import { expect } from "chai"; -import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; - -describe("{{symbolName}}", () => { - it("should do something", () => { - class Test { - @{{symbolName}}() - method(){} - } - - expect({{symbolName}}).to.be.a("function") - expect({{symbolName}}()).to.be.a("function") - }); -}); diff --git a/packages/cli-plugin-mocha/templates/generate/decorator.param.spec.hbs b/packages/cli-plugin-mocha/templates/generate/decorator.param.spec.hbs deleted file mode 100644 index 85120a5bb..000000000 --- a/packages/cli-plugin-mocha/templates/generate/decorator.param.spec.hbs +++ /dev/null @@ -1,15 +0,0 @@ -import { expect } from "chai"; -import { Store } from "@tsed/core"; -import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; - -describe("{{symbolName}}", () => { - it("should store options", () => { - class Test { - method(@{{symbolName}}({options: "options"}) param: string){} - } - - const store = Store.from(Test, "method", 0) - - expect(store.get({{symbolName}})).to.deep.eq({options: "options"}); - }); -}); diff --git a/packages/cli-plugin-mocha/templates/generate/decorator.parameter.spec.hbs b/packages/cli-plugin-mocha/templates/generate/decorator.parameter.spec.hbs deleted file mode 100644 index 2d5d05bed..000000000 --- a/packages/cli-plugin-mocha/templates/generate/decorator.parameter.spec.hbs +++ /dev/null @@ -1,13 +0,0 @@ -import { expect } from "chai"; -import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; - -describe("{{symbolName}}", () => { - it("should do something", () => { - class Test { - method(@{{symbolName}}() param: string){} - } - - expect({{symbolName}}).to.be.a("function") - expect({{symbolName}}()).to.be.a("function") - }); -}); diff --git a/packages/cli-plugin-mocha/templates/generate/decorator.prop.spec.hbs b/packages/cli-plugin-mocha/templates/generate/decorator.prop.spec.hbs deleted file mode 100644 index 35b0581b9..000000000 --- a/packages/cli-plugin-mocha/templates/generate/decorator.prop.spec.hbs +++ /dev/null @@ -1,16 +0,0 @@ -import { expect } from "chai"; -import { Store } from "@tsed/core"; -import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; - -describe("{{symbolName}}", () => { - it("should store options", () => { - class Test { - @{{symbolName}}({options: "options"}) - property: string; - } - - const store = Store.from(Test, "property"); - - expect(store.get({{symbolName}})).to.deep.eq({options: "options"}); - }); -}); diff --git a/packages/cli-plugin-mocha/templates/generate/decorator.property.spec.hbs b/packages/cli-plugin-mocha/templates/generate/decorator.property.spec.hbs deleted file mode 100644 index 97bda53e2..000000000 --- a/packages/cli-plugin-mocha/templates/generate/decorator.property.spec.hbs +++ /dev/null @@ -1,14 +0,0 @@ -import { expect } from "chai"; -import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; - -describe("{{symbolName}}", () => { - it("should do something", () => { - class Test { - @{{symbolName}}() - property: string; - } - - expect({{symbolName}}).to.be.a("function") - expect({{symbolName}}()).to.be.a("function") - }); -}); diff --git a/packages/cli-plugin-mocha/templates/generate/generic.integration.hbs b/packages/cli-plugin-mocha/templates/generate/generic.integration.hbs deleted file mode 100644 index d5330375f..000000000 --- a/packages/cli-plugin-mocha/templates/generate/generic.integration.hbs +++ /dev/null @@ -1,21 +0,0 @@ -import { expect } from "chai"; -import { PlatformTest } from "@tsed/common"; -import SuperTest from "supertest"; -import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; -import { Server } from "{{relativeSrcPath}}/Server.js"; - -describe("{{symbolName}}", () => { - beforeEach(PlatformTest.bootstrap(Server, { - mount: { - "/": {{symbolName}} - } - })); - afterEach(PlatformTest.reset); - - it("should call GET {{route}}", async () => { - const request = SuperTest(PlatformTest.callback()); - const response = await request.get("{{route}}").expect(200); - - expect(response.text).to.eq("hello"); - }); -}); diff --git a/packages/cli-plugin-mocha/templates/generate/generic.spec.hbs b/packages/cli-plugin-mocha/templates/generate/generic.spec.hbs deleted file mode 100644 index 02670764a..000000000 --- a/packages/cli-plugin-mocha/templates/generate/generic.spec.hbs +++ /dev/null @@ -1,15 +0,0 @@ -import { expect } from "chai"; -import { PlatformTest } from "@tsed/common"; -import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; - -describe("{{symbolName}}", () => { - beforeEach(PlatformTest.create); - afterEach(PlatformTest.reset); - - it("should do something", () => { - const instance = PlatformTest.get<{{symbolName}}>({{symbolName}}); - // const instance = PlatformTest.invoke<{{symbolName}}>({{symbolName}}); // get fresh instance - - expect(instance).to.be.instanceof({{symbolName}}); - }); -}); diff --git a/packages/cli-plugin-mocha/templates/generate/model.spec.hbs b/packages/cli-plugin-mocha/templates/generate/model.spec.hbs deleted file mode 100644 index 2dd3d9211..000000000 --- a/packages/cli-plugin-mocha/templates/generate/model.spec.hbs +++ /dev/null @@ -1,8 +0,0 @@ -import { expect } from "chai"; -import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; - -describe("{{symbolName}}", () => { - it("should do something", () => { - expect(new {{symbolName}}()).to.be.instanceof({{symbolName}}); - }); -}); diff --git a/packages/cli-plugin-mocha/templates/generate/server.integration.hbs b/packages/cli-plugin-mocha/templates/generate/server.integration.hbs deleted file mode 100644 index a31db5cd1..000000000 --- a/packages/cli-plugin-mocha/templates/generate/server.integration.hbs +++ /dev/null @@ -1,21 +0,0 @@ -import { PlatformTest } from "@tsed/common"; -import SuperTest from "supertest"; -import {expect} from "chai"; -import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; - -describe("{{symbolName}}", () => { - beforeEach(PlatformTest.bootstrap({{symbolName}})); - afterEach(PlatformTest.reset); - - it("should call GET {{route}}", async () => { - const request = SuperTest(PlatformTest.callback()); - const response = await request.get("{{route}}").expect(404); - - expect(response.body).to.deep.equal({ - errors: [], - message: 'Resource "/rest" not found', - name: "NOT_FOUND", - status: 404, - }); - }); -}); diff --git a/packages/cli-plugin-mocha/templates/init/.mocharc.js.hbs b/packages/cli-plugin-mocha/templates/init/.mocharc.js.hbs deleted file mode 100644 index 5ed23cea0..000000000 --- a/packages/cli-plugin-mocha/templates/init/.mocharc.js.hbs +++ /dev/null @@ -1,11 +0,0 @@ -module.exports = { - require: [ - "ts-node/register/transpile-only", - "scripts/mocha/register" - ], - recursive: true, - reporter: "dot", - spec: [ - "{{srcDir}}/**/*.spec.ts" - ] -}; diff --git a/packages/cli-plugin-mocha/templates/init/.nycrc.hbs b/packages/cli-plugin-mocha/templates/init/.nycrc.hbs deleted file mode 100644 index ca5296a4d..000000000 --- a/packages/cli-plugin-mocha/templates/init/.nycrc.hbs +++ /dev/null @@ -1,26 +0,0 @@ -{ - "include": [ - "{{srcDir}}/**/*.ts" - ], - "exclude": [ - "node_modules", - "**/*.d.ts", - "**/index.ts", - "**/interfaces/**", - "**/*.spec.ts" - ], - "reporter": [ - "text-summary", - "html", - "lcov" - ], - "extension": [ - ".ts" - ], - "check-coverage": true, - "lines": 70, - "statements": 70, - "functions": 70, - "branches": 70, - "all": true -} diff --git a/packages/cli-plugin-mocha/templates/init/register.js.hbs b/packages/cli-plugin-mocha/templates/init/register.js.hbs deleted file mode 100644 index d811dae63..000000000 --- a/packages/cli-plugin-mocha/templates/init/register.js.hbs +++ /dev/null @@ -1,12 +0,0 @@ -const Chai = require("chai"); -const ChaiAsPromised = require("chai-as-promised"); -const SinonChai = require("sinon-chai"); - -Chai.should(); -Chai.use(SinonChai); -Chai.use(ChaiAsPromised); - -process.on("unhandledRejection", (reason, p) => { - console.log("Unhandled Rejection at: Promise", p, "reason:", reason); - // application specific logging, throwing an error, or other logic here -}); diff --git a/packages/cli-plugin-mocha/tsconfig.esm.json b/packages/cli-plugin-mocha/tsconfig.esm.json deleted file mode 100644 index 45d441a7d..000000000 --- a/packages/cli-plugin-mocha/tsconfig.esm.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "extends": "@tsed/typescript/tsconfig.node.json", - "compilerOptions": { - "baseUrl": ".", - "rootDir": "src", - "outDir": "./lib/esm", - "declarationDir": "./lib/types", - "declaration": true, - "composite": true, - "noEmit": false - }, - "include": ["src", "src/**/*.json"], - "exclude": [ - "node_modules", - "test", - "lib", - "benchmark", - "coverage", - "spec", - "**/*.benchmark.ts", - "**/*.spec.ts", - "keys", - "**/__mock__/**", - "webpack.config.js" - ] -} diff --git a/packages/cli-plugin-mocha/tsconfig.json b/packages/cli-plugin-mocha/tsconfig.json deleted file mode 100644 index cf03b6beb..000000000 --- a/packages/cli-plugin-mocha/tsconfig.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "extends": "@tsed/typescript/tsconfig.node.json", - "compilerOptions": { - "baseUrl": ".", - "noEmit": true - }, - "include": [], - "references": [ - { - "path": "../cli/tsconfig.json" - }, - { - "path": "../cli-core/tsconfig.json" - }, - { - "path": "./tsconfig.esm.json" - } - ] -} diff --git a/packages/cli-plugin-mocha/tsconfig.spec.json b/packages/cli-plugin-mocha/tsconfig.spec.json deleted file mode 100644 index 079424388..000000000 --- a/packages/cli-plugin-mocha/tsconfig.spec.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "extends": "@tsed/typescript/tsconfig.node.json", - "compilerOptions": { - "baseUrl": ".", - "rootDir": "..", - "module": "commonjs", - "outDir": "./lib/cjs", - "declaration": false, - "composite": false, - "noEmit": true, - "paths": { - "@tsed/openspec": ["../specs/openspec/src"], - "@tsed/schema": ["../specs/schema/src"], - "@tsed/exceptions": ["../specs/exceptions/src"], - "@tsed/json-mapper": ["../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../platform/platform-router/src"], - "@tsed/platform-views": ["../platform/platform-views/src"], - "@tsed/components-scan": ["../third-parties/components-scan/src"], - "@tsed/common": ["../platform/common/src"], - "@tsed/ajv": ["../specs/ajv/src"], - "@tsed/platform-cache": ["../platform/platform-cache/src"], - "@tsed/swagger": ["../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../platform/platform-express/src"], - "@tsed/platform-koa": ["../platform/platform-koa/src"] - }, - "types": ["vite/client", "vitest/globals"] - }, - "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], - "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] -} diff --git a/packages/cli-plugin-mocha/vitest.config.mts b/packages/cli-plugin-mocha/vitest.config.mts deleted file mode 100644 index d759e8179..000000000 --- a/packages/cli-plugin-mocha/vitest.config.mts +++ /dev/null @@ -1,21 +0,0 @@ -// @ts-ignore -import {presets} from "@tsed/vitest/presets"; -import {defineConfig} from "vitest/config"; - -export default defineConfig( - { - ...presets, - test: { - ...presets.test, - coverage: { - ...presets.test.coverage, - thresholds: { - statements: 0, - branches: 0, - functions: 0, - lines: 0 - } - } - } - } -); diff --git a/packages/cli/src/commands/init/config/FeaturesPrompt.ts b/packages/cli/src/commands/init/config/FeaturesPrompt.ts index 7d28d12e7..7aae55bec 100644 --- a/packages/cli/src/commands/init/config/FeaturesPrompt.ts +++ b/packages/cli/src/commands/init/config/FeaturesPrompt.ts @@ -46,7 +46,6 @@ export enum FeatureType { TESTING = "testing", JEST = "jest", VITEST = "vitest", - MOCHA = "mocha", LINTER = "linter", ESLINT = "eslint", LINT_STAGED = "lintstaged", @@ -239,12 +238,6 @@ export const FeaturesMap: Record = { "@tsed/cli-plugin-jest": "{{cliVersion}}" } }, - [FeatureType.MOCHA]: { - name: "Mocha + Chai + Sinon", - devDependencies: { - "@tsed/cli-plugin-mocha": "{{cliVersion}}" - } - }, [FeatureType.ESLINT]: { name: "EsLint", checked: true, @@ -372,7 +365,7 @@ export const FeaturesPrompt = (availableRuntimes: string[], availablePackageMana type: "list", name: "featuresTesting", when: hasFeature(FeatureType.TESTING), - choices: [FeatureType.VITEST, FeatureType.JEST, FeatureType.MOCHA] + choices: [FeatureType.VITEST, FeatureType.JEST] }, { message: "Choose linter tools framework", diff --git a/packages/cli/src/commands/init/prompts/getFeaturesPrompt.spec.ts b/packages/cli/src/commands/init/prompts/getFeaturesPrompt.spec.ts index 71bd6e50e..3f12491bc 100644 --- a/packages/cli/src/commands/init/prompts/getFeaturesPrompt.spec.ts +++ b/packages/cli/src/commands/init/prompts/getFeaturesPrompt.spec.ts @@ -269,13 +269,6 @@ describe("getFeaturesPrompt", () => { "name": "Jest", "value": "jest", }, - { - "devDependencies": { - "@tsed/cli-plugin-mocha": "{{cliVersion}}", - }, - "name": "Mocha + Chai + Sinon", - "value": "mocha", - }, ], "message": "Choose unit framework", "name": "featuresTesting", From 673d61c236aaf23288cff167c12fafe87adb3923 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Mon, 16 Sep 2024 03:29:59 +0200 Subject: [PATCH 08/69] fix(cli-core): add update notifier --- packages/cli-core/package.json | 2 +- packages/cli-core/src/CliCore.ts | 5 +- tsconfig.json | 3 - yarn.lock | 166 +++++++++++++++++-------------- 4 files changed, 95 insertions(+), 81 deletions(-) diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index 30d6f3388..6c6de32e3 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -63,7 +63,7 @@ "split": "1.0.1", "tslib": "2.3.1", "tunnel": "0.0.6", - "update-notifier": "7.1.0", + "update-notifier": "7.3.1", "url-parse": "1.5.10", "uuid": "^8.3.2" }, diff --git a/packages/cli-core/src/CliCore.ts b/packages/cli-core/src/CliCore.ts index 6ba95accf..46a6bbb81 100644 --- a/packages/cli-core/src/CliCore.ts +++ b/packages/cli-core/src/CliCore.ts @@ -4,6 +4,7 @@ import chalk from "chalk"; import {Command} from "commander"; import {join, resolve} from "path"; import semver from "semver"; +import updateNotifier from "update-notifier"; import {CliError} from "./domains/CliError.js"; import {CliConfiguration} from "./services/CliConfiguration.js"; @@ -82,9 +83,7 @@ export class CliCore { } static async updateNotifier(pkg: any) { - // const {default: updateNotifier} = await import("update-notifier"); - // - // updateNotifier({pkg, updateCheckInterval: 0}).notify(); + updateNotifier({pkg, updateCheckInterval: 0}).notify(); return this; } diff --git a/tsconfig.json b/tsconfig.json index 8c9699a12..c0be62df6 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -30,9 +30,6 @@ { "path": "./packages/cli-plugin-jest/tsconfig.json" }, - { - "path": "./packages/cli-plugin-mocha/tsconfig.json" - }, { "path": "./packages/cli-plugin-mongoose/tsconfig.json" }, diff --git a/yarn.lock b/yarn.lock index f0117a9e3..5d24944ed 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2313,7 +2313,7 @@ __metadata: tslib: "npm:2.3.1" tunnel: "npm:0.0.6" typescript: "npm:4.9.5" - update-notifier: "npm:7.1.0" + update-notifier: "npm:7.3.1" url-parse: "npm:1.5.10" uuid: "npm:^8.3.2" vitest: "npm:2.1.1" @@ -2399,20 +2399,6 @@ __metadata: languageName: unknown linkType: soft -"@tsed/cli-plugin-mocha@workspace:packages/cli-plugin-mocha": - version: 0.0.0-use.local - resolution: "@tsed/cli-plugin-mocha@workspace:packages/cli-plugin-mocha" - dependencies: - "@tsed/cli": "workspace:*" - "@tsed/cli-core": "workspace:*" - "@tsed/typescript": "workspace:*" - cross-env: "npm:7.0.3" - tslib: "npm:2.3.1" - typescript: "npm:4.9.5" - vitest: "npm:2.1.1" - languageName: unknown - linkType: soft - "@tsed/cli-plugin-mongoose@workspace:packages/cli-plugin-mongoose": version: 0.0.0-use.local resolution: "@tsed/cli-plugin-mongoose@workspace:packages/cli-plugin-mongoose" @@ -4325,6 +4311,16 @@ __metadata: languageName: node linkType: hard +"atomically@npm:^2.0.3": + version: 2.0.3 + resolution: "atomically@npm:2.0.3" + dependencies: + stubborn-fs: "npm:^1.2.5" + when-exit: "npm:^2.1.1" + checksum: 10/c71cd27688a99199bfb441930ebdea8a289d86f210f59351d872aaaff39f4e29b7dfaf47ab593e444ef1b0e29ee5ea870285cc25a43078040c4f6cfc50bbf19a + languageName: node + linkType: hard + "autolinker@npm:~0.28.0": version: 0.28.1 resolution: "autolinker@npm:0.28.1" @@ -4528,19 +4524,19 @@ __metadata: languageName: node linkType: hard -"boxen@npm:^7.1.1": - version: 7.1.1 - resolution: "boxen@npm:7.1.1" +"boxen@npm:^8.0.1": + version: 8.0.1 + resolution: "boxen@npm:8.0.1" dependencies: ansi-align: "npm:^3.0.1" - camelcase: "npm:^7.0.1" - chalk: "npm:^5.2.0" + camelcase: "npm:^8.0.0" + chalk: "npm:^5.3.0" cli-boxes: "npm:^3.0.0" - string-width: "npm:^5.1.2" - type-fest: "npm:^2.13.0" - widest-line: "npm:^4.0.1" - wrap-ansi: "npm:^8.1.0" - checksum: 10/a21d514435ccdd51f11088ad42e6298e3ff6be1bc2801699dcc1d3d79a2c5b005b5384dd03742e91a1ce2d9aedf99996efb36ed5fc7c5c392e19de2404bcfa37 + string-width: "npm:^7.2.0" + type-fest: "npm:^4.21.0" + widest-line: "npm:^5.0.0" + wrap-ansi: "npm:^9.0.0" + checksum: 10/30e2804c3b8d86735817e25961b7861dbfb19adfdc0cf2a0afd8a6dc2e7114de636f86239f4069f81349449d16da3fb33c4100422f41931982bd7d247092a78e languageName: node linkType: hard @@ -4797,10 +4793,10 @@ __metadata: languageName: node linkType: hard -"camelcase@npm:^7.0.1": - version: 7.0.1 - resolution: "camelcase@npm:7.0.1" - checksum: 10/86ab8f3ebf08bcdbe605a211a242f00ed30d8bfb77dab4ebb744dd36efbc84432d1c4adb28975ba87a1b8be40a80fbd1e60e2f06565315918fa7350011a26d3d +"camelcase@npm:^8.0.0": + version: 8.0.0 + resolution: "camelcase@npm:8.0.0" + checksum: 10/6da7abe997af29e80052f17aa21628c7cce14af364cef9f07a2a44d59614dd6f361d405f121938e673424d673697a8c53ad17be8c4b03b0a727307c4db8b5b5e languageName: node linkType: hard @@ -4865,7 +4861,7 @@ __metadata: languageName: node linkType: hard -"chalk@npm:>=5.3.0, chalk@npm:^5.2.0, chalk@npm:^5.3.0": +"chalk@npm:>=5.3.0, chalk@npm:^5.3.0": version: 5.3.0 resolution: "chalk@npm:5.3.0" checksum: 10/6373caaab21bd64c405bfc4bd9672b145647fc9482657b5ea1d549b3b2765054e9d3d928870cdf764fb4aad67555f5061538ff247b8310f110c5c888d92397ea @@ -5488,16 +5484,15 @@ __metadata: languageName: node linkType: hard -"configstore@npm:^6.0.0": - version: 6.0.0 - resolution: "configstore@npm:6.0.0" +"configstore@npm:^7.0.0": + version: 7.0.0 + resolution: "configstore@npm:7.0.0" dependencies: - dot-prop: "npm:^6.0.1" - graceful-fs: "npm:^4.2.6" - unique-string: "npm:^3.0.0" - write-file-atomic: "npm:^3.0.3" - xdg-basedir: "npm:^5.0.1" - checksum: 10/81995351c10bc04c58507f17748477aeac6f47465109d20e3534cebc881d22e927cfd29e73dd852c46c55f62c2b7be4cd1fe6eb3a93ba51f7f9813c218f9bae0 + atomically: "npm:^2.0.3" + dot-prop: "npm:^9.0.0" + graceful-fs: "npm:^4.2.11" + xdg-basedir: "npm:^5.1.0" + checksum: 10/1f8f1ca51d10d5ef54a346e12dd82c81918d28144ff5f41af0a6eb65c394c0e3a37d0f91931516d8964efff8fd8802c6478d13a35a6c7924e7a6c83f11d19c16 languageName: node linkType: hard @@ -6388,12 +6383,12 @@ __metadata: languageName: node linkType: hard -"dot-prop@npm:^6.0.1": - version: 6.0.1 - resolution: "dot-prop@npm:6.0.1" +"dot-prop@npm:^9.0.0": + version: 9.0.0 + resolution: "dot-prop@npm:9.0.0" dependencies: - is-obj: "npm:^2.0.0" - checksum: 10/1200a4f6f81151161b8526c37966d60738cf12619b0ed1f55be01bdb55790bf0a5cd1398b8f2c296dcc07d0a7c2dd0e650baf0b069c367e74bb5df2f6603aba0 + type-fest: "npm:^4.18.2" + checksum: 10/2c2352401818a527f4489df6f27ff74a447ee03f7dbb52c24f25c123be175e1034b6d59946af8fe3cdb8f41946f1a46213e26801c49b0987a4277a275ada1d90 languageName: node linkType: hard @@ -8882,13 +8877,6 @@ __metadata: languageName: node linkType: hard -"import-lazy@npm:^4.0.0": - version: 4.0.0 - resolution: "import-lazy@npm:4.0.0" - checksum: 10/943309cc8eb01ada12700448c288b0384f77a1bc33c7e00fa4cb223c665f467a13ce9aaceb8d2e4cf586b07c1d2828040263dcc069873ce63cfc2ac6fd087971 - languageName: node - linkType: hard - "import-local@npm:3.1.0": version: 3.1.0 resolution: "import-local@npm:3.1.0" @@ -9386,12 +9374,12 @@ __metadata: languageName: node linkType: hard -"is-in-ci@npm:^0.1.0": - version: 0.1.0 - resolution: "is-in-ci@npm:0.1.0" +"is-in-ci@npm:^1.0.0": + version: 1.0.0 + resolution: "is-in-ci@npm:1.0.0" bin: is-in-ci: cli.js - checksum: 10/0479c03f8255d101aaa71cfcbef4175f9d2634d3f70318ed48f68affd63c54b8d3851573744012a18b367c0fdd132c69bbd24b2580d8ee6e40170e57637da376 + checksum: 10/a2e82d04aa729008e31e4b3dda56266f02ffa44109525a9cb2f521f44a2538d2f86227a32ca4f855b0ebd24f976561c368105cacb477ca34b16acb0b766e9103 languageName: node linkType: hard @@ -14470,7 +14458,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:^7.3.8, semver@npm:^7.6.2": +"semver@npm:^7.3.8, semver@npm:^7.6.3": version: 7.6.3 resolution: "semver@npm:7.6.3" bin: @@ -15209,6 +15197,17 @@ __metadata: languageName: node linkType: hard +"string-width@npm:^7.2.0": + version: 7.2.0 + resolution: "string-width@npm:7.2.0" + dependencies: + emoji-regex: "npm:^10.3.0" + get-east-asian-width: "npm:^1.0.0" + strip-ansi: "npm:^7.1.0" + checksum: 10/42f9e82f61314904a81393f6ef75b832c39f39761797250de68c041d8ba4df2ef80db49ab6cd3a292923a6f0f409b8c9980d120f7d32c820b4a8a84a2598a295 + languageName: node + linkType: hard + "string_decoder@npm:^1.1.1": version: 1.3.0 resolution: "string_decoder@npm:1.3.0" @@ -15366,6 +15365,13 @@ __metadata: languageName: node linkType: hard +"stubborn-fs@npm:^1.2.5": + version: 1.2.5 + resolution: "stubborn-fs@npm:1.2.5" + checksum: 10/bd811a7a33f6c7aa2656f41167affd033c8d686eccdd998e8b3b53c0bce0dc78b0e03af97b7fe426196825cd5bc0c649cc3bcc7ef4675b770f3ba47c67463a2e + languageName: node + linkType: hard + "success-symbol@npm:^0.1.0": version: 0.1.0 resolution: "success-symbol@npm:0.1.0" @@ -16120,7 +16126,7 @@ __metadata: languageName: node linkType: hard -"type-fest@npm:^2.12.2, type-fest@npm:^2.13.0": +"type-fest@npm:^2.12.2": version: 2.19.0 resolution: "type-fest@npm:2.19.0" checksum: 10/7bf9e8fdf34f92c8bb364c0af14ca875fac7e0183f2985498b77be129dc1b3b1ad0a6b3281580f19e48c6105c037fb966ad9934520c69c6434d17fd0af4eed78 @@ -16141,6 +16147,13 @@ __metadata: languageName: node linkType: hard +"type-fest@npm:^4.18.2, type-fest@npm:^4.21.0": + version: 4.26.1 + resolution: "type-fest@npm:4.26.1" + checksum: 10/b82676194f80af228cb852e320d2ea8381c89d667d2e4d9f2bdfc8f254bccc039c7741a90c53617a4de0c9fdca8265ed18eb0888cd628f391c5c381c33a9f94b + languageName: node + linkType: hard + "type-fest@npm:^4.6.0, type-fest@npm:^4.7.1": version: 4.10.3 resolution: "type-fest@npm:4.10.3" @@ -16500,23 +16513,21 @@ __metadata: languageName: node linkType: hard -"update-notifier@npm:7.1.0": - version: 7.1.0 - resolution: "update-notifier@npm:7.1.0" +"update-notifier@npm:7.3.1": + version: 7.3.1 + resolution: "update-notifier@npm:7.3.1" dependencies: - boxen: "npm:^7.1.1" + boxen: "npm:^8.0.1" chalk: "npm:^5.3.0" - configstore: "npm:^6.0.0" - import-lazy: "npm:^4.0.0" - is-in-ci: "npm:^0.1.0" + configstore: "npm:^7.0.0" + is-in-ci: "npm:^1.0.0" is-installed-globally: "npm:^1.0.0" is-npm: "npm:^6.0.0" latest-version: "npm:^9.0.0" pupa: "npm:^3.1.0" - semver: "npm:^7.6.2" - semver-diff: "npm:^4.0.0" + semver: "npm:^7.6.3" xdg-basedir: "npm:^5.1.0" - checksum: 10/f84da89f07b1148df7d1fe31972e2f1c449949ba83fa823a3b3a7bab446c42ee1433bab33428b48683e510ff708f5c0da5fc63482853e9d0c7e09c5ea4b02c7d + checksum: 10/1c5a7fe67d85c53f8e5cb811f4a66e0bee2e9d80758635d013ec89e52379e8950afbc2d1b52a2f85f757b6131e120fa40cfa2d3b673e891ba8332921a1626a02 languageName: node linkType: hard @@ -16904,6 +16915,13 @@ __metadata: languageName: node linkType: hard +"when-exit@npm:^2.1.1": + version: 2.1.3 + resolution: "when-exit@npm:2.1.3" + checksum: 10/d4242a15148df89e08e518b4c372580516d45a6ab527f14643a3789c6edb9ccfc788b1d717728c1a33c85dc53badefb511a3ee704ea61c4e86f693f3bf7666f2 + languageName: node + linkType: hard + "which@npm:^1.2.9": version: 1.3.1 resolution: "which@npm:1.3.1" @@ -16976,12 +16994,12 @@ __metadata: languageName: node linkType: hard -"widest-line@npm:^4.0.1": - version: 4.0.1 - resolution: "widest-line@npm:4.0.1" +"widest-line@npm:^5.0.0": + version: 5.0.0 + resolution: "widest-line@npm:5.0.0" dependencies: - string-width: "npm:^5.0.1" - checksum: 10/64c48cf27171221be5f86fc54b94dd29879165bdff1a7aa92dde723d9a8c99fb108312768a5d62c8c2b80b701fa27bbd36a1ddc58367585cd45c0db7920a0cba + string-width: "npm:^7.0.0" + checksum: 10/07f6527b961b88d40ac250596c06fada00cbe049080c6cc8ef4d7bc4f4ab03d7eb1a1c2e5585dd0d8b6ec99ba6f168d5b236edd8ba9221aeb8d914451f0235f9 languageName: node linkType: hard @@ -17081,7 +17099,7 @@ __metadata: languageName: node linkType: hard -"write-file-atomic@npm:^3.0.0, write-file-atomic@npm:^3.0.3": +"write-file-atomic@npm:^3.0.0": version: 3.0.3 resolution: "write-file-atomic@npm:3.0.3" dependencies: @@ -17132,7 +17150,7 @@ __metadata: languageName: node linkType: hard -"xdg-basedir@npm:^5.0.1, xdg-basedir@npm:^5.1.0": +"xdg-basedir@npm:^5.1.0": version: 5.1.0 resolution: "xdg-basedir@npm:5.1.0" checksum: 10/b60e8a2c663ccb1dac77c2d913f3b96de48dafbfa083657171d3d50e10820b8a04bb4edfe9f00808c8c20e5f5355e1927bea9029f03136e29265cb98291e1fea From b8de785cfe70ab38ae63dd944a27fc8e7c10a8db Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Mon, 16 Sep 2024 03:57:28 +0200 Subject: [PATCH 09/69] fix(cli): use @tsed/barrels instead barrelsby to generate barrels --- packages/barrels/.npmignore | 8 + packages/barrels/bin/barrels.js | 89 ++++++++ packages/barrels/package.json | 30 +++ packages/barrels/readme.md | 82 +++++++ packages/barrels/vitest.config.mts | 21 ++ .../init.integration.spec.ts.snap | 4 +- packages/cli-plugin-typegraphql/package.json | 2 +- .../test/init/init.integration.spec.ts | 2 +- .../init/init.integration.spec.ts | 4 +- packages/cli/package.json | 3 + packages/cli/src/commands/init/InitCmd.ts | 4 +- packages/cli/src/commands/run/RunCmd.spec.ts | 41 +--- packages/cli/src/commands/run/RunCmd.ts | 27 +-- packages/cli/src/runtimes/RuntimesModule.ts | 2 +- ...{.barrelsby.json.hbs => .barrels.json.hbs} | 6 +- packages/cli/templates/init/README.md.hbs | 12 +- .../templates/init/docker/npm/Dockerfile.hbs | 2 +- .../templates/init/docker/pnpm/Dockerfile.hbs | 2 +- .../templates/init/docker/yarn/Dockerfile.hbs | 2 +- .../init/docker/yarn_berry/Dockerfile.hbs | 2 +- .../init/init.integration.spec.ts | 40 ++-- yarn.lock | 213 +++++++++++++++++- 22 files changed, 490 insertions(+), 108 deletions(-) create mode 100644 packages/barrels/.npmignore create mode 100755 packages/barrels/bin/barrels.js create mode 100644 packages/barrels/package.json create mode 100644 packages/barrels/readme.md create mode 100644 packages/barrels/vitest.config.mts rename packages/cli/templates/init/{.barrelsby.json.hbs => .barrels.json.hbs} (55%) diff --git a/packages/barrels/.npmignore b/packages/barrels/.npmignore new file mode 100644 index 000000000..672ed7652 --- /dev/null +++ b/packages/barrels/.npmignore @@ -0,0 +1,8 @@ +src +test +coverage +tsconfig.json +tsconfig.*.json +__mock__ +*.spec.js +*.tsbuildinfo diff --git a/packages/barrels/bin/barrels.js b/packages/barrels/bin/barrels.js new file mode 100755 index 000000000..ecf169c45 --- /dev/null +++ b/packages/barrels/bin/barrels.js @@ -0,0 +1,89 @@ +#!/usr/bin/env node +import {existsSync} from "node:fs"; +import {writeFile, readFile} from "node:fs/promises"; +import {join} from "node:path"; +import globby from "globby"; + +function resolveConfig() { + return [ + join(process.cwd(), ".barrelsby.json"), + join(process.cwd(), ".barrels.json") + ].find((path) => { + return existsSync(path); + }); +} + +async function readJSON(path) { + const content = await readFile(path, "utf-8"); + + return JSON.parse(content) +} + +function getConfig() { + const configPath = resolveConfig(); + + if (!configPath) { + return {}; + } + + return readJSON(configPath); +} + +async function cleanIndex(cwd, excluded) { + const patterns = [ + "**/index.ts", + ...excluded + ]; + + const files = await globby(patterns, { + cwd: cwd + }); + + return Promise.all(files.map((file) => fs.unlink(join(cwd, file)))); +} + +async function build() { + const { + directory = ["./src"], + exclude = ["**/__mock__", "**/__mocks__", "**/*.spec.ts", "**/*.benchmark.ts"], + delete: shouldDelete + } = await getConfig(); + + const excluded = exclude + .map((path) => `!${path}`) + .concat(directory.map((path) => `!${path}/index.ts`)); + + const promises = directory + .map(async (directory) => { + const baseIndex = join(process.cwd(), directory); + + const files = await globby([ + "**/*.ts", + "!index.ts", + ...excluded + ], { + cwd: directory + }); + + const exports = files + .sort((a, b) => a.localeCompare(b)) + .map((file) => { + // TODO set .js after all configuration are ok to resolve .js + return `export * from "./${file.replace(".ts", ".js")}";`; + }); + + const content = [ + "/**", + " * @file Automatically generated by @tsed/barrels.", + " */", + ...exports + ]; + + await writeFile(join(baseIndex, "index.ts"), content.join("\n") + "\n", {encoding: "utf8"}); + }); + + await Promise.all(promises); +} + + +await build(); diff --git a/packages/barrels/package.json b/packages/barrels/package.json new file mode 100644 index 000000000..2689b8a80 --- /dev/null +++ b/packages/barrels/package.json @@ -0,0 +1,30 @@ +{ + "name": "@tsed/barrels", + "description": "A simple tool to generate barrels for your TypeScript project", + "version": "5.2.10", + "type": "module", + "main": "./lib/esm/index.js", + "source": "./src/index.ts", + "module": "./lib/esm/index.js", + "typings": "./lib/types/index.d.ts", + "exports": { + ".": { + "types": "./lib/types/index.d.ts", + "import": "./lib/esm/index.js", + "require": "./lib/cjs/index.js", + "default": "./lib/esm/index.js" + } + }, + "bin": "bin/barrels.js", + "files": [], + "keywords": [ + "Ts.ED", + "barrels" + ], + "engines": { + "node": ">=20" + }, + "dependencies": { + "globby": "14.0.2" + } +} diff --git a/packages/barrels/readme.md b/packages/barrels/readme.md new file mode 100644 index 000000000..52d3c4e21 --- /dev/null +++ b/packages/barrels/readme.md @@ -0,0 +1,82 @@ +# @tsed/barrels + +

+ Ts.ED logo +

+ +[![Build & Release](https://github.com/tsedio/tsed-cli/workflows/Build%20&%20Release/badge.svg?branch=master)](https://github.com/tsedio/tsed-cli/actions?query=workflow%3A%22Build+%26+Release%22) +[![npm version](https://badge.fury.io/js/%40tsed%2Fcli.svg)](https://badge.fury.io/js/%40tsed%2Fcli) +[![Known Vulnerabilities](https://snyk.io/test/github/tsedio/tsed-cli/badge.svg)](https://snyk.io/test/github/tsedio/tsed-cli) +[![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release) +[![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier) +[![backers](https://opencollective.com/tsed/tiers/badge.svg)](https://opencollective.com/tsed) + +> A simple tool to generate barrels for your TypeScript project + +## Installation + +```bash +npm install -g @tsed/barrels +``` + +Then create a `barrels.json` configuration: + +``` +{ + "directory": [ + "./src" + ], + "exclude": [ + "**/__mock__", + "**/__mocks__", + "**/*.spec.ts" + ], + "delete": true +} +``` + +## Usage + +```bash +Usage: barrels +``` + +```shell +barrels +``` + +## Contributors + +Please read [contributing guidelines here](https://tsed.io/CONTRIBUTING.html) + + + +## Backers + +Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/tsed#backer)] + + + +## Sponsors + +Support this project by becoming a sponsor. Your logo will show up here with a link to your +website. [[Become a sponsor](https://opencollective.com/tsed#sponsor)] + +## License + +The MIT License (MIT) + +Copyright (c) 2016 - 2023 Romain Lenzotti + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated +documentation files (the "Software"), to deal in the Software without restriction, including without limitation the +rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit +persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/packages/barrels/vitest.config.mts b/packages/barrels/vitest.config.mts new file mode 100644 index 000000000..d759e8179 --- /dev/null +++ b/packages/barrels/vitest.config.mts @@ -0,0 +1,21 @@ +// @ts-ignore +import {presets} from "@tsed/vitest/presets"; +import {defineConfig} from "vitest/config"; + +export default defineConfig( + { + ...presets, + test: { + ...presets.test, + coverage: { + ...presets.test.coverage, + thresholds: { + statements: 0, + branches: 0, + functions: 0, + lines: 0 + } + } + } + } +); diff --git a/packages/cli-plugin-oidc-provider/test/init/__snapshots__/init.integration.spec.ts.snap b/packages/cli-plugin-oidc-provider/test/init/__snapshots__/init.integration.spec.ts.snap index 006756011..d84d4ca99 100644 --- a/packages/cli-plugin-oidc-provider/test/init/__snapshots__/init.integration.spec.ts.snap +++ b/packages/cli-plugin-oidc-provider/test/init/__snapshots__/init.integration.spec.ts.snap @@ -4,7 +4,7 @@ exports[`Init OIDC Provider project > should generate a project with oidc 1`] = [ "./project-name", "project-name", - "project-name/.barrelsby.json", + "project-name/.barrels.json", "project-name/.dockerignore", "project-name/.gitignore", "project-name/Dockerfile", @@ -119,7 +119,7 @@ exports[`Init OIDC Provider project > should generate a project with oidc and sw [ "./project-name", "project-name", - "project-name/.barrelsby.json", + "project-name/.barrels.json", "project-name/.dockerignore", "project-name/.gitignore", "project-name/Dockerfile", diff --git a/packages/cli-plugin-typegraphql/package.json b/packages/cli-plugin-typegraphql/package.json index 5c64acd01..60906c196 100644 --- a/packages/cli-plugin-typegraphql/package.json +++ b/packages/cli-plugin-typegraphql/package.json @@ -18,7 +18,7 @@ "scripts": { "build": "yarn build:ts", "build:ts": "tsc --build tsconfig.json", - "test": "vitest run -u", + "test": "vitest run", "test:ci": "vitest run --coverage.thresholds.autoUpdate=true" }, "files": [ diff --git a/packages/cli-plugin-typegraphql/test/init/init.integration.spec.ts b/packages/cli-plugin-typegraphql/test/init/init.integration.spec.ts index 159e134f7..255ae63c3 100644 --- a/packages/cli-plugin-typegraphql/test/init/init.integration.spec.ts +++ b/packages/cli-plugin-typegraphql/test/init/init.integration.spec.ts @@ -35,7 +35,7 @@ describe("Init TypeGraphQL project", () => { [ "./project-name", "project-name", - "project-name/.barrelsby.json", + "project-name/.barrels.json", "project-name/.dockerignore", "project-name/.gitignore", "project-name/Dockerfile", diff --git a/packages/cli-plugin-typeorm/test/integrations/init/init.integration.spec.ts b/packages/cli-plugin-typeorm/test/integrations/init/init.integration.spec.ts index eab5c5c1d..8caf7e0af 100644 --- a/packages/cli-plugin-typeorm/test/integrations/init/init.integration.spec.ts +++ b/packages/cli-plugin-typeorm/test/integrations/init/init.integration.spec.ts @@ -53,7 +53,7 @@ describe("TypeORM: Init cmd", () => { [ "./project-name", "project-name", - "project-name/.barrelsby.json", + "project-name/.barrels.json", "project-name/.dockerignore", "project-name/.gitignore", "project-name/Dockerfile", @@ -127,7 +127,7 @@ describe("TypeORM: Init cmd", () => { [ "./project-name", "project-name", - "project-name/.barrelsby.json", + "project-name/.barrels.json", "project-name/.dockerignore", "project-name/.gitignore", "project-name/Dockerfile", diff --git a/packages/cli/package.json b/packages/cli/package.json index f5020d3a4..10ac7df71 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -65,6 +65,9 @@ "node": ">=14" }, "dependencies": { + "@swc-node/register": ">=1.10.9", + "@swc/core": ">=1.7.26", + "@swc/helpers": ">=0.5.13", "@tsed/cli-core": "workspace:*", "@tsed/core": ">=7.14.2", "@tsed/di": ">=7.14.2", diff --git a/packages/cli/src/commands/init/InitCmd.ts b/packages/cli/src/commands/init/InitCmd.ts index 1534ecd01..21582a5ba 100644 --- a/packages/cli/src/commands/init/InitCmd.ts +++ b/packages/cli/src/commands/init/InitCmd.ts @@ -389,8 +389,8 @@ export class InitCmd implements CommandProvider { "@tsed/logger": "latest", "@tsed/logger-file": "latest", "@tsed/engines": "latest", + "@tsed/barrels": "latest", ajv: "latest", - barrelsby: "latest", "cross-env": "latest", dotenv: "latest", "dotenv-expand": "latest", @@ -462,7 +462,7 @@ export class InitCmd implements CommandProvider { ...runtime.files(), "/init/.dockerignore.hbs", "/init/.gitignore.hbs", - "/init/.barrelsby.json.hbs", + "/init/.barrels.json.hbs", "/init/processes.config.cjs.hbs", "/init/docker-compose.yml.hbs", { diff --git a/packages/cli/src/commands/run/RunCmd.spec.ts b/packages/cli/src/commands/run/RunCmd.spec.ts index 992902a8e..3632ae1bb 100644 --- a/packages/cli/src/commands/run/RunCmd.spec.ts +++ b/packages/cli/src/commands/run/RunCmd.spec.ts @@ -35,7 +35,7 @@ describe("RunCmd", () => { }; await command.$exec(ctx as any); - expect(runScript.run).toHaveBeenCalledWith("ts-node", ["-r", "tsconfig-paths/register", "src/bin/index.ts", "do", "-o"], { + expect(runScript.run).toHaveBeenCalledWith("node", ["--import", "@swc-node/register/register-esm", "src/bin/index.ts", "do", "-o"], { env: { ...process.env } @@ -66,44 +66,9 @@ describe("RunCmd", () => { }; await command.$exec(ctx as any); - expect(runScript.run).toHaveBeenCalledWith("node", ["dist/bin/index.js", "do", "-o"], { + expect(runScript.run).toHaveBeenCalledWith("node", ["--import", "@swc-node/register/register-esm", "src/bin/index.ts", "do", "-o"], { env: { - ...process.env, - NODE_ENV: "production" - } - }); - }); - it("should run sub project command (production + tsconfig)", async () => { - const runScript = { - run: vi.fn() - }; - const cliFs = { - exists: vi.fn().mockReturnValue(true), - readFile: vi.fn().mockResolvedValue(JSON.stringify({compilerOptions: {outDir: "./lib"}})), - readJsonSync: vi.fn().mockResolvedValue({}) - }; - const command = await CliPlatformTest.invoke(RunCmd, [ - { - token: CliRunScript, - use: runScript - }, - { - token: CliFs, - use: cliFs - } - ]); - - const ctx = { - production: true, - command: "do", - rawArgs: ["-o"] - }; - - await command.$exec(ctx as any); - expect(runScript.run).toHaveBeenCalledWith("node", ["lib/bin/index.js", "do", "-o"], { - env: { - ...process.env, - NODE_ENV: "production" + ...process.env } }); }); diff --git a/packages/cli/src/commands/run/RunCmd.ts b/packages/cli/src/commands/run/RunCmd.ts index 3d5104a2f..e49f5a839 100644 --- a/packages/cli/src/commands/run/RunCmd.ts +++ b/packages/cli/src/commands/run/RunCmd.ts @@ -38,33 +38,14 @@ export class RunCmd implements CommandProvider { runScript: CliRunScript; async $exec(ctx: RunCmdContext): Promise { - const cmd = ctx.production ? "node" : "ts-node"; - const args = ctx.production ? [] : ["-r", "tsconfig-paths/register"]; - const path = normalizePath(ctx.production ? join(await this.getCompilePath(), "bin/index.js") : "src/bin/index.ts"); - const env: any = { - ...process.env - }; - - if (ctx.production) { - env.NODE_ENV = "production"; - } + const cmd = "node"; + const args = ["--import", "@swc-node/register/register-esm"]; + const path = normalizePath("src/bin/index.ts"); await this.runScript.run(cmd, [...args, path, ctx.command, ...ctx.rawArgs], { - env + env: process.env }); return []; } - - protected async getCompilePath() { - const {dir} = this.projectPackageJson; - const tsConfigPath = join(dir, "tsconfig.compile.json"); - - if (this.fs.exists(tsConfigPath)) { - const content = JSON.parse(await this.fs.readFile(tsConfigPath, "utf8")); - return content.compilerOptions.outDir; - } - - return "./dist"; - } } diff --git a/packages/cli/src/runtimes/RuntimesModule.ts b/packages/cli/src/runtimes/RuntimesModule.ts index 1f8cbee69..8015a377d 100644 --- a/packages/cli/src/runtimes/RuntimesModule.ts +++ b/packages/cli/src/runtimes/RuntimesModule.ts @@ -61,7 +61,7 @@ export class RuntimesModule { return { build: `${runtime.run("barrels")} && ${runtime.compile("src/index.ts", "dist/index.js")}`, - barrels: "barrelsby --config .barrelsby.json", + barrels: "barrels", start: `${runtime.run("barrels")} && ${runtime.startDev("src/index.ts")}`, "start:prod": `cross-env NODE_ENV=production ${runtime.startProd("dist/index.js")}` }; diff --git a/packages/cli/templates/init/.barrelsby.json.hbs b/packages/cli/templates/init/.barrels.json.hbs similarity index 55% rename from packages/cli/templates/init/.barrelsby.json.hbs rename to packages/cli/templates/init/.barrels.json.hbs index 4c399e9d5..d7ecf7204 100644 --- a/packages/cli/templates/init/.barrelsby.json.hbs +++ b/packages/cli/templates/init/.barrels.json.hbs @@ -1,9 +1,9 @@ { "directory": {{{barrels}}}, "exclude": [ - "__mock__", - "__mocks__", - ".spec.ts" + "**/__mock__", + "**/__mocks__", + "**/*.spec.ts" ], "delete": true } diff --git a/packages/cli/templates/init/README.md.hbs b/packages/cli/templates/init/README.md.hbs index f71156687..0973f2bd8 100644 --- a/packages/cli/templates/init/README.md.hbs +++ b/packages/cli/templates/init/README.md.hbs @@ -45,11 +45,11 @@ docker compose build docker compose up ``` -## Barrelsby +## Barrels -This project uses [barrelsby](https://www.npmjs.com/package/barrelsby) to generate index files to import the controllers. +This project uses [barrels](https://www.npmjs.com/package/@tsed/barrels) to generate index files to import the controllers. -Edit `.barreslby.json` to customize it: +Edit `.barrels.json` to customize it: ```json { @@ -58,9 +58,9 @@ Edit `.barreslby.json` to customize it: "./src/controllers/pages" ], "exclude": [ - "__mock__", - "__mocks__", - ".spec.ts" + "**/__mock__", + "**/__mocks__", + "**/*.spec.ts" ], "delete": true } diff --git a/packages/cli/templates/init/docker/npm/Dockerfile.hbs b/packages/cli/templates/init/docker/npm/Dockerfile.hbs index ea3f7d38a..5805bbc27 100644 --- a/packages/cli/templates/init/docker/npm/Dockerfile.hbs +++ b/packages/cli/templates/init/docker/npm/Dockerfile.hbs @@ -5,7 +5,7 @@ ARG NODE_VERSION=20.10.0 FROM node:${NODE_VERSION}-alpine as build WORKDIR /opt -COPY package.json package-lock.json tsconfig.json tsconfig.compile.json .barrelsby.json ./ +COPY package.json package-lock.json tsconfig.json tsconfig.compile.json .barrels.json ./ RUN npm ci diff --git a/packages/cli/templates/init/docker/pnpm/Dockerfile.hbs b/packages/cli/templates/init/docker/pnpm/Dockerfile.hbs index 4312895a8..11ae7b32a 100644 --- a/packages/cli/templates/init/docker/pnpm/Dockerfile.hbs +++ b/packages/cli/templates/init/docker/pnpm/Dockerfile.hbs @@ -5,7 +5,7 @@ ARG NODE_VERSION=20.10.0 FROM node:${NODE_VERSION}-alpine as build WORKDIR /opt -COPY package.json pnpm-lock.yaml tsconfig.json tsconfig.compile.json .barrelsby.json ./ +COPY package.json pnpm-lock.yaml tsconfig.json tsconfig.compile.json .barrels.json ./ RUN pnpm install --frozen-lockfile diff --git a/packages/cli/templates/init/docker/yarn/Dockerfile.hbs b/packages/cli/templates/init/docker/yarn/Dockerfile.hbs index 13547a42d..a9cf8565e 100644 --- a/packages/cli/templates/init/docker/yarn/Dockerfile.hbs +++ b/packages/cli/templates/init/docker/yarn/Dockerfile.hbs @@ -5,7 +5,7 @@ ARG NODE_VERSION=20.10.0 FROM node:${NODE_VERSION}-alpine as build WORKDIR /opt -COPY package.json yarn.lock tsconfig.json tsconfig.compile.json .barrelsby.json ./ +COPY package.json yarn.lock tsconfig.json tsconfig.compile.json .barrels.json ./ RUN yarn install --pure-lockfile diff --git a/packages/cli/templates/init/docker/yarn_berry/Dockerfile.hbs b/packages/cli/templates/init/docker/yarn_berry/Dockerfile.hbs index a43edb352..eb54588e2 100644 --- a/packages/cli/templates/init/docker/yarn_berry/Dockerfile.hbs +++ b/packages/cli/templates/init/docker/yarn_berry/Dockerfile.hbs @@ -5,7 +5,7 @@ ARG NODE_VERSION=20.10.0 FROM node:${NODE_VERSION}-alpine as build WORKDIR /opt -COPY package.json yarn.lock yarn.lock tsconfig.json tsconfig.compile.json .barrelsby.json ./ +COPY package.json yarn.lock yarn.lock tsconfig.json tsconfig.compile.json .barrels.json ./ RUN yarn set version berry RUN yarn install --immutable diff --git a/packages/cli/test/integrations/init/init.integration.spec.ts b/packages/cli/test/integrations/init/init.integration.spec.ts index 0007fcb2a..814300e73 100644 --- a/packages/cli/test/integrations/init/init.integration.spec.ts +++ b/packages/cli/test/integrations/init/init.integration.spec.ts @@ -41,7 +41,7 @@ describe("Init cmd", () => { [ "./project-name", "project-name", - "project-name/.barrelsby.json", + "project-name/.barrels.json", "project-name/.dockerignore", "project-name/.gitignore", "project-name/Dockerfile", @@ -96,7 +96,7 @@ describe("Init cmd", () => { "devDependencies": {}, "name": "project-data", "scripts": { - "barrels": "barrelsby --config .barrelsby.json", + "barrels": "barrels", "build": "yarn run barrels && tsc --project tsconfig.compile.json", "start": "yarn run barrels && tsnd --inspect --exit-child --cls --ignore-watch node_modules --respawn --transpile-only src/index.ts", "start:prod": "cross-env NODE_ENV=production node dist/index.js", @@ -111,7 +111,7 @@ describe("Init cmd", () => { const dockerFile = FakeCliFs.entries.get("project-name/Dockerfile")!; - expect(dockerFile).toContain("COPY package.json yarn.lock tsconfig.json tsconfig.compile.json .barrelsby.json ./"); + expect(dockerFile).toContain("COPY package.json yarn.lock tsconfig.json tsconfig.compile.json .barrels.json ./"); expect(dockerFile).toContain("RUN yarn build"); expect(dockerFile).toContain("RUN yarn install --pure-lockfile"); @@ -140,7 +140,7 @@ describe("Init cmd", () => { [ "./project-name", "project-name", - "project-name/.barrelsby.json", + "project-name/.barrels.json", "project-name/.dockerignore", "project-name/.gitignore", "project-name/Dockerfile", @@ -201,7 +201,7 @@ describe("Init cmd", () => { "devDependencies": {}, "name": "project-data", "scripts": { - "barrels": "barrelsby --config .barrelsby.json", + "barrels": "barrels", "build": "yarn run barrels && tsc --project tsconfig.compile.json", "start": "yarn run barrels && tsnd --inspect --exit-child --cls --ignore-watch node_modules --respawn --transpile-only src/index.ts", "start:prod": "cross-env NODE_ENV=production node dist/index.js", @@ -236,7 +236,7 @@ describe("Init cmd", () => { [ "./project-name", "project-name", - "project-name/.barrelsby.json", + "project-name/.barrels.json", "project-name/.dockerignore", "project-name/.gitignore", "project-name/Dockerfile", @@ -291,7 +291,7 @@ describe("Init cmd", () => { "devDependencies": {}, "name": "project-data", "scripts": { - "barrels": "barrelsby --config .barrelsby.json", + "barrels": "barrels", "build": "bun run barrels && bun build --target=bun src/index.ts --outfile=dist/index.js", "start": "bun run barrels && bun --watch src/index.ts", "start:prod": "cross-env NODE_ENV=production bun dist/index.js", @@ -327,7 +327,7 @@ describe("Init cmd", () => { "./project-name", "project-name", "project-name/.babelrc", - "project-name/.barrelsby.json", + "project-name/.barrels.json", "project-name/.dockerignore", "project-name/.gitignore", "project-name/Dockerfile", @@ -382,7 +382,7 @@ describe("Init cmd", () => { "devDependencies": {}, "name": "project-data", "scripts": { - "barrels": "barrelsby --config .barrelsby.json", + "barrels": "barrels", "build": "yarn run barrels && tsc && babel src --out-dir dist --extensions ".ts,.tsx" --source-maps inline", "start": "yarn run barrels && babel-watch --extensions .ts src/index.ts", "start:prod": "cross-env NODE_ENV=production node dist/index.js", @@ -418,7 +418,7 @@ describe("Init cmd", () => { "./project-name", "project-name", "project-name/.babelrc", - "project-name/.barrelsby.json", + "project-name/.barrels.json", "project-name/.dockerignore", "project-name/.gitignore", "project-name/Dockerfile", @@ -474,7 +474,7 @@ describe("Init cmd", () => { "devDependencies": {}, "name": "project-data", "scripts": { - "barrels": "barrelsby --config .barrelsby.json", + "barrels": "barrels", "build": "yarn run barrels && tsc && cross-env NODE_ENV=production webpack", "start": "yarn run barrels && babel-watch --extensions .ts src/index.ts", "start:prod": "cross-env NODE_ENV=production node dist/app.bundle.js", @@ -509,7 +509,7 @@ describe("Init cmd", () => { [ "./project-name", "project-name", - "project-name/.barrelsby.json", + "project-name/.barrels.json", "project-name/.dockerignore", "project-name/.gitignore", "project-name/.node-dev.json", @@ -566,7 +566,7 @@ describe("Init cmd", () => { "devDependencies": {}, "name": "project-data", "scripts": { - "barrels": "barrelsby --config .barrelsby.json", + "barrels": "barrels", "build": "yarn run barrels && swc src --out-dir dist -s", "start": "yarn run barrels && node-dev src/index.ts", "start:prod": "cross-env NODE_ENV=production node dist/index.js", @@ -601,7 +601,7 @@ describe("Init cmd", () => { [ "./project-name", "project-name", - "project-name/.barrelsby.json", + "project-name/.barrels.json", "project-name/.dockerignore", "project-name/.gitignore", "project-name/Dockerfile", @@ -656,7 +656,7 @@ describe("Init cmd", () => { "devDependencies": {}, "name": "project-data", "scripts": { - "barrels": "barrelsby --config .barrelsby.json", + "barrels": "barrels", "build": "npm run barrels && tsc --project tsconfig.compile.json", "start": "npm run barrels && tsnd --inspect --exit-child --cls --ignore-watch node_modules --respawn --transpile-only src/index.ts", "start:prod": "cross-env NODE_ENV=production node dist/index.js", @@ -695,7 +695,7 @@ describe("Init cmd", () => { [ "./project-name", "project-name", - "project-name/.barrelsby.json", + "project-name/.barrels.json", "project-name/.dockerignore", "project-name/.gitignore", "project-name/Dockerfile", @@ -759,7 +759,7 @@ describe("Init cmd", () => { [ "./project-name", "project-name", - "project-name/.barrelsby.json", + "project-name/.barrels.json", "project-name/.dockerignore", "project-name/.gitignore", "project-name/Dockerfile", @@ -822,7 +822,7 @@ describe("Init cmd", () => { [ "./project-name", "project-name", - "project-name/.barrelsby.json", + "project-name/.barrels.json", "project-name/.dockerignore", "project-name/.gitignore", "project-name/Dockerfile", @@ -878,7 +878,7 @@ describe("Init cmd", () => { "devDependencies": {}, "name": "project-data", "scripts": { - "barrels": "barrelsby --config .barrelsby.json", + "barrels": "barrels", "build": "yarn run barrels && tsc --project tsconfig.compile.json", "start": "yarn run barrels && tsnd --inspect --exit-child --cls --ignore-watch node_modules --respawn --transpile-only src/index.ts", "start:prod": "cross-env NODE_ENV=production node dist/index.js", @@ -927,7 +927,7 @@ describe("Init cmd", () => { [ "./project-name", "project-name", - "project-name/.barrelsby.json", + "project-name/.barrels.json", "project-name/.dockerignore", "project-name/.gitignore", "project-name/Dockerfile", diff --git a/yarn.lock b/yarn.lock index 5d24944ed..a1b4e76fa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -837,7 +837,7 @@ __metadata: languageName: node linkType: hard -"@napi-rs/wasm-runtime@npm:0.2.4": +"@napi-rs/wasm-runtime@npm:0.2.4, @napi-rs/wasm-runtime@npm:^0.2.4": version: 0.2.4 resolution: "@napi-rs/wasm-runtime@npm:0.2.4" dependencies: @@ -1643,6 +1643,85 @@ __metadata: languageName: node linkType: hard +"@oxc-resolver/binding-darwin-arm64@npm:1.11.0": + version: 1.11.0 + resolution: "@oxc-resolver/binding-darwin-arm64@npm:1.11.0" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + +"@oxc-resolver/binding-darwin-x64@npm:1.11.0": + version: 1.11.0 + resolution: "@oxc-resolver/binding-darwin-x64@npm:1.11.0" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + +"@oxc-resolver/binding-freebsd-x64@npm:1.11.0": + version: 1.11.0 + resolution: "@oxc-resolver/binding-freebsd-x64@npm:1.11.0" + conditions: os=freebsd & cpu=x64 + languageName: node + linkType: hard + +"@oxc-resolver/binding-linux-arm-gnueabihf@npm:1.11.0": + version: 1.11.0 + resolution: "@oxc-resolver/binding-linux-arm-gnueabihf@npm:1.11.0" + conditions: os=linux & cpu=arm + languageName: node + linkType: hard + +"@oxc-resolver/binding-linux-arm64-gnu@npm:1.11.0": + version: 1.11.0 + resolution: "@oxc-resolver/binding-linux-arm64-gnu@npm:1.11.0" + conditions: os=linux & cpu=arm64 & libc=glibc + languageName: node + linkType: hard + +"@oxc-resolver/binding-linux-arm64-musl@npm:1.11.0": + version: 1.11.0 + resolution: "@oxc-resolver/binding-linux-arm64-musl@npm:1.11.0" + conditions: os=linux & cpu=arm64 & libc=musl + languageName: node + linkType: hard + +"@oxc-resolver/binding-linux-x64-gnu@npm:1.11.0": + version: 1.11.0 + resolution: "@oxc-resolver/binding-linux-x64-gnu@npm:1.11.0" + conditions: os=linux & cpu=x64 & libc=glibc + languageName: node + linkType: hard + +"@oxc-resolver/binding-linux-x64-musl@npm:1.11.0": + version: 1.11.0 + resolution: "@oxc-resolver/binding-linux-x64-musl@npm:1.11.0" + conditions: os=linux & cpu=x64 & libc=musl + languageName: node + linkType: hard + +"@oxc-resolver/binding-wasm32-wasi@npm:1.11.0": + version: 1.11.0 + resolution: "@oxc-resolver/binding-wasm32-wasi@npm:1.11.0" + dependencies: + "@napi-rs/wasm-runtime": "npm:^0.2.4" + conditions: cpu=wasm32 + languageName: node + linkType: hard + +"@oxc-resolver/binding-win32-arm64-msvc@npm:1.11.0": + version: 1.11.0 + resolution: "@oxc-resolver/binding-win32-arm64-msvc@npm:1.11.0" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + +"@oxc-resolver/binding-win32-x64-msvc@npm:1.11.0": + version: 1.11.0 + resolution: "@oxc-resolver/binding-win32-x64-msvc@npm:1.11.0" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + "@pkgjs/parseargs@npm:^0.11.0": version: 0.11.0 resolution: "@pkgjs/parseargs@npm:0.11.0" @@ -2075,6 +2154,44 @@ __metadata: languageName: node linkType: hard +"@swc-node/core@npm:^1.13.3": + version: 1.13.3 + resolution: "@swc-node/core@npm:1.13.3" + peerDependencies: + "@swc/core": ">= 1.4.13" + "@swc/types": ">= 0.1" + checksum: 10/4fcc180f047e5d60bad49f793a477740262c9833fc7cd9d34ff4286ea7026f9d77aad122f9c728b73c9addc494b27f8405db32c1b5c446dc9eb94b7bc3cdee1f + languageName: node + linkType: hard + +"@swc-node/register@npm:>=1.10.9": + version: 1.10.9 + resolution: "@swc-node/register@npm:1.10.9" + dependencies: + "@swc-node/core": "npm:^1.13.3" + "@swc-node/sourcemap-support": "npm:^0.5.1" + colorette: "npm:^2.0.20" + debug: "npm:^4.3.5" + oxc-resolver: "npm:^1.10.2" + pirates: "npm:^4.0.6" + tslib: "npm:^2.6.3" + peerDependencies: + "@swc/core": ">= 1.4.13" + typescript: ">= 4.3" + checksum: 10/e6b7e2623ddb8e53aa3c941bdc6ca7aaf67336447c3fdb211b218e6db747eb2df5aff88b7da8edcb74fd3fb11c018b92e4b60eba5da3654524504ec36454e1c2 + languageName: node + linkType: hard + +"@swc-node/sourcemap-support@npm:^0.5.1": + version: 0.5.1 + resolution: "@swc-node/sourcemap-support@npm:0.5.1" + dependencies: + source-map-support: "npm:^0.5.21" + tslib: "npm:^2.6.3" + checksum: 10/d347be3a3fb1507aa2de4d07cc70d845722b4af64762b193f8407b0010fd28592b0dcaba0046fa7ab71276f72d6bc70d1742bc6ec6589e75784445b7b116accc + languageName: node + linkType: hard + "@swc/core-darwin-arm64@npm:1.7.26": version: 1.7.26 resolution: "@swc/core-darwin-arm64@npm:1.7.26" @@ -2145,7 +2262,7 @@ __metadata: languageName: node linkType: hard -"@swc/core@npm:1.7.26": +"@swc/core@npm:1.7.26, @swc/core@npm:>=1.7.26": version: 1.7.26 resolution: "@swc/core@npm:1.7.26" dependencies: @@ -2198,7 +2315,7 @@ __metadata: languageName: node linkType: hard -"@swc/helpers@npm:0.5.13": +"@swc/helpers@npm:0.5.13, @swc/helpers@npm:>=0.5.13": version: 0.5.13 resolution: "@swc/helpers@npm:0.5.13" dependencies: @@ -2260,6 +2377,16 @@ __metadata: languageName: node linkType: hard +"@tsed/barrels@workspace:packages/barrels": + version: 0.0.0-use.local + resolution: "@tsed/barrels@workspace:packages/barrels" + dependencies: + globby: "npm:14.0.2" + bin: + barrels: bin/barrels.js + languageName: unknown + linkType: soft + "@tsed/cli-core@workspace:*, @tsed/cli-core@workspace:packages/cli-core": version: 0.0.0-use.local resolution: "@tsed/cli-core@workspace:packages/cli-core" @@ -2597,6 +2724,9 @@ __metadata: version: 0.0.0-use.local resolution: "@tsed/cli@workspace:packages/cli" dependencies: + "@swc-node/register": "npm:>=1.10.9" + "@swc/core": "npm:>=1.7.26" + "@swc/helpers": "npm:>=0.5.13" "@tsed/cli-core": "workspace:*" "@tsed/core": "npm:>=7.14.2" "@tsed/di": "npm:>=7.14.2" @@ -8205,6 +8335,20 @@ __metadata: languageName: node linkType: hard +"globby@npm:14.0.2": + version: 14.0.2 + resolution: "globby@npm:14.0.2" + dependencies: + "@sindresorhus/merge-streams": "npm:^2.1.0" + fast-glob: "npm:^3.3.2" + ignore: "npm:^5.2.4" + path-type: "npm:^5.0.0" + slash: "npm:^5.1.0" + unicorn-magic: "npm:^0.1.0" + checksum: 10/67660da70fc1223f7170c1a62ba6c373385e9e39765d952b6518606dec15ed8c7958e9dae6ba5752a31dbc1e9126f146938b830ad680fe794141734ffc3fbb75 + languageName: node + linkType: hard + "globby@npm:8.0.2": version: 8.0.2 resolution: "globby@npm:8.0.2" @@ -12714,6 +12858,48 @@ __metadata: languageName: node linkType: hard +"oxc-resolver@npm:^1.10.2": + version: 1.11.0 + resolution: "oxc-resolver@npm:1.11.0" + dependencies: + "@oxc-resolver/binding-darwin-arm64": "npm:1.11.0" + "@oxc-resolver/binding-darwin-x64": "npm:1.11.0" + "@oxc-resolver/binding-freebsd-x64": "npm:1.11.0" + "@oxc-resolver/binding-linux-arm-gnueabihf": "npm:1.11.0" + "@oxc-resolver/binding-linux-arm64-gnu": "npm:1.11.0" + "@oxc-resolver/binding-linux-arm64-musl": "npm:1.11.0" + "@oxc-resolver/binding-linux-x64-gnu": "npm:1.11.0" + "@oxc-resolver/binding-linux-x64-musl": "npm:1.11.0" + "@oxc-resolver/binding-wasm32-wasi": "npm:1.11.0" + "@oxc-resolver/binding-win32-arm64-msvc": "npm:1.11.0" + "@oxc-resolver/binding-win32-x64-msvc": "npm:1.11.0" + dependenciesMeta: + "@oxc-resolver/binding-darwin-arm64": + optional: true + "@oxc-resolver/binding-darwin-x64": + optional: true + "@oxc-resolver/binding-freebsd-x64": + optional: true + "@oxc-resolver/binding-linux-arm-gnueabihf": + optional: true + "@oxc-resolver/binding-linux-arm64-gnu": + optional: true + "@oxc-resolver/binding-linux-arm64-musl": + optional: true + "@oxc-resolver/binding-linux-x64-gnu": + optional: true + "@oxc-resolver/binding-linux-x64-musl": + optional: true + "@oxc-resolver/binding-wasm32-wasi": + optional: true + "@oxc-resolver/binding-win32-arm64-msvc": + optional: true + "@oxc-resolver/binding-win32-x64-msvc": + optional: true + checksum: 10/b6096c176a8aec362bb39a0942aa3a6d05f9dc57fc12d5439b4e10e275ed0bc3e3522988256c9333e4f4d9edd228f7c79f1bd661903ee8b191802c9501db7c86 + languageName: node + linkType: hard + "p-cancelable@npm:^1.0.0": version: 1.1.0 resolution: "p-cancelable@npm:1.1.0" @@ -13371,6 +13557,13 @@ __metadata: languageName: node linkType: hard +"pirates@npm:^4.0.6": + version: 4.0.6 + resolution: "pirates@npm:4.0.6" + checksum: 10/d02dda76f4fec1cbdf395c36c11cf26f76a644f9f9a1bfa84d3167d0d3154d5289aacc72677aa20d599bb4a6937a471de1b65c995e2aea2d8687cbcd7e43ea5f + languageName: node + linkType: hard + "pkg-conf@npm:^2.1.0": version: 2.1.0 resolution: "pkg-conf@npm:2.1.0" @@ -14938,6 +15131,16 @@ __metadata: languageName: node linkType: hard +"source-map-support@npm:^0.5.21": + version: 0.5.21 + resolution: "source-map-support@npm:0.5.21" + dependencies: + buffer-from: "npm:^1.0.0" + source-map: "npm:^0.6.0" + checksum: 10/8317e12d84019b31e34b86d483dd41d6f832f389f7417faf8fc5c75a66a12d9686e47f589a0554a868b8482f037e23df9d040d29387eb16fa14cb85f091ba207 + languageName: node + linkType: hard + "source-map-url@npm:^0.4.0": version: 0.4.1 resolution: "source-map-url@npm:0.4.1" @@ -14952,7 +15155,7 @@ __metadata: languageName: node linkType: hard -"source-map@npm:^0.6.1": +"source-map@npm:^0.6.0, source-map@npm:^0.6.1": version: 0.6.1 resolution: "source-map@npm:0.6.1" checksum: 10/59ef7462f1c29d502b3057e822cdbdae0b0e565302c4dd1a95e11e793d8d9d62006cdc10e0fd99163ca33ff2071360cf50ee13f90440806e7ed57d81cba2f7ff @@ -16008,7 +16211,7 @@ __metadata: languageName: node linkType: hard -"tslib@npm:^2.6.2": +"tslib@npm:^2.6.2, tslib@npm:^2.6.3": version: 2.7.0 resolution: "tslib@npm:2.7.0" checksum: 10/9a5b47ddac65874fa011c20ff76db69f97cf90c78cff5934799ab8894a5342db2d17b4e7613a087046bc1d133d21547ddff87ac558abeec31ffa929c88b7fce6 From df1cafe5b765b3e96ab125dcdb4933b841d17e37 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Mon, 16 Sep 2024 19:46:29 +0200 Subject: [PATCH 10/69] feat(cli): use swc loader to load ts files --- .../cli-core/src/services/Renderer.spec.ts | 2 +- packages/cli/package.json | 2 +- packages/cli/src/commands/init/InitCmd.ts | 1 - .../commands/init/config/FeaturesPrompt.ts | 10 +- .../init/prompts/getFeaturesPrompt.spec.ts | 8 +- packages/cli/src/runtimes/RuntimesModule.ts | 3 +- packages/cli/src/runtimes/index.ts | 1 - .../cli/src/runtimes/supports/BabelRuntime.ts | 7 +- .../cli/src/runtimes/supports/BunRuntime.ts | 6 + .../cli/src/runtimes/supports/NodeRuntime.ts | 33 +++-- .../cli/src/runtimes/supports/SWCRuntime.ts | 33 ----- .../src/runtimes/supports/WebpackRuntime.ts | 1 + .../cli/templates/init/.node-dev.json.hbs | 5 - packages/cli/templates/init/nodemon.json.hbs | 9 ++ .../init.integration.spec.ts.snap | 51 ------- .../init/init.integration.spec.ts | 130 ++++-------------- 16 files changed, 81 insertions(+), 221 deletions(-) delete mode 100644 packages/cli/src/runtimes/supports/SWCRuntime.ts delete mode 100644 packages/cli/templates/init/.node-dev.json.hbs create mode 100644 packages/cli/templates/init/nodemon.json.hbs diff --git a/packages/cli-core/src/services/Renderer.spec.ts b/packages/cli-core/src/services/Renderer.spec.ts index c4354cb53..24eff16ee 100644 --- a/packages/cli-core/src/services/Renderer.spec.ts +++ b/packages/cli-core/src/services/Renderer.spec.ts @@ -1,6 +1,6 @@ -// @ts-ignore import {join} from "node:path"; +// @ts-ignore import {FakeCliFs, normalizePath} from "@tsed/cli-testing"; import Consolidate from "consolidate"; import globby from "globby"; diff --git a/packages/cli/package.json b/packages/cli/package.json index 10ac7df71..c2c540cb3 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -37,7 +37,7 @@ "start:g:prisma": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts g service -r ./.tmp/init/awesome prisma", "start:generate:run": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts generate -r ./.tmp/init/awesome", "start:typeorm:run": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts typeorm entity:create -r ./.tmp/init/awesome --name User", - "test": "vitest run", + "test": "vitest run -u", "test:ci": "vitest run --coverage.thresholds.autoUpdate=true" }, "bin": { diff --git a/packages/cli/src/commands/init/InitCmd.ts b/packages/cli/src/commands/init/InitCmd.ts index 21582a5ba..1aee83917 100644 --- a/packages/cli/src/commands/init/InitCmd.ts +++ b/packages/cli/src/commands/init/InitCmd.ts @@ -406,7 +406,6 @@ export class InitCmd implements CommandProvider { "@types/node": "latest", "@types/multer": "latest", tslib: "latest", - typescript: "latest", ...this.runtimes.get().devDependencies(), ...this.platforms.get(ctx.platform).devDependencies(ctx) }, diff --git a/packages/cli/src/commands/init/config/FeaturesPrompt.ts b/packages/cli/src/commands/init/config/FeaturesPrompt.ts index 7aae55bec..b02afbedd 100644 --- a/packages/cli/src/commands/init/config/FeaturesPrompt.ts +++ b/packages/cli/src/commands/init/config/FeaturesPrompt.ts @@ -252,7 +252,7 @@ export const FeaturesMap: Record = { name: "Lint on commit" }, node: { - name: "Node.js", + name: "Node.js + SWC", checked: true }, babel: { @@ -263,12 +263,8 @@ export const FeaturesMap: Record = { name: "Node.js + Webpack", checked: false }, - swc: { - name: "Node.js + SWC", - checked: false - }, bun: { - name: "Bun.js (experimental)", + name: "Bun.js", checked: false }, yarn: { @@ -284,7 +280,7 @@ export const FeaturesMap: Record = { checked: false }, pnpm: { - name: "PNPM (experimental)", + name: "PNPM", checked: false } }; diff --git a/packages/cli/src/commands/init/prompts/getFeaturesPrompt.spec.ts b/packages/cli/src/commands/init/prompts/getFeaturesPrompt.spec.ts index 3f12491bc..1c5c8f822 100644 --- a/packages/cli/src/commands/init/prompts/getFeaturesPrompt.spec.ts +++ b/packages/cli/src/commands/init/prompts/getFeaturesPrompt.spec.ts @@ -318,12 +318,12 @@ describe("getFeaturesPrompt", () => { "choices": [ { "checked": true, - "name": "Node.js", + "name": "Node.js + SWC", "value": "node", }, { "checked": false, - "name": "Bun.js (experimental)", + "name": "Bun.js", "value": "bun", }, ], @@ -345,12 +345,12 @@ describe("getFeaturesPrompt", () => { }, { "checked": false, - "name": "PNPM (experimental)", + "name": "PNPM", "value": "pnpm", }, { "checked": false, - "name": "Bun.js (experimental)", + "name": "Bun.js", "value": "bun", }, ], diff --git a/packages/cli/src/runtimes/RuntimesModule.ts b/packages/cli/src/runtimes/RuntimesModule.ts index 8015a377d..395beaba2 100644 --- a/packages/cli/src/runtimes/RuntimesModule.ts +++ b/packages/cli/src/runtimes/RuntimesModule.ts @@ -5,7 +5,6 @@ import {BabelRuntime} from "./supports/BabelRuntime.js"; import {BaseRuntime} from "./supports/BaseRuntime.js"; import {BunRuntime} from "./supports/BunRuntime.js"; import {NodeRuntime} from "./supports/NodeRuntime.js"; -import {SWCRuntime} from "./supports/SWCRuntime.js"; import {WebpackRuntime} from "./supports/WebpackRuntime.js"; export interface RuntimeInitOptions extends Record { @@ -13,7 +12,7 @@ export interface RuntimeInitOptions extends Record { } @Module({ - imports: [NodeRuntime, BabelRuntime, WebpackRuntime, SWCRuntime, BunRuntime] + imports: [NodeRuntime, BabelRuntime, WebpackRuntime, BunRuntime] }) export class RuntimesModule { @Inject() diff --git a/packages/cli/src/runtimes/index.ts b/packages/cli/src/runtimes/index.ts index 5596e9051..175fae2a5 100644 --- a/packages/cli/src/runtimes/index.ts +++ b/packages/cli/src/runtimes/index.ts @@ -3,5 +3,4 @@ export * from "./supports/BabelRuntime.js"; export * from "./supports/BaseRuntime.js"; export * from "./supports/BunRuntime.js"; export * from "./supports/NodeRuntime.js"; -export * from "./supports/SWCRuntime.js"; export * from "./supports/WebpackRuntime.js"; diff --git a/packages/cli/src/runtimes/supports/BabelRuntime.ts b/packages/cli/src/runtimes/supports/BabelRuntime.ts index 821bce450..f60b87947 100644 --- a/packages/cli/src/runtimes/supports/BabelRuntime.ts +++ b/packages/cli/src/runtimes/supports/BabelRuntime.ts @@ -18,6 +18,10 @@ export class BabelRuntime extends NodeRuntime { return `babel-watch --extensions .ts ${main}`; } + startProd(args: string) { + return `${this.cmd} ${args}`; + } + compile(src: string, out: string) { return `tsc && babel ${dirname(src)} --out-dir ${dirname(out)} --extensions ".ts,.tsx" --source-maps inline`; } @@ -33,7 +37,8 @@ export class BabelRuntime extends NodeRuntime { "@babel/preset-typescript": "latest", "@babel/plugin-proposal-object-rest-spread": "latest", "babel-plugin-transform-typescript-metadata": "latest", - "babel-watch": "latest" + "babel-watch": "latest", + typescript: "latest" }; } } diff --git a/packages/cli/src/runtimes/supports/BunRuntime.ts b/packages/cli/src/runtimes/supports/BunRuntime.ts index e1f291977..a5b216180 100644 --- a/packages/cli/src/runtimes/supports/BunRuntime.ts +++ b/packages/cli/src/runtimes/supports/BunRuntime.ts @@ -21,4 +21,10 @@ export class BunRuntime extends BaseRuntime { startProd(args: string) { return `${this.cmd} ${args}`; } + + dependencies(): Record { + return { + typescript: "latest" + }; + } } diff --git a/packages/cli/src/runtimes/supports/NodeRuntime.ts b/packages/cli/src/runtimes/supports/NodeRuntime.ts index 006adb44f..ac14fabfa 100644 --- a/packages/cli/src/runtimes/supports/NodeRuntime.ts +++ b/packages/cli/src/runtimes/supports/NodeRuntime.ts @@ -10,22 +10,35 @@ export class NodeRuntime extends BaseRuntime { readonly cmd: string = "node"; readonly order: number = 0; - devDependencies(): Record { - return { - "ts-node": "latest", - "ts-node-dev": "latest" - }; + files() { + return ["/init/.swcrc.hbs", "/init/nodemon.json.hbs"]; + } + + startDev(main: string) { + return `nodemon --import @swc-node/register/register-esm ${main}`; + } + + startProd(main: string) { + return `${this.cmd} --import @swc-node/register/register-esm ${main.replace("dist", "src")}`; } compile(src: string, out: string) { - return `tsc --project tsconfig.compile.json`; + return `swc ${src.replace("/index.ts", "")} --out-dir ${out.replace("/index.js", "")} -s`; } - startDev(main: string) { - return `tsnd --inspect --exit-child --cls --ignore-watch node_modules --respawn --transpile-only ${main}`; + dependencies(): Record { + return { + "@swc/core": "latest", + "@swc/cli": "latest", + "@swc/helpers": "latest", + "@swc-node/register": "latest", + typescript: "latest" + }; } - startProd(args: string) { - return `${this.cmd} ${args}`; + devDependencies(): Record { + return { + nodemon: "latest" + }; } } diff --git a/packages/cli/src/runtimes/supports/SWCRuntime.ts b/packages/cli/src/runtimes/supports/SWCRuntime.ts deleted file mode 100644 index 82b056e61..000000000 --- a/packages/cli/src/runtimes/supports/SWCRuntime.ts +++ /dev/null @@ -1,33 +0,0 @@ -import {Injectable} from "@tsed/di"; - -import {NodeRuntime} from "./NodeRuntime.js"; - -@Injectable({ - type: "runtime" -}) -export class SWCRuntime extends NodeRuntime { - readonly name = "swc"; - readonly order: number = 3; - - files() { - return [...super.files(), "/init/.swcrc.hbs", "/init/.node-dev.json.hbs"]; - } - - startDev(main: string) { - return `node-dev ${main}`; - } - - compile(src: string, out: string) { - return `swc ${src.replace("/index.ts", "")} --out-dir ${out.replace("/index.js", "")} -s`; - } - - devDependencies(): Record { - return { - "@swc/core": "latest", - "@swc/cli": "latest", - "@swc/helpers": "latest", - "@swc-node/register": "latest", - "node-dev": "latest" - }; - } -} diff --git a/packages/cli/src/runtimes/supports/WebpackRuntime.ts b/packages/cli/src/runtimes/supports/WebpackRuntime.ts index 829d2ef3d..3ab020f1b 100644 --- a/packages/cli/src/runtimes/supports/WebpackRuntime.ts +++ b/packages/cli/src/runtimes/supports/WebpackRuntime.ts @@ -25,6 +25,7 @@ export class WebpackRuntime extends BabelRuntime { devDependencies() { return { ...super.devDependencies(), + typescript: "latest", "babel-loader": "latest", webpack: "latest", "webpack-cli": "latest" diff --git a/packages/cli/templates/init/.node-dev.json.hbs b/packages/cli/templates/init/.node-dev.json.hbs deleted file mode 100644 index 88550fcf5..000000000 --- a/packages/cli/templates/init/.node-dev.json.hbs +++ /dev/null @@ -1,5 +0,0 @@ -{ - "extensions": { - "ts": "@swc-node/register" - } -} diff --git a/packages/cli/templates/init/nodemon.json.hbs b/packages/cli/templates/init/nodemon.json.hbs new file mode 100644 index 000000000..1cd4fdacd --- /dev/null +++ b/packages/cli/templates/init/nodemon.json.hbs @@ -0,0 +1,9 @@ +{ + "extensions": ["ts"], + "watch": ["src"], + "ignore": ["**/*.spec.ts"], + "delay": 100, + "execMap": { + "ts": "node --import @swc-node/register/esm-register" + } +} diff --git a/packages/cli/test/integrations/init/__snapshots__/init.integration.spec.ts.snap b/packages/cli/test/integrations/init/__snapshots__/init.integration.spec.ts.snap index 8cc8429c0..705d577af 100644 --- a/packages/cli/test/integrations/init/__snapshots__/init.integration.spec.ts.snap +++ b/packages/cli/test/integrations/init/__snapshots__/init.integration.spec.ts.snap @@ -277,57 +277,6 @@ export class Server { " `; -exports[`Init cmd > Express.js > should generate a project with SWC 2`] = ` -"import {join} from "path"; -import {Configuration, Inject} from "@tsed/di"; -import {PlatformApplication} from "@tsed/common"; -import "@tsed/platform-express"; // /!\\ keep this import -import "@tsed/ajv"; -import {config} from "./config/index.js"; -import * as rest from "./controllers/rest/index.js"; - -@Configuration({ - ...config, - acceptMimes: ["application/json"], - httpPort: process.env.PORT || 8083, - httpsPort: false, // CHANGE - disableComponentsScan: true, - ajv: { - returnsCoercedValues: true - }, - mount: { - "/rest": [ - ...Object.values(rest) - ] - }, - middlewares: [ - "cors", - "cookie-parser", - "compression", - "method-override", - "json-parser", - { use: "urlencoded-parser", options: { extended: true }} - ], - views: { - root: join(process.cwd(), "../views"), - extensions: { - ejs: "ejs" - } - }, - exclude: [ - "**/*.spec.ts" - ] -}) -export class Server { - @Inject() - protected app: PlatformApplication; - - @Configuration() - protected settings: Configuration; -} -" -`; - exports[`Init cmd > Express.js > should generate a project with Webpack 2`] = ` "import {join} from "path"; import {Configuration, Inject} from "@tsed/di"; diff --git a/packages/cli/test/integrations/init/init.integration.spec.ts b/packages/cli/test/integrations/init/init.integration.spec.ts index 814300e73..a648b8d8d 100644 --- a/packages/cli/test/integrations/init/init.integration.spec.ts +++ b/packages/cli/test/integrations/init/init.integration.spec.ts @@ -44,9 +44,11 @@ describe("Init cmd", () => { "project-name/.barrels.json", "project-name/.dockerignore", "project-name/.gitignore", + "project-name/.swcrc", "project-name/Dockerfile", "project-name/README.md", "project-name/docker-compose.yml", + "project-name/nodemon.json", "project-name/package.json", "project-name/processes.config.cjs", "project-name/src", @@ -97,9 +99,9 @@ describe("Init cmd", () => { "name": "project-data", "scripts": { "barrels": "barrels", - "build": "yarn run barrels && tsc --project tsconfig.compile.json", - "start": "yarn run barrels && tsnd --inspect --exit-child --cls --ignore-watch node_modules --respawn --transpile-only src/index.ts", - "start:prod": "cross-env NODE_ENV=production node dist/index.js", + "build": "yarn run barrels && swc src --out-dir dist -s", + "start": "yarn run barrels && nodemon --import @swc-node/register/register-esm src/index.ts", + "start:prod": "cross-env NODE_ENV=production node --import @swc-node/register/register-esm src/index.js", }, "tsed": { "packageManager": "yarn", @@ -143,9 +145,11 @@ describe("Init cmd", () => { "project-name/.barrels.json", "project-name/.dockerignore", "project-name/.gitignore", + "project-name/.swcrc", "project-name/Dockerfile", "project-name/README.md", "project-name/docker-compose.yml", + "project-name/nodemon.json", "project-name/package.json", "project-name/processes.config.cjs", "project-name/src", @@ -202,9 +206,9 @@ describe("Init cmd", () => { "name": "project-data", "scripts": { "barrels": "barrels", - "build": "yarn run barrels && tsc --project tsconfig.compile.json", - "start": "yarn run barrels && tsnd --inspect --exit-child --cls --ignore-watch node_modules --respawn --transpile-only src/index.ts", - "start:prod": "cross-env NODE_ENV=production node dist/index.js", + "build": "yarn run barrels && swc src --out-dir dist -s", + "start": "yarn run barrels && nodemon --import @swc-node/register/register-esm src/index.ts", + "start:prod": "cross-env NODE_ENV=production node --import @swc-node/register/register-esm src/index.js", }, "tsed": { "packageManager": "yarn", @@ -487,98 +491,6 @@ describe("Init cmd", () => { } `); }); - it("should generate a project with SWC", async () => { - CliPlatformTest.setPackageJson({ - name: "", - version: "1.0.0", - description: "", - scripts: {}, - dependencies: {}, - devDependencies: {} - }); - - await CliPlatformTest.exec("init", { - platform: "express", - rootDir: "./project-data", - projectName: "project-data", - tsedVersion: "5.58.1", - runtime: "swc" - }); - - expect(FakeCliFs.getKeys()).toMatchInlineSnapshot(` - [ - "./project-name", - "project-name", - "project-name/.barrels.json", - "project-name/.dockerignore", - "project-name/.gitignore", - "project-name/.node-dev.json", - "project-name/.swcrc", - "project-name/Dockerfile", - "project-name/README.md", - "project-name/docker-compose.yml", - "project-name/package.json", - "project-name/processes.config.cjs", - "project-name/src", - "project-name/src/Server.ts", - "project-name/src/config", - "project-name/src/config/envs", - "project-name/src/config/envs/index.ts", - "project-name/src/config/index.ts", - "project-name/src/config/logger", - "project-name/src/config/logger/index.ts", - "project-name/src/controllers/rest", - "project-name/src/controllers/rest/HelloWorldController.ts", - "project-name/src/index.ts", - "project-name/tsconfig.base.json", - "project-name/tsconfig.node.json", - ] - `); - - const content = FakeCliFs.entries.get("project-name/src/Server.ts")!; - expect(content).toContain('import {Configuration, Inject} from "@tsed/di"'); - expect(content).toContain('import "@tsed/platform-express"'); - expect(content).toContain('import "@tsed/ajv"'); - expect(content).toMatchSnapshot(); - - const pkg = JSON.parse(FakeCliFs.entries.get("project-name/package.json")!); - expect(pkg).toMatchInlineSnapshot(` - { - "dependencies": { - "@tsed/ajv": "5.58.1", - "@tsed/common": "5.58.1", - "@tsed/core": "5.58.1", - "@tsed/di": "5.58.1", - "@tsed/exceptions": "5.58.1", - "@tsed/json-mapper": "5.58.1", - "@tsed/openspec": "5.58.1", - "@tsed/platform-cache": "5.58.1", - "@tsed/platform-exceptions": "5.58.1", - "@tsed/platform-express": "5.58.1", - "@tsed/platform-log-middleware": "5.58.1", - "@tsed/platform-middlewares": "5.58.1", - "@tsed/platform-params": "5.58.1", - "@tsed/platform-response-filter": "5.58.1", - "@tsed/platform-views": "5.58.1", - "@tsed/schema": "5.58.1", - }, - "description": "", - "devDependencies": {}, - "name": "project-data", - "scripts": { - "barrels": "barrels", - "build": "yarn run barrels && swc src --out-dir dist -s", - "start": "yarn run barrels && node-dev src/index.ts", - "start:prod": "cross-env NODE_ENV=production node dist/index.js", - }, - "tsed": { - "packageManager": "yarn", - "runtime": "swc", - }, - "version": "1.0.0", - } - `); - }); it("should generate a project with NPM", async () => { CliPlatformTest.setPackageJson({ name: "", @@ -604,9 +516,11 @@ describe("Init cmd", () => { "project-name/.barrels.json", "project-name/.dockerignore", "project-name/.gitignore", + "project-name/.swcrc", "project-name/Dockerfile", "project-name/README.md", "project-name/docker-compose.yml", + "project-name/nodemon.json", "project-name/package.json", "project-name/processes.config.cjs", "project-name/src", @@ -657,9 +571,9 @@ describe("Init cmd", () => { "name": "project-data", "scripts": { "barrels": "barrels", - "build": "npm run barrels && tsc --project tsconfig.compile.json", - "start": "npm run barrels && tsnd --inspect --exit-child --cls --ignore-watch node_modules --respawn --transpile-only src/index.ts", - "start:prod": "cross-env NODE_ENV=production node dist/index.js", + "build": "npm run barrels && swc src --out-dir dist -s", + "start": "npm run barrels && nodemon --import @swc-node/register/register-esm src/index.ts", + "start:prod": "cross-env NODE_ENV=production node --import @swc-node/register/register-esm src/index.js", }, "tsed": { "packageManager": "npm", @@ -698,9 +612,11 @@ describe("Init cmd", () => { "project-name/.barrels.json", "project-name/.dockerignore", "project-name/.gitignore", + "project-name/.swcrc", "project-name/Dockerfile", "project-name/README.md", "project-name/docker-compose.yml", + "project-name/nodemon.json", "project-name/package.json", "project-name/processes.config.cjs", "project-name/src", @@ -762,9 +678,11 @@ describe("Init cmd", () => { "project-name/.barrels.json", "project-name/.dockerignore", "project-name/.gitignore", + "project-name/.swcrc", "project-name/Dockerfile", "project-name/README.md", "project-name/docker-compose.yml", + "project-name/nodemon.json", "project-name/package.json", "project-name/processes.config.cjs", "project-name/src", @@ -825,9 +743,11 @@ describe("Init cmd", () => { "project-name/.barrels.json", "project-name/.dockerignore", "project-name/.gitignore", + "project-name/.swcrc", "project-name/Dockerfile", "project-name/README.md", "project-name/docker-compose.yml", + "project-name/nodemon.json", "project-name/package.json", "project-name/processes.config.cjs", "project-name/src", @@ -879,9 +799,9 @@ describe("Init cmd", () => { "name": "project-data", "scripts": { "barrels": "barrels", - "build": "yarn run barrels && tsc --project tsconfig.compile.json", - "start": "yarn run barrels && tsnd --inspect --exit-child --cls --ignore-watch node_modules --respawn --transpile-only src/index.ts", - "start:prod": "cross-env NODE_ENV=production node dist/index.js", + "build": "yarn run barrels && swc src --out-dir dist -s", + "start": "yarn run barrels && nodemon --import @swc-node/register/register-esm src/index.ts", + "start:prod": "cross-env NODE_ENV=production node --import @swc-node/register/register-esm src/index.js", }, "tsed": { "packageManager": "yarn", @@ -930,9 +850,11 @@ describe("Init cmd", () => { "project-name/.barrels.json", "project-name/.dockerignore", "project-name/.gitignore", + "project-name/.swcrc", "project-name/Dockerfile", "project-name/README.md", "project-name/docker-compose.yml", + "project-name/nodemon.json", "project-name/package.json", "project-name/processes.config.cjs", "project-name/src", From 6f48f288a6ebf3f1dc5f6ff951f722fd782c218f Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Mon, 16 Sep 2024 13:50:13 +0200 Subject: [PATCH 11/69] fix(barrels): fix globby import --- packages/barrels/bin/barrels.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/barrels/bin/barrels.js b/packages/barrels/bin/barrels.js index ecf169c45..1dc60c05a 100755 --- a/packages/barrels/bin/barrels.js +++ b/packages/barrels/bin/barrels.js @@ -2,7 +2,7 @@ import {existsSync} from "node:fs"; import {writeFile, readFile} from "node:fs/promises"; import {join} from "node:path"; -import globby from "globby"; +import {globby} from "globby"; function resolveConfig() { return [ From 95540d2013276e911832d9f4fca0bb76b28198c9 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Tue, 17 Sep 2024 08:09:27 +0200 Subject: [PATCH 12/69] fix: fix configuration and build issue --- .../cli-generate-http-client/package.json | 1 - .../tsconfig.spec.json | 24 +-- packages/cli-generate-swagger/package.json | 1 - .../cli-generate-swagger/tsconfig.spec.json | 24 +-- packages/cli-plugin-eslint/package.json | 1 - packages/cli-plugin-eslint/tsconfig.spec.json | 24 +-- packages/cli-plugin-jest/package.json | 1 - packages/cli-plugin-mongoose/package.json | 1 - .../cli-plugin-mongoose/tsconfig.cjs.json | 30 +--- .../cli-plugin-oidc-provider/package.json | 1 - packages/cli-plugin-passport/package.json | 1 - .../cli-plugin-passport/tsconfig.spec.json | 24 +-- packages/cli-plugin-prisma/package.json | 1 - packages/cli-plugin-typegraphql/package.json | 1 - packages/cli-plugin-typeorm/package.json | 1 - packages/cli-plugin-vitest/package.json | 1 - packages/cli-testing/package.json | 1 - packages/cli-testing/tsconfig.cjs.json | 28 ---- packages/cli-testing/tsconfig.spec.json | 24 +-- packages/cli/package.json | 5 +- tools/vitest/package.json | 2 +- yarn.lock | 139 +----------------- 22 files changed, 21 insertions(+), 315 deletions(-) delete mode 100644 packages/cli-testing/tsconfig.cjs.json diff --git a/packages/cli-generate-http-client/package.json b/packages/cli-generate-http-client/package.json index 4e0530dec..e70954712 100644 --- a/packages/cli-generate-http-client/package.json +++ b/packages/cli-generate-http-client/package.json @@ -11,7 +11,6 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "require": "./lib/cjs/index.js", "default": "./lib/esm/index.js" } }, diff --git a/packages/cli-generate-http-client/tsconfig.spec.json b/packages/cli-generate-http-client/tsconfig.spec.json index 079424388..ef4e5e8f8 100644 --- a/packages/cli-generate-http-client/tsconfig.spec.json +++ b/packages/cli-generate-http-client/tsconfig.spec.json @@ -3,32 +3,10 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, - "paths": { - "@tsed/openspec": ["../specs/openspec/src"], - "@tsed/schema": ["../specs/schema/src"], - "@tsed/exceptions": ["../specs/exceptions/src"], - "@tsed/json-mapper": ["../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../platform/platform-router/src"], - "@tsed/platform-views": ["../platform/platform-views/src"], - "@tsed/components-scan": ["../third-parties/components-scan/src"], - "@tsed/common": ["../platform/common/src"], - "@tsed/ajv": ["../specs/ajv/src"], - "@tsed/platform-cache": ["../platform/platform-cache/src"], - "@tsed/swagger": ["../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../platform/platform-express/src"], - "@tsed/platform-koa": ["../platform/platform-koa/src"] - }, + "paths": {}, "types": ["vite/client", "vitest/globals"] }, "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], diff --git a/packages/cli-generate-swagger/package.json b/packages/cli-generate-swagger/package.json index 9740b07f2..a0c173a48 100644 --- a/packages/cli-generate-swagger/package.json +++ b/packages/cli-generate-swagger/package.json @@ -11,7 +11,6 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "require": "./lib/cjs/index.js", "default": "./lib/esm/index.js" } }, diff --git a/packages/cli-generate-swagger/tsconfig.spec.json b/packages/cli-generate-swagger/tsconfig.spec.json index 079424388..ef4e5e8f8 100644 --- a/packages/cli-generate-swagger/tsconfig.spec.json +++ b/packages/cli-generate-swagger/tsconfig.spec.json @@ -3,32 +3,10 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, - "paths": { - "@tsed/openspec": ["../specs/openspec/src"], - "@tsed/schema": ["../specs/schema/src"], - "@tsed/exceptions": ["../specs/exceptions/src"], - "@tsed/json-mapper": ["../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../platform/platform-router/src"], - "@tsed/platform-views": ["../platform/platform-views/src"], - "@tsed/components-scan": ["../third-parties/components-scan/src"], - "@tsed/common": ["../platform/common/src"], - "@tsed/ajv": ["../specs/ajv/src"], - "@tsed/platform-cache": ["../platform/platform-cache/src"], - "@tsed/swagger": ["../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../platform/platform-express/src"], - "@tsed/platform-koa": ["../platform/platform-koa/src"] - }, + "paths": {}, "types": ["vite/client", "vitest/globals"] }, "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], diff --git a/packages/cli-plugin-eslint/package.json b/packages/cli-plugin-eslint/package.json index be3b897ff..68393441a 100644 --- a/packages/cli-plugin-eslint/package.json +++ b/packages/cli-plugin-eslint/package.json @@ -11,7 +11,6 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "require": "./lib/cjs/index.js", "default": "./lib/esm/index.js" } }, diff --git a/packages/cli-plugin-eslint/tsconfig.spec.json b/packages/cli-plugin-eslint/tsconfig.spec.json index 079424388..ef4e5e8f8 100644 --- a/packages/cli-plugin-eslint/tsconfig.spec.json +++ b/packages/cli-plugin-eslint/tsconfig.spec.json @@ -3,32 +3,10 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, - "paths": { - "@tsed/openspec": ["../specs/openspec/src"], - "@tsed/schema": ["../specs/schema/src"], - "@tsed/exceptions": ["../specs/exceptions/src"], - "@tsed/json-mapper": ["../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../platform/platform-router/src"], - "@tsed/platform-views": ["../platform/platform-views/src"], - "@tsed/components-scan": ["../third-parties/components-scan/src"], - "@tsed/common": ["../platform/common/src"], - "@tsed/ajv": ["../specs/ajv/src"], - "@tsed/platform-cache": ["../platform/platform-cache/src"], - "@tsed/swagger": ["../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../platform/platform-express/src"], - "@tsed/platform-koa": ["../platform/platform-koa/src"] - }, + "paths": {}, "types": ["vite/client", "vitest/globals"] }, "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], diff --git a/packages/cli-plugin-jest/package.json b/packages/cli-plugin-jest/package.json index f3355c84a..e83586601 100644 --- a/packages/cli-plugin-jest/package.json +++ b/packages/cli-plugin-jest/package.json @@ -11,7 +11,6 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "require": "./lib/cjs/index.js", "default": "./lib/esm/index.js" } }, diff --git a/packages/cli-plugin-mongoose/package.json b/packages/cli-plugin-mongoose/package.json index 35a0c1b91..39228d037 100644 --- a/packages/cli-plugin-mongoose/package.json +++ b/packages/cli-plugin-mongoose/package.json @@ -11,7 +11,6 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "require": "./lib/cjs/index.js", "default": "./lib/esm/index.js" } }, diff --git a/packages/cli-plugin-mongoose/tsconfig.cjs.json b/packages/cli-plugin-mongoose/tsconfig.cjs.json index 7f23b116d..ef4e5e8f8 100644 --- a/packages/cli-plugin-mongoose/tsconfig.cjs.json +++ b/packages/cli-plugin-mongoose/tsconfig.cjs.json @@ -2,27 +2,13 @@ "extends": "@tsed/typescript/tsconfig.node.json", "compilerOptions": { "baseUrl": ".", - "module": "commonjs", - "moduleResolution": "Node16", - "rootDir": "src", - "outDir": "./lib/cjs", - "declaration": true, - "declarationDir": "./lib/types", - "composite": true, - "noEmit": false + "rootDir": "..", + "declaration": false, + "composite": false, + "noEmit": true, + "paths": {}, + "types": ["vite/client", "vitest/globals"] }, - "include": ["src", "src/**/*.json"], - "exclude": [ - "node_modules", - "test", - "lib", - "benchmark", - "coverage", - "spec", - "**/*.benchmark.ts", - "**/*.spec.ts", - "keys", - "**/__mock__/**", - "webpack.config.js" - ] + "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], + "exclude": ["node_modules", "test", "lib", "benchmark", "coverage"] } diff --git a/packages/cli-plugin-oidc-provider/package.json b/packages/cli-plugin-oidc-provider/package.json index 9a11c9c0c..1722b4ce6 100644 --- a/packages/cli-plugin-oidc-provider/package.json +++ b/packages/cli-plugin-oidc-provider/package.json @@ -11,7 +11,6 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "require": "./lib/cjs/index.js", "default": "./lib/esm/index.js" } }, diff --git a/packages/cli-plugin-passport/package.json b/packages/cli-plugin-passport/package.json index 7f0a8f1cb..69edb88c6 100644 --- a/packages/cli-plugin-passport/package.json +++ b/packages/cli-plugin-passport/package.json @@ -11,7 +11,6 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "require": "./lib/cjs/index.js", "default": "./lib/esm/index.js" } }, diff --git a/packages/cli-plugin-passport/tsconfig.spec.json b/packages/cli-plugin-passport/tsconfig.spec.json index 079424388..ef4e5e8f8 100644 --- a/packages/cli-plugin-passport/tsconfig.spec.json +++ b/packages/cli-plugin-passport/tsconfig.spec.json @@ -3,32 +3,10 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, - "paths": { - "@tsed/openspec": ["../specs/openspec/src"], - "@tsed/schema": ["../specs/schema/src"], - "@tsed/exceptions": ["../specs/exceptions/src"], - "@tsed/json-mapper": ["../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../platform/platform-router/src"], - "@tsed/platform-views": ["../platform/platform-views/src"], - "@tsed/components-scan": ["../third-parties/components-scan/src"], - "@tsed/common": ["../platform/common/src"], - "@tsed/ajv": ["../specs/ajv/src"], - "@tsed/platform-cache": ["../platform/platform-cache/src"], - "@tsed/swagger": ["../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../platform/platform-express/src"], - "@tsed/platform-koa": ["../platform/platform-koa/src"] - }, + "paths": {}, "types": ["vite/client", "vitest/globals"] }, "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], diff --git a/packages/cli-plugin-prisma/package.json b/packages/cli-plugin-prisma/package.json index f7ce6e1ff..625a5c631 100644 --- a/packages/cli-plugin-prisma/package.json +++ b/packages/cli-plugin-prisma/package.json @@ -11,7 +11,6 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "require": "./lib/cjs/index.js", "default": "./lib/esm/index.js" } }, diff --git a/packages/cli-plugin-typegraphql/package.json b/packages/cli-plugin-typegraphql/package.json index 3b3c1aace..1971e9b21 100644 --- a/packages/cli-plugin-typegraphql/package.json +++ b/packages/cli-plugin-typegraphql/package.json @@ -11,7 +11,6 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "require": "./lib/cjs/index.js", "default": "./lib/esm/index.js" } }, diff --git a/packages/cli-plugin-typeorm/package.json b/packages/cli-plugin-typeorm/package.json index 712cc6020..179896b82 100644 --- a/packages/cli-plugin-typeorm/package.json +++ b/packages/cli-plugin-typeorm/package.json @@ -11,7 +11,6 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "require": "./lib/cjs/index.js", "default": "./lib/esm/index.js" } }, diff --git a/packages/cli-plugin-vitest/package.json b/packages/cli-plugin-vitest/package.json index 7751b84bc..521b9c9a3 100644 --- a/packages/cli-plugin-vitest/package.json +++ b/packages/cli-plugin-vitest/package.json @@ -11,7 +11,6 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "require": "./lib/cjs/index.js", "default": "./lib/esm/index.js" } }, diff --git a/packages/cli-testing/package.json b/packages/cli-testing/package.json index a60625160..3fd55f481 100644 --- a/packages/cli-testing/package.json +++ b/packages/cli-testing/package.json @@ -11,7 +11,6 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "require": "./lib/cjs/index.js", "default": "./lib/esm/index.js" } }, diff --git a/packages/cli-testing/tsconfig.cjs.json b/packages/cli-testing/tsconfig.cjs.json deleted file mode 100644 index 7f23b116d..000000000 --- a/packages/cli-testing/tsconfig.cjs.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "extends": "@tsed/typescript/tsconfig.node.json", - "compilerOptions": { - "baseUrl": ".", - "module": "commonjs", - "moduleResolution": "Node16", - "rootDir": "src", - "outDir": "./lib/cjs", - "declaration": true, - "declarationDir": "./lib/types", - "composite": true, - "noEmit": false - }, - "include": ["src", "src/**/*.json"], - "exclude": [ - "node_modules", - "test", - "lib", - "benchmark", - "coverage", - "spec", - "**/*.benchmark.ts", - "**/*.spec.ts", - "keys", - "**/__mock__/**", - "webpack.config.js" - ] -} diff --git a/packages/cli-testing/tsconfig.spec.json b/packages/cli-testing/tsconfig.spec.json index 079424388..ef4e5e8f8 100644 --- a/packages/cli-testing/tsconfig.spec.json +++ b/packages/cli-testing/tsconfig.spec.json @@ -3,32 +3,10 @@ "compilerOptions": { "baseUrl": ".", "rootDir": "..", - "module": "commonjs", - "outDir": "./lib/cjs", "declaration": false, "composite": false, "noEmit": true, - "paths": { - "@tsed/openspec": ["../specs/openspec/src"], - "@tsed/schema": ["../specs/schema/src"], - "@tsed/exceptions": ["../specs/exceptions/src"], - "@tsed/json-mapper": ["../specs/json-mapper/src"], - "@tsed/platform-exceptions": ["../platform/platform-exceptions/src"], - "@tsed/platform-middlewares": ["../platform/platform-middlewares/src"], - "@tsed/platform-params": ["../platform/platform-params/src"], - "@tsed/platform-log-middleware": ["../platform/platform-log-middleware/src"], - "@tsed/platform-response-filter": ["../platform/platform-response-filter/src"], - "@tsed/platform-router": ["../platform/platform-router/src"], - "@tsed/platform-views": ["../platform/platform-views/src"], - "@tsed/components-scan": ["../third-parties/components-scan/src"], - "@tsed/common": ["../platform/common/src"], - "@tsed/ajv": ["../specs/ajv/src"], - "@tsed/platform-cache": ["../platform/platform-cache/src"], - "@tsed/swagger": ["../specs/swagger/src"], - "@tsed/platform-test-sdk": ["../platform/platform-test-sdk/src"], - "@tsed/platform-express": ["../platform/platform-express/src"], - "@tsed/platform-koa": ["../platform/platform-koa/src"] - }, + "paths": {}, "types": ["vite/client", "vitest/globals"] }, "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], diff --git a/packages/cli/package.json b/packages/cli/package.json index fcc4cafa0..fbba5ced6 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -11,7 +11,6 @@ ".": { "types": "./lib/types/index.d.ts", "import": "./lib/esm/index.js", - "require": "./lib/cjs/index.js", "default": "./lib/esm/index.js" } }, @@ -41,11 +40,9 @@ "test:ci": "vitest run --coverage.thresholds.autoUpdate=true" }, "bin": { - "tsed": "lib/cjs/bin/tsed.js" + "tsed": "lib/esm/bin/tsed.js" }, "files": [ - "lib/cjs/bin/tsed.js", - "lib/cjs/bin", "lib/esm/bin/tsed.js", "lib/esm/bin", "lib", diff --git a/tools/vitest/package.json b/tools/vitest/package.json index d445ac77c..1d88d7395 100644 --- a/tools/vitest/package.json +++ b/tools/vitest/package.json @@ -9,7 +9,7 @@ "./presets": "./presets/index.js" }, "devDependencies": { - "vitest": "2.0.5" + "vitest": "2.1.1" }, "scripts": { "generate": "node index.js" diff --git a/yarn.lock b/yarn.lock index a1b4e76fa..e74145a38 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2754,7 +2754,7 @@ __metadata: "@tsed/openspec": ">=7.14.2" "@tsed/schema": ">=7.14.2" bin: - tsed: lib/cjs/bin/tsed.js + tsed: lib/esm/bin/tsed.js languageName: unknown linkType: soft @@ -2909,7 +2909,7 @@ __metadata: version: 0.0.0-use.local resolution: "@tsed/vitest@workspace:tools/vitest" dependencies: - vitest: "npm:2.0.5" + vitest: "npm:2.1.1" languageName: unknown linkType: soft @@ -3502,18 +3502,6 @@ __metadata: languageName: node linkType: hard -"@vitest/expect@npm:2.0.5": - version: 2.0.5 - resolution: "@vitest/expect@npm:2.0.5" - dependencies: - "@vitest/spy": "npm:2.0.5" - "@vitest/utils": "npm:2.0.5" - chai: "npm:^5.1.1" - tinyrainbow: "npm:^1.2.0" - checksum: 10/ca9a218f50254b2259fd16166b2d8c9ccc8ee2cc068905e6b3d6281da10967b1590cc7d34b5fa9d429297f97e740450233745583b4cc12272ff11705faf70a37 - languageName: node - linkType: hard - "@vitest/expect@npm:2.1.1": version: 2.1.1 resolution: "@vitest/expect@npm:2.1.1" @@ -3546,16 +3534,7 @@ __metadata: languageName: node linkType: hard -"@vitest/pretty-format@npm:2.0.5": - version: 2.0.5 - resolution: "@vitest/pretty-format@npm:2.0.5" - dependencies: - tinyrainbow: "npm:^1.2.0" - checksum: 10/70bf452dd0b8525e658795125b3f11110bd6baadfaa38c5bb91ca763bded35ec6dc80e27964ad4e91b91be6544d35e18ea7748c1997693988f975a7283c3e9a0 - languageName: node - linkType: hard - -"@vitest/pretty-format@npm:2.1.1, @vitest/pretty-format@npm:^2.0.5, @vitest/pretty-format@npm:^2.1.1": +"@vitest/pretty-format@npm:2.1.1, @vitest/pretty-format@npm:^2.1.1": version: 2.1.1 resolution: "@vitest/pretty-format@npm:2.1.1" dependencies: @@ -3564,16 +3543,6 @@ __metadata: languageName: node linkType: hard -"@vitest/runner@npm:2.0.5": - version: 2.0.5 - resolution: "@vitest/runner@npm:2.0.5" - dependencies: - "@vitest/utils": "npm:2.0.5" - pathe: "npm:^1.1.2" - checksum: 10/464449abb84b3c779e1c6d1bedfc9e7469240ba3ccc4b4fa884386d1752d6572b68b9a87440159d433f17f61aca4012ee3bb78a3718d0e2bc64d810e9fc574a5 - languageName: node - linkType: hard - "@vitest/runner@npm:2.1.1": version: 2.1.1 resolution: "@vitest/runner@npm:2.1.1" @@ -3584,17 +3553,6 @@ __metadata: languageName: node linkType: hard -"@vitest/snapshot@npm:2.0.5": - version: 2.0.5 - resolution: "@vitest/snapshot@npm:2.0.5" - dependencies: - "@vitest/pretty-format": "npm:2.0.5" - magic-string: "npm:^0.30.10" - pathe: "npm:^1.1.2" - checksum: 10/fb46bc65851d4c8dcbbf86279c4146d5e7c17ad0d1be97132dedd98565d37f70ac8b0bf51ead0c6707786ffb15652535398c14d4304fa2146b0393d3db26fdff - languageName: node - linkType: hard - "@vitest/snapshot@npm:2.1.1": version: 2.1.1 resolution: "@vitest/snapshot@npm:2.1.1" @@ -3606,15 +3564,6 @@ __metadata: languageName: node linkType: hard -"@vitest/spy@npm:2.0.5": - version: 2.0.5 - resolution: "@vitest/spy@npm:2.0.5" - dependencies: - tinyspy: "npm:^3.0.0" - checksum: 10/ed19f4c3bb4d3853241e8070979615138e24403ce4c137fa48c903b3af2c8b3ada2cc26aca9c1aa323bb314a457a8130a29acbb18dafd4e42737deefb2abf1ca - languageName: node - linkType: hard - "@vitest/spy@npm:2.1.1, @vitest/spy@npm:^2.1.0-beta.1": version: 2.1.1 resolution: "@vitest/spy@npm:2.1.1" @@ -3624,18 +3573,6 @@ __metadata: languageName: node linkType: hard -"@vitest/utils@npm:2.0.5": - version: 2.0.5 - resolution: "@vitest/utils@npm:2.0.5" - dependencies: - "@vitest/pretty-format": "npm:2.0.5" - estree-walker: "npm:^3.0.3" - loupe: "npm:^3.1.1" - tinyrainbow: "npm:^1.2.0" - checksum: 10/d631d56d29c33bc8de631166b2b6691c470187a345469dfef7048befe6027e1c6ff9552f2ee11c8a247522c325c4a64bfcc73f8f0f0c525da39cb9f190f119f8 - languageName: node - linkType: hard - "@vitest/utils@npm:2.1.1": version: 2.1.1 resolution: "@vitest/utils@npm:2.1.1" @@ -7124,7 +7061,7 @@ __metadata: languageName: node linkType: hard -"execa@npm:>=8.0.1, execa@npm:^8.0.0, execa@npm:^8.0.1": +"execa@npm:>=8.0.1, execa@npm:^8.0.0": version: 8.0.1 resolution: "execa@npm:8.0.1" dependencies: @@ -11143,7 +11080,7 @@ __metadata: languageName: node linkType: hard -"magic-string@npm:^0.30.10, magic-string@npm:^0.30.11": +"magic-string@npm:^0.30.11": version: 0.30.11 resolution: "magic-string@npm:0.30.11" dependencies: @@ -15900,7 +15837,7 @@ __metadata: languageName: node linkType: hard -"tinybench@npm:^2.8.0, tinybench@npm:^2.9.0": +"tinybench@npm:^2.9.0": version: 2.9.0 resolution: "tinybench@npm:2.9.0" checksum: 10/cfa1e1418e91289219501703c4693c70708c91ffb7f040fd318d24aef419fb5a43e0c0160df9471499191968b2451d8da7f8087b08c3133c251c40d24aced06c @@ -16901,21 +16838,6 @@ __metadata: languageName: node linkType: hard -"vite-node@npm:2.0.5": - version: 2.0.5 - resolution: "vite-node@npm:2.0.5" - dependencies: - cac: "npm:^6.7.14" - debug: "npm:^4.3.5" - pathe: "npm:^1.1.2" - tinyrainbow: "npm:^1.2.0" - vite: "npm:^5.0.0" - bin: - vite-node: vite-node.mjs - checksum: 10/de259cdf4b9ff82f39ba92ffca99db8a80783efd2764d3553b62cd8c8864488d590114a75bc93a93bf5ba2a2086bea1bee4b0029da9e62c4c0d3bf6c1f364eed - languageName: node - linkType: hard - "vite-node@npm:2.1.1": version: 2.1.1 resolution: "vite-node@npm:2.1.1" @@ -16973,55 +16895,6 @@ __metadata: languageName: node linkType: hard -"vitest@npm:2.0.5": - version: 2.0.5 - resolution: "vitest@npm:2.0.5" - dependencies: - "@ampproject/remapping": "npm:^2.3.0" - "@vitest/expect": "npm:2.0.5" - "@vitest/pretty-format": "npm:^2.0.5" - "@vitest/runner": "npm:2.0.5" - "@vitest/snapshot": "npm:2.0.5" - "@vitest/spy": "npm:2.0.5" - "@vitest/utils": "npm:2.0.5" - chai: "npm:^5.1.1" - debug: "npm:^4.3.5" - execa: "npm:^8.0.1" - magic-string: "npm:^0.30.10" - pathe: "npm:^1.1.2" - std-env: "npm:^3.7.0" - tinybench: "npm:^2.8.0" - tinypool: "npm:^1.0.0" - tinyrainbow: "npm:^1.2.0" - vite: "npm:^5.0.0" - vite-node: "npm:2.0.5" - why-is-node-running: "npm:^2.3.0" - peerDependencies: - "@edge-runtime/vm": "*" - "@types/node": ^18.0.0 || >=20.0.0 - "@vitest/browser": 2.0.5 - "@vitest/ui": 2.0.5 - happy-dom: "*" - jsdom: "*" - peerDependenciesMeta: - "@edge-runtime/vm": - optional: true - "@types/node": - optional: true - "@vitest/browser": - optional: true - "@vitest/ui": - optional: true - happy-dom: - optional: true - jsdom: - optional: true - bin: - vitest: vitest.mjs - checksum: 10/abb916e3496a3fa9e9d05ecd806332dc4000aa0e433f0cb1e99f9dd1fa5c06d2c66656874b9860a683cec0f32abe1519599babef02e5c0ca80e9afbcdbddfdbd - languageName: node - linkType: hard - "vitest@npm:2.1.1": version: 2.1.1 resolution: "vitest@npm:2.1.1" From ffbbccf4c4894eb19ba74a527b3cb0e6a8eacabc Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 17 Sep 2024 06:16:10 +0000 Subject: [PATCH 13/69] Github CI build: __run_2 v6.0.0-alpha.1 [ci skip] --- lerna.json | 4 ++-- package.json | 2 +- packages/barrels/package.json | 2 +- packages/cli-core/package.json | 2 +- packages/cli-generate-http-client/package.json | 2 +- packages/cli-generate-swagger/package.json | 2 +- packages/cli-plugin-eslint/package.json | 2 +- packages/cli-plugin-jest/package.json | 2 +- packages/cli-plugin-mongoose/package.json | 2 +- packages/cli-plugin-oidc-provider/package.json | 2 +- packages/cli-plugin-passport/package.json | 2 +- packages/cli-plugin-prisma/package.json | 2 +- packages/cli-plugin-typegraphql/package.json | 2 +- packages/cli-plugin-typeorm/package.json | 2 +- packages/cli-plugin-vitest/package.json | 2 +- packages/cli-testing/package.json | 2 +- packages/cli/package.json | 2 +- tools/typescript/package.json | 2 +- tools/vitest/package.json | 2 +- 19 files changed, 20 insertions(+), 20 deletions(-) diff --git a/lerna.json b/lerna.json index 0dd849655..b318bfa07 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "packages": [ "packages/*" ], - "version": "5.3.1" -} + "version": "6.0.0-alpha.1" +} \ No newline at end of file diff --git a/package.json b/package.json index 77478c187..6c825857e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@tsed/cli-root", - "version": "5.3.1", + "version": "6.0.0-alpha.1", "description": "CLI to bootstrap your Ts.ED project", "private": true, "type": "module", diff --git a/packages/barrels/package.json b/packages/barrels/package.json index 758e41b03..496451b2a 100644 --- a/packages/barrels/package.json +++ b/packages/barrels/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/barrels", "description": "A simple tool to generate barrels for your TypeScript project", - "version": "5.3.1", + "version": "6.0.0-alpha.1", "type": "module", "bin": "bin/barrels.js", "files": [], diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index a5582248d..96973f0b3 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-core", "description": "Build your CLI with TypeScript and Decorators", - "version": "5.3.1", + "version": "6.0.0-alpha.1", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-generate-http-client/package.json b/packages/cli-generate-http-client/package.json index e70954712..71e2fd2bf 100644 --- a/packages/cli-generate-http-client/package.json +++ b/packages/cli-generate-http-client/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-generate-http-client", "description": "Ts.ED CLI plugin. Export a command that generate an HTTP Client (axios or fetch) from your Ts.ED controllers and OS3 spec.", - "version": "5.3.1", + "version": "6.0.0-alpha.1", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-generate-swagger/package.json b/packages/cli-generate-swagger/package.json index a0c173a48..309f0cd4d 100644 --- a/packages/cli-generate-swagger/package.json +++ b/packages/cli-generate-swagger/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-generate-swagger", "description": "Ts.ED CLI plugin. Export a command that generate the swagger.json from your Ts.ED controllers and OS3 spec.", - "version": "5.3.1", + "version": "6.0.0-alpha.1", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-eslint/package.json b/packages/cli-plugin-eslint/package.json index 68393441a..d3b2c10f0 100644 --- a/packages/cli-plugin-eslint/package.json +++ b/packages/cli-plugin-eslint/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-eslint", "description": "Ts.ED CLI plugin. Add EsLint support", - "version": "5.3.1", + "version": "6.0.0-alpha.1", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-jest/package.json b/packages/cli-plugin-jest/package.json index e83586601..a976f7a63 100644 --- a/packages/cli-plugin-jest/package.json +++ b/packages/cli-plugin-jest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-jest", "description": "Ts.ED CLI plugin. Add Jest support", - "version": "5.3.1", + "version": "6.0.0-alpha.1", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-mongoose/package.json b/packages/cli-plugin-mongoose/package.json index 39228d037..08b88305b 100644 --- a/packages/cli-plugin-mongoose/package.json +++ b/packages/cli-plugin-mongoose/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-mongoose", "description": "Ts.ED CLI plugin. Add Mongoose support", - "version": "5.3.1", + "version": "6.0.0-alpha.1", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-oidc-provider/package.json b/packages/cli-plugin-oidc-provider/package.json index 1722b4ce6..f74c5f54c 100644 --- a/packages/cli-plugin-oidc-provider/package.json +++ b/packages/cli-plugin-oidc-provider/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-oidc-provider", "description": "Ts.ED CLI plugin. Add OIDC Provider", - "version": "5.3.1", + "version": "6.0.0-alpha.1", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-passport/package.json b/packages/cli-plugin-passport/package.json index 69edb88c6..3d002faa3 100644 --- a/packages/cli-plugin-passport/package.json +++ b/packages/cli-plugin-passport/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-passport", "description": "Ts.ED CLI plugin. Add Passport.js support", - "version": "5.3.1", + "version": "6.0.0-alpha.1", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-prisma/package.json b/packages/cli-plugin-prisma/package.json index 625a5c631..3c42d32cf 100644 --- a/packages/cli-plugin-prisma/package.json +++ b/packages/cli-plugin-prisma/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-prisma", "description": "Ts.ED CLI plugin. Add Prisma project initialisation support.", - "version": "5.3.1", + "version": "6.0.0-alpha.1", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-typegraphql/package.json b/packages/cli-plugin-typegraphql/package.json index 1971e9b21..77f7f6d04 100644 --- a/packages/cli-plugin-typegraphql/package.json +++ b/packages/cli-plugin-typegraphql/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-typegraphql", "description": "Ts.ED CLI plugin. Add TypeGraphql support.", - "version": "5.3.1", + "version": "6.0.0-alpha.1", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-typeorm/package.json b/packages/cli-plugin-typeorm/package.json index 179896b82..fd9d2c197 100644 --- a/packages/cli-plugin-typeorm/package.json +++ b/packages/cli-plugin-typeorm/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-typeorm", "description": "Ts.ED CLI plugin. Add TypeORM support", - "version": "5.3.1", + "version": "6.0.0-alpha.1", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-vitest/package.json b/packages/cli-plugin-vitest/package.json index 521b9c9a3..fdb560cb6 100644 --- a/packages/cli-plugin-vitest/package.json +++ b/packages/cli-plugin-vitest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-vitest", "description": "Ts.ED CLI plugin. Add Jest support", - "version": "5.3.1", + "version": "6.0.0-alpha.1", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-testing/package.json b/packages/cli-testing/package.json index 3fd55f481..0612ac119 100644 --- a/packages/cli-testing/package.json +++ b/packages/cli-testing/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-testing", "description": "Utils to test you CLI based on Ts.ED CLI", - "version": "5.3.1", + "version": "6.0.0-alpha.1", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli/package.json b/packages/cli/package.json index fbba5ced6..2b6b5dfca 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli", "description": "CLI to bootstrap your Ts.ED project", - "version": "5.3.1", + "version": "6.0.0-alpha.1", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/tools/typescript/package.json b/tools/typescript/package.json index 675ef33bc..21e833817 100644 --- a/tools/typescript/package.json +++ b/tools/typescript/package.json @@ -1,6 +1,6 @@ { "name": "@tsed/typescript", - "version": "5.3.1", + "version": "6.0.0-alpha.1", "description": "Util to compile source", "type": "module", "private": true, diff --git a/tools/vitest/package.json b/tools/vitest/package.json index 1d88d7395..67bdc0906 100644 --- a/tools/vitest/package.json +++ b/tools/vitest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/vitest", "type": "module", - "version": "7.83.0", + "version": "6.0.0-alpha.1", "private": true, "exports": { ".": "./index.js", From db11fe3a9787cd3d928170e9ce1b08f62c09175a Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Tue, 17 Sep 2024 09:39:17 +0200 Subject: [PATCH 14/69] fix(cli-core): fix missing .js in import --- packages/cli-core/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli-core/src/index.ts b/packages/cli-core/src/index.ts index 5b63eef70..f602cab64 100644 --- a/packages/cli-core/src/index.ts +++ b/packages/cli-core/src/index.ts @@ -30,4 +30,4 @@ export * from "@tsed/logger"; export * from "@tsed/normalize-path"; export {Inquirer}; -import "./utils/patchCommander"; +import "./utils/patchCommander.js"; From 310683138ef8611091a9cb885a15420284eb9260 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 17 Sep 2024 07:43:30 +0000 Subject: [PATCH 15/69] Github CI build: __run_2 v6.0.0-alpha.2 [ci skip] --- lerna.json | 2 +- package.json | 2 +- packages/barrels/package.json | 2 +- packages/cli-core/package.json | 2 +- packages/cli-generate-http-client/package.json | 2 +- packages/cli-generate-swagger/package.json | 2 +- packages/cli-plugin-eslint/package.json | 2 +- packages/cli-plugin-jest/package.json | 2 +- packages/cli-plugin-mongoose/package.json | 2 +- packages/cli-plugin-oidc-provider/package.json | 2 +- packages/cli-plugin-passport/package.json | 2 +- packages/cli-plugin-prisma/package.json | 2 +- packages/cli-plugin-typegraphql/package.json | 2 +- packages/cli-plugin-typeorm/package.json | 2 +- packages/cli-plugin-vitest/package.json | 2 +- packages/cli-testing/package.json | 2 +- packages/cli/package.json | 2 +- tools/typescript/package.json | 2 +- tools/vitest/package.json | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lerna.json b/lerna.json index b318bfa07..39b867b52 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "packages": [ "packages/*" ], - "version": "6.0.0-alpha.1" + "version": "6.0.0-alpha.2" } \ No newline at end of file diff --git a/package.json b/package.json index 6c825857e..f77e768e6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@tsed/cli-root", - "version": "6.0.0-alpha.1", + "version": "6.0.0-alpha.2", "description": "CLI to bootstrap your Ts.ED project", "private": true, "type": "module", diff --git a/packages/barrels/package.json b/packages/barrels/package.json index 496451b2a..94f65660c 100644 --- a/packages/barrels/package.json +++ b/packages/barrels/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/barrels", "description": "A simple tool to generate barrels for your TypeScript project", - "version": "6.0.0-alpha.1", + "version": "6.0.0-alpha.2", "type": "module", "bin": "bin/barrels.js", "files": [], diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index 96973f0b3..9fc3f4e3d 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-core", "description": "Build your CLI with TypeScript and Decorators", - "version": "6.0.0-alpha.1", + "version": "6.0.0-alpha.2", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-generate-http-client/package.json b/packages/cli-generate-http-client/package.json index 71e2fd2bf..7386c26bd 100644 --- a/packages/cli-generate-http-client/package.json +++ b/packages/cli-generate-http-client/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-generate-http-client", "description": "Ts.ED CLI plugin. Export a command that generate an HTTP Client (axios or fetch) from your Ts.ED controllers and OS3 spec.", - "version": "6.0.0-alpha.1", + "version": "6.0.0-alpha.2", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-generate-swagger/package.json b/packages/cli-generate-swagger/package.json index 309f0cd4d..8857688b6 100644 --- a/packages/cli-generate-swagger/package.json +++ b/packages/cli-generate-swagger/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-generate-swagger", "description": "Ts.ED CLI plugin. Export a command that generate the swagger.json from your Ts.ED controllers and OS3 spec.", - "version": "6.0.0-alpha.1", + "version": "6.0.0-alpha.2", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-eslint/package.json b/packages/cli-plugin-eslint/package.json index d3b2c10f0..46f3781f4 100644 --- a/packages/cli-plugin-eslint/package.json +++ b/packages/cli-plugin-eslint/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-eslint", "description": "Ts.ED CLI plugin. Add EsLint support", - "version": "6.0.0-alpha.1", + "version": "6.0.0-alpha.2", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-jest/package.json b/packages/cli-plugin-jest/package.json index a976f7a63..93827b18e 100644 --- a/packages/cli-plugin-jest/package.json +++ b/packages/cli-plugin-jest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-jest", "description": "Ts.ED CLI plugin. Add Jest support", - "version": "6.0.0-alpha.1", + "version": "6.0.0-alpha.2", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-mongoose/package.json b/packages/cli-plugin-mongoose/package.json index 08b88305b..4cf537e2e 100644 --- a/packages/cli-plugin-mongoose/package.json +++ b/packages/cli-plugin-mongoose/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-mongoose", "description": "Ts.ED CLI plugin. Add Mongoose support", - "version": "6.0.0-alpha.1", + "version": "6.0.0-alpha.2", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-oidc-provider/package.json b/packages/cli-plugin-oidc-provider/package.json index f74c5f54c..dc3822a82 100644 --- a/packages/cli-plugin-oidc-provider/package.json +++ b/packages/cli-plugin-oidc-provider/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-oidc-provider", "description": "Ts.ED CLI plugin. Add OIDC Provider", - "version": "6.0.0-alpha.1", + "version": "6.0.0-alpha.2", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-passport/package.json b/packages/cli-plugin-passport/package.json index 3d002faa3..98a3284f5 100644 --- a/packages/cli-plugin-passport/package.json +++ b/packages/cli-plugin-passport/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-passport", "description": "Ts.ED CLI plugin. Add Passport.js support", - "version": "6.0.0-alpha.1", + "version": "6.0.0-alpha.2", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-prisma/package.json b/packages/cli-plugin-prisma/package.json index 3c42d32cf..e47f4d3e5 100644 --- a/packages/cli-plugin-prisma/package.json +++ b/packages/cli-plugin-prisma/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-prisma", "description": "Ts.ED CLI plugin. Add Prisma project initialisation support.", - "version": "6.0.0-alpha.1", + "version": "6.0.0-alpha.2", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-typegraphql/package.json b/packages/cli-plugin-typegraphql/package.json index 77f7f6d04..34726bdbd 100644 --- a/packages/cli-plugin-typegraphql/package.json +++ b/packages/cli-plugin-typegraphql/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-typegraphql", "description": "Ts.ED CLI plugin. Add TypeGraphql support.", - "version": "6.0.0-alpha.1", + "version": "6.0.0-alpha.2", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-typeorm/package.json b/packages/cli-plugin-typeorm/package.json index fd9d2c197..a8f2a98fd 100644 --- a/packages/cli-plugin-typeorm/package.json +++ b/packages/cli-plugin-typeorm/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-typeorm", "description": "Ts.ED CLI plugin. Add TypeORM support", - "version": "6.0.0-alpha.1", + "version": "6.0.0-alpha.2", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-vitest/package.json b/packages/cli-plugin-vitest/package.json index fdb560cb6..e2d596ea9 100644 --- a/packages/cli-plugin-vitest/package.json +++ b/packages/cli-plugin-vitest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-vitest", "description": "Ts.ED CLI plugin. Add Jest support", - "version": "6.0.0-alpha.1", + "version": "6.0.0-alpha.2", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-testing/package.json b/packages/cli-testing/package.json index 0612ac119..3d7b68548 100644 --- a/packages/cli-testing/package.json +++ b/packages/cli-testing/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-testing", "description": "Utils to test you CLI based on Ts.ED CLI", - "version": "6.0.0-alpha.1", + "version": "6.0.0-alpha.2", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli/package.json b/packages/cli/package.json index 2b6b5dfca..e6c1073b3 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli", "description": "CLI to bootstrap your Ts.ED project", - "version": "6.0.0-alpha.1", + "version": "6.0.0-alpha.2", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/tools/typescript/package.json b/tools/typescript/package.json index 21e833817..0969c8f4a 100644 --- a/tools/typescript/package.json +++ b/tools/typescript/package.json @@ -1,6 +1,6 @@ { "name": "@tsed/typescript", - "version": "6.0.0-alpha.1", + "version": "6.0.0-alpha.2", "description": "Util to compile source", "type": "module", "private": true, diff --git a/tools/vitest/package.json b/tools/vitest/package.json index 67bdc0906..660f787fd 100644 --- a/tools/vitest/package.json +++ b/tools/vitest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/vitest", "type": "module", - "version": "6.0.0-alpha.1", + "version": "6.0.0-alpha.2", "private": true, "exports": { ".": "./index.js", From eb5ba20b27906290a4e88add77d080a86bf7d6b7 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Tue, 17 Sep 2024 12:39:58 +0200 Subject: [PATCH 16/69] fix(cli-core): fix missing .js in import --- packages/cli-core/src/services/Renderer.ts | 2 +- .../generate/generate.controller.integration.spec.ts | 3 +-- .../integrations/generate/generate.model.integration.spec.ts | 3 +-- .../cli-plugin-typegraphql/test/init/init.integration.spec.ts | 2 +- .../generate/generate.controller.integration.spec.ts | 2 +- .../test/integrations/init/init.integration.spec.ts | 2 +- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/packages/cli-core/src/services/Renderer.ts b/packages/cli-core/src/services/Renderer.ts index 57bc8c025..f622c233d 100644 --- a/packages/cli-core/src/services/Renderer.ts +++ b/packages/cli-core/src/services/Renderer.ts @@ -1,4 +1,4 @@ -import "../utils/hbs/index"; +import "../utils/hbs/index.js"; import {isString} from "@tsed/core"; import {Configuration, Constant, Inject, Injectable} from "@tsed/di"; diff --git a/packages/cli-plugin-jest/test/integrations/generate/generate.controller.integration.spec.ts b/packages/cli-plugin-jest/test/integrations/generate/generate.controller.integration.spec.ts index 31009820c..c35a6a620 100644 --- a/packages/cli-plugin-jest/test/integrations/generate/generate.controller.integration.spec.ts +++ b/packages/cli-plugin-jest/test/integrations/generate/generate.controller.integration.spec.ts @@ -1,7 +1,6 @@ -import "../../../src"; +import "../../../src/index.js"; import {GenerateCmd, TEMPLATE_DIR} from "@tsed/cli"; -import {CliService, ProjectPackageJson} from "@tsed/cli-core"; import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; describe("Generate Controller", () => { diff --git a/packages/cli-plugin-mongoose/test/integrations/generate/generate.model.integration.spec.ts b/packages/cli-plugin-mongoose/test/integrations/generate/generate.model.integration.spec.ts index 0f4cf8184..375b3f095 100644 --- a/packages/cli-plugin-mongoose/test/integrations/generate/generate.model.integration.spec.ts +++ b/packages/cli-plugin-mongoose/test/integrations/generate/generate.model.integration.spec.ts @@ -1,7 +1,6 @@ -import "../../../src"; +import "../../../src/index.js"; import {GenerateCmd, TEMPLATE_DIR} from "@tsed/cli"; -import {CliService, ProjectPackageJson} from "@tsed/cli-core"; import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; describe("Generate Model", () => { diff --git a/packages/cli-plugin-typegraphql/test/init/init.integration.spec.ts b/packages/cli-plugin-typegraphql/test/init/init.integration.spec.ts index d7825f6bc..48e27002d 100644 --- a/packages/cli-plugin-typegraphql/test/init/init.integration.spec.ts +++ b/packages/cli-plugin-typegraphql/test/init/init.integration.spec.ts @@ -1,4 +1,4 @@ -import "../.."; +import "../../src/index.js"; import {InitCmd, TEMPLATE_DIR} from "@tsed/cli"; import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; diff --git a/packages/cli-plugin-typeorm/test/integrations/generate/generate.controller.integration.spec.ts b/packages/cli-plugin-typeorm/test/integrations/generate/generate.controller.integration.spec.ts index f84d7a208..04bdad18f 100644 --- a/packages/cli-plugin-typeorm/test/integrations/generate/generate.controller.integration.spec.ts +++ b/packages/cli-plugin-typeorm/test/integrations/generate/generate.controller.integration.spec.ts @@ -1,4 +1,4 @@ -import "../../../src"; +import "../../../src/index.js"; import {GenerateCmd, TEMPLATE_DIR} from "@tsed/cli"; import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; diff --git a/packages/cli-plugin-typeorm/test/integrations/init/init.integration.spec.ts b/packages/cli-plugin-typeorm/test/integrations/init/init.integration.spec.ts index d5c22176c..979ed9c8e 100644 --- a/packages/cli-plugin-typeorm/test/integrations/init/init.integration.spec.ts +++ b/packages/cli-plugin-typeorm/test/integrations/init/init.integration.spec.ts @@ -1,4 +1,4 @@ -import "../../../src"; +import "../../../src/index.js"; import {ArchitectureConvention, FeatureType, InitCmd, PlatformType, ProjectConvention, TEMPLATE_DIR} from "@tsed/cli"; import {PackageManager} from "@tsed/cli-core"; From de381192d4f2b009d10d20ad91ffc8eb8f464b30 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 17 Sep 2024 11:58:53 +0000 Subject: [PATCH 17/69] Github CI build: __run_2 v6.0.0-alpha.3 [ci skip] --- lerna.json | 2 +- package.json | 2 +- packages/barrels/package.json | 2 +- packages/cli-core/package.json | 2 +- packages/cli-generate-http-client/package.json | 2 +- packages/cli-generate-swagger/package.json | 2 +- packages/cli-plugin-eslint/package.json | 2 +- packages/cli-plugin-jest/package.json | 2 +- packages/cli-plugin-mongoose/package.json | 2 +- packages/cli-plugin-oidc-provider/package.json | 2 +- packages/cli-plugin-passport/package.json | 2 +- packages/cli-plugin-prisma/package.json | 2 +- packages/cli-plugin-typegraphql/package.json | 2 +- packages/cli-plugin-typeorm/package.json | 2 +- packages/cli-plugin-vitest/package.json | 2 +- packages/cli-testing/package.json | 2 +- packages/cli/package.json | 2 +- tools/typescript/package.json | 2 +- tools/vitest/package.json | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lerna.json b/lerna.json index 39b867b52..cbe04cbd2 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "packages": [ "packages/*" ], - "version": "6.0.0-alpha.2" + "version": "6.0.0-alpha.3" } \ No newline at end of file diff --git a/package.json b/package.json index f77e768e6..2da6f9466 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@tsed/cli-root", - "version": "6.0.0-alpha.2", + "version": "6.0.0-alpha.3", "description": "CLI to bootstrap your Ts.ED project", "private": true, "type": "module", diff --git a/packages/barrels/package.json b/packages/barrels/package.json index 94f65660c..c399a6883 100644 --- a/packages/barrels/package.json +++ b/packages/barrels/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/barrels", "description": "A simple tool to generate barrels for your TypeScript project", - "version": "6.0.0-alpha.2", + "version": "6.0.0-alpha.3", "type": "module", "bin": "bin/barrels.js", "files": [], diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index 9fc3f4e3d..59496e457 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-core", "description": "Build your CLI with TypeScript and Decorators", - "version": "6.0.0-alpha.2", + "version": "6.0.0-alpha.3", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-generate-http-client/package.json b/packages/cli-generate-http-client/package.json index 7386c26bd..2d7fb5322 100644 --- a/packages/cli-generate-http-client/package.json +++ b/packages/cli-generate-http-client/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-generate-http-client", "description": "Ts.ED CLI plugin. Export a command that generate an HTTP Client (axios or fetch) from your Ts.ED controllers and OS3 spec.", - "version": "6.0.0-alpha.2", + "version": "6.0.0-alpha.3", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-generate-swagger/package.json b/packages/cli-generate-swagger/package.json index 8857688b6..f9e14aa83 100644 --- a/packages/cli-generate-swagger/package.json +++ b/packages/cli-generate-swagger/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-generate-swagger", "description": "Ts.ED CLI plugin. Export a command that generate the swagger.json from your Ts.ED controllers and OS3 spec.", - "version": "6.0.0-alpha.2", + "version": "6.0.0-alpha.3", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-eslint/package.json b/packages/cli-plugin-eslint/package.json index 46f3781f4..b460d95fe 100644 --- a/packages/cli-plugin-eslint/package.json +++ b/packages/cli-plugin-eslint/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-eslint", "description": "Ts.ED CLI plugin. Add EsLint support", - "version": "6.0.0-alpha.2", + "version": "6.0.0-alpha.3", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-jest/package.json b/packages/cli-plugin-jest/package.json index 93827b18e..338820462 100644 --- a/packages/cli-plugin-jest/package.json +++ b/packages/cli-plugin-jest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-jest", "description": "Ts.ED CLI plugin. Add Jest support", - "version": "6.0.0-alpha.2", + "version": "6.0.0-alpha.3", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-mongoose/package.json b/packages/cli-plugin-mongoose/package.json index 4cf537e2e..6cb889020 100644 --- a/packages/cli-plugin-mongoose/package.json +++ b/packages/cli-plugin-mongoose/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-mongoose", "description": "Ts.ED CLI plugin. Add Mongoose support", - "version": "6.0.0-alpha.2", + "version": "6.0.0-alpha.3", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-oidc-provider/package.json b/packages/cli-plugin-oidc-provider/package.json index dc3822a82..e79c45174 100644 --- a/packages/cli-plugin-oidc-provider/package.json +++ b/packages/cli-plugin-oidc-provider/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-oidc-provider", "description": "Ts.ED CLI plugin. Add OIDC Provider", - "version": "6.0.0-alpha.2", + "version": "6.0.0-alpha.3", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-passport/package.json b/packages/cli-plugin-passport/package.json index 98a3284f5..e4bd0e8c6 100644 --- a/packages/cli-plugin-passport/package.json +++ b/packages/cli-plugin-passport/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-passport", "description": "Ts.ED CLI plugin. Add Passport.js support", - "version": "6.0.0-alpha.2", + "version": "6.0.0-alpha.3", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-prisma/package.json b/packages/cli-plugin-prisma/package.json index e47f4d3e5..2937d8c53 100644 --- a/packages/cli-plugin-prisma/package.json +++ b/packages/cli-plugin-prisma/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-prisma", "description": "Ts.ED CLI plugin. Add Prisma project initialisation support.", - "version": "6.0.0-alpha.2", + "version": "6.0.0-alpha.3", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-typegraphql/package.json b/packages/cli-plugin-typegraphql/package.json index 34726bdbd..bc1f3d760 100644 --- a/packages/cli-plugin-typegraphql/package.json +++ b/packages/cli-plugin-typegraphql/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-typegraphql", "description": "Ts.ED CLI plugin. Add TypeGraphql support.", - "version": "6.0.0-alpha.2", + "version": "6.0.0-alpha.3", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-typeorm/package.json b/packages/cli-plugin-typeorm/package.json index a8f2a98fd..bb990bd7c 100644 --- a/packages/cli-plugin-typeorm/package.json +++ b/packages/cli-plugin-typeorm/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-typeorm", "description": "Ts.ED CLI plugin. Add TypeORM support", - "version": "6.0.0-alpha.2", + "version": "6.0.0-alpha.3", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-vitest/package.json b/packages/cli-plugin-vitest/package.json index e2d596ea9..1cafade26 100644 --- a/packages/cli-plugin-vitest/package.json +++ b/packages/cli-plugin-vitest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-vitest", "description": "Ts.ED CLI plugin. Add Jest support", - "version": "6.0.0-alpha.2", + "version": "6.0.0-alpha.3", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-testing/package.json b/packages/cli-testing/package.json index 3d7b68548..9a1c735ad 100644 --- a/packages/cli-testing/package.json +++ b/packages/cli-testing/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-testing", "description": "Utils to test you CLI based on Ts.ED CLI", - "version": "6.0.0-alpha.2", + "version": "6.0.0-alpha.3", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli/package.json b/packages/cli/package.json index e6c1073b3..0386abfa3 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli", "description": "CLI to bootstrap your Ts.ED project", - "version": "6.0.0-alpha.2", + "version": "6.0.0-alpha.3", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/tools/typescript/package.json b/tools/typescript/package.json index 0969c8f4a..1cfe1fccc 100644 --- a/tools/typescript/package.json +++ b/tools/typescript/package.json @@ -1,6 +1,6 @@ { "name": "@tsed/typescript", - "version": "6.0.0-alpha.2", + "version": "6.0.0-alpha.3", "description": "Util to compile source", "type": "module", "private": true, diff --git a/tools/vitest/package.json b/tools/vitest/package.json index 660f787fd..ab2baec92 100644 --- a/tools/vitest/package.json +++ b/tools/vitest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/vitest", "type": "module", - "version": "6.0.0-alpha.2", + "version": "6.0.0-alpha.3", "private": true, "exports": { ".": "./index.js", From 1d87dfab9fb4126a0ab10e321ac212833e5572ed Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Tue, 17 Sep 2024 14:22:41 +0200 Subject: [PATCH 18/69] fix(cli): remove module-alias which is not longer required --- package.json | 1 - packages/cli-core/package.json | 1 - packages/cli/package.json | 1 - packages/cli/src/Cli.ts | 13 ------------- yarn.lock | 10 ---------- 5 files changed, 26 deletions(-) diff --git a/package.json b/package.json index 2da6f9466..8e8b1b5ab 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,6 @@ "js-yaml": "4.1.0", "lerna": "8.1.8", "listr2": "5.0.5", - "module-alias": "2.2.2", "read-pkg-up": "7.0.1", "registry-url": "5.1.0", "rxjs": "^7.5.5", diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index 59496e457..6ef6d75e1 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -54,7 +54,6 @@ "inquirer-autocomplete-prompt": "2.0.0", "js-yaml": "4.1.0", "listr2": "5.0.5", - "module-alias": "2.2.2", "normalize-path": "3.0.0", "read-pkg-up": "7.0.1", "registry-url": "5.1.0", diff --git a/packages/cli/package.json b/packages/cli/package.json index 0386abfa3..e655df472 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -74,7 +74,6 @@ "chalk": "4.1.2", "change-case": "4.1.2", "globby": "11.1.0", - "module-alias": "^2.2.2", "normalize-path": "3.0.0", "read-pkg-up": "7.0.1", "semver": "^7.3.5", diff --git a/packages/cli/src/Cli.ts b/packages/cli/src/Cli.ts index 25e6772ae..5cf8bf5be 100644 --- a/packages/cli/src/Cli.ts +++ b/packages/cli/src/Cli.ts @@ -1,7 +1,5 @@ import {CliCore} from "@tsed/cli-core"; import chalk from "chalk"; -// @ts-ignore -import alias from "module-alias"; import commands from "./commands/index.js"; import {PKG, TEMPLATE_DIR} from "./constants/index.js"; @@ -62,20 +60,9 @@ export class Cli extends CliCore { const {pkg} = opts; this.checkPrecondition(opts); - this.createAliases(); await this.updateNotifier(pkg); return super.bootstrap(opts, Cli); } - - static createAliases() { - alias.addAliases({ - "@tsed/core": require.resolve("@tsed/core"), - "@tsed/di": require.resolve("@tsed/di"), - "@tsed/schema": require.resolve("@tsed/schema"), - "@tsed/cli-core": require.resolve("@tsed/cli-core"), - "@tsed/cli": require.resolve("@tsed/cli") - }); - } } diff --git a/yarn.lock b/yarn.lock index e74145a38..efdf53835 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2430,7 +2430,6 @@ __metadata: inquirer-autocomplete-prompt: "npm:2.0.0" js-yaml: "npm:4.1.0" listr2: "npm:5.0.5" - module-alias: "npm:2.2.2" normalize-path: "npm:3.0.0" read-pkg-up: "npm:7.0.1" registry-url: "npm:5.1.0" @@ -2685,7 +2684,6 @@ __metadata: lint-staged: "npm:13.0.3" listr2: "npm:5.0.5" markdown-it: "npm:13.0.1" - module-alias: "npm:2.2.2" prettier: "npm:3.3.3" read-pkg-up: "npm:7.0.1" registry-url: "npm:5.1.0" @@ -2739,7 +2737,6 @@ __metadata: change-case: "npm:4.1.2" cross-env: "npm:7.0.3" globby: "npm:11.1.0" - module-alias: "npm:^2.2.2" normalize-path: "npm:3.0.0" read-pkg-up: "npm:7.0.1" semver: "npm:^7.3.5" @@ -11833,13 +11830,6 @@ __metadata: languageName: node linkType: hard -"module-alias@npm:2.2.2, module-alias@npm:^2.2.2": - version: 2.2.2 - resolution: "module-alias@npm:2.2.2" - checksum: 10/997aab639bff9b911fa856e445e5a6481b0ad84e5411b3b36a776624106e112984ff287b8be52ba53dd4088e09c2d7bd7afd951a540e4e87860017ec03e68d4e - languageName: node - linkType: hard - "moment@npm:^2.18.1": version: 2.29.4 resolution: "moment@npm:2.29.4" From b2016f28c7c5de142665c0aa062c7742f12ce173 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 17 Sep 2024 12:27:43 +0000 Subject: [PATCH 19/69] Github CI build: __run_2 v6.0.0-alpha.4 [ci skip] --- lerna.json | 2 +- package.json | 2 +- packages/barrels/package.json | 2 +- packages/cli-core/package.json | 2 +- packages/cli-generate-http-client/package.json | 2 +- packages/cli-generate-swagger/package.json | 2 +- packages/cli-plugin-eslint/package.json | 2 +- packages/cli-plugin-jest/package.json | 2 +- packages/cli-plugin-mongoose/package.json | 2 +- packages/cli-plugin-oidc-provider/package.json | 2 +- packages/cli-plugin-passport/package.json | 2 +- packages/cli-plugin-prisma/package.json | 2 +- packages/cli-plugin-typegraphql/package.json | 2 +- packages/cli-plugin-typeorm/package.json | 2 +- packages/cli-plugin-vitest/package.json | 2 +- packages/cli-testing/package.json | 2 +- packages/cli/package.json | 2 +- tools/typescript/package.json | 2 +- tools/vitest/package.json | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lerna.json b/lerna.json index cbe04cbd2..5b3484939 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "packages": [ "packages/*" ], - "version": "6.0.0-alpha.3" + "version": "6.0.0-alpha.4" } \ No newline at end of file diff --git a/package.json b/package.json index 8e8b1b5ab..8b121a277 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@tsed/cli-root", - "version": "6.0.0-alpha.3", + "version": "6.0.0-alpha.4", "description": "CLI to bootstrap your Ts.ED project", "private": true, "type": "module", diff --git a/packages/barrels/package.json b/packages/barrels/package.json index c399a6883..54dea5ae2 100644 --- a/packages/barrels/package.json +++ b/packages/barrels/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/barrels", "description": "A simple tool to generate barrels for your TypeScript project", - "version": "6.0.0-alpha.3", + "version": "6.0.0-alpha.4", "type": "module", "bin": "bin/barrels.js", "files": [], diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index 6ef6d75e1..7fdb3b73a 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-core", "description": "Build your CLI with TypeScript and Decorators", - "version": "6.0.0-alpha.3", + "version": "6.0.0-alpha.4", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-generate-http-client/package.json b/packages/cli-generate-http-client/package.json index 2d7fb5322..5a036f99c 100644 --- a/packages/cli-generate-http-client/package.json +++ b/packages/cli-generate-http-client/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-generate-http-client", "description": "Ts.ED CLI plugin. Export a command that generate an HTTP Client (axios or fetch) from your Ts.ED controllers and OS3 spec.", - "version": "6.0.0-alpha.3", + "version": "6.0.0-alpha.4", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-generate-swagger/package.json b/packages/cli-generate-swagger/package.json index f9e14aa83..07bf79af5 100644 --- a/packages/cli-generate-swagger/package.json +++ b/packages/cli-generate-swagger/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-generate-swagger", "description": "Ts.ED CLI plugin. Export a command that generate the swagger.json from your Ts.ED controllers and OS3 spec.", - "version": "6.0.0-alpha.3", + "version": "6.0.0-alpha.4", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-eslint/package.json b/packages/cli-plugin-eslint/package.json index b460d95fe..7dcb37d74 100644 --- a/packages/cli-plugin-eslint/package.json +++ b/packages/cli-plugin-eslint/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-eslint", "description": "Ts.ED CLI plugin. Add EsLint support", - "version": "6.0.0-alpha.3", + "version": "6.0.0-alpha.4", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-jest/package.json b/packages/cli-plugin-jest/package.json index 338820462..ea1196c51 100644 --- a/packages/cli-plugin-jest/package.json +++ b/packages/cli-plugin-jest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-jest", "description": "Ts.ED CLI plugin. Add Jest support", - "version": "6.0.0-alpha.3", + "version": "6.0.0-alpha.4", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-mongoose/package.json b/packages/cli-plugin-mongoose/package.json index 6cb889020..de3edb75e 100644 --- a/packages/cli-plugin-mongoose/package.json +++ b/packages/cli-plugin-mongoose/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-mongoose", "description": "Ts.ED CLI plugin. Add Mongoose support", - "version": "6.0.0-alpha.3", + "version": "6.0.0-alpha.4", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-oidc-provider/package.json b/packages/cli-plugin-oidc-provider/package.json index e79c45174..d52818405 100644 --- a/packages/cli-plugin-oidc-provider/package.json +++ b/packages/cli-plugin-oidc-provider/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-oidc-provider", "description": "Ts.ED CLI plugin. Add OIDC Provider", - "version": "6.0.0-alpha.3", + "version": "6.0.0-alpha.4", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-passport/package.json b/packages/cli-plugin-passport/package.json index e4bd0e8c6..385fdf34c 100644 --- a/packages/cli-plugin-passport/package.json +++ b/packages/cli-plugin-passport/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-passport", "description": "Ts.ED CLI plugin. Add Passport.js support", - "version": "6.0.0-alpha.3", + "version": "6.0.0-alpha.4", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-prisma/package.json b/packages/cli-plugin-prisma/package.json index 2937d8c53..11acdeb13 100644 --- a/packages/cli-plugin-prisma/package.json +++ b/packages/cli-plugin-prisma/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-prisma", "description": "Ts.ED CLI plugin. Add Prisma project initialisation support.", - "version": "6.0.0-alpha.3", + "version": "6.0.0-alpha.4", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-typegraphql/package.json b/packages/cli-plugin-typegraphql/package.json index bc1f3d760..3e7b6f98e 100644 --- a/packages/cli-plugin-typegraphql/package.json +++ b/packages/cli-plugin-typegraphql/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-typegraphql", "description": "Ts.ED CLI plugin. Add TypeGraphql support.", - "version": "6.0.0-alpha.3", + "version": "6.0.0-alpha.4", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-typeorm/package.json b/packages/cli-plugin-typeorm/package.json index bb990bd7c..fffe35f6f 100644 --- a/packages/cli-plugin-typeorm/package.json +++ b/packages/cli-plugin-typeorm/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-typeorm", "description": "Ts.ED CLI plugin. Add TypeORM support", - "version": "6.0.0-alpha.3", + "version": "6.0.0-alpha.4", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-vitest/package.json b/packages/cli-plugin-vitest/package.json index 1cafade26..fce444812 100644 --- a/packages/cli-plugin-vitest/package.json +++ b/packages/cli-plugin-vitest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-vitest", "description": "Ts.ED CLI plugin. Add Jest support", - "version": "6.0.0-alpha.3", + "version": "6.0.0-alpha.4", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-testing/package.json b/packages/cli-testing/package.json index 9a1c735ad..16cbfa34b 100644 --- a/packages/cli-testing/package.json +++ b/packages/cli-testing/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-testing", "description": "Utils to test you CLI based on Ts.ED CLI", - "version": "6.0.0-alpha.3", + "version": "6.0.0-alpha.4", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli/package.json b/packages/cli/package.json index e655df472..33bcfa821 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli", "description": "CLI to bootstrap your Ts.ED project", - "version": "6.0.0-alpha.3", + "version": "6.0.0-alpha.4", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/tools/typescript/package.json b/tools/typescript/package.json index 1cfe1fccc..3183f79ed 100644 --- a/tools/typescript/package.json +++ b/tools/typescript/package.json @@ -1,6 +1,6 @@ { "name": "@tsed/typescript", - "version": "6.0.0-alpha.3", + "version": "6.0.0-alpha.4", "description": "Util to compile source", "type": "module", "private": true, diff --git a/tools/vitest/package.json b/tools/vitest/package.json index ab2baec92..d3c32ad95 100644 --- a/tools/vitest/package.json +++ b/tools/vitest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/vitest", "type": "module", - "version": "6.0.0-alpha.3", + "version": "6.0.0-alpha.4", "private": true, "exports": { ".": "./index.js", From 5928aecb7a131ee50cbd9dae4109018635382a68 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Wed, 18 Sep 2024 08:59:44 +0200 Subject: [PATCH 20/69] fix(core): force type module on package.json --- packages/cli-core/src/interfaces/PackageJson.ts | 2 ++ packages/cli-core/src/services/ProjectPackageJson.ts | 1 + 2 files changed, 3 insertions(+) diff --git a/packages/cli-core/src/interfaces/PackageJson.ts b/packages/cli-core/src/interfaces/PackageJson.ts index e728ab263..5ba9f9487 100644 --- a/packages/cli-core/src/interfaces/PackageJson.ts +++ b/packages/cli-core/src/interfaces/PackageJson.ts @@ -2,6 +2,7 @@ export interface PackageJson { name: string; version: string; description: string; + type: "module"; scripts: {[key: string]: string}; dependencies: {[key: string]: string}; devDependencies: {[key: string]: string}; @@ -13,6 +14,7 @@ export interface PackageInfo { _id: string; _rev: string; name: string; + type: "module"; "dist-tags": { [key: string]: string; }; diff --git a/packages/cli-core/src/services/ProjectPackageJson.ts b/packages/cli-core/src/services/ProjectPackageJson.ts index 8ff016dfb..386eecc30 100644 --- a/packages/cli-core/src/services/ProjectPackageJson.ts +++ b/packages/cli-core/src/services/ProjectPackageJson.ts @@ -228,6 +228,7 @@ export class ProjectPackageJson { this.raw = { ...originalPkg, ...this.raw, + type: "module", scripts: { ...(originalPkg.scripts || {}), ...(this.raw.scripts || {}) From 992d3b91c3d6eb95c68aab7883d7c9926b16119f Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Wed, 18 Sep 2024 09:00:31 +0200 Subject: [PATCH 21/69] fix(cli): fix miscellaneous issue in templates --- .../init.integration.spec.ts.snap | 2 ++ .../test/init/init.integration.spec.ts | 1 + .../init/init.integration.spec.ts | 2 ++ packages/cli/src/commands/init/InitCmd.ts | 18 ++++++++++---- .../cli/src/runtimes/supports/BabelRuntime.ts | 4 ++++ .../cli/src/runtimes/supports/BaseRuntime.ts | 4 ++++ .../cli/src/runtimes/supports/NodeRuntime.ts | 2 +- .../src/runtimes/supports/WebpackRuntime.ts | 4 ++++ packages/cli/templates/init/.swcrc.hbs | 4 ++-- .../templates/init/docker/bun/Dockerfile.hbs | 4 ++-- .../templates/init/docker/npm/Dockerfile.hbs | 8 +++---- .../templates/init/docker/pnpm/Dockerfile.hbs | 8 +++---- .../templates/init/docker/yarn/Dockerfile.hbs | 10 ++++---- .../init/docker/yarn_berry/Dockerfile.hbs | 10 ++++---- .../init/pm2/bun/processes.config.cjs.hbs | 23 ++++++++++++++++++ .../node-compiled}/processes.config.cjs.hbs | 7 +++--- .../pm2/node-loader/processes.config.cjs.hbs | 24 +++++++++++++++++++ .../init/init.integration.spec.ts | 22 +++++++++++++---- 18 files changed, 120 insertions(+), 37 deletions(-) create mode 100644 packages/cli/templates/init/pm2/bun/processes.config.cjs.hbs rename packages/cli/templates/init/{ => pm2/node-compiled}/processes.config.cjs.hbs (68%) create mode 100644 packages/cli/templates/init/pm2/node-loader/processes.config.cjs.hbs diff --git a/packages/cli-plugin-oidc-provider/test/init/__snapshots__/init.integration.spec.ts.snap b/packages/cli-plugin-oidc-provider/test/init/__snapshots__/init.integration.spec.ts.snap index e05fd34a2..3ec3ffcfb 100644 --- a/packages/cli-plugin-oidc-provider/test/init/__snapshots__/init.integration.spec.ts.snap +++ b/packages/cli-plugin-oidc-provider/test/init/__snapshots__/init.integration.spec.ts.snap @@ -43,6 +43,7 @@ exports[`Init OIDC Provider project > should generate a project with oidc 1`] = "project-name/src/services", "project-name/src/services/Accounts.ts", "project-name/tsconfig.base.json", + "project-name/tsconfig.json", "project-name/tsconfig.node.json", "project-name/views", "project-name/views/consent.ejs", @@ -157,6 +158,7 @@ exports[`Init OIDC Provider project > should generate a project with oidc and sw "project-name/src/services", "project-name/src/services/Accounts.ts", "project-name/tsconfig.base.json", + "project-name/tsconfig.json", "project-name/tsconfig.node.json", "project-name/views", "project-name/views/consent.ejs", diff --git a/packages/cli-plugin-typegraphql/test/init/init.integration.spec.ts b/packages/cli-plugin-typegraphql/test/init/init.integration.spec.ts index 48e27002d..91c2bc00d 100644 --- a/packages/cli-plugin-typegraphql/test/init/init.integration.spec.ts +++ b/packages/cli-plugin-typegraphql/test/init/init.integration.spec.ts @@ -68,6 +68,7 @@ describe("Init TypeGraphQL project", () => { "project-name/src/services", "project-name/src/services/RecipeService.ts", "project-name/tsconfig.base.json", + "project-name/tsconfig.json", "project-name/tsconfig.node.json", ] `); diff --git a/packages/cli-plugin-typeorm/test/integrations/init/init.integration.spec.ts b/packages/cli-plugin-typeorm/test/integrations/init/init.integration.spec.ts index 979ed9c8e..ad7920264 100644 --- a/packages/cli-plugin-typeorm/test/integrations/init/init.integration.spec.ts +++ b/packages/cli-plugin-typeorm/test/integrations/init/init.integration.spec.ts @@ -77,6 +77,7 @@ describe("TypeORM: Init cmd", () => { "project-name/src/datasources/MysqlDatasource.ts", "project-name/src/index.ts", "project-name/tsconfig.base.json", + "project-name/tsconfig.json", "project-name/tsconfig.node.json", ] `); @@ -151,6 +152,7 @@ describe("TypeORM: Init cmd", () => { "project-name/src/controllers/rest/HelloWorldController.ts", "project-name/src/index.ts", "project-name/tsconfig.base.json", + "project-name/tsconfig.json", "project-name/tsconfig.node.json", ] `); diff --git a/packages/cli/src/commands/init/InitCmd.ts b/packages/cli/src/commands/init/InitCmd.ts index 1aee83917..7ed08a188 100644 --- a/packages/cli/src/commands/init/InitCmd.ts +++ b/packages/cli/src/commands/init/InitCmd.ts @@ -214,7 +214,7 @@ export class InitCmd implements CommandProvider { }, ...getFeaturesPrompt( runtimes, - packageManagers.filter((o) => o !== "bun"), + packageManagers.filter((o: string) => o !== "bun"), initialOptions ) ]; @@ -226,11 +226,11 @@ export class InitCmd implements CommandProvider { this.runtimes.init(ctx); - this.runtimes.list().forEach((key) => { + this.runtimes.list().forEach((key: string) => { ctx[key] = ctx.runtime === key; }); - this.packageManagers.list().forEach((key) => { + this.packageManagers.list().forEach((key: string) => { ctx[key] = ctx.packageManager === key; }); @@ -453,16 +453,23 @@ export class InitCmd implements CommandProvider { ctx = { ...ctx, node: runtime instanceof NodeRuntime, - bun: runtime instanceof BunRuntime + bun: runtime instanceof BunRuntime, + compiled: runtime instanceof NodeRuntime && runtime.isCompiled() }; + const pm2 = ctx.bun ? "bun" : ctx.compiled ? "node-compiled" : "node-loader"; + return this.rootRenderer.renderAll( [ ...runtime.files(), "/init/.dockerignore.hbs", "/init/.gitignore.hbs", "/init/.barrels.json.hbs", - "/init/processes.config.cjs.hbs", + { + path: `/init/pm2/${pm2}/processes.config.cjs.hbs`, + output: `processes.config.cjs`, + replaces: [`pm2/${pm2}`] + }, "/init/docker-compose.yml.hbs", { path: `/init/docker/${packageManager.name}/Dockerfile.hbs`, @@ -470,6 +477,7 @@ export class InitCmd implements CommandProvider { replaces: [`docker/${packageManager.name}`] }, "/init/README.md.hbs", + "/init/tsconfig.json.hbs", "/init/tsconfig.base.json.hbs", "/init/tsconfig.node.json.hbs", ctx.testing && "/init/tsconfig.spec.json.hbs", diff --git a/packages/cli/src/runtimes/supports/BabelRuntime.ts b/packages/cli/src/runtimes/supports/BabelRuntime.ts index f60b87947..2ee803448 100644 --- a/packages/cli/src/runtimes/supports/BabelRuntime.ts +++ b/packages/cli/src/runtimes/supports/BabelRuntime.ts @@ -10,6 +10,10 @@ export class BabelRuntime extends NodeRuntime { readonly name: string = "babel"; readonly order: number = 1; + isCompiled() { + return false; + } + files() { return ["/init/.babelrc.hbs"]; } diff --git a/packages/cli/src/runtimes/supports/BaseRuntime.ts b/packages/cli/src/runtimes/supports/BaseRuntime.ts index e56cca762..47fd27b51 100644 --- a/packages/cli/src/runtimes/supports/BaseRuntime.ts +++ b/packages/cli/src/runtimes/supports/BaseRuntime.ts @@ -16,6 +16,10 @@ export abstract class BaseRuntime { return this.packageManagers.get(); } + isCompiled() { + return true; + } + files(): string[] { return []; } diff --git a/packages/cli/src/runtimes/supports/NodeRuntime.ts b/packages/cli/src/runtimes/supports/NodeRuntime.ts index ac14fabfa..079e7394f 100644 --- a/packages/cli/src/runtimes/supports/NodeRuntime.ts +++ b/packages/cli/src/runtimes/supports/NodeRuntime.ts @@ -15,7 +15,7 @@ export class NodeRuntime extends BaseRuntime { } startDev(main: string) { - return `nodemon --import @swc-node/register/register-esm ${main}`; + return `nodemon ${main}`; } startProd(main: string) { diff --git a/packages/cli/src/runtimes/supports/WebpackRuntime.ts b/packages/cli/src/runtimes/supports/WebpackRuntime.ts index 3ab020f1b..608c897ff 100644 --- a/packages/cli/src/runtimes/supports/WebpackRuntime.ts +++ b/packages/cli/src/runtimes/supports/WebpackRuntime.ts @@ -10,6 +10,10 @@ export class WebpackRuntime extends BabelRuntime { readonly name = "webpack"; readonly order: number = 2; + isCompiled() { + return true; + } + files() { return [...super.files(), "/init/webpack.config.js.hbs"]; } diff --git a/packages/cli/templates/init/.swcrc.hbs b/packages/cli/templates/init/.swcrc.hbs index f0531eae3..6fb5a60fa 100644 --- a/packages/cli/templates/init/.swcrc.hbs +++ b/packages/cli/templates/init/.swcrc.hbs @@ -6,7 +6,7 @@ "decorators": true, "dynamicImport": true }, - "target": "es2022", + "target": "es2023", "externalHelpers": true, "keepClassNames": true, "transform": { @@ -16,6 +16,6 @@ } }, "module": { - "type": "commonjs" + "type": "es6" } } diff --git a/packages/cli/templates/init/docker/bun/Dockerfile.hbs b/packages/cli/templates/init/docker/bun/Dockerfile.hbs index 8fb2efdcc..15b6e077f 100644 --- a/packages/cli/templates/init/docker/bun/Dockerfile.hbs +++ b/packages/cli/templates/init/docker/bun/Dockerfile.hbs @@ -2,7 +2,7 @@ ARG BUN_VERSION=1 -FROM oven/bun:${BUN_VERSION} as base +FROM oven/bun:${BUN_VERSION} AS base WORKDIR /opt FROM base AS install @@ -33,4 +33,4 @@ USER bun {{> docker-body}} -CMD ["pm2-runtime", "start", "processes.config.js", "--env", "production", "--interpreter", "~/.bun/bin/bun"] +CMD ["pm2-runtime", "start", "processes.config.cjs", "--env", "production", "--interpreter", "~/.bun/bin/bun"] diff --git a/packages/cli/templates/init/docker/npm/Dockerfile.hbs b/packages/cli/templates/init/docker/npm/Dockerfile.hbs index 5805bbc27..f0b94268b 100644 --- a/packages/cli/templates/init/docker/npm/Dockerfile.hbs +++ b/packages/cli/templates/init/docker/npm/Dockerfile.hbs @@ -1,11 +1,11 @@ {{> docker-header }} -ARG NODE_VERSION=20.10.0 +ARG NODE_VERSION=20.11.0 -FROM node:${NODE_VERSION}-alpine as build +FROM node:${NODE_VERSION}-alpine AS build WORKDIR /opt -COPY package.json package-lock.json tsconfig.json tsconfig.compile.json .barrels.json ./ +COPY package.json package-lock.json tsconfig.json tsconfig.base.json tsconfig.node.json tsconfig.spec.json .barrels.json .swcrc ./ RUN npm ci @@ -25,4 +25,4 @@ RUN npm ci --omit=dev --ignore-scripts {{> docker-body}} -CMD ["pm2-runtime", "start", "processes.config.js", "--env", "production"] +CMD ["pm2-runtime", "start", "processes.config.cjs", "--env", "production"] diff --git a/packages/cli/templates/init/docker/pnpm/Dockerfile.hbs b/packages/cli/templates/init/docker/pnpm/Dockerfile.hbs index 11ae7b32a..a06c501d5 100644 --- a/packages/cli/templates/init/docker/pnpm/Dockerfile.hbs +++ b/packages/cli/templates/init/docker/pnpm/Dockerfile.hbs @@ -1,11 +1,11 @@ {{> docker-header }} -ARG NODE_VERSION=20.10.0 +ARG NODE_VERSION=20.11.0 -FROM node:${NODE_VERSION}-alpine as build +FROM node:${NODE_VERSION}-alpine AS build WORKDIR /opt -COPY package.json pnpm-lock.yaml tsconfig.json tsconfig.compile.json .barrels.json ./ +COPY package.json pnpm-lock.yaml tsconfig.json tsconfig.base.json tsconfig.node.json tsconfig.spec.json .barrels.json .swcrc ./ RUN pnpm install --frozen-lockfile @@ -25,4 +25,4 @@ RUN pnpm install --frozen-lockfile --prod {{> docker-body}} -CMD ["pm2-runtime", "start", "processes.config.js", "--env", "production"] +CMD ["pm2-runtime", "start", "processes.config.cjs", "--env", "production"] diff --git a/packages/cli/templates/init/docker/yarn/Dockerfile.hbs b/packages/cli/templates/init/docker/yarn/Dockerfile.hbs index a9cf8565e..8653dfeca 100644 --- a/packages/cli/templates/init/docker/yarn/Dockerfile.hbs +++ b/packages/cli/templates/init/docker/yarn/Dockerfile.hbs @@ -1,11 +1,11 @@ {{> docker-header }} -ARG NODE_VERSION=20.10.0 +ARG NODE_VERSION=20.11.0 -FROM node:${NODE_VERSION}-alpine as build +FROM node:${NODE_VERSION}-alpine AS build WORKDIR /opt -COPY package.json yarn.lock tsconfig.json tsconfig.compile.json .barrels.json ./ +COPY package.json yarn.lock tsconfig.json tsconfig.base.json tsconfig.node.json tsconfig.spec.json .barrels.json .swcrc ./ RUN yarn install --pure-lockfile @@ -13,7 +13,7 @@ COPY ./src ./src RUN yarn build -FROM node:${NODE_VERSION}-alpine as runtime +FROM node:${NODE_VERSION}-alpine AS runtime ENV WORKDIR /opt WORKDIR $WORKDIR @@ -25,4 +25,4 @@ RUN yarn install --pure-lockfile --production {{> docker-body}} -CMD ["pm2-runtime", "start", "processes.config.js", "--env", "production"] +CMD ["pm2-runtime", "start", "processes.config.cjs", "--env", "production"] diff --git a/packages/cli/templates/init/docker/yarn_berry/Dockerfile.hbs b/packages/cli/templates/init/docker/yarn_berry/Dockerfile.hbs index eb54588e2..2b5ce27b1 100644 --- a/packages/cli/templates/init/docker/yarn_berry/Dockerfile.hbs +++ b/packages/cli/templates/init/docker/yarn_berry/Dockerfile.hbs @@ -1,11 +1,11 @@ {{> docker-header }} -ARG NODE_VERSION=20.10.0 +ARG NODE_VERSION=20.11.0 -FROM node:${NODE_VERSION}-alpine as build +FROM node:${NODE_VERSION}-alpine AS build WORKDIR /opt -COPY package.json yarn.lock yarn.lock tsconfig.json tsconfig.compile.json .barrels.json ./ +COPY package.json yarn.lock yarn.lock tsconfig.json tsconfig.base.json tsconfig.node.json tsconfig.spec.json .barrels.json .swcrc ./ RUN yarn set version berry RUN yarn install --immutable @@ -14,7 +14,7 @@ COPY ./src ./src RUN yarn build -FROM node:${NODE_VERSION}-alpine as runtime +FROM node:${NODE_VERSION}-alpine AS runtime ENV WORKDIR /opt WORKDIR $WORKDIR @@ -28,4 +28,4 @@ RUN yarn install --immutable {{> docker-body}} -CMD ["pm2-runtime", "start", "processes.config.js", "--env", "production"] +CMD ["pm2-runtime", "start", "processes.config.cjs", "--env", "production"] diff --git a/packages/cli/templates/init/pm2/bun/processes.config.cjs.hbs b/packages/cli/templates/init/pm2/bun/processes.config.cjs.hbs new file mode 100644 index 000000000..b0bd795e9 --- /dev/null +++ b/packages/cli/templates/init/pm2/bun/processes.config.cjs.hbs @@ -0,0 +1,23 @@ +'use strict' + +const path = require('path') +const defaultLogFile = path.join(__dirname, '/logs/project-server.log') + +module.exports = { + 'apps': [ + { + name: 'api', + interpreter: '~/.bun/bin/bun', + 'script': `${process.env.WORKDIR}/dist/index.js`, + 'cwd': process.env.WORKDIR, + exec_mode: 'cluster', + instances: process.env.NODE_ENV === 'test' ? 1 : process.env.NB_INSTANCES || 2, + autorestart: true, + max_memory_restart: process.env.MAX_MEMORY_RESTART || '750M', + 'out_file': defaultLogFile, + 'error_file': defaultLogFile, + 'merge_logs': true, + 'kill_timeout': 30000, + } + ] +} diff --git a/packages/cli/templates/init/processes.config.cjs.hbs b/packages/cli/templates/init/pm2/node-compiled/processes.config.cjs.hbs similarity index 68% rename from packages/cli/templates/init/processes.config.cjs.hbs rename to packages/cli/templates/init/pm2/node-compiled/processes.config.cjs.hbs index d7e3359b5..b1e2ccb41 100644 --- a/packages/cli/templates/init/processes.config.cjs.hbs +++ b/packages/cli/templates/init/pm2/node-compiled/processes.config.cjs.hbs @@ -6,14 +6,13 @@ const defaultLogFile = path.join(__dirname, '/logs/project-server.log') module.exports = { 'apps': [ { - name: "api", - {{#if bun}}interpreter: "~/.bun/bin/bun",{{/if}} + name: 'api', 'script': `${process.env.WORKDIR}/dist/index.js`, 'cwd': process.env.WORKDIR, exec_mode: "cluster", - instances: process.env.NODE_ENV === "test" ? 1 : process.env.NB_INSTANCES || 2, + instances: process.env.NODE_ENV === 'test' ? 1 : process.env.NB_INSTANCES || 2, autorestart: true, - max_memory_restart: process.env.MAX_MEMORY_RESTART || "750M", + max_memory_restart: process.env.MAX_MEMORY_RESTART || '750M', 'out_file': defaultLogFile, 'error_file': defaultLogFile, 'merge_logs': true, diff --git a/packages/cli/templates/init/pm2/node-loader/processes.config.cjs.hbs b/packages/cli/templates/init/pm2/node-loader/processes.config.cjs.hbs new file mode 100644 index 000000000..ad69f14f7 --- /dev/null +++ b/packages/cli/templates/init/pm2/node-loader/processes.config.cjs.hbs @@ -0,0 +1,24 @@ +'use strict' + +const path = require('path') +const defaultLogFile = path.join(__dirname, '/logs/project-server.log') + +module.exports = { + 'apps': [ + { + name: 'api', + 'interpreter': 'node', + interpreter_args: '--import @swc-node/register/esm-register --enable-source-maps', + 'script': `${process.env.WORKDIR}/src/index.ts`, + 'cwd': process.env.WORKDIR, + exec_mode: 'cluster', + instances: process.env.NODE_ENV === 'test' ? 1 : process.env.NB_INSTANCES || 2, + autorestart: true, + max_memory_restart: process.env.MAX_MEMORY_RESTART || '750M', + 'out_file': defaultLogFile, + 'error_file': defaultLogFile, + 'merge_logs': true, + 'kill_timeout': 30000, + } + ] +} diff --git a/packages/cli/test/integrations/init/init.integration.spec.ts b/packages/cli/test/integrations/init/init.integration.spec.ts index a648b8d8d..00fa66d5b 100644 --- a/packages/cli/test/integrations/init/init.integration.spec.ts +++ b/packages/cli/test/integrations/init/init.integration.spec.ts @@ -63,6 +63,7 @@ describe("Init cmd", () => { "project-name/src/controllers/rest/HelloWorldController.ts", "project-name/src/index.ts", "project-name/tsconfig.base.json", + "project-name/tsconfig.json", "project-name/tsconfig.node.json", ] `); @@ -100,7 +101,7 @@ describe("Init cmd", () => { "scripts": { "barrels": "barrels", "build": "yarn run barrels && swc src --out-dir dist -s", - "start": "yarn run barrels && nodemon --import @swc-node/register/register-esm src/index.ts", + "start": "yarn run barrels && nodemon src/index.ts", "start:prod": "cross-env NODE_ENV=production node --import @swc-node/register/register-esm src/index.js", }, "tsed": { @@ -113,7 +114,9 @@ describe("Init cmd", () => { const dockerFile = FakeCliFs.entries.get("project-name/Dockerfile")!; - expect(dockerFile).toContain("COPY package.json yarn.lock tsconfig.json tsconfig.compile.json .barrels.json ./"); + expect(dockerFile).toContain( + "COPY package.json yarn.lock tsconfig.json tsconfig.base.json tsconfig.node.json tsconfig.spec.json .barrels.json .swcrc ./" + ); expect(dockerFile).toContain("RUN yarn build"); expect(dockerFile).toContain("RUN yarn install --pure-lockfile"); @@ -166,6 +169,7 @@ describe("Init cmd", () => { "project-name/src/controllers/rest/HelloWorldController.ts", "project-name/src/index.ts", "project-name/tsconfig.base.json", + "project-name/tsconfig.json", "project-name/tsconfig.node.json", "project-name/views", "project-name/views/swagger.ejs", @@ -207,7 +211,7 @@ describe("Init cmd", () => { "scripts": { "barrels": "barrels", "build": "yarn run barrels && swc src --out-dir dist -s", - "start": "yarn run barrels && nodemon --import @swc-node/register/register-esm src/index.ts", + "start": "yarn run barrels && nodemon src/index.ts", "start:prod": "cross-env NODE_ENV=production node --import @swc-node/register/register-esm src/index.js", }, "tsed": { @@ -260,6 +264,7 @@ describe("Init cmd", () => { "project-name/src/controllers/rest/HelloWorldController.ts", "project-name/src/index.ts", "project-name/tsconfig.base.json", + "project-name/tsconfig.json", "project-name/tsconfig.node.json", ] `); @@ -351,6 +356,7 @@ describe("Init cmd", () => { "project-name/src/controllers/rest/HelloWorldController.ts", "project-name/src/index.ts", "project-name/tsconfig.base.json", + "project-name/tsconfig.json", "project-name/tsconfig.node.json", ] `); @@ -442,6 +448,7 @@ describe("Init cmd", () => { "project-name/src/controllers/rest/HelloWorldController.ts", "project-name/src/index.ts", "project-name/tsconfig.base.json", + "project-name/tsconfig.json", "project-name/tsconfig.node.json", "project-name/webpack.config.js", ] @@ -535,6 +542,7 @@ describe("Init cmd", () => { "project-name/src/controllers/rest/HelloWorldController.ts", "project-name/src/index.ts", "project-name/tsconfig.base.json", + "project-name/tsconfig.json", "project-name/tsconfig.node.json", ] `); @@ -572,7 +580,7 @@ describe("Init cmd", () => { "scripts": { "barrels": "barrels", "build": "npm run barrels && swc src --out-dir dist -s", - "start": "npm run barrels && nodemon --import @swc-node/register/register-esm src/index.ts", + "start": "npm run barrels && nodemon src/index.ts", "start:prod": "cross-env NODE_ENV=production node --import @swc-node/register/register-esm src/index.js", }, "tsed": { @@ -633,6 +641,7 @@ describe("Init cmd", () => { "project-name/src/index.ts", "project-name/src/server.ts", "project-name/tsconfig.base.json", + "project-name/tsconfig.json", "project-name/tsconfig.node.json", "project-name/views", "project-name/views/swagger.ejs", @@ -699,6 +708,7 @@ describe("Init cmd", () => { "project-name/src/rest/hello-world.controller.ts", "project-name/src/server.ts", "project-name/tsconfig.base.json", + "project-name/tsconfig.json", "project-name/tsconfig.node.json", "project-name/views", "project-name/views/swagger.ejs", @@ -762,6 +772,7 @@ describe("Init cmd", () => { "project-name/src/controllers/rest/HelloWorldController.ts", "project-name/src/index.ts", "project-name/tsconfig.base.json", + "project-name/tsconfig.json", "project-name/tsconfig.node.json", ] `); @@ -800,7 +811,7 @@ describe("Init cmd", () => { "scripts": { "barrels": "barrels", "build": "yarn run barrels && swc src --out-dir dist -s", - "start": "yarn run barrels && nodemon --import @swc-node/register/register-esm src/index.ts", + "start": "yarn run barrels && nodemon src/index.ts", "start:prod": "cross-env NODE_ENV=production node --import @swc-node/register/register-esm src/index.js", }, "tsed": { @@ -872,6 +883,7 @@ describe("Init cmd", () => { "project-name/src/controllers/rest/HelloWorldController.ts", "project-name/src/index.ts", "project-name/tsconfig.base.json", + "project-name/tsconfig.json", "project-name/tsconfig.node.json", ] `); From 14bcd6cd85e0c3e0a6737eb6a95619892377e543 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Thu, 19 Sep 2024 07:55:39 +0200 Subject: [PATCH 22/69] fix(cli): use loader to resolve plugin loading issue --- packages/cli/package.json | 3 ++- packages/cli/src/bin/tsed.ts | 7 ++++++- packages/cli/src/loaders/alias.hook.ts | 11 +++++++++++ .../test/integrations/init/init.integration.spec.ts | 7 +++++++ yarn.lock | 8 ++++++++ 5 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 packages/cli/src/loaders/alias.hook.ts diff --git a/packages/cli/package.json b/packages/cli/package.json index 33bcfa821..278201c1c 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -36,7 +36,7 @@ "start:g:prisma": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts g service -r ./.tmp/init/awesome prisma", "start:generate:run": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts generate -r ./.tmp/init/awesome", "start:typeorm:run": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts typeorm entity:create -r ./.tmp/init/awesome --name User", - "test": "vitest run -u", + "test": "vitest run", "test:ci": "vitest run --coverage.thresholds.autoUpdate=true" }, "bin": { @@ -73,6 +73,7 @@ "@tsed/schema": ">=7.14.2", "chalk": "4.1.2", "change-case": "4.1.2", + "esm-module-alias": "^2.2.1", "globby": "11.1.0", "normalize-path": "3.0.0", "read-pkg-up": "7.0.1", diff --git a/packages/cli/src/bin/tsed.ts b/packages/cli/src/bin/tsed.ts index b75d07131..8d66fe8b8 100644 --- a/packages/cli/src/bin/tsed.ts +++ b/packages/cli/src/bin/tsed.ts @@ -1,5 +1,10 @@ #!/usr/bin/env node -import {Cli} from "../Cli.js"; +import {register} from "node:module"; +import {pathToFileURL} from "node:url"; + +register(pathToFileURL(`${import.meta.dirname}/../alias.hook.js`)); + +const {Cli} = await import("../Cli.js"); Cli.bootstrap({}).catch((error) => { console.error(error); diff --git a/packages/cli/src/loaders/alias.hook.ts b/packages/cli/src/loaders/alias.hook.ts new file mode 100644 index 000000000..373c7f57e --- /dev/null +++ b/packages/cli/src/loaders/alias.hook.ts @@ -0,0 +1,11 @@ +import generateAliasesResolver from "esm-module-alias"; + +const aliases = { + "@tsed/core": import.meta.resolve("@tsed/core"), + "@tsed/di": import.meta.resolve("@tsed/di"), + "@tsed/schema": import.meta.resolve("@tsed/schema"), + "@tsed/cli-core": import.meta.resolve("@tsed/cli-core"), + "@tsed/cli": import.meta.resolve("@tsed/cli") +}; + +export const resolve = generateAliasesResolver(aliases); diff --git a/packages/cli/test/integrations/init/init.integration.spec.ts b/packages/cli/test/integrations/init/init.integration.spec.ts index 00fa66d5b..5de0ab910 100644 --- a/packages/cli/test/integrations/init/init.integration.spec.ts +++ b/packages/cli/test/integrations/init/init.integration.spec.ts @@ -108,6 +108,7 @@ describe("Init cmd", () => { "packageManager": "yarn", "runtime": "node", }, + "type": "module", "version": "1.0.0", } `); @@ -218,6 +219,7 @@ describe("Init cmd", () => { "packageManager": "yarn", "runtime": "node", }, + "type": "module", "version": "1.0.0", } `); @@ -309,6 +311,7 @@ describe("Init cmd", () => { "packageManager": "bun", "runtime": "bun", }, + "type": "module", "version": "1.0.0", } `); @@ -401,6 +404,7 @@ describe("Init cmd", () => { "packageManager": "yarn", "runtime": "babel", }, + "type": "module", "version": "1.0.0", } `); @@ -494,6 +498,7 @@ describe("Init cmd", () => { "packageManager": "yarn", "runtime": "webpack", }, + "type": "module", "version": "1.0.0", } `); @@ -587,6 +592,7 @@ describe("Init cmd", () => { "packageManager": "npm", "runtime": "node", }, + "type": "module", "version": "1.0.0", } `); @@ -818,6 +824,7 @@ describe("Init cmd", () => { "packageManager": "yarn", "runtime": "node", }, + "type": "module", "version": "1.0.0", } `); diff --git a/yarn.lock b/yarn.lock index efdf53835..c885c0344 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2736,6 +2736,7 @@ __metadata: chalk: "npm:4.1.2" change-case: "npm:4.1.2" cross-env: "npm:7.0.3" + esm-module-alias: "npm:^2.2.1" globby: "npm:11.1.0" normalize-path: "npm:3.0.0" read-pkg-up: "npm:7.0.1" @@ -6934,6 +6935,13 @@ __metadata: languageName: node linkType: hard +"esm-module-alias@npm:^2.2.1": + version: 2.2.1 + resolution: "esm-module-alias@npm:2.2.1" + checksum: 10/2dda8bdde12b7b6fdfe7dd0efc4abe15c09af26f62cf5540d3df464dfe1be6a9a627105d5b6ea940f0be4d87c78c15db192fff821be7869b16cc9a1e678b8b31 + languageName: node + linkType: hard + "espree@npm:^10.0.1, espree@npm:^10.1.0": version: 10.1.0 resolution: "espree@npm:10.1.0" From a997c2ab37edda6f48b160e62cb625941d254303 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 19 Sep 2024 08:26:20 +0000 Subject: [PATCH 23/69] Github CI build: __run_2 v6.0.0-alpha.5 [ci skip] --- lerna.json | 2 +- package.json | 2 +- packages/barrels/package.json | 2 +- packages/cli-core/package.json | 2 +- packages/cli-generate-http-client/package.json | 2 +- packages/cli-generate-swagger/package.json | 2 +- packages/cli-plugin-eslint/package.json | 2 +- packages/cli-plugin-jest/package.json | 2 +- packages/cli-plugin-mongoose/package.json | 2 +- packages/cli-plugin-oidc-provider/package.json | 2 +- packages/cli-plugin-passport/package.json | 2 +- packages/cli-plugin-prisma/package.json | 2 +- packages/cli-plugin-typegraphql/package.json | 2 +- packages/cli-plugin-typeorm/package.json | 2 +- packages/cli-plugin-vitest/package.json | 2 +- packages/cli-testing/package.json | 2 +- packages/cli/package.json | 2 +- tools/typescript/package.json | 2 +- tools/vitest/package.json | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lerna.json b/lerna.json index 5b3484939..d36824be0 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "packages": [ "packages/*" ], - "version": "6.0.0-alpha.4" + "version": "6.0.0-alpha.5" } \ No newline at end of file diff --git a/package.json b/package.json index 8b121a277..d7875dd81 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@tsed/cli-root", - "version": "6.0.0-alpha.4", + "version": "6.0.0-alpha.5", "description": "CLI to bootstrap your Ts.ED project", "private": true, "type": "module", diff --git a/packages/barrels/package.json b/packages/barrels/package.json index 54dea5ae2..e2115de73 100644 --- a/packages/barrels/package.json +++ b/packages/barrels/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/barrels", "description": "A simple tool to generate barrels for your TypeScript project", - "version": "6.0.0-alpha.4", + "version": "6.0.0-alpha.5", "type": "module", "bin": "bin/barrels.js", "files": [], diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index 7fdb3b73a..8f53713ca 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-core", "description": "Build your CLI with TypeScript and Decorators", - "version": "6.0.0-alpha.4", + "version": "6.0.0-alpha.5", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-generate-http-client/package.json b/packages/cli-generate-http-client/package.json index 5a036f99c..cec376d6d 100644 --- a/packages/cli-generate-http-client/package.json +++ b/packages/cli-generate-http-client/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-generate-http-client", "description": "Ts.ED CLI plugin. Export a command that generate an HTTP Client (axios or fetch) from your Ts.ED controllers and OS3 spec.", - "version": "6.0.0-alpha.4", + "version": "6.0.0-alpha.5", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-generate-swagger/package.json b/packages/cli-generate-swagger/package.json index 07bf79af5..a0a0904fa 100644 --- a/packages/cli-generate-swagger/package.json +++ b/packages/cli-generate-swagger/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-generate-swagger", "description": "Ts.ED CLI plugin. Export a command that generate the swagger.json from your Ts.ED controllers and OS3 spec.", - "version": "6.0.0-alpha.4", + "version": "6.0.0-alpha.5", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-eslint/package.json b/packages/cli-plugin-eslint/package.json index 7dcb37d74..e302d2cff 100644 --- a/packages/cli-plugin-eslint/package.json +++ b/packages/cli-plugin-eslint/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-eslint", "description": "Ts.ED CLI plugin. Add EsLint support", - "version": "6.0.0-alpha.4", + "version": "6.0.0-alpha.5", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-jest/package.json b/packages/cli-plugin-jest/package.json index ea1196c51..c97e28f04 100644 --- a/packages/cli-plugin-jest/package.json +++ b/packages/cli-plugin-jest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-jest", "description": "Ts.ED CLI plugin. Add Jest support", - "version": "6.0.0-alpha.4", + "version": "6.0.0-alpha.5", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-mongoose/package.json b/packages/cli-plugin-mongoose/package.json index de3edb75e..91490d128 100644 --- a/packages/cli-plugin-mongoose/package.json +++ b/packages/cli-plugin-mongoose/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-mongoose", "description": "Ts.ED CLI plugin. Add Mongoose support", - "version": "6.0.0-alpha.4", + "version": "6.0.0-alpha.5", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-oidc-provider/package.json b/packages/cli-plugin-oidc-provider/package.json index d52818405..6167d8ca2 100644 --- a/packages/cli-plugin-oidc-provider/package.json +++ b/packages/cli-plugin-oidc-provider/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-oidc-provider", "description": "Ts.ED CLI plugin. Add OIDC Provider", - "version": "6.0.0-alpha.4", + "version": "6.0.0-alpha.5", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-passport/package.json b/packages/cli-plugin-passport/package.json index 385fdf34c..333944086 100644 --- a/packages/cli-plugin-passport/package.json +++ b/packages/cli-plugin-passport/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-passport", "description": "Ts.ED CLI plugin. Add Passport.js support", - "version": "6.0.0-alpha.4", + "version": "6.0.0-alpha.5", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-prisma/package.json b/packages/cli-plugin-prisma/package.json index 11acdeb13..f51917035 100644 --- a/packages/cli-plugin-prisma/package.json +++ b/packages/cli-plugin-prisma/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-prisma", "description": "Ts.ED CLI plugin. Add Prisma project initialisation support.", - "version": "6.0.0-alpha.4", + "version": "6.0.0-alpha.5", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-typegraphql/package.json b/packages/cli-plugin-typegraphql/package.json index 3e7b6f98e..4984a25b6 100644 --- a/packages/cli-plugin-typegraphql/package.json +++ b/packages/cli-plugin-typegraphql/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-typegraphql", "description": "Ts.ED CLI plugin. Add TypeGraphql support.", - "version": "6.0.0-alpha.4", + "version": "6.0.0-alpha.5", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-typeorm/package.json b/packages/cli-plugin-typeorm/package.json index fffe35f6f..f0296c4c8 100644 --- a/packages/cli-plugin-typeorm/package.json +++ b/packages/cli-plugin-typeorm/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-typeorm", "description": "Ts.ED CLI plugin. Add TypeORM support", - "version": "6.0.0-alpha.4", + "version": "6.0.0-alpha.5", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-vitest/package.json b/packages/cli-plugin-vitest/package.json index fce444812..cf7ce3212 100644 --- a/packages/cli-plugin-vitest/package.json +++ b/packages/cli-plugin-vitest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-vitest", "description": "Ts.ED CLI plugin. Add Jest support", - "version": "6.0.0-alpha.4", + "version": "6.0.0-alpha.5", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-testing/package.json b/packages/cli-testing/package.json index 16cbfa34b..a55f9cb14 100644 --- a/packages/cli-testing/package.json +++ b/packages/cli-testing/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-testing", "description": "Utils to test you CLI based on Ts.ED CLI", - "version": "6.0.0-alpha.4", + "version": "6.0.0-alpha.5", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli/package.json b/packages/cli/package.json index 278201c1c..4d6b2eca5 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli", "description": "CLI to bootstrap your Ts.ED project", - "version": "6.0.0-alpha.4", + "version": "6.0.0-alpha.5", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/tools/typescript/package.json b/tools/typescript/package.json index 3183f79ed..699e34157 100644 --- a/tools/typescript/package.json +++ b/tools/typescript/package.json @@ -1,6 +1,6 @@ { "name": "@tsed/typescript", - "version": "6.0.0-alpha.4", + "version": "6.0.0-alpha.5", "description": "Util to compile source", "type": "module", "private": true, diff --git a/tools/vitest/package.json b/tools/vitest/package.json index d3c32ad95..8901fa741 100644 --- a/tools/vitest/package.json +++ b/tools/vitest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/vitest", "type": "module", - "version": "6.0.0-alpha.4", + "version": "6.0.0-alpha.5", "private": true, "exports": { ".": "./index.js", From 7bf4692c367263d0d45ba80faf819119148a4c67 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Thu, 19 Sep 2024 17:08:26 +0200 Subject: [PATCH 24/69] fix(cli): fix plugin module resolution --- packages/cli-core/src/services/CliFs.ts | 18 +++++++----------- packages/cli-core/src/utils/loadPlugins.ts | 4 +++- packages/cli/src/bin/tsed.ts | 14 ++++++++++++-- packages/cli/src/loaders/alias.hook.ts | 17 +++++++++-------- 4 files changed, 31 insertions(+), 22 deletions(-) diff --git a/packages/cli-core/src/services/CliFs.ts b/packages/cli-core/src/services/CliFs.ts index 9ed646ba5..00d3788d3 100644 --- a/packages/cli-core/src/services/CliFs.ts +++ b/packages/cli-core/src/services/CliFs.ts @@ -1,8 +1,9 @@ +import {fileURLToPath} from "node:url"; + import {Injectable} from "@tsed/di"; import {normalizePath} from "@tsed/normalize-path"; import {PathLike, WriteFileOptions} from "fs"; -import Fs from "fs-extra"; -import {EnsureOptions} from "fs-extra"; +import Fs, {EnsureOptions} from "fs-extra"; import {join} from "path"; @Injectable() @@ -66,10 +67,6 @@ export class CliFs { async importModule(mod: string, root: string = process.cwd()) { try { if (process.env.NODE_ENV === "development") { - if (isCommonjs()) { - return require(mod); - } - return await import(mod); } } catch (er) {} @@ -77,13 +74,12 @@ export class CliFs { const path = this.findUpFile(root, join("node_modules", mod)); if (path) { - return import(path); + const pkg = await this.readJson(join(path, "package.json")); + const file = pkg.exports?.["."]?.import || pkg.exports?.["."]?.default || pkg.exports?.["."] || pkg.module || pkg.main; + + return import(join(path, file)); } return import(mod); } } - -function isCommonjs() { - return typeof module !== "undefined" && typeof exports !== "undefined"; -} diff --git a/packages/cli-core/src/utils/loadPlugins.ts b/packages/cli-core/src/utils/loadPlugins.ts index 13d7c0eda..6a390f42b 100644 --- a/packages/cli-core/src/utils/loadPlugins.ts +++ b/packages/cli-core/src/utils/loadPlugins.ts @@ -1,3 +1,5 @@ +import {fileURLToPath} from "node:url"; + import {GlobalProviders, InjectorService} from "@tsed/di"; import chalk from "chalk"; // @ts-ignore @@ -19,7 +21,7 @@ export async function loadPlugins(injector: InjectorService) { .filter((mod) => mod.startsWith(`@${name}/cli-plugin`) || mod.includes(`${name}-cli-plugin`)) .map(async (mod) => { try { - const {default: plugin} = await fs.importModule(mod, rootDir); + const {default: plugin} = await fs.importModule(mod, fileURLToPath(rootDir)); if (!injector.has(plugin)) { const provider = GlobalProviders.get(plugin)?.clone(); diff --git a/packages/cli/src/bin/tsed.ts b/packages/cli/src/bin/tsed.ts index 8d66fe8b8..d7de8ac7e 100644 --- a/packages/cli/src/bin/tsed.ts +++ b/packages/cli/src/bin/tsed.ts @@ -1,8 +1,18 @@ #!/usr/bin/env node import {register} from "node:module"; -import {pathToFileURL} from "node:url"; +import {fileURLToPath, pathToFileURL} from "node:url"; -register(pathToFileURL(`${import.meta.dirname}/../alias.hook.js`)); +register(pathToFileURL(`${import.meta.dirname}/../loaders/alias.hook.js`), { + parentURL: import.meta.dirname, + data: { + "@tsed/core": fileURLToPath(import.meta.resolve("@tsed/core")), + "@tsed/di": fileURLToPath(import.meta.resolve("@tsed/di")), + "@tsed/schema": fileURLToPath(import.meta.resolve("@tsed/schema")), + "@tsed/cli-core": fileURLToPath(import.meta.resolve("@tsed/cli-core")), + "@tsed/cli": fileURLToPath(import.meta.resolve("@tsed/cli")) + }, + transferList: [] +}); const {Cli} = await import("../Cli.js"); diff --git a/packages/cli/src/loaders/alias.hook.ts b/packages/cli/src/loaders/alias.hook.ts index 373c7f57e..5e5bb8038 100644 --- a/packages/cli/src/loaders/alias.hook.ts +++ b/packages/cli/src/loaders/alias.hook.ts @@ -1,11 +1,12 @@ import generateAliasesResolver from "esm-module-alias"; -const aliases = { - "@tsed/core": import.meta.resolve("@tsed/core"), - "@tsed/di": import.meta.resolve("@tsed/di"), - "@tsed/schema": import.meta.resolve("@tsed/schema"), - "@tsed/cli-core": import.meta.resolve("@tsed/cli-core"), - "@tsed/cli": import.meta.resolve("@tsed/cli") -}; +let resolver: any = null; -export const resolve = generateAliasesResolver(aliases); +export async function initialize(aliases: Record) { + // Receives data from `register`. + resolver = generateAliasesResolver(aliases); +} + +export function resolve(specifier: any, context: any, nextResolve: any) { + return resolver(specifier, context, nextResolve); +} From 1be1d7c3bef34980bbde9ed52ef3886c182a01d7 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Thu, 19 Sep 2024 17:09:11 +0200 Subject: [PATCH 25/69] fix(cli-plugin-eslint): fix template link --- packages/cli-plugin-eslint/src/hooks/EslintInitHook.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli-plugin-eslint/src/hooks/EslintInitHook.ts b/packages/cli-plugin-eslint/src/hooks/EslintInitHook.ts index f7dd4ff46..6ba2967f8 100644 --- a/packages/cli-plugin-eslint/src/hooks/EslintInitHook.ts +++ b/packages/cli-plugin-eslint/src/hooks/EslintInitHook.ts @@ -26,7 +26,7 @@ export class EslintInitHook { task: (ctx: any) => { return this.rootRenderer.renderAll( [ - "eslint.config.mjs", + "eslint.config.mjs.hbs", ctx.lintstaged && ".husky/_/.gitignore.hbs", ctx.lintstaged && ".husky/_/husky.sh.hbs", ctx.lintstaged && ".husky/.gitignore.hbs", From 80fad36ce14a55c6fd00bb03b029c2f67f13cd04 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Fri, 20 Sep 2024 07:13:27 +0000 Subject: [PATCH 26/69] Github CI build: __run_2 v6.0.0-alpha.6 [ci skip] --- lerna.json | 2 +- package.json | 2 +- packages/barrels/package.json | 2 +- packages/cli-core/package.json | 2 +- packages/cli-generate-http-client/package.json | 2 +- packages/cli-generate-swagger/package.json | 2 +- packages/cli-plugin-eslint/package.json | 2 +- packages/cli-plugin-jest/package.json | 2 +- packages/cli-plugin-mongoose/package.json | 2 +- packages/cli-plugin-oidc-provider/package.json | 2 +- packages/cli-plugin-passport/package.json | 2 +- packages/cli-plugin-prisma/package.json | 2 +- packages/cli-plugin-typegraphql/package.json | 2 +- packages/cli-plugin-typeorm/package.json | 2 +- packages/cli-plugin-vitest/package.json | 2 +- packages/cli-testing/package.json | 2 +- packages/cli/package.json | 2 +- tools/typescript/package.json | 2 +- tools/vitest/package.json | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lerna.json b/lerna.json index d36824be0..cb321ddb5 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "packages": [ "packages/*" ], - "version": "6.0.0-alpha.5" + "version": "6.0.0-alpha.6" } \ No newline at end of file diff --git a/package.json b/package.json index d7875dd81..aad80e995 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@tsed/cli-root", - "version": "6.0.0-alpha.5", + "version": "6.0.0-alpha.6", "description": "CLI to bootstrap your Ts.ED project", "private": true, "type": "module", diff --git a/packages/barrels/package.json b/packages/barrels/package.json index e2115de73..da7bcfe93 100644 --- a/packages/barrels/package.json +++ b/packages/barrels/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/barrels", "description": "A simple tool to generate barrels for your TypeScript project", - "version": "6.0.0-alpha.5", + "version": "6.0.0-alpha.6", "type": "module", "bin": "bin/barrels.js", "files": [], diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index 8f53713ca..d34c62fcc 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-core", "description": "Build your CLI with TypeScript and Decorators", - "version": "6.0.0-alpha.5", + "version": "6.0.0-alpha.6", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-generate-http-client/package.json b/packages/cli-generate-http-client/package.json index cec376d6d..238f30319 100644 --- a/packages/cli-generate-http-client/package.json +++ b/packages/cli-generate-http-client/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-generate-http-client", "description": "Ts.ED CLI plugin. Export a command that generate an HTTP Client (axios or fetch) from your Ts.ED controllers and OS3 spec.", - "version": "6.0.0-alpha.5", + "version": "6.0.0-alpha.6", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-generate-swagger/package.json b/packages/cli-generate-swagger/package.json index a0a0904fa..6f33e70d3 100644 --- a/packages/cli-generate-swagger/package.json +++ b/packages/cli-generate-swagger/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-generate-swagger", "description": "Ts.ED CLI plugin. Export a command that generate the swagger.json from your Ts.ED controllers and OS3 spec.", - "version": "6.0.0-alpha.5", + "version": "6.0.0-alpha.6", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-eslint/package.json b/packages/cli-plugin-eslint/package.json index e302d2cff..42a1dc8e5 100644 --- a/packages/cli-plugin-eslint/package.json +++ b/packages/cli-plugin-eslint/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-eslint", "description": "Ts.ED CLI plugin. Add EsLint support", - "version": "6.0.0-alpha.5", + "version": "6.0.0-alpha.6", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-jest/package.json b/packages/cli-plugin-jest/package.json index c97e28f04..e101563de 100644 --- a/packages/cli-plugin-jest/package.json +++ b/packages/cli-plugin-jest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-jest", "description": "Ts.ED CLI plugin. Add Jest support", - "version": "6.0.0-alpha.5", + "version": "6.0.0-alpha.6", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-mongoose/package.json b/packages/cli-plugin-mongoose/package.json index 91490d128..97a6659dc 100644 --- a/packages/cli-plugin-mongoose/package.json +++ b/packages/cli-plugin-mongoose/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-mongoose", "description": "Ts.ED CLI plugin. Add Mongoose support", - "version": "6.0.0-alpha.5", + "version": "6.0.0-alpha.6", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-oidc-provider/package.json b/packages/cli-plugin-oidc-provider/package.json index 6167d8ca2..998538245 100644 --- a/packages/cli-plugin-oidc-provider/package.json +++ b/packages/cli-plugin-oidc-provider/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-oidc-provider", "description": "Ts.ED CLI plugin. Add OIDC Provider", - "version": "6.0.0-alpha.5", + "version": "6.0.0-alpha.6", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-passport/package.json b/packages/cli-plugin-passport/package.json index 333944086..e781abfae 100644 --- a/packages/cli-plugin-passport/package.json +++ b/packages/cli-plugin-passport/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-passport", "description": "Ts.ED CLI plugin. Add Passport.js support", - "version": "6.0.0-alpha.5", + "version": "6.0.0-alpha.6", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-prisma/package.json b/packages/cli-plugin-prisma/package.json index f51917035..dda720419 100644 --- a/packages/cli-plugin-prisma/package.json +++ b/packages/cli-plugin-prisma/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-prisma", "description": "Ts.ED CLI plugin. Add Prisma project initialisation support.", - "version": "6.0.0-alpha.5", + "version": "6.0.0-alpha.6", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-typegraphql/package.json b/packages/cli-plugin-typegraphql/package.json index 4984a25b6..afb58cc0b 100644 --- a/packages/cli-plugin-typegraphql/package.json +++ b/packages/cli-plugin-typegraphql/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-typegraphql", "description": "Ts.ED CLI plugin. Add TypeGraphql support.", - "version": "6.0.0-alpha.5", + "version": "6.0.0-alpha.6", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-typeorm/package.json b/packages/cli-plugin-typeorm/package.json index f0296c4c8..e2f74c34a 100644 --- a/packages/cli-plugin-typeorm/package.json +++ b/packages/cli-plugin-typeorm/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-typeorm", "description": "Ts.ED CLI plugin. Add TypeORM support", - "version": "6.0.0-alpha.5", + "version": "6.0.0-alpha.6", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-vitest/package.json b/packages/cli-plugin-vitest/package.json index cf7ce3212..521fe23f9 100644 --- a/packages/cli-plugin-vitest/package.json +++ b/packages/cli-plugin-vitest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-vitest", "description": "Ts.ED CLI plugin. Add Jest support", - "version": "6.0.0-alpha.5", + "version": "6.0.0-alpha.6", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-testing/package.json b/packages/cli-testing/package.json index a55f9cb14..b9b277881 100644 --- a/packages/cli-testing/package.json +++ b/packages/cli-testing/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-testing", "description": "Utils to test you CLI based on Ts.ED CLI", - "version": "6.0.0-alpha.5", + "version": "6.0.0-alpha.6", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli/package.json b/packages/cli/package.json index 4d6b2eca5..56e2ab01d 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli", "description": "CLI to bootstrap your Ts.ED project", - "version": "6.0.0-alpha.5", + "version": "6.0.0-alpha.6", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/tools/typescript/package.json b/tools/typescript/package.json index 699e34157..5c0734d39 100644 --- a/tools/typescript/package.json +++ b/tools/typescript/package.json @@ -1,6 +1,6 @@ { "name": "@tsed/typescript", - "version": "6.0.0-alpha.5", + "version": "6.0.0-alpha.6", "description": "Util to compile source", "type": "module", "private": true, diff --git a/tools/vitest/package.json b/tools/vitest/package.json index 8901fa741..3e205210c 100644 --- a/tools/vitest/package.json +++ b/tools/vitest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/vitest", "type": "module", - "version": "6.0.0-alpha.5", + "version": "6.0.0-alpha.6", "private": true, "exports": { ".": "./index.js", From b17c2cf5f6f3bc8e52110898bc1fcddc7a7a862d Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Fri, 20 Sep 2024 09:33:35 +0200 Subject: [PATCH 27/69] fix: bump typescript version to v5.6 --- .gitignore | 1 + package.json | 8 +- packages/cli-core/package.json | 2 +- packages/cli-core/src/decorators/command.ts | 2 +- packages/cli-core/src/index.ts | 26 +- .../src/interfaces/CommandMetadata.ts | 2 +- .../src/interfaces/CommandProvider.ts | 4 +- packages/cli-core/src/interfaces/index.ts | 4 +- .../packageManagers/PackageManagersModule.ts | 2 +- .../packageManagers/supports/BunManager.ts | 2 +- .../packageManagers/supports/NpmManager.ts | 2 +- .../packageManagers/supports/PNpmManager.ts | 2 +- .../supports/YarnBerryManager.ts | 2 +- .../packageManagers/supports/YarnManager.ts | 2 +- packages/cli-core/src/services/CliFs.ts | 6 +- .../cli-core/src/services/CliHttpClient.ts | 2 +- packages/cli-core/src/services/CliLoadFile.ts | 2 +- .../cli-core/src/services/CliPackageJson.ts | 2 +- packages/cli-core/src/services/CliPlugins.ts | 2 +- packages/cli-core/src/services/CliService.ts | 6 +- .../src/services/NpmRegistryClient.ts | 2 +- .../src/services/ProjectPackageJson.ts | 4 +- packages/cli-core/src/utils/createInjector.ts | 2 +- .../cli-core/src/utils/getCommandMetadata.ts | 4 +- .../cli-core/src/utils/mapCommanderArgs.ts | 2 +- .../src/utils/resolveConfiguration.ts | 2 +- .../cli-generate-http-client/package.json | 2 +- .../src/commands/GenerateHttpClientCmd.ts | 4 +- packages/cli-generate-swagger/package.json | 2 +- .../src/commands/GenerateSwaggerCmd.ts | 3 +- packages/cli-plugin-eslint/package.json | 2 +- .../src/hooks/EslintInitHook.ts | 2 +- packages/cli-plugin-jest/package.json | 2 +- .../src/hooks/JestGenerateHook.ts | 4 +- packages/cli-plugin-mongoose/package.json | 2 +- .../src/hooks/MongooseGenerateHook.ts | 4 +- .../src/hooks/MongooseInitHook.ts | 2 +- .../cli-plugin-oidc-provider/package.json | 2 +- .../src/hooks/OidcProviderInitHook.ts | 2 +- .../templates/tsconfig.json | 8 + packages/cli-plugin-passport/package.json | 2 +- .../src/hooks/PassportGenerateHook.ts | 4 +- packages/cli-plugin-prisma/package.json | 2 +- .../src/commands/PrismaCmd.ts | 2 +- .../src/hooks/PrismaInitHook.ts | 2 +- packages/cli-plugin-typegraphql/package.json | 2 +- .../src/hooks/TypeGraphqlInitHook.ts | 2 +- packages/cli-plugin-typeorm/package.json | 2 +- .../src/hooks/TypeORMGenerateHook.ts | 4 +- .../src/hooks/TypeORMInitHook.ts | 2 +- packages/cli-plugin-vitest/package.json | 2 +- .../src/hooks/VitestGenerateHook.ts | 4 +- packages/cli-testing/package.json | 2 +- packages/cli-testing/src/CliPlatformTest.ts | 2 +- packages/cli-testing/src/FakeCliFs.ts | 4 +- packages/cli-testing/src/FakeCliHttpClient.ts | 4 +- packages/cli/package.json | 2 +- packages/cli/src/commands/add/AddCmd.ts | 8 +- .../cli/src/commands/generate/GenerateCmd.ts | 2 +- packages/cli/src/commands/init/InitCmd.ts | 10 +- .../commands/init/config/FeaturesPrompt.ts | 2 +- .../init/interfaces/InitCmdContext.ts | 4 +- .../src/commands/init/mappers/mapToContext.ts | 2 +- .../commands/init/mappers/mapUniqFeatures.ts | 4 +- .../init/prompts/getFeaturesPrompt.ts | 2 +- packages/cli/src/commands/run/RunCmd.ts | 3 +- packages/cli/src/commands/update/UpdateCmd.ts | 8 +- .../cli/src/platforms/InitPlatformsModule.ts | 2 +- .../platforms/supports/InitExpressPlatform.ts | 2 +- .../src/platforms/supports/InitKoaPlatform.ts | 2 +- tools/typescript/tsconfig.node.json | 1 + yarn.lock | 424 +++--------------- 72 files changed, 181 insertions(+), 477 deletions(-) create mode 100644 packages/cli-plugin-oidc-provider/templates/tsconfig.json diff --git a/.gitignore b/.gitignore index f646edad4..659438743 100644 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,7 @@ node_modules typings/ # Typescript +tsconfig.*.tsbuildinfo test/*.js test/*.js.map /packages/*.js diff --git a/package.json b/package.json index aad80e995..d0e557221 100644 --- a/package.json +++ b/package.json @@ -101,12 +101,8 @@ "prettier": "3.3.3", "semantic-release": "24.1.1", "semantic-release-slack-bot": "4.0.2", - "sinon": "14.0.0", - "sinon-chai": "3.7.0", - "ts-jest": "28.0.8", - "ts-node": "10.9.1", - "tsconfig-paths": "4.1.2", - "typescript": "4.9.5", + "ts-node": "^10.9.2", + "typescript": "5.6.2", "unplugin-swc": "^1.5.1", "vitest": "2.1.1" }, diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index d34c62fcc..2acecb964 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -84,7 +84,7 @@ "@types/uuid": "8.3.4", "cross-env": "7.0.3", "deps": "^1.0.0", - "typescript": "4.9.5", + "typescript": "5.6.2", "vitest": "2.1.1" }, "peerDependencies": { diff --git a/packages/cli-core/src/decorators/command.ts b/packages/cli-core/src/decorators/command.ts index 730dd2f63..0b837470c 100644 --- a/packages/cli-core/src/decorators/command.ts +++ b/packages/cli-core/src/decorators/command.ts @@ -2,7 +2,7 @@ import {StoreSet, useDecorators} from "@tsed/core"; import {Injectable} from "@tsed/di"; import {CommandStoreKeys} from "../domains/CommandStoreKeys.js"; -import {CommandParameters} from "../interfaces/CommandParameters.js"; +import type {CommandParameters} from "../interfaces/CommandParameters.js"; export function Command(options: CommandParameters): ClassDecorator { return useDecorators(Injectable({type: "command"}), StoreSet(CommandStoreKeys.COMMAND, options)) as any; diff --git a/packages/cli-core/src/index.ts b/packages/cli-core/src/index.ts index f602cab64..9ce874022 100644 --- a/packages/cli-core/src/index.ts +++ b/packages/cli-core/src/index.ts @@ -1,4 +1,7 @@ +import "./utils/patchCommander.js"; + import Inquirer from "inquirer"; + export * from "./CliCore.js"; export * from "./decorators/index.js"; export * from "./interfaces/index.js"; @@ -6,28 +9,7 @@ export * from "./packageManagers/index.js"; export * from "./services/index.js"; export * from "./utils/index.js"; export * from "@tsed/core"; -export { - Configuration, - Constant, - Container, - DITest, - Inject, - Injectable, - InjectorService, - InvokeOptions, - LocalsContainer, - Module, - OnDestroy, - OnInit, - Opts, - OverrideProvider, - registerProvider, - TokenProvider, - UseOpts, - Value -} from "@tsed/di"; +export * from "@tsed/di"; export * from "@tsed/logger"; export * from "@tsed/normalize-path"; export {Inquirer}; - -import "./utils/patchCommander.js"; diff --git a/packages/cli-core/src/interfaces/CommandMetadata.ts b/packages/cli-core/src/interfaces/CommandMetadata.ts index 78b810852..610b33f71 100644 --- a/packages/cli-core/src/interfaces/CommandMetadata.ts +++ b/packages/cli-core/src/interfaces/CommandMetadata.ts @@ -1,4 +1,4 @@ -import {CommandArg, CommandOptions, CommandParameters} from "./CommandParameters.js"; +import type {CommandArg, CommandOptions, CommandParameters} from "./CommandParameters.js"; export interface CommandMetadata extends CommandParameters { /** diff --git a/packages/cli-core/src/interfaces/CommandProvider.ts b/packages/cli-core/src/interfaces/CommandProvider.ts index 96793674a..5eca05dea 100644 --- a/packages/cli-core/src/interfaces/CommandProvider.ts +++ b/packages/cli-core/src/interfaces/CommandProvider.ts @@ -1,6 +1,6 @@ -import {Answers, QuestionCollection} from "inquirer"; +import type {Answers, QuestionCollection} from "inquirer"; -import {Tasks} from "./Tasks.js"; +import type {Tasks} from "./Tasks.js"; export type QuestionOptions = QuestionCollection; diff --git a/packages/cli-core/src/interfaces/index.ts b/packages/cli-core/src/interfaces/index.ts index ebbfdd721..660bfeacd 100644 --- a/packages/cli-core/src/interfaces/index.ts +++ b/packages/cli-core/src/interfaces/index.ts @@ -1,7 +1,7 @@ import {Type} from "@tsed/core"; -import {CommandProvider} from "./CommandProvider.js"; -import {PackageJson} from "./PackageJson.js"; +import type {CommandProvider} from "./CommandProvider.js"; +import type {PackageJson} from "./PackageJson.js"; export * from "./CliDefaultOptions.js"; export * from "./CommandMetadata.js"; diff --git a/packages/cli-core/src/packageManagers/PackageManagersModule.ts b/packages/cli-core/src/packageManagers/PackageManagersModule.ts index d68ecdb72..14091db2f 100644 --- a/packages/cli-core/src/packageManagers/PackageManagersModule.ts +++ b/packages/cli-core/src/packageManagers/PackageManagersModule.ts @@ -1,5 +1,5 @@ import {Inject, Injectable} from "@tsed/di"; -import {Options} from "execa"; +import type {Options} from "execa"; import {EMPTY, throwError} from "rxjs"; import {catchError} from "rxjs/operators"; diff --git a/packages/cli-core/src/packageManagers/supports/BunManager.ts b/packages/cli-core/src/packageManagers/supports/BunManager.ts index c82f8e58f..c145a37ed 100644 --- a/packages/cli-core/src/packageManagers/supports/BunManager.ts +++ b/packages/cli-core/src/packageManagers/supports/BunManager.ts @@ -2,7 +2,7 @@ import {Injectable} from "@tsed/di"; import execa from "execa"; import {Observable} from "rxjs"; -import {BaseManager, ManagerCmdOpts} from "./BaseManager.js"; +import {BaseManager, type ManagerCmdOpts} from "./BaseManager.js"; @Injectable({ type: "package:manager" diff --git a/packages/cli-core/src/packageManagers/supports/NpmManager.ts b/packages/cli-core/src/packageManagers/supports/NpmManager.ts index 436630e88..c65bdd714 100644 --- a/packages/cli-core/src/packageManagers/supports/NpmManager.ts +++ b/packages/cli-core/src/packageManagers/supports/NpmManager.ts @@ -1,7 +1,7 @@ import {Injectable} from "@tsed/di"; import {Observable} from "rxjs"; -import {BaseManager, ManagerCmdOpts} from "./BaseManager.js"; +import {BaseManager, type ManagerCmdOpts} from "./BaseManager.js"; @Injectable({ type: "package:manager" diff --git a/packages/cli-core/src/packageManagers/supports/PNpmManager.ts b/packages/cli-core/src/packageManagers/supports/PNpmManager.ts index fc4261841..2319920d7 100644 --- a/packages/cli-core/src/packageManagers/supports/PNpmManager.ts +++ b/packages/cli-core/src/packageManagers/supports/PNpmManager.ts @@ -1,7 +1,7 @@ import {Injectable} from "@tsed/di"; import {Observable} from "rxjs"; -import {BaseManager, ManagerCmdOpts} from "./BaseManager.js"; +import {BaseManager, type ManagerCmdOpts} from "./BaseManager.js"; @Injectable({ type: "package:manager" diff --git a/packages/cli-core/src/packageManagers/supports/YarnBerryManager.ts b/packages/cli-core/src/packageManagers/supports/YarnBerryManager.ts index f0d30c32a..db1ec7eba 100644 --- a/packages/cli-core/src/packageManagers/supports/YarnBerryManager.ts +++ b/packages/cli-core/src/packageManagers/supports/YarnBerryManager.ts @@ -4,7 +4,7 @@ import {join} from "path"; import {Observable} from "rxjs"; import {CliYaml} from "../../services/CliYaml.js"; -import {BaseManager, ManagerCmdOpts, ManagerCmdSyncOpts} from "./BaseManager.js"; +import {BaseManager, type ManagerCmdOpts, type ManagerCmdSyncOpts} from "./BaseManager.js"; @Injectable({ type: "package:manager" diff --git a/packages/cli-core/src/packageManagers/supports/YarnManager.ts b/packages/cli-core/src/packageManagers/supports/YarnManager.ts index 954084682..107afe935 100644 --- a/packages/cli-core/src/packageManagers/supports/YarnManager.ts +++ b/packages/cli-core/src/packageManagers/supports/YarnManager.ts @@ -2,7 +2,7 @@ import {Injectable} from "@tsed/di"; import execa from "execa"; import {Observable} from "rxjs"; -import {BaseManager, ManagerCmdOpts} from "./BaseManager.js"; +import {BaseManager, type ManagerCmdOpts} from "./BaseManager.js"; @Injectable({ type: "package:manager" diff --git a/packages/cli-core/src/services/CliFs.ts b/packages/cli-core/src/services/CliFs.ts index 00d3788d3..6e42e4232 100644 --- a/packages/cli-core/src/services/CliFs.ts +++ b/packages/cli-core/src/services/CliFs.ts @@ -1,9 +1,7 @@ -import {fileURLToPath} from "node:url"; - import {Injectable} from "@tsed/di"; import {normalizePath} from "@tsed/normalize-path"; -import {PathLike, WriteFileOptions} from "fs"; -import Fs, {EnsureOptions} from "fs-extra"; +import type {PathLike, WriteFileOptions} from "fs"; +import Fs, {type EnsureOptions} from "fs-extra"; import {join} from "path"; @Injectable() diff --git a/packages/cli-core/src/services/CliHttpClient.ts b/packages/cli-core/src/services/CliHttpClient.ts index 5b048d704..33029c446 100644 --- a/packages/cli-core/src/services/CliHttpClient.ts +++ b/packages/cli-core/src/services/CliHttpClient.ts @@ -1,6 +1,6 @@ import {cleanObject} from "@tsed/core"; import {Inject, Injectable} from "@tsed/di"; -import axios, {AxiosRequestConfig, Method} from "axios"; +import axios, {type AxiosRequestConfig, type Method} from "axios"; import {stringify} from "querystring"; import {URL} from "url"; diff --git a/packages/cli-core/src/services/CliLoadFile.ts b/packages/cli-core/src/services/CliLoadFile.ts index 6635e1577..e76d37cd3 100644 --- a/packages/cli-core/src/services/CliLoadFile.ts +++ b/packages/cli-core/src/services/CliLoadFile.ts @@ -1,5 +1,5 @@ import {Inject, Injectable} from "@tsed/di"; -import {default as Ajv, Schema} from "ajv"; +import {default as Ajv, type Schema} from "ajv"; import {extname} from "path"; import {CliFs} from "./CliFs.js"; diff --git a/packages/cli-core/src/services/CliPackageJson.ts b/packages/cli-core/src/services/CliPackageJson.ts index 06d55da6d..fb272e0f4 100644 --- a/packages/cli-core/src/services/CliPackageJson.ts +++ b/packages/cli-core/src/services/CliPackageJson.ts @@ -1,6 +1,6 @@ import {Configuration, Inject, registerProvider} from "@tsed/di"; -import {PackageJson} from "../interfaces/PackageJson.js"; +import {type PackageJson} from "../interfaces/PackageJson.js"; export type CliPackageJson = PackageJson; diff --git a/packages/cli-core/src/services/CliPlugins.ts b/packages/cli-core/src/services/CliPlugins.ts index 72078b37b..9f493869c 100644 --- a/packages/cli-core/src/services/CliPlugins.ts +++ b/packages/cli-core/src/services/CliPlugins.ts @@ -2,7 +2,7 @@ import {Constant, Inject, Injectable, InjectorService} from "@tsed/di"; import chalk from "chalk"; import {CommandStoreKeys} from "../domains/CommandStoreKeys.js"; -import {Task} from "../interfaces/index.js"; +import type {Task} from "../interfaces/index.js"; import {PackageManagersModule} from "../packageManagers/PackageManagersModule.js"; import {createSubTasks} from "../utils/createTasksRunner.js"; import {loadPlugins} from "../utils/loadPlugins.js"; diff --git a/packages/cli-core/src/services/CliService.ts b/packages/cli-core/src/services/CliService.ts index 0f36f783f..f8ae1fea1 100644 --- a/packages/cli-core/src/services/CliService.ts +++ b/packages/cli-core/src/services/CliService.ts @@ -7,9 +7,9 @@ import inquirer_autocomplete_prompt from "inquirer-autocomplete-prompt"; import {v4} from "uuid"; import {CommandStoreKeys} from "../domains/CommandStoreKeys.js"; -import {CommandMetadata} from "../interfaces/CommandMetadata.js"; -import {CommandArg, CommandOptions} from "../interfaces/CommandParameters.js"; -import {CommandProvider} from "../interfaces/CommandProvider.js"; +import type {CommandMetadata} from "../interfaces/CommandMetadata.js"; +import type {CommandArg, CommandOptions} from "../interfaces/CommandParameters.js"; +import type {CommandProvider} from "../interfaces/CommandProvider.js"; import {PackageManagersModule} from "../packageManagers/index.js"; import {createSubTasks, createTasksRunner} from "../utils/createTasksRunner.js"; import {getCommandMetadata} from "../utils/getCommandMetadata.js"; diff --git a/packages/cli-core/src/services/NpmRegistryClient.ts b/packages/cli-core/src/services/NpmRegistryClient.ts index c7a1e724c..57641112b 100644 --- a/packages/cli-core/src/services/NpmRegistryClient.ts +++ b/packages/cli-core/src/services/NpmRegistryClient.ts @@ -2,7 +2,7 @@ import {Inject, Injectable} from "@tsed/di"; import registry_url from "registry-url"; import url from "url"; -import {PackageInfo} from "../interfaces/PackageJson.js"; +import type {PackageInfo} from "../interfaces/PackageJson.js"; import {CliHttpClient} from "./CliHttpClient.js"; const HOST = registry_url(); diff --git a/packages/cli-core/src/services/ProjectPackageJson.ts b/packages/cli-core/src/services/ProjectPackageJson.ts index 386eecc30..cd0ce2247 100644 --- a/packages/cli-core/src/services/ProjectPackageJson.ts +++ b/packages/cli-core/src/services/ProjectPackageJson.ts @@ -3,8 +3,8 @@ import {Configuration, Injectable} from "@tsed/di"; import {dirname, join} from "path"; import readPkgUp from "read-pkg-up"; -import {PackageJson} from "../interfaces/PackageJson.js"; -import {ProjectPreferences} from "../interfaces/ProjectPreferences.js"; +import type {PackageJson} from "../interfaces/PackageJson.js"; +import type {ProjectPreferences} from "../interfaces/ProjectPreferences.js"; import {isValidVersion} from "../utils/isValidVersion.js"; import {CliFs} from "./CliFs.js"; diff --git a/packages/cli-core/src/utils/createInjector.ts b/packages/cli-core/src/utils/createInjector.ts index 856938978..b54114afb 100644 --- a/packages/cli-core/src/utils/createInjector.ts +++ b/packages/cli-core/src/utils/createInjector.ts @@ -1,4 +1,4 @@ -import {DIConfigurationOptions, InjectorService} from "@tsed/di"; +import {type DIConfigurationOptions, InjectorService} from "@tsed/di"; import {Logger} from "@tsed/logger"; import {CliConfiguration} from "../services/CliConfiguration.js"; diff --git a/packages/cli-core/src/utils/getCommandMetadata.ts b/packages/cli-core/src/utils/getCommandMetadata.ts index 864b76ec3..c3a66f0a0 100644 --- a/packages/cli-core/src/utils/getCommandMetadata.ts +++ b/packages/cli-core/src/utils/getCommandMetadata.ts @@ -1,8 +1,8 @@ import {Store, Type} from "@tsed/core"; import {CommandStoreKeys} from "../domains/CommandStoreKeys.js"; -import {CommandMetadata} from "../interfaces/CommandMetadata.js"; -import {CommandParameters} from "../interfaces/CommandParameters.js"; +import type {CommandMetadata} from "../interfaces/CommandMetadata.js"; +import type {CommandParameters} from "../interfaces/CommandParameters.js"; export function getCommandMetadata(token: Type): CommandMetadata { const { diff --git a/packages/cli-core/src/utils/mapCommanderArgs.ts b/packages/cli-core/src/utils/mapCommanderArgs.ts index 43bbaf413..43a20c887 100644 --- a/packages/cli-core/src/utils/mapCommanderArgs.ts +++ b/packages/cli-core/src/utils/mapCommanderArgs.ts @@ -1,6 +1,6 @@ import {isArray, isClass, Type} from "@tsed/core"; -import {CommandArg} from "../interfaces/CommandParameters.js"; +import type {CommandArg} from "../interfaces/CommandParameters.js"; function mapValue(value: any, {type, itemType}: {type?: Type; itemType?: Type}) { if (!value) { diff --git a/packages/cli-core/src/utils/resolveConfiguration.ts b/packages/cli-core/src/utils/resolveConfiguration.ts index cae02c1b8..212aa08a3 100644 --- a/packages/cli-core/src/utils/resolveConfiguration.ts +++ b/packages/cli-core/src/utils/resolveConfiguration.ts @@ -1,5 +1,5 @@ import {getValue} from "@tsed/core"; -import {TokenProvider} from "@tsed/di"; +import type {TokenProvider} from "@tsed/di"; import {getCommandMetadata} from "./getCommandMetadata.js"; diff --git a/packages/cli-generate-http-client/package.json b/packages/cli-generate-http-client/package.json index 238f30319..6c6a9d848 100644 --- a/packages/cli-generate-http-client/package.json +++ b/packages/cli-generate-http-client/package.json @@ -30,7 +30,7 @@ "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", "swagger-typescript-api": "^9.3.1", - "typescript": "4.9.5", + "typescript": "5.6.2", "vitest": "2.1.1" }, "peerDependencies": { diff --git a/packages/cli-generate-http-client/src/commands/GenerateHttpClientCmd.ts b/packages/cli-generate-http-client/src/commands/GenerateHttpClientCmd.ts index 2d8f638d8..ea5b87de9 100644 --- a/packages/cli-generate-http-client/src/commands/GenerateHttpClientCmd.ts +++ b/packages/cli-generate-http-client/src/commands/GenerateHttpClientCmd.ts @@ -1,9 +1,9 @@ -import {CliFs, Command, CommandProvider, Inject, Type} from "@tsed/cli-core"; +import {CliFs, Command, type CommandProvider, Inject, Type} from "@tsed/cli-core"; import {isString} from "@tsed/core"; import {Constant, InjectorService} from "@tsed/di"; import {camelCase} from "change-case"; import path, {join, resolve} from "path"; -import {generateApi, Hooks, RawRouteInfo, RouteNameInfo} from "swagger-typescript-api"; +import {generateApi, type Hooks, type RawRouteInfo, type RouteNameInfo} from "swagger-typescript-api"; export interface GenerateHttpClientCtx { output: string; diff --git a/packages/cli-generate-swagger/package.json b/packages/cli-generate-swagger/package.json index 6f33e70d3..0c5eecd82 100644 --- a/packages/cli-generate-swagger/package.json +++ b/packages/cli-generate-swagger/package.json @@ -29,7 +29,7 @@ "@tsed/cli-core": "workspace:*", "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", - "typescript": "4.9.5", + "typescript": "5.6.2", "vitest": "2.1.1" }, "peerDependencies": { diff --git a/packages/cli-generate-swagger/src/commands/GenerateSwaggerCmd.ts b/packages/cli-generate-swagger/src/commands/GenerateSwaggerCmd.ts index f90038fa8..a869a0244 100644 --- a/packages/cli-generate-swagger/src/commands/GenerateSwaggerCmd.ts +++ b/packages/cli-generate-swagger/src/commands/GenerateSwaggerCmd.ts @@ -1,5 +1,4 @@ -import {CliFs, CliYaml, Command, CommandProvider, Constant, Inject, InjectorService, Type} from "@tsed/cli-core"; -import {importPackage} from "@tsed/core"; +import {CliFs, CliYaml, Command, type CommandProvider, Constant, Inject, InjectorService, Type} from "@tsed/cli-core"; import path, {join, resolve} from "path"; export interface GenerateSwaggerCtx { diff --git a/packages/cli-plugin-eslint/package.json b/packages/cli-plugin-eslint/package.json index 42a1dc8e5..548b72b9e 100644 --- a/packages/cli-plugin-eslint/package.json +++ b/packages/cli-plugin-eslint/package.json @@ -23,7 +23,7 @@ "@tsed/cli-core": "workspace:*", "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", - "typescript": "4.9.5", + "typescript": "5.6.2", "vitest": "2.1.1" }, "dependencies": { diff --git a/packages/cli-plugin-eslint/src/hooks/EslintInitHook.ts b/packages/cli-plugin-eslint/src/hooks/EslintInitHook.ts index 6ba2967f8..d474e3457 100644 --- a/packages/cli-plugin-eslint/src/hooks/EslintInitHook.ts +++ b/packages/cli-plugin-eslint/src/hooks/EslintInitHook.ts @@ -1,4 +1,4 @@ -import {InitCmdContext} from "@tsed/cli"; +import type {InitCmdContext} from "@tsed/cli"; import {Inject, Injectable, OnExec, OnPostInstall, PackageManagersModule, ProjectPackageJson, RootRendererService} from "@tsed/cli-core"; import {TEMPLATE_DIR} from "../utils/templateDir.js"; diff --git a/packages/cli-plugin-jest/package.json b/packages/cli-plugin-jest/package.json index e101563de..81d0bfdbc 100644 --- a/packages/cli-plugin-jest/package.json +++ b/packages/cli-plugin-jest/package.json @@ -25,7 +25,7 @@ "@tsed/cli-core": "workspace:*", "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", - "typescript": "4.9.5", + "typescript": "5.6.2", "vitest": "2.1.1" }, "dependencies": { diff --git a/packages/cli-plugin-jest/src/hooks/JestGenerateHook.ts b/packages/cli-plugin-jest/src/hooks/JestGenerateHook.ts index 1664e50ba..2a005c547 100644 --- a/packages/cli-plugin-jest/src/hooks/JestGenerateHook.ts +++ b/packages/cli-plugin-jest/src/hooks/JestGenerateHook.ts @@ -1,5 +1,5 @@ -import {GenerateCmdContext} from "@tsed/cli"; -import {Inject, Injectable, OnExec, SrcRendererService, Tasks} from "@tsed/cli-core"; +import type {GenerateCmdContext} from "@tsed/cli"; +import {Inject, Injectable, OnExec, SrcRendererService, type Tasks} from "@tsed/cli-core"; import normalizePath from "normalize-path"; import {TEMPLATE_DIR} from "../utils/templateDir.js"; diff --git a/packages/cli-plugin-mongoose/package.json b/packages/cli-plugin-mongoose/package.json index 97a6659dc..b5d4d5bd1 100644 --- a/packages/cli-plugin-mongoose/package.json +++ b/packages/cli-plugin-mongoose/package.json @@ -30,7 +30,7 @@ "@tsed/cli-core": "workspace:*", "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", - "typescript": "4.9.5", + "typescript": "5.6.2", "vitest": "2.1.1" } } diff --git a/packages/cli-plugin-mongoose/src/hooks/MongooseGenerateHook.ts b/packages/cli-plugin-mongoose/src/hooks/MongooseGenerateHook.ts index 482e4049a..b8047fbac 100644 --- a/packages/cli-plugin-mongoose/src/hooks/MongooseGenerateHook.ts +++ b/packages/cli-plugin-mongoose/src/hooks/MongooseGenerateHook.ts @@ -1,5 +1,5 @@ -import {GenerateCmdContext, ProvidersInfoService} from "@tsed/cli"; -import {CliDockerComposeYaml, Inject, OnExec, ProjectPackageJson, SrcRendererService, Tasks} from "@tsed/cli-core"; +import {type GenerateCmdContext, ProvidersInfoService} from "@tsed/cli"; +import {CliDockerComposeYaml, Inject, OnExec, ProjectPackageJson, SrcRendererService, type Tasks} from "@tsed/cli-core"; import {Injectable} from "@tsed/di"; import {camelCase, paramCase} from "change-case"; // @ts-ignore diff --git a/packages/cli-plugin-mongoose/src/hooks/MongooseInitHook.ts b/packages/cli-plugin-mongoose/src/hooks/MongooseInitHook.ts index dc916cc4b..53f680abb 100644 --- a/packages/cli-plugin-mongoose/src/hooks/MongooseInitHook.ts +++ b/packages/cli-plugin-mongoose/src/hooks/MongooseInitHook.ts @@ -1,4 +1,4 @@ -import {InitCmdContext} from "@tsed/cli"; +import type {InitCmdContext} from "@tsed/cli"; import {CliDockerComposeYaml, Inject, OnExec, ProjectPackageJson, RootRendererService, SrcRendererService} from "@tsed/cli-core"; import {Injectable} from "@tsed/di"; diff --git a/packages/cli-plugin-oidc-provider/package.json b/packages/cli-plugin-oidc-provider/package.json index 998538245..3aedf0075 100644 --- a/packages/cli-plugin-oidc-provider/package.json +++ b/packages/cli-plugin-oidc-provider/package.json @@ -32,7 +32,7 @@ "@tsed/cli-core": "workspace:*", "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", - "typescript": "4.9.5", + "typescript": "5.6.2", "vitest": "2.1.1" }, "peerDependencies": { diff --git a/packages/cli-plugin-oidc-provider/src/hooks/OidcProviderInitHook.ts b/packages/cli-plugin-oidc-provider/src/hooks/OidcProviderInitHook.ts index c0d114ae8..6d6c6b182 100644 --- a/packages/cli-plugin-oidc-provider/src/hooks/OidcProviderInitHook.ts +++ b/packages/cli-plugin-oidc-provider/src/hooks/OidcProviderInitHook.ts @@ -1,4 +1,4 @@ -import {InitCmdContext} from "@tsed/cli"; +import type {InitCmdContext} from "@tsed/cli"; import {CliDockerComposeYaml, Inject, OnExec, ProjectPackageJson, RootRendererService, SrcRendererService} from "@tsed/cli-core"; import {Injectable} from "@tsed/di"; diff --git a/packages/cli-plugin-oidc-provider/templates/tsconfig.json b/packages/cli-plugin-oidc-provider/templates/tsconfig.json new file mode 100644 index 000000000..201757253 --- /dev/null +++ b/packages/cli-plugin-oidc-provider/templates/tsconfig.json @@ -0,0 +1,8 @@ +{ + "extends": "@tsed/typescript/tsconfig.node.json", + "compilerOptions": { + "noEmit": true, + "noEmitOnError": true + }, + "include": ["init/**/*.ts"] +} diff --git a/packages/cli-plugin-passport/package.json b/packages/cli-plugin-passport/package.json index e781abfae..8d9ebdcc0 100644 --- a/packages/cli-plugin-passport/package.json +++ b/packages/cli-plugin-passport/package.json @@ -30,7 +30,7 @@ "@tsed/typescript": "workspace:*", "@types/change-case": "^2.3.1", "cross-env": "7.0.3", - "typescript": "4.9.5", + "typescript": "5.6.2", "vitest": "2.1.1" } } diff --git a/packages/cli-plugin-passport/src/hooks/PassportGenerateHook.ts b/packages/cli-plugin-passport/src/hooks/PassportGenerateHook.ts index 743c8932f..c38ac2881 100644 --- a/packages/cli-plugin-passport/src/hooks/PassportGenerateHook.ts +++ b/packages/cli-plugin-passport/src/hooks/PassportGenerateHook.ts @@ -1,5 +1,5 @@ -import {GenerateCmdContext, ProvidersInfoService} from "@tsed/cli"; -import {Inject, OnExec, OnPrompt, ProjectPackageJson, SrcRendererService, Tasks} from "@tsed/cli-core"; +import {type GenerateCmdContext, ProvidersInfoService} from "@tsed/cli"; +import {Inject, OnExec, OnPrompt, ProjectPackageJson, SrcRendererService, type Tasks} from "@tsed/cli-core"; import {Injectable} from "@tsed/di"; import {paramCase} from "change-case"; diff --git a/packages/cli-plugin-prisma/package.json b/packages/cli-plugin-prisma/package.json index dda720419..8b7defdd2 100644 --- a/packages/cli-plugin-prisma/package.json +++ b/packages/cli-plugin-prisma/package.json @@ -29,7 +29,7 @@ "@tsed/cli-core": "workspace:*", "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", - "typescript": "4.9.5", + "typescript": "5.6.2", "vitest": "2.1.1" } } diff --git a/packages/cli-plugin-prisma/src/commands/PrismaCmd.ts b/packages/cli-plugin-prisma/src/commands/PrismaCmd.ts index 0c9b6ace2..447afb32b 100644 --- a/packages/cli-plugin-prisma/src/commands/PrismaCmd.ts +++ b/packages/cli-plugin-prisma/src/commands/PrismaCmd.ts @@ -1,4 +1,4 @@ -import {CliDefaultOptions, Command, CommandProvider, Inject} from "@tsed/cli-core"; +import {type CliDefaultOptions, Command, type CommandProvider, Inject} from "@tsed/cli-core"; import {CliPrisma} from "../services/CliPrisma.js"; diff --git a/packages/cli-plugin-prisma/src/hooks/PrismaInitHook.ts b/packages/cli-plugin-prisma/src/hooks/PrismaInitHook.ts index c49bffef6..48aa0172f 100644 --- a/packages/cli-plugin-prisma/src/hooks/PrismaInitHook.ts +++ b/packages/cli-plugin-prisma/src/hooks/PrismaInitHook.ts @@ -1,4 +1,4 @@ -import {InitCmdContext} from "@tsed/cli"; +import type {InitCmdContext} from "@tsed/cli"; import {CliService, Inject, OnExec, PackageManagersModule, ProjectPackageJson} from "@tsed/cli-core"; import {Injectable} from "@tsed/di"; diff --git a/packages/cli-plugin-typegraphql/package.json b/packages/cli-plugin-typegraphql/package.json index afb58cc0b..83ed1b965 100644 --- a/packages/cli-plugin-typegraphql/package.json +++ b/packages/cli-plugin-typegraphql/package.json @@ -32,7 +32,7 @@ "@tsed/cli-core": "workspace:*", "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", - "typescript": "4.9.5", + "typescript": "5.6.2", "vitest": "2.1.1" }, "peerDependencies": { diff --git a/packages/cli-plugin-typegraphql/src/hooks/TypeGraphqlInitHook.ts b/packages/cli-plugin-typegraphql/src/hooks/TypeGraphqlInitHook.ts index 2453b7ef6..d4be0a1a6 100644 --- a/packages/cli-plugin-typegraphql/src/hooks/TypeGraphqlInitHook.ts +++ b/packages/cli-plugin-typegraphql/src/hooks/TypeGraphqlInitHook.ts @@ -1,4 +1,4 @@ -import {InitCmdContext} from "@tsed/cli"; +import type {InitCmdContext} from "@tsed/cli"; import {Inject, OnExec, ProjectPackageJson, RootRendererService, SrcRendererService} from "@tsed/cli-core"; import {Injectable} from "@tsed/di"; diff --git a/packages/cli-plugin-typeorm/package.json b/packages/cli-plugin-typeorm/package.json index e2f74c34a..aec1cd3eb 100644 --- a/packages/cli-plugin-typeorm/package.json +++ b/packages/cli-plugin-typeorm/package.json @@ -29,7 +29,7 @@ "@tsed/cli-core": "workspace:*", "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", - "typescript": "4.9.5", + "typescript": "5.6.2", "vitest": "2.1.1" } } diff --git a/packages/cli-plugin-typeorm/src/hooks/TypeORMGenerateHook.ts b/packages/cli-plugin-typeorm/src/hooks/TypeORMGenerateHook.ts index 40c3c39ff..e4e11bdbc 100644 --- a/packages/cli-plugin-typeorm/src/hooks/TypeORMGenerateHook.ts +++ b/packages/cli-plugin-typeorm/src/hooks/TypeORMGenerateHook.ts @@ -1,5 +1,5 @@ -import {FeaturesMap, GenerateCmdContext, ProvidersInfoService} from "@tsed/cli"; -import {CliDockerComposeYaml, Inject, OnExec, OnPrompt, ProjectPackageJson, SrcRendererService, Tasks} from "@tsed/cli-core"; +import {FeaturesMap, type GenerateCmdContext, ProvidersInfoService} from "@tsed/cli"; +import {CliDockerComposeYaml, Inject, OnExec, OnPrompt, ProjectPackageJson, SrcRendererService, type Tasks} from "@tsed/cli-core"; import {Injectable} from "@tsed/di"; import {camelCase} from "change-case"; diff --git a/packages/cli-plugin-typeorm/src/hooks/TypeORMInitHook.ts b/packages/cli-plugin-typeorm/src/hooks/TypeORMInitHook.ts index 71fa01495..7a6b8aadd 100644 --- a/packages/cli-plugin-typeorm/src/hooks/TypeORMInitHook.ts +++ b/packages/cli-plugin-typeorm/src/hooks/TypeORMInitHook.ts @@ -1,4 +1,4 @@ -import {InitCmdContext} from "@tsed/cli"; +import type {InitCmdContext} from "@tsed/cli"; import { CliDockerComposeYaml, CliService, diff --git a/packages/cli-plugin-vitest/package.json b/packages/cli-plugin-vitest/package.json index 521fe23f9..d9f769e51 100644 --- a/packages/cli-plugin-vitest/package.json +++ b/packages/cli-plugin-vitest/package.json @@ -25,7 +25,7 @@ "@tsed/cli-core": "workspace:*", "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", - "typescript": "4.9.5", + "typescript": "5.6.2", "vitest": "2.1.1" }, "dependencies": { diff --git a/packages/cli-plugin-vitest/src/hooks/VitestGenerateHook.ts b/packages/cli-plugin-vitest/src/hooks/VitestGenerateHook.ts index bb392d77a..cc5af6e58 100644 --- a/packages/cli-plugin-vitest/src/hooks/VitestGenerateHook.ts +++ b/packages/cli-plugin-vitest/src/hooks/VitestGenerateHook.ts @@ -1,5 +1,5 @@ -import {GenerateCmdContext} from "@tsed/cli"; -import {Inject, Injectable, OnExec, SrcRendererService, Tasks} from "@tsed/cli-core"; +import type {GenerateCmdContext} from "@tsed/cli"; +import {Inject, Injectable, OnExec, SrcRendererService, type Tasks} from "@tsed/cli-core"; import normalizePath from "normalize-path"; import {TEMPLATE_DIR} from "../utils/templateDir.js"; diff --git a/packages/cli-testing/package.json b/packages/cli-testing/package.json index b9b277881..bfffd563f 100644 --- a/packages/cli-testing/package.json +++ b/packages/cli-testing/package.json @@ -35,7 +35,7 @@ "devDependencies": { "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", - "typescript": "4.9.5", + "typescript": "5.6.2", "vitest": "2.1.1" } } diff --git a/packages/cli-testing/src/CliPlatformTest.ts b/packages/cli-testing/src/CliPlatformTest.ts index cf978ff37..6a572e522 100644 --- a/packages/cli-testing/src/CliPlatformTest.ts +++ b/packages/cli-testing/src/CliPlatformTest.ts @@ -11,7 +11,7 @@ import { InjectorService, ProjectPackageJson, resolveConfiguration, - TokenProvider + type TokenProvider } from "@tsed/cli-core"; import {Type} from "@tsed/core"; import {DIContext, runInContext} from "@tsed/di"; diff --git a/packages/cli-testing/src/FakeCliFs.ts b/packages/cli-testing/src/FakeCliFs.ts index b230167c7..37ff6026c 100644 --- a/packages/cli-testing/src/FakeCliFs.ts +++ b/packages/cli-testing/src/FakeCliFs.ts @@ -1,7 +1,7 @@ import {isString} from "@tsed/core"; +import type {PathLike} from "fs"; import * as fs from "fs"; -import {PathLike} from "fs"; -import {EnsureOptions, WriteFileOptions} from "fs-extra"; +import type {EnsureOptions, WriteFileOptions} from "fs-extra"; import {normalizePath} from "./normalizePath.js"; diff --git a/packages/cli-testing/src/FakeCliHttpClient.ts b/packages/cli-testing/src/FakeCliHttpClient.ts index 9ba2274fe..f8da43549 100644 --- a/packages/cli-testing/src/FakeCliHttpClient.ts +++ b/packages/cli-testing/src/FakeCliHttpClient.ts @@ -1,5 +1,5 @@ -import {CliHttpClient, CliHttpClientOptions} from "@tsed/cli-core"; -import {OnDestroy} from "@tsed/di"; +import {CliHttpClient, type CliHttpClientOptions} from "@tsed/cli-core"; +import type {OnDestroy} from "@tsed/di"; export class FakeCliHttpClient extends CliHttpClient implements OnDestroy { static entries = new Map(); diff --git a/packages/cli/package.json b/packages/cli/package.json index 56e2ab01d..9e5a38bc1 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -84,7 +84,7 @@ "@tsed/typescript": "workspace:*", "@types/change-case": "^2.3.1", "cross-env": "7.0.3", - "typescript": "4.9.5", + "typescript": "5.6.2", "vitest": "2.1.1" }, "peerDependencies": { diff --git a/packages/cli/src/commands/add/AddCmd.ts b/packages/cli/src/commands/add/AddCmd.ts index f5c01ffa4..400f2d3ef 100644 --- a/packages/cli/src/commands/add/AddCmd.ts +++ b/packages/cli/src/commands/add/AddCmd.ts @@ -1,13 +1,13 @@ import { - CliDefaultOptions, + type CliDefaultOptions, CliPlugins, Command, - CommandProvider, + type CommandProvider, createSubTasks, PackageManagersModule, ProjectPackageJson, - QuestionOptions, - Task + type QuestionOptions, + type Task } from "@tsed/cli-core"; import {Inject} from "@tsed/di"; diff --git a/packages/cli/src/commands/generate/GenerateCmd.ts b/packages/cli/src/commands/generate/GenerateCmd.ts index 7db033878..a0facc82a 100644 --- a/packages/cli/src/commands/generate/GenerateCmd.ts +++ b/packages/cli/src/commands/generate/GenerateCmd.ts @@ -1,4 +1,4 @@ -import {CliDefaultOptions, Command, CommandProvider, Inject, ProjectPackageJson, SrcRendererService} from "@tsed/cli-core"; +import {type CliDefaultOptions, Command, type CommandProvider, Inject, ProjectPackageJson, SrcRendererService} from "@tsed/cli-core"; import {paramCase, pascalCase} from "change-case"; import globby from "globby"; import normalizePath from "normalize-path"; diff --git a/packages/cli/src/commands/init/InitCmd.ts b/packages/cli/src/commands/init/InitCmd.ts index 7ed08a188..f9aa51b42 100644 --- a/packages/cli/src/commands/init/InitCmd.ts +++ b/packages/cli/src/commands/init/InitCmd.ts @@ -6,7 +6,7 @@ import { CliPlugins, CliService, Command, - CommandProvider, + type CommandProvider, Configuration, createSubTasks, createTasksRunner, @@ -14,9 +14,9 @@ import { PackageManager, PackageManagersModule, ProjectPackageJson, - QuestionOptions, + type QuestionOptions, RootRendererService, - Task + type Task } from "@tsed/cli-core"; import {paramCase, pascalCase} from "change-case"; import {basename, join} from "path"; @@ -33,8 +33,8 @@ import {NodeRuntime} from "../../runtimes/supports/NodeRuntime.js"; import {fillImports} from "../../utils/fillImports.js"; import {FeaturesMap, FeatureType} from "./config/FeaturesPrompt.js"; import {InitFileSchema} from "./config/InitFileSchema.js"; -import {InitCmdContext} from "./interfaces/InitCmdContext.js"; -import {InitOptions} from "./interfaces/InitOptions.js"; +import type {InitCmdContext} from "./interfaces/InitCmdContext.js"; +import type {InitOptions} from "./interfaces/InitOptions.js"; import {mapToContext} from "./mappers/mapToContext.js"; import {getFeaturesPrompt} from "./prompts/getFeaturesPrompt.js"; diff --git a/packages/cli/src/commands/init/config/FeaturesPrompt.ts b/packages/cli/src/commands/init/config/FeaturesPrompt.ts index b02afbedd..f972d9e7b 100644 --- a/packages/cli/src/commands/init/config/FeaturesPrompt.ts +++ b/packages/cli/src/commands/init/config/FeaturesPrompt.ts @@ -1,5 +1,5 @@ import {ArchitectureConvention, PlatformType, ProjectConvention} from "../../../interfaces/index.js"; -import {InitOptions} from "../interfaces/InitOptions.js"; +import type {InitOptions} from "../interfaces/InitOptions.js"; import {hasFeature, hasValue} from "../utils/hasFeature.js"; import {isPlatform} from "../utils/isPlatform.js"; diff --git a/packages/cli/src/commands/init/interfaces/InitCmdContext.ts b/packages/cli/src/commands/init/interfaces/InitCmdContext.ts index e14921319..39f4e466e 100644 --- a/packages/cli/src/commands/init/interfaces/InitCmdContext.ts +++ b/packages/cli/src/commands/init/interfaces/InitCmdContext.ts @@ -1,6 +1,6 @@ -import {CliDefaultOptions} from "@tsed/cli-core"; +import type {CliDefaultOptions} from "@tsed/cli-core"; -import {InitOptions} from "./InitOptions.js"; +import type {InitOptions} from "./InitOptions.js"; export interface InitCmdContext extends InitOptions, CliDefaultOptions, Record { root: string; diff --git a/packages/cli/src/commands/init/mappers/mapToContext.ts b/packages/cli/src/commands/init/mappers/mapToContext.ts index fc2d041e8..589bbb456 100644 --- a/packages/cli/src/commands/init/mappers/mapToContext.ts +++ b/packages/cli/src/commands/init/mappers/mapToContext.ts @@ -1,6 +1,6 @@ import {camelCase} from "change-case"; -import {InitCmdContext} from "../interfaces/InitCmdContext.js"; +import type {InitCmdContext} from "../interfaces/InitCmdContext.js"; import {mapUniqFeatures} from "./mapUniqFeatures.js"; export function mapToContext(options: any): InitCmdContext { diff --git a/packages/cli/src/commands/init/mappers/mapUniqFeatures.ts b/packages/cli/src/commands/init/mappers/mapUniqFeatures.ts index 681abcb97..2f85f8078 100644 --- a/packages/cli/src/commands/init/mappers/mapUniqFeatures.ts +++ b/packages/cli/src/commands/init/mappers/mapUniqFeatures.ts @@ -1,6 +1,6 @@ import {FeatureType} from "../config/FeaturesPrompt.js"; -import {InitOptions} from "../interfaces/InitOptions.js"; -import {InitPromptAnswers} from "../interfaces/InitPromptAnswers.js"; +import type {InitOptions} from "../interfaces/InitOptions.js"; +import type {InitPromptAnswers} from "../interfaces/InitPromptAnswers.js"; export function mapUniqFeatures(answers: InitPromptAnswers & any): InitOptions { const features: string[] = []; diff --git a/packages/cli/src/commands/init/prompts/getFeaturesPrompt.ts b/packages/cli/src/commands/init/prompts/getFeaturesPrompt.ts index 52406afcc..74347016a 100644 --- a/packages/cli/src/commands/init/prompts/getFeaturesPrompt.ts +++ b/packages/cli/src/commands/init/prompts/getFeaturesPrompt.ts @@ -1,7 +1,7 @@ import {cleanObject, isFunction} from "@tsed/core"; import {FeaturesMap, FeaturesPrompt} from "../config/FeaturesPrompt.js"; -import {InitOptions} from "../interfaces/InitOptions.js"; +import type {InitOptions} from "../interfaces/InitOptions.js"; function mapChoices(item: any, options: Partial) { return item.choices.map((choice: string) => { diff --git a/packages/cli/src/commands/run/RunCmd.ts b/packages/cli/src/commands/run/RunCmd.ts index e49f5a839..81aeb8fad 100644 --- a/packages/cli/src/commands/run/RunCmd.ts +++ b/packages/cli/src/commands/run/RunCmd.ts @@ -1,6 +1,5 @@ -import {CliFs, CliRunScript, Command, CommandProvider, normalizePath, ProjectPackageJson, Tasks} from "@tsed/cli-core"; +import {CliFs, CliRunScript, Command, type CommandProvider, normalizePath, ProjectPackageJson, type Tasks} from "@tsed/cli-core"; import {Inject} from "@tsed/di"; -import {join} from "path"; export interface RunCmdContext { production: boolean; diff --git a/packages/cli/src/commands/update/UpdateCmd.ts b/packages/cli/src/commands/update/UpdateCmd.ts index 2fb9aadea..112f1deff 100644 --- a/packages/cli/src/commands/update/UpdateCmd.ts +++ b/packages/cli/src/commands/update/UpdateCmd.ts @@ -1,15 +1,15 @@ import { - CliDefaultOptions, + type CliDefaultOptions, CliPackageJson, Command, - CommandProvider, + type CommandProvider, createSubTasks, Inject, NpmRegistryClient, PackageManagersModule, ProjectPackageJson, - QuestionOptions, - Task + type QuestionOptions, + type Task } from "@tsed/cli-core"; import {getValue} from "@tsed/core"; import semver from "semver"; diff --git a/packages/cli/src/platforms/InitPlatformsModule.ts b/packages/cli/src/platforms/InitPlatformsModule.ts index 1e855f34a..624ea0d43 100644 --- a/packages/cli/src/platforms/InitPlatformsModule.ts +++ b/packages/cli/src/platforms/InitPlatformsModule.ts @@ -1,7 +1,7 @@ import {Inject} from "@tsed/cli-core"; import {Module} from "@tsed/di"; -import {InitBasePlatform} from "./supports/InitBasePlatform.js"; +import type {InitBasePlatform} from "./supports/InitBasePlatform.js"; import {InitExpressPlatform} from "./supports/InitExpressPlatform.js"; import {InitKoaPlatform} from "./supports/InitKoaPlatform.js"; diff --git a/packages/cli/src/platforms/supports/InitExpressPlatform.ts b/packages/cli/src/platforms/supports/InitExpressPlatform.ts index cce8ad8d7..285f53dc0 100644 --- a/packages/cli/src/platforms/supports/InitExpressPlatform.ts +++ b/packages/cli/src/platforms/supports/InitExpressPlatform.ts @@ -1,6 +1,6 @@ import {Injectable} from "@tsed/cli-core"; -import {InitBasePlatform} from "./InitBasePlatform.js"; +import type {InitBasePlatform} from "./InitBasePlatform.js"; @Injectable({ type: "platform:init" diff --git a/packages/cli/src/platforms/supports/InitKoaPlatform.ts b/packages/cli/src/platforms/supports/InitKoaPlatform.ts index b1e0fdc01..7706625f6 100644 --- a/packages/cli/src/platforms/supports/InitKoaPlatform.ts +++ b/packages/cli/src/platforms/supports/InitKoaPlatform.ts @@ -1,6 +1,6 @@ import {Injectable} from "@tsed/cli-core"; -import {InitBasePlatform} from "./InitBasePlatform.js"; +import type {InitBasePlatform} from "./InitBasePlatform.js"; @Injectable({ type: "platform:init" diff --git a/tools/typescript/tsconfig.node.json b/tools/typescript/tsconfig.node.json index 17a1ccf23..ec87644ed 100644 --- a/tools/typescript/tsconfig.node.json +++ b/tools/typescript/tsconfig.node.json @@ -23,6 +23,7 @@ "declaration": false, "noResolve": false, "preserveConstEnums": true, + "verbatimModuleSyntax": true, "sourceMap": true, "noEmit": true } diff --git a/yarn.lock b/yarn.lock index c885c0344..312b8f972 100644 --- a/yarn.lock +++ b/yarn.lock @@ -641,15 +641,6 @@ __metadata: languageName: node linkType: hard -"@jest/schemas@npm:^28.1.3": - version: 28.1.3 - resolution: "@jest/schemas@npm:28.1.3" - dependencies: - "@sinclair/typebox": "npm:^0.24.1" - checksum: 10/3cf1d4b66c9c4ffda58b246de1ddcba8e6ad085af63dccdf07922511f13b68c0cc480a7bc620cb4f3099a6f134801c747e1df7bfc7a4ef4dceefbdea3e31e1de - languageName: node - linkType: hard - "@jest/schemas@npm:^29.6.3": version: 29.6.3 resolution: "@jest/schemas@npm:29.6.3" @@ -659,20 +650,6 @@ __metadata: languageName: node linkType: hard -"@jest/types@npm:^28.1.1": - version: 28.1.3 - resolution: "@jest/types@npm:28.1.3" - dependencies: - "@jest/schemas": "npm:^28.1.3" - "@types/istanbul-lib-coverage": "npm:^2.0.0" - "@types/istanbul-reports": "npm:^3.0.0" - "@types/node": "npm:*" - "@types/yargs": "npm:^17.0.8" - chalk: "npm:^4.0.0" - checksum: 10/a90e636df760799b6c3d91e34e539e701ea803e80312257e674e345a3c23a7c892df7a301afbc7883ec1d623daf3ba266cde57c5965e0692e5f1e61915d3524b - languageName: node - linkType: hard - "@jridgewell/gen-mapping@npm:^0.3.5": version: 0.3.5 resolution: "@jridgewell/gen-mapping@npm:0.3.5" @@ -684,14 +661,7 @@ __metadata: languageName: node linkType: hard -"@jridgewell/resolve-uri@npm:^3.0.3": - version: 3.0.5 - resolution: "@jridgewell/resolve-uri@npm:3.0.5" - checksum: 10/66da0c14dfaebd3481ac363306eefa45aca6779f8635df7337b97c18873853a7e2946d79104fad3e2ab832fe438ebabcaa2091e55e069a81b35001fa6738f532 - languageName: node - linkType: hard - -"@jridgewell/resolve-uri@npm:^3.1.0": +"@jridgewell/resolve-uri@npm:^3.0.3, @jridgewell/resolve-uri@npm:^3.1.0": version: 3.1.2 resolution: "@jridgewell/resolve-uri@npm:3.1.2" checksum: 10/97106439d750a409c22c8bff822d648f6a71f3aa9bc8e5129efdc36343cd3096ddc4eeb1c62d2fe48e9bdd4db37b05d4646a17114ecebd3bbcacfa2de51c3c1d @@ -2069,13 +2039,6 @@ __metadata: languageName: node linkType: hard -"@sinclair/typebox@npm:^0.24.1": - version: 0.24.31 - resolution: "@sinclair/typebox@npm:0.24.31" - checksum: 10/2651ff281d964c03bc084a70d794a087b7844b8ad5eecdd4bca5af5798cb7cf7e07c396153365c7d19d37308766695ff5e23d9852605b49e89f0c5a49cbe7975 - languageName: node - linkType: hard - "@sinclair/typebox@npm:^0.27.8": version: 0.27.8 resolution: "@sinclair/typebox@npm:0.27.8" @@ -2118,42 +2081,6 @@ __metadata: languageName: node linkType: hard -"@sinonjs/commons@npm:^1.6.0, @sinonjs/commons@npm:^1.7.0, @sinonjs/commons@npm:^1.8.3": - version: 1.8.3 - resolution: "@sinonjs/commons@npm:1.8.3" - dependencies: - type-detect: "npm:4.0.8" - checksum: 10/910720ef0a5465474a593b4f48d39b67ca7f1a3962475e85d67ed8a13194e3c16b9bfe21081b51c66b631d649376fce0efd5a7c74066d3fe6fcda2729829af1f - languageName: node - linkType: hard - -"@sinonjs/fake-timers@npm:>=5, @sinonjs/fake-timers@npm:^9.1.2": - version: 9.1.2 - resolution: "@sinonjs/fake-timers@npm:9.1.2" - dependencies: - "@sinonjs/commons": "npm:^1.7.0" - checksum: 10/033c74ad389b0655b6af2fa1af31dddf45878e65879f06c5d1940e0ceb053a234f2f46c728dcd97df8ee9312431e45dd7aedaee3a69d47f73a2001a7547fc3d6 - languageName: node - linkType: hard - -"@sinonjs/samsam@npm:^6.1.1": - version: 6.1.1 - resolution: "@sinonjs/samsam@npm:6.1.1" - dependencies: - "@sinonjs/commons": "npm:^1.6.0" - lodash.get: "npm:^4.4.2" - type-detect: "npm:^4.0.8" - checksum: 10/19375e6613db537f103cdc89c554f4c1b1550a7dc255a438792e7c3e6d751a9c43775871f72f48bdc7429418c9f7f8758fba6d512820a376b6c13f1ce57378e3 - languageName: node - linkType: hard - -"@sinonjs/text-encoding@npm:^0.7.1": - version: 0.7.1 - resolution: "@sinonjs/text-encoding@npm:0.7.1" - checksum: 10/1340c707f210fb7171c429e47006e7b25da275e11235d53fe08d5d0f0c37cf9ecc1896a3326deea28b6a2a6a7fd38056593c75f5741c0840526337589cdfcbf0 - languageName: node - linkType: hard - "@swc-node/core@npm:^1.13.3": version: 1.13.3 resolution: "@swc-node/core@npm:1.13.3" @@ -2350,30 +2277,30 @@ __metadata: linkType: hard "@tsconfig/node10@npm:^1.0.7": - version: 1.0.8 - resolution: "@tsconfig/node10@npm:1.0.8" - checksum: 10/b8d5fffbc6b17ef64ef74f7fdbccee02a809a063ade785c3648dae59406bc207f70ea2c4296f92749b33019fa36a5ae716e42e49cc7f1bbf0fd147be0d6b970a + version: 1.0.11 + resolution: "@tsconfig/node10@npm:1.0.11" + checksum: 10/51fe47d55fe1b80ec35e6e5ed30a13665fd3a531945350aa74a14a1e82875fb60b350c2f2a5e72a64831b1b6bc02acb6760c30b3738b54954ec2dea82db7a267 languageName: node linkType: hard "@tsconfig/node12@npm:^1.0.7": - version: 1.0.9 - resolution: "@tsconfig/node12@npm:1.0.9" - checksum: 10/a01b2400ab3582b86b589c6d31dcd0c0656f333adecde85d6d7d4086adb059808b82692380bb169546d189bf771ae21d02544a75b57bd6da4a5dd95f8567bec9 + version: 1.0.11 + resolution: "@tsconfig/node12@npm:1.0.11" + checksum: 10/5ce29a41b13e7897a58b8e2df11269c5395999e588b9a467386f99d1d26f6c77d1af2719e407621412520ea30517d718d5192a32403b8dfcc163bf33e40a338a languageName: node linkType: hard "@tsconfig/node14@npm:^1.0.0": - version: 1.0.1 - resolution: "@tsconfig/node14@npm:1.0.1" - checksum: 10/976345e896c0f059867f94f8d0f6ddb8b1844fb62bf36b727de8a9a68f024857e5db97ed51d3325e23e0616a5e48c034ff51a8d595b3fe7e955f3587540489be + version: 1.0.3 + resolution: "@tsconfig/node14@npm:1.0.3" + checksum: 10/19275fe80c4c8d0ad0abed6a96dbf00642e88b220b090418609c4376e1cef81bf16237bf170ad1b341452feddb8115d8dd2e5acdfdea1b27422071163dc9ba9d languageName: node linkType: hard "@tsconfig/node16@npm:^1.0.2": - version: 1.0.2 - resolution: "@tsconfig/node16@npm:1.0.2" - checksum: 10/ca94d3639714672bbfd55f03521d3f56bb6a25479bd425da81faf21f13e1e9d15f40f97377dedbbf477a5841c5b0c8f4cd1b391f33553d750b9202c54c2c07aa + version: 1.0.4 + resolution: "@tsconfig/node16@npm:1.0.4" + checksum: 10/202319785901f942a6e1e476b872d421baec20cf09f4b266a1854060efbf78cde16a4d256e8bc949d31e6cd9a90f1e8ef8fb06af96a65e98338a2b6b0de0a0ff languageName: node linkType: hard @@ -2438,7 +2365,7 @@ __metadata: split: "npm:1.0.1" tslib: "npm:2.3.1" tunnel: "npm:0.0.6" - typescript: "npm:4.9.5" + typescript: "npm:5.6.2" update-notifier: "npm:7.3.1" url-parse: "npm:1.5.10" uuid: "npm:^8.3.2" @@ -2460,7 +2387,7 @@ __metadata: cross-env: "npm:7.0.3" swagger-typescript-api: "npm:^9.3.1" tslib: "npm:2.3.1" - typescript: "npm:4.9.5" + typescript: "npm:5.6.2" vitest: "npm:2.1.1" peerDependencies: "@tsed/common": ">=7.14.2" @@ -2484,7 +2411,7 @@ __metadata: change-case: "npm:4.1.2" cross-env: "npm:7.0.3" tslib: "npm:2.3.1" - typescript: "npm:4.9.5" + typescript: "npm:5.6.2" vitest: "npm:2.1.1" peerDependencies: "@tsed/common": ">=7.14.2" @@ -2506,7 +2433,7 @@ __metadata: "@tsed/typescript": "workspace:*" cross-env: "npm:7.0.3" tslib: "npm:2.3.1" - typescript: "npm:4.9.5" + typescript: "npm:5.6.2" vitest: "npm:2.1.1" languageName: unknown linkType: soft @@ -2520,7 +2447,7 @@ __metadata: "@tsed/typescript": "workspace:*" cross-env: "npm:7.0.3" tslib: "npm:2.3.1" - typescript: "npm:4.9.5" + typescript: "npm:5.6.2" vitest: "npm:2.1.1" languageName: unknown linkType: soft @@ -2536,7 +2463,7 @@ __metadata: cross-env: "npm:7.0.3" pluralize: "npm:8.0.0" tslib: "npm:2.3.1" - typescript: "npm:4.9.5" + typescript: "npm:5.6.2" vitest: "npm:2.1.1" languageName: unknown linkType: soft @@ -2550,7 +2477,7 @@ __metadata: "@tsed/typescript": "workspace:*" cross-env: "npm:7.0.3" tslib: "npm:2.3.1" - typescript: "npm:4.9.5" + typescript: "npm:5.6.2" vitest: "npm:2.1.1" peerDependencies: "@tsed/cli": "workspace:*" @@ -2569,7 +2496,7 @@ __metadata: change-case: "npm:^4.1.2" cross-env: "npm:7.0.3" tslib: "npm:2.3.1" - typescript: "npm:4.9.5" + typescript: "npm:5.6.2" vitest: "npm:2.1.1" languageName: unknown linkType: soft @@ -2584,7 +2511,7 @@ __metadata: change-case: "npm:4.1.2" cross-env: "npm:7.0.3" tslib: "npm:2.3.1" - typescript: "npm:4.9.5" + typescript: "npm:5.6.2" vitest: "npm:2.1.1" languageName: unknown linkType: soft @@ -2598,7 +2525,7 @@ __metadata: "@tsed/typescript": "workspace:*" cross-env: "npm:7.0.3" tslib: "npm:2.3.1" - typescript: "npm:4.9.5" + typescript: "npm:5.6.2" vitest: "npm:2.1.1" peerDependencies: "@tsed/cli": "workspace:*" @@ -2616,7 +2543,7 @@ __metadata: change-case: "npm:4.1.2" cross-env: "npm:7.0.3" tslib: "npm:2.3.1" - typescript: "npm:4.9.5" + typescript: "npm:5.6.2" vitest: "npm:2.1.1" languageName: unknown linkType: soft @@ -2630,7 +2557,7 @@ __metadata: "@tsed/typescript": "workspace:*" cross-env: "npm:7.0.3" tslib: "npm:2.3.1" - typescript: "npm:4.9.5" + typescript: "npm:5.6.2" vitest: "npm:2.1.1" languageName: unknown linkType: soft @@ -2691,14 +2618,10 @@ __metadata: semantic-release: "npm:24.1.1" semantic-release-slack-bot: "npm:4.0.2" semver: "npm:7.3.5" - sinon: "npm:14.0.0" - sinon-chai: "npm:3.7.0" split: "npm:1.0.1" - ts-jest: "npm:28.0.8" - ts-node: "npm:10.9.1" - tsconfig-paths: "npm:4.1.2" + ts-node: "npm:^10.9.2" tslib: "npm:2.3.1" - typescript: "npm:4.9.5" + typescript: "npm:5.6.2" unplugin-swc: "npm:^1.5.1" update-notifier: "npm:5.1.0" vitest: "npm:2.1.1" @@ -2713,7 +2636,7 @@ __metadata: "@tsed/typescript": "workspace:*" cross-env: "npm:7.0.3" tslib: "npm:2.3.1" - typescript: "npm:4.9.5" + typescript: "npm:5.6.2" vitest: "npm:2.1.1" languageName: unknown linkType: soft @@ -2742,7 +2665,7 @@ __metadata: read-pkg-up: "npm:7.0.1" semver: "npm:^7.3.5" tslib: "npm:2.3.1" - typescript: "npm:4.9.5" + typescript: "npm:5.6.2" vitest: "npm:2.1.1" peerDependencies: "@tsed/cli-core": "workspace:*" @@ -3050,31 +2973,6 @@ __metadata: languageName: node linkType: hard -"@types/istanbul-lib-coverage@npm:*, @types/istanbul-lib-coverage@npm:^2.0.0": - version: 2.0.4 - resolution: "@types/istanbul-lib-coverage@npm:2.0.4" - checksum: 10/a25d7589ee65c94d31464c16b72a9dc81dfa0bea9d3e105ae03882d616e2a0712a9c101a599ec482d297c3591e16336962878cb3eb1a0a62d5b76d277a890ce7 - languageName: node - linkType: hard - -"@types/istanbul-lib-report@npm:*": - version: 3.0.0 - resolution: "@types/istanbul-lib-report@npm:3.0.0" - dependencies: - "@types/istanbul-lib-coverage": "npm:*" - checksum: 10/f121dcac8a6b8184f3cab97286d8d519f1937fa8620ada5dbc43b699d602b8be289e4a4bccbd6ee1aade6869d3c9fb68bf04c6fdca8c5b0c4e7e314c31c7900a - languageName: node - linkType: hard - -"@types/istanbul-reports@npm:^3.0.0": - version: 3.0.1 - resolution: "@types/istanbul-reports@npm:3.0.1" - dependencies: - "@types/istanbul-lib-report": "npm:*" - checksum: 10/f1ad54bc68f37f60b30c7915886b92f86b847033e597f9b34f2415acdbe5ed742fa559a0a40050d74cdba3b6a63c342cac1f3a64dba5b68b66a6941f4abd7903 - languageName: node - linkType: hard - "@types/js-yaml@npm:4.0.5": version: 4.0.5 resolution: "@types/js-yaml@npm:4.0.5" @@ -3246,22 +3144,6 @@ __metadata: languageName: node linkType: hard -"@types/yargs-parser@npm:*": - version: 21.0.0 - resolution: "@types/yargs-parser@npm:21.0.0" - checksum: 10/c4caec730c1ee09466588389ba4ac83d85a01423c539b9565bb5b5a084bff3f4e47bfb7c06e963c0ef8d4929cf6fca0bc2923a33ef16727cdba60e95c8cdd0d0 - languageName: node - linkType: hard - -"@types/yargs@npm:^17.0.8": - version: 17.0.10 - resolution: "@types/yargs@npm:17.0.10" - dependencies: - "@types/yargs-parser": "npm:*" - checksum: 10/cfe94e8ba50364e08d7b3ecb10a7c153762d0e56c571079538bb06b306638d1045e395fc5a745b94519e73798779c761fa386ec13c82306a62349f64d7b9eec1 - languageName: node - linkType: hard - "@typescript-eslint/eslint-plugin@npm:8.5.0": version: 8.5.0 resolution: "@typescript-eslint/eslint-plugin@npm:8.5.0" @@ -3646,13 +3528,15 @@ __metadata: linkType: hard "acorn-walk@npm:^8.1.1": - version: 8.2.0 - resolution: "acorn-walk@npm:8.2.0" - checksum: 10/e69f7234f2adfeb16db3671429a7c80894105bd7534cb2032acf01bb26e6a847952d11a062d071420b43f8d82e33d2e57f26fe87d9cce0853e8143d8910ff1de + version: 8.3.4 + resolution: "acorn-walk@npm:8.3.4" + dependencies: + acorn: "npm:^8.11.0" + checksum: 10/871386764e1451c637bb8ab9f76f4995d408057e9909be6fb5ad68537ae3375d85e6a6f170b98989f44ab3ff6c74ad120bc2779a3d577606e7a0cd2b4efcaf77 languageName: node linkType: hard -"acorn@npm:^8.12.0, acorn@npm:^8.12.1": +"acorn@npm:^8.11.0, acorn@npm:^8.12.0, acorn@npm:^8.12.1, acorn@npm:^8.4.1": version: 8.12.1 resolution: "acorn@npm:8.12.1" bin: @@ -3661,15 +3545,6 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^8.4.1": - version: 8.8.0 - resolution: "acorn@npm:8.8.0" - bin: - acorn: bin/acorn - checksum: 10/ed7ee7ae42bcc8c22ce671ad44f7fc54d4341d0564d97d2e276530c9a77f3ccaf95fa29c13d67c3b1fd6049d069c24386fd703498102ad1fdd3243ddb8b30875 - languageName: node - linkType: hard - "add-stream@npm:^1.0.0": version: 1.0.0 resolution: "add-stream@npm:1.0.0" @@ -4651,15 +4526,6 @@ __metadata: languageName: node linkType: hard -"bs-logger@npm:0.x": - version: 0.2.6 - resolution: "bs-logger@npm:0.2.6" - dependencies: - fast-json-stable-stringify: "npm:2.x" - checksum: 10/e6d3ff82698bb3f20ce64fb85355c5716a3cf267f3977abe93bf9c32a2e46186b253f48a028ae5b96ab42bacd2c826766d9ae8cf6892f9b944656be9113cf212 - languageName: node - linkType: hard - "buffer-from@npm:^1.0.0": version: 1.1.2 resolution: "buffer-from@npm:1.1.2" @@ -6387,13 +6253,6 @@ __metadata: languageName: node linkType: hard -"diff@npm:^5.0.0": - version: 5.1.0 - resolution: "diff@npm:5.1.0" - checksum: 10/f4557032a98b2967fe27b1a91dfcf8ebb6b9a24b1afe616b5c2312465100b861e9b8d4da374be535f2d6b967ce2f53826d7f6edc2a0d32b2ab55abc96acc2f9d - languageName: node - linkType: hard - "diff@npm:^5.1.0": version: 5.2.0 resolution: "diff@npm:5.2.0" @@ -7341,7 +7200,7 @@ __metadata: languageName: node linkType: hard -"fast-json-stable-stringify@npm:2.x, fast-json-stable-stringify@npm:^2.0.0": +"fast-json-stable-stringify@npm:^2.0.0": version: 2.1.0 resolution: "fast-json-stable-stringify@npm:2.1.0" checksum: 10/2c20055c1fa43c922428f16ca8bb29f2807de63e5c851f665f7ac9790176c01c3b40335257736b299764a8d383388dabc73c8083b8e1bc3d99f0a941444ec60e @@ -8378,7 +8237,7 @@ __metadata: languageName: node linkType: hard -"graceful-fs@npm:4.2.10, graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.15, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.2.2, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9": +"graceful-fs@npm:4.2.10, graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.15, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.2.2, graceful-fs@npm:^4.2.6": version: 4.2.10 resolution: "graceful-fs@npm:4.2.10" checksum: 10/0c83c52b62c68a944dcfb9d66b0f9f10f7d6e3d081e8067b9bfdc9e5f3a8896584d576036f82915773189eec1eba599397fc620e75c03c0610fb3d67c6713c1a @@ -9794,13 +9653,6 @@ __metadata: languageName: node linkType: hard -"isarray@npm:0.0.1": - version: 0.0.1 - resolution: "isarray@npm:0.0.1" - checksum: 10/49191f1425681df4a18c2f0f93db3adb85573bcdd6a4482539d98eac9e705d8961317b01175627e860516a2fc45f8f9302db26e5a380a97a520e272e2a40a8d4 - languageName: node - linkType: hard - "isarray@npm:1.0.0, isarray@npm:~1.0.0": version: 1.0.0 resolution: "isarray@npm:1.0.0" @@ -9981,20 +9833,6 @@ __metadata: languageName: node linkType: hard -"jest-util@npm:^28.0.0": - version: 28.1.1 - resolution: "jest-util@npm:28.1.1" - dependencies: - "@jest/types": "npm:^28.1.1" - "@types/node": "npm:*" - chalk: "npm:^4.0.0" - ci-info: "npm:^3.2.0" - graceful-fs: "npm:^4.2.9" - picomatch: "npm:^2.2.3" - checksum: 10/624d001c25f1ecacd40be564c476226edd61397766196e1631e2ec48877d76f838e0a6c03a8af2b2c64fbf7ceb38a7aaca6cb55915ea45bb91fca64b7fee6a22 - languageName: node - linkType: hard - "jiti@npm:^1.19.1": version: 1.21.6 resolution: "jiti@npm:1.21.6" @@ -10118,7 +9956,7 @@ __metadata: languageName: node linkType: hard -"json5@npm:^2.2.1, json5@npm:^2.2.2": +"json5@npm:^2.2.2": version: 2.2.3 resolution: "json5@npm:2.2.3" bin: @@ -10180,13 +10018,6 @@ __metadata: languageName: node linkType: hard -"just-extend@npm:^4.0.2": - version: 4.2.1 - resolution: "just-extend@npm:4.2.1" - checksum: 10/375389c0847d56300873fa622fbc5c5e208933e372bbedb39c82f583299cdad4fe9c4773bc35fcd9c42cd85744f07474ca4163aa0f9125dd5be37bc09075eb49 - languageName: node - linkType: hard - "keyv@npm:^3.0.0": version: 3.1.0 resolution: "keyv@npm:3.1.0" @@ -10799,13 +10630,6 @@ __metadata: languageName: node linkType: hard -"lodash.get@npm:^4.4.2": - version: 4.4.2 - resolution: "lodash.get@npm:4.4.2" - checksum: 10/2a4925f6e89bc2c010a77a802d1ba357e17ed1ea03c2ddf6a146429f2856a216663e694a6aa3549a318cbbba3fd8b7decb392db457e6ac0b83dc745ed0a17380 - languageName: node - linkType: hard - "lodash.ismatch@npm:^4.4.0": version: 4.4.0 resolution: "lodash.ismatch@npm:4.4.0" @@ -10834,13 +10658,6 @@ __metadata: languageName: node linkType: hard -"lodash.memoize@npm:4.x": - version: 4.1.2 - resolution: "lodash.memoize@npm:4.1.2" - checksum: 10/192b2168f310c86f303580b53acf81ab029761b9bd9caa9506a019ffea5f3363ea98d7e39e7e11e6b9917066c9d36a09a11f6fe16f812326390d8f3a54a1a6da - languageName: node - linkType: hard - "lodash.merge@npm:^4.6.2": version: 4.6.2 resolution: "lodash.merge@npm:4.6.2" @@ -11142,7 +10959,7 @@ __metadata: languageName: node linkType: hard -"make-error@npm:1.x, make-error@npm:^1.1.1": +"make-error@npm:^1.1.1": version: 1.3.6 resolution: "make-error@npm:1.3.6" checksum: 10/b86e5e0e25f7f777b77fabd8e2cbf15737972869d852a22b7e73c17623928fccb826d8e46b9951501d3f20e51ad74ba8c59ed584f610526a48f8ccf88aaec402 @@ -11969,19 +11786,6 @@ __metadata: languageName: node linkType: hard -"nise@npm:^5.1.1": - version: 5.1.1 - resolution: "nise@npm:5.1.1" - dependencies: - "@sinonjs/commons": "npm:^1.8.3" - "@sinonjs/fake-timers": "npm:>=5" - "@sinonjs/text-encoding": "npm:^0.7.1" - just-extend: "npm:^4.0.2" - path-to-regexp: "npm:^1.7.0" - checksum: 10/931e0ce1fcfc9fc3c9d2fcaa16ae0e813ef309aaf3af3367029cafd46785905916473fb29beafdb20e7d1fd9280003628b95e9f6d4702c1eb0de87e10bca00d7 - languageName: node - linkType: hard - "no-case@npm:^3.0.4": version: 3.0.4 resolution: "no-case@npm:3.0.4" @@ -13388,15 +13192,6 @@ __metadata: languageName: node linkType: hard -"path-to-regexp@npm:^1.7.0": - version: 1.8.0 - resolution: "path-to-regexp@npm:1.8.0" - dependencies: - isarray: "npm:0.0.1" - checksum: 10/45a01690f72919163cf89714e31a285937b14ad54c53734c826363fcf7beba9d9d0f2de802b4986b1264374562d6a3398a2e5289753a764e3a256494f1e52add - languageName: node - linkType: hard - "path-type@npm:^3.0.0": version: 3.0.0 resolution: "path-type@npm:3.0.0" @@ -13448,7 +13243,7 @@ __metadata: languageName: node linkType: hard -"picomatch@npm:2.3.1, picomatch@npm:^2.0.5, picomatch@npm:^2.2.3, picomatch@npm:^2.3.1": +"picomatch@npm:2.3.1, picomatch@npm:^2.0.5, picomatch@npm:^2.3.1": version: 2.3.1 resolution: "picomatch@npm:2.3.1" checksum: 10/60c2595003b05e4535394d1da94850f5372c9427ca4413b71210f437f7b2ca091dbd611c45e8b37d10036fa8eade25c1b8951654f9d3973bfa66a2ff4d3b08bc @@ -14555,17 +14350,6 @@ __metadata: languageName: node linkType: hard -"semver@npm:7.x, semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.1.2, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7": - version: 7.3.7 - resolution: "semver@npm:7.3.7" - dependencies: - lru-cache: "npm:^6.0.0" - bin: - semver: bin/semver.js - checksum: 10/6f60700810ef4879eb0af1d8d0626e5a2d11ba57ca7889e041d88155cb4b45629d1efebb8c6d381ecac4f87870ecb4e1b27760019d017ed1bf74a5083f4eeeb8 - languageName: node - linkType: hard - "semver@npm:>=7.5.4, semver@npm:^7.5.4": version: 7.5.4 resolution: "semver@npm:7.5.4" @@ -14586,6 +14370,17 @@ __metadata: languageName: node linkType: hard +"semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.1.2, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7": + version: 7.3.7 + resolution: "semver@npm:7.3.7" + dependencies: + lru-cache: "npm:^6.0.0" + bin: + semver: bin/semver.js + checksum: 10/6f60700810ef4879eb0af1d8d0626e5a2d11ba57ca7889e041d88155cb4b45629d1efebb8c6d381ecac4f87870ecb4e1b27760019d017ed1bf74a5083f4eeeb8 + languageName: node + linkType: hard + "semver@npm:^7.3.8, semver@npm:^7.6.3": version: 7.6.3 resolution: "semver@npm:7.6.3" @@ -14808,30 +14603,6 @@ __metadata: languageName: node linkType: hard -"sinon-chai@npm:3.7.0": - version: 3.7.0 - resolution: "sinon-chai@npm:3.7.0" - peerDependencies: - chai: ^4.0.0 - sinon: ">=4.0.0" - checksum: 10/028853eb8a545ca613c6863014a40f07d1e6b81467e20939fefcd13f170206d24165b91099fb297aeb4d137745e321da25daa8e2d665cc0a78f90d5b877e8bbe - languageName: node - linkType: hard - -"sinon@npm:14.0.0": - version: 14.0.0 - resolution: "sinon@npm:14.0.0" - dependencies: - "@sinonjs/commons": "npm:^1.8.3" - "@sinonjs/fake-timers": "npm:^9.1.2" - "@sinonjs/samsam": "npm:^6.1.1" - diff: "npm:^5.0.0" - nise: "npm:^5.1.1" - supports-color: "npm:^7.2.0" - checksum: 10/40c14850252ae3eed0fc0abda2525b163bb57f514b267885a3838b210abc1e7a60125a51f7a6aa61509959d2ecf73634b4d793e4a789308f41d60da9eaed4160 - languageName: node - linkType: hard - "skin-tone@npm:^2.0.0": version: 2.0.0 resolution: "skin-tone@npm:2.0.0" @@ -15543,7 +15314,7 @@ __metadata: languageName: node linkType: hard -"supports-color@npm:^7.0.0, supports-color@npm:^7.1.0, supports-color@npm:^7.2.0": +"supports-color@npm:^7.0.0, supports-color@npm:^7.1.0": version: 7.2.0 resolution: "supports-color@npm:7.2.0" dependencies: @@ -16011,42 +15782,9 @@ __metadata: languageName: node linkType: hard -"ts-jest@npm:28.0.8": - version: 28.0.8 - resolution: "ts-jest@npm:28.0.8" - dependencies: - bs-logger: "npm:0.x" - fast-json-stable-stringify: "npm:2.x" - jest-util: "npm:^28.0.0" - json5: "npm:^2.2.1" - lodash.memoize: "npm:4.x" - make-error: "npm:1.x" - semver: "npm:7.x" - yargs-parser: "npm:^21.0.1" - peerDependencies: - "@babel/core": ">=7.0.0-beta.0 <8" - "@jest/types": ^28.0.0 - babel-jest: ^28.0.0 - jest: ^28.0.0 - typescript: ">=4.3" - peerDependenciesMeta: - "@babel/core": - optional: true - "@jest/types": - optional: true - babel-jest: - optional: true - esbuild: - optional: true - bin: - ts-jest: cli.js - checksum: 10/16cfe812ac5ec6557c9dc17e93bb0785c535002e5c13287f5a2bd2440ab57ea03ff696b32a80ba2992ca9fddab1c8649d7ae42670c02a22322805212933b1096 - languageName: node - linkType: hard - -"ts-node@npm:10.9.1": - version: 10.9.1 - resolution: "ts-node@npm:10.9.1" +"ts-node@npm:^10.9.2": + version: 10.9.2 + resolution: "ts-node@npm:10.9.2" dependencies: "@cspotcode/source-map-support": "npm:^0.8.0" "@tsconfig/node10": "npm:^1.0.7" @@ -16078,18 +15816,7 @@ __metadata: ts-node-script: dist/bin-script.js ts-node-transpile-only: dist/bin-transpile.js ts-script: dist/bin-script-deprecated.js - checksum: 10/bee56d4dc96ccbafc99dfab7b73fbabc62abab2562af53cdea91c874a301b9d11e42bc33c0a032a6ed6d813dbdc9295ec73dde7b73ea4ebde02b0e22006f7e04 - languageName: node - linkType: hard - -"tsconfig-paths@npm:4.1.2": - version: 4.1.2 - resolution: "tsconfig-paths@npm:4.1.2" - dependencies: - json5: "npm:^2.2.2" - minimist: "npm:^1.2.6" - strip-bom: "npm:^3.0.0" - checksum: 10/438c2370f09b2ecc6f2fb4cce6e24d4f5afec725b64cf4e6e0495e895e3c4e75a79465efb524684350cc9185894e537caf65f6b4dd08d8589ff8abea1fd039e7 + checksum: 10/a91a15b3c9f76ac462f006fa88b6bfa528130dcfb849dd7ef7f9d640832ab681e235b8a2bc58ecde42f72851cc1d5d4e22c901b0c11aa51001ea1d395074b794 languageName: node linkType: hard @@ -16180,13 +15907,6 @@ __metadata: languageName: node linkType: hard -"type-detect@npm:4.0.8, type-detect@npm:^4.0.8": - version: 4.0.8 - resolution: "type-detect@npm:4.0.8" - checksum: 10/5179e3b8ebc51fce1b13efb75fdea4595484433f9683bbc2dca6d99789dba4e602ab7922d2656f2ce8383987467f7770131d4a7f06a26287db0615d2f4c4ce7d - languageName: node - linkType: hard - "type-fest@npm:^0.12.0": version: 0.12.0 resolution: "type-fest@npm:0.12.0" @@ -16324,17 +16044,7 @@ __metadata: languageName: node linkType: hard -"typescript@npm:4.9.5, typescript@npm:^4.2.4": - version: 4.9.5 - resolution: "typescript@npm:4.9.5" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: 10/458f7220ab11e0fc191514cc41be1707645ec9a8c2d609448a448e18c522cef9646f58728f6811185a4c35613dacdf6c98cf8965c88b3541d0288c47291e4300 - languageName: node - linkType: hard - -"typescript@npm:>=3 < 6": +"typescript@npm:5.6.2, typescript@npm:>=3 < 6": version: 5.6.2 resolution: "typescript@npm:5.6.2" bin: @@ -16354,17 +16064,17 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@npm%3A4.9.5#optional!builtin, typescript@patch:typescript@npm%3A^4.2.4#optional!builtin": +"typescript@npm:^4.2.4": version: 4.9.5 - resolution: "typescript@patch:typescript@npm%3A4.9.5#optional!builtin::version=4.9.5&hash=289587" + resolution: "typescript@npm:4.9.5" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10/5659316360b5cc2d6f5931b346401fa534107b68b60179cf14970e27978f0936c1d5c46f4b5b8175f8cba0430f522b3ce355b4b724c0ea36ce6c0347fab25afd + checksum: 10/458f7220ab11e0fc191514cc41be1707645ec9a8c2d609448a448e18c522cef9646f58728f6811185a4c35613dacdf6c98cf8965c88b3541d0288c47291e4300 languageName: node linkType: hard -"typescript@patch:typescript@npm%3A>=3 < 6#optional!builtin": +"typescript@patch:typescript@npm%3A5.6.2#optional!builtin, typescript@patch:typescript@npm%3A>=3 < 6#optional!builtin": version: 5.6.2 resolution: "typescript@patch:typescript@npm%3A5.6.2#optional!builtin::version=5.6.2&hash=d69c25" bin: @@ -16384,6 +16094,16 @@ __metadata: languageName: node linkType: hard +"typescript@patch:typescript@npm%3A^4.2.4#optional!builtin": + version: 4.9.5 + resolution: "typescript@patch:typescript@npm%3A4.9.5#optional!builtin::version=4.9.5&hash=289587" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 10/5659316360b5cc2d6f5931b346401fa534107b68b60179cf14970e27978f0936c1d5c46f4b5b8175f8cba0430f522b3ce355b4b724c0ea36ce6c0347fab25afd + languageName: node + linkType: hard + "uc.micro@npm:^1.0.1, uc.micro@npm:^1.0.5": version: 1.0.6 resolution: "uc.micro@npm:1.0.6" @@ -17294,7 +17014,7 @@ __metadata: languageName: node linkType: hard -"yargs-parser@npm:^21.0.0, yargs-parser@npm:^21.0.1": +"yargs-parser@npm:^21.0.0": version: 21.0.1 resolution: "yargs-parser@npm:21.0.1" checksum: 10/4e818773852813727ee84e4103c7f6ab6cb007edf8050eda6f1cebef7672721324031299846a713ef8ed3427e8c320c44a1838784ba83e1513881f9860650b64 From df96fba418ad37496988128d9016a416bdb9f799 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Fri, 20 Sep 2024 08:16:28 +0000 Subject: [PATCH 28/69] Github CI build: __run_2 v6.0.0-alpha.7 [ci skip] --- lerna.json | 2 +- package.json | 2 +- packages/barrels/package.json | 2 +- packages/cli-core/package.json | 2 +- packages/cli-generate-http-client/package.json | 2 +- packages/cli-generate-swagger/package.json | 2 +- packages/cli-plugin-eslint/package.json | 2 +- packages/cli-plugin-jest/package.json | 2 +- packages/cli-plugin-mongoose/package.json | 2 +- packages/cli-plugin-oidc-provider/package.json | 2 +- packages/cli-plugin-passport/package.json | 2 +- packages/cli-plugin-prisma/package.json | 2 +- packages/cli-plugin-typegraphql/package.json | 2 +- packages/cli-plugin-typeorm/package.json | 2 +- packages/cli-plugin-vitest/package.json | 2 +- packages/cli-testing/package.json | 2 +- packages/cli/package.json | 2 +- tools/typescript/package.json | 2 +- tools/vitest/package.json | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lerna.json b/lerna.json index cb321ddb5..c4f339af8 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "packages": [ "packages/*" ], - "version": "6.0.0-alpha.6" + "version": "6.0.0-alpha.7" } \ No newline at end of file diff --git a/package.json b/package.json index d0e557221..6150bf103 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@tsed/cli-root", - "version": "6.0.0-alpha.6", + "version": "6.0.0-alpha.7", "description": "CLI to bootstrap your Ts.ED project", "private": true, "type": "module", diff --git a/packages/barrels/package.json b/packages/barrels/package.json index da7bcfe93..8cdbb1cc5 100644 --- a/packages/barrels/package.json +++ b/packages/barrels/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/barrels", "description": "A simple tool to generate barrels for your TypeScript project", - "version": "6.0.0-alpha.6", + "version": "6.0.0-alpha.7", "type": "module", "bin": "bin/barrels.js", "files": [], diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index 2acecb964..5b66ec288 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-core", "description": "Build your CLI with TypeScript and Decorators", - "version": "6.0.0-alpha.6", + "version": "6.0.0-alpha.7", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-generate-http-client/package.json b/packages/cli-generate-http-client/package.json index 6c6a9d848..2c33c396a 100644 --- a/packages/cli-generate-http-client/package.json +++ b/packages/cli-generate-http-client/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-generate-http-client", "description": "Ts.ED CLI plugin. Export a command that generate an HTTP Client (axios or fetch) from your Ts.ED controllers and OS3 spec.", - "version": "6.0.0-alpha.6", + "version": "6.0.0-alpha.7", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-generate-swagger/package.json b/packages/cli-generate-swagger/package.json index 0c5eecd82..5bb560547 100644 --- a/packages/cli-generate-swagger/package.json +++ b/packages/cli-generate-swagger/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-generate-swagger", "description": "Ts.ED CLI plugin. Export a command that generate the swagger.json from your Ts.ED controllers and OS3 spec.", - "version": "6.0.0-alpha.6", + "version": "6.0.0-alpha.7", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-eslint/package.json b/packages/cli-plugin-eslint/package.json index 548b72b9e..a4ca997ba 100644 --- a/packages/cli-plugin-eslint/package.json +++ b/packages/cli-plugin-eslint/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-eslint", "description": "Ts.ED CLI plugin. Add EsLint support", - "version": "6.0.0-alpha.6", + "version": "6.0.0-alpha.7", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-jest/package.json b/packages/cli-plugin-jest/package.json index 81d0bfdbc..687fbdb20 100644 --- a/packages/cli-plugin-jest/package.json +++ b/packages/cli-plugin-jest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-jest", "description": "Ts.ED CLI plugin. Add Jest support", - "version": "6.0.0-alpha.6", + "version": "6.0.0-alpha.7", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-mongoose/package.json b/packages/cli-plugin-mongoose/package.json index b5d4d5bd1..521fa86c7 100644 --- a/packages/cli-plugin-mongoose/package.json +++ b/packages/cli-plugin-mongoose/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-mongoose", "description": "Ts.ED CLI plugin. Add Mongoose support", - "version": "6.0.0-alpha.6", + "version": "6.0.0-alpha.7", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-oidc-provider/package.json b/packages/cli-plugin-oidc-provider/package.json index 3aedf0075..7b6a31628 100644 --- a/packages/cli-plugin-oidc-provider/package.json +++ b/packages/cli-plugin-oidc-provider/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-oidc-provider", "description": "Ts.ED CLI plugin. Add OIDC Provider", - "version": "6.0.0-alpha.6", + "version": "6.0.0-alpha.7", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-passport/package.json b/packages/cli-plugin-passport/package.json index 8d9ebdcc0..6f08541a1 100644 --- a/packages/cli-plugin-passport/package.json +++ b/packages/cli-plugin-passport/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-passport", "description": "Ts.ED CLI plugin. Add Passport.js support", - "version": "6.0.0-alpha.6", + "version": "6.0.0-alpha.7", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-prisma/package.json b/packages/cli-plugin-prisma/package.json index 8b7defdd2..b28028708 100644 --- a/packages/cli-plugin-prisma/package.json +++ b/packages/cli-plugin-prisma/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-prisma", "description": "Ts.ED CLI plugin. Add Prisma project initialisation support.", - "version": "6.0.0-alpha.6", + "version": "6.0.0-alpha.7", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-typegraphql/package.json b/packages/cli-plugin-typegraphql/package.json index 83ed1b965..baafec735 100644 --- a/packages/cli-plugin-typegraphql/package.json +++ b/packages/cli-plugin-typegraphql/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-typegraphql", "description": "Ts.ED CLI plugin. Add TypeGraphql support.", - "version": "6.0.0-alpha.6", + "version": "6.0.0-alpha.7", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-typeorm/package.json b/packages/cli-plugin-typeorm/package.json index aec1cd3eb..8dc9da8c7 100644 --- a/packages/cli-plugin-typeorm/package.json +++ b/packages/cli-plugin-typeorm/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-typeorm", "description": "Ts.ED CLI plugin. Add TypeORM support", - "version": "6.0.0-alpha.6", + "version": "6.0.0-alpha.7", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-vitest/package.json b/packages/cli-plugin-vitest/package.json index d9f769e51..b3209ca06 100644 --- a/packages/cli-plugin-vitest/package.json +++ b/packages/cli-plugin-vitest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-vitest", "description": "Ts.ED CLI plugin. Add Jest support", - "version": "6.0.0-alpha.6", + "version": "6.0.0-alpha.7", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-testing/package.json b/packages/cli-testing/package.json index bfffd563f..9846a4480 100644 --- a/packages/cli-testing/package.json +++ b/packages/cli-testing/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-testing", "description": "Utils to test you CLI based on Ts.ED CLI", - "version": "6.0.0-alpha.6", + "version": "6.0.0-alpha.7", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli/package.json b/packages/cli/package.json index 9e5a38bc1..f022ac6af 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli", "description": "CLI to bootstrap your Ts.ED project", - "version": "6.0.0-alpha.6", + "version": "6.0.0-alpha.7", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/tools/typescript/package.json b/tools/typescript/package.json index 5c0734d39..2e594edf8 100644 --- a/tools/typescript/package.json +++ b/tools/typescript/package.json @@ -1,6 +1,6 @@ { "name": "@tsed/typescript", - "version": "6.0.0-alpha.6", + "version": "6.0.0-alpha.7", "description": "Util to compile source", "type": "module", "private": true, diff --git a/tools/vitest/package.json b/tools/vitest/package.json index 3e205210c..0943c12bf 100644 --- a/tools/vitest/package.json +++ b/tools/vitest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/vitest", "type": "module", - "version": "6.0.0-alpha.6", + "version": "6.0.0-alpha.7", "private": true, "exports": { ".": "./index.js", From b0fa59e3b428bc9936234d437857515e00b4cc09 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Sat, 21 Sep 2024 10:39:07 +0200 Subject: [PATCH 29/69] fix(barrels): fix globby configuration for directory fields --- packages/barrels/bin/barrels.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/barrels/bin/barrels.js b/packages/barrels/bin/barrels.js index 9abaafaa3..25546a533 100755 --- a/packages/barrels/bin/barrels.js +++ b/packages/barrels/bin/barrels.js @@ -1,7 +1,7 @@ #!/usr/bin/env node import {existsSync} from "node:fs"; import {readFile, writeFile} from "node:fs/promises"; -import {join} from "node:path"; +import {dirname, join} from "node:path"; import {globby} from "globby"; @@ -46,8 +46,16 @@ async function build() { const excluded = exclude.map((path) => `!${path}`).concat(directory.map((path) => `!${path}/index.ts`)); - const promises = directory.map(async (directory) => { - const baseIndex = join(process.cwd(), directory); + const directories = ( + await globby(directory, { + cwd: process.cwd() + }) + ).reduce((set, file) => { + return set.add(dirname(file)); + }, new Set()); + + const promises = [...directories.keys()].map(async (directory) => { + const baseIndex = join(process.cwd(), directory?.path ?? directory); const files = await globby(["**/*.ts", "!index.ts", ...excluded], { cwd: directory From 118b4e74d11f903fea14f6a5c3613116f87f64f5 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Sat, 21 Sep 2024 10:39:45 +0200 Subject: [PATCH 30/69] fix(cli-core): fix bad import and loadPlugins file resolution --- packages/cli-core/src/utils/createTasksRunner.ts | 2 +- packages/cli-core/src/utils/loadPlugins.ts | 4 +--- packages/cli-core/src/utils/mapCommanderOptions.ts | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/cli-core/src/utils/createTasksRunner.ts b/packages/cli-core/src/utils/createTasksRunner.ts index 420f3d6e6..4b020374d 100644 --- a/packages/cli-core/src/utils/createTasksRunner.ts +++ b/packages/cli-core/src/utils/createTasksRunner.ts @@ -1,6 +1,6 @@ // @ts-ignore import {isFunction} from "@tsed/core"; -import {Listr, ListrTaskWrapper, Logger} from "listr2"; +import {Listr, type ListrTaskWrapper, Logger} from "listr2"; import type {TaskOptions, Tasks} from "../interfaces/Tasks.js"; import {getLogger} from "./createInjector.js"; diff --git a/packages/cli-core/src/utils/loadPlugins.ts b/packages/cli-core/src/utils/loadPlugins.ts index 6a390f42b..13d7c0eda 100644 --- a/packages/cli-core/src/utils/loadPlugins.ts +++ b/packages/cli-core/src/utils/loadPlugins.ts @@ -1,5 +1,3 @@ -import {fileURLToPath} from "node:url"; - import {GlobalProviders, InjectorService} from "@tsed/di"; import chalk from "chalk"; // @ts-ignore @@ -21,7 +19,7 @@ export async function loadPlugins(injector: InjectorService) { .filter((mod) => mod.startsWith(`@${name}/cli-plugin`) || mod.includes(`${name}-cli-plugin`)) .map(async (mod) => { try { - const {default: plugin} = await fs.importModule(mod, fileURLToPath(rootDir)); + const {default: plugin} = await fs.importModule(mod, rootDir); if (!injector.has(plugin)) { const provider = GlobalProviders.get(plugin)?.clone(); diff --git a/packages/cli-core/src/utils/mapCommanderOptions.ts b/packages/cli-core/src/utils/mapCommanderOptions.ts index 51148a720..637347ab5 100644 --- a/packages/cli-core/src/utils/mapCommanderOptions.ts +++ b/packages/cli-core/src/utils/mapCommanderOptions.ts @@ -1,6 +1,6 @@ -import commander from "commander"; +import type {Command} from "commander"; -export function mapCommanderOptions(commands: commander.Command[]) { +export function mapCommanderOptions(commands: Command[]) { const options: any = {}; commands.forEach((command) => { Object.entries(command.opts()) From 8c1d15d85cf77ba2829b8379bda08904c2a3d466 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Sat, 21 Sep 2024 10:40:17 +0200 Subject: [PATCH 31/69] fix(cli): fix templates --- .../cli/src/commands/generate/GenerateCmd.spec.ts | 4 ++-- .../utils/__snapshots__/fillImport.spec.ts.snap | 14 +++++++------- packages/cli/src/utils/fillImports.ts | 10 +++++----- .../cli/templates/init/docker/npm/Dockerfile.hbs | 2 +- .../cli/templates/init/docker/pnpm/Dockerfile.hbs | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/cli/src/commands/generate/GenerateCmd.spec.ts b/packages/cli/src/commands/generate/GenerateCmd.spec.ts index d3e66cf2a..65f79236d 100644 --- a/packages/cli/src/commands/generate/GenerateCmd.spec.ts +++ b/packages/cli/src/commands/generate/GenerateCmd.spec.ts @@ -115,7 +115,7 @@ describe("GenerateCmd", () => { express: false, koa: false, platformSymbol: undefined, - barrels: '["./src/controllers/rest/index.js"]', + barrels: '["./src/controllers/rest"]', imports: [ {from: "@tsed/ajv"}, {symbols: "{config}", from: "./config/index.js"}, @@ -169,7 +169,7 @@ describe("GenerateCmd", () => { express: false, koa: false, platformSymbol: undefined, - barrels: '["./src/controllers/rest/index.js"]', + barrels: '["./src/controllers/rest"]', imports: [ {from: "@tsed/ajv"}, {symbols: "{config}", from: "./config/index.js"}, diff --git a/packages/cli/src/utils/__snapshots__/fillImport.spec.ts.snap b/packages/cli/src/utils/__snapshots__/fillImport.spec.ts.snap index 4448675ca..d050719fc 100644 --- a/packages/cli/src/utils/__snapshots__/fillImport.spec.ts.snap +++ b/packages/cli/src/utils/__snapshots__/fillImport.spec.ts.snap @@ -3,7 +3,7 @@ exports[`fillImports() > should return barrels and imports files for ('arc_default', oidc: false, graphql: false, swagger: true, passportjs: false, express: false, koa: false, mongoose: false) 1`] = ` { "architecture": "arc_default", - "barrels": "["./src/controllers/rest/index.js","./src/controllers/pages/index.js"]", + "barrels": "["./src/controllers/rest","./src/controllers/pages"]", "express": false, "graphql": false, "imports": [ @@ -37,7 +37,7 @@ exports[`fillImports() > should return barrels and imports files for ('arc_defau exports[`fillImports() > should return barrels and imports files for ('arc_default', oidc: true, graphql: false, swagger: false, passportjs: false, express: false, koa: true, mongoose: false) 1`] = ` { "architecture": "arc_default", - "barrels": "["./src/controllers/rest/index.js","./src/interactions/index.js"]", + "barrels": "["./src/controllers/rest","./src/interactions"]", "express": false, "graphql": false, "imports": [ @@ -75,7 +75,7 @@ exports[`fillImports() > should return barrels and imports files for ('arc_defau exports[`fillImports() > should return barrels and imports files for ('arc_default', oidc: true, graphql: true, swagger: true, passportjs: true, express: false, koa: true, mongoose: true) 1`] = ` { "architecture": "arc_default", - "barrels": "["./src/controllers/rest/index.js","./src/controllers/pages/index.js","./src/interactions/index.js","./src/datasources/index.js","./src/resolvers/index.js"]", + "barrels": "["./src/controllers/rest","./src/controllers/pages","./src/interactions","./src/datasources","./src/resolvers"]", "express": false, "graphql": true, "imports": [ @@ -131,7 +131,7 @@ exports[`fillImports() > should return barrels and imports files for ('arc_defau exports[`fillImports() > should return barrels and imports files for ('feature', oidc: false, graphql: false, swagger: false, passportjs: false, express: false, koa: false, mongoose: false) 1`] = ` { "architecture": "feature", - "barrels": "["./src/rest/index.js"]", + "barrels": "["./src/rest"]", "express": false, "graphql": false, "imports": [ @@ -158,7 +158,7 @@ exports[`fillImports() > should return barrels and imports files for ('feature', exports[`fillImports() > should return barrels and imports files for ('feature', oidc: false, graphql: false, swagger: true, passportjs: false, express: false, koa: false, mongoose: false) 1`] = ` { "architecture": "feature", - "barrels": "["./src/rest/index.js","./src/pages/index.js"]", + "barrels": "["./src/rest","./src/pages"]", "express": false, "graphql": false, "imports": [ @@ -192,7 +192,7 @@ exports[`fillImports() > should return barrels and imports files for ('feature', exports[`fillImports() > should return barrels and imports files for ('feature', oidc: true, graphql: false, swagger: false, passportjs: false, express: true, koa: false, mongoose: false) 1`] = ` { "architecture": "feature", - "barrels": "["./src/rest/index.js","./src/interactions/index.js"]", + "barrels": "["./src/rest","./src/interactions"]", "express": false, "graphql": false, "imports": [ @@ -230,7 +230,7 @@ exports[`fillImports() > should return barrels and imports files for ('feature', exports[`fillImports() > should return barrels and imports files for ('feature', oidc: true, graphql: true, swagger: true, passportjs: true, express: true, koa: false, mongoose: true) 1`] = ` { "architecture": "feature", - "barrels": "["./src/rest/index.js","./src/pages/index.js","./src/interactions/index.js","./src/datasources/index.js","./src/resolvers/index.js"]", + "barrels": "["./src/rest","./src/pages","./src/interactions","./src/datasources","./src/resolvers"]", "express": false, "graphql": true, "imports": [ diff --git a/packages/cli/src/utils/fillImports.ts b/packages/cli/src/utils/fillImports.ts index 4296412e7..242b71a51 100644 --- a/packages/cli/src/utils/fillImports.ts +++ b/packages/cli/src/utils/fillImports.ts @@ -10,11 +10,11 @@ export function fillImports(ctx: any) { ctx.barrels = JSON.stringify( [ - isFeature ? "./src/rest/index.js" : "./src/controllers/rest/index.js", - ctx.swagger && (isFeature ? "./src/pages/index.js" : "./src/controllers/pages/index.js"), - ctx.oidc && "./src/interactions/index.js", - ctx.graphql && "./src/datasources/index.js", - ctx.graphql && "./src/resolvers/index.js" + isFeature ? "./src/rest" : "./src/controllers/rest", + ctx.swagger && (isFeature ? "./src/pages" : "./src/controllers/pages"), + ctx.oidc && "./src/interactions", + ctx.graphql && "./src/datasources", + ctx.graphql && "./src/resolvers" ].filter(Boolean) ); diff --git a/packages/cli/templates/init/docker/npm/Dockerfile.hbs b/packages/cli/templates/init/docker/npm/Dockerfile.hbs index f0b94268b..013823ee5 100644 --- a/packages/cli/templates/init/docker/npm/Dockerfile.hbs +++ b/packages/cli/templates/init/docker/npm/Dockerfile.hbs @@ -13,7 +13,7 @@ COPY ./src ./src RUN npm run build -FROM node:${NODE_VERSION}-alpine as runtime +FROM node:${NODE_VERSION}-alpine AS runtime ENV WORKDIR /opt WORKDIR $WORKDIR diff --git a/packages/cli/templates/init/docker/pnpm/Dockerfile.hbs b/packages/cli/templates/init/docker/pnpm/Dockerfile.hbs index a06c501d5..d30c383c6 100644 --- a/packages/cli/templates/init/docker/pnpm/Dockerfile.hbs +++ b/packages/cli/templates/init/docker/pnpm/Dockerfile.hbs @@ -13,7 +13,7 @@ COPY ./src ./src RUN pnpm run build -FROM node:${NODE_VERSION}-alpine as runtime +FROM node:${NODE_VERSION}-alpine AS runtime ENV WORKDIR /opt WORKDIR $WORKDIR From 3f6e954199ee98c24ca8e7f7befa960e43332f4e Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Sat, 21 Sep 2024 10:40:42 +0200 Subject: [PATCH 32/69] fix(cli-plugin-eslint): fix templates and run linter after installation --- .../src/hooks/EslintInitHook.ts | 17 +++++++++++++++++ .../templates/init/eslint.config.mjs.hbs | 5 ++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/packages/cli-plugin-eslint/src/hooks/EslintInitHook.ts b/packages/cli-plugin-eslint/src/hooks/EslintInitHook.ts index d474e3457..897375fe7 100644 --- a/packages/cli-plugin-eslint/src/hooks/EslintInitHook.ts +++ b/packages/cli-plugin-eslint/src/hooks/EslintInitHook.ts @@ -70,6 +70,14 @@ export class EslintInitHook { await this.packageManagers.runScript("prepare"); } + }, + { + title: "Run linter", + task: () => { + return this.packageManagers.runScript("test:lint:fix", { + ignoreError: true + }); + } } ]; } @@ -115,6 +123,15 @@ export class EslintInitHook { ); } + if (ctx.vitest) { + this.packageJson.addDevDependencies( + { + "eslint-plugin-vitest": "latest" + }, + ctx + ); + } + if (ctx.prettier) { this.packageJson.addDevDependencies( { diff --git a/packages/cli-plugin-eslint/templates/init/eslint.config.mjs.hbs b/packages/cli-plugin-eslint/templates/init/eslint.config.mjs.hbs index 705f34168..bbdb5f078 100644 --- a/packages/cli-plugin-eslint/templates/init/eslint.config.mjs.hbs +++ b/packages/cli-plugin-eslint/templates/init/eslint.config.mjs.hbs @@ -3,7 +3,7 @@ import typescriptParser from "@typescript-eslint/parser"; {{#if prettier}}import pluginPrettierRecommended from "eslint-plugin-prettier/recommended"; {{/if}}import pluginSimpleImportSort from "eslint-plugin-simple-import-sort"; {{#if vitest}}import vitest from "eslint-plugin-vitest"; -i{{/if}}import globals from "globals"; +{{/if}}import globals from "globals"; export default [ { @@ -58,8 +58,7 @@ export default [ }, rules: { "simple-import-sort/imports": "error", - "simple-import-sort/exports": "error", - "workspaces/no-absolute-imports": "error" + "simple-import-sort/exports": "error" } }{{#if prettier}}, pluginPrettierRecommended{{/if}} From 972207b66d7d4f23735a78dc26821aed4881b700 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Sat, 21 Sep 2024 10:49:56 +0200 Subject: [PATCH 33/69] fix(cli): fix dockerignore and swcrc --- packages/cli/templates/init/.dockerignore.hbs | 1 + packages/cli/templates/init/.swcrc.hbs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/cli/templates/init/.dockerignore.hbs b/packages/cli/templates/init/.dockerignore.hbs index fec4b2af0..3a9f7b09d 100644 --- a/packages/cli/templates/init/.dockerignore.hbs +++ b/packages/cli/templates/init/.dockerignore.hbs @@ -2,3 +2,4 @@ node_modules Dockerfile .env.local .env.development +**/*.spec.ts diff --git a/packages/cli/templates/init/.swcrc.hbs b/packages/cli/templates/init/.swcrc.hbs index 6fb5a60fa..f686f85cc 100644 --- a/packages/cli/templates/init/.swcrc.hbs +++ b/packages/cli/templates/init/.swcrc.hbs @@ -6,7 +6,7 @@ "decorators": true, "dynamicImport": true }, - "target": "es2023", + "target": "es2022", "externalHelpers": true, "keepClassNames": true, "transform": { From 006212bc546e04e23562de8e05c7ae2d087c0a94 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Sat, 21 Sep 2024 10:53:26 +0200 Subject: [PATCH 34/69] fix(cli-plugin-vitest): fix extra space in vitest command --- packages/cli-plugin-vitest/src/CliPluginVitestModule.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli-plugin-vitest/src/CliPluginVitestModule.ts b/packages/cli-plugin-vitest/src/CliPluginVitestModule.ts index ce6f47afd..5ec0cd05b 100644 --- a/packages/cli-plugin-vitest/src/CliPluginVitestModule.ts +++ b/packages/cli-plugin-vitest/src/CliPluginVitestModule.ts @@ -25,7 +25,7 @@ export class CliPluginVitestModule { const runtime = this.runtimes.get(); this.packageJson.addScripts({ - test: `${runtime.run("test:lint")} && ${runtime.run("test:coverage")} `, + test: `${runtime.run("test:lint")} && ${runtime.run("test:coverage")}`, "test:unit": "cross-env NODE_ENV=test vitest run", "test:watch": "cross-env NODE_ENV=test vitest", "test:coverage": `cross-env NODE_ENV=test vitest run --coverage` From 1f5f66a4f2a2471622a65b83c4c714f9d6c33356 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sat, 21 Sep 2024 09:01:04 +0000 Subject: [PATCH 35/69] Github CI build: __run_2 v6.0.0-alpha.8 [ci skip] --- lerna.json | 2 +- package.json | 2 +- packages/barrels/package.json | 2 +- packages/cli-core/package.json | 2 +- packages/cli-generate-http-client/package.json | 2 +- packages/cli-generate-swagger/package.json | 2 +- packages/cli-plugin-eslint/package.json | 2 +- packages/cli-plugin-jest/package.json | 2 +- packages/cli-plugin-mongoose/package.json | 2 +- packages/cli-plugin-oidc-provider/package.json | 2 +- packages/cli-plugin-passport/package.json | 2 +- packages/cli-plugin-prisma/package.json | 2 +- packages/cli-plugin-typegraphql/package.json | 2 +- packages/cli-plugin-typeorm/package.json | 2 +- packages/cli-plugin-vitest/package.json | 2 +- packages/cli-testing/package.json | 2 +- packages/cli/package.json | 2 +- tools/typescript/package.json | 2 +- tools/vitest/package.json | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lerna.json b/lerna.json index c4f339af8..7bbfcc7d9 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "packages": [ "packages/*" ], - "version": "6.0.0-alpha.7" + "version": "6.0.0-alpha.8" } \ No newline at end of file diff --git a/package.json b/package.json index 6150bf103..b24f061a0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@tsed/cli-root", - "version": "6.0.0-alpha.7", + "version": "6.0.0-alpha.8", "description": "CLI to bootstrap your Ts.ED project", "private": true, "type": "module", diff --git a/packages/barrels/package.json b/packages/barrels/package.json index 8cdbb1cc5..4a3025038 100644 --- a/packages/barrels/package.json +++ b/packages/barrels/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/barrels", "description": "A simple tool to generate barrels for your TypeScript project", - "version": "6.0.0-alpha.7", + "version": "6.0.0-alpha.8", "type": "module", "bin": "bin/barrels.js", "files": [], diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index 5b66ec288..5b8798df0 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-core", "description": "Build your CLI with TypeScript and Decorators", - "version": "6.0.0-alpha.7", + "version": "6.0.0-alpha.8", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-generate-http-client/package.json b/packages/cli-generate-http-client/package.json index 2c33c396a..8936f4b81 100644 --- a/packages/cli-generate-http-client/package.json +++ b/packages/cli-generate-http-client/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-generate-http-client", "description": "Ts.ED CLI plugin. Export a command that generate an HTTP Client (axios or fetch) from your Ts.ED controllers and OS3 spec.", - "version": "6.0.0-alpha.7", + "version": "6.0.0-alpha.8", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-generate-swagger/package.json b/packages/cli-generate-swagger/package.json index 5bb560547..da450909f 100644 --- a/packages/cli-generate-swagger/package.json +++ b/packages/cli-generate-swagger/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-generate-swagger", "description": "Ts.ED CLI plugin. Export a command that generate the swagger.json from your Ts.ED controllers and OS3 spec.", - "version": "6.0.0-alpha.7", + "version": "6.0.0-alpha.8", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-eslint/package.json b/packages/cli-plugin-eslint/package.json index a4ca997ba..a7e2777e0 100644 --- a/packages/cli-plugin-eslint/package.json +++ b/packages/cli-plugin-eslint/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-eslint", "description": "Ts.ED CLI plugin. Add EsLint support", - "version": "6.0.0-alpha.7", + "version": "6.0.0-alpha.8", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-jest/package.json b/packages/cli-plugin-jest/package.json index 687fbdb20..9baa7c81d 100644 --- a/packages/cli-plugin-jest/package.json +++ b/packages/cli-plugin-jest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-jest", "description": "Ts.ED CLI plugin. Add Jest support", - "version": "6.0.0-alpha.7", + "version": "6.0.0-alpha.8", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-mongoose/package.json b/packages/cli-plugin-mongoose/package.json index 521fa86c7..6b0b1c639 100644 --- a/packages/cli-plugin-mongoose/package.json +++ b/packages/cli-plugin-mongoose/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-mongoose", "description": "Ts.ED CLI plugin. Add Mongoose support", - "version": "6.0.0-alpha.7", + "version": "6.0.0-alpha.8", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-oidc-provider/package.json b/packages/cli-plugin-oidc-provider/package.json index 7b6a31628..76d26b2cb 100644 --- a/packages/cli-plugin-oidc-provider/package.json +++ b/packages/cli-plugin-oidc-provider/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-oidc-provider", "description": "Ts.ED CLI plugin. Add OIDC Provider", - "version": "6.0.0-alpha.7", + "version": "6.0.0-alpha.8", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-passport/package.json b/packages/cli-plugin-passport/package.json index 6f08541a1..be85353f6 100644 --- a/packages/cli-plugin-passport/package.json +++ b/packages/cli-plugin-passport/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-passport", "description": "Ts.ED CLI plugin. Add Passport.js support", - "version": "6.0.0-alpha.7", + "version": "6.0.0-alpha.8", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-prisma/package.json b/packages/cli-plugin-prisma/package.json index b28028708..2f87096c4 100644 --- a/packages/cli-plugin-prisma/package.json +++ b/packages/cli-plugin-prisma/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-prisma", "description": "Ts.ED CLI plugin. Add Prisma project initialisation support.", - "version": "6.0.0-alpha.7", + "version": "6.0.0-alpha.8", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-typegraphql/package.json b/packages/cli-plugin-typegraphql/package.json index baafec735..b0763b498 100644 --- a/packages/cli-plugin-typegraphql/package.json +++ b/packages/cli-plugin-typegraphql/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-typegraphql", "description": "Ts.ED CLI plugin. Add TypeGraphql support.", - "version": "6.0.0-alpha.7", + "version": "6.0.0-alpha.8", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-typeorm/package.json b/packages/cli-plugin-typeorm/package.json index 8dc9da8c7..238b98fbc 100644 --- a/packages/cli-plugin-typeorm/package.json +++ b/packages/cli-plugin-typeorm/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-typeorm", "description": "Ts.ED CLI plugin. Add TypeORM support", - "version": "6.0.0-alpha.7", + "version": "6.0.0-alpha.8", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-vitest/package.json b/packages/cli-plugin-vitest/package.json index b3209ca06..53a1f258e 100644 --- a/packages/cli-plugin-vitest/package.json +++ b/packages/cli-plugin-vitest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-vitest", "description": "Ts.ED CLI plugin. Add Jest support", - "version": "6.0.0-alpha.7", + "version": "6.0.0-alpha.8", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-testing/package.json b/packages/cli-testing/package.json index 9846a4480..8ddb55895 100644 --- a/packages/cli-testing/package.json +++ b/packages/cli-testing/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-testing", "description": "Utils to test you CLI based on Ts.ED CLI", - "version": "6.0.0-alpha.7", + "version": "6.0.0-alpha.8", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli/package.json b/packages/cli/package.json index f022ac6af..47b278279 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli", "description": "CLI to bootstrap your Ts.ED project", - "version": "6.0.0-alpha.7", + "version": "6.0.0-alpha.8", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/tools/typescript/package.json b/tools/typescript/package.json index 2e594edf8..c552755b0 100644 --- a/tools/typescript/package.json +++ b/tools/typescript/package.json @@ -1,6 +1,6 @@ { "name": "@tsed/typescript", - "version": "6.0.0-alpha.7", + "version": "6.0.0-alpha.8", "description": "Util to compile source", "type": "module", "private": true, diff --git a/tools/vitest/package.json b/tools/vitest/package.json index 0943c12bf..b1b27ef6a 100644 --- a/tools/vitest/package.json +++ b/tools/vitest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/vitest", "type": "module", - "version": "6.0.0-alpha.7", + "version": "6.0.0-alpha.8", "private": true, "exports": { ".": "./index.js", From ec8beb4515aee166bec32834f5e32b47f72f38d0 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Wed, 25 Sep 2024 07:28:26 +0200 Subject: [PATCH 36/69] fix: bump @npmcli/run-script to v8.1.0 --- packages/cli-core/package.json | 2 +- yarn.lock | 397 +-------------------------------- 2 files changed, 12 insertions(+), 387 deletions(-) diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index 5b8798df0..409b6aff0 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -31,7 +31,7 @@ "listr" ], "dependencies": { - "@npmcli/run-script": "3.0.1", + "@npmcli/run-script": "8.1.0", "@tsed/logger": ">=6.1.1", "@tsed/normalize-path": ">=7.14.2", "@types/fs-extra": "^9.0.13", diff --git a/yarn.lock b/yarn.lock index 312b8f972..1bc092527 100644 --- a/yarn.lock +++ b/yarn.lock @@ -585,13 +585,6 @@ __metadata: languageName: node linkType: hard -"@gar/promisify@npm:^1.1.3": - version: 1.1.3 - resolution: "@gar/promisify@npm:1.1.3" - checksum: 10/052dd232140fa60e81588000cbe729a40146579b361f1070bce63e2a761388a22a16d00beeffc504bd3601cb8e055c57b21a185448b3ed550cf50716f4fd442e - languageName: node - linkType: hard - "@humanwhocodes/module-importer@npm:^1.0.1": version: 1.0.1 resolution: "@humanwhocodes/module-importer@npm:1.0.1" @@ -978,16 +971,6 @@ __metadata: languageName: node linkType: hard -"@npmcli/fs@npm:^2.1.0": - version: 2.1.0 - resolution: "@npmcli/fs@npm:2.1.0" - dependencies: - "@gar/promisify": "npm:^1.1.3" - semver: "npm:^7.3.5" - checksum: 10/1fe97efb5c1250c5986b46b6c8256b1eab8159a6d50fc8ace9f90937b3195541272faf77f18bdbf5eeb89bab68332c7846ac5ab9337e6099e63c6007388ebe84 - languageName: node - linkType: hard - "@npmcli/fs@npm:^3.1.0": version: 3.1.0 resolution: "@npmcli/fs@npm:3.1.0" @@ -1083,16 +1066,6 @@ __metadata: languageName: node linkType: hard -"@npmcli/move-file@npm:^2.0.0": - version: 2.0.0 - resolution: "@npmcli/move-file@npm:2.0.0" - dependencies: - mkdirp: "npm:^1.0.4" - rimraf: "npm:^3.0.2" - checksum: 10/1388777b507b0c592d53f41b9d182e1a8de7763bc625fc07999b8edbc22325f074e5b3ec90af79c89d6987fdb2325bc66d59f483258543c14a43661621f841b0 - languageName: node - linkType: hard - "@npmcli/name-from-folder@npm:^2.0.0": version: 2.0.0 resolution: "@npmcli/name-from-folder@npm:2.0.0" @@ -1100,13 +1073,6 @@ __metadata: languageName: node linkType: hard -"@npmcli/node-gyp@npm:^1.0.3": - version: 1.0.3 - resolution: "@npmcli/node-gyp@npm:1.0.3" - checksum: 10/ad7c69a394d4620a0f37abb48839676afa5809ca453e00e92f4624b8751b2f37c5d8d4b9b354c382c424455eebff5344210ff8aad969a0b9ee1038d2354c78ac - languageName: node - linkType: hard - "@npmcli/node-gyp@npm:^3.0.0": version: 3.0.0 resolution: "@npmcli/node-gyp@npm:3.0.0" @@ -1144,15 +1110,6 @@ __metadata: languageName: node linkType: hard -"@npmcli/promise-spawn@npm:^1.3.2": - version: 1.3.2 - resolution: "@npmcli/promise-spawn@npm:1.3.2" - dependencies: - infer-owner: "npm:^1.0.4" - checksum: 10/543b7c1e26230499b4100b10d45efa35b1077e8f25595050f34930ca3310abe9524f7387279fe4330139e0f28a0207595245503439276fd4b686cca2b6503080 - languageName: node - linkType: hard - "@npmcli/promise-spawn@npm:^7.0.0, @npmcli/promise-spawn@npm:^7.0.1": version: 7.0.1 resolution: "@npmcli/promise-spawn@npm:7.0.1" @@ -1178,18 +1135,6 @@ __metadata: languageName: node linkType: hard -"@npmcli/run-script@npm:3.0.1": - version: 3.0.1 - resolution: "@npmcli/run-script@npm:3.0.1" - dependencies: - "@npmcli/node-gyp": "npm:^1.0.3" - "@npmcli/promise-spawn": "npm:^1.3.2" - node-gyp: "npm:^9.0.0" - read-package-json-fast: "npm:^2.0.3" - checksum: 10/930cc12d4bfd54bf06c6873fde2b8a544c93e040c349f4d195343a7310a2449e2955574cce24c9a54f43b33a5865996d78f34018af3a961de37c8dd477344980 - languageName: node - linkType: hard - "@npmcli/run-script@npm:8.1.0, @npmcli/run-script@npm:^8.0.0, @npmcli/run-script@npm:^8.1.0": version: 8.1.0 resolution: "@npmcli/run-script@npm:8.1.0" @@ -2269,13 +2214,6 @@ __metadata: languageName: node linkType: hard -"@tootallnate/once@npm:2": - version: 2.0.0 - resolution: "@tootallnate/once@npm:2.0.0" - checksum: 10/ad87447820dd3f24825d2d947ebc03072b20a42bfc96cbafec16bff8bbda6c1a81fcb0be56d5b21968560c5359a0af4038a68ba150c3e1694fe4c109a063bed8 - languageName: node - linkType: hard - "@tsconfig/node10@npm:^1.0.7": version: 1.0.11 resolution: "@tsconfig/node10@npm:1.0.11" @@ -2318,7 +2256,7 @@ __metadata: version: 0.0.0-use.local resolution: "@tsed/cli-core@workspace:packages/cli-core" dependencies: - "@npmcli/run-script": "npm:3.0.1" + "@npmcli/run-script": "npm:8.1.0" "@tsed/logger": "npm:>=6.1.1" "@tsed/normalize-path": "npm:>=7.14.2" "@tsed/typescript": "workspace:*" @@ -3504,13 +3442,6 @@ __metadata: languageName: node linkType: hard -"abbrev@npm:1": - version: 1.1.1 - resolution: "abbrev@npm:1.1.1" - checksum: 10/2d882941183c66aa665118bafdab82b7a177e9add5eb2776c33e960a4f3c89cff88a1b38aba13a456de01d0dd9d66a8bea7c903268b21ea91dd1097e1e2e8243 - languageName: node - linkType: hard - "abbrev@npm:^2.0.0": version: 2.0.0 resolution: "abbrev@npm:2.0.0" @@ -3552,15 +3483,6 @@ __metadata: languageName: node linkType: hard -"agent-base@npm:6, agent-base@npm:^6.0.2": - version: 6.0.2 - resolution: "agent-base@npm:6.0.2" - dependencies: - debug: "npm:4" - checksum: 10/21fb903e0917e5cb16591b4d0ef6a028a54b83ac30cd1fca58dece3d4e0990512a8723f9f83130d88a41e2af8b1f7be1386fda3ea2d181bb1a62155e75e95e23 - languageName: node - linkType: hard - "agent-base@npm:^7.0.2, agent-base@npm:^7.1.0": version: 7.1.0 resolution: "agent-base@npm:7.1.0" @@ -3570,17 +3492,6 @@ __metadata: languageName: node linkType: hard -"agentkeepalive@npm:^4.2.1": - version: 4.2.1 - resolution: "agentkeepalive@npm:4.2.1" - dependencies: - debug: "npm:^4.1.0" - depd: "npm:^1.1.2" - humanize-ms: "npm:^1.2.1" - checksum: 10/63961cba1afa26d708da94159f3b9428d46fdc137b783fbc399b848e750c5e28c97d96839efa8cb3c2d11ecd12dd411298c00d164600212f660e8c55369c9e55 - languageName: node - linkType: hard - "aggregate-error@npm:^3.0.0": version: 3.1.0 resolution: "aggregate-error@npm:3.1.0" @@ -4070,16 +3981,6 @@ __metadata: languageName: node linkType: hard -"are-we-there-yet@npm:^3.0.0": - version: 3.0.0 - resolution: "are-we-there-yet@npm:3.0.0" - dependencies: - delegates: "npm:^1.0.0" - readable-stream: "npm:^3.6.0" - checksum: 10/7266eee19d0be9dd8e58b63cfb1e1ad45945125fac1e75f00237b55960891bf3bb0be291757a8d9dcf1dbfacfb3802d3eb3f9a064084a6a70a61fe0571f9318f - languageName: node - linkType: hard - "are-we-there-yet@npm:^4.0.0": version: 4.0.2 resolution: "are-we-there-yet@npm:4.0.2" @@ -4566,32 +4467,6 @@ __metadata: languageName: node linkType: hard -"cacache@npm:^16.1.0": - version: 16.1.0 - resolution: "cacache@npm:16.1.0" - dependencies: - "@npmcli/fs": "npm:^2.1.0" - "@npmcli/move-file": "npm:^2.0.0" - chownr: "npm:^2.0.0" - fs-minipass: "npm:^2.1.0" - glob: "npm:^8.0.1" - infer-owner: "npm:^1.0.4" - lru-cache: "npm:^7.7.1" - minipass: "npm:^3.1.6" - minipass-collect: "npm:^1.0.2" - minipass-flush: "npm:^1.0.5" - minipass-pipeline: "npm:^1.2.4" - mkdirp: "npm:^1.0.4" - p-map: "npm:^4.0.0" - promise-inflight: "npm:^1.0.1" - rimraf: "npm:^3.0.2" - ssri: "npm:^9.0.0" - tar: "npm:^6.1.11" - unique-filename: "npm:^1.1.1" - checksum: 10/5a84a79db11204cd6827bfa5e05c72d512ed091b77df772988f8df1eea4aaa879e30e38093d10db1267ed2d0cb9cafe31c64ad7f55074dca52e4cb5dca204382 - languageName: node - linkType: hard - "cacache@npm:^18.0.0, cacache@npm:^18.0.2": version: 18.0.2 resolution: "cacache@npm:18.0.2" @@ -5989,7 +5864,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4": +"debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.1.1, debug@npm:^4.3.2, debug@npm:^4.3.4": version: 4.3.4 resolution: "debug@npm:4.3.4" dependencies: @@ -6191,20 +6066,6 @@ __metadata: languageName: node linkType: hard -"delegates@npm:^1.0.0": - version: 1.0.0 - resolution: "delegates@npm:1.0.0" - checksum: 10/a51744d9b53c164ba9c0492471a1a2ffa0b6727451bdc89e31627fdf4adda9d51277cfcbfb20f0a6f08ccb3c436f341df3e92631a3440226d93a8971724771fd - languageName: node - linkType: hard - -"depd@npm:^1.1.2": - version: 1.1.2 - resolution: "depd@npm:1.1.2" - checksum: 10/2ed6966fc14463a9e85451db330ab8ba041efed0b9a1a472dbfc6fbf2f82bab66491915f996b25d8517dddc36c8c74e24c30879b34877f3c4410733444a51d1d - languageName: node - linkType: hard - "deprecation@npm:^2.0.0": version: 2.3.1 resolution: "deprecation@npm:2.3.1" @@ -7596,7 +7457,7 @@ __metadata: languageName: node linkType: hard -"fs-minipass@npm:^2.0.0, fs-minipass@npm:^2.1.0": +"fs-minipass@npm:^2.0.0": version: 2.1.0 resolution: "fs-minipass@npm:2.1.0" dependencies: @@ -7661,22 +7522,6 @@ __metadata: languageName: node linkType: hard -"gauge@npm:^4.0.3": - version: 4.0.4 - resolution: "gauge@npm:4.0.4" - dependencies: - aproba: "npm:^1.0.3 || ^2.0.0" - color-support: "npm:^1.1.3" - console-control-strings: "npm:^1.1.0" - has-unicode: "npm:^2.0.1" - signal-exit: "npm:^3.0.7" - string-width: "npm:^4.2.3" - strip-ansi: "npm:^6.0.1" - wide-align: "npm:^1.1.5" - checksum: 10/09535dd53b5ced6a34482b1fa9f3929efdeac02f9858569cde73cef3ed95050e0f3d095706c1689614059898924b7a74aa14042f51381a1ccc4ee5c29d2389c4 - languageName: node - linkType: hard - "gauge@npm:^5.0.0": version: 5.0.1 resolution: "gauge@npm:5.0.1" @@ -8036,7 +7881,7 @@ __metadata: languageName: node linkType: hard -"glob@npm:^7.1.2, glob@npm:^7.1.3, glob@npm:^7.1.4": +"glob@npm:^7.1.2, glob@npm:^7.1.3": version: 7.2.3 resolution: "glob@npm:7.2.3" dependencies: @@ -8050,19 +7895,6 @@ __metadata: languageName: node linkType: hard -"glob@npm:^8.0.1": - version: 8.0.3 - resolution: "glob@npm:8.0.3" - dependencies: - fs.realpath: "npm:^1.0.0" - inflight: "npm:^1.0.4" - inherits: "npm:2" - minimatch: "npm:^5.0.1" - once: "npm:^1.3.0" - checksum: 10/cd002c04010ffddba426376c3046466b923b5450f89a434e6a9df6bfec369a4e907afc436303d7fbc34366dcf37056dcc3bec41e41ce983ed8d78b6035ecc317 - languageName: node - linkType: hard - "glob@npm:^9.2.0": version: 9.3.5 resolution: "glob@npm:9.3.5" @@ -8608,7 +8440,7 @@ __metadata: languageName: node linkType: hard -"http-cache-semantics@npm:^4.0.0, http-cache-semantics@npm:^4.1.0": +"http-cache-semantics@npm:^4.0.0": version: 4.1.0 resolution: "http-cache-semantics@npm:4.1.0" checksum: 10/c9c29508b27c1d81ba78fc1df45dc142dfc039a0871e596db0a2257f08c7e9de16be6a61c3a7c90f4cb0e7dfc1c0277ed8a1ea4bc700b07d4e91ff403ca46d9e @@ -8622,17 +8454,6 @@ __metadata: languageName: node linkType: hard -"http-proxy-agent@npm:^5.0.0": - version: 5.0.0 - resolution: "http-proxy-agent@npm:5.0.0" - dependencies: - "@tootallnate/once": "npm:2" - agent-base: "npm:6" - debug: "npm:4" - checksum: 10/5ee19423bc3e0fd5f23ce991b0755699ad2a46a440ce9cec99e8126bb98448ad3479d2c0ea54be5519db5b19a4ffaa69616bac01540db18506dd4dac3dc418f0 - languageName: node - linkType: hard - "http-proxy-agent@npm:^7.0.0": version: 7.0.0 resolution: "http-proxy-agent@npm:7.0.0" @@ -8650,16 +8471,6 @@ __metadata: languageName: node linkType: hard -"https-proxy-agent@npm:^5.0.0": - version: 5.0.1 - resolution: "https-proxy-agent@npm:5.0.1" - dependencies: - agent-base: "npm:6" - debug: "npm:4" - checksum: 10/f0dce7bdcac5e8eaa0be3c7368bb8836ed010fb5b6349ffb412b172a203efe8f807d9a6681319105ea1b6901e1972c7b5ea899672a7b9aad58309f766dcbe0df - languageName: node - linkType: hard - "https-proxy-agent@npm:^7.0.0": version: 7.0.4 resolution: "https-proxy-agent@npm:7.0.4" @@ -8715,15 +8526,6 @@ __metadata: languageName: node linkType: hard -"humanize-ms@npm:^1.2.1": - version: 1.2.1 - resolution: "humanize-ms@npm:1.2.1" - dependencies: - ms: "npm:^2.0.0" - checksum: 10/9c7a74a2827f9294c009266c82031030eae811ca87b0da3dceb8d6071b9bde22c9f3daef0469c3c533cc67a97d8a167cd9fc0389350e5f415f61a79b171ded16 - languageName: node - linkType: hard - "husky@npm:8.0.1": version: 8.0.1 resolution: "husky@npm:8.0.1" @@ -8876,13 +8678,6 @@ __metadata: languageName: node linkType: hard -"infer-owner@npm:^1.0.4": - version: 1.0.4 - resolution: "infer-owner@npm:1.0.4" - checksum: 10/181e732764e4a0611576466b4b87dac338972b839920b2a8cde43642e4ed6bd54dc1fb0b40874728f2a2df9a1b097b8ff83b56d5f8f8e3927f837fdcb47d8a89 - languageName: node - linkType: hard - "inflight@npm:^1.0.4": version: 1.0.6 resolution: "inflight@npm:1.0.6" @@ -9057,13 +8852,6 @@ __metadata: languageName: node linkType: hard -"ip@npm:^1.1.5": - version: 1.1.8 - resolution: "ip@npm:1.1.8" - checksum: 10/52975ebf84a090162d561fc6948fbc4c53775a8054c05371f09cfcb40e30a53aa225b4efb624f630cff5af2dd8124c82dd68e4df065dc1d1ca91d04e850e9cde - languageName: node - linkType: hard - "ip@npm:^2.0.0": version: 2.0.0 resolution: "ip@npm:2.0.0" @@ -10895,13 +10683,6 @@ __metadata: languageName: node linkType: hard -"lru-cache@npm:^7.7.1": - version: 7.10.1 - resolution: "lru-cache@npm:7.10.1" - checksum: 10/34a917a3764992fa1e8ed9449afece4c2b1ee8787bb904770d76994f84d3d6bdc7175cc3017ce2f1faaf87518f49bfb1f986de20ab775791f50fea340e551bda - languageName: node - linkType: hard - "magic-string@npm:^0.30.11": version: 0.30.11 resolution: "magic-string@npm:0.30.11" @@ -10966,30 +10747,6 @@ __metadata: languageName: node linkType: hard -"make-fetch-happen@npm:^10.0.3": - version: 10.1.6 - resolution: "make-fetch-happen@npm:10.1.6" - dependencies: - agentkeepalive: "npm:^4.2.1" - cacache: "npm:^16.1.0" - http-cache-semantics: "npm:^4.1.0" - http-proxy-agent: "npm:^5.0.0" - https-proxy-agent: "npm:^5.0.0" - is-lambda: "npm:^1.0.1" - lru-cache: "npm:^7.7.1" - minipass: "npm:^3.1.6" - minipass-collect: "npm:^1.0.2" - minipass-fetch: "npm:^2.0.3" - minipass-flush: "npm:^1.0.5" - minipass-pipeline: "npm:^1.2.4" - negotiator: "npm:^0.6.3" - promise-retry: "npm:^2.0.1" - socks-proxy-agent: "npm:^6.1.1" - ssri: "npm:^9.0.0" - checksum: 10/5b5d9593455489d5ff8e13190cf62a82ed01e4f02548f3be8a55efaeb64f54cbb9195c19ef1f6a0d848bfd5bc3b2e6688ee131f863c35d0434192811bb01750a - languageName: node - linkType: hard - "make-fetch-happen@npm:^13.0.0": version: 13.0.0 resolution: "make-fetch-happen@npm:13.0.0" @@ -11497,15 +11254,6 @@ __metadata: languageName: node linkType: hard -"minipass-collect@npm:^1.0.2": - version: 1.0.2 - resolution: "minipass-collect@npm:1.0.2" - dependencies: - minipass: "npm:^3.0.0" - checksum: 10/14df761028f3e47293aee72888f2657695ec66bd7d09cae7ad558da30415fdc4752bbfee66287dcc6fd5e6a2fa3466d6c484dc1cbd986525d9393b9523d97f10 - languageName: node - linkType: hard - "minipass-collect@npm:^2.0.1": version: 2.0.1 resolution: "minipass-collect@npm:2.0.1" @@ -11515,21 +11263,6 @@ __metadata: languageName: node linkType: hard -"minipass-fetch@npm:^2.0.3": - version: 2.1.0 - resolution: "minipass-fetch@npm:2.1.0" - dependencies: - encoding: "npm:^0.1.13" - minipass: "npm:^3.1.6" - minipass-sized: "npm:^1.0.3" - minizlib: "npm:^2.1.2" - dependenciesMeta: - encoding: - optional: true - checksum: 10/33b6927ef8a4516e27878e1e9966a6dee5c2efb844584b39712a8c222cf7cc586ae00c09897ce3b21e77b6600ad4c7503f8bd732ef1a8bf98137f18c45c6d6c4 - languageName: node - linkType: hard - "minipass-fetch@npm:^3.0.0": version: 3.0.4 resolution: "minipass-fetch@npm:3.0.4" @@ -11582,7 +11315,7 @@ __metadata: languageName: node linkType: hard -"minipass@npm:^3.0.0, minipass@npm:^3.1.1, minipass@npm:^3.1.6": +"minipass@npm:^3.0.0": version: 3.1.6 resolution: "minipass@npm:3.1.6" dependencies: @@ -11639,7 +11372,7 @@ __metadata: languageName: node linkType: hard -"mkdirp@npm:^1.0.3, mkdirp@npm:^1.0.4": +"mkdirp@npm:^1.0.3": version: 1.0.4 resolution: "mkdirp@npm:1.0.4" bin: @@ -11676,7 +11409,7 @@ __metadata: languageName: node linkType: hard -"ms@npm:^2.0.0, ms@npm:^2.1.2, ms@npm:^2.1.3": +"ms@npm:^2.1.2, ms@npm:^2.1.3": version: 2.1.3 resolution: "ms@npm:2.1.3" checksum: 10/aa92de608021b242401676e35cfa5aa42dd70cbdc082b916da7fb925c542173e36bce97ea3e804923fe92c0ad991434e4a38327e15a1b5b5f945d66df615ae6d @@ -11860,26 +11593,6 @@ __metadata: languageName: node linkType: hard -"node-gyp@npm:^9.0.0": - version: 9.0.0 - resolution: "node-gyp@npm:9.0.0" - dependencies: - env-paths: "npm:^2.2.0" - glob: "npm:^7.1.4" - graceful-fs: "npm:^4.2.6" - make-fetch-happen: "npm:^10.0.3" - nopt: "npm:^5.0.0" - npmlog: "npm:^6.0.0" - rimraf: "npm:^3.0.2" - semver: "npm:^7.3.5" - tar: "npm:^6.1.2" - which: "npm:^2.0.2" - bin: - node-gyp: bin/node-gyp.js - checksum: 10/7a9f184dda7bd53970ac52e138b091b417505bef5be0a7d9a902137a55246afaebbae1263a0545b6d7d94af131bcd49ac99f18db0b801c5b4c627dd291c08a7f - languageName: node - linkType: hard - "node-machine-id@npm:1.1.12": version: 1.1.12 resolution: "node-machine-id@npm:1.1.12" @@ -11896,17 +11609,6 @@ __metadata: languageName: node linkType: hard -"nopt@npm:^5.0.0": - version: 5.0.0 - resolution: "nopt@npm:5.0.0" - dependencies: - abbrev: "npm:1" - bin: - nopt: bin/nopt.js - checksum: 10/00f9bb2d16449469ba8ffcf9b8f0eae6bae285ec74b135fec533e5883563d2400c0cd70902d0a7759e47ac031ccf206ace4e86556da08ed3f1c66dda206e9ccd - languageName: node - linkType: hard - "nopt@npm:^7.0.0, nopt@npm:^7.2.0": version: 7.2.0 resolution: "nopt@npm:7.2.0" @@ -12022,13 +11724,6 @@ __metadata: languageName: node linkType: hard -"npm-normalize-package-bin@npm:^1.0.1": - version: 1.0.1 - resolution: "npm-normalize-package-bin@npm:1.0.1" - checksum: 10/b61593d1afc2b05258afe791043d1b665376ec91ae56dfcf6c67bb802acfc2c249136d3fb600f356562ef013f9e46a009c5e4769693bf13bcabf99fb5e806e6a - languageName: node - linkType: hard - "npm-normalize-package-bin@npm:^3.0.0": version: 3.0.1 resolution: "npm-normalize-package-bin@npm:3.0.1" @@ -12279,18 +11974,6 @@ __metadata: languageName: node linkType: hard -"npmlog@npm:^6.0.0": - version: 6.0.2 - resolution: "npmlog@npm:6.0.2" - dependencies: - are-we-there-yet: "npm:^3.0.0" - console-control-strings: "npm:^1.1.0" - gauge: "npm:^4.0.3" - set-blocking: "npm:^2.0.0" - checksum: 10/82b123677e62deb9e7472e27b92386c09e6e254ee6c8bcd720b3011013e4168bc7088e984f4fbd53cb6e12f8b4690e23e4fa6132689313e0d0dc4feea45489bb - languageName: node - linkType: hard - "npmlog@npm:^7.0.1": version: 7.0.1 resolution: "npmlog@npm:7.0.1" @@ -13598,16 +13281,6 @@ __metadata: languageName: node linkType: hard -"read-package-json-fast@npm:^2.0.3": - version: 2.0.3 - resolution: "read-package-json-fast@npm:2.0.3" - dependencies: - json-parse-even-better-errors: "npm:^2.3.0" - npm-normalize-package-bin: "npm:^1.0.1" - checksum: 10/fca37b3b2160b9dda7c5588b767f6a2b8ce68d03a044000e568208e20bea0cf6dd2de17b90740ce8da8b42ea79c0b3859649dadf29510bbe77224ea65326a903 - languageName: node - linkType: hard - "read-package-json-fast@npm:^3.0.0, read-package-json-fast@npm:^3.0.2": version: 3.0.2 resolution: "read-package-json-fast@npm:3.0.2" @@ -13776,7 +13449,7 @@ __metadata: languageName: node linkType: hard -"readable-stream@npm:^3.0.0, readable-stream@npm:^3.0.2, readable-stream@npm:^3.1.1, readable-stream@npm:^3.4.0, readable-stream@npm:^3.6.0": +"readable-stream@npm:^3.0.0, readable-stream@npm:^3.0.2, readable-stream@npm:^3.1.1, readable-stream@npm:^3.4.0": version: 3.6.0 resolution: "readable-stream@npm:3.6.0" dependencies: @@ -14071,7 +13744,7 @@ __metadata: languageName: node linkType: hard -"rimraf@npm:^3.0.0, rimraf@npm:^3.0.2": +"rimraf@npm:^3.0.0": version: 3.0.2 resolution: "rimraf@npm:3.0.2" dependencies: @@ -14757,17 +14430,6 @@ __metadata: languageName: node linkType: hard -"socks-proxy-agent@npm:^6.1.1": - version: 6.2.1 - resolution: "socks-proxy-agent@npm:6.2.1" - dependencies: - agent-base: "npm:^6.0.2" - debug: "npm:^4.3.3" - socks: "npm:^2.6.2" - checksum: 10/554749ba3bdba0742ec36493a907261c116dd0dafcd618ea5babdfc90ce5a5ae648d4ee4d2e26e7184afd854973d282372ce0af63e1fc6412bb9fa1a2b1f2d45 - languageName: node - linkType: hard - "socks-proxy-agent@npm:^8.0.1": version: 8.0.2 resolution: "socks-proxy-agent@npm:8.0.2" @@ -14779,16 +14441,6 @@ __metadata: languageName: node linkType: hard -"socks@npm:^2.6.2": - version: 2.6.2 - resolution: "socks@npm:2.6.2" - dependencies: - ip: "npm:^1.1.5" - smart-buffer: "npm:^4.2.0" - checksum: 10/820232ddaeb847ef33312c429fb51aae03e1b774917f189ef491048bb4c4d7742924064f72d7730e3aa08a3ddb6cc2bdcd5949d34c35597e4f6a66eefd994f14 - languageName: node - linkType: hard - "socks@npm:^2.7.1": version: 2.7.1 resolution: "socks@npm:2.7.1" @@ -14984,15 +14636,6 @@ __metadata: languageName: node linkType: hard -"ssri@npm:^9.0.0": - version: 9.0.1 - resolution: "ssri@npm:9.0.1" - dependencies: - minipass: "npm:^3.1.1" - checksum: 10/7638a61e91432510718e9265d48d0438a17d53065e5184f1336f234ef6aa3479663942e41e97df56cda06bb24d9d0b5ef342c10685add3cac7267a82d7fa6718 - languageName: node - linkType: hard - "stackback@npm:0.0.2": version: 0.0.2 resolution: "stackback@npm:0.0.2" @@ -16167,15 +15810,6 @@ __metadata: languageName: node linkType: hard -"unique-filename@npm:^1.1.1": - version: 1.1.1 - resolution: "unique-filename@npm:1.1.1" - dependencies: - unique-slug: "npm:^2.0.0" - checksum: 10/9b6969d649a2096755f19f793315465c6427453b66d67c2a1bee8f36ca7e1fc40725be2c028e974dec110d365bd30a4248e89b1044dc1dfe29663b6867d071ef - languageName: node - linkType: hard - "unique-filename@npm:^3.0.0": version: 3.0.0 resolution: "unique-filename@npm:3.0.0" @@ -16185,15 +15819,6 @@ __metadata: languageName: node linkType: hard -"unique-slug@npm:^2.0.0": - version: 2.0.2 - resolution: "unique-slug@npm:2.0.2" - dependencies: - imurmurhash: "npm:^0.1.4" - checksum: 10/6cfaf91976acc9c125fd0686c561ee9ca0784bb4b2b408972e6cd30e747b4ff0ca50264c01bcf5e711b463535ea611ffb84199e9f73088cd79ac9ddee8154042 - languageName: node - linkType: hard - "unique-slug@npm:^4.0.0": version: 4.0.0 resolution: "unique-slug@npm:4.0.0" @@ -16727,7 +16352,7 @@ __metadata: languageName: node linkType: hard -"which@npm:^2.0.1, which@npm:^2.0.2": +"which@npm:^2.0.1": version: 2.0.2 resolution: "which@npm:2.0.2" dependencies: From 459fd0df581d1520581b5737ac4a3f71ff974aa3 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Wed, 25 Sep 2024 07:29:17 +0200 Subject: [PATCH 37/69] fix: bump @swc dependencies --- package.json | 2 +- packages/cli/package.json | 6 +-- yarn.lock | 100 +++++++++++++++++++------------------- 3 files changed, 54 insertions(+), 54 deletions(-) diff --git a/package.json b/package.json index b24f061a0..0ac3c1594 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "devDependencies": { "@commitlint/cli": "19.5.0", "@commitlint/config-conventional": "19.5.0", - "@swc/core": "1.7.26", + "@swc/core": "1.7.28", "@swc/helpers": "0.5.13", "@tsed/markdown-it-symbols": "3.20.4", "@tsed/monorepo-utils": "2.3.5", diff --git a/packages/cli/package.json b/packages/cli/package.json index 47b278279..a3014ee4f 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -62,9 +62,9 @@ "node": ">=14" }, "dependencies": { - "@swc-node/register": ">=1.10.9", - "@swc/core": ">=1.7.26", - "@swc/helpers": ">=0.5.13", + "@swc-node/register": "^1.10.9", + "@swc/core": "^1.7.28", + "@swc/helpers": "^0.5.13", "@tsed/cli-core": "workspace:*", "@tsed/core": ">=7.14.2", "@tsed/di": ">=7.14.2", diff --git a/yarn.lock b/yarn.lock index 1bc092527..86cc4e8ec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2036,7 +2036,7 @@ __metadata: languageName: node linkType: hard -"@swc-node/register@npm:>=1.10.9": +"@swc-node/register@npm:^1.10.9": version: 1.10.9 resolution: "@swc-node/register@npm:1.10.9" dependencies: @@ -2064,90 +2064,90 @@ __metadata: languageName: node linkType: hard -"@swc/core-darwin-arm64@npm:1.7.26": - version: 1.7.26 - resolution: "@swc/core-darwin-arm64@npm:1.7.26" +"@swc/core-darwin-arm64@npm:1.7.28": + version: 1.7.28 + resolution: "@swc/core-darwin-arm64@npm:1.7.28" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@swc/core-darwin-x64@npm:1.7.26": - version: 1.7.26 - resolution: "@swc/core-darwin-x64@npm:1.7.26" +"@swc/core-darwin-x64@npm:1.7.28": + version: 1.7.28 + resolution: "@swc/core-darwin-x64@npm:1.7.28" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@swc/core-linux-arm-gnueabihf@npm:1.7.26": - version: 1.7.26 - resolution: "@swc/core-linux-arm-gnueabihf@npm:1.7.26" +"@swc/core-linux-arm-gnueabihf@npm:1.7.28": + version: 1.7.28 + resolution: "@swc/core-linux-arm-gnueabihf@npm:1.7.28" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@swc/core-linux-arm64-gnu@npm:1.7.26": - version: 1.7.26 - resolution: "@swc/core-linux-arm64-gnu@npm:1.7.26" +"@swc/core-linux-arm64-gnu@npm:1.7.28": + version: 1.7.28 + resolution: "@swc/core-linux-arm64-gnu@npm:1.7.28" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@swc/core-linux-arm64-musl@npm:1.7.26": - version: 1.7.26 - resolution: "@swc/core-linux-arm64-musl@npm:1.7.26" +"@swc/core-linux-arm64-musl@npm:1.7.28": + version: 1.7.28 + resolution: "@swc/core-linux-arm64-musl@npm:1.7.28" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@swc/core-linux-x64-gnu@npm:1.7.26": - version: 1.7.26 - resolution: "@swc/core-linux-x64-gnu@npm:1.7.26" +"@swc/core-linux-x64-gnu@npm:1.7.28": + version: 1.7.28 + resolution: "@swc/core-linux-x64-gnu@npm:1.7.28" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@swc/core-linux-x64-musl@npm:1.7.26": - version: 1.7.26 - resolution: "@swc/core-linux-x64-musl@npm:1.7.26" +"@swc/core-linux-x64-musl@npm:1.7.28": + version: 1.7.28 + resolution: "@swc/core-linux-x64-musl@npm:1.7.28" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@swc/core-win32-arm64-msvc@npm:1.7.26": - version: 1.7.26 - resolution: "@swc/core-win32-arm64-msvc@npm:1.7.26" +"@swc/core-win32-arm64-msvc@npm:1.7.28": + version: 1.7.28 + resolution: "@swc/core-win32-arm64-msvc@npm:1.7.28" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@swc/core-win32-ia32-msvc@npm:1.7.26": - version: 1.7.26 - resolution: "@swc/core-win32-ia32-msvc@npm:1.7.26" +"@swc/core-win32-ia32-msvc@npm:1.7.28": + version: 1.7.28 + resolution: "@swc/core-win32-ia32-msvc@npm:1.7.28" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@swc/core-win32-x64-msvc@npm:1.7.26": - version: 1.7.26 - resolution: "@swc/core-win32-x64-msvc@npm:1.7.26" +"@swc/core-win32-x64-msvc@npm:1.7.28": + version: 1.7.28 + resolution: "@swc/core-win32-x64-msvc@npm:1.7.28" conditions: os=win32 & cpu=x64 languageName: node linkType: hard -"@swc/core@npm:1.7.26, @swc/core@npm:>=1.7.26": - version: 1.7.26 - resolution: "@swc/core@npm:1.7.26" +"@swc/core@npm:1.7.28, @swc/core@npm:^1.7.28": + version: 1.7.28 + resolution: "@swc/core@npm:1.7.28" dependencies: - "@swc/core-darwin-arm64": "npm:1.7.26" - "@swc/core-darwin-x64": "npm:1.7.26" - "@swc/core-linux-arm-gnueabihf": "npm:1.7.26" - "@swc/core-linux-arm64-gnu": "npm:1.7.26" - "@swc/core-linux-arm64-musl": "npm:1.7.26" - "@swc/core-linux-x64-gnu": "npm:1.7.26" - "@swc/core-linux-x64-musl": "npm:1.7.26" - "@swc/core-win32-arm64-msvc": "npm:1.7.26" - "@swc/core-win32-ia32-msvc": "npm:1.7.26" - "@swc/core-win32-x64-msvc": "npm:1.7.26" + "@swc/core-darwin-arm64": "npm:1.7.28" + "@swc/core-darwin-x64": "npm:1.7.28" + "@swc/core-linux-arm-gnueabihf": "npm:1.7.28" + "@swc/core-linux-arm64-gnu": "npm:1.7.28" + "@swc/core-linux-arm64-musl": "npm:1.7.28" + "@swc/core-linux-x64-gnu": "npm:1.7.28" + "@swc/core-linux-x64-musl": "npm:1.7.28" + "@swc/core-win32-arm64-msvc": "npm:1.7.28" + "@swc/core-win32-ia32-msvc": "npm:1.7.28" + "@swc/core-win32-x64-msvc": "npm:1.7.28" "@swc/counter": "npm:^0.1.3" "@swc/types": "npm:^0.1.12" peerDependencies: @@ -2176,7 +2176,7 @@ __metadata: peerDependenciesMeta: "@swc/helpers": optional: true - checksum: 10/8fb43420bdd1b774dc054c6629f87f733e76860b97130609c7374f3a48406bc0ae1a2dd0b3e3c10317c692b2eaa64747f1a690b309727a8d1411112e2d2a884e + checksum: 10/a477e79387ecc8b68c2bdbbdc88cc61f27a02c5d00f0d77134f9e2de166786a4ee9f7388d6ffd44fc01bfef5311a15cc3132052bab72fb43246dc42705fedb60 languageName: node linkType: hard @@ -2187,7 +2187,7 @@ __metadata: languageName: node linkType: hard -"@swc/helpers@npm:0.5.13, @swc/helpers@npm:>=0.5.13": +"@swc/helpers@npm:0.5.13, @swc/helpers@npm:^0.5.13": version: 0.5.13 resolution: "@swc/helpers@npm:0.5.13" dependencies: @@ -2507,7 +2507,7 @@ __metadata: "@commitlint/cli": "npm:19.5.0" "@commitlint/config-conventional": "npm:19.5.0" "@samverschueren/stream-to-observable": "npm:0.3.1" - "@swc/core": "npm:1.7.26" + "@swc/core": "npm:1.7.28" "@swc/helpers": "npm:0.5.13" "@tsed/core": "npm:>=7.14.2" "@tsed/di": "npm:>=7.14.2" @@ -2583,9 +2583,9 @@ __metadata: version: 0.0.0-use.local resolution: "@tsed/cli@workspace:packages/cli" dependencies: - "@swc-node/register": "npm:>=1.10.9" - "@swc/core": "npm:>=1.7.26" - "@swc/helpers": "npm:>=0.5.13" + "@swc-node/register": "npm:^1.10.9" + "@swc/core": "npm:^1.7.28" + "@swc/helpers": "npm:^0.5.13" "@tsed/cli-core": "workspace:*" "@tsed/core": "npm:>=7.14.2" "@tsed/di": "npm:>=7.14.2" From 127e15536f72679d87a236c078cce7583ccd5e75 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Wed, 25 Sep 2024 07:31:02 +0200 Subject: [PATCH 38/69] fix: bump @types dependencies --- package.json | 2 +- packages/cli-core/package.json | 22 ++-- yarn.lock | 197 ++++++++++++++++++--------------- 3 files changed, 117 insertions(+), 104 deletions(-) diff --git a/package.json b/package.json index 0ac3c1594..c56da4276 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "@tsed/markdown-it-symbols": "3.20.4", "@tsed/monorepo-utils": "2.3.5", "@tsed/ts-doc": "^4.1.0", - "@types/node": "20.14.8", + "@types/node": "22.7.0", "@typescript-eslint/eslint-plugin": "8.5.0", "@typescript-eslint/parser": "8.5.0", "@vitest/coverage-v8": "^2.1.1", diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index 409b6aff0..e9611a4f2 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -34,8 +34,8 @@ "@npmcli/run-script": "8.1.0", "@tsed/logger": ">=6.1.1", "@tsed/normalize-path": ">=7.14.2", - "@types/fs-extra": "^9.0.13", - "@types/inquirer": "^8.2.4", + "@types/fs-extra": "^11.0.4", + "@types/inquirer": "^9.0.7", "ajv": "8.17.1", "axios": "1.6.7", "chalk": "4.1.2", @@ -70,18 +70,18 @@ "@tsed/typescript": "workspace:*", "@types/axios": "0.14.0", "@types/commander": "2.12.2", - "@types/consolidate": "0.14.1", + "@types/consolidate": "0.14.4", "@types/figures": "3.0.1", "@types/globby": "9.1.0", - "@types/inquirer": "8.2.4", - "@types/js-yaml": "4.0.5", - "@types/normalize-path": "^3.0.0", + "@types/inquirer": "9.0.7", + "@types/js-yaml": "4.0.9", + "@types/normalize-path": "^3.0.2", "@types/read-pkg-up": "6.0.0", - "@types/semver": "7.3.9", - "@types/tunnel": "0.0.3", - "@types/update-notifier": "5.1.0", - "@types/url-parse": "^1.4.3", - "@types/uuid": "8.3.4", + "@types/semver": "7.5.8", + "@types/tunnel": "0.0.7", + "@types/update-notifier": "6.0.8", + "@types/url-parse": "^1.4.11", + "@types/uuid": "10.0.0", "cross-env": "7.0.3", "deps": "^1.0.0", "typescript": "5.6.2", diff --git a/yarn.lock b/yarn.lock index 86cc4e8ec..41cbc8fcf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2262,19 +2262,19 @@ __metadata: "@tsed/typescript": "workspace:*" "@types/axios": "npm:0.14.0" "@types/commander": "npm:2.12.2" - "@types/consolidate": "npm:0.14.1" + "@types/consolidate": "npm:0.14.4" "@types/figures": "npm:3.0.1" - "@types/fs-extra": "npm:^9.0.13" + "@types/fs-extra": "npm:^11.0.4" "@types/globby": "npm:9.1.0" - "@types/inquirer": "npm:8.2.4" - "@types/js-yaml": "npm:4.0.5" - "@types/normalize-path": "npm:^3.0.0" + "@types/inquirer": "npm:9.0.7" + "@types/js-yaml": "npm:4.0.9" + "@types/normalize-path": "npm:^3.0.2" "@types/read-pkg-up": "npm:6.0.0" - "@types/semver": "npm:7.3.9" - "@types/tunnel": "npm:0.0.3" - "@types/update-notifier": "npm:5.1.0" - "@types/url-parse": "npm:^1.4.3" - "@types/uuid": "npm:8.3.4" + "@types/semver": "npm:7.5.8" + "@types/tunnel": "npm:0.0.7" + "@types/update-notifier": "npm:6.0.8" + "@types/url-parse": "npm:^1.4.11" + "@types/uuid": "npm:10.0.0" ajv: "npm:8.17.1" axios: "npm:1.6.7" chalk: "npm:4.1.2" @@ -2516,7 +2516,7 @@ __metadata: "@tsed/monorepo-utils": "npm:2.3.5" "@tsed/normalize-path": "npm:>=7.14.2" "@tsed/ts-doc": "npm:^4.1.0" - "@types/node": "npm:20.14.8" + "@types/node": "npm:22.7.0" "@typescript-eslint/eslint-plugin": "npm:8.5.0" "@typescript-eslint/parser": "npm:8.5.0" "@vitest/coverage-v8": "npm:^2.1.1" @@ -2839,13 +2839,13 @@ __metadata: languageName: node linkType: hard -"@types/consolidate@npm:0.14.1": - version: 0.14.1 - resolution: "@types/consolidate@npm:0.14.1" +"@types/consolidate@npm:0.14.4": + version: 0.14.4 + resolution: "@types/consolidate@npm:0.14.4" dependencies: "@types/bluebird": "npm:*" "@types/node": "npm:*" - checksum: 10/bbde7d28dacdf6335a6a9be5937940b21c4299143ea5059284280b4dc4829a44339facb0c5b5cee0990fb9a9e4fbea574323db14cc03a3050fd5b6a34430d5b9 + checksum: 10/a02edb6bf236a5c76ae48519837e6aad968770e04c672e2642de0b442205736257d788e3b619d1eac47d0afb12a3f60cbf66775bced515cf5661d3c8a60e7083 languageName: node linkType: hard @@ -2874,12 +2874,13 @@ __metadata: languageName: node linkType: hard -"@types/fs-extra@npm:^9.0.13": - version: 9.0.13 - resolution: "@types/fs-extra@npm:9.0.13" +"@types/fs-extra@npm:^11.0.4": + version: 11.0.4 + resolution: "@types/fs-extra@npm:11.0.4" dependencies: + "@types/jsonfile": "npm:*" "@types/node": "npm:*" - checksum: 10/ac545e377248039c596ef27d9f277b813507ebdd95d05f32fe7e9c67eb1ed567dafb4ba59f5fdcb6601dd7fd396ff9ba24f8c122e89cef096cdc17987c50a7fa + checksum: 10/acc4c1eb0cde7b1f23f3fe6eb080a14832d8fa9dc1761aa444c5e2f0f6b6fa657ed46ebae32fb580a6700fc921b6165ce8ac3e3ba030c3dd15f10ad4dd4cae98 languageName: node linkType: hard @@ -2902,19 +2903,29 @@ __metadata: languageName: node linkType: hard -"@types/inquirer@npm:8.2.4": - version: 8.2.4 - resolution: "@types/inquirer@npm:8.2.4" +"@types/inquirer@npm:9.0.7": + version: 9.0.7 + resolution: "@types/inquirer@npm:9.0.7" dependencies: "@types/through": "npm:*" - checksum: 10/89b16bd2d00e293e655937d95c8df4e43552d154e100ef2889345e9a9770e10aa7ea3211580249b5dd48046be8d09c3b39f2a7997e0177cbc91826e3c30352ad + rxjs: "npm:^7.2.0" + checksum: 10/84cefdd10d7ca747ae2338ea35518020abbc28f7670ade446e367c4cd333153618b374d30830253f31a9567dd26e7f3093fb3cd20210af5ba27a1a91b89bb97e languageName: node linkType: hard -"@types/js-yaml@npm:4.0.5": - version: 4.0.5 - resolution: "@types/js-yaml@npm:4.0.5" - checksum: 10/6fff5f47d97070f1a01022517ce4bd81a0cfac7cd30f9dbc7222dc5f8db4bfe5f5c8cba3f4b02bdbd6f31f691050db97395b33c8df66d1e7c4f66096b41a3df6 +"@types/js-yaml@npm:4.0.9": + version: 4.0.9 + resolution: "@types/js-yaml@npm:4.0.9" + checksum: 10/a0ce595db8a987904badd21fc50f9f444cb73069f4b95a76cc222e0a17b3ff180669059c763ec314bc4c3ce284379177a9da80e83c5f650c6c1310cafbfaa8e6 + languageName: node + linkType: hard + +"@types/jsonfile@npm:*": + version: 6.1.4 + resolution: "@types/jsonfile@npm:6.1.4" + dependencies: + "@types/node": "npm:*" + checksum: 10/309fda20eb5f1cf68f2df28931afdf189c5e7e6bec64ac783ce737bb98908d57f6f58757ad5da9be37b815645a6f914e2d4f3ac66c574b8fe1ba6616284d0e97 languageName: node linkType: hard @@ -2957,12 +2968,12 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:20.14.8": - version: 20.14.8 - resolution: "@types/node@npm:20.14.8" +"@types/node@npm:22.7.0": + version: 22.7.0 + resolution: "@types/node@npm:22.7.0" dependencies: - undici-types: "npm:~5.26.4" - checksum: 10/73822f66f269ce865df7e2f586787ac7444bd1169fd265cbed1e851b72787f1170517c5b616e0308ec2fbc0934ec6403b0f28d4152acbb0486071aec41167d51 + undici-types: "npm:~6.19.2" + checksum: 10/6476d94a4c0fbf60df56634063e8aa26da1152e7096daf374f1eb010eab1c7ef4cdb75ab2508480e82c0b56538e0e7bdfc72af47e7a4e4ace37f2035eddfd3c2 languageName: node linkType: hard @@ -2980,10 +2991,10 @@ __metadata: languageName: node linkType: hard -"@types/normalize-path@npm:^3.0.0": - version: 3.0.0 - resolution: "@types/normalize-path@npm:3.0.0" - checksum: 10/7a0d89dac238a5ed70314b9afa856aea1d6a43b4b334af5ba7b96bf7fbb5a183979e2d478320e1bab338bdeea9889f69fbefdf0f254bb1295a87d1adeec6c8c7 +"@types/normalize-path@npm:^3.0.2": + version: 3.0.2 + resolution: "@types/normalize-path@npm:3.0.2" + checksum: 10/0fafa7d0c19eca1501cc4f9ce8a8c6ca7739d0fcd58f5851c56ad2babafc07c6113d593b4d8cc045678e0828af134f2339901f8dfe200801ee7b2d3e1496c316 languageName: node linkType: hard @@ -3012,14 +3023,7 @@ __metadata: languageName: node linkType: hard -"@types/semver@npm:7.3.9": - version: 7.3.9 - resolution: "@types/semver@npm:7.3.9" - checksum: 10/872d9689bed8bba950b9ad9ba4a61e9770f13d5dde93ab50db6aa7474593c5b50c766c95f1e0b31f75f06da5322fb217668b5b749f1759008ea6018e62082293 - languageName: node - linkType: hard - -"@types/semver@npm:^7.5.5": +"@types/semver@npm:7.5.8, @types/semver@npm:^7.5.5": version: 7.5.8 resolution: "@types/semver@npm:7.5.8" checksum: 10/3496808818ddb36deabfe4974fd343a78101fa242c4690044ccdc3b95dcf8785b494f5d628f2f47f38a702f8db9c53c67f47d7818f2be1b79f2efb09692e1178 @@ -3042,12 +3046,12 @@ __metadata: languageName: node linkType: hard -"@types/tunnel@npm:0.0.3": - version: 0.0.3 - resolution: "@types/tunnel@npm:0.0.3" +"@types/tunnel@npm:0.0.7": + version: 0.0.7 + resolution: "@types/tunnel@npm:0.0.7" dependencies: "@types/node": "npm:*" - checksum: 10/53e23a1f9fb14a491c00425b2a4fc443817564d77be5e1b95fcbeb6d009551b62ea82ffc3e5ca0c6b9f6b186824ca6ec46e7450c1bcd6674a46d1325f0116e24 + checksum: 10/73ca8f5c843f89dd4add909e99c93bb01c1283ebf030257a49c8c6d1e0e9fadf695256a464b252cf403f4c72d6842051450c97a03f7af8fd61e9df1fd38ae4cf languageName: node linkType: hard @@ -3058,27 +3062,27 @@ __metadata: languageName: node linkType: hard -"@types/update-notifier@npm:5.1.0": - version: 5.1.0 - resolution: "@types/update-notifier@npm:5.1.0" +"@types/update-notifier@npm:6.0.8": + version: 6.0.8 + resolution: "@types/update-notifier@npm:6.0.8" dependencies: "@types/configstore": "npm:*" - boxen: "npm:^4.2.0" - checksum: 10/388474cd534efd4ccbd5dbdda8b584becd75e0ecb0c53ce645f9848e8d959b2bbfbcf0205970190fcc158dbb92015582642949dbaded26239abddd33368da631 + boxen: "npm:^7.1.1" + checksum: 10/385df38855383dd9f0521a14037dec386c30bbccfac7b2682d9fc0b5bc1bf09a307bb657d9aa637fc4afdb99e69b619fa3f0195f09eb3bdd57fdb86eb620a189 languageName: node linkType: hard -"@types/url-parse@npm:^1.4.3": - version: 1.4.8 - resolution: "@types/url-parse@npm:1.4.8" - checksum: 10/44a5e96ed4b579c43750f3578bfa9165f97a359c3b2a85ee126e9c16db964f6ea105e152afd3d1adbd15850a8b812043215f3820112177bb4255a60b432dbd85 +"@types/url-parse@npm:^1.4.11": + version: 1.4.11 + resolution: "@types/url-parse@npm:1.4.11" + checksum: 10/3e289d184b03d0b0203bccdff00efc1388db2ad8bba4af094201bf3ea5d001f36674ce1ee1764b8906b786a2de625dbc5d76b63ac68e2a3383a93acfe49e01b8 languageName: node linkType: hard -"@types/uuid@npm:8.3.4": - version: 8.3.4 - resolution: "@types/uuid@npm:8.3.4" - checksum: 10/6f11f3ff70f30210edaa8071422d405e9c1d4e53abbe50fdce365150d3c698fe7bbff65c1e71ae080cbfb8fded860dbb5e174da96fdbbdfcaa3fb3daa474d20f +"@types/uuid@npm:10.0.0": + version: 10.0.0 + resolution: "@types/uuid@npm:10.0.0" + checksum: 10/e3958f8b0fe551c86c14431f5940c3470127293280830684154b91dc7eb3514aeb79fe3216968833cf79d4d1c67f580f054b5be2cd562bebf4f728913e73e944 languageName: node linkType: hard @@ -4333,22 +4337,6 @@ __metadata: languageName: node linkType: hard -"boxen@npm:^4.2.0": - version: 4.2.0 - resolution: "boxen@npm:4.2.0" - dependencies: - ansi-align: "npm:^3.0.0" - camelcase: "npm:^5.3.1" - chalk: "npm:^3.0.0" - cli-boxes: "npm:^2.2.0" - string-width: "npm:^4.1.0" - term-size: "npm:^2.1.0" - type-fest: "npm:^0.8.1" - widest-line: "npm:^3.1.0" - checksum: 10/ce2b565a2e44b33d11336155675cf4f7f0e13dbf7412928845aefd6a2cf65e0da2dbb0a2cb198b7620a2ae714416a2eb710926b780f15d19f6250a19633b29af - languageName: node - linkType: hard - "boxen@npm:^5.0.0": version: 5.1.2 resolution: "boxen@npm:5.1.2" @@ -4365,6 +4353,22 @@ __metadata: languageName: node linkType: hard +"boxen@npm:^7.1.1": + version: 7.1.1 + resolution: "boxen@npm:7.1.1" + dependencies: + ansi-align: "npm:^3.0.1" + camelcase: "npm:^7.0.1" + chalk: "npm:^5.2.0" + cli-boxes: "npm:^3.0.0" + string-width: "npm:^5.1.2" + type-fest: "npm:^2.13.0" + widest-line: "npm:^4.0.1" + wrap-ansi: "npm:^8.1.0" + checksum: 10/a21d514435ccdd51f11088ad42e6298e3ff6be1bc2801699dcc1d3d79a2c5b005b5384dd03742e91a1ce2d9aedf99996efb36ed5fc7c5c392e19de2404bcfa37 + languageName: node + linkType: hard + "boxen@npm:^8.0.1": version: 8.0.1 resolution: "boxen@npm:8.0.1" @@ -4599,6 +4603,13 @@ __metadata: languageName: node linkType: hard +"camelcase@npm:^7.0.1": + version: 7.0.1 + resolution: "camelcase@npm:7.0.1" + checksum: 10/86ab8f3ebf08bcdbe605a211a242f00ed30d8bfb77dab4ebb744dd36efbc84432d1c4adb28975ba87a1b8be40a80fbd1e60e2f06565315918fa7350011a26d3d + languageName: node + linkType: hard + "camelcase@npm:^8.0.0": version: 8.0.0 resolution: "camelcase@npm:8.0.0" @@ -4637,7 +4648,7 @@ __metadata: languageName: node linkType: hard -"chalk@npm:3.0.0, chalk@npm:^3.0.0": +"chalk@npm:3.0.0": version: 3.0.0 resolution: "chalk@npm:3.0.0" dependencies: @@ -4667,7 +4678,7 @@ __metadata: languageName: node linkType: hard -"chalk@npm:>=5.3.0, chalk@npm:^5.3.0": +"chalk@npm:>=5.3.0, chalk@npm:^5.2.0, chalk@npm:^5.3.0": version: 5.3.0 resolution: "chalk@npm:5.3.0" checksum: 10/6373caaab21bd64c405bfc4bd9672b145647fc9482657b5ea1d549b3b2765054e9d3d928870cdf764fb4aad67555f5061538ff247b8310f110c5c888d92397ea @@ -13852,7 +13863,7 @@ __metadata: languageName: node linkType: hard -"rxjs@npm:>=7.8.1, rxjs@npm:^7.8.1": +"rxjs@npm:>=7.8.1, rxjs@npm:^7.2.0, rxjs@npm:^7.8.1": version: 7.8.1 resolution: "rxjs@npm:7.8.1" dependencies: @@ -15152,13 +15163,6 @@ __metadata: languageName: node linkType: hard -"term-size@npm:^2.1.0": - version: 2.2.1 - resolution: "term-size@npm:2.2.1" - checksum: 10/f96aca2d4139c91e3359f5949ffb86f0a58f8c254ab7fe4a64b65126974939c782db6aaa91bf51a56d0344e505e22f9a0186f2f689e23ac9382b54606603c537 - languageName: node - linkType: hard - "test-exclude@npm:^7.0.1": version: 7.0.1 resolution: "test-exclude@npm:7.0.1" @@ -15627,7 +15631,7 @@ __metadata: languageName: node linkType: hard -"type-fest@npm:^2.12.2": +"type-fest@npm:^2.12.2, type-fest@npm:^2.13.0": version: 2.19.0 resolution: "type-fest@npm:2.19.0" checksum: 10/7bf9e8fdf34f92c8bb364c0af14ca875fac7e0183f2985498b77be129dc1b3b1ad0a6b3281580f19e48c6105c037fb966ad9934520c69c6434d17fd0af4eed78 @@ -15763,10 +15767,10 @@ __metadata: languageName: node linkType: hard -"undici-types@npm:~5.26.4": - version: 5.26.5 - resolution: "undici-types@npm:5.26.5" - checksum: 10/0097779d94bc0fd26f0418b3a05472410408877279141ded2bd449167be1aed7ea5b76f756562cb3586a07f251b90799bab22d9019ceba49c037c76445f7cddd +"undici-types@npm:~6.19.2": + version: 6.19.8 + resolution: "undici-types@npm:6.19.8" + checksum: 10/cf0b48ed4fc99baf56584afa91aaffa5010c268b8842f62e02f752df209e3dea138b372a60a963b3b2576ed932f32329ce7ddb9cb5f27a6c83040d8cd74b7a70 languageName: node linkType: hard @@ -16413,6 +16417,15 @@ __metadata: languageName: node linkType: hard +"widest-line@npm:^4.0.1": + version: 4.0.1 + resolution: "widest-line@npm:4.0.1" + dependencies: + string-width: "npm:^5.0.1" + checksum: 10/64c48cf27171221be5f86fc54b94dd29879165bdff1a7aa92dde723d9a8c99fb108312768a5d62c8c2b80b701fa27bbd36a1ddc58367585cd45c0db7920a0cba + languageName: node + linkType: hard + "widest-line@npm:^5.0.0": version: 5.0.0 resolution: "widest-line@npm:5.0.0" From 90e7c82e491e99c69d10b48578ea58d9c387bd04 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Wed, 25 Sep 2024 07:40:04 +0200 Subject: [PATCH 39/69] fix: remove normalize-path dependency --- packages/cli-core/package.json | 2 -- packages/cli-core/src/services/CliFs.ts | 6 +++--- packages/cli-core/src/services/Renderer.ts | 2 +- packages/cli-plugin-jest/src/hooks/JestGenerateHook.ts | 2 +- .../init/__snapshots__/init.integration.spec.ts.snap | 2 -- .../test/init/init.integration.spec.ts | 1 - .../test/integrations/init/init.integration.spec.ts | 2 -- .../cli-plugin-vitest/src/hooks/VitestGenerateHook.ts | 2 +- packages/cli-testing/src/FakeCliFs.ts | 6 +++--- packages/cli-testing/src/normalizePath.ts | 4 ++-- packages/cli/package.json | 1 - packages/cli/src/commands/generate/GenerateCmd.ts | 2 +- .../test/integrations/init/init.integration.spec.ts | 10 ---------- yarn.lock | 10 ---------- 14 files changed, 12 insertions(+), 40 deletions(-) diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index e9611a4f2..b538a9ccb 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -54,7 +54,6 @@ "inquirer-autocomplete-prompt": "2.0.0", "js-yaml": "4.1.0", "listr2": "5.0.5", - "normalize-path": "3.0.0", "read-pkg-up": "7.0.1", "registry-url": "5.1.0", "rxjs": "^7.5.5", @@ -75,7 +74,6 @@ "@types/globby": "9.1.0", "@types/inquirer": "9.0.7", "@types/js-yaml": "4.0.9", - "@types/normalize-path": "^3.0.2", "@types/read-pkg-up": "6.0.0", "@types/semver": "7.5.8", "@types/tunnel": "0.0.7", diff --git a/packages/cli-core/src/services/CliFs.ts b/packages/cli-core/src/services/CliFs.ts index 6e42e4232..0166728b1 100644 --- a/packages/cli-core/src/services/CliFs.ts +++ b/packages/cli-core/src/services/CliFs.ts @@ -1,7 +1,7 @@ import {Injectable} from "@tsed/di"; import {normalizePath} from "@tsed/normalize-path"; import type {PathLike, WriteFileOptions} from "fs"; -import Fs, {type EnsureOptions} from "fs-extra"; +import Fs, {type EnsureDirOptions} from "fs-extra"; import {join} from "path"; @Injectable() @@ -48,11 +48,11 @@ export class CliFs { return this.raw.writeFile(file, data, options as any); } - ensureDir(path: string, options?: EnsureOptions | number) { + ensureDir(path: string, options?: EnsureDirOptions | number) { return this.raw.ensureDir(path, options); } - ensureDirSync(path: string, options?: EnsureOptions | number): void { + ensureDirSync(path: string, options?: EnsureDirOptions | number): void { return this.raw.ensureDirSync(path, options); } diff --git a/packages/cli-core/src/services/Renderer.ts b/packages/cli-core/src/services/Renderer.ts index f622c233d..23e5cdd9c 100644 --- a/packages/cli-core/src/services/Renderer.ts +++ b/packages/cli-core/src/services/Renderer.ts @@ -2,11 +2,11 @@ import "../utils/hbs/index.js"; import {isString} from "@tsed/core"; import {Configuration, Constant, Inject, Injectable} from "@tsed/di"; +import {normalizePath} from "@tsed/normalize-path"; import Consolidate from "consolidate"; import fs from "fs-extra"; import globby from "globby"; import handlebars from "handlebars"; -import normalizePath from "normalize-path"; import {basename, dirname, join, relative} from "path"; import {Observable} from "rxjs"; diff --git a/packages/cli-plugin-jest/src/hooks/JestGenerateHook.ts b/packages/cli-plugin-jest/src/hooks/JestGenerateHook.ts index 2a005c547..349bd3125 100644 --- a/packages/cli-plugin-jest/src/hooks/JestGenerateHook.ts +++ b/packages/cli-plugin-jest/src/hooks/JestGenerateHook.ts @@ -1,6 +1,6 @@ import type {GenerateCmdContext} from "@tsed/cli"; import {Inject, Injectable, OnExec, SrcRendererService, type Tasks} from "@tsed/cli-core"; -import normalizePath from "normalize-path"; +import {normalizePath} from "@tsed/normalize-path"; import {TEMPLATE_DIR} from "../utils/templateDir.js"; diff --git a/packages/cli-plugin-oidc-provider/test/init/__snapshots__/init.integration.spec.ts.snap b/packages/cli-plugin-oidc-provider/test/init/__snapshots__/init.integration.spec.ts.snap index 3ec3ffcfb..b1a084080 100644 --- a/packages/cli-plugin-oidc-provider/test/init/__snapshots__/init.integration.spec.ts.snap +++ b/packages/cli-plugin-oidc-provider/test/init/__snapshots__/init.integration.spec.ts.snap @@ -2,7 +2,6 @@ exports[`Init OIDC Provider project > should generate a project with oidc 1`] = ` [ - "./project-name", "project-name", "project-name/.barrels.json", "project-name/.dockerignore", @@ -120,7 +119,6 @@ export class Server { exports[`Init OIDC Provider project > should generate a project with oidc and swagger 1`] = ` [ - "./project-name", "project-name", "project-name/.barrels.json", "project-name/.dockerignore", diff --git a/packages/cli-plugin-typegraphql/test/init/init.integration.spec.ts b/packages/cli-plugin-typegraphql/test/init/init.integration.spec.ts index 91c2bc00d..5491aa3f9 100644 --- a/packages/cli-plugin-typegraphql/test/init/init.integration.spec.ts +++ b/packages/cli-plugin-typegraphql/test/init/init.integration.spec.ts @@ -33,7 +33,6 @@ describe("Init TypeGraphQL project", () => { expect(FakeCliFs.getKeys()).toMatchInlineSnapshot(` [ - "./project-name", "project-name", "project-name/.barrels.json", "project-name/.dockerignore", diff --git a/packages/cli-plugin-typeorm/test/integrations/init/init.integration.spec.ts b/packages/cli-plugin-typeorm/test/integrations/init/init.integration.spec.ts index ad7920264..97581b411 100644 --- a/packages/cli-plugin-typeorm/test/integrations/init/init.integration.spec.ts +++ b/packages/cli-plugin-typeorm/test/integrations/init/init.integration.spec.ts @@ -51,7 +51,6 @@ describe("TypeORM: Init cmd", () => { expect(FakeCliFs.getKeys()).toMatchInlineSnapshot(` [ - "./project-name", "project-name", "project-name/.barrels.json", "project-name/.dockerignore", @@ -128,7 +127,6 @@ describe("TypeORM: Init cmd", () => { expect(FakeCliFs.getKeys()).toMatchInlineSnapshot(` [ - "./project-name", "project-name", "project-name/.barrels.json", "project-name/.dockerignore", diff --git a/packages/cli-plugin-vitest/src/hooks/VitestGenerateHook.ts b/packages/cli-plugin-vitest/src/hooks/VitestGenerateHook.ts index cc5af6e58..82a3e2955 100644 --- a/packages/cli-plugin-vitest/src/hooks/VitestGenerateHook.ts +++ b/packages/cli-plugin-vitest/src/hooks/VitestGenerateHook.ts @@ -1,6 +1,6 @@ import type {GenerateCmdContext} from "@tsed/cli"; import {Inject, Injectable, OnExec, SrcRendererService, type Tasks} from "@tsed/cli-core"; -import normalizePath from "normalize-path"; +import {normalizePath} from "@tsed/normalize-path"; import {TEMPLATE_DIR} from "../utils/templateDir.js"; diff --git a/packages/cli-testing/src/FakeCliFs.ts b/packages/cli-testing/src/FakeCliFs.ts index 37ff6026c..b0735e229 100644 --- a/packages/cli-testing/src/FakeCliFs.ts +++ b/packages/cli-testing/src/FakeCliFs.ts @@ -1,7 +1,7 @@ import {isString} from "@tsed/core"; import type {PathLike} from "fs"; import * as fs from "fs"; -import type {EnsureOptions, WriteFileOptions} from "fs-extra"; +import type {EnsureDirOptions, WriteFileOptions} from "fs-extra"; import {normalizePath} from "./normalizePath.js"; @@ -55,12 +55,12 @@ export class FakeCliFs { FakeCliFs.entries.set(normalizePath(file), data); } - ensureDir(path: string, options?: EnsureOptions | number): Promise { + ensureDir(path: string, options?: EnsureDirOptions | number): Promise { FakeCliFs.entries.set(normalizePath(path), path); return Promise.resolve(); } - ensureDirSync(path: string, options?: EnsureOptions | number) { + ensureDirSync(path: string, options?: EnsureDirOptions | number) { FakeCliFs.entries.set(normalizePath(path), path); } diff --git a/packages/cli-testing/src/normalizePath.ts b/packages/cli-testing/src/normalizePath.ts index 8842da337..d6c585f14 100644 --- a/packages/cli-testing/src/normalizePath.ts +++ b/packages/cli-testing/src/normalizePath.ts @@ -1,9 +1,9 @@ import {isString} from "@tsed/core"; -import normalize_path from "normalize-path"; +import {normalizePath as n} from "@tsed/normalize-path"; export function normalizePath(item: any) { if (isString(item)) { - return normalize_path(item); + return n(item); } return item.map(normalizePath); diff --git a/packages/cli/package.json b/packages/cli/package.json index a3014ee4f..085073ec0 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -75,7 +75,6 @@ "change-case": "4.1.2", "esm-module-alias": "^2.2.1", "globby": "11.1.0", - "normalize-path": "3.0.0", "read-pkg-up": "7.0.1", "semver": "^7.3.5", "tslib": "2.3.1" diff --git a/packages/cli/src/commands/generate/GenerateCmd.ts b/packages/cli/src/commands/generate/GenerateCmd.ts index a0facc82a..fcbe74147 100644 --- a/packages/cli/src/commands/generate/GenerateCmd.ts +++ b/packages/cli/src/commands/generate/GenerateCmd.ts @@ -1,7 +1,7 @@ import {type CliDefaultOptions, Command, type CommandProvider, Inject, ProjectPackageJson, SrcRendererService} from "@tsed/cli-core"; +import {normalizePath} from "@tsed/normalize-path"; import {paramCase, pascalCase} from "change-case"; import globby from "globby"; -import normalizePath from "normalize-path"; import {basename, dirname, join} from "path"; import {ProjectConvention} from "../../interfaces/ProjectConvention.js"; diff --git a/packages/cli/test/integrations/init/init.integration.spec.ts b/packages/cli/test/integrations/init/init.integration.spec.ts index 5de0ab910..91f124146 100644 --- a/packages/cli/test/integrations/init/init.integration.spec.ts +++ b/packages/cli/test/integrations/init/init.integration.spec.ts @@ -39,7 +39,6 @@ describe("Init cmd", () => { expect(FakeCliFs.getKeys()).toMatchInlineSnapshot(` [ - "./project-name", "project-name", "project-name/.barrels.json", "project-name/.dockerignore", @@ -144,7 +143,6 @@ describe("Init cmd", () => { expect(FakeCliFs.getKeys()).toMatchInlineSnapshot(` [ - "./project-name", "project-name", "project-name/.barrels.json", "project-name/.dockerignore", @@ -244,7 +242,6 @@ describe("Init cmd", () => { expect(FakeCliFs.getKeys()).toMatchInlineSnapshot(` [ - "./project-name", "project-name", "project-name/.barrels.json", "project-name/.dockerignore", @@ -336,7 +333,6 @@ describe("Init cmd", () => { expect(FakeCliFs.getKeys()).toMatchInlineSnapshot(` [ - "./project-name", "project-name", "project-name/.babelrc", "project-name/.barrels.json", @@ -429,7 +425,6 @@ describe("Init cmd", () => { expect(FakeCliFs.getKeys()).toMatchInlineSnapshot(` [ - "./project-name", "project-name", "project-name/.babelrc", "project-name/.barrels.json", @@ -523,7 +518,6 @@ describe("Init cmd", () => { expect(FakeCliFs.getKeys()).toMatchInlineSnapshot(` [ - "./project-name", "project-name", "project-name/.barrels.json", "project-name/.dockerignore", @@ -621,7 +615,6 @@ describe("Init cmd", () => { expect(FakeCliFs.getKeys()).toMatchInlineSnapshot(` [ - "./project-name", "project-name", "project-name/.barrels.json", "project-name/.dockerignore", @@ -688,7 +681,6 @@ describe("Init cmd", () => { expect(FakeCliFs.getKeys()).toMatchInlineSnapshot(` [ - "./project-name", "project-name", "project-name/.barrels.json", "project-name/.dockerignore", @@ -754,7 +746,6 @@ describe("Init cmd", () => { expect(FakeCliFs.getKeys()).toMatchInlineSnapshot(` [ - "./project-name", "project-name", "project-name/.barrels.json", "project-name/.dockerignore", @@ -863,7 +854,6 @@ describe("Init cmd", () => { expect(FakeCliFs.getKeys()).toMatchInlineSnapshot(` [ - "./project-name", "project-name", "project-name/.barrels.json", "project-name/.dockerignore", diff --git a/yarn.lock b/yarn.lock index 41cbc8fcf..ec36156e8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2268,7 +2268,6 @@ __metadata: "@types/globby": "npm:9.1.0" "@types/inquirer": "npm:9.0.7" "@types/js-yaml": "npm:4.0.9" - "@types/normalize-path": "npm:^3.0.2" "@types/read-pkg-up": "npm:6.0.0" "@types/semver": "npm:7.5.8" "@types/tunnel": "npm:0.0.7" @@ -2295,7 +2294,6 @@ __metadata: inquirer-autocomplete-prompt: "npm:2.0.0" js-yaml: "npm:4.1.0" listr2: "npm:5.0.5" - normalize-path: "npm:3.0.0" read-pkg-up: "npm:7.0.1" registry-url: "npm:5.1.0" rxjs: "npm:^7.5.5" @@ -2599,7 +2597,6 @@ __metadata: cross-env: "npm:7.0.3" esm-module-alias: "npm:^2.2.1" globby: "npm:11.1.0" - normalize-path: "npm:3.0.0" read-pkg-up: "npm:7.0.1" semver: "npm:^7.3.5" tslib: "npm:2.3.1" @@ -2991,13 +2988,6 @@ __metadata: languageName: node linkType: hard -"@types/normalize-path@npm:^3.0.2": - version: 3.0.2 - resolution: "@types/normalize-path@npm:3.0.2" - checksum: 10/0fafa7d0c19eca1501cc4f9ce8a8c6ca7739d0fcd58f5851c56ad2babafc07c6113d593b4d8cc045678e0828af134f2339901f8dfe200801ee7b2d3e1496c316 - languageName: node - linkType: hard - "@types/parse-json@npm:^4.0.0": version: 4.0.0 resolution: "@types/parse-json@npm:4.0.0" From 3111183cf3024112013112b1eebe295926531192 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Wed, 25 Sep 2024 07:41:50 +0200 Subject: [PATCH 40/69] fix: remove @types/axios dependency --- packages/cli-core/package.json | 1 - yarn.lock | 21 +-------------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index b538a9ccb..25608c12f 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -67,7 +67,6 @@ }, "devDependencies": { "@tsed/typescript": "workspace:*", - "@types/axios": "0.14.0", "@types/commander": "2.12.2", "@types/consolidate": "0.14.4", "@types/figures": "3.0.1", diff --git a/yarn.lock b/yarn.lock index ec36156e8..fc6e0e7f7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2260,7 +2260,6 @@ __metadata: "@tsed/logger": "npm:>=6.1.1" "@tsed/normalize-path": "npm:>=7.14.2" "@tsed/typescript": "workspace:*" - "@types/axios": "npm:0.14.0" "@types/commander": "npm:2.12.2" "@types/consolidate": "npm:0.14.4" "@types/figures": "npm:3.0.1" @@ -2795,15 +2794,6 @@ __metadata: languageName: node linkType: hard -"@types/axios@npm:0.14.0": - version: 0.14.0 - resolution: "@types/axios@npm:0.14.0" - dependencies: - axios: "npm:*" - checksum: 10/12a230b9404055d81804cb57fe4739b2317111b28a39e2477b2513250e8b85725e6f6ce509fc2a9494a6da60facb8d80df875fcd747f62f6c3abebc7db60ae66 - languageName: node - linkType: hard - "@types/bluebird@npm:*": version: 3.5.36 resolution: "@types/bluebird@npm:3.5.36" @@ -4165,15 +4155,6 @@ __metadata: languageName: node linkType: hard -"axios@npm:*": - version: 0.26.1 - resolution: "axios@npm:0.26.1" - dependencies: - follow-redirects: "npm:^1.14.8" - checksum: 10/02863f4a4fd4e43ad6e0c8bc9d1359a0863c43cc57bda42ea21dfce34681e3211df193b2bf2e8ee10b2c3870ab8d6bed38a3cf80cd6e8ee17749b7d73ccd4752 - languageName: node - linkType: hard - "axios@npm:1.6.7, axios@npm:>=1.6.7": version: 1.6.7 resolution: "axios@npm:1.6.7" @@ -7305,7 +7286,7 @@ __metadata: languageName: node linkType: hard -"follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.8": +"follow-redirects@npm:^1.14.0": version: 1.15.1 resolution: "follow-redirects@npm:1.15.1" peerDependenciesMeta: From 681a62c27b590d09515412a9ea11c06319e2a9d5 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Wed, 25 Sep 2024 07:47:11 +0200 Subject: [PATCH 41/69] fix: bump some dependencies --- package.json | 36 +- packages/cli-core/package.json | 20 +- packages/cli-plugin-passport/package.json | 2 +- packages/cli/package.json | 2 +- yarn.lock | 802 ++++++++++++---------- 5 files changed, 484 insertions(+), 378 deletions(-) diff --git a/package.json b/package.json index c56da4276..69328256d 100644 --- a/package.json +++ b/package.json @@ -50,24 +50,24 @@ "@tsed/logger": ">=6.2.1", "@tsed/normalize-path": ">=7.14.2", "any-observable": "0.5.1", - "axios": "1.6.7", - "chalk": "4.1.0", + "axios": "1.7.7", + "chalk": "5.3.0", "commander": "9.3.0", - "consolidate": "0.16.0", + "consolidate": "1.0.4", "execa": "5.1.1", "figures": "4.0.1", "fs-extra": "11.1.0", - "handlebars": "4.7.7", + "handlebars": "4.7.8", "handlebars-helpers": "0.10.0", - "inquirer": "8.2.4", - "inquirer-autocomplete-prompt": "2.0.0", + "inquirer": "8.2.6", + "inquirer-autocomplete-prompt": "2.0.1", "js-yaml": "4.1.0", "lerna": "8.1.8", - "listr2": "5.0.5", + "listr2": "5.0.8", "read-pkg-up": "7.0.1", "registry-url": "5.1.0", - "rxjs": "^7.5.5", - "semver": "7.3.5", + "rxjs": "^7.8.1", + "semver": "7.6.3", "split": "1.0.1", "tslib": "2.3.1", "update-notifier": "5.1.0" @@ -81,23 +81,23 @@ "@tsed/monorepo-utils": "2.3.5", "@tsed/ts-doc": "^4.1.0", "@types/node": "22.7.0", - "@typescript-eslint/eslint-plugin": "8.5.0", - "@typescript-eslint/parser": "8.5.0", + "@typescript-eslint/eslint-plugin": "8.7.0", + "@typescript-eslint/parser": "8.7.0", "@vitest/coverage-v8": "^2.1.1", - "concurrently": "7.6.0", + "concurrently": "9.0.1", "cross-env": "7.0.3", "entities": "1.1.2", - "eslint": "9.10.0", + "eslint": "9.11.1", "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.2.1", "eslint-plugin-simple-import-sort": "12.1.1", "eslint-plugin-vitest": "^0.5.4", - "eslint-plugin-workspaces": "0.8.0", - "gflow": "^5.1.2", - "husky": "8.0.1", + "eslint-plugin-workspaces": "0.10.1", + "gflow": "^5.1.4", + "husky": "9.1.6", "is-ci": "3.0.1", - "lint-staged": "13.0.3", - "markdown-it": "13.0.1", + "lint-staged": "15.2.10", + "markdown-it": "13.0.2", "prettier": "3.3.3", "semantic-release": "24.1.1", "semantic-release-slack-bot": "4.0.2", diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index 25608c12f..99aecf4c9 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -37,27 +37,27 @@ "@types/fs-extra": "^11.0.4", "@types/inquirer": "^9.0.7", "ajv": "8.17.1", - "axios": "1.6.7", + "axios": "1.7.7", "chalk": "4.1.2", - "change-case": "^4.1.2", + "change-case": "^5.4.4", "commander": "9.3.0", - "consolidate": "1.0.1", + "consolidate": "1.0.4", "create-frame": "1.0.0", - "enquirer": "2.3.6", + "enquirer": "2.4.1", "execa": "5.1.1", "figures": "4.0.1", "fs-extra": "11.1.0", "globby": "11.1.0", - "handlebars": "4.7.7", + "handlebars": "4.7.8", "handlebars-utils": "1.0.6", - "inquirer": "8.2.4", - "inquirer-autocomplete-prompt": "2.0.0", + "inquirer": "8.2.6", + "inquirer-autocomplete-prompt": "2.0.1", "js-yaml": "4.1.0", - "listr2": "5.0.5", + "listr2": "5.0.8", "read-pkg-up": "7.0.1", "registry-url": "5.1.0", - "rxjs": "^7.5.5", - "semver": "7.3.5", + "rxjs": "^7.8.1", + "semver": "7.6.3", "split": "1.0.1", "tslib": "2.3.1", "tunnel": "0.0.6", diff --git a/packages/cli-plugin-passport/package.json b/packages/cli-plugin-passport/package.json index be85353f6..905ec2a90 100644 --- a/packages/cli-plugin-passport/package.json +++ b/packages/cli-plugin-passport/package.json @@ -21,7 +21,7 @@ "test:ci": "vitest run --coverage.thresholds.autoUpdate=true" }, "dependencies": { - "change-case": "^4.1.2", + "change-case": "^5.4.4", "tslib": "2.3.1" }, "devDependencies": { diff --git a/packages/cli/package.json b/packages/cli/package.json index 085073ec0..2e9a66c3b 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -76,7 +76,7 @@ "esm-module-alias": "^2.2.1", "globby": "11.1.0", "read-pkg-up": "7.0.1", - "semver": "^7.3.5", + "semver": "^7.6.3", "tslib": "2.3.1" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index fc6e0e7f7..2b1d9af67 100644 --- a/yarn.lock +++ b/yarn.lock @@ -538,6 +538,13 @@ __metadata: languageName: node linkType: hard +"@eslint/core@npm:^0.6.0": + version: 0.6.0 + resolution: "@eslint/core@npm:0.6.0" + checksum: 10/ec5cce168c8773fbd60c5a505563c6cf24398b3e1fa352929878d63129e0dd5b134d3232be2f2c49e8124a965d03359b38962aa0dcf7dfaf50746059d2a2f798 + languageName: node + linkType: hard + "@eslint/eslintrc@npm:^3.1.0": version: 3.1.0 resolution: "@eslint/eslintrc@npm:3.1.0" @@ -555,10 +562,10 @@ __metadata: languageName: node linkType: hard -"@eslint/js@npm:9.10.0": - version: 9.10.0 - resolution: "@eslint/js@npm:9.10.0" - checksum: 10/cbda2bf268c8ac7a2b2493aaaa0113a78165a576ee5178b9fbdaf245c3d40ffaf41d006f75afab5718f68d816f00319e267b4c88ead100b19022fe491f9e0175 +"@eslint/js@npm:9.11.1": + version: 9.11.1 + resolution: "@eslint/js@npm:9.11.1" + checksum: 10/77b9c744bdf24e2ca1f99f671139767d6c31cb10d732cf22a85ef28f1f95f2a621cf204f572fd9fee67da6193ff2597a5d236cef3b557b07624230b622612339 languageName: node linkType: hard @@ -569,12 +576,12 @@ __metadata: languageName: node linkType: hard -"@eslint/plugin-kit@npm:^0.1.0": - version: 0.1.0 - resolution: "@eslint/plugin-kit@npm:0.1.0" +"@eslint/plugin-kit@npm:^0.2.0": + version: 0.2.0 + resolution: "@eslint/plugin-kit@npm:0.2.0" dependencies: levn: "npm:^0.4.1" - checksum: 10/3c6b10505f53c6e32b40572f780164b75389bbabd1bf80ab8742222710d90683a2cc9480468fca132da636f6a3053ae60b173181d14f4975fde2e6f8f9564c6d + checksum: 10/ebb363174397341dea47dc35fc206e24328083e4f0fa1c539687dbb7f94bef77e43faa12867d032e6eea5ac980ea8fbb6b1d844186e422d327c04088041b99f3 languageName: node linkType: hard @@ -2274,29 +2281,29 @@ __metadata: "@types/url-parse": "npm:^1.4.11" "@types/uuid": "npm:10.0.0" ajv: "npm:8.17.1" - axios: "npm:1.6.7" + axios: "npm:1.7.7" chalk: "npm:4.1.2" - change-case: "npm:^4.1.2" + change-case: "npm:^5.4.4" commander: "npm:9.3.0" - consolidate: "npm:1.0.1" + consolidate: "npm:1.0.4" create-frame: "npm:1.0.0" cross-env: "npm:7.0.3" deps: "npm:^1.0.0" - enquirer: "npm:2.3.6" + enquirer: "npm:2.4.1" execa: "npm:5.1.1" figures: "npm:4.0.1" fs-extra: "npm:11.1.0" globby: "npm:11.1.0" - handlebars: "npm:4.7.7" + handlebars: "npm:4.7.8" handlebars-utils: "npm:1.0.6" - inquirer: "npm:8.2.4" - inquirer-autocomplete-prompt: "npm:2.0.0" + inquirer: "npm:8.2.6" + inquirer-autocomplete-prompt: "npm:2.0.1" js-yaml: "npm:4.1.0" - listr2: "npm:5.0.5" + listr2: "npm:5.0.8" read-pkg-up: "npm:7.0.1" registry-url: "npm:5.1.0" - rxjs: "npm:^7.5.5" - semver: "npm:7.3.5" + rxjs: "npm:^7.8.1" + semver: "npm:7.6.3" split: "npm:1.0.1" tslib: "npm:2.3.1" tunnel: "npm:0.0.6" @@ -2428,7 +2435,7 @@ __metadata: "@tsed/cli-core": "workspace:*" "@tsed/typescript": "workspace:*" "@types/change-case": "npm:^2.3.1" - change-case: "npm:^4.1.2" + change-case: "npm:^5.4.4" cross-env: "npm:7.0.3" tslib: "npm:2.3.1" typescript: "npm:5.6.2" @@ -2514,45 +2521,45 @@ __metadata: "@tsed/normalize-path": "npm:>=7.14.2" "@tsed/ts-doc": "npm:^4.1.0" "@types/node": "npm:22.7.0" - "@typescript-eslint/eslint-plugin": "npm:8.5.0" - "@typescript-eslint/parser": "npm:8.5.0" + "@typescript-eslint/eslint-plugin": "npm:8.7.0" + "@typescript-eslint/parser": "npm:8.7.0" "@vitest/coverage-v8": "npm:^2.1.1" any-observable: "npm:0.5.1" - axios: "npm:1.6.7" - chalk: "npm:4.1.0" + axios: "npm:1.7.7" + chalk: "npm:5.3.0" commander: "npm:9.3.0" - concurrently: "npm:7.6.0" - consolidate: "npm:0.16.0" + concurrently: "npm:9.0.1" + consolidate: "npm:1.0.4" cross-env: "npm:7.0.3" entities: "npm:1.1.2" - eslint: "npm:9.10.0" + eslint: "npm:9.11.1" eslint-config-prettier: "npm:9.1.0" eslint-plugin-prettier: "npm:5.2.1" eslint-plugin-simple-import-sort: "npm:12.1.1" eslint-plugin-vitest: "npm:^0.5.4" - eslint-plugin-workspaces: "npm:0.8.0" + eslint-plugin-workspaces: "npm:0.10.1" execa: "npm:5.1.1" figures: "npm:4.0.1" fs-extra: "npm:11.1.0" - gflow: "npm:^5.1.2" - handlebars: "npm:4.7.7" + gflow: "npm:^5.1.4" + handlebars: "npm:4.7.8" handlebars-helpers: "npm:0.10.0" - husky: "npm:8.0.1" - inquirer: "npm:8.2.4" - inquirer-autocomplete-prompt: "npm:2.0.0" + husky: "npm:9.1.6" + inquirer: "npm:8.2.6" + inquirer-autocomplete-prompt: "npm:2.0.1" is-ci: "npm:3.0.1" js-yaml: "npm:4.1.0" lerna: "npm:8.1.8" - lint-staged: "npm:13.0.3" - listr2: "npm:5.0.5" - markdown-it: "npm:13.0.1" + lint-staged: "npm:15.2.10" + listr2: "npm:5.0.8" + markdown-it: "npm:13.0.2" prettier: "npm:3.3.3" read-pkg-up: "npm:7.0.1" registry-url: "npm:5.1.0" - rxjs: "npm:^7.5.5" + rxjs: "npm:^7.8.1" semantic-release: "npm:24.1.1" semantic-release-slack-bot: "npm:4.0.2" - semver: "npm:7.3.5" + semver: "npm:7.6.3" split: "npm:1.0.1" ts-node: "npm:^10.9.2" tslib: "npm:2.3.1" @@ -2597,7 +2604,7 @@ __metadata: esm-module-alias: "npm:^2.2.1" globby: "npm:11.1.0" read-pkg-up: "npm:7.0.1" - semver: "npm:^7.3.5" + semver: "npm:^7.6.3" tslib: "npm:2.3.1" typescript: "npm:5.6.2" vitest: "npm:2.1.1" @@ -2852,6 +2859,13 @@ __metadata: languageName: node linkType: hard +"@types/estree@npm:^1.0.6": + version: 1.0.6 + resolution: "@types/estree@npm:1.0.6" + checksum: 10/9d35d475095199c23e05b431bcdd1f6fec7380612aed068b14b2a08aa70494de8a9026765a5a91b1073f636fb0368f6d8973f518a31391d519e20c59388ed88d + languageName: node + linkType: hard + "@types/figures@npm:3.0.1": version: 3.0.1 resolution: "@types/figures@npm:3.0.1" @@ -2907,6 +2921,13 @@ __metadata: languageName: node linkType: hard +"@types/json-schema@npm:^7.0.15": + version: 7.0.15 + resolution: "@types/json-schema@npm:7.0.15" + checksum: 10/1a3c3e06236e4c4aab89499c428d585527ce50c24fe8259e8b3926d3df4cfbbbcf306cfc73ddfb66cbafc973116efd15967020b0f738f63e09e64c7d260519e7 + languageName: node + linkType: hard + "@types/jsonfile@npm:*": version: 6.1.4 resolution: "@types/jsonfile@npm:6.1.4" @@ -3066,15 +3087,15 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:8.5.0": - version: 8.5.0 - resolution: "@typescript-eslint/eslint-plugin@npm:8.5.0" +"@typescript-eslint/eslint-plugin@npm:8.7.0": + version: 8.7.0 + resolution: "@typescript-eslint/eslint-plugin@npm:8.7.0" dependencies: "@eslint-community/regexpp": "npm:^4.10.0" - "@typescript-eslint/scope-manager": "npm:8.5.0" - "@typescript-eslint/type-utils": "npm:8.5.0" - "@typescript-eslint/utils": "npm:8.5.0" - "@typescript-eslint/visitor-keys": "npm:8.5.0" + "@typescript-eslint/scope-manager": "npm:8.7.0" + "@typescript-eslint/type-utils": "npm:8.7.0" + "@typescript-eslint/utils": "npm:8.7.0" + "@typescript-eslint/visitor-keys": "npm:8.7.0" graphemer: "npm:^1.4.0" ignore: "npm:^5.3.1" natural-compare: "npm:^1.4.0" @@ -3085,25 +3106,25 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 10/344f5aca7e167544af718b81269b87b8c2a041210882cac76e1608dbec7c2a646de74387920ca9a5704fcd4c24ada052c2bc5adbeee39e950e7bce83647dae7d + checksum: 10/5bc774b1da4e1cd19c5ffd731c655c53035fd81ff06a95c2f2c54ab62c401879f886da3e1a1235505341e8172b2841c6edc78b4565a261105ab32d83bf5b8ab1 languageName: node linkType: hard -"@typescript-eslint/parser@npm:8.5.0": - version: 8.5.0 - resolution: "@typescript-eslint/parser@npm:8.5.0" +"@typescript-eslint/parser@npm:8.7.0": + version: 8.7.0 + resolution: "@typescript-eslint/parser@npm:8.7.0" dependencies: - "@typescript-eslint/scope-manager": "npm:8.5.0" - "@typescript-eslint/types": "npm:8.5.0" - "@typescript-eslint/typescript-estree": "npm:8.5.0" - "@typescript-eslint/visitor-keys": "npm:8.5.0" + "@typescript-eslint/scope-manager": "npm:8.7.0" + "@typescript-eslint/types": "npm:8.7.0" + "@typescript-eslint/typescript-estree": "npm:8.7.0" + "@typescript-eslint/visitor-keys": "npm:8.7.0" debug: "npm:^4.3.4" peerDependencies: eslint: ^8.57.0 || ^9.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 10/f0d5a11a8d4b42750c3e7a3a8f6874740c7bb006b6bf3037a2b1422ba8f4eb2ff2d46e673a9f54007b95d3e4302b7966677b2481da58b6307d0ceb962478ee95 + checksum: 10/896ac60f8426f9e5c23198c89555f6f88f7957c5b16bb7b966dac45c5f5e7076c1a050bcee2e0eddff88055b9c0d7bdfaef9c64889e3bdf3356d20356b0daa04 languageName: node linkType: hard @@ -3117,28 +3138,28 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:8.5.0": - version: 8.5.0 - resolution: "@typescript-eslint/scope-manager@npm:8.5.0" +"@typescript-eslint/scope-manager@npm:8.7.0": + version: 8.7.0 + resolution: "@typescript-eslint/scope-manager@npm:8.7.0" dependencies: - "@typescript-eslint/types": "npm:8.5.0" - "@typescript-eslint/visitor-keys": "npm:8.5.0" - checksum: 10/18f9958cdf196a0beede93535e564313d27dfd392a335952c785e46c32def55fdeae8c3c7d46f07c81c105ed2b48e9cd36a1fe5101fccd80e83c04cf1693dbed + "@typescript-eslint/types": "npm:8.7.0" + "@typescript-eslint/visitor-keys": "npm:8.7.0" + checksum: 10/6a6aae28437f6cd78f82dd1359658593fcc8f6d0da966b4d128b14db3a307b6094d22515a79c222055a31bf9b73b73799acf18fbf48c0da16e8f408fcc10464c languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:8.5.0": - version: 8.5.0 - resolution: "@typescript-eslint/type-utils@npm:8.5.0" +"@typescript-eslint/type-utils@npm:8.7.0": + version: 8.7.0 + resolution: "@typescript-eslint/type-utils@npm:8.7.0" dependencies: - "@typescript-eslint/typescript-estree": "npm:8.5.0" - "@typescript-eslint/utils": "npm:8.5.0" + "@typescript-eslint/typescript-estree": "npm:8.7.0" + "@typescript-eslint/utils": "npm:8.7.0" debug: "npm:^4.3.4" ts-api-utils: "npm:^1.3.0" peerDependenciesMeta: typescript: optional: true - checksum: 10/ed487c8b530a0a6ea292385c82b2d9d9d94b99768ddd93882899be3319ea6af09c1b9f1a07e0381beb6149bbbb1f66ae95a635279fad8946345fd2298bce3549 + checksum: 10/dba4520dd3dce35b765640f9633100bd29d2092478cb467e89bde51dc23fb19f7395e87f4486b898315aab081263003cbc78f03f0f40079602713aafc2f2a6a5 languageName: node linkType: hard @@ -3156,10 +3177,10 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/types@npm:8.5.0": - version: 8.5.0 - resolution: "@typescript-eslint/types@npm:8.5.0" - checksum: 10/5cc55411fbf3f46d1571fe6ad1ef88f937093629a58e2b7bafb389646dde8a4e29d938fd57309eb30ee3f20978b4bdc5f823b31d718e053ba4c54c637a6df4e4 +"@typescript-eslint/types@npm:8.7.0": + version: 8.7.0 + resolution: "@typescript-eslint/types@npm:8.7.0" + checksum: 10/9adbe4efdcb00735af5144a161d6bb2f79a952a9701820920ad33adba02032d65d5b601087e953c2918f7efa548abbcd9289f83ec6299f66941d7c585886792e languageName: node linkType: hard @@ -3182,12 +3203,12 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:8.5.0": - version: 8.5.0 - resolution: "@typescript-eslint/typescript-estree@npm:8.5.0" +"@typescript-eslint/typescript-estree@npm:8.7.0": + version: 8.7.0 + resolution: "@typescript-eslint/typescript-estree@npm:8.7.0" dependencies: - "@typescript-eslint/types": "npm:8.5.0" - "@typescript-eslint/visitor-keys": "npm:8.5.0" + "@typescript-eslint/types": "npm:8.7.0" + "@typescript-eslint/visitor-keys": "npm:8.7.0" debug: "npm:^4.3.4" fast-glob: "npm:^3.3.2" is-glob: "npm:^4.0.3" @@ -3197,7 +3218,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 10/69f21c49a158c394106e0d627f57451430cf32449a6c01118ee4afbb9f92f06be3aa87f3478ffc84d1062c3b21dca983e458f70f2cbe4fee1ad206f84ab97eb8 + checksum: 10/c4f7e3c18c8382b72800681c37c87726b02a96cf6831be37d2d2f9c26267016a9dd7af4e08184b96376a9aebdc5c344c6c378c86821c374fe10a9e45aca1b33d languageName: node linkType: hard @@ -3220,17 +3241,17 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/utils@npm:8.5.0": - version: 8.5.0 - resolution: "@typescript-eslint/utils@npm:8.5.0" +"@typescript-eslint/utils@npm:8.7.0": + version: 8.7.0 + resolution: "@typescript-eslint/utils@npm:8.7.0" dependencies: "@eslint-community/eslint-utils": "npm:^4.4.0" - "@typescript-eslint/scope-manager": "npm:8.5.0" - "@typescript-eslint/types": "npm:8.5.0" - "@typescript-eslint/typescript-estree": "npm:8.5.0" + "@typescript-eslint/scope-manager": "npm:8.7.0" + "@typescript-eslint/types": "npm:8.7.0" + "@typescript-eslint/typescript-estree": "npm:8.7.0" peerDependencies: eslint: ^8.57.0 || ^9.0.0 - checksum: 10/f4727ebdee15082debe61a815eaad588f006a4f93d7fe94d065da563b4d3f91b7b7f795b5c77aa4cdebdf0936f83aa878089f22b8dbdbb738c557e8974129f54 + checksum: 10/81674503fb5ea32ff5de8f1a29fecbcfa947025e7609e861ac8e32cd13326fc050c4fa5044e1a877f05e7e1264c42b9c72a7fd09c4a41d0ac2cf1c49259abf03 languageName: node linkType: hard @@ -3268,13 +3289,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:8.5.0": - version: 8.5.0 - resolution: "@typescript-eslint/visitor-keys@npm:8.5.0" +"@typescript-eslint/visitor-keys@npm:8.7.0": + version: 8.7.0 + resolution: "@typescript-eslint/visitor-keys@npm:8.7.0" dependencies: - "@typescript-eslint/types": "npm:8.5.0" + "@typescript-eslint/types": "npm:8.7.0" eslint-visitor-keys: "npm:^3.4.3" - checksum: 10/32cc9d8120531bb1b5da79d697ab80bbbf18e5630d74c8b6c0f835d7914be7833ed9e5b95fa05f6f7b724d928cd4208b4028a2cc9d767401434d88214614887b + checksum: 10/189ea297ff4da53aea92f31de57aed164550c51ac7cf663007c997c4f0f75a82097e35568e3a0fbcced290cb4c12ab7d3afd99e93eb37c930d7f6d6bbfd6ed98 languageName: node linkType: hard @@ -3451,7 +3472,7 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^8.11.0, acorn@npm:^8.12.0, acorn@npm:^8.12.1, acorn@npm:^8.4.1": +"acorn@npm:^8.11.0, acorn@npm:^8.11.3, acorn@npm:^8.12.0, acorn@npm:^8.12.1, acorn@npm:^8.4.1": version: 8.12.1 resolution: "acorn@npm:8.12.1" bin: @@ -3713,6 +3734,15 @@ __metadata: languageName: node linkType: hard +"ansi-escapes@npm:^7.0.0": + version: 7.0.0 + resolution: "ansi-escapes@npm:7.0.0" + dependencies: + environment: "npm:^1.0.0" + checksum: 10/2d0e2345087bd7ae6bf122b9cc05ee35560d40dcc061146edcdc02bc2d7c7c50143cd12a22e69a0b5c0f62b948b7bc9a4539ee888b80f5bd33cdfd82d01a70ab + languageName: node + linkType: hard + "ansi-gray@npm:^0.1.1": version: 0.1.1 resolution: "ansi-gray@npm:0.1.1" @@ -4155,7 +4185,18 @@ __metadata: languageName: node linkType: hard -"axios@npm:1.6.7, axios@npm:>=1.6.7": +"axios@npm:1.7.7, axios@npm:^1.7.4": + version: 1.7.7 + resolution: "axios@npm:1.7.7" + dependencies: + follow-redirects: "npm:^1.15.6" + form-data: "npm:^4.0.0" + proxy-from-env: "npm:^1.1.0" + checksum: 10/7f875ea13b9298cd7b40fd09985209f7a38d38321f1118c701520939de2f113c4ba137832fe8e3f811f99a38e12c8225481011023209a77b0c0641270e20cde1 + languageName: node + linkType: hard + +"axios@npm:>=1.6.7": version: 1.6.7 resolution: "axios@npm:1.6.7" dependencies: @@ -4175,17 +4216,6 @@ __metadata: languageName: node linkType: hard -"axios@npm:^1.7.4": - version: 1.7.7 - resolution: "axios@npm:1.7.7" - dependencies: - follow-redirects: "npm:^1.15.6" - form-data: "npm:^4.0.0" - proxy-from-env: "npm:^1.1.0" - checksum: 10/7f875ea13b9298cd7b40fd09985209f7a38d38321f1118c701520939de2f113c4ba137832fe8e3f811f99a38e12c8225481011023209a77b0c0641270e20cde1 - languageName: node - linkType: hard - "bail@npm:^1.0.0": version: 1.0.5 resolution: "bail@npm:1.0.5" @@ -4278,13 +4308,6 @@ __metadata: languageName: node linkType: hard -"bluebird@npm:^3.7.2": - version: 3.7.2 - resolution: "bluebird@npm:3.7.2" - checksum: 10/007c7bad22c5d799c8dd49c85b47d012a1fe3045be57447721e6afbd1d5be43237af1db62e26cb9b0d9ba812d2e4ca3bac82f6d7e016b6b88de06ee25ceb96e7 - languageName: node - linkType: hard - "bottleneck@npm:^2.15.3": version: 2.19.5 resolution: "bottleneck@npm:2.19.5" @@ -4402,6 +4425,15 @@ __metadata: languageName: node linkType: hard +"braces@npm:^3.0.3": + version: 3.0.3 + resolution: "braces@npm:3.0.3" + dependencies: + fill-range: "npm:^7.1.1" + checksum: 10/fad11a0d4697a27162840b02b1fad249c1683cbc510cd5bf1a471f2f8085c046d41094308c577a50a03a579dd99d5a6b3724c4b5e8b14df2c4443844cfcda2c6 + languageName: node + linkType: hard + "buffer-from@npm:^1.0.0": version: 1.1.2 resolution: "buffer-from@npm:1.1.2" @@ -4639,7 +4671,7 @@ __metadata: languageName: node linkType: hard -"chalk@npm:4.1.2, chalk@npm:^4.0.2, chalk@npm:^4.1.1": +"chalk@npm:4.1.2, chalk@npm:^4.0.2, chalk@npm:^4.1.1, chalk@npm:^4.1.2": version: 4.1.2 resolution: "chalk@npm:4.1.2" dependencies: @@ -4649,7 +4681,7 @@ __metadata: languageName: node linkType: hard -"chalk@npm:>=5.3.0, chalk@npm:^5.2.0, chalk@npm:^5.3.0": +"chalk@npm:5.3.0, chalk@npm:>=5.3.0, chalk@npm:^5.2.0, chalk@npm:^5.3.0, chalk@npm:~5.3.0": version: 5.3.0 resolution: "chalk@npm:5.3.0" checksum: 10/6373caaab21bd64c405bfc4bd9672b145647fc9482657b5ea1d549b3b2765054e9d3d928870cdf764fb4aad67555f5061538ff247b8310f110c5c888d92397ea @@ -4700,6 +4732,13 @@ __metadata: languageName: node linkType: hard +"change-case@npm:^5.4.4": + version: 5.4.4 + resolution: "change-case@npm:5.4.4" + checksum: 10/446e5573f3c854290a91292afef92b957d2e43a928260c91989b482aa860caaa29711b6725fc40c200af68061cbab357b033446d16a17bc5c553636994074e92 + languageName: node + linkType: hard + "char-regex@npm:^1.0.2": version: 1.0.2 resolution: "char-regex@npm:1.0.2" @@ -4865,6 +4904,15 @@ __metadata: languageName: node linkType: hard +"cli-cursor@npm:^5.0.0": + version: 5.0.0 + resolution: "cli-cursor@npm:5.0.0" + dependencies: + restore-cursor: "npm:^5.0.0" + checksum: 10/1eb9a3f878b31addfe8d82c6d915ec2330cec8447ab1f117f4aa34f0137fbb3137ec3466e1c9a65bcb7557f6e486d343f2da57f253a2f668d691372dfa15c090 + languageName: node + linkType: hard + "cli-highlight@npm:^2.1.11": version: 2.1.11 resolution: "cli-highlight@npm:2.1.11" @@ -4932,16 +4980,6 @@ __metadata: languageName: node linkType: hard -"cli-truncate@npm:^3.1.0": - version: 3.1.0 - resolution: "cli-truncate@npm:3.1.0" - dependencies: - slice-ansi: "npm:^5.0.0" - string-width: "npm:^5.0.0" - checksum: 10/c3243e41974445691c63f8b405df1d5a24049dc33d324fe448dc572e561a7b772ae982692900b1a5960901cc4fc7def25a629b9c69a4208ee89d12ab3332617a - languageName: node - linkType: hard - "cli-truncate@npm:^4.0.0": version: 4.0.0 resolution: "cli-truncate@npm:4.0.0" @@ -5087,7 +5125,7 @@ __metadata: languageName: node linkType: hard -"colorette@npm:^2.0.16, colorette@npm:^2.0.17, colorette@npm:^2.0.19": +"colorette@npm:^2.0.19": version: 2.0.19 resolution: "colorette@npm:2.0.19" checksum: 10/6e2606435cd30e1cae8fc6601b024fdd809e20515c57ce1e588d0518403cff0c98abf807912ba543645a9188af36763b69b67e353d47397f24a1c961aba300bd @@ -5127,7 +5165,7 @@ __metadata: languageName: node linkType: hard -"commander@npm:*, commander@npm:^9.3.0": +"commander@npm:*": version: 9.4.0 resolution: "commander@npm:9.4.0" checksum: 10/9b9af6b5c93287e18f00f92bb366220e72e2b9cb267c132c5e02639b2aded3db942433823ce6e786ef3f817bf35984ec83f41911ed68676068ba910aa7322e69 @@ -5162,6 +5200,13 @@ __metadata: languageName: node linkType: hard +"commander@npm:~12.1.0": + version: 12.1.0 + resolution: "commander@npm:12.1.0" + checksum: 10/cdaeb672d979816853a4eed7f1310a9319e8b976172485c2a6b437ed0db0a389a44cfb222bfbde772781efa9f215bdd1b936f80d6b249485b465c6cb906e1f93 + languageName: node + linkType: hard + "common-ancestor-path@npm:^1.0.1": version: 1.0.1 resolution: "common-ancestor-path@npm:1.0.1" @@ -5214,23 +5259,28 @@ __metadata: languageName: node linkType: hard -"concurrently@npm:7.6.0": - version: 7.6.0 - resolution: "concurrently@npm:7.6.0" +"concurrently@npm:9.0.1": + version: 9.0.1 + resolution: "concurrently@npm:9.0.1" dependencies: - chalk: "npm:^4.1.0" - date-fns: "npm:^2.29.1" + chalk: "npm:^4.1.2" lodash: "npm:^4.17.21" - rxjs: "npm:^7.0.0" - shell-quote: "npm:^1.7.3" - spawn-command: "npm:^0.0.2-1" - supports-color: "npm:^8.1.0" + rxjs: "npm:^7.8.1" + shell-quote: "npm:^1.8.1" + supports-color: "npm:^8.1.1" tree-kill: "npm:^1.2.2" - yargs: "npm:^17.3.1" + yargs: "npm:^17.7.2" bin: conc: dist/bin/concurrently.js concurrently: dist/bin/concurrently.js - checksum: 10/502f3f1df8093ec690866622dba04fc1c7a0e92dcb27532cc860d4b20c442cc9f6c3292074550bdafb5ad247dc5c147c068ce9dd27e55316f877d88e99546696 + checksum: 10/aae80b641c61a46dbb8831b79c81506f1c0b95a438c408e6b36d9aa84eb453c4126c608e58e8ed57049e068a5d868d16645475e15b9bb7902d684cd0e0bd1b34 + languageName: node + linkType: hard + +"confbox@npm:^0.1.7": + version: 0.1.7 + resolution: "confbox@npm:0.1.7" + checksum: 10/3086687b9a2a70d44d4b40a2d376536fe7e1baec4a2a34261b21b8a836026b419cbf89ded6054216631823e7d63c415dad4b4d53591d6edbb202bb9820dfa6fa languageName: node linkType: hard @@ -5291,18 +5341,9 @@ __metadata: languageName: node linkType: hard -"consolidate@npm:0.16.0": - version: 0.16.0 - resolution: "consolidate@npm:0.16.0" - dependencies: - bluebird: "npm:^3.7.2" - checksum: 10/74b9bc2f1c8a6898e062a569e873ad3800490cf0e83f951933895e0a68ebd144de073b15898ba84bf61bffe88eb389998cd3a53b69096c15cc72303f725e1753 - languageName: node - linkType: hard - -"consolidate@npm:1.0.1": - version: 1.0.1 - resolution: "consolidate@npm:1.0.1" +"consolidate@npm:1.0.4": + version: 1.0.4 + resolution: "consolidate@npm:1.0.4" peerDependencies: "@babel/core": ^7.22.5 arc-templates: ^0.5.3 @@ -5335,8 +5376,8 @@ __metadata: pug: ^3.0.0 qejs: ^3.0.5 ractive: ^1.3.12 - react: ^16.13.1 - react-dom: ^16.13.1 + react: ">=16.13.1" + react-dom: ">=16.13.1" slm: ^2.0.0 swig: ^1.4.2 swig-templates: ^2.0.3 @@ -5449,7 +5490,7 @@ __metadata: optional: true whiskers: optional: true - checksum: 10/506b764359ed1eb2eaf3910391168e8b8b189a145c7ce518dbdf5f39570ec9f17b8fe4e50aced92fc77c85db33f47ecfc6200164f25b38ca6ff35bc5cb8acb5e + checksum: 10/967a3ec47e406a6c5e44f27a85000161bd28202a796578af7ce35fb567eeb148bd586750a910ee41708d8205c614a8cd8c024a2d46005ab90e16d168adccda65 languageName: node linkType: hard @@ -5816,13 +5857,6 @@ __metadata: languageName: node linkType: hard -"date-fns@npm:^2.29.1": - version: 2.29.3 - resolution: "date-fns@npm:2.29.3" - checksum: 10/05b6ce6093ed2a09aafe89bb7a6d51ff72971341d7db1e531299d117df305c4a9f408bcdd533687622ae820ba9ea8859437b12074d7043b76325c7828e5d41fc - languageName: node - linkType: hard - "date-format@npm:^4.0.6": version: 4.0.14 resolution: "date-format@npm:4.0.14" @@ -5867,7 +5901,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:^4.3.1, debug@npm:^4.3.5, debug@npm:^4.3.6": +"debug@npm:^4.3.1, debug@npm:^4.3.5, debug@npm:^4.3.6, debug@npm:~4.3.6": version: 4.3.7 resolution: "debug@npm:4.3.7" dependencies: @@ -6283,7 +6317,17 @@ __metadata: languageName: node linkType: hard -"enquirer@npm:2.3.6, enquirer@npm:~2.3.6": +"enquirer@npm:2.4.1": + version: 2.4.1 + resolution: "enquirer@npm:2.4.1" + dependencies: + ansi-colors: "npm:^4.1.1" + strip-ansi: "npm:^6.0.1" + checksum: 10/b3726486cd98f0d458a851a03326a2a5dd4d84f37ff94ff2a2960c915e0fc865865da3b78f0877dc36ac5c1189069eca603e82ec63d5bc6b0dd9985bf6426d7a + languageName: node + linkType: hard + +"enquirer@npm:~2.3.6": version: 2.3.6 resolution: "enquirer@npm:2.3.6" dependencies: @@ -6339,6 +6383,13 @@ __metadata: languageName: node linkType: hard +"environment@npm:^1.0.0": + version: 1.1.0 + resolution: "environment@npm:1.1.0" + checksum: 10/dd3c1b9825e7f71f1e72b03c2344799ac73f2e9ef81b78ea8b373e55db021786c6b9f3858ea43a436a2c4611052670ec0afe85bc029c384cc71165feee2f4ba6 + languageName: node + linkType: hard + "err-code@npm:^2.0.2": version: 2.0.3 resolution: "err-code@npm:2.0.3" @@ -6548,12 +6599,12 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-workspaces@npm:0.8.0": - version: 0.8.0 - resolution: "eslint-plugin-workspaces@npm:0.8.0" +"eslint-plugin-workspaces@npm:0.10.1": + version: 0.10.1 + resolution: "eslint-plugin-workspaces@npm:0.10.1" dependencies: - find-workspaces: "npm:^0.1.0" - checksum: 10/d574f2627b3e6a5f9848b68b72eba56060fd3f0886975725198d3db083a9bcd8680a799969c5ee9cdc961dfb8e964010ad61863ccd778251d137768f7ca91ee2 + find-workspaces: "npm:^0.3.0" + checksum: 10/22942be27b269a4f85b8d967c1bdec0eb766c8f8e95d3164f87b1579d50e9fc4653a614063173c18097c5bca073d1f9badb40adec1a1173740d62285790a0a0e languageName: node linkType: hard @@ -6588,19 +6639,22 @@ __metadata: languageName: node linkType: hard -"eslint@npm:9.10.0": - version: 9.10.0 - resolution: "eslint@npm:9.10.0" +"eslint@npm:9.11.1": + version: 9.11.1 + resolution: "eslint@npm:9.11.1" dependencies: "@eslint-community/eslint-utils": "npm:^4.2.0" "@eslint-community/regexpp": "npm:^4.11.0" "@eslint/config-array": "npm:^0.18.0" + "@eslint/core": "npm:^0.6.0" "@eslint/eslintrc": "npm:^3.1.0" - "@eslint/js": "npm:9.10.0" - "@eslint/plugin-kit": "npm:^0.1.0" + "@eslint/js": "npm:9.11.1" + "@eslint/plugin-kit": "npm:^0.2.0" "@humanwhocodes/module-importer": "npm:^1.0.1" "@humanwhocodes/retry": "npm:^0.3.0" "@nodelib/fs.walk": "npm:^1.2.8" + "@types/estree": "npm:^1.0.6" + "@types/json-schema": "npm:^7.0.15" ajv: "npm:^6.12.4" chalk: "npm:^4.0.0" cross-spawn: "npm:^7.0.2" @@ -6633,7 +6687,7 @@ __metadata: optional: true bin: eslint: bin/eslint.js - checksum: 10/bbb6da7db83f5182cff5a5e1681cf77be761e37bfbfedf66add9d3d2a216dbc336e787d02d05a2ea85179c51a10203713b2438b86adfd7666c29afd3ee008fe8 + checksum: 10/38de03a51044a5f708c93302cff5e860355447d424f1a21fa67f5b2f0541d092d3f3807c0242820d9795553a3f1165db51769e9a042816334d05c86f015fdfef languageName: node linkType: hard @@ -6768,7 +6822,7 @@ __metadata: languageName: node linkType: hard -"execa@npm:>=8.0.1, execa@npm:^8.0.0": +"execa@npm:>=8.0.1, execa@npm:^8.0.0, execa@npm:~8.0.1": version: 8.0.1 resolution: "execa@npm:8.0.1" dependencies: @@ -6834,23 +6888,6 @@ __metadata: languageName: node linkType: hard -"execa@npm:^6.1.0": - version: 6.1.0 - resolution: "execa@npm:6.1.0" - dependencies: - cross-spawn: "npm:^7.0.3" - get-stream: "npm:^6.0.1" - human-signals: "npm:^3.0.1" - is-stream: "npm:^3.0.0" - merge-stream: "npm:^2.0.0" - npm-run-path: "npm:^5.1.0" - onetime: "npm:^6.0.0" - signal-exit: "npm:^3.0.7" - strip-final-newline: "npm:^3.0.0" - checksum: 10/669437011a7896b41b6b84786f9054c93202cb8336bd4fe15b6376bcddc37fd31f2e81f7f446fa1de519cbe831a0b93457ee185e5072caee1f230366f7d07aef - languageName: node - linkType: hard - "execa@npm:^9.0.0": version: 9.3.1 resolution: "execa@npm:9.3.1" @@ -7017,19 +7054,6 @@ __metadata: languageName: node linkType: hard -"fast-glob@npm:^3.2.12": - version: 3.2.12 - resolution: "fast-glob@npm:3.2.12" - dependencies: - "@nodelib/fs.stat": "npm:^2.0.2" - "@nodelib/fs.walk": "npm:^1.2.3" - glob-parent: "npm:^5.1.2" - merge2: "npm:^1.3.0" - micromatch: "npm:^4.0.4" - checksum: 10/641e748664ae0fdc4dadd23c812fd7d6c80cd92d451571cb1f81fa87edb750e917f25abf74fc9503c97438b0b67ecf75b738bb8e50a83b16bd2a88b4d64e81fa - languageName: node - linkType: hard - "fast-glob@npm:^3.3.2": version: 3.3.2 resolution: "fast-glob@npm:3.3.2" @@ -7182,6 +7206,15 @@ __metadata: languageName: node linkType: hard +"fill-range@npm:^7.1.1": + version: 7.1.1 + resolution: "fill-range@npm:7.1.1" + dependencies: + to-regex-range: "npm:^5.0.1" + checksum: 10/a7095cb39e5bc32fada2aa7c7249d3f6b01bd1ce461a61b0adabacccabd9198500c6fb1f68a7c851a657e273fce2233ba869638897f3d7ed2e87a2d89b4436ea + languageName: node + linkType: hard + "find-up-simple@npm:^1.0.0": version: 1.0.0 resolution: "find-up-simple@npm:1.0.0" @@ -7249,14 +7282,14 @@ __metadata: languageName: node linkType: hard -"find-workspaces@npm:^0.1.0": - version: 0.1.0 - resolution: "find-workspaces@npm:0.1.0" +"find-workspaces@npm:^0.3.0": + version: 0.3.1 + resolution: "find-workspaces@npm:0.3.1" dependencies: - fast-glob: "npm:^3.2.12" - type-fest: "npm:^3.2.0" - yaml: "npm:^2.1.3" - checksum: 10/0d4cca9d9623f55c4b45306e617b3c78d08e867580e1c2c08a1b280a4fe143547deb482e7d02988a2e49821800a047f7ffd898ff7e5d64b4276fa377b3dc622e + fast-glob: "npm:^3.3.2" + pkg-types: "npm:^1.0.3" + yaml: "npm:^2.3.4" + checksum: 10/8803ca7431768d04cfefb7e838db3c54207bebf875eb25fa73d318c486b5694fa59e43d63808263a4cadaa66b78915b8f970ffe5151a050843234ef84a071a19 languageName: node linkType: hard @@ -7627,7 +7660,7 @@ __metadata: languageName: node linkType: hard -"get-stream@npm:^6.0.0, get-stream@npm:^6.0.1": +"get-stream@npm:^6.0.0": version: 6.0.1 resolution: "get-stream@npm:6.0.1" checksum: 10/781266d29725f35c59f1d214aedc92b0ae855800a980800e2923b3fbc4e56b3cb6e462c42e09a1cf1a00c64e056a78fa407cbe06c7c92b7e5cd49b4b85c2a497 @@ -7665,9 +7698,9 @@ __metadata: languageName: node linkType: hard -"gflow@npm:^5.1.2": - version: 5.1.3 - resolution: "gflow@npm:5.1.3" +"gflow@npm:^5.1.4": + version: 5.1.4 + resolution: "gflow@npm:5.1.4" dependencies: "@samverschueren/stream-to-observable": "npm:^0.3.0" any-observable: "npm:^0.4.0" @@ -7689,7 +7722,7 @@ __metadata: update-notifier: "npm:^3.0.1" bin: gflow: bin/gflow.js - checksum: 10/8d82f35010e37ccca30a9f822ccaf3d75eaff827704c63bfd53924e4847cc8c2a9255bb30e77508b379c24dd2962eff39f82501c1e49e28c80fc24e60c430341 + checksum: 10/59ccca8fadd5fe4b5a3ec7dcd8823ef0ed3b8234f13740e4557d27a98a17576111272d6f8dbaa0dc7a1dd93c9b6eb7a53092eed76e84e3abf9be135f775dabf7 languageName: node linkType: hard @@ -8139,7 +8172,25 @@ __metadata: languageName: node linkType: hard -"handlebars@npm:4.7.7, handlebars@npm:^4.0.11, handlebars@npm:^4.7.7": +"handlebars@npm:4.7.8": + version: 4.7.8 + resolution: "handlebars@npm:4.7.8" + dependencies: + minimist: "npm:^1.2.5" + neo-async: "npm:^2.6.2" + source-map: "npm:^0.6.1" + uglify-js: "npm:^3.1.4" + wordwrap: "npm:^1.0.0" + dependenciesMeta: + uglify-js: + optional: true + bin: + handlebars: bin/handlebars + checksum: 10/bd528f4dd150adf67f3f857118ef0fa43ff79a153b1d943fa0a770f2599e38b25a7a0dbac1a3611a4ec86970fd2325a81310fb788b5c892308c9f8743bd02e11 + languageName: node + linkType: hard + +"handlebars@npm:^4.0.11, handlebars@npm:^4.7.7": version: 4.7.7 resolution: "handlebars@npm:4.7.7" dependencies: @@ -8487,13 +8538,6 @@ __metadata: languageName: node linkType: hard -"human-signals@npm:^3.0.1": - version: 3.0.1 - resolution: "human-signals@npm:3.0.1" - checksum: 10/0b2741651e668ddebbc9ba5163c9c33cd4f837270133eda5831f50374d010e7eacc415fe5ed04b4b113d9779a81eef1d03467a7c7eb55ec094b2bd1dd8d3a837 - languageName: node - linkType: hard - "human-signals@npm:^5.0.0": version: 5.0.0 resolution: "human-signals@npm:5.0.0" @@ -8508,12 +8552,12 @@ __metadata: languageName: node linkType: hard -"husky@npm:8.0.1": - version: 8.0.1 - resolution: "husky@npm:8.0.1" +"husky@npm:9.1.6": + version: 9.1.6 + resolution: "husky@npm:9.1.6" bin: - husky: lib/bin.js - checksum: 10/0f4c1162845cd8c4ecf13af85fe62a1c9de3d4277053004a59dae90a36346fe7eeb7eff3bc7a8484c4f365f6eccf7fd17aa6935198028980c9d6e95306455f3c + husky: bin.js + checksum: 10/421ccd8850378231aaefd70dbe9e4f1549b84ffe3a6897f93a202242bbc04e48bd498169aef43849411105d9fcf7c192b757d42661e28d06b934a609a4eb8771 languageName: node linkType: hard @@ -8735,9 +8779,9 @@ __metadata: languageName: node linkType: hard -"inquirer-autocomplete-prompt@npm:2.0.0": - version: 2.0.0 - resolution: "inquirer-autocomplete-prompt@npm:2.0.0" +"inquirer-autocomplete-prompt@npm:2.0.1": + version: 2.0.1 + resolution: "inquirer-autocomplete-prompt@npm:2.0.1" dependencies: ansi-escapes: "npm:^4.3.2" figures: "npm:^3.2.0" @@ -8746,13 +8790,13 @@ __metadata: rxjs: "npm:^7.5.4" peerDependencies: inquirer: ^8.0.0 - checksum: 10/434995723d1c314fe685e357055102b01b1e4d74999b603d1239d29c3d75f5305f2ee49ea9f2ebe4ef8464ac921db1714cd5d0571f0594ad74bc09067579b6e5 + checksum: 10/1c17ca6181f700edc465d6b4e34e0cfaa9b6b99d8f704750e372cb57ea3d5346adee71f96f204c8bf9db87735d9b7750eb7ce6794e26a485c8a87623233dbf8d languageName: node linkType: hard -"inquirer@npm:8.2.4, inquirer@npm:^8.2.4": - version: 8.2.4 - resolution: "inquirer@npm:8.2.4" +"inquirer@npm:8.2.6": + version: 8.2.6 + resolution: "inquirer@npm:8.2.6" dependencies: ansi-escapes: "npm:^4.2.1" chalk: "npm:^4.1.1" @@ -8768,8 +8812,8 @@ __metadata: string-width: "npm:^4.1.0" strip-ansi: "npm:^6.0.0" through: "npm:^2.3.6" - wrap-ansi: "npm:^7.0.0" - checksum: 10/879e462bec401ea1c89ee219359cd321ac7eee623571c34c584b4c6db52d12584f4955dca5889966f417f8af7b6aff96a7bdac8039771871f9e32acfbcceaab4 + wrap-ansi: "npm:^6.0.1" + checksum: 10/f642b9e5a94faaba54f277bdda2af0e0a6b592bd7f88c60e1614b5795b19336c7025e0c2923915d5f494f600a02fe8517413779a794415bb79a9563b061d68ab languageName: node linkType: hard @@ -8817,6 +8861,29 @@ __metadata: languageName: node linkType: hard +"inquirer@npm:^8.2.4": + version: 8.2.4 + resolution: "inquirer@npm:8.2.4" + dependencies: + ansi-escapes: "npm:^4.2.1" + chalk: "npm:^4.1.1" + cli-cursor: "npm:^3.1.0" + cli-width: "npm:^3.0.0" + external-editor: "npm:^3.0.3" + figures: "npm:^3.0.0" + lodash: "npm:^4.17.21" + mute-stream: "npm:0.0.8" + ora: "npm:^5.4.1" + run-async: "npm:^2.4.0" + rxjs: "npm:^7.5.5" + string-width: "npm:^4.1.0" + strip-ansi: "npm:^6.0.0" + through: "npm:^2.3.6" + wrap-ansi: "npm:^7.0.0" + checksum: 10/879e462bec401ea1c89ee219359cd321ac7eee623571c34c584b4c6db52d12584f4955dca5889966f417f8af7b6aff96a7bdac8039771871f9e32acfbcceaab4 + languageName: node + linkType: hard + "into-stream@npm:^7.0.0": version: 7.0.0 resolution: "into-stream@npm:7.0.0" @@ -10134,10 +10201,10 @@ __metadata: languageName: node linkType: hard -"lilconfig@npm:2.0.5": - version: 2.0.5 - resolution: "lilconfig@npm:2.0.5" - checksum: 10/a6e201bcb5b2f876cdd8b1cb7d20b126156aff976e29a184b62e6408e1c7da127603390543441fda8656a34d710113d74bb1551317e0cdc9dcb6e96dfbf6c525 +"lilconfig@npm:~3.1.2": + version: 3.1.2 + resolution: "lilconfig@npm:3.1.2" + checksum: 10/8058403850cfad76d6041b23db23f730e52b6c17a8c28d87b90766639ca0ee40c748a3e85c2d7bd133d572efabff166c4b015e5d25e01fd666cb4b13cfada7f0 languageName: node linkType: hard @@ -10164,26 +10231,23 @@ __metadata: languageName: node linkType: hard -"lint-staged@npm:13.0.3": - version: 13.0.3 - resolution: "lint-staged@npm:13.0.3" +"lint-staged@npm:15.2.10": + version: 15.2.10 + resolution: "lint-staged@npm:15.2.10" dependencies: - cli-truncate: "npm:^3.1.0" - colorette: "npm:^2.0.17" - commander: "npm:^9.3.0" - debug: "npm:^4.3.4" - execa: "npm:^6.1.0" - lilconfig: "npm:2.0.5" - listr2: "npm:^4.0.5" - micromatch: "npm:^4.0.5" - normalize-path: "npm:^3.0.0" - object-inspect: "npm:^1.12.2" - pidtree: "npm:^0.6.0" - string-argv: "npm:^0.3.1" - yaml: "npm:^2.1.1" + chalk: "npm:~5.3.0" + commander: "npm:~12.1.0" + debug: "npm:~4.3.6" + execa: "npm:~8.0.1" + lilconfig: "npm:~3.1.2" + listr2: "npm:~8.2.4" + micromatch: "npm:~4.0.8" + pidtree: "npm:~0.6.0" + string-argv: "npm:~0.3.2" + yaml: "npm:~2.5.0" bin: lint-staged: bin/lint-staged.js - checksum: 10/d5b2b96f8c57c9cf93ac1e44800f951029198b2f50b0e01a9ee3bdcb3e146ee7478217878f6674875045e6325a40d872fdc240deb9d9e753b9c8242b693d8bbb + checksum: 10/ab6930cd633dbb5b6ec7c81fc06c65df41e9f80d93dd22e0d79c6e272cdfd8110a0fbdec60303d46a06b30bcd92261153630e2c937531b77ec5ae41e7e9d90d3 languageName: node linkType: hard @@ -10224,16 +10288,16 @@ __metadata: languageName: node linkType: hard -"listr2@npm:5.0.5": - version: 5.0.5 - resolution: "listr2@npm:5.0.5" +"listr2@npm:5.0.8": + version: 5.0.8 + resolution: "listr2@npm:5.0.8" dependencies: cli-truncate: "npm:^2.1.0" colorette: "npm:^2.0.19" log-update: "npm:^4.0.0" p-map: "npm:^4.0.0" rfdc: "npm:^1.3.0" - rxjs: "npm:^7.5.6" + rxjs: "npm:^7.8.0" through: "npm:^2.3.8" wrap-ansi: "npm:^7.0.0" peerDependencies: @@ -10241,7 +10305,7 @@ __metadata: peerDependenciesMeta: enquirer: optional: true - checksum: 10/11a6a69c198b06244ca38eaa30438269d9c6b2d0b82321d58e383b712019674dd92b214b9b2389560ab1bdabf66d16070ea2e26b96211b78b68416c1cfaf63de + checksum: 10/41181bcd86d26b82acb3b26738d3836443531bc0ad6f7463cfee411af4f0268f3753485ed4c6d697c120ff01475dbb055aa34c22e6834c4c0bd84e3f242ce78e languageName: node linkType: hard @@ -10259,24 +10323,17 @@ __metadata: languageName: node linkType: hard -"listr2@npm:^4.0.5": - version: 4.0.5 - resolution: "listr2@npm:4.0.5" +"listr2@npm:~8.2.4": + version: 8.2.4 + resolution: "listr2@npm:8.2.4" dependencies: - cli-truncate: "npm:^2.1.0" - colorette: "npm:^2.0.16" - log-update: "npm:^4.0.0" - p-map: "npm:^4.0.0" - rfdc: "npm:^1.3.0" - rxjs: "npm:^7.5.5" - through: "npm:^2.3.8" - wrap-ansi: "npm:^7.0.0" - peerDependencies: - enquirer: ">= 2.3.0 < 3" - peerDependenciesMeta: - enquirer: - optional: true - checksum: 10/9c591fdd4fd6b7e8b4feca60380be01d74c65a98857f6caff2418c609fb9f0016c2e1b65c0ef5b1f4ff015967be87e8642e7ac3ad7ce0aa3c1a0329b60128b3b + cli-truncate: "npm:^4.0.0" + colorette: "npm:^2.0.20" + eventemitter3: "npm:^5.0.1" + log-update: "npm:^6.1.0" + rfdc: "npm:^1.4.1" + wrap-ansi: "npm:^9.0.0" + checksum: 10/344d2397e127bf802935925e95b54468eef745fbbaf9326eb33a1634ae2d6e86cdb527ef48cb83a19a50671955d39b3e2608c74db85530df07b5674f5de115e1 languageName: node linkType: hard @@ -10568,6 +10625,19 @@ __metadata: languageName: node linkType: hard +"log-update@npm:^6.1.0": + version: 6.1.0 + resolution: "log-update@npm:6.1.0" + dependencies: + ansi-escapes: "npm:^7.0.0" + cli-cursor: "npm:^5.0.0" + slice-ansi: "npm:^7.1.0" + strip-ansi: "npm:^7.1.0" + wrap-ansi: "npm:^9.0.0" + checksum: 10/5abb4131e33b1e7f8416bb194fe17a3603d83e4657c5bf5bb81ce4187f3b00ea481643b85c3d5cefe6037a452cdcf7f1391ab8ea0d9c23e75d19589830ec4f11 + languageName: node + linkType: hard + "log-utils@npm:^0.2.1": version: 0.2.1 resolution: "log-utils@npm:0.2.1" @@ -10778,9 +10848,9 @@ __metadata: languageName: node linkType: hard -"markdown-it@npm:13.0.1": - version: 13.0.1 - resolution: "markdown-it@npm:13.0.1" +"markdown-it@npm:13.0.2": + version: 13.0.2 + resolution: "markdown-it@npm:13.0.2" dependencies: argparse: "npm:^2.0.1" entities: "npm:~3.0.1" @@ -10789,7 +10859,7 @@ __metadata: uc.micro: "npm:^1.0.5" bin: markdown-it: bin/markdown-it.js - checksum: 10/ebe2cfd515c23d2d88692efac41e4070fcd2e932af15e5455e73e1a47f1f86298a4aacb2de3b5cc647a409bed5951739980c02dbf7d34f78e25554d8742751db + checksum: 10/4f48271bbd44d16502efd4148d7c05ca1fb4b50719a07d34c91e8d16f8d065c558fed0fafe07cd13ca5958096bfe295b37cd4f042add7ec49f73c70154e75f58 languageName: node linkType: hard @@ -11087,7 +11157,7 @@ __metadata: languageName: node linkType: hard -"micromatch@npm:^4.0.2, micromatch@npm:^4.0.4, micromatch@npm:^4.0.5": +"micromatch@npm:^4.0.2, micromatch@npm:^4.0.4": version: 4.0.5 resolution: "micromatch@npm:4.0.5" dependencies: @@ -11097,6 +11167,16 @@ __metadata: languageName: node linkType: hard +"micromatch@npm:~4.0.8": + version: 4.0.8 + resolution: "micromatch@npm:4.0.8" + dependencies: + braces: "npm:^3.0.3" + picomatch: "npm:^2.3.1" + checksum: 10/6bf2a01672e7965eb9941d1f02044fad2bd12486b5553dc1116ff24c09a8723157601dc992e74c911d896175918448762df3b3fd0a6b61037dd1a9766ddfbf58 + languageName: node + linkType: hard + "mime-db@npm:1.52.0": version: 1.52.0 resolution: "mime-db@npm:1.52.0" @@ -11143,6 +11223,13 @@ __metadata: languageName: node linkType: hard +"mimic-function@npm:^5.0.0": + version: 5.0.1 + resolution: "mimic-function@npm:5.0.1" + checksum: 10/eb5893c99e902ccebbc267c6c6b83092966af84682957f79313311edb95e8bb5f39fb048d77132b700474d1c86d90ccc211e99bae0935447a4834eb4c882982c + languageName: node + linkType: hard + "mimic-response@npm:^1.0.0, mimic-response@npm:^1.0.1": version: 1.0.1 resolution: "mimic-response@npm:1.0.1" @@ -11363,6 +11450,18 @@ __metadata: languageName: node linkType: hard +"mlly@npm:^1.7.1": + version: 1.7.1 + resolution: "mlly@npm:1.7.1" + dependencies: + acorn: "npm:^8.11.3" + pathe: "npm:^1.1.2" + pkg-types: "npm:^1.1.1" + ufo: "npm:^1.5.3" + checksum: 10/c1ef3989e95fb6c6c27a238330897b01f46507020501f45a681f2cae453f982e38dcb0e45aa65f672ea7280945d4a729d266f17a8acb187956f312b0cafddf61 + languageName: node + linkType: hard + "modify-values@npm:^1.0.1": version: 1.0.1 resolution: "modify-values@npm:1.0.1" @@ -11487,7 +11586,7 @@ __metadata: languageName: node linkType: hard -"neo-async@npm:^2.6.0": +"neo-async@npm:^2.6.0, neo-async@npm:^2.6.2": version: 2.6.2 resolution: "neo-async@npm:2.6.2" checksum: 10/1a7948fea86f2b33ec766bc899c88796a51ba76a4afc9026764aedc6e7cde692a09067031e4a1bf6db4f978ccd99e7f5b6c03fe47ad9865c3d4f99050d67e002 @@ -11660,7 +11759,7 @@ __metadata: languageName: node linkType: hard -"normalize-path@npm:3.0.0, normalize-path@npm:>=3.0.0, normalize-path@npm:^3.0.0": +"normalize-path@npm:3.0.0, normalize-path@npm:>=3.0.0": version: 3.0.0 resolution: "normalize-path@npm:3.0.0" checksum: 10/88eeb4da891e10b1318c4b2476b6e2ecbeb5ff97d946815ffea7794c31a89017c70d7f34b3c2ebf23ef4e9fc9fb99f7dffe36da22011b5b5c6ffa34f4873ec20 @@ -12136,13 +12235,6 @@ __metadata: languageName: node linkType: hard -"object-inspect@npm:^1.12.2": - version: 1.12.2 - resolution: "object-inspect@npm:1.12.2" - checksum: 10/aa11100d45fa919b36448347d4f7c8a78b0247886881db56a2026b512c4042a9749e64894519b00a4db8c6e2b713a965b5ceaa3b59324aeb3da007c54a33bc58 - languageName: node - linkType: hard - "object-visit@npm:^1.0.0": version: 1.0.1 resolution: "object-visit@npm:1.0.1" @@ -12197,6 +12289,15 @@ __metadata: languageName: node linkType: hard +"onetime@npm:^7.0.0": + version: 7.0.0 + resolution: "onetime@npm:7.0.0" + dependencies: + mimic-function: "npm:^5.0.0" + checksum: 10/eb08d2da9339819e2f9d52cab9caf2557d80e9af8c7d1ae86e1a0fef027d00a88e9f5bd67494d350df360f7c559fbb44e800b32f310fb989c860214eacbb561c + languageName: node + linkType: hard + "open@npm:^8.4.0": version: 8.4.0 resolution: "open@npm:8.4.0" @@ -12915,7 +13016,7 @@ __metadata: languageName: node linkType: hard -"pidtree@npm:^0.6.0": +"pidtree@npm:~0.6.0": version: 0.6.0 resolution: "pidtree@npm:0.6.0" bin: @@ -12978,6 +13079,17 @@ __metadata: languageName: node linkType: hard +"pkg-types@npm:^1.0.3, pkg-types@npm:^1.1.1": + version: 1.2.0 + resolution: "pkg-types@npm:1.2.0" + dependencies: + confbox: "npm:^0.1.7" + mlly: "npm:^1.7.1" + pathe: "npm:^1.1.2" + checksum: 10/ed732842b86260395b82e31afc0dd8316e74642a78754ad148a5500ca5537565c6dfbd6c80c2dc92077afc1beb471b05a85a9572089cc8a1bba82248c331bf45 + languageName: node + linkType: hard + "pluralize@npm:8.0.0": version: 8.0.0 resolution: "pluralize@npm:8.0.0" @@ -13691,6 +13803,16 @@ __metadata: languageName: node linkType: hard +"restore-cursor@npm:^5.0.0": + version: 5.1.0 + resolution: "restore-cursor@npm:5.1.0" + dependencies: + onetime: "npm:^7.0.0" + signal-exit: "npm:^4.1.0" + checksum: 10/838dd54e458d89cfbc1a923b343c1b0f170a04100b4ce1733e97531842d7b440463967e521216e8ab6c6f8e89df877acc7b7f4c18ec76e99fb9bf5a60d358d2c + languageName: node + linkType: hard + "ret@npm:~0.1.10": version: 0.1.15 resolution: "ret@npm:0.1.15" @@ -13726,6 +13848,13 @@ __metadata: languageName: node linkType: hard +"rfdc@npm:^1.4.1": + version: 1.4.1 + resolution: "rfdc@npm:1.4.1" + checksum: 10/2f3d11d3d8929b4bfeefc9acb03aae90f971401de0add5ae6c5e38fec14f0405e6a4aad8fdb76344bfdd20c5193110e3750cbbd28ba86d73729d222b6cf4a729 + languageName: node + linkType: hard + "rimraf@npm:^3.0.0": version: 3.0.2 resolution: "rimraf@npm:3.0.2" @@ -13834,7 +13963,7 @@ __metadata: languageName: node linkType: hard -"rxjs@npm:>=7.8.1, rxjs@npm:^7.2.0, rxjs@npm:^7.8.1": +"rxjs@npm:>=7.8.1, rxjs@npm:^7.2.0, rxjs@npm:^7.8.0, rxjs@npm:^7.8.1": version: 7.8.1 resolution: "rxjs@npm:7.8.1" dependencies: @@ -13852,7 +13981,7 @@ __metadata: languageName: node linkType: hard -"rxjs@npm:^7.0.0, rxjs@npm:^7.5.4, rxjs@npm:^7.5.5, rxjs@npm:^7.5.6": +"rxjs@npm:^7.5.4, rxjs@npm:^7.5.5": version: 7.8.0 resolution: "rxjs@npm:7.8.0" dependencies: @@ -13994,14 +14123,12 @@ __metadata: languageName: node linkType: hard -"semver@npm:7.3.5": - version: 7.3.5 - resolution: "semver@npm:7.3.5" - dependencies: - lru-cache: "npm:^6.0.0" +"semver@npm:7.6.3, semver@npm:^7.3.8, semver@npm:^7.6.3": + version: 7.6.3 + resolution: "semver@npm:7.6.3" bin: semver: bin/semver.js - checksum: 10/22854378594943f2988ee853c02a7471dd02eba7bf75e286b98538114590a148dd59b22775edf42fcfb354438f304b8f32a53c136d228e99068ac52c60259324 + checksum: 10/36b1fbe1a2b6f873559cd57b238f1094a053dbfd997ceeb8757d79d1d2089c56d1321b9f1069ce263dc64cfa922fa1d2ad566b39426fe1ac6c723c1487589e10 languageName: node linkType: hard @@ -14036,15 +14163,6 @@ __metadata: languageName: node linkType: hard -"semver@npm:^7.3.8, semver@npm:^7.6.3": - version: 7.6.3 - resolution: "semver@npm:7.6.3" - bin: - semver: bin/semver.js - checksum: 10/36b1fbe1a2b6f873559cd57b238f1094a053dbfd997ceeb8757d79d1d2089c56d1321b9f1069ce263dc64cfa922fa1d2ad566b39426fe1ac6c723c1487589e10 - languageName: node - linkType: hard - "semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.6.0": version: 7.6.0 resolution: "semver@npm:7.6.0" @@ -14149,10 +14267,10 @@ __metadata: languageName: node linkType: hard -"shell-quote@npm:^1.7.3": - version: 1.7.4 - resolution: "shell-quote@npm:1.7.4" - checksum: 10/e5059820d0ffc7e9298f9ee4be528cd5820c45a87d318dac5ad4b62066069fe4e62520801af639d8723b0a36af621ef6330adf8ce532cfaeb0c874c691117f1b +"shell-quote@npm:^1.8.1": + version: 1.8.1 + resolution: "shell-quote@npm:1.8.1" + checksum: 10/af19ab5a1ec30cb4b2f91fd6df49a7442d5c4825a2e269b3712eded10eedd7f9efeaab96d57829880733fc55bcdd8e9b1d8589b4befb06667c731d08145e274d languageName: node linkType: hard @@ -14219,7 +14337,7 @@ __metadata: languageName: node linkType: hard -"signal-exit@npm:3.0.7, signal-exit@npm:^3.0.0, signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.3, signal-exit@npm:^3.0.7": +"signal-exit@npm:3.0.7, signal-exit@npm:^3.0.0, signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.3": version: 3.0.7 resolution: "signal-exit@npm:3.0.7" checksum: 10/a2f098f247adc367dffc27845853e9959b9e88b01cb301658cfe4194352d8d2bb32e18467c786a7fe15f1d44b233ea35633d076d5e737870b7139949d1ab6318 @@ -14349,7 +14467,7 @@ __metadata: languageName: node linkType: hard -"slice-ansi@npm:^7.0.0": +"slice-ansi@npm:^7.0.0, slice-ansi@npm:^7.1.0": version: 7.1.0 resolution: "slice-ansi@npm:7.1.0" dependencies: @@ -14502,13 +14620,6 @@ __metadata: languageName: node linkType: hard -"spawn-command@npm:^0.0.2-1": - version: 0.0.2-1 - resolution: "spawn-command@npm:0.0.2-1" - checksum: 10/f59fd2f16c8ffe46afda588134697ba4f1e2032b216baf7c134a66a0b3d48df323ee46c367f273eb7f7bb8c68b8296ca6b49aac6530cedb4b6785302d238c411 - languageName: node - linkType: hard - "spawn-error-forwarder@npm:~1.0.0": version: 1.0.0 resolution: "spawn-error-forwarder@npm:1.0.0" @@ -14659,10 +14770,10 @@ __metadata: languageName: node linkType: hard -"string-argv@npm:^0.3.1": - version: 0.3.1 - resolution: "string-argv@npm:0.3.1" - checksum: 10/47c637e3f47b3f5a6430036315e65564483fcf7745341d474943f0c2046f188681275fc1f2948db75c7a7e68134b1446e0dcceda60a7be1ee0c3fb026c0d90c4 +"string-argv@npm:~0.3.2": + version: 0.3.2 + resolution: "string-argv@npm:0.3.2" + checksum: 10/f9d3addf887026b4b5f997a271149e93bf71efc8692e7dc0816e8807f960b18bcb9787b45beedf0f97ff459575ee389af3f189d8b649834cac602f2e857e75af languageName: node linkType: hard @@ -14709,7 +14820,7 @@ __metadata: languageName: node linkType: hard -"string-width@npm:^5.0.0, string-width@npm:^5.0.1, string-width@npm:^5.1.2": +"string-width@npm:^5.0.1, string-width@npm:^5.1.2": version: 5.1.2 resolution: "string-width@npm:5.1.2" dependencies: @@ -14948,7 +15059,7 @@ __metadata: languageName: node linkType: hard -"supports-color@npm:^8.1.0": +"supports-color@npm:^8.1.1": version: 8.1.1 resolution: "supports-color@npm:8.1.1" dependencies: @@ -15616,13 +15727,6 @@ __metadata: languageName: node linkType: hard -"type-fest@npm:^3.2.0": - version: 3.11.1 - resolution: "type-fest@npm:3.11.1" - checksum: 10/b3105b0a05e228a997c74eb9942723601ab81c725a63b29c5bd43a21fd537517c7862f5301cc3108c62ea195e4d8351f7a80c9eaab5466cbdef9aad388393593 - languageName: node - linkType: hard - "type-fest@npm:^4.18.2, type-fest@npm:^4.21.0": version: 4.26.1 resolution: "type-fest@npm:4.26.1" @@ -15729,6 +15833,13 @@ __metadata: languageName: node linkType: hard +"ufo@npm:^1.5.3": + version: 1.5.4 + resolution: "ufo@npm:1.5.4" + checksum: 10/a885ed421e656aea6ca64e9727b8118a9488715460b6f1a0f0427118adfe2f2830fe7c1d5bd9c5c754a332e6807516551cd663ea67ce9ed6a4e3edc739916335 + languageName: node + linkType: hard + "uglify-js@npm:^3.1.4": version: 3.15.3 resolution: "uglify-js@npm:3.15.3" @@ -16441,7 +16552,7 @@ __metadata: languageName: node linkType: hard -"wrap-ansi@npm:^6.2.0": +"wrap-ansi@npm:^6.0.1, wrap-ansi@npm:^6.2.0": version: 6.2.0 resolution: "wrap-ansi@npm:6.2.0" dependencies: @@ -16595,17 +16706,12 @@ __metadata: languageName: node linkType: hard -"yaml@npm:^2.1.1": - version: 2.1.1 - resolution: "yaml@npm:2.1.1" - checksum: 10/ed5e61560229fa7108c8528ba772ed5ec4113f297666376b7e07144dcb24fb5a02af40b1c5ac1c922d3e5bed979b6994ffeee6224671a37c0800058216564ed6 - languageName: node - linkType: hard - -"yaml@npm:^2.1.3": - version: 2.3.1 - resolution: "yaml@npm:2.3.1" - checksum: 10/66501d597e43766eb94dc175d28ec8b2c63087d6a78783e59b4218eee32b9172740f9f27d54b7bc0ca8af61422f7134929f9974faeaac99d583787e793852fd2 +"yaml@npm:^2.3.4, yaml@npm:~2.5.0": + version: 2.5.1 + resolution: "yaml@npm:2.5.1" + bin: + yaml: bin.mjs + checksum: 10/0eecb679db75ea6a989ad97715a9fa5d946972945aa6aa7d2175bca66c213b5564502ccb1cdd04b1bf816ee38b5c43e4e2fda3ff6f5e09da24dabb51ae92c57d languageName: node linkType: hard @@ -16630,7 +16736,7 @@ __metadata: languageName: node linkType: hard -"yargs@npm:17.7.2, yargs@npm:^17.5.1, yargs@npm:^17.6.2": +"yargs@npm:17.7.2, yargs@npm:^17.5.1, yargs@npm:^17.6.2, yargs@npm:^17.7.2": version: 17.7.2 resolution: "yargs@npm:17.7.2" dependencies: @@ -16660,7 +16766,7 @@ __metadata: languageName: node linkType: hard -"yargs@npm:^17.0.0, yargs@npm:^17.0.1, yargs@npm:^17.3.1": +"yargs@npm:^17.0.0, yargs@npm:^17.0.1": version: 17.5.1 resolution: "yargs@npm:17.5.1" dependencies: From b93e619096576f9a9c2dbffc02fdfb96b19b57ef Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Wed, 25 Sep 2024 07:49:36 +0200 Subject: [PATCH 42/69] fix: bump chalk dependency --- packages/cli-core/package.json | 2 +- packages/cli/package.json | 2 +- yarn.lock | 24 ++++++++++++------------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index 99aecf4c9..d2d68580a 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -38,7 +38,7 @@ "@types/inquirer": "^9.0.7", "ajv": "8.17.1", "axios": "1.7.7", - "chalk": "4.1.2", + "chalk": "5.3.0", "change-case": "^5.4.4", "commander": "9.3.0", "consolidate": "1.0.4", diff --git a/packages/cli/package.json b/packages/cli/package.json index 2e9a66c3b..2d71f76f1 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -71,7 +71,7 @@ "@tsed/logger": ">=6.2.1", "@tsed/openspec": ">=7.14.2", "@tsed/schema": ">=7.14.2", - "chalk": "4.1.2", + "chalk": "5.3.0", "change-case": "4.1.2", "esm-module-alias": "^2.2.1", "globby": "11.1.0", diff --git a/yarn.lock b/yarn.lock index 2b1d9af67..0e53e61ce 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2282,7 +2282,7 @@ __metadata: "@types/uuid": "npm:10.0.0" ajv: "npm:8.17.1" axios: "npm:1.7.7" - chalk: "npm:4.1.2" + chalk: "npm:5.3.0" change-case: "npm:^5.4.4" commander: "npm:9.3.0" consolidate: "npm:1.0.4" @@ -2598,7 +2598,7 @@ __metadata: "@tsed/schema": "npm:>=7.14.2" "@tsed/typescript": "workspace:*" "@types/change-case": "npm:^2.3.1" - chalk: "npm:4.1.2" + chalk: "npm:5.3.0" change-case: "npm:4.1.2" cross-env: "npm:7.0.3" esm-module-alias: "npm:^2.2.1" @@ -4671,16 +4671,6 @@ __metadata: languageName: node linkType: hard -"chalk@npm:4.1.2, chalk@npm:^4.0.2, chalk@npm:^4.1.1, chalk@npm:^4.1.2": - version: 4.1.2 - resolution: "chalk@npm:4.1.2" - dependencies: - ansi-styles: "npm:^4.1.0" - supports-color: "npm:^7.1.0" - checksum: 10/cb3f3e594913d63b1814d7ca7c9bafbf895f75fbf93b92991980610dfd7b48500af4e3a5d4e3a8f337990a96b168d7eb84ee55efdce965e2ee8efc20f8c8f139 - languageName: node - linkType: hard - "chalk@npm:5.3.0, chalk@npm:>=5.3.0, chalk@npm:^5.2.0, chalk@npm:^5.3.0, chalk@npm:~5.3.0": version: 5.3.0 resolution: "chalk@npm:5.3.0" @@ -4712,6 +4702,16 @@ __metadata: languageName: node linkType: hard +"chalk@npm:^4.0.2, chalk@npm:^4.1.1, chalk@npm:^4.1.2": + version: 4.1.2 + resolution: "chalk@npm:4.1.2" + dependencies: + ansi-styles: "npm:^4.1.0" + supports-color: "npm:^7.1.0" + checksum: 10/cb3f3e594913d63b1814d7ca7c9bafbf895f75fbf93b92991980610dfd7b48500af4e3a5d4e3a8f337990a96b168d7eb84ee55efdce965e2ee8efc20f8c8f139 + languageName: node + linkType: hard + "change-case@npm:*, change-case@npm:4.1.2, change-case@npm:^4.1.2": version: 4.1.2 resolution: "change-case@npm:4.1.2" From fa724f8dc70e8f6f4ea823da101d14099690b564 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Wed, 25 Sep 2024 07:50:39 +0200 Subject: [PATCH 43/69] fix: bump figures dependency --- package.json | 2 +- packages/cli-core/package.json | 2 +- packages/cli-core/src/utils/loadPlugins.ts | 3 +-- yarn.lock | 24 +++++++++++----------- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 69328256d..37d0a2cbb 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "commander": "9.3.0", "consolidate": "1.0.4", "execa": "5.1.1", - "figures": "4.0.1", + "figures": "6.1.0", "fs-extra": "11.1.0", "handlebars": "4.7.8", "handlebars-helpers": "0.10.0", diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index d2d68580a..6f6bc8514 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -45,7 +45,7 @@ "create-frame": "1.0.0", "enquirer": "2.4.1", "execa": "5.1.1", - "figures": "4.0.1", + "figures": "6.1.0", "fs-extra": "11.1.0", "globby": "11.1.0", "handlebars": "4.7.8", diff --git a/packages/cli-core/src/utils/loadPlugins.ts b/packages/cli-core/src/utils/loadPlugins.ts index 13d7c0eda..012378caa 100644 --- a/packages/cli-core/src/utils/loadPlugins.ts +++ b/packages/cli-core/src/utils/loadPlugins.ts @@ -1,7 +1,6 @@ import {GlobalProviders, InjectorService} from "@tsed/di"; import chalk from "chalk"; -// @ts-ignore -import {figures} from "listr2"; +import figures from "figures"; import {CliFs} from "../services/CliFs.js"; import {ProjectPackageJson} from "../services/ProjectPackageJson.js"; diff --git a/yarn.lock b/yarn.lock index 0e53e61ce..6d507ee77 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2291,7 +2291,7 @@ __metadata: deps: "npm:^1.0.0" enquirer: "npm:2.4.1" execa: "npm:5.1.1" - figures: "npm:4.0.1" + figures: "npm:6.1.0" fs-extra: "npm:11.1.0" globby: "npm:11.1.0" handlebars: "npm:4.7.8" @@ -2539,7 +2539,7 @@ __metadata: eslint-plugin-vitest: "npm:^0.5.4" eslint-plugin-workspaces: "npm:0.10.1" execa: "npm:5.1.1" - figures: "npm:4.0.1" + figures: "npm:6.1.0" fs-extra: "npm:11.1.0" gflow: "npm:^5.1.4" handlebars: "npm:4.7.8" @@ -7111,7 +7111,7 @@ __metadata: languageName: node linkType: hard -"figures@npm:*, figures@npm:4.0.1": +"figures@npm:*": version: 4.0.1 resolution: "figures@npm:4.0.1" dependencies: @@ -7130,6 +7130,15 @@ __metadata: languageName: node linkType: hard +"figures@npm:6.1.0, figures@npm:^6.1.0": + version: 6.1.0 + resolution: "figures@npm:6.1.0" + dependencies: + is-unicode-supported: "npm:^2.0.0" + checksum: 10/9822d13630bee8e6a9f2da866713adf13854b07e0bfde042defa8bba32d47a1c0b2afa627ce73837c674cf9a5e3edce7e879ea72cb9ea7960b2390432d8e1167 + languageName: node + linkType: hard + "figures@npm:>=3.2.0, figures@npm:^6.0.0": version: 6.0.1 resolution: "figures@npm:6.0.1" @@ -7158,15 +7167,6 @@ __metadata: languageName: node linkType: hard -"figures@npm:^6.1.0": - version: 6.1.0 - resolution: "figures@npm:6.1.0" - dependencies: - is-unicode-supported: "npm:^2.0.0" - checksum: 10/9822d13630bee8e6a9f2da866713adf13854b07e0bfde042defa8bba32d47a1c0b2afa627ce73837c674cf9a5e3edce7e879ea72cb9ea7960b2390432d8e1167 - languageName: node - linkType: hard - "file-entry-cache@npm:^8.0.0": version: 8.0.0 resolution: "file-entry-cache@npm:8.0.0" From 95aefb235c80cb3db971520e24a1e44c2ebd225b Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Wed, 25 Sep 2024 07:53:37 +0200 Subject: [PATCH 44/69] fix: bump change-case dependency to v5.4.4 --- packages/cli-generate-http-client/package.json | 2 +- packages/cli-generate-swagger/package.json | 2 +- packages/cli-plugin-mongoose/package.json | 2 +- packages/cli-plugin-prisma/package.json | 2 +- packages/cli-plugin-typeorm/package.json | 2 +- packages/cli/package.json | 2 +- .../cli/src/commands/generate/GenerateCmd.ts | 4 ++-- packages/cli/src/commands/init/InitCmd.ts | 8 ++++---- packages/cli/src/pipes/ClassNamePipe.ts | 4 ++-- packages/cli/src/pipes/RoutePipe.ts | 6 +++--- yarn.lock | 16 ++++++++-------- 11 files changed, 25 insertions(+), 25 deletions(-) diff --git a/packages/cli-generate-http-client/package.json b/packages/cli-generate-http-client/package.json index 8936f4b81..fd7c99fad 100644 --- a/packages/cli-generate-http-client/package.json +++ b/packages/cli-generate-http-client/package.json @@ -21,7 +21,7 @@ "/test:ci": "vitest run --coverage.thresholds.autoUpdate=true" }, "dependencies": { - "change-case": "4.1.2", + "change-case": "5.4.4", "tslib": "2.3.1" }, "devDependencies": { diff --git a/packages/cli-generate-swagger/package.json b/packages/cli-generate-swagger/package.json index da450909f..f1ad5c9a8 100644 --- a/packages/cli-generate-swagger/package.json +++ b/packages/cli-generate-swagger/package.json @@ -21,7 +21,7 @@ "/test:ci": "vitest run --coverage.thresholds.autoUpdate=true" }, "dependencies": { - "change-case": "4.1.2", + "change-case": "5.4.4", "tslib": "2.3.1" }, "devDependencies": { diff --git a/packages/cli-plugin-mongoose/package.json b/packages/cli-plugin-mongoose/package.json index 6b0b1c639..6242e7cc2 100644 --- a/packages/cli-plugin-mongoose/package.json +++ b/packages/cli-plugin-mongoose/package.json @@ -21,7 +21,7 @@ "test:ci": "vitest run --coverage.thresholds.autoUpdate=true" }, "dependencies": { - "change-case": "4.1.2", + "change-case": "5.4.4", "pluralize": "8.0.0", "tslib": "2.3.1" }, diff --git a/packages/cli-plugin-prisma/package.json b/packages/cli-plugin-prisma/package.json index 2f87096c4..007bbd28b 100644 --- a/packages/cli-plugin-prisma/package.json +++ b/packages/cli-plugin-prisma/package.json @@ -21,7 +21,7 @@ "test:ci": "vitest run --coverage.thresholds.autoUpdate=true" }, "dependencies": { - "change-case": "4.1.2", + "change-case": "5.4.4", "tslib": "2.3.1" }, "devDependencies": { diff --git a/packages/cli-plugin-typeorm/package.json b/packages/cli-plugin-typeorm/package.json index 238b98fbc..778633a2b 100644 --- a/packages/cli-plugin-typeorm/package.json +++ b/packages/cli-plugin-typeorm/package.json @@ -21,7 +21,7 @@ "test:ci": "vitest run --coverage.thresholds.autoUpdate=true" }, "dependencies": { - "change-case": "4.1.2", + "change-case": "5.4.4", "tslib": "2.3.1" }, "devDependencies": { diff --git a/packages/cli/package.json b/packages/cli/package.json index 2d71f76f1..4e245e327 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -72,7 +72,7 @@ "@tsed/openspec": ">=7.14.2", "@tsed/schema": ">=7.14.2", "chalk": "5.3.0", - "change-case": "4.1.2", + "change-case": "5.4.4", "esm-module-alias": "^2.2.1", "globby": "11.1.0", "read-pkg-up": "7.0.1", diff --git a/packages/cli/src/commands/generate/GenerateCmd.ts b/packages/cli/src/commands/generate/GenerateCmd.ts index fcbe74147..564879b78 100644 --- a/packages/cli/src/commands/generate/GenerateCmd.ts +++ b/packages/cli/src/commands/generate/GenerateCmd.ts @@ -1,6 +1,6 @@ import {type CliDefaultOptions, Command, type CommandProvider, Inject, ProjectPackageJson, SrcRendererService} from "@tsed/cli-core"; import {normalizePath} from "@tsed/normalize-path"; -import {paramCase, pascalCase} from "change-case"; +import {kebabCase, pascalCase} from "change-case"; import globby from "globby"; import {basename, dirname, join} from "path"; @@ -207,7 +207,7 @@ export class GenerateCmd implements CommandProvider { } const symbolName = this.classNamePipe.transform({name, type, format: ProjectConvention.DEFAULT}); - const symbolParamName = paramCase(symbolName); + const symbolParamName = kebabCase(symbolName); return fillImports({ ...ctx, diff --git a/packages/cli/src/commands/init/InitCmd.ts b/packages/cli/src/commands/init/InitCmd.ts index f9aa51b42..88bb00d83 100644 --- a/packages/cli/src/commands/init/InitCmd.ts +++ b/packages/cli/src/commands/init/InitCmd.ts @@ -18,7 +18,7 @@ import { RootRendererService, type Task } from "@tsed/cli-core"; -import {paramCase, pascalCase} from "change-case"; +import {kebabCase, pascalCase} from "change-case"; import {basename, join} from "path"; import {DEFAULT_TSED_TAGS} from "../../constants/index.js"; @@ -206,10 +206,10 @@ export class InitCmd implements CommandProvider { type: "input", name: "projectName", message: "What is your project name", - default: paramCase(initialOptions.root!), + default: kebabCase(initialOptions.root!), when: initialOptions.root !== ".", transformer(input: string) { - return paramCase(input); + return kebabCase(input); } }, ...getFeaturesPrompt( @@ -349,7 +349,7 @@ export class InitCmd implements CommandProvider { } resolveRootDir(ctx: Partial) { - const rootDirName = paramCase(ctx.projectName || basename(this.packageJson.dir)); + const rootDirName = kebabCase(ctx.projectName || basename(this.packageJson.dir)); if (this.packageJson.dir.endsWith(rootDirName)) { ctx.projectName = ctx.projectName || rootDirName; diff --git a/packages/cli/src/pipes/ClassNamePipe.ts b/packages/cli/src/pipes/ClassNamePipe.ts index 74330c9b5..b6292654f 100644 --- a/packages/cli/src/pipes/ClassNamePipe.ts +++ b/packages/cli/src/pipes/ClassNamePipe.ts @@ -1,6 +1,6 @@ import {Injectable, ProjectPackageJson} from "@tsed/cli-core"; import {Inject} from "@tsed/di"; -import {paramCase, pascalCase} from "change-case"; +import {kebabCase, pascalCase} from "change-case"; import {basename} from "path"; import {ProjectConvention} from "../interfaces/ProjectConvention.js"; @@ -19,7 +19,7 @@ export class ClassNamePipe { const meta = this.providers.get(options.type)?.model || "{{symbolName}}.{{symbolType}}?"; const type = options.type.split(":").at(-1)!; - const symbolName = paramCase(basename(options.name)).replace(`-${type}`, ""); + const symbolName = kebabCase(basename(options.name)).replace(`-${type}`, ""); const names = meta.split(".").reduce((acc: Set, key: string) => { return key diff --git a/packages/cli/src/pipes/RoutePipe.ts b/packages/cli/src/pipes/RoutePipe.ts index 1278fdbf7..bc9eea107 100644 --- a/packages/cli/src/pipes/RoutePipe.ts +++ b/packages/cli/src/pipes/RoutePipe.ts @@ -1,5 +1,5 @@ import {Injectable} from "@tsed/cli-core"; -import {paramCase} from "change-case"; +import {kebabCase} from "change-case"; @Injectable() export class RoutePipe { @@ -7,13 +7,13 @@ export class RoutePipe { const r = route .split("/") .reduce((paths: string[], path) => { - const word = paramCase(path); + const word = kebabCase(path); if (paths.includes(`${word}s`) || paths.includes(word)) { return paths; } - return [...paths, paramCase(path)]; + return [...paths, kebabCase(path)]; }, []) .join("/"); diff --git a/yarn.lock b/yarn.lock index 6d507ee77..b3b707abe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2325,7 +2325,7 @@ __metadata: "@tsed/cli": "workspace:*" "@tsed/cli-core": "workspace:*" "@tsed/typescript": "workspace:*" - change-case: "npm:4.1.2" + change-case: "npm:5.4.4" cross-env: "npm:7.0.3" swagger-typescript-api: "npm:^9.3.1" tslib: "npm:2.3.1" @@ -2350,7 +2350,7 @@ __metadata: "@tsed/cli": "workspace:*" "@tsed/cli-core": "workspace:*" "@tsed/typescript": "workspace:*" - change-case: "npm:4.1.2" + change-case: "npm:5.4.4" cross-env: "npm:7.0.3" tslib: "npm:2.3.1" typescript: "npm:5.6.2" @@ -2401,7 +2401,7 @@ __metadata: "@tsed/cli": "workspace:*" "@tsed/cli-core": "workspace:*" "@tsed/typescript": "workspace:*" - change-case: "npm:4.1.2" + change-case: "npm:5.4.4" cross-env: "npm:7.0.3" pluralize: "npm:8.0.0" tslib: "npm:2.3.1" @@ -2450,7 +2450,7 @@ __metadata: "@tsed/cli": "workspace:*" "@tsed/cli-core": "workspace:*" "@tsed/typescript": "workspace:*" - change-case: "npm:4.1.2" + change-case: "npm:5.4.4" cross-env: "npm:7.0.3" tslib: "npm:2.3.1" typescript: "npm:5.6.2" @@ -2482,7 +2482,7 @@ __metadata: "@tsed/cli": "workspace:*" "@tsed/cli-core": "workspace:*" "@tsed/typescript": "workspace:*" - change-case: "npm:4.1.2" + change-case: "npm:5.4.4" cross-env: "npm:7.0.3" tslib: "npm:2.3.1" typescript: "npm:5.6.2" @@ -2599,7 +2599,7 @@ __metadata: "@tsed/typescript": "workspace:*" "@types/change-case": "npm:^2.3.1" chalk: "npm:5.3.0" - change-case: "npm:4.1.2" + change-case: "npm:5.4.4" cross-env: "npm:7.0.3" esm-module-alias: "npm:^2.2.1" globby: "npm:11.1.0" @@ -4712,7 +4712,7 @@ __metadata: languageName: node linkType: hard -"change-case@npm:*, change-case@npm:4.1.2, change-case@npm:^4.1.2": +"change-case@npm:*, change-case@npm:^4.1.2": version: 4.1.2 resolution: "change-case@npm:4.1.2" dependencies: @@ -4732,7 +4732,7 @@ __metadata: languageName: node linkType: hard -"change-case@npm:^5.4.4": +"change-case@npm:5.4.4, change-case@npm:^5.4.4": version: 5.4.4 resolution: "change-case@npm:5.4.4" checksum: 10/446e5573f3c854290a91292afef92b957d2e43a928260c91989b482aa860caaa29711b6725fc40c200af68061cbab357b033446d16a17bc5c553636994074e92 From aa63ecfb86e9beefd95ca736a1160e8ce2186c72 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Wed, 25 Sep 2024 07:55:03 +0200 Subject: [PATCH 45/69] fix: remove entities dependency --- package.json | 1 - yarn.lock | 8 -------- 2 files changed, 9 deletions(-) diff --git a/package.json b/package.json index 37d0a2cbb..df86abe7a 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,6 @@ "@vitest/coverage-v8": "^2.1.1", "concurrently": "9.0.1", "cross-env": "7.0.3", - "entities": "1.1.2", "eslint": "9.11.1", "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.2.1", diff --git a/yarn.lock b/yarn.lock index b3b707abe..6a0c75eed 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2531,7 +2531,6 @@ __metadata: concurrently: "npm:9.0.1" consolidate: "npm:1.0.4" cross-env: "npm:7.0.3" - entities: "npm:1.1.2" eslint: "npm:9.11.1" eslint-config-prettier: "npm:9.1.0" eslint-plugin-prettier: "npm:5.2.1" @@ -6343,13 +6342,6 @@ __metadata: languageName: node linkType: hard -"entities@npm:1.1.2": - version: 1.1.2 - resolution: "entities@npm:1.1.2" - checksum: 10/4a707022f4e932060f03df2526be55d085a2576fe534421e5b22bc62abb0d1f04241c171f9981e3d7baa4f4160606cad72a2f7eb01b6a25e279e3f31a2be4bf2 - languageName: node - linkType: hard - "entities@npm:~3.0.1": version: 3.0.1 resolution: "entities@npm:3.0.1" From c1e98374479ff1b6d132fae2fcd76f7d2685d7ac Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Wed, 25 Sep 2024 07:57:20 +0200 Subject: [PATCH 46/69] fix: bump update-notifier and uuid dependencies --- package.json | 2 +- packages/cli-core/package.json | 2 +- .../src/hooks/PassportGenerateHook.ts | 4 +- yarn.lock | 193 +----------------- 4 files changed, 12 insertions(+), 189 deletions(-) diff --git a/package.json b/package.json index df86abe7a..86cde9b21 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "semver": "7.6.3", "split": "1.0.1", "tslib": "2.3.1", - "update-notifier": "5.1.0" + "update-notifier": "7.3.1" }, "devDependencies": { "@commitlint/cli": "19.5.0", diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index 6f6bc8514..e8db6bacc 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -63,7 +63,7 @@ "tunnel": "0.0.6", "update-notifier": "7.3.1", "url-parse": "1.5.10", - "uuid": "^8.3.2" + "uuid": "^10.0.0" }, "devDependencies": { "@tsed/typescript": "workspace:*", diff --git a/packages/cli-plugin-passport/src/hooks/PassportGenerateHook.ts b/packages/cli-plugin-passport/src/hooks/PassportGenerateHook.ts index c38ac2881..0b08ff626 100644 --- a/packages/cli-plugin-passport/src/hooks/PassportGenerateHook.ts +++ b/packages/cli-plugin-passport/src/hooks/PassportGenerateHook.ts @@ -1,7 +1,7 @@ import {type GenerateCmdContext, ProvidersInfoService} from "@tsed/cli"; import {Inject, OnExec, OnPrompt, ProjectPackageJson, SrcRendererService, type Tasks} from "@tsed/cli-core"; import {Injectable} from "@tsed/di"; -import {paramCase} from "change-case"; +import {kebabCase} from "change-case"; import {PassportClient} from "../services/PassportClient.js"; import {TEMPLATE_DIR} from "../utils/templateDir.js"; @@ -90,7 +90,7 @@ export class PassportGenerateHook { private mapOptions(options: PassportGenerateOptions) { return { ...options, - protocolName: paramCase(options.name), + protocolName: kebabCase(options.name), passportPackage: options.passportPackage }; } diff --git a/yarn.lock b/yarn.lock index 6a0c75eed..08f402358 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2310,7 +2310,7 @@ __metadata: typescript: "npm:5.6.2" update-notifier: "npm:7.3.1" url-parse: "npm:1.5.10" - uuid: "npm:^8.3.2" + uuid: "npm:^10.0.0" vitest: "npm:2.1.1" peerDependencies: "@tsed/core": ">=7.14.2" @@ -2564,7 +2564,7 @@ __metadata: tslib: "npm:2.3.1" typescript: "npm:5.6.2" unplugin-swc: "npm:^1.5.1" - update-notifier: "npm:5.1.0" + update-notifier: "npm:7.3.1" vitest: "npm:2.1.1" languageName: unknown linkType: soft @@ -4330,22 +4330,6 @@ __metadata: languageName: node linkType: hard -"boxen@npm:^5.0.0": - version: 5.1.2 - resolution: "boxen@npm:5.1.2" - dependencies: - ansi-align: "npm:^3.0.0" - camelcase: "npm:^6.2.0" - chalk: "npm:^4.1.0" - cli-boxes: "npm:^2.2.1" - string-width: "npm:^4.2.2" - type-fest: "npm:^0.20.2" - widest-line: "npm:^3.1.0" - wrap-ansi: "npm:^7.0.0" - checksum: 10/bc3d3d88d77dc8cabb0811844acdbd4805e8ca8011222345330817737042bf6f86d93eb74a3f7e0cab634e64ef69db03cf52b480761ed90a965de0c8ff1bea8c - languageName: node - linkType: hard - "boxen@npm:^7.1.1": version: 7.1.1 resolution: "boxen@npm:7.1.1" @@ -4598,13 +4582,6 @@ __metadata: languageName: node linkType: hard -"camelcase@npm:^6.2.0": - version: 6.3.0 - resolution: "camelcase@npm:6.3.0" - checksum: 10/8c96818a9076434998511251dcb2761a94817ea17dbdc37f47ac080bd088fc62c7369429a19e2178b993497132c8cbcf5cc1f44ba963e76782ba469c0474938d - languageName: node - linkType: hard - "camelcase@npm:^7.0.1": version: 7.0.1 resolution: "camelcase@npm:7.0.1" @@ -4852,7 +4829,7 @@ __metadata: languageName: node linkType: hard -"cli-boxes@npm:^2.2.0, cli-boxes@npm:^2.2.1": +"cli-boxes@npm:^2.2.0": version: 2.2.1 resolution: "cli-boxes@npm:2.2.1" checksum: 10/be79f8ec23a558b49e01311b39a1ea01243ecee30539c880cf14bf518a12e223ef40c57ead0cb44f509bffdffc5c129c746cd50d863ab879385370112af4f585 @@ -5307,20 +5284,6 @@ __metadata: languageName: node linkType: hard -"configstore@npm:^5.0.1": - version: 5.0.1 - resolution: "configstore@npm:5.0.1" - dependencies: - dot-prop: "npm:^5.2.0" - graceful-fs: "npm:^4.1.2" - make-dir: "npm:^3.0.0" - unique-string: "npm:^2.0.0" - write-file-atomic: "npm:^3.0.0" - xdg-basedir: "npm:^4.0.0" - checksum: 10/60ef65d493b63f96e14b11ba7ec072fdbf3d40110a94fb7199d1c287761bdea5c5244e76b2596325f30c1b652213aa75de96ea20afd4a5f82065e61ea090988e - languageName: node - linkType: hard - "configstore@npm:^7.0.0": version: 7.0.0 resolution: "configstore@npm:7.0.0" @@ -6174,7 +6137,7 @@ __metadata: languageName: node linkType: hard -"dot-prop@npm:^5.1.0, dot-prop@npm:^5.2.0": +"dot-prop@npm:^5.1.0": version: 5.3.0 resolution: "dot-prop@npm:5.3.0" dependencies: @@ -6499,13 +6462,6 @@ __metadata: languageName: node linkType: hard -"escape-goat@npm:^2.0.0": - version: 2.1.1 - resolution: "escape-goat@npm:2.1.1" - checksum: 10/ce05c70c20dd7007b60d2d644b625da5412325fdb57acf671ba06cb2ab3cd6789e2087026921a05b665b0a03fadee2955e7fc0b9a67da15a6551a980b260eba7 - languageName: node - linkType: hard - "escape-goat@npm:^4.0.0": version: 4.0.0 resolution: "escape-goat@npm:4.0.0" @@ -7932,15 +7888,6 @@ __metadata: languageName: node linkType: hard -"global-dirs@npm:^3.0.0": - version: 3.0.0 - resolution: "global-dirs@npm:3.0.0" - dependencies: - ini: "npm:2.0.0" - checksum: 10/953c17cf14bf6ee0e2100ae82a0d779934eed8a3ec5c94a7a4f37c5b3b592c31ea015fb9a15cf32484de13c79f4a814f3015152f3e1d65976cfbe47c1bfe4a88 - languageName: node - linkType: hard - "globals@npm:^14.0.0": version: 14.0.0 resolution: "globals@npm:14.0.0" @@ -8720,13 +8667,6 @@ __metadata: languageName: node linkType: hard -"ini@npm:2.0.0": - version: 2.0.0 - resolution: "ini@npm:2.0.0" - checksum: 10/04e24ba05c4f6947e15560824e153b4610bceea2f5a3ab68651d221a4aab3c77d4e3e90a917ebc8bf5ad71a30a8575de56c39d6b4c4b1375a28016b9f3625f9d - languageName: node - linkType: hard - "ini@npm:4.1.1, ini@npm:^4.1.0, ini@npm:^4.1.1": version: 4.1.1 resolution: "ini@npm:4.1.1" @@ -9167,16 +9107,6 @@ __metadata: languageName: node linkType: hard -"is-installed-globally@npm:^0.4.0": - version: 0.4.0 - resolution: "is-installed-globally@npm:0.4.0" - dependencies: - global-dirs: "npm:^3.0.0" - is-path-inside: "npm:^3.0.2" - checksum: 10/5294d21c82cb9beedd693ce1dfb12117c4db36d6e35edc9dc6bf06cb300d23c96520d1bfb063386b054268ae3d7255c3f09393b52218cc26ace99b217bf37c93 - languageName: node - linkType: hard - "is-installed-globally@npm:^1.0.0": version: 1.0.0 resolution: "is-installed-globally@npm:1.0.0" @@ -9208,13 +9138,6 @@ __metadata: languageName: node linkType: hard -"is-npm@npm:^5.0.0": - version: 5.0.0 - resolution: "is-npm@npm:5.0.0" - checksum: 10/9baff02b0c69a3d3c79b162cb2f9e67fb40ef6d172c16601b2e2471c21e9a4fa1fc9885a308d7bc6f3a3cd2a324c27fa0bf284c133c3349bb22571ab70d041cc - languageName: node - linkType: hard - "is-npm@npm:^6.0.0": version: 6.0.0 resolution: "is-npm@npm:6.0.0" @@ -9302,7 +9225,7 @@ __metadata: languageName: node linkType: hard -"is-path-inside@npm:^3.0.1, is-path-inside@npm:^3.0.2, is-path-inside@npm:^3.0.3": +"is-path-inside@npm:^3.0.1, is-path-inside@npm:^3.0.3": version: 3.0.3 resolution: "is-path-inside@npm:3.0.3" checksum: 10/abd50f06186a052b349c15e55b182326f1936c89a78bf6c8f2b707412517c097ce04bc49a0ca221787bc44e1049f51f09a2ffb63d22899051988d3a618ba13e9 @@ -9431,13 +9354,6 @@ __metadata: languageName: node linkType: hard -"is-typedarray@npm:^1.0.0": - version: 1.0.0 - resolution: "is-typedarray@npm:1.0.0" - checksum: 10/4b433bfb0f9026f079f4eb3fbaa4ed2de17c9995c3a0b5c800bec40799b4b2a8b4e051b1ada77749deb9ded4ae52fe2096973f3a93ff83df1a5a7184a669478c - languageName: node - linkType: hard - "is-unicode-supported@npm:^0.1.0": version: 0.1.0 resolution: "is-unicode-supported@npm:0.1.0" @@ -9904,7 +9820,7 @@ __metadata: languageName: node linkType: hard -"latest-version@npm:^5.0.0, latest-version@npm:^5.1.0": +"latest-version@npm:^5.0.0": version: 5.1.0 resolution: "latest-version@npm:5.1.0" dependencies: @@ -13291,15 +13207,6 @@ __metadata: languageName: node linkType: hard -"pupa@npm:^2.1.1": - version: 2.1.1 - resolution: "pupa@npm:2.1.1" - dependencies: - escape-goat: "npm:^2.0.0" - checksum: 10/49529e50372ffdb0cccf0efa0f3b3cb0a2c77805d0d9cc2725bd2a0f6bb414631e61c93a38561b26be1259550b7bb6c2cb92315aa09c8bf93f3bdcb49f2b2fb7 - languageName: node - linkType: hard - "pupa@npm:^3.1.0": version: 3.1.0 resolution: "pupa@npm:3.1.0" @@ -14081,15 +13988,6 @@ __metadata: languageName: node linkType: hard -"semver-diff@npm:^3.1.1": - version: 3.1.1 - resolution: "semver-diff@npm:3.1.1" - dependencies: - semver: "npm:^6.3.0" - checksum: 10/8bbe5a5d7add2d5e51b72314a9215cd294d71f41cdc2bf6bd59ee76411f3610b576172896f1d191d0d7294cb9f2f847438d2ee158adacc0c224dca79052812fe - languageName: node - linkType: hard - "semver-diff@npm:^4.0.0": version: 4.0.0 resolution: "semver-diff@npm:4.0.0" @@ -14135,7 +14033,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:^6.0.0, semver@npm:^6.2.0, semver@npm:^6.3.0": +"semver@npm:^6.0.0, semver@npm:^6.2.0": version: 6.3.0 resolution: "semver@npm:6.3.0" bin: @@ -14769,7 +14667,7 @@ __metadata: languageName: node linkType: hard -"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.0.0, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.2, string-width@npm:^4.2.3": +"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3": version: 4.2.3 resolution: "string-width@npm:4.2.3" dependencies: @@ -15642,13 +15540,6 @@ __metadata: languageName: node linkType: hard -"type-fest@npm:^0.20.2": - version: 0.20.2 - resolution: "type-fest@npm:0.20.2" - checksum: 10/8907e16284b2d6cfa4f4817e93520121941baba36b39219ea36acfe64c86b9dbc10c9941af450bd60832c8f43464974d51c0957f9858bc66b952b66b6914cbb9 - languageName: node - linkType: hard - "type-fest@npm:^0.21.3": version: 0.21.3 resolution: "type-fest@npm:0.21.3" @@ -15733,15 +15624,6 @@ __metadata: languageName: node linkType: hard -"typedarray-to-buffer@npm:^3.1.5": - version: 3.1.5 - resolution: "typedarray-to-buffer@npm:3.1.5" - dependencies: - is-typedarray: "npm:^1.0.0" - checksum: 10/7c850c3433fbdf4d04f04edfc751743b8f577828b8e1eb93b95a3bce782d156e267d83e20fb32b3b47813e69a69ab5e9b5342653332f7d21c7d1210661a7a72c - languageName: node - linkType: hard - "typedarray@npm:^0.0.6": version: 0.0.6 resolution: "typedarray@npm:0.0.6" @@ -16052,28 +15934,6 @@ __metadata: languageName: node linkType: hard -"update-notifier@npm:5.1.0": - version: 5.1.0 - resolution: "update-notifier@npm:5.1.0" - dependencies: - boxen: "npm:^5.0.0" - chalk: "npm:^4.1.0" - configstore: "npm:^5.0.1" - has-yarn: "npm:^2.1.0" - import-lazy: "npm:^2.1.0" - is-ci: "npm:^2.0.0" - is-installed-globally: "npm:^0.4.0" - is-npm: "npm:^5.0.0" - is-yarn-global: "npm:^0.3.0" - latest-version: "npm:^5.1.0" - pupa: "npm:^2.1.1" - semver: "npm:^7.3.4" - semver-diff: "npm:^3.1.1" - xdg-basedir: "npm:^4.0.0" - checksum: 10/9df39e2d4f2e59ea788c719baaacf3d2bdde09d065f00319d52c0af255990e15f98ba40c115fb6246b6b2d5468685f36955ae0679c0b7fec834892fe7db4cab2 - languageName: node - linkType: hard - "update-notifier@npm:7.3.1": version: 7.3.1 resolution: "update-notifier@npm:7.3.1" @@ -16195,15 +16055,6 @@ __metadata: languageName: node linkType: hard -"uuid@npm:^8.3.2": - version: 8.3.2 - resolution: "uuid@npm:8.3.2" - bin: - uuid: dist/bin/uuid - checksum: 10/9a5f7aa1d6f56dd1e8d5f2478f855f25c645e64e26e347a98e98d95781d5ed20062d6cca2eecb58ba7c84bc3910be95c0451ef4161906abaab44f9cb68ffbdd1 - languageName: node - linkType: hard - "v8-compile-cache-lib@npm:^3.0.1": version: 3.0.1 resolution: "v8-compile-cache-lib@npm:3.0.1" @@ -16482,15 +16333,6 @@ __metadata: languageName: node linkType: hard -"widest-line@npm:^3.1.0": - version: 3.1.0 - resolution: "widest-line@npm:3.1.0" - dependencies: - string-width: "npm:^4.0.0" - checksum: 10/03db6c9d0af9329c37d74378ff1d91972b12553c7d72a6f4e8525fe61563fa7adb0b9d6e8d546b7e059688712ea874edd5ded475999abdeedf708de9849310e0 - languageName: node - linkType: hard - "widest-line@npm:^4.0.1": version: 4.0.1 resolution: "widest-line@npm:4.0.1" @@ -16605,18 +16447,6 @@ __metadata: languageName: node linkType: hard -"write-file-atomic@npm:^3.0.0": - version: 3.0.3 - resolution: "write-file-atomic@npm:3.0.3" - dependencies: - imurmurhash: "npm:^0.1.4" - is-typedarray: "npm:^1.0.0" - signal-exit: "npm:^3.0.2" - typedarray-to-buffer: "npm:^3.1.5" - checksum: 10/0955ab94308b74d32bc252afe69d8b42ba4b8a28b8d79f399f3f405969f82623f981e35d13129a52aa2973450f342107c06d86047572637584e85a1c0c246bf3 - languageName: node - linkType: hard - "write-json-file@npm:^3.2.0": version: 3.2.0 resolution: "write-json-file@npm:3.2.0" @@ -16649,13 +16479,6 @@ __metadata: languageName: node linkType: hard -"xdg-basedir@npm:^4.0.0": - version: 4.0.0 - resolution: "xdg-basedir@npm:4.0.0" - checksum: 10/0073d5b59a37224ed3a5ac0dd2ec1d36f09c49f0afd769008a6e9cd3cd666bd6317bd1c7ce2eab47e1de285a286bad11a9b038196413cd753b79770361855f3c - languageName: node - linkType: hard - "xdg-basedir@npm:^5.1.0": version: 5.1.0 resolution: "xdg-basedir@npm:5.1.0" From 5284d9240e8e89cad3a84a5b78982e349828cbd3 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Wed, 25 Sep 2024 08:09:27 +0200 Subject: [PATCH 47/69] fix: bump execa to v9.4.0 --- package.json | 4 +- packages/cli-core/package.json | 50 ++--- packages/cli-core/src/CliCore.spec.ts | 2 +- .../packageManagers/PackageManagersModule.ts | 5 +- .../packageManagers/supports/BaseManager.ts | 15 +- .../packageManagers/supports/BunManager.ts | 4 +- .../supports/YarnBerryManager.ts | 7 +- .../packageManagers/supports/YarnManager.ts | 4 +- packages/cli-core/src/services/CliExeca.ts | 9 +- .../integrations/command.integration.spec.ts | 4 +- packages/cli/package.json | 10 +- yarn.lock | 190 ++++++++++-------- 12 files changed, 161 insertions(+), 143 deletions(-) diff --git a/package.json b/package.json index 86cde9b21..c5013ef50 100644 --- a/package.json +++ b/package.json @@ -54,9 +54,9 @@ "chalk": "5.3.0", "commander": "9.3.0", "consolidate": "1.0.4", - "execa": "5.1.1", + "execa": "9.4.0", "figures": "6.1.0", - "fs-extra": "11.1.0", + "fs-extra": "^11.2.0", "handlebars": "4.7.8", "handlebars-helpers": "0.10.0", "inquirer": "8.2.6", diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index e8db6bacc..65a94678d 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -36,33 +36,33 @@ "@tsed/normalize-path": ">=7.14.2", "@types/fs-extra": "^11.0.4", "@types/inquirer": "^9.0.7", - "ajv": "8.17.1", - "axios": "1.7.7", - "chalk": "5.3.0", + "ajv": "^8.17.1", + "axios": "^1.7.7", + "chalk": "^5.3.0", "change-case": "^5.4.4", - "commander": "9.3.0", - "consolidate": "1.0.4", - "create-frame": "1.0.0", - "enquirer": "2.4.1", - "execa": "5.1.1", - "figures": "6.1.0", - "fs-extra": "11.1.0", - "globby": "11.1.0", - "handlebars": "4.7.8", - "handlebars-utils": "1.0.6", - "inquirer": "8.2.6", - "inquirer-autocomplete-prompt": "2.0.1", - "js-yaml": "4.1.0", - "listr2": "5.0.8", - "read-pkg-up": "7.0.1", - "registry-url": "5.1.0", + "commander": "^9.3.0", + "consolidate": "^1.0.4", + "create-frame": "^1.0.0", + "enquirer": "^2.4.1", + "execa": "^9.4.0", + "figures": "^6.1.0", + "fs-extra": "^11.2.0", + "globby": "^11.1.0", + "handlebars": "^4.7.8", + "handlebars-utils": "^1.0.6", + "inquirer": "^8.2.6", + "inquirer-autocomplete-prompt": "^2.0.1", + "js-yaml": "^4.1.0", + "listr2": "^5.0.8", + "read-pkg-up": "^7.0.1", + "registry-url": "^5.1.0", "rxjs": "^7.8.1", - "semver": "7.6.3", - "split": "1.0.1", - "tslib": "2.3.1", - "tunnel": "0.0.6", - "update-notifier": "7.3.1", - "url-parse": "1.5.10", + "semver": "^7.6.3", + "split": "^1.0.1", + "tslib": "^2.3.1", + "tunnel": "^0.0.6", + "update-notifier": "^7.3.1", + "url-parse": "^1.5.10", "uuid": "^10.0.0" }, "devDependencies": { diff --git a/packages/cli-core/src/CliCore.spec.ts b/packages/cli-core/src/CliCore.spec.ts index 0a74ac232..b18e31364 100644 --- a/packages/cli-core/src/CliCore.spec.ts +++ b/packages/cli-core/src/CliCore.spec.ts @@ -1,5 +1,5 @@ import {normalizePath} from "@tsed/normalize-path"; -import execa from "execa"; +import {execa} from "execa"; import {CliCore} from "./CliCore.js"; import {CliService} from "./services/index.js"; diff --git a/packages/cli-core/src/packageManagers/PackageManagersModule.ts b/packages/cli-core/src/packageManagers/PackageManagersModule.ts index 14091db2f..9e002dcbb 100644 --- a/packages/cli-core/src/packageManagers/PackageManagersModule.ts +++ b/packages/cli-core/src/packageManagers/PackageManagersModule.ts @@ -1,11 +1,10 @@ import {Inject, Injectable} from "@tsed/di"; -import type {Options} from "execa"; import {EMPTY, throwError} from "rxjs"; import {catchError} from "rxjs/operators"; import {ProjectPackageJson} from "../services/ProjectPackageJson.js"; import {isValidVersion} from "../utils/isValidVersion.js"; -import {BaseManager} from "./supports/BaseManager.js"; +import {BaseManager, type ManagerCmdOpts} from "./supports/BaseManager.js"; import {BunManager} from "./supports/BunManager.js"; import {NpmManager} from "./supports/NpmManager.js"; import {PNpmManager} from "./supports/PNpmManager.js"; @@ -146,7 +145,7 @@ export class PackageManagersModule { ...opts }: { ignoreError?: boolean; - } & Options & + } & ManagerCmdOpts & Record = {} ) { const options = { diff --git a/packages/cli-core/src/packageManagers/supports/BaseManager.ts b/packages/cli-core/src/packageManagers/supports/BaseManager.ts index 8a7d442d1..e9da2deb2 100644 --- a/packages/cli-core/src/packageManagers/supports/BaseManager.ts +++ b/packages/cli-core/src/packageManagers/supports/BaseManager.ts @@ -1,11 +1,11 @@ import {Inject} from "@tsed/di"; -import execa from "execa"; +import type {Options, SyncOptions} from "execa"; import {Observable} from "rxjs"; import {CliExeca} from "../../services/CliExeca.js"; -export type ManagerCmdOpts = {verbose?: boolean} & execa.Options; -export type ManagerCmdSyncOpts = {verbose?: boolean} & execa.SyncOptions; +export type ManagerCmdOpts = {verbose?: boolean} & Omit; +export type ManagerCmdSyncOpts = {verbose?: boolean} & Omit; export abstract class BaseManager { abstract readonly name: string; @@ -26,7 +26,7 @@ export abstract class BaseManager { } } - async init(opts: ManagerCmdSyncOpts): Promise {} + async init(opts: ManagerCmdOpts): Promise {} abstract install(options: ManagerCmdOpts): Observable; @@ -38,7 +38,10 @@ export abstract class BaseManager { return this.run("run", [script], options); } - run(cmd: string, args: any[], options: {verbose?: boolean} & execa.Options) { - return this.cliExeca.run(this.cmd, [cmd, options.verbose && this.verboseOpt, ...args].filter(Boolean) as string[], options); + run(cmd: string, args: any[], options: ManagerCmdOpts) { + return this.cliExeca.run(this.cmd, [cmd, options.verbose && this.verboseOpt, ...args].filter(Boolean) as string[], { + ...options, + verbose: options.verbose ? "full" : undefined + }); } } diff --git a/packages/cli-core/src/packageManagers/supports/BunManager.ts b/packages/cli-core/src/packageManagers/supports/BunManager.ts index c145a37ed..eb6d00f1c 100644 --- a/packages/cli-core/src/packageManagers/supports/BunManager.ts +++ b/packages/cli-core/src/packageManagers/supports/BunManager.ts @@ -1,5 +1,5 @@ import {Injectable} from "@tsed/di"; -import execa from "execa"; +import type {Options} from "execa"; import {Observable} from "rxjs"; import {BaseManager, type ManagerCmdOpts} from "./BaseManager.js"; @@ -19,7 +19,7 @@ export class BunManager extends BaseManager { return this.run("add", ["-d", ...deps], options); } - install(options: {verbose?: boolean} & execa.Options): Observable { + install(options: {verbose?: boolean} & Options): Observable { return this.run("install", [options.verbose && "--verbose"], options); } } diff --git a/packages/cli-core/src/packageManagers/supports/YarnBerryManager.ts b/packages/cli-core/src/packageManagers/supports/YarnBerryManager.ts index db1ec7eba..b3b5cc513 100644 --- a/packages/cli-core/src/packageManagers/supports/YarnBerryManager.ts +++ b/packages/cli-core/src/packageManagers/supports/YarnBerryManager.ts @@ -1,5 +1,4 @@ import {Inject, Injectable} from "@tsed/di"; -import execa from "execa"; import {join} from "path"; import {Observable} from "rxjs"; @@ -16,12 +15,12 @@ export class YarnBerryManager extends BaseManager { @Inject() protected cliYaml: CliYaml; - async init(options: ManagerCmdSyncOpts) { + async init(options: ManagerCmdOpts) { // init yarn v1 this.install(options); // then switch write file - await this.cliYaml.write(join(options.cwd!, ".yarnrc.yml"), { + await this.cliYaml.write(join(String(options.cwd!), ".yarnrc.yml"), { nodeLinker: "node-modules" }); @@ -37,7 +36,7 @@ export class YarnBerryManager extends BaseManager { return this.run("add", ["-D", ...deps], options); } - install(options: {verbose?: boolean} & execa.Options): Observable { + install(options: ManagerCmdOpts): Observable { return this.run("install", [options.verbose && "--verbose"], options); } } diff --git a/packages/cli-core/src/packageManagers/supports/YarnManager.ts b/packages/cli-core/src/packageManagers/supports/YarnManager.ts index 107afe935..3688f9fdc 100644 --- a/packages/cli-core/src/packageManagers/supports/YarnManager.ts +++ b/packages/cli-core/src/packageManagers/supports/YarnManager.ts @@ -1,5 +1,5 @@ import {Injectable} from "@tsed/di"; -import execa from "execa"; +import type {Options} from "execa"; import {Observable} from "rxjs"; import {BaseManager, type ManagerCmdOpts} from "./BaseManager.js"; @@ -19,7 +19,7 @@ export class YarnManager extends BaseManager { return this.run("add", ["-D", "--ignore-engines", ...deps], options); } - install(options: {verbose?: boolean} & execa.Options): Observable { + install(options: {verbose?: boolean} & Options): Observable { return this.run("install", [options.verbose && "--verbose"], options); } } diff --git a/packages/cli-core/src/services/CliExeca.ts b/packages/cli-core/src/services/CliExeca.ts index 96d98ee60..bb8f7d315 100644 --- a/packages/cli-core/src/services/CliExeca.ts +++ b/packages/cli-core/src/services/CliExeca.ts @@ -1,6 +1,6 @@ import {Injectable} from "@tsed/di"; import type {Options, SyncOptions} from "execa"; -import execa from "execa"; +import {execa, execaSync} from "execa"; import {filter, mergeWith} from "rxjs/operators"; // @ts-ignore import split from "split"; @@ -10,6 +10,7 @@ import {streamToObservable} from "../utils/streamToObservable.js"; @Injectable() export class CliExeca { readonly raw = execa; + readonly rawSync = execaSync; /** * @@ -26,14 +27,14 @@ export class CliExeca { } runSync(cmd: string, args: string[], opts?: SyncOptions) { - return this.raw.sync(cmd, args, opts); + return this.rawSync(cmd, args, opts); } - async getAsync(cmd: string, args: string[], opts?: SyncOptions) { + async getAsync(cmd: string | URL, args: readonly string[], opts?: Options) { return (await this.raw(cmd, args, opts)).stdout; } get(cmd: string, args: string[], opts?: SyncOptions) { - return this.raw.sync(cmd, args, opts).stdout; + return this.rawSync(cmd, args, opts).stdout; } } diff --git a/packages/cli-core/test/integrations/command.integration.spec.ts b/packages/cli-core/test/integrations/command.integration.spec.ts index e4be43b37..b756267ec 100644 --- a/packages/cli-core/test/integrations/command.integration.spec.ts +++ b/packages/cli-core/test/integrations/command.integration.spec.ts @@ -1,6 +1,6 @@ -import execa from "execa"; +import {execa} from "execa"; -import {CliCore, Command, CommandProvider, Tasks} from "../../src/index.js"; +import {CliCore, Command, type CommandProvider, type Tasks} from "../../src/index.js"; vi.mock("execa"); diff --git a/packages/cli/package.json b/packages/cli/package.json index 4e245e327..9469e86a5 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -71,13 +71,13 @@ "@tsed/logger": ">=6.2.1", "@tsed/openspec": ">=7.14.2", "@tsed/schema": ">=7.14.2", - "chalk": "5.3.0", - "change-case": "5.4.4", + "chalk": "^5.3.0", + "change-case": "^5.4.4", "esm-module-alias": "^2.2.1", - "globby": "11.1.0", - "read-pkg-up": "7.0.1", + "globby": "^11.1.0", + "read-pkg-up": "^7.0.1", "semver": "^7.6.3", - "tslib": "2.3.1" + "tslib": "^2.3.1" }, "devDependencies": { "@tsed/typescript": "workspace:*", diff --git a/yarn.lock b/yarn.lock index 08f402358..30e828511 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2280,36 +2280,36 @@ __metadata: "@types/update-notifier": "npm:6.0.8" "@types/url-parse": "npm:^1.4.11" "@types/uuid": "npm:10.0.0" - ajv: "npm:8.17.1" - axios: "npm:1.7.7" - chalk: "npm:5.3.0" + ajv: "npm:^8.17.1" + axios: "npm:^1.7.7" + chalk: "npm:^5.3.0" change-case: "npm:^5.4.4" - commander: "npm:9.3.0" - consolidate: "npm:1.0.4" - create-frame: "npm:1.0.0" + commander: "npm:^9.3.0" + consolidate: "npm:^1.0.4" + create-frame: "npm:^1.0.0" cross-env: "npm:7.0.3" deps: "npm:^1.0.0" - enquirer: "npm:2.4.1" - execa: "npm:5.1.1" - figures: "npm:6.1.0" - fs-extra: "npm:11.1.0" - globby: "npm:11.1.0" - handlebars: "npm:4.7.8" - handlebars-utils: "npm:1.0.6" - inquirer: "npm:8.2.6" - inquirer-autocomplete-prompt: "npm:2.0.1" - js-yaml: "npm:4.1.0" - listr2: "npm:5.0.8" - read-pkg-up: "npm:7.0.1" - registry-url: "npm:5.1.0" + enquirer: "npm:^2.4.1" + execa: "npm:^9.4.0" + figures: "npm:^6.1.0" + fs-extra: "npm:^11.2.0" + globby: "npm:^11.1.0" + handlebars: "npm:^4.7.8" + handlebars-utils: "npm:^1.0.6" + inquirer: "npm:^8.2.6" + inquirer-autocomplete-prompt: "npm:^2.0.1" + js-yaml: "npm:^4.1.0" + listr2: "npm:^5.0.8" + read-pkg-up: "npm:^7.0.1" + registry-url: "npm:^5.1.0" rxjs: "npm:^7.8.1" - semver: "npm:7.6.3" - split: "npm:1.0.1" - tslib: "npm:2.3.1" - tunnel: "npm:0.0.6" + semver: "npm:^7.6.3" + split: "npm:^1.0.1" + tslib: "npm:^2.3.1" + tunnel: "npm:^0.0.6" typescript: "npm:5.6.2" - update-notifier: "npm:7.3.1" - url-parse: "npm:1.5.10" + update-notifier: "npm:^7.3.1" + url-parse: "npm:^1.5.10" uuid: "npm:^10.0.0" vitest: "npm:2.1.1" peerDependencies: @@ -2537,9 +2537,9 @@ __metadata: eslint-plugin-simple-import-sort: "npm:12.1.1" eslint-plugin-vitest: "npm:^0.5.4" eslint-plugin-workspaces: "npm:0.10.1" - execa: "npm:5.1.1" + execa: "npm:9.4.0" figures: "npm:6.1.0" - fs-extra: "npm:11.1.0" + fs-extra: "npm:^11.2.0" gflow: "npm:^5.1.4" handlebars: "npm:4.7.8" handlebars-helpers: "npm:0.10.0" @@ -2597,14 +2597,14 @@ __metadata: "@tsed/schema": "npm:>=7.14.2" "@tsed/typescript": "workspace:*" "@types/change-case": "npm:^2.3.1" - chalk: "npm:5.3.0" - change-case: "npm:5.4.4" + chalk: "npm:^5.3.0" + change-case: "npm:^5.4.4" cross-env: "npm:7.0.3" esm-module-alias: "npm:^2.2.1" - globby: "npm:11.1.0" - read-pkg-up: "npm:7.0.1" + globby: "npm:^11.1.0" + read-pkg-up: "npm:^7.0.1" semver: "npm:^7.6.3" - tslib: "npm:2.3.1" + tslib: "npm:^2.3.1" typescript: "npm:5.6.2" vitest: "npm:2.1.1" peerDependencies: @@ -3516,18 +3516,6 @@ __metadata: languageName: node linkType: hard -"ajv@npm:8.17.1, ajv@npm:^8.11.0": - version: 8.17.1 - resolution: "ajv@npm:8.17.1" - dependencies: - fast-deep-equal: "npm:^3.1.3" - fast-uri: "npm:^3.0.1" - json-schema-traverse: "npm:^1.0.0" - require-from-string: "npm:^2.0.2" - checksum: 10/ee3c62162c953e91986c838f004132b6a253d700f1e51253b99791e2dbfdb39161bc950ebdc2f156f8568035bb5ed8be7bd78289cd9ecbf3381fe8f5b82e3f33 - languageName: node - linkType: hard - "ajv@npm:^6.12.4": version: 6.12.6 resolution: "ajv@npm:6.12.6" @@ -3540,6 +3528,18 @@ __metadata: languageName: node linkType: hard +"ajv@npm:^8.11.0, ajv@npm:^8.17.1": + version: 8.17.1 + resolution: "ajv@npm:8.17.1" + dependencies: + fast-deep-equal: "npm:^3.1.3" + fast-uri: "npm:^3.0.1" + json-schema-traverse: "npm:^1.0.0" + require-from-string: "npm:^2.0.2" + checksum: 10/ee3c62162c953e91986c838f004132b6a253d700f1e51253b99791e2dbfdb39161bc950ebdc2f156f8568035bb5ed8be7bd78289cd9ecbf3381fe8f5b82e3f33 + languageName: node + linkType: hard + "ansi-align@npm:^3.0.0, ansi-align@npm:^3.0.1": version: 3.0.1 resolution: "ansi-align@npm:3.0.1" @@ -4184,7 +4184,7 @@ __metadata: languageName: node linkType: hard -"axios@npm:1.7.7, axios@npm:^1.7.4": +"axios@npm:1.7.7, axios@npm:^1.7.4, axios@npm:^1.7.7": version: 1.7.7 resolution: "axios@npm:1.7.7" dependencies: @@ -5176,6 +5176,13 @@ __metadata: languageName: node linkType: hard +"commander@npm:^9.3.0": + version: 9.5.0 + resolution: "commander@npm:9.5.0" + checksum: 10/41c49b3d0f94a1fbeb0463c85b13f15aa15a9e0b4d5e10a49c0a1d58d4489b549d62262b052ae0aa6cfda53299bee487bfe337825df15e342114dde543f82906 + languageName: node + linkType: hard + "commander@npm:~12.1.0": version: 12.1.0 resolution: "commander@npm:12.1.0" @@ -5303,7 +5310,7 @@ __metadata: languageName: node linkType: hard -"consolidate@npm:1.0.4": +"consolidate@npm:1.0.4, consolidate@npm:^1.0.4": version: 1.0.4 resolution: "consolidate@npm:1.0.4" peerDependencies: @@ -5706,7 +5713,7 @@ __metadata: languageName: node linkType: hard -"create-frame@npm:1.0.0, create-frame@npm:^1.0.0": +"create-frame@npm:^1.0.0": version: 1.0.0 resolution: "create-frame@npm:1.0.0" dependencies: @@ -6279,7 +6286,7 @@ __metadata: languageName: node linkType: hard -"enquirer@npm:2.4.1": +"enquirer@npm:^2.4.1": version: 2.4.1 resolution: "enquirer@npm:2.4.1" dependencies: @@ -6753,20 +6760,23 @@ __metadata: languageName: node linkType: hard -"execa@npm:5.1.1": - version: 5.1.1 - resolution: "execa@npm:5.1.1" +"execa@npm:9.4.0, execa@npm:^9.4.0": + version: 9.4.0 + resolution: "execa@npm:9.4.0" dependencies: + "@sindresorhus/merge-streams": "npm:^4.0.0" cross-spawn: "npm:^7.0.3" - get-stream: "npm:^6.0.0" - human-signals: "npm:^2.1.0" - is-stream: "npm:^2.0.0" - merge-stream: "npm:^2.0.0" - npm-run-path: "npm:^4.0.1" - onetime: "npm:^5.1.2" - signal-exit: "npm:^3.0.3" - strip-final-newline: "npm:^2.0.0" - checksum: 10/8ada91f2d70f7dff702c861c2c64f21dfdc1525628f3c0454fd6f02fce65f7b958616cbd2b99ca7fa4d474e461a3d363824e91b3eb881705231abbf387470597 + figures: "npm:^6.1.0" + get-stream: "npm:^9.0.0" + human-signals: "npm:^8.0.0" + is-plain-obj: "npm:^4.1.0" + is-stream: "npm:^4.0.1" + npm-run-path: "npm:^6.0.0" + pretty-ms: "npm:^9.0.0" + signal-exit: "npm:^4.1.0" + strip-final-newline: "npm:^4.0.0" + yoctocolors: "npm:^2.0.0" + checksum: 10/a92be5d2b5baa84e6ef32fc38c620e1f4b5990399e88661563933ffbcd7be1ea28cc96bef059f14d45fee289061980c9452d2abb4786f4c6f492f04767387a67 languageName: node linkType: hard @@ -7376,17 +7386,6 @@ __metadata: languageName: node linkType: hard -"fs-extra@npm:11.1.0": - version: 11.1.0 - resolution: "fs-extra@npm:11.1.0" - dependencies: - graceful-fs: "npm:^4.2.0" - jsonfile: "npm:^6.0.1" - universalify: "npm:^2.0.0" - checksum: 10/b3f4a411e221f3300cfed7f2c1fa3ea0538cc1688c4276ce38fc404e270526002c5a01a18f64f8dee5e2745f7c2e9ba188cb130240796da67a2a142b133b4b25 - languageName: node - linkType: hard - "fs-extra@npm:8.1.0, fs-extra@npm:^8.1.0": version: 8.1.0 resolution: "fs-extra@npm:8.1.0" @@ -8101,7 +8100,7 @@ __metadata: languageName: node linkType: hard -"handlebars-utils@npm:1.0.6, handlebars-utils@npm:^1.0.2, handlebars-utils@npm:^1.0.4, handlebars-utils@npm:^1.0.6": +"handlebars-utils@npm:^1.0.2, handlebars-utils@npm:^1.0.4, handlebars-utils@npm:^1.0.6": version: 1.0.6 resolution: "handlebars-utils@npm:1.0.6" dependencies: @@ -8111,7 +8110,7 @@ __metadata: languageName: node linkType: hard -"handlebars@npm:4.7.8": +"handlebars@npm:4.7.8, handlebars@npm:^4.7.8": version: 4.7.8 resolution: "handlebars@npm:4.7.8" dependencies: @@ -8711,7 +8710,7 @@ __metadata: languageName: node linkType: hard -"inquirer-autocomplete-prompt@npm:2.0.1": +"inquirer-autocomplete-prompt@npm:2.0.1, inquirer-autocomplete-prompt@npm:^2.0.1": version: 2.0.1 resolution: "inquirer-autocomplete-prompt@npm:2.0.1" dependencies: @@ -8726,7 +8725,7 @@ __metadata: languageName: node linkType: hard -"inquirer@npm:8.2.6": +"inquirer@npm:8.2.6, inquirer@npm:^8.2.6": version: 8.2.6 resolution: "inquirer@npm:8.2.6" dependencies: @@ -10196,7 +10195,7 @@ __metadata: languageName: node linkType: hard -"listr2@npm:5.0.8": +"listr2@npm:5.0.8, listr2@npm:^5.0.8": version: 5.0.8 resolution: "listr2@npm:5.0.8" dependencies: @@ -11875,6 +11874,16 @@ __metadata: languageName: node linkType: hard +"npm-run-path@npm:^6.0.0": + version: 6.0.0 + resolution: "npm-run-path@npm:6.0.0" + dependencies: + path-key: "npm:^4.0.0" + unicorn-magic: "npm:^0.3.0" + checksum: 10/1a1b50aba6e6af7fd34a860ba2e252e245c4a59b316571a990356417c0cdf0414cabf735f7f52d9c330899cb56f0ab804a8e21fb12a66d53d7843e39ada4a3b6 + languageName: node + linkType: hard + "npm-user-validate@npm:^2.0.0": version: 2.0.0 resolution: "npm-user-validate@npm:2.0.0" @@ -13505,7 +13514,7 @@ __metadata: languageName: node linkType: hard -"registry-url@npm:5.1.0, registry-url@npm:^5.0.0": +"registry-url@npm:5.1.0, registry-url@npm:^5.0.0, registry-url@npm:^5.1.0": version: 5.1.0 resolution: "registry-url@npm:5.1.0" dependencies: @@ -15485,6 +15494,13 @@ __metadata: languageName: node linkType: hard +"tslib@npm:^2.3.1, tslib@npm:^2.6.2, tslib@npm:^2.6.3": + version: 2.7.0 + resolution: "tslib@npm:2.7.0" + checksum: 10/9a5b47ddac65874fa011c20ff76db69f97cf90c78cff5934799ab8894a5342db2d17b4e7613a087046bc1d133d21547ddff87ac558abeec31ffa929c88b7fce6 + languageName: node + linkType: hard + "tslib@npm:^2.4.0": version: 2.5.3 resolution: "tslib@npm:2.5.3" @@ -15492,13 +15508,6 @@ __metadata: languageName: node linkType: hard -"tslib@npm:^2.6.2, tslib@npm:^2.6.3": - version: 2.7.0 - resolution: "tslib@npm:2.7.0" - checksum: 10/9a5b47ddac65874fa011c20ff76db69f97cf90c78cff5934799ab8894a5342db2d17b4e7613a087046bc1d133d21547ddff87ac558abeec31ffa929c88b7fce6 - languageName: node - linkType: hard - "tuf-js@npm:^2.2.0": version: 2.2.0 resolution: "tuf-js@npm:2.2.0" @@ -15510,7 +15519,7 @@ __metadata: languageName: node linkType: hard -"tunnel@npm:0.0.6": +"tunnel@npm:^0.0.6": version: 0.0.6 resolution: "tunnel@npm:0.0.6" checksum: 10/cf1ffed5e67159b901a924dbf94c989f20b2b3b65649cfbbe4b6abb35955ce2cf7433b23498bdb2c5530ab185b82190fce531597b3b4a649f06a907fc8702405 @@ -15744,6 +15753,13 @@ __metadata: languageName: node linkType: hard +"unicorn-magic@npm:^0.3.0": + version: 0.3.0 + resolution: "unicorn-magic@npm:0.3.0" + checksum: 10/bdd7d7c522f9456f32a0b77af23f8854f9a7db846088c3868ec213f9550683ab6a2bdf3803577eacbafddb4e06900974385841ccb75338d17346ccef45f9cb01 + languageName: node + linkType: hard + "unified@npm:^9.0.0": version: 9.2.2 resolution: "unified@npm:9.2.2" @@ -15934,7 +15950,7 @@ __metadata: languageName: node linkType: hard -"update-notifier@npm:7.3.1": +"update-notifier@npm:7.3.1, update-notifier@npm:^7.3.1": version: 7.3.1 resolution: "update-notifier@npm:7.3.1" dependencies: @@ -16022,7 +16038,7 @@ __metadata: languageName: node linkType: hard -"url-parse@npm:1.5.10": +"url-parse@npm:^1.5.10": version: 1.5.10 resolution: "url-parse@npm:1.5.10" dependencies: From 32a83317ce8b3f1eb4352e8bf32e4796be238f89 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Wed, 25 Sep 2024 08:22:02 +0200 Subject: [PATCH 48/69] fix: bump globby to v14.0.2 --- packages/cli-core/package.json | 2 +- packages/cli-core/src/services/Renderer.spec.ts | 2 +- packages/cli-core/src/services/Renderer.ts | 2 +- packages/cli/package.json | 2 +- packages/cli/src/commands/generate/GenerateCmd.ts | 4 ++-- tools/vitest/presets/alias.js | 4 ++-- yarn.lock | 6 +++--- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index 65a94678d..fc53efa63 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -47,7 +47,7 @@ "execa": "^9.4.0", "figures": "^6.1.0", "fs-extra": "^11.2.0", - "globby": "^11.1.0", + "globby": "^14.0.2", "handlebars": "^4.7.8", "handlebars-utils": "^1.0.6", "inquirer": "^8.2.6", diff --git a/packages/cli-core/src/services/Renderer.spec.ts b/packages/cli-core/src/services/Renderer.spec.ts index 24eff16ee..5327bcb57 100644 --- a/packages/cli-core/src/services/Renderer.spec.ts +++ b/packages/cli-core/src/services/Renderer.spec.ts @@ -3,7 +3,7 @@ import {join} from "node:path"; // @ts-ignore import {FakeCliFs, normalizePath} from "@tsed/cli-testing"; import Consolidate from "consolidate"; -import globby from "globby"; +import {globby} from "globby"; import handlebars from "handlebars"; import {getTemplateDirectory} from "../utils/index.js"; diff --git a/packages/cli-core/src/services/Renderer.ts b/packages/cli-core/src/services/Renderer.ts index 23e5cdd9c..6315a1d08 100644 --- a/packages/cli-core/src/services/Renderer.ts +++ b/packages/cli-core/src/services/Renderer.ts @@ -5,7 +5,7 @@ import {Configuration, Constant, Inject, Injectable} from "@tsed/di"; import {normalizePath} from "@tsed/normalize-path"; import Consolidate from "consolidate"; import fs from "fs-extra"; -import globby from "globby"; +import {globby} from "globby"; import handlebars from "handlebars"; import {basename, dirname, join, relative} from "path"; import {Observable} from "rxjs"; diff --git a/packages/cli/package.json b/packages/cli/package.json index 9469e86a5..ca6edbd33 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -74,7 +74,7 @@ "chalk": "^5.3.0", "change-case": "^5.4.4", "esm-module-alias": "^2.2.1", - "globby": "^11.1.0", + "globby": "^14.0.2", "read-pkg-up": "^7.0.1", "semver": "^7.6.3", "tslib": "^2.3.1" diff --git a/packages/cli/src/commands/generate/GenerateCmd.ts b/packages/cli/src/commands/generate/GenerateCmd.ts index 564879b78..0fee057ff 100644 --- a/packages/cli/src/commands/generate/GenerateCmd.ts +++ b/packages/cli/src/commands/generate/GenerateCmd.ts @@ -1,7 +1,7 @@ import {type CliDefaultOptions, Command, type CommandProvider, Inject, ProjectPackageJson, SrcRendererService} from "@tsed/cli-core"; import {normalizePath} from "@tsed/normalize-path"; import {kebabCase, pascalCase} from "change-case"; -import globby from "globby"; +import {globbySync} from "globby"; import {basename, dirname, join} from "path"; import {ProjectConvention} from "../../interfaces/ProjectConvention.js"; @@ -269,7 +269,7 @@ export class GenerateCmd implements CommandProvider { } getDirectories(dir: string) { - const directories = globby.sync("**/*", { + const directories = globbySync("**/*", { cwd: join(this.srcRenderService.rootDir, dir), ignore: ["__*"] }); diff --git a/tools/vitest/presets/alias.js b/tools/vitest/presets/alias.js index ade065253..7174bb99d 100644 --- a/tools/vitest/presets/alias.js +++ b/tools/vitest/presets/alias.js @@ -1,7 +1,7 @@ import {readFileSync} from "node:fs"; import {basename, dirname, join} from "node:path"; -import {sync} from "globby"; +import {globbySync} from "globby"; const root = join(import.meta.dirname, "../../.."); @@ -18,7 +18,7 @@ function deps(pkg, pkgs, set = new Set()) { } function findPackages() { - const pkgs = sync( + const pkgs = globbySync( [ "packages/*/package.json", "packages/graphql/*/package.json", diff --git a/yarn.lock b/yarn.lock index 30e828511..705dbd97f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2293,7 +2293,7 @@ __metadata: execa: "npm:^9.4.0" figures: "npm:^6.1.0" fs-extra: "npm:^11.2.0" - globby: "npm:^11.1.0" + globby: "npm:^14.0.2" handlebars: "npm:^4.7.8" handlebars-utils: "npm:^1.0.6" inquirer: "npm:^8.2.6" @@ -2601,7 +2601,7 @@ __metadata: change-case: "npm:^5.4.4" cross-env: "npm:7.0.3" esm-module-alias: "npm:^2.2.1" - globby: "npm:^11.1.0" + globby: "npm:^14.0.2" read-pkg-up: "npm:^7.0.1" semver: "npm:^7.6.3" tslib: "npm:^2.3.1" @@ -7921,7 +7921,7 @@ __metadata: languageName: node linkType: hard -"globby@npm:14.0.2": +"globby@npm:14.0.2, globby@npm:^14.0.2": version: 14.0.2 resolution: "globby@npm:14.0.2" dependencies: From cd8b5f889e67290c4f7a2345fda2177eeda8c310 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Wed, 25 Sep 2024 08:25:16 +0200 Subject: [PATCH 49/69] fix: bump read-pkg-up to v11.0.0 --- package.json | 2 +- packages/cli-core/package.json | 3 +- .../src/services/ProjectPackageJson.ts | 4 +- .../src/utils/getTemplateDirectory.ts | 4 +- packages/cli/package.json | 2 +- packages/cli/src/constants/index.ts | 4 +- yarn.lock | 87 +++++-------------- 7 files changed, 33 insertions(+), 73 deletions(-) diff --git a/package.json b/package.json index c5013ef50..4f5b33cf6 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "js-yaml": "4.1.0", "lerna": "8.1.8", "listr2": "5.0.8", - "read-pkg-up": "7.0.1", + "read-pkg-up": "^11.0.0", "registry-url": "5.1.0", "rxjs": "^7.8.1", "semver": "7.6.3", diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index fc53efa63..0a1ab05a9 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -54,7 +54,7 @@ "inquirer-autocomplete-prompt": "^2.0.1", "js-yaml": "^4.1.0", "listr2": "^5.0.8", - "read-pkg-up": "^7.0.1", + "read-pkg-up": "^11.0.0", "registry-url": "^5.1.0", "rxjs": "^7.8.1", "semver": "^7.6.3", @@ -73,7 +73,6 @@ "@types/globby": "9.1.0", "@types/inquirer": "9.0.7", "@types/js-yaml": "4.0.9", - "@types/read-pkg-up": "6.0.0", "@types/semver": "7.5.8", "@types/tunnel": "0.0.7", "@types/update-notifier": "6.0.8", diff --git a/packages/cli-core/src/services/ProjectPackageJson.ts b/packages/cli-core/src/services/ProjectPackageJson.ts index cd0ce2247..bc2568390 100644 --- a/packages/cli-core/src/services/ProjectPackageJson.ts +++ b/packages/cli-core/src/services/ProjectPackageJson.ts @@ -1,7 +1,7 @@ import {getValue, setValue} from "@tsed/core"; import {Configuration, Injectable} from "@tsed/di"; import {dirname, join} from "path"; -import readPkgUp from "read-pkg-up"; +import {readPackageUpSync} from "read-pkg-up"; import type {PackageJson} from "../interfaces/PackageJson.js"; import type {ProjectPreferences} from "../interfaces/ProjectPreferences.js"; @@ -315,7 +315,7 @@ export class ProjectPackageJson { const fileExists = this.fs.exists(pkgPath); if (!disableReadUpPkg && !fileExists) { - const result = readPkgUp.sync({ + const result = readPackageUpSync({ cwd }); diff --git a/packages/cli-core/src/utils/getTemplateDirectory.ts b/packages/cli-core/src/utils/getTemplateDirectory.ts index 001bafb2c..5b45024ba 100644 --- a/packages/cli-core/src/utils/getTemplateDirectory.ts +++ b/packages/cli-core/src/utils/getTemplateDirectory.ts @@ -1,8 +1,8 @@ import {dirname, join} from "path"; -import readPkgUp from "read-pkg-up"; +import {readPackageUpSync} from "read-pkg-up"; export function getTemplateDirectory(cwd: string) { - const {path} = readPkgUp.sync({ + const {path} = readPackageUpSync({ cwd: join(cwd, "..", "..") })!; diff --git a/packages/cli/package.json b/packages/cli/package.json index ca6edbd33..1b2ba5415 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -75,7 +75,7 @@ "change-case": "^5.4.4", "esm-module-alias": "^2.2.1", "globby": "^14.0.2", - "read-pkg-up": "^7.0.1", + "read-pkg-up": "^11.0.0", "semver": "^7.6.3", "tslib": "^2.3.1" }, diff --git a/packages/cli/src/constants/index.ts b/packages/cli/src/constants/index.ts index fcf35949a..2bf3a35cb 100644 --- a/packages/cli/src/constants/index.ts +++ b/packages/cli/src/constants/index.ts @@ -1,7 +1,7 @@ import {dirname, join} from "path"; -import readPkgUp from "read-pkg-up"; +import {readPackageUpSync} from "read-pkg-up"; -const {path, packageJson} = readPkgUp.sync({ +const {path, packageJson} = readPackageUpSync({ cwd: join(import.meta.dirname, "..", "..") })!; diff --git a/yarn.lock b/yarn.lock index 705dbd97f..0287ba5f5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2274,7 +2274,6 @@ __metadata: "@types/globby": "npm:9.1.0" "@types/inquirer": "npm:9.0.7" "@types/js-yaml": "npm:4.0.9" - "@types/read-pkg-up": "npm:6.0.0" "@types/semver": "npm:7.5.8" "@types/tunnel": "npm:0.0.7" "@types/update-notifier": "npm:6.0.8" @@ -2300,7 +2299,7 @@ __metadata: inquirer-autocomplete-prompt: "npm:^2.0.1" js-yaml: "npm:^4.1.0" listr2: "npm:^5.0.8" - read-pkg-up: "npm:^7.0.1" + read-pkg-up: "npm:^11.0.0" registry-url: "npm:^5.1.0" rxjs: "npm:^7.8.1" semver: "npm:^7.6.3" @@ -2553,7 +2552,7 @@ __metadata: listr2: "npm:5.0.8" markdown-it: "npm:13.0.2" prettier: "npm:3.3.3" - read-pkg-up: "npm:7.0.1" + read-pkg-up: "npm:^11.0.0" registry-url: "npm:5.1.0" rxjs: "npm:^7.8.1" semantic-release: "npm:24.1.1" @@ -2602,7 +2601,7 @@ __metadata: cross-env: "npm:7.0.3" esm-module-alias: "npm:^2.2.1" globby: "npm:^14.0.2" - read-pkg-up: "npm:^7.0.1" + read-pkg-up: "npm:^11.0.0" semver: "npm:^7.6.3" tslib: "npm:^2.3.1" typescript: "npm:5.6.2" @@ -2984,7 +2983,7 @@ __metadata: languageName: node linkType: hard -"@types/normalize-package-data@npm:^2.4.0, @types/normalize-package-data@npm:^2.4.1": +"@types/normalize-package-data@npm:^2.4.0": version: 2.4.1 resolution: "@types/normalize-package-data@npm:2.4.1" checksum: 10/e87bccbf11f95035c89a132b52b79ce69a1e3652fe55962363063c9c0dae0fe2477ebc585e03a9652adc6f381d24ba5589cc5e51849df4ced3d3e004a7d40ed5 @@ -3005,15 +3004,6 @@ __metadata: languageName: node linkType: hard -"@types/read-pkg-up@npm:6.0.0": - version: 6.0.0 - resolution: "@types/read-pkg-up@npm:6.0.0" - dependencies: - read-pkg-up: "npm:*" - checksum: 10/d3dd17b2ab8841ff7071591dc5203fe080a610abfb8ecebef3f3e998aaa9e8c537a032fa657da0f4724c72929df9a1ea5b9f7cb4648badffe49def9badeff81a - languageName: node - linkType: hard - "@types/responselike@npm:^1.0.0": version: 1.0.3 resolution: "@types/responselike@npm:1.0.3" @@ -7209,16 +7199,6 @@ __metadata: languageName: node linkType: hard -"find-up@npm:^6.3.0": - version: 6.3.0 - resolution: "find-up@npm:6.3.0" - dependencies: - locate-path: "npm:^7.1.0" - path-exists: "npm:^5.0.0" - checksum: 10/4f3bdc30d41778c647e53f4923e72de5e5fb055157031f34501c5b36c2eb59f77b997edf9cb00165c6060cda7eaa2e3da82cb6be2e61d68ad3e07c4bc4cce67e - languageName: node - linkType: hard - "find-up@npm:^7.0.0": version: 7.0.0 resolution: "find-up@npm:7.0.0" @@ -10320,7 +10300,7 @@ __metadata: languageName: node linkType: hard -"locate-path@npm:^7.1.0, locate-path@npm:^7.2.0": +"locate-path@npm:^7.2.0": version: 7.2.0 resolution: "locate-path@npm:7.2.0" dependencies: @@ -11631,7 +11611,7 @@ __metadata: languageName: node linkType: hard -"normalize-package-data@npm:^3.0.0, normalize-package-data@npm:^3.0.2, normalize-package-data@npm:^3.0.3": +"normalize-package-data@npm:^3.0.0, normalize-package-data@npm:^3.0.3": version: 3.0.3 resolution: "normalize-package-data@npm:3.0.3" dependencies: @@ -13316,17 +13296,6 @@ __metadata: languageName: node linkType: hard -"read-pkg-up@npm:*": - version: 9.1.0 - resolution: "read-pkg-up@npm:9.1.0" - dependencies: - find-up: "npm:^6.3.0" - read-pkg: "npm:^7.1.0" - type-fest: "npm:^2.5.0" - checksum: 10/41b8ba4bdb7c1e914aa6ce2d36a7c1651e9086938977fa12f058f6fca51ee15315634af648ca4ef70dd074e575e854616b39032ad0b376e9e97d61a9d0867afe - languageName: node - linkType: hard - "read-pkg-up@npm:7.0.0": version: 7.0.0 resolution: "read-pkg-up@npm:7.0.0" @@ -13338,14 +13307,14 @@ __metadata: languageName: node linkType: hard -"read-pkg-up@npm:7.0.1, read-pkg-up@npm:^7.0.1": - version: 7.0.1 - resolution: "read-pkg-up@npm:7.0.1" +"read-pkg-up@npm:^11.0.0": + version: 11.0.0 + resolution: "read-pkg-up@npm:11.0.0" dependencies: - find-up: "npm:^4.1.0" - read-pkg: "npm:^5.2.0" - type-fest: "npm:^0.8.1" - checksum: 10/e4e93ce70e5905b490ca8f883eb9e48b5d3cebc6cd4527c25a0d8f3ae2903bd4121c5ab9c5a3e217ada0141098eeb661313c86fa008524b089b8ed0b7f165e44 + find-up-simple: "npm:^1.0.0" + read-pkg: "npm:^9.0.0" + type-fest: "npm:^4.6.0" + checksum: 10/c08fe324a6d8cb3f1f4533074db8a4ef222c85af74bc30e7a98117c578e5d6b2dd8868fded660386167c95ffaf5d566f95743a621581df332573bc989c19cf45 languageName: node linkType: hard @@ -13370,6 +13339,17 @@ __metadata: languageName: node linkType: hard +"read-pkg-up@npm:^7.0.1": + version: 7.0.1 + resolution: "read-pkg-up@npm:7.0.1" + dependencies: + find-up: "npm:^4.1.0" + read-pkg: "npm:^5.2.0" + type-fest: "npm:^0.8.1" + checksum: 10/e4e93ce70e5905b490ca8f883eb9e48b5d3cebc6cd4527c25a0d8f3ae2903bd4121c5ab9c5a3e217ada0141098eeb661313c86fa008524b089b8ed0b7f165e44 + languageName: node + linkType: hard + "read-pkg@npm:^3.0.0": version: 3.0.0 resolution: "read-pkg@npm:3.0.0" @@ -13393,18 +13373,6 @@ __metadata: languageName: node linkType: hard -"read-pkg@npm:^7.1.0": - version: 7.1.0 - resolution: "read-pkg@npm:7.1.0" - dependencies: - "@types/normalize-package-data": "npm:^2.4.1" - normalize-package-data: "npm:^3.0.2" - parse-json: "npm:^5.2.0" - type-fest: "npm:^2.0.0" - checksum: 10/20d11c59be3ae1fc79d4b9c8594dabeaec58105f9dfd710570ef9690ec2ac929247006e79ca114257683228663199735d60f149948dbc5f34fcd2d28883ab5f7 - languageName: node - linkType: hard - "read-pkg@npm:^9.0.0": version: 9.0.1 resolution: "read-pkg@npm:9.0.1" @@ -15598,13 +15566,6 @@ __metadata: languageName: node linkType: hard -"type-fest@npm:^2.0.0, type-fest@npm:^2.5.0": - version: 2.12.1 - resolution: "type-fest@npm:2.12.1" - checksum: 10/88be3a1ae7c5f8b8b7a8b0488704a78a83bc11f55529f972ef2ae4533694ae8a80a828610d23c23d92cb5b4c85adc21fa25ac6e43b1cf86817b088df5bbe5230 - languageName: node - linkType: hard - "type-fest@npm:^2.12.2, type-fest@npm:^2.13.0": version: 2.19.0 resolution: "type-fest@npm:2.19.0" From e9dbf8c4a00ace2a82ab98406f69209ccf00516f Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Wed, 25 Sep 2024 08:29:33 +0200 Subject: [PATCH 50/69] fix: bump registry-url to v6.0.1 --- package.json | 36 +- packages/cli-core/package.json | 4 +- .../cli-generate-http-client/package.json | 2 +- packages/cli-generate-swagger/package.json | 2 +- packages/cli-plugin-eslint/package.json | 2 +- packages/cli-plugin-jest/package.json | 2 +- packages/cli-plugin-mongoose/package.json | 2 +- .../cli-plugin-oidc-provider/package.json | 2 +- packages/cli-plugin-passport/package.json | 2 +- packages/cli-plugin-prisma/package.json | 2 +- packages/cli-plugin-typegraphql/package.json | 2 +- packages/cli-plugin-typeorm/package.json | 2 +- packages/cli-plugin-vitest/package.json | 2 +- packages/cli-testing/package.json | 2 +- packages/cli/package.json | 2 +- yarn.lock | 317 +++++++++--------- 16 files changed, 186 insertions(+), 197 deletions(-) diff --git a/package.json b/package.json index 4f5b33cf6..8f75ef94a 100644 --- a/package.json +++ b/package.json @@ -44,33 +44,31 @@ }, "homepage": "https://github.com/tsedio/tsed-cli", "dependencies": { - "@samverschueren/stream-to-observable": "0.3.1", "@tsed/core": ">=7.14.2", "@tsed/di": ">=7.14.2", "@tsed/logger": ">=6.2.1", "@tsed/normalize-path": ">=7.14.2", - "any-observable": "0.5.1", - "axios": "1.7.7", - "chalk": "5.3.0", - "commander": "9.3.0", - "consolidate": "1.0.4", - "execa": "9.4.0", - "figures": "6.1.0", + "axios": "^1.7.7", + "chalk": "^5.3.0", + "commander": "^9.3.0", + "consolidate": "^1.0.4", + "execa": "^9.4.0", + "figures": "^6.1.0", "fs-extra": "^11.2.0", - "handlebars": "4.7.8", - "handlebars-helpers": "0.10.0", - "inquirer": "8.2.6", - "inquirer-autocomplete-prompt": "2.0.1", - "js-yaml": "4.1.0", - "lerna": "8.1.8", - "listr2": "5.0.8", + "handlebars": "^4.7.8", + "handlebars-helpers": "^0.10.0", + "inquirer": "^8.2.6", + "inquirer-autocomplete-prompt": "^2.0.1", + "js-yaml": "^4.1.0", + "lerna": "^8.1.8", + "listr2": "^5.0.8", "read-pkg-up": "^11.0.0", - "registry-url": "5.1.0", + "registry-url": "^6.0.1", "rxjs": "^7.8.1", "semver": "7.6.3", - "split": "1.0.1", - "tslib": "2.3.1", - "update-notifier": "7.3.1" + "split": "^1.0.1", + "tslib": "^2.7.0", + "update-notifier": "^7.3.1" }, "devDependencies": { "@commitlint/cli": "19.5.0", diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index 0a1ab05a9..801f3610d 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -55,11 +55,11 @@ "js-yaml": "^4.1.0", "listr2": "^5.0.8", "read-pkg-up": "^11.0.0", - "registry-url": "^5.1.0", + "registry-url": "^6.0.1", "rxjs": "^7.8.1", "semver": "^7.6.3", "split": "^1.0.1", - "tslib": "^2.3.1", + "tslib": "^2.7.0", "tunnel": "^0.0.6", "update-notifier": "^7.3.1", "url-parse": "^1.5.10", diff --git a/packages/cli-generate-http-client/package.json b/packages/cli-generate-http-client/package.json index fd7c99fad..da0898b51 100644 --- a/packages/cli-generate-http-client/package.json +++ b/packages/cli-generate-http-client/package.json @@ -22,7 +22,7 @@ }, "dependencies": { "change-case": "5.4.4", - "tslib": "2.3.1" + "tslib": "2.7.0" }, "devDependencies": { "@tsed/cli": "workspace:*", diff --git a/packages/cli-generate-swagger/package.json b/packages/cli-generate-swagger/package.json index f1ad5c9a8..e6ae6a360 100644 --- a/packages/cli-generate-swagger/package.json +++ b/packages/cli-generate-swagger/package.json @@ -22,7 +22,7 @@ }, "dependencies": { "change-case": "5.4.4", - "tslib": "2.3.1" + "tslib": "2.7.0" }, "devDependencies": { "@tsed/cli": "workspace:*", diff --git a/packages/cli-plugin-eslint/package.json b/packages/cli-plugin-eslint/package.json index a7e2777e0..6258b68ae 100644 --- a/packages/cli-plugin-eslint/package.json +++ b/packages/cli-plugin-eslint/package.json @@ -27,6 +27,6 @@ "vitest": "2.1.1" }, "dependencies": { - "tslib": "2.3.1" + "tslib": "2.7.0" } } diff --git a/packages/cli-plugin-jest/package.json b/packages/cli-plugin-jest/package.json index 9baa7c81d..3297bf39b 100644 --- a/packages/cli-plugin-jest/package.json +++ b/packages/cli-plugin-jest/package.json @@ -29,6 +29,6 @@ "vitest": "2.1.1" }, "dependencies": { - "tslib": "2.3.1" + "tslib": "2.7.0" } } diff --git a/packages/cli-plugin-mongoose/package.json b/packages/cli-plugin-mongoose/package.json index 6242e7cc2..1fdd0554f 100644 --- a/packages/cli-plugin-mongoose/package.json +++ b/packages/cli-plugin-mongoose/package.json @@ -23,7 +23,7 @@ "dependencies": { "change-case": "5.4.4", "pluralize": "8.0.0", - "tslib": "2.3.1" + "tslib": "2.7.0" }, "devDependencies": { "@tsed/cli": "workspace:*", diff --git a/packages/cli-plugin-oidc-provider/package.json b/packages/cli-plugin-oidc-provider/package.json index 76d26b2cb..29cfc847b 100644 --- a/packages/cli-plugin-oidc-provider/package.json +++ b/packages/cli-plugin-oidc-provider/package.json @@ -25,7 +25,7 @@ "templates" ], "dependencies": { - "tslib": "2.3.1" + "tslib": "2.7.0" }, "devDependencies": { "@tsed/cli": "workspace:*", diff --git a/packages/cli-plugin-passport/package.json b/packages/cli-plugin-passport/package.json index 905ec2a90..c9f188da0 100644 --- a/packages/cli-plugin-passport/package.json +++ b/packages/cli-plugin-passport/package.json @@ -22,7 +22,7 @@ }, "dependencies": { "change-case": "^5.4.4", - "tslib": "2.3.1" + "tslib": "2.7.0" }, "devDependencies": { "@tsed/cli": "workspace:*", diff --git a/packages/cli-plugin-prisma/package.json b/packages/cli-plugin-prisma/package.json index 007bbd28b..f3213a825 100644 --- a/packages/cli-plugin-prisma/package.json +++ b/packages/cli-plugin-prisma/package.json @@ -22,7 +22,7 @@ }, "dependencies": { "change-case": "5.4.4", - "tslib": "2.3.1" + "tslib": "2.7.0" }, "devDependencies": { "@tsed/cli": "workspace:*", diff --git a/packages/cli-plugin-typegraphql/package.json b/packages/cli-plugin-typegraphql/package.json index b0763b498..ead5044db 100644 --- a/packages/cli-plugin-typegraphql/package.json +++ b/packages/cli-plugin-typegraphql/package.json @@ -25,7 +25,7 @@ "templates" ], "dependencies": { - "tslib": "2.3.1" + "tslib": "2.7.0" }, "devDependencies": { "@tsed/cli": "workspace:*", diff --git a/packages/cli-plugin-typeorm/package.json b/packages/cli-plugin-typeorm/package.json index 778633a2b..e09f0fcec 100644 --- a/packages/cli-plugin-typeorm/package.json +++ b/packages/cli-plugin-typeorm/package.json @@ -22,7 +22,7 @@ }, "dependencies": { "change-case": "5.4.4", - "tslib": "2.3.1" + "tslib": "2.7.0" }, "devDependencies": { "@tsed/cli": "workspace:*", diff --git a/packages/cli-plugin-vitest/package.json b/packages/cli-plugin-vitest/package.json index 53a1f258e..552f57613 100644 --- a/packages/cli-plugin-vitest/package.json +++ b/packages/cli-plugin-vitest/package.json @@ -29,6 +29,6 @@ "vitest": "2.1.1" }, "dependencies": { - "tslib": "2.3.1" + "tslib": "2.7.0" } } diff --git a/packages/cli-testing/package.json b/packages/cli-testing/package.json index 8ddb55895..a89dcc7a5 100644 --- a/packages/cli-testing/package.json +++ b/packages/cli-testing/package.json @@ -30,7 +30,7 @@ ], "dependencies": { "@tsed/cli-core": "workspace:*", - "tslib": "2.3.1" + "tslib": "2.7.0" }, "devDependencies": { "@tsed/typescript": "workspace:*", diff --git a/packages/cli/package.json b/packages/cli/package.json index 1b2ba5415..18c07f272 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -77,7 +77,7 @@ "globby": "^14.0.2", "read-pkg-up": "^11.0.0", "semver": "^7.6.3", - "tslib": "^2.3.1" + "tslib": "^2.7.0" }, "devDependencies": { "@tsed/typescript": "workspace:*", diff --git a/yarn.lock b/yarn.lock index 0287ba5f5..98b13e4da 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1813,7 +1813,7 @@ __metadata: languageName: node linkType: hard -"@samverschueren/stream-to-observable@npm:0.3.1, @samverschueren/stream-to-observable@npm:>=0.3.1, @samverschueren/stream-to-observable@npm:^0.3.0": +"@samverschueren/stream-to-observable@npm:>=0.3.1, @samverschueren/stream-to-observable@npm:^0.3.0": version: 0.3.1 resolution: "@samverschueren/stream-to-observable@npm:0.3.1" dependencies: @@ -2300,11 +2300,11 @@ __metadata: js-yaml: "npm:^4.1.0" listr2: "npm:^5.0.8" read-pkg-up: "npm:^11.0.0" - registry-url: "npm:^5.1.0" + registry-url: "npm:^6.0.1" rxjs: "npm:^7.8.1" semver: "npm:^7.6.3" split: "npm:^1.0.1" - tslib: "npm:^2.3.1" + tslib: "npm:^2.7.0" tunnel: "npm:^0.0.6" typescript: "npm:5.6.2" update-notifier: "npm:^7.3.1" @@ -2327,7 +2327,7 @@ __metadata: change-case: "npm:5.4.4" cross-env: "npm:7.0.3" swagger-typescript-api: "npm:^9.3.1" - tslib: "npm:2.3.1" + tslib: "npm:2.7.0" typescript: "npm:5.6.2" vitest: "npm:2.1.1" peerDependencies: @@ -2351,7 +2351,7 @@ __metadata: "@tsed/typescript": "workspace:*" change-case: "npm:5.4.4" cross-env: "npm:7.0.3" - tslib: "npm:2.3.1" + tslib: "npm:2.7.0" typescript: "npm:5.6.2" vitest: "npm:2.1.1" peerDependencies: @@ -2373,7 +2373,7 @@ __metadata: "@tsed/cli-core": "workspace:*" "@tsed/typescript": "workspace:*" cross-env: "npm:7.0.3" - tslib: "npm:2.3.1" + tslib: "npm:2.7.0" typescript: "npm:5.6.2" vitest: "npm:2.1.1" languageName: unknown @@ -2387,7 +2387,7 @@ __metadata: "@tsed/cli-core": "workspace:*" "@tsed/typescript": "workspace:*" cross-env: "npm:7.0.3" - tslib: "npm:2.3.1" + tslib: "npm:2.7.0" typescript: "npm:5.6.2" vitest: "npm:2.1.1" languageName: unknown @@ -2403,7 +2403,7 @@ __metadata: change-case: "npm:5.4.4" cross-env: "npm:7.0.3" pluralize: "npm:8.0.0" - tslib: "npm:2.3.1" + tslib: "npm:2.7.0" typescript: "npm:5.6.2" vitest: "npm:2.1.1" languageName: unknown @@ -2417,7 +2417,7 @@ __metadata: "@tsed/cli-core": "workspace:*" "@tsed/typescript": "workspace:*" cross-env: "npm:7.0.3" - tslib: "npm:2.3.1" + tslib: "npm:2.7.0" typescript: "npm:5.6.2" vitest: "npm:2.1.1" peerDependencies: @@ -2436,7 +2436,7 @@ __metadata: "@types/change-case": "npm:^2.3.1" change-case: "npm:^5.4.4" cross-env: "npm:7.0.3" - tslib: "npm:2.3.1" + tslib: "npm:2.7.0" typescript: "npm:5.6.2" vitest: "npm:2.1.1" languageName: unknown @@ -2451,7 +2451,7 @@ __metadata: "@tsed/typescript": "workspace:*" change-case: "npm:5.4.4" cross-env: "npm:7.0.3" - tslib: "npm:2.3.1" + tslib: "npm:2.7.0" typescript: "npm:5.6.2" vitest: "npm:2.1.1" languageName: unknown @@ -2465,7 +2465,7 @@ __metadata: "@tsed/cli-core": "workspace:*" "@tsed/typescript": "workspace:*" cross-env: "npm:7.0.3" - tslib: "npm:2.3.1" + tslib: "npm:2.7.0" typescript: "npm:5.6.2" vitest: "npm:2.1.1" peerDependencies: @@ -2483,7 +2483,7 @@ __metadata: "@tsed/typescript": "workspace:*" change-case: "npm:5.4.4" cross-env: "npm:7.0.3" - tslib: "npm:2.3.1" + tslib: "npm:2.7.0" typescript: "npm:5.6.2" vitest: "npm:2.1.1" languageName: unknown @@ -2497,7 +2497,7 @@ __metadata: "@tsed/cli-core": "workspace:*" "@tsed/typescript": "workspace:*" cross-env: "npm:7.0.3" - tslib: "npm:2.3.1" + tslib: "npm:2.7.0" typescript: "npm:5.6.2" vitest: "npm:2.1.1" languageName: unknown @@ -2509,7 +2509,6 @@ __metadata: dependencies: "@commitlint/cli": "npm:19.5.0" "@commitlint/config-conventional": "npm:19.5.0" - "@samverschueren/stream-to-observable": "npm:0.3.1" "@swc/core": "npm:1.7.28" "@swc/helpers": "npm:0.5.13" "@tsed/core": "npm:>=7.14.2" @@ -2523,12 +2522,11 @@ __metadata: "@typescript-eslint/eslint-plugin": "npm:8.7.0" "@typescript-eslint/parser": "npm:8.7.0" "@vitest/coverage-v8": "npm:^2.1.1" - any-observable: "npm:0.5.1" - axios: "npm:1.7.7" - chalk: "npm:5.3.0" - commander: "npm:9.3.0" + axios: "npm:^1.7.7" + chalk: "npm:^5.3.0" + commander: "npm:^9.3.0" concurrently: "npm:9.0.1" - consolidate: "npm:1.0.4" + consolidate: "npm:^1.0.4" cross-env: "npm:7.0.3" eslint: "npm:9.11.1" eslint-config-prettier: "npm:9.1.0" @@ -2536,34 +2534,34 @@ __metadata: eslint-plugin-simple-import-sort: "npm:12.1.1" eslint-plugin-vitest: "npm:^0.5.4" eslint-plugin-workspaces: "npm:0.10.1" - execa: "npm:9.4.0" - figures: "npm:6.1.0" + execa: "npm:^9.4.0" + figures: "npm:^6.1.0" fs-extra: "npm:^11.2.0" gflow: "npm:^5.1.4" - handlebars: "npm:4.7.8" - handlebars-helpers: "npm:0.10.0" + handlebars: "npm:^4.7.8" + handlebars-helpers: "npm:^0.10.0" husky: "npm:9.1.6" - inquirer: "npm:8.2.6" - inquirer-autocomplete-prompt: "npm:2.0.1" + inquirer: "npm:^8.2.6" + inquirer-autocomplete-prompt: "npm:^2.0.1" is-ci: "npm:3.0.1" - js-yaml: "npm:4.1.0" - lerna: "npm:8.1.8" + js-yaml: "npm:^4.1.0" + lerna: "npm:^8.1.8" lint-staged: "npm:15.2.10" - listr2: "npm:5.0.8" + listr2: "npm:^5.0.8" markdown-it: "npm:13.0.2" prettier: "npm:3.3.3" read-pkg-up: "npm:^11.0.0" - registry-url: "npm:5.1.0" + registry-url: "npm:^6.0.1" rxjs: "npm:^7.8.1" semantic-release: "npm:24.1.1" semantic-release-slack-bot: "npm:4.0.2" semver: "npm:7.6.3" - split: "npm:1.0.1" + split: "npm:^1.0.1" ts-node: "npm:^10.9.2" - tslib: "npm:2.3.1" + tslib: "npm:^2.7.0" typescript: "npm:5.6.2" unplugin-swc: "npm:^1.5.1" - update-notifier: "npm:7.3.1" + update-notifier: "npm:^7.3.1" vitest: "npm:2.1.1" languageName: unknown linkType: soft @@ -2575,7 +2573,7 @@ __metadata: "@tsed/cli-core": "workspace:*" "@tsed/typescript": "workspace:*" cross-env: "npm:7.0.3" - tslib: "npm:2.3.1" + tslib: "npm:2.7.0" typescript: "npm:5.6.2" vitest: "npm:2.1.1" languageName: unknown @@ -2603,7 +2601,7 @@ __metadata: globby: "npm:^14.0.2" read-pkg-up: "npm:^11.0.0" semver: "npm:^7.6.3" - tslib: "npm:^2.3.1" + tslib: "npm:^2.7.0" typescript: "npm:5.6.2" vitest: "npm:2.1.1" peerDependencies: @@ -3937,7 +3935,7 @@ __metadata: languageName: node linkType: hard -"any-observable@npm:0.5.1, any-observable@npm:>=0.5.1": +"any-observable@npm:>=0.5.1": version: 0.5.1 resolution: "any-observable@npm:0.5.1" peerDependenciesMeta: @@ -4174,17 +4172,6 @@ __metadata: languageName: node linkType: hard -"axios@npm:1.7.7, axios@npm:^1.7.4, axios@npm:^1.7.7": - version: 1.7.7 - resolution: "axios@npm:1.7.7" - dependencies: - follow-redirects: "npm:^1.15.6" - form-data: "npm:^4.0.0" - proxy-from-env: "npm:^1.1.0" - checksum: 10/7f875ea13b9298cd7b40fd09985209f7a38d38321f1118c701520939de2f113c4ba137832fe8e3f811f99a38e12c8225481011023209a77b0c0641270e20cde1 - languageName: node - linkType: hard - "axios@npm:>=1.6.7": version: 1.6.7 resolution: "axios@npm:1.6.7" @@ -4205,6 +4192,17 @@ __metadata: languageName: node linkType: hard +"axios@npm:^1.7.4, axios@npm:^1.7.7": + version: 1.7.7 + resolution: "axios@npm:1.7.7" + dependencies: + follow-redirects: "npm:^1.15.6" + form-data: "npm:^4.0.0" + proxy-from-env: "npm:^1.1.0" + checksum: 10/7f875ea13b9298cd7b40fd09985209f7a38d38321f1118c701520939de2f113c4ba137832fe8e3f811f99a38e12c8225481011023209a77b0c0641270e20cde1 + languageName: node + linkType: hard + "bail@npm:^1.0.0": version: 1.0.5 resolution: "bail@npm:1.0.5" @@ -4637,7 +4635,7 @@ __metadata: languageName: node linkType: hard -"chalk@npm:5.3.0, chalk@npm:>=5.3.0, chalk@npm:^5.2.0, chalk@npm:^5.3.0, chalk@npm:~5.3.0": +"chalk@npm:>=5.3.0, chalk@npm:^5.2.0, chalk@npm:^5.3.0, chalk@npm:~5.3.0": version: 5.3.0 resolution: "chalk@npm:5.3.0" checksum: 10/6373caaab21bd64c405bfc4bd9672b145647fc9482657b5ea1d549b3b2765054e9d3d928870cdf764fb4aad67555f5061538ff247b8310f110c5c888d92397ea @@ -5138,13 +5136,6 @@ __metadata: languageName: node linkType: hard -"commander@npm:9.3.0": - version: 9.3.0 - resolution: "commander@npm:9.3.0" - checksum: 10/18c49c9d7329847720c5eb453b1b2720db11dc44182abb0e814820c6598fa82184ac52aca26f4b4a57131ff91713326eff351ae8ad02b0c49222626cf8cacc3d - languageName: node - linkType: hard - "commander@npm:>=12.0.0": version: 12.0.0 resolution: "commander@npm:12.0.0" @@ -5300,7 +5291,7 @@ __metadata: languageName: node linkType: hard -"consolidate@npm:1.0.4, consolidate@npm:^1.0.4": +"consolidate@npm:^1.0.4": version: 1.0.4 resolution: "consolidate@npm:1.0.4" peerDependencies: @@ -6750,26 +6741,6 @@ __metadata: languageName: node linkType: hard -"execa@npm:9.4.0, execa@npm:^9.4.0": - version: 9.4.0 - resolution: "execa@npm:9.4.0" - dependencies: - "@sindresorhus/merge-streams": "npm:^4.0.0" - cross-spawn: "npm:^7.0.3" - figures: "npm:^6.1.0" - get-stream: "npm:^9.0.0" - human-signals: "npm:^8.0.0" - is-plain-obj: "npm:^4.1.0" - is-stream: "npm:^4.0.1" - npm-run-path: "npm:^6.0.0" - pretty-ms: "npm:^9.0.0" - signal-exit: "npm:^4.1.0" - strip-final-newline: "npm:^4.0.0" - yoctocolors: "npm:^2.0.0" - checksum: 10/a92be5d2b5baa84e6ef32fc38c620e1f4b5990399e88661563933ffbcd7be1ea28cc96bef059f14d45fee289061980c9452d2abb4786f4c6f492f04767387a67 - languageName: node - linkType: hard - "execa@npm:>=8.0.1, execa@npm:^8.0.0, execa@npm:~8.0.1": version: 8.0.1 resolution: "execa@npm:8.0.1" @@ -6856,6 +6827,26 @@ __metadata: languageName: node linkType: hard +"execa@npm:^9.4.0": + version: 9.4.0 + resolution: "execa@npm:9.4.0" + dependencies: + "@sindresorhus/merge-streams": "npm:^4.0.0" + cross-spawn: "npm:^7.0.3" + figures: "npm:^6.1.0" + get-stream: "npm:^9.0.0" + human-signals: "npm:^8.0.0" + is-plain-obj: "npm:^4.1.0" + is-stream: "npm:^4.0.1" + npm-run-path: "npm:^6.0.0" + pretty-ms: "npm:^9.0.0" + signal-exit: "npm:^4.1.0" + strip-final-newline: "npm:^4.0.0" + yoctocolors: "npm:^2.0.0" + checksum: 10/a92be5d2b5baa84e6ef32fc38c620e1f4b5990399e88661563933ffbcd7be1ea28cc96bef059f14d45fee289061980c9452d2abb4786f4c6f492f04767387a67 + languageName: node + linkType: hard + "expand-brackets@npm:^2.1.4": version: 2.1.4 resolution: "expand-brackets@npm:2.1.4" @@ -7078,15 +7069,6 @@ __metadata: languageName: node linkType: hard -"figures@npm:6.1.0, figures@npm:^6.1.0": - version: 6.1.0 - resolution: "figures@npm:6.1.0" - dependencies: - is-unicode-supported: "npm:^2.0.0" - checksum: 10/9822d13630bee8e6a9f2da866713adf13854b07e0bfde042defa8bba32d47a1c0b2afa627ce73837c674cf9a5e3edce7e879ea72cb9ea7960b2390432d8e1167 - languageName: node - linkType: hard - "figures@npm:>=3.2.0, figures@npm:^6.0.0": version: 6.0.1 resolution: "figures@npm:6.0.1" @@ -7115,6 +7097,15 @@ __metadata: languageName: node linkType: hard +"figures@npm:^6.1.0": + version: 6.1.0 + resolution: "figures@npm:6.1.0" + dependencies: + is-unicode-supported: "npm:^2.0.0" + checksum: 10/9822d13630bee8e6a9f2da866713adf13854b07e0bfde042defa8bba32d47a1c0b2afa627ce73837c674cf9a5e3edce7e879ea72cb9ea7960b2390432d8e1167 + languageName: node + linkType: hard + "file-entry-cache@npm:^8.0.0": version: 8.0.0 resolution: "file-entry-cache@npm:8.0.0" @@ -8044,7 +8035,7 @@ __metadata: languageName: node linkType: hard -"handlebars-helpers@npm:0.10.0": +"handlebars-helpers@npm:^0.10.0": version: 0.10.0 resolution: "handlebars-helpers@npm:0.10.0" dependencies: @@ -8090,12 +8081,12 @@ __metadata: languageName: node linkType: hard -"handlebars@npm:4.7.8, handlebars@npm:^4.7.8": - version: 4.7.8 - resolution: "handlebars@npm:4.7.8" +"handlebars@npm:^4.0.11, handlebars@npm:^4.7.7": + version: 4.7.7 + resolution: "handlebars@npm:4.7.7" dependencies: minimist: "npm:^1.2.5" - neo-async: "npm:^2.6.2" + neo-async: "npm:^2.6.0" source-map: "npm:^0.6.1" uglify-js: "npm:^3.1.4" wordwrap: "npm:^1.0.0" @@ -8104,16 +8095,16 @@ __metadata: optional: true bin: handlebars: bin/handlebars - checksum: 10/bd528f4dd150adf67f3f857118ef0fa43ff79a153b1d943fa0a770f2599e38b25a7a0dbac1a3611a4ec86970fd2325a81310fb788b5c892308c9f8743bd02e11 + checksum: 10/617b1e689b7577734abc74564bdb8cdaddf8fd48ce72afdb489f426e9c60a7d6ee2a2707c023720c4059070128243c948bded8f2716e4543378033e3971b85ea languageName: node linkType: hard -"handlebars@npm:^4.0.11, handlebars@npm:^4.7.7": - version: 4.7.7 - resolution: "handlebars@npm:4.7.7" +"handlebars@npm:^4.7.8": + version: 4.7.8 + resolution: "handlebars@npm:4.7.8" dependencies: minimist: "npm:^1.2.5" - neo-async: "npm:^2.6.0" + neo-async: "npm:^2.6.2" source-map: "npm:^0.6.1" uglify-js: "npm:^3.1.4" wordwrap: "npm:^1.0.0" @@ -8122,7 +8113,7 @@ __metadata: optional: true bin: handlebars: bin/handlebars - checksum: 10/617b1e689b7577734abc74564bdb8cdaddf8fd48ce72afdb489f426e9c60a7d6ee2a2707c023720c4059070128243c948bded8f2716e4543378033e3971b85ea + checksum: 10/bd528f4dd150adf67f3f857118ef0fa43ff79a153b1d943fa0a770f2599e38b25a7a0dbac1a3611a4ec86970fd2325a81310fb788b5c892308c9f8743bd02e11 languageName: node linkType: hard @@ -8690,7 +8681,7 @@ __metadata: languageName: node linkType: hard -"inquirer-autocomplete-prompt@npm:2.0.1, inquirer-autocomplete-prompt@npm:^2.0.1": +"inquirer-autocomplete-prompt@npm:^2.0.1": version: 2.0.1 resolution: "inquirer-autocomplete-prompt@npm:2.0.1" dependencies: @@ -8705,29 +8696,6 @@ __metadata: languageName: node linkType: hard -"inquirer@npm:8.2.6, inquirer@npm:^8.2.6": - version: 8.2.6 - resolution: "inquirer@npm:8.2.6" - dependencies: - ansi-escapes: "npm:^4.2.1" - chalk: "npm:^4.1.1" - cli-cursor: "npm:^3.1.0" - cli-width: "npm:^3.0.0" - external-editor: "npm:^3.0.3" - figures: "npm:^3.0.0" - lodash: "npm:^4.17.21" - mute-stream: "npm:0.0.8" - ora: "npm:^5.4.1" - run-async: "npm:^2.4.0" - rxjs: "npm:^7.5.5" - string-width: "npm:^4.1.0" - strip-ansi: "npm:^6.0.0" - through: "npm:^2.3.6" - wrap-ansi: "npm:^6.0.1" - checksum: 10/f642b9e5a94faaba54f277bdda2af0e0a6b592bd7f88c60e1614b5795b19336c7025e0c2923915d5f494f600a02fe8517413779a794415bb79a9563b061d68ab - languageName: node - linkType: hard - "inquirer@npm:>=9.2.13": version: 9.2.13 resolution: "inquirer@npm:9.2.13" @@ -8795,6 +8763,29 @@ __metadata: languageName: node linkType: hard +"inquirer@npm:^8.2.6": + version: 8.2.6 + resolution: "inquirer@npm:8.2.6" + dependencies: + ansi-escapes: "npm:^4.2.1" + chalk: "npm:^4.1.1" + cli-cursor: "npm:^3.1.0" + cli-width: "npm:^3.0.0" + external-editor: "npm:^3.0.3" + figures: "npm:^3.0.0" + lodash: "npm:^4.17.21" + mute-stream: "npm:0.0.8" + ora: "npm:^5.4.1" + run-async: "npm:^2.4.0" + rxjs: "npm:^7.5.5" + string-width: "npm:^4.1.0" + strip-ansi: "npm:^6.0.0" + through: "npm:^2.3.6" + wrap-ansi: "npm:^6.0.1" + checksum: 10/f642b9e5a94faaba54f277bdda2af0e0a6b592bd7f88c60e1614b5795b19336c7025e0c2923915d5f494f600a02fe8517413779a794415bb79a9563b061d68ab + languageName: node + linkType: hard + "into-stream@npm:^7.0.0": version: 7.0.0 resolution: "into-stream@npm:7.0.0" @@ -9826,7 +9817,7 @@ __metadata: languageName: node linkType: hard -"lerna@npm:8.1.8": +"lerna@npm:^8.1.8": version: 8.1.8 resolution: "lerna@npm:8.1.8" dependencies: @@ -10175,7 +10166,21 @@ __metadata: languageName: node linkType: hard -"listr2@npm:5.0.8, listr2@npm:^5.0.8": +"listr2@npm:>=8.0.2": + version: 8.0.2 + resolution: "listr2@npm:8.0.2" + dependencies: + cli-truncate: "npm:^4.0.0" + colorette: "npm:^2.0.20" + eventemitter3: "npm:^5.0.1" + log-update: "npm:^6.0.0" + rfdc: "npm:^1.3.1" + wrap-ansi: "npm:^9.0.0" + checksum: 10/1265c0629e1c7a51efdb08da3beb50caf580c46f28cbf0ab5f708af2567547c483f733b32fcf8366e9592e0c7c46750d082baa24e5f2af5864ae6200f5124dbd + languageName: node + linkType: hard + +"listr2@npm:^5.0.8": version: 5.0.8 resolution: "listr2@npm:5.0.8" dependencies: @@ -10196,20 +10201,6 @@ __metadata: languageName: node linkType: hard -"listr2@npm:>=8.0.2": - version: 8.0.2 - resolution: "listr2@npm:8.0.2" - dependencies: - cli-truncate: "npm:^4.0.0" - colorette: "npm:^2.0.20" - eventemitter3: "npm:^5.0.1" - log-update: "npm:^6.0.0" - rfdc: "npm:^1.3.1" - wrap-ansi: "npm:^9.0.0" - checksum: 10/1265c0629e1c7a51efdb08da3beb50caf580c46f28cbf0ab5f708af2567547c483f733b32fcf8366e9592e0c7c46750d082baa24e5f2af5864ae6200f5124dbd - languageName: node - linkType: hard - "listr2@npm:~8.2.4": version: 8.2.4 resolution: "listr2@npm:8.2.4" @@ -13482,7 +13473,7 @@ __metadata: languageName: node linkType: hard -"registry-url@npm:5.1.0, registry-url@npm:^5.0.0, registry-url@npm:^5.1.0": +"registry-url@npm:^5.0.0": version: 5.1.0 resolution: "registry-url@npm:5.1.0" dependencies: @@ -14562,7 +14553,7 @@ __metadata: languageName: node linkType: hard -"split@npm:1.0.1, split@npm:>=1.0.1, split@npm:^1.0.1": +"split@npm:>=1.0.1, split@npm:^1.0.1": version: 1.0.1 resolution: "split@npm:1.0.1" dependencies: @@ -15441,6 +15432,13 @@ __metadata: languageName: node linkType: hard +"tslib@npm:2.7.0, tslib@npm:^2.6.2, tslib@npm:^2.6.3, tslib@npm:^2.7.0": + version: 2.7.0 + resolution: "tslib@npm:2.7.0" + checksum: 10/9a5b47ddac65874fa011c20ff76db69f97cf90c78cff5934799ab8894a5342db2d17b4e7613a087046bc1d133d21547ddff87ac558abeec31ffa929c88b7fce6 + languageName: node + linkType: hard + "tslib@npm:^1.9.0": version: 1.14.1 resolution: "tslib@npm:1.14.1" @@ -15462,13 +15460,6 @@ __metadata: languageName: node linkType: hard -"tslib@npm:^2.3.1, tslib@npm:^2.6.2, tslib@npm:^2.6.3": - version: 2.7.0 - resolution: "tslib@npm:2.7.0" - checksum: 10/9a5b47ddac65874fa011c20ff76db69f97cf90c78cff5934799ab8894a5342db2d17b4e7613a087046bc1d133d21547ddff87ac558abeec31ffa929c88b7fce6 - languageName: node - linkType: hard - "tslib@npm:^2.4.0": version: 2.5.3 resolution: "tslib@npm:2.5.3" @@ -15911,24 +15902,6 @@ __metadata: languageName: node linkType: hard -"update-notifier@npm:7.3.1, update-notifier@npm:^7.3.1": - version: 7.3.1 - resolution: "update-notifier@npm:7.3.1" - dependencies: - boxen: "npm:^8.0.1" - chalk: "npm:^5.3.0" - configstore: "npm:^7.0.0" - is-in-ci: "npm:^1.0.0" - is-installed-globally: "npm:^1.0.0" - is-npm: "npm:^6.0.0" - latest-version: "npm:^9.0.0" - pupa: "npm:^3.1.0" - semver: "npm:^7.6.3" - xdg-basedir: "npm:^5.1.0" - checksum: 10/1c5a7fe67d85c53f8e5cb811f4a66e0bee2e9d80758635d013ec89e52379e8950afbc2d1b52a2f85f757b6131e120fa40cfa2d3b673e891ba8332921a1626a02 - languageName: node - linkType: hard - "update-notifier@npm:^3.0.1": version: 3.0.1 resolution: "update-notifier@npm:3.0.1" @@ -15949,6 +15922,24 @@ __metadata: languageName: node linkType: hard +"update-notifier@npm:^7.3.1": + version: 7.3.1 + resolution: "update-notifier@npm:7.3.1" + dependencies: + boxen: "npm:^8.0.1" + chalk: "npm:^5.3.0" + configstore: "npm:^7.0.0" + is-in-ci: "npm:^1.0.0" + is-installed-globally: "npm:^1.0.0" + is-npm: "npm:^6.0.0" + latest-version: "npm:^9.0.0" + pupa: "npm:^3.1.0" + semver: "npm:^7.6.3" + xdg-basedir: "npm:^5.1.0" + checksum: 10/1c5a7fe67d85c53f8e5cb811f4a66e0bee2e9d80758635d013ec89e52379e8950afbc2d1b52a2f85f757b6131e120fa40cfa2d3b673e891ba8332921a1626a02 + languageName: node + linkType: hard + "upper-case-first@npm:^2.0.2": version: 2.0.2 resolution: "upper-case-first@npm:2.0.2" From 73931b0d326ec72c7356e19c572c8724007d69e4 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Wed, 25 Sep 2024 09:48:06 +0200 Subject: [PATCH 51/69] fix: bump listr2 to v8.2.4 --- package.json | 2 +- packages/cli-core/package.json | 2 +- packages/cli-core/src/interfaces/Tasks.ts | 5 +- .../cli-core/src/utils/createTasksRunner.ts | 71 ++++++------------- .../src/hooks/MongooseGenerateHook.ts | 4 +- .../src/services/CliMongoose.ts | 6 +- yarn.lock | 70 ++---------------- 7 files changed, 36 insertions(+), 124 deletions(-) diff --git a/package.json b/package.json index 8f75ef94a..333bbd785 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "inquirer-autocomplete-prompt": "^2.0.1", "js-yaml": "^4.1.0", "lerna": "^8.1.8", - "listr2": "^5.0.8", + "listr2": "^8.2.4", "read-pkg-up": "^11.0.0", "registry-url": "^6.0.1", "rxjs": "^7.8.1", diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index 801f3610d..585000d68 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -53,7 +53,7 @@ "inquirer": "^8.2.6", "inquirer-autocomplete-prompt": "^2.0.1", "js-yaml": "^4.1.0", - "listr2": "^5.0.8", + "listr2": "^8.2.4", "read-pkg-up": "^11.0.0", "registry-url": "^6.0.1", "rxjs": "^7.8.1", diff --git a/packages/cli-core/src/interfaces/Tasks.ts b/packages/cli-core/src/interfaces/Tasks.ts index 9a7247c5d..bcd197b33 100644 --- a/packages/cli-core/src/interfaces/Tasks.ts +++ b/packages/cli-core/src/interfaces/Tasks.ts @@ -1,7 +1,6 @@ -// @ts-ignore -import type {ListrContext, ListrOptions, ListrTask} from "listr2"; +import {type ListrBaseClassOptions, type ListrContext, type ListrTask} from "listr2"; -export interface TaskOptions extends ListrOptions { +export interface TaskOptions extends ListrBaseClassOptions { concurrent?: boolean | number; verbose?: boolean; bindLogger?: boolean; diff --git a/packages/cli-core/src/utils/createTasksRunner.ts b/packages/cli-core/src/utils/createTasksRunner.ts index 4b020374d..40a3f1e42 100644 --- a/packages/cli-core/src/utils/createTasksRunner.ts +++ b/packages/cli-core/src/utils/createTasksRunner.ts @@ -1,75 +1,46 @@ // @ts-ignore import {isFunction} from "@tsed/core"; -import {Listr, type ListrTaskWrapper, Logger} from "listr2"; +import {DefaultRenderer, Listr, ListrLogger, type ListrTaskWrapper, type LoggerFieldOptions, VerboseRenderer} from "listr2"; import type {TaskOptions, Tasks} from "../interfaces/Tasks.js"; import {getLogger} from "./createInjector.js"; -class CustomLogger extends Logger { - fail(message: string) { - getLogger()?.error("[FAIL]", message); - } - - skip(message: string) { - getLogger()?.info("[SKIP]", message); - } - - success(message: string) { - getLogger()?.info("[SUCCESS]", message); - } - - data(message: string) { - getLogger()?.info("[DATA]", message); - } - - start(message: string) { - getLogger()?.info("[START]", message); - } - - title(message: string) { - getLogger()?.info("[TITLE]", message); - } - - retry(message: string) { - getLogger()?.info("[RETRY]", message); - } - - rollback(message: string) { - getLogger()?.info("[ROLLBACK]", message); +class CustomLogger extends ListrLogger { + log(level: string, message: string | any[], options?: LoggerFieldOptions) { + if (["FAILED"].includes(level)) { + getLogger()?.error(`[${level}]`, message); + } else { + getLogger()?.info(`[${level}]`, message); + } } } -function getOptions({bindLogger = true, ...ctx}: TaskOptions): any { +function getOptions({bindLogger = true, ...ctx}: TaskOptions) { const useRawRenderer = !(!ctx.verbose && !process.env.CI); - const rendererOptions = - useRawRenderer && bindLogger - ? { - logger: CustomLogger - } - : {}; + return { - ...ctx, - rendererSilent: process.env.NODE_ENV === "test", - rendererFallback: useRawRenderer, - renderer: useRawRenderer ? "verbose" : "default", - nonTTYRendererOptions: rendererOptions, - rendererOptions + silentRendererCondition: process.env.NODE_ENV === "test", + renderer: useRawRenderer ? VerboseRenderer : DefaultRenderer, + rendererOptions: + useRawRenderer && bindLogger + ? { + logger: CustomLogger as never + } + : undefined }; } export function createTasks(tasks: Tasks, ctx: TaskOptions) { - return new Listr(tasks as any, getOptions(ctx)); + return new Listr(tasks, getOptions(ctx)); } export function createSubTasks(tasks: Tasks | ((ctx: any, task: any) => Tasks | Promise), opts: TaskOptions) { - opts = getOptions(opts); - - return async (ctx: any, task: ListrTaskWrapper) => { + return async (ctx: any, task: ListrTaskWrapper) => { if (isFunction(tasks)) { tasks = await tasks(ctx, task); } - return task.newListr(tasks, opts); + return task.newListr(tasks, getOptions(opts)); }; } diff --git a/packages/cli-plugin-mongoose/src/hooks/MongooseGenerateHook.ts b/packages/cli-plugin-mongoose/src/hooks/MongooseGenerateHook.ts index b8047fbac..782037ee6 100644 --- a/packages/cli-plugin-mongoose/src/hooks/MongooseGenerateHook.ts +++ b/packages/cli-plugin-mongoose/src/hooks/MongooseGenerateHook.ts @@ -1,7 +1,7 @@ import {type GenerateCmdContext, ProvidersInfoService} from "@tsed/cli"; import {CliDockerComposeYaml, Inject, OnExec, ProjectPackageJson, SrcRendererService, type Tasks} from "@tsed/cli-core"; import {Injectable} from "@tsed/di"; -import {camelCase, paramCase} from "change-case"; +import {camelCase, kebabCase} from "change-case"; // @ts-ignore import {plural} from "pluralize"; @@ -90,7 +90,7 @@ export class MongooseGenerateHook { private generateConnection(ctx: GenerateCmdContext) { return [ { - title: `Generate Mongoose configuration file to '${paramCase(ctx.name)}.config.ts'`, + title: `Generate Mongoose configuration file to '${kebabCase(ctx.name)}.config.ts'`, task: () => this.cliMongoose.writeConfig(ctx.name, ctx) }, { diff --git a/packages/cli-plugin-mongoose/src/services/CliMongoose.ts b/packages/cli-plugin-mongoose/src/services/CliMongoose.ts index 065d6a95f..2e499e6ef 100644 --- a/packages/cli-plugin-mongoose/src/services/CliMongoose.ts +++ b/packages/cli-plugin-mongoose/src/services/CliMongoose.ts @@ -1,5 +1,5 @@ import {Inject, Injectable, ProjectPackageJson, SrcRendererService} from "@tsed/cli-core"; -import {camelCase, constantCase, paramCase} from "change-case"; +import {camelCase, constantCase, kebabCase} from "change-case"; import {basename, join} from "path"; import {TEMPLATE_DIR} from "../utils/templateDir.js"; @@ -18,10 +18,10 @@ export class CliMongoose { { ...options, symbolName: constantCase(name), - name: paramCase(name) + name: kebabCase(name) }, { - output: `${paramCase(name)}.config.ts`, + output: `${kebabCase(name)}.config.ts`, rootDir: join(this.srcRenderer.rootDir, "config", "mongoose"), templateDir: TEMPLATE_DIR } diff --git a/yarn.lock b/yarn.lock index 98b13e4da..4cd2fa8f3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2298,7 +2298,7 @@ __metadata: inquirer: "npm:^8.2.6" inquirer-autocomplete-prompt: "npm:^2.0.1" js-yaml: "npm:^4.1.0" - listr2: "npm:^5.0.8" + listr2: "npm:^8.2.4" read-pkg-up: "npm:^11.0.0" registry-url: "npm:^6.0.1" rxjs: "npm:^7.8.1" @@ -2547,7 +2547,7 @@ __metadata: js-yaml: "npm:^4.1.0" lerna: "npm:^8.1.8" lint-staged: "npm:15.2.10" - listr2: "npm:^5.0.8" + listr2: "npm:^8.2.4" markdown-it: "npm:13.0.2" prettier: "npm:3.3.3" read-pkg-up: "npm:^11.0.0" @@ -3703,7 +3703,7 @@ __metadata: languageName: node linkType: hard -"ansi-escapes@npm:^4.2.1, ansi-escapes@npm:^4.3.0, ansi-escapes@npm:^4.3.2": +"ansi-escapes@npm:^4.2.1, ansi-escapes@npm:^4.3.2": version: 4.3.2 resolution: "ansi-escapes@npm:4.3.2" dependencies: @@ -5089,13 +5089,6 @@ __metadata: languageName: node linkType: hard -"colorette@npm:^2.0.19": - version: 2.0.19 - resolution: "colorette@npm:2.0.19" - checksum: 10/6e2606435cd30e1cae8fc6601b024fdd809e20515c57ce1e588d0518403cff0c98abf807912ba543645a9188af36763b69b67e353d47397f24a1c961aba300bd - languageName: node - linkType: hard - "colorette@npm:^2.0.20": version: 2.0.20 resolution: "colorette@npm:2.0.20" @@ -10180,28 +10173,7 @@ __metadata: languageName: node linkType: hard -"listr2@npm:^5.0.8": - version: 5.0.8 - resolution: "listr2@npm:5.0.8" - dependencies: - cli-truncate: "npm:^2.1.0" - colorette: "npm:^2.0.19" - log-update: "npm:^4.0.0" - p-map: "npm:^4.0.0" - rfdc: "npm:^1.3.0" - rxjs: "npm:^7.8.0" - through: "npm:^2.3.8" - wrap-ansi: "npm:^7.0.0" - peerDependencies: - enquirer: ">= 2.3.0 < 3" - peerDependenciesMeta: - enquirer: - optional: true - checksum: 10/41181bcd86d26b82acb3b26738d3836443531bc0ad6f7463cfee411af4f0268f3753485ed4c6d697c120ff01475dbb055aa34c22e6834c4c0bd84e3f242ce78e - languageName: node - linkType: hard - -"listr2@npm:~8.2.4": +"listr2@npm:^8.2.4, listr2@npm:~8.2.4": version: 8.2.4 resolution: "listr2@npm:8.2.4" dependencies: @@ -10478,18 +10450,6 @@ __metadata: languageName: node linkType: hard -"log-update@npm:^4.0.0": - version: 4.0.0 - resolution: "log-update@npm:4.0.0" - dependencies: - ansi-escapes: "npm:^4.3.0" - cli-cursor: "npm:^3.1.0" - slice-ansi: "npm:^4.0.0" - wrap-ansi: "npm:^6.2.0" - checksum: 10/ae2f85bbabc1906034154fb7d4c4477c79b3e703d22d78adee8b3862fa913942772e7fa11713e3d96fb46de4e3cabefbf5d0a544344f03b58d3c4bff52aa9eb2 - languageName: node - linkType: hard - "log-update@npm:^6.0.0": version: 6.0.0 resolution: "log-update@npm:6.0.0" @@ -13701,13 +13661,6 @@ __metadata: languageName: node linkType: hard -"rfdc@npm:^1.3.0": - version: 1.3.0 - resolution: "rfdc@npm:1.3.0" - checksum: 10/76dedd9700cdf132947fde7ce1a8838c9cbb7f3e8f9188af0aaf97194cce745f42094dd2cf547426934cc83252ee2c0e432b2e0222a4415ab0db32de82665c69 - languageName: node - linkType: hard - "rfdc@npm:^1.3.1": version: 1.3.1 resolution: "rfdc@npm:1.3.1" @@ -13830,7 +13783,7 @@ __metadata: languageName: node linkType: hard -"rxjs@npm:>=7.8.1, rxjs@npm:^7.2.0, rxjs@npm:^7.8.0, rxjs@npm:^7.8.1": +"rxjs@npm:>=7.8.1, rxjs@npm:^7.2.0, rxjs@npm:^7.8.1": version: 7.8.1 resolution: "rxjs@npm:7.8.1" dependencies: @@ -14304,17 +14257,6 @@ __metadata: languageName: node linkType: hard -"slice-ansi@npm:^4.0.0": - version: 4.0.0 - resolution: "slice-ansi@npm:4.0.0" - dependencies: - ansi-styles: "npm:^4.0.0" - astral-regex: "npm:^2.0.0" - is-fullwidth-code-point: "npm:^3.0.0" - checksum: 10/4a82d7f085b0e1b070e004941ada3c40d3818563ac44766cca4ceadd2080427d337554f9f99a13aaeb3b4a94d9964d9466c807b3d7b7541d1ec37ee32d308756 - languageName: node - linkType: hard - "slice-ansi@npm:^5.0.0": version: 5.0.0 resolution: "slice-ansi@npm:5.0.0" @@ -15163,7 +15105,7 @@ __metadata: languageName: node linkType: hard -"through@npm:2, through@npm:>=2.2.7 <3, through@npm:^2.3.4, through@npm:^2.3.6, through@npm:^2.3.8": +"through@npm:2, through@npm:>=2.2.7 <3, through@npm:^2.3.4, through@npm:^2.3.6": version: 2.3.8 resolution: "through@npm:2.3.8" checksum: 10/5da78346f70139a7d213b65a0106f3c398d6bc5301f9248b5275f420abc2c4b1e77c2abc72d218dedc28c41efb2e7c312cb76a7730d04f9c2d37d247da3f4198 From 8221fb819a1f62cfcc45f673ef7a9b9d57a6b186 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sat, 28 Sep 2024 10:55:26 +0000 Subject: [PATCH 52/69] Github CI build: __run_2 v6.0.0-alpha.9 [ci skip] --- lerna.json | 2 +- package.json | 2 +- packages/barrels/package.json | 2 +- packages/cli-core/package.json | 2 +- packages/cli-generate-http-client/package.json | 2 +- packages/cli-generate-swagger/package.json | 2 +- packages/cli-plugin-eslint/package.json | 2 +- packages/cli-plugin-jest/package.json | 2 +- packages/cli-plugin-mongoose/package.json | 2 +- packages/cli-plugin-oidc-provider/package.json | 2 +- packages/cli-plugin-passport/package.json | 2 +- packages/cli-plugin-prisma/package.json | 2 +- packages/cli-plugin-typegraphql/package.json | 2 +- packages/cli-plugin-typeorm/package.json | 2 +- packages/cli-plugin-vitest/package.json | 2 +- packages/cli-testing/package.json | 2 +- packages/cli/package.json | 2 +- tools/typescript/package.json | 2 +- tools/vitest/package.json | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lerna.json b/lerna.json index 7bbfcc7d9..d3c190693 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "packages": [ "packages/*" ], - "version": "6.0.0-alpha.8" + "version": "6.0.0-alpha.9" } \ No newline at end of file diff --git a/package.json b/package.json index 333bbd785..588421f89 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@tsed/cli-root", - "version": "6.0.0-alpha.8", + "version": "6.0.0-alpha.9", "description": "CLI to bootstrap your Ts.ED project", "private": true, "type": "module", diff --git a/packages/barrels/package.json b/packages/barrels/package.json index 4a3025038..abeea07af 100644 --- a/packages/barrels/package.json +++ b/packages/barrels/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/barrels", "description": "A simple tool to generate barrels for your TypeScript project", - "version": "6.0.0-alpha.8", + "version": "6.0.0-alpha.9", "type": "module", "bin": "bin/barrels.js", "files": [], diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index 585000d68..63fcb5138 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-core", "description": "Build your CLI with TypeScript and Decorators", - "version": "6.0.0-alpha.8", + "version": "6.0.0-alpha.9", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-generate-http-client/package.json b/packages/cli-generate-http-client/package.json index da0898b51..a3ef0b59d 100644 --- a/packages/cli-generate-http-client/package.json +++ b/packages/cli-generate-http-client/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-generate-http-client", "description": "Ts.ED CLI plugin. Export a command that generate an HTTP Client (axios or fetch) from your Ts.ED controllers and OS3 spec.", - "version": "6.0.0-alpha.8", + "version": "6.0.0-alpha.9", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-generate-swagger/package.json b/packages/cli-generate-swagger/package.json index e6ae6a360..a7ff6f352 100644 --- a/packages/cli-generate-swagger/package.json +++ b/packages/cli-generate-swagger/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-generate-swagger", "description": "Ts.ED CLI plugin. Export a command that generate the swagger.json from your Ts.ED controllers and OS3 spec.", - "version": "6.0.0-alpha.8", + "version": "6.0.0-alpha.9", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-eslint/package.json b/packages/cli-plugin-eslint/package.json index 6258b68ae..0bc8c95bb 100644 --- a/packages/cli-plugin-eslint/package.json +++ b/packages/cli-plugin-eslint/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-eslint", "description": "Ts.ED CLI plugin. Add EsLint support", - "version": "6.0.0-alpha.8", + "version": "6.0.0-alpha.9", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-jest/package.json b/packages/cli-plugin-jest/package.json index 3297bf39b..8cb56794c 100644 --- a/packages/cli-plugin-jest/package.json +++ b/packages/cli-plugin-jest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-jest", "description": "Ts.ED CLI plugin. Add Jest support", - "version": "6.0.0-alpha.8", + "version": "6.0.0-alpha.9", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-mongoose/package.json b/packages/cli-plugin-mongoose/package.json index 1fdd0554f..bc8050558 100644 --- a/packages/cli-plugin-mongoose/package.json +++ b/packages/cli-plugin-mongoose/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-mongoose", "description": "Ts.ED CLI plugin. Add Mongoose support", - "version": "6.0.0-alpha.8", + "version": "6.0.0-alpha.9", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-oidc-provider/package.json b/packages/cli-plugin-oidc-provider/package.json index 29cfc847b..2e31b8bf0 100644 --- a/packages/cli-plugin-oidc-provider/package.json +++ b/packages/cli-plugin-oidc-provider/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-oidc-provider", "description": "Ts.ED CLI plugin. Add OIDC Provider", - "version": "6.0.0-alpha.8", + "version": "6.0.0-alpha.9", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-passport/package.json b/packages/cli-plugin-passport/package.json index c9f188da0..f01a39d71 100644 --- a/packages/cli-plugin-passport/package.json +++ b/packages/cli-plugin-passport/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-passport", "description": "Ts.ED CLI plugin. Add Passport.js support", - "version": "6.0.0-alpha.8", + "version": "6.0.0-alpha.9", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-prisma/package.json b/packages/cli-plugin-prisma/package.json index f3213a825..d7d92e7b4 100644 --- a/packages/cli-plugin-prisma/package.json +++ b/packages/cli-plugin-prisma/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-prisma", "description": "Ts.ED CLI plugin. Add Prisma project initialisation support.", - "version": "6.0.0-alpha.8", + "version": "6.0.0-alpha.9", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-typegraphql/package.json b/packages/cli-plugin-typegraphql/package.json index ead5044db..9630adba7 100644 --- a/packages/cli-plugin-typegraphql/package.json +++ b/packages/cli-plugin-typegraphql/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-typegraphql", "description": "Ts.ED CLI plugin. Add TypeGraphql support.", - "version": "6.0.0-alpha.8", + "version": "6.0.0-alpha.9", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-typeorm/package.json b/packages/cli-plugin-typeorm/package.json index e09f0fcec..bb92db55e 100644 --- a/packages/cli-plugin-typeorm/package.json +++ b/packages/cli-plugin-typeorm/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-typeorm", "description": "Ts.ED CLI plugin. Add TypeORM support", - "version": "6.0.0-alpha.8", + "version": "6.0.0-alpha.9", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-vitest/package.json b/packages/cli-plugin-vitest/package.json index 552f57613..6011aa050 100644 --- a/packages/cli-plugin-vitest/package.json +++ b/packages/cli-plugin-vitest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-vitest", "description": "Ts.ED CLI plugin. Add Jest support", - "version": "6.0.0-alpha.8", + "version": "6.0.0-alpha.9", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-testing/package.json b/packages/cli-testing/package.json index a89dcc7a5..c19d33002 100644 --- a/packages/cli-testing/package.json +++ b/packages/cli-testing/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-testing", "description": "Utils to test you CLI based on Ts.ED CLI", - "version": "6.0.0-alpha.8", + "version": "6.0.0-alpha.9", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli/package.json b/packages/cli/package.json index 18c07f272..3cb020a7f 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli", "description": "CLI to bootstrap your Ts.ED project", - "version": "6.0.0-alpha.8", + "version": "6.0.0-alpha.9", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/tools/typescript/package.json b/tools/typescript/package.json index c552755b0..ff9621215 100644 --- a/tools/typescript/package.json +++ b/tools/typescript/package.json @@ -1,6 +1,6 @@ { "name": "@tsed/typescript", - "version": "6.0.0-alpha.8", + "version": "6.0.0-alpha.9", "description": "Util to compile source", "type": "module", "private": true, diff --git a/tools/vitest/package.json b/tools/vitest/package.json index b1b27ef6a..ddf2f0aef 100644 --- a/tools/vitest/package.json +++ b/tools/vitest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/vitest", "type": "module", - "version": "6.0.0-alpha.8", + "version": "6.0.0-alpha.9", "private": true, "exports": { ".": "./index.js", From d73d5b351be9e4027c9b5f6e88f25fb75e505cef Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Sat, 28 Sep 2024 14:05:15 +0200 Subject: [PATCH 53/69] chore: rollback to execa v8 --- package.json | 2 +- packages/cli-core/package.json | 2 +- .../packageManagers/PackageManagersModule.ts | 6 +-- .../packageManagers/supports/BaseManager.ts | 5 +-- packages/cli-core/src/services/CliExeca.ts | 2 +- .../cli-core/src/utils/createTasksRunner.ts | 4 +- packages/cli/.swcrc | 33 ++++++++++++++ packages/cli/package.json | 39 +++++++++-------- packages/cli/src/bin/tsed.ts | 4 +- yarn.lock | 43 ++----------------- 10 files changed, 68 insertions(+), 72 deletions(-) create mode 100644 packages/cli/.swcrc diff --git a/package.json b/package.json index 588421f89..407186e2b 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "chalk": "^5.3.0", "commander": "^9.3.0", "consolidate": "^1.0.4", - "execa": "^9.4.0", + "execa": "8.0.1", "figures": "^6.1.0", "fs-extra": "^11.2.0", "handlebars": "^4.7.8", diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index 63fcb5138..835481e0f 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -44,7 +44,7 @@ "consolidate": "^1.0.4", "create-frame": "^1.0.0", "enquirer": "^2.4.1", - "execa": "^9.4.0", + "execa": "^8.0.1", "figures": "^6.1.0", "fs-extra": "^11.2.0", "globby": "^14.0.2", diff --git a/packages/cli-core/src/packageManagers/PackageManagersModule.ts b/packages/cli-core/src/packageManagers/PackageManagersModule.ts index 9e002dcbb..060e00f2e 100644 --- a/packages/cli-core/src/packageManagers/PackageManagersModule.ts +++ b/packages/cli-core/src/packageManagers/PackageManagersModule.ts @@ -95,17 +95,17 @@ export class PackageManagersModule { { title: `Installing dependencies using ${packageManager.name}`, skip: () => !this.projectPackageJson.reinstall, - task: () => packageManager.install(options as any).pipe(errorPipe()) + task: () => packageManager.install(options as any) // .pipe(errorPipe()) }, { title: `Add dependencies using ${packageManager.name}`, skip: () => !deps.length, - task: () => packageManager.add(deps, options as any).pipe(errorPipe()) + task: () => packageManager.add(deps, options as any) //.pipe(errorPipe()) }, { title: `Add devDependencies using ${packageManager.name}`, skip: () => !devDeps.length, - task: () => packageManager.addDev(devDeps, options as any).pipe(errorPipe()) + task: () => packageManager.addDev(devDeps, options as any) //.pipe(errorPipe()) }, { title: "Refresh", diff --git a/packages/cli-core/src/packageManagers/supports/BaseManager.ts b/packages/cli-core/src/packageManagers/supports/BaseManager.ts index e9da2deb2..1007b8ab5 100644 --- a/packages/cli-core/src/packageManagers/supports/BaseManager.ts +++ b/packages/cli-core/src/packageManagers/supports/BaseManager.ts @@ -39,9 +39,6 @@ export abstract class BaseManager { } run(cmd: string, args: any[], options: ManagerCmdOpts) { - return this.cliExeca.run(this.cmd, [cmd, options.verbose && this.verboseOpt, ...args].filter(Boolean) as string[], { - ...options, - verbose: options.verbose ? "full" : undefined - }); + return this.cliExeca.run(this.cmd, [cmd, options.verbose && this.verboseOpt, ...args].filter(Boolean) as string[], options); } } diff --git a/packages/cli-core/src/services/CliExeca.ts b/packages/cli-core/src/services/CliExeca.ts index bb8f7d315..0651d8259 100644 --- a/packages/cli-core/src/services/CliExeca.ts +++ b/packages/cli-core/src/services/CliExeca.ts @@ -30,7 +30,7 @@ export class CliExeca { return this.rawSync(cmd, args, opts); } - async getAsync(cmd: string | URL, args: readonly string[], opts?: Options) { + async getAsync(cmd: string, args: readonly string[], opts?: Options) { return (await this.raw(cmd, args, opts)).stdout; } diff --git a/packages/cli-core/src/utils/createTasksRunner.ts b/packages/cli-core/src/utils/createTasksRunner.ts index 40a3f1e42..f8d611a61 100644 --- a/packages/cli-core/src/utils/createTasksRunner.ts +++ b/packages/cli-core/src/utils/createTasksRunner.ts @@ -24,7 +24,7 @@ function getOptions({bindLogger = true, ...ctx}: TaskOptions) { rendererOptions: useRawRenderer && bindLogger ? { - logger: CustomLogger as never + logger: new CustomLogger() as never } : undefined }; @@ -40,7 +40,7 @@ export function createSubTasks(tasks: Tasks | ((ctx: any, task: any) => Tasks | tasks = await tasks(ctx, task); } - return task.newListr(tasks, getOptions(opts)); + return task.newListr(tasks, getOptions(opts) as never); }; } diff --git a/packages/cli/.swcrc b/packages/cli/.swcrc new file mode 100644 index 000000000..49b7d23d2 --- /dev/null +++ b/packages/cli/.swcrc @@ -0,0 +1,33 @@ +{ + "sourceMaps": "inline", + "jsc": { + "target": "es2021", + "externalHelpers": true, + "keepClassNames": true, + "parser": { + "syntax": "typescript", + "tsx": true, + "decorators": true, + "dynamicImport": true, + "privateMethod": true, + "exportDefaultFrom": true, + "importMeta": true, + "preserveAllComments": true + }, + "transform": { + "hidden": { + "jest": true + }, + "legacyDecorator": true, + "decoratorMetadata": true + } + }, + "module": { + "type": "es6", + "strict": false, + "strictMode": true, + "lazy": false, + "noInterop": false + }, + "isModule": true +} diff --git a/packages/cli/package.json b/packages/cli/package.json index 3cb020a7f..67a0b8f99 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -17,25 +17,26 @@ "scripts": { "build": "yarn build:ts", "build:ts": "tsc --build tsconfig.json", - "start:help": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts -h", - "start:help:g": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts generate -h", - "start:help:i": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts init -h", - "start:version": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts --version", - "start:init:help": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts init -h", - "start:init:test": "cross-env NODE_ENV=development cross-env CI=true ts-node -r tsconfig-paths/register src/bin/tsed.ts init -r ./.tmp/init/default --features=oidc --arch=default --convention=conv_default --platform=express --skip-prompt .", - "start:init:test:jest": "cross-env NODE_ENV=development cross-env CI=true ts-node -r tsconfig-paths/register src/bin/tsed.ts init -r ./.tmp/init/default --features=jest --arch=default --convention=conv_default --platform=express --skip-prompt .", - "start:init:run": "cross-env NODE_ENV=development cross-env CI=true ts-node -r tsconfig-paths/register src/bin/tsed.ts init -r ./.tmp/init/default", - "start:init:params": "cross-env NODE_ENV=development cross-env CI=true ts-node -r tsconfig-paths/register src/bin/tsed.ts init -r ./.tmp/init/default --skip-prompt --features swagger,jest,lintstaged", - "start:init:run:name": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts init -r ./.tmp/init awesome --verbose", - "start:init:args": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts init -r ./.tmp/cmd --package-manager=npm --project-name=untitled3 --features=graphql,typeorm,passportjs,socketio,linter,eslint,prettier --arch=default --convention=default --platform=express --skip-prompt .", - "start:add:run": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts add -r ./.tmp", - "start:generate": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts generate -r ./.tmp/init/default", - "start:generate:help": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts generate -h", - "start:generate:model": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts generate model -r ./.tmp/init/awesome", - "start:g:model": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts g model -r ./.tmp/init/awesome", - "start:g:prisma": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts g service -r ./.tmp/init/awesome prisma", - "start:generate:run": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts generate -r ./.tmp/init/awesome", - "start:typeorm:run": "cross-env NODE_ENV=development ts-node -r tsconfig-paths/register src/bin/tsed.ts typeorm entity:create -r ./.tmp/init/awesome --name User", + "run-cmd": "cross-env NODE_ENV=development CLI_MODE=ts CI=true node --import @swc-node/register/esm-register src/bin/tsed.ts", + "start:help": "yarn run-cmd -h", + "start:help:g": "yarn run-cmd generate -h", + "start:help:i": "yarn run-cmd init -h", + "start:version": "yarn run-cmd --version", + "start:init:help": "yarn run-cmd init -h", + "start:init:test": "yarn run-cmd init init -r ./.tmp/init/default --features=oidc --arch=default --convention=conv_default --platform=express --package-manager=npm --skip-prompt .", + "start:init:test:jest": "yarn run-cmd init -r ./.tmp/init/default --features=jest --arch=default --convention=conv_default --platform=express --package-manager=npm --skip-prompt .", + "start:init:run": "yarn run-cmd init -r ./.tmp/init/default", + "start:init:params": "yarn run-cmd init -r ./.tmp/init/default --skip-prompt --features swagger,jest,lintstaged", + "start:init:run:name": "yarn run-cmd init -r ./.tmp/init awesome --verbose", + "start:init:args": "yarn run-cmd init -r ./.tmp/cmd --package-manager=npm --project-name=untitled3 --features=graphql,typeorm,passportjs,socketio,linter,eslint,prettier --arch=default --convention=default --platform=express --skip-prompt .", + "start:add:run": "yarn run-cmd add -r ./.tmp", + "start:generate": "yarn run-cmd generate -r ./.tmp/init/default", + "start:generate:help": "yarn run-cmd generate -h", + "start:generate:model": "yarn run-cmd generate model -r ./.tmp/init/awesome", + "start:g:model": "yarn run-cmd g model -r ./.tmp/init/awesome", + "start:g:prisma": "yarn run-cmd g service -r ./.tmp/init/awesome prisma", + "start:generate:run": "yarn run-cmd generate -r ./.tmp/init/awesome", + "start:typeorm:run": "yarn run-cmd typeorm entity:create -r ./.tmp/init/awesome --name User", "test": "vitest run", "test:ci": "vitest run --coverage.thresholds.autoUpdate=true" }, diff --git a/packages/cli/src/bin/tsed.ts b/packages/cli/src/bin/tsed.ts index d7de8ac7e..a47be169d 100644 --- a/packages/cli/src/bin/tsed.ts +++ b/packages/cli/src/bin/tsed.ts @@ -2,7 +2,9 @@ import {register} from "node:module"; import {fileURLToPath, pathToFileURL} from "node:url"; -register(pathToFileURL(`${import.meta.dirname}/../loaders/alias.hook.js`), { +const EXT = process.env.CLI_MODE === "ts" ? "ts" : "js"; + +register(pathToFileURL(`${import.meta.dirname}/../loaders/alias.hook.${EXT}`), { parentURL: import.meta.dirname, data: { "@tsed/core": fileURLToPath(import.meta.resolve("@tsed/core")), diff --git a/yarn.lock b/yarn.lock index 4cd2fa8f3..a0dba351a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2289,7 +2289,7 @@ __metadata: cross-env: "npm:7.0.3" deps: "npm:^1.0.0" enquirer: "npm:^2.4.1" - execa: "npm:^9.4.0" + execa: "npm:^8.0.1" figures: "npm:^6.1.0" fs-extra: "npm:^11.2.0" globby: "npm:^14.0.2" @@ -2534,7 +2534,7 @@ __metadata: eslint-plugin-simple-import-sort: "npm:12.1.1" eslint-plugin-vitest: "npm:^0.5.4" eslint-plugin-workspaces: "npm:0.10.1" - execa: "npm:^9.4.0" + execa: "npm:8.0.1" figures: "npm:^6.1.0" fs-extra: "npm:^11.2.0" gflow: "npm:^5.1.4" @@ -6734,7 +6734,7 @@ __metadata: languageName: node linkType: hard -"execa@npm:>=8.0.1, execa@npm:^8.0.0, execa@npm:~8.0.1": +"execa@npm:8.0.1, execa@npm:>=8.0.1, execa@npm:^8.0.0, execa@npm:^8.0.1, execa@npm:~8.0.1": version: 8.0.1 resolution: "execa@npm:8.0.1" dependencies: @@ -6820,26 +6820,6 @@ __metadata: languageName: node linkType: hard -"execa@npm:^9.4.0": - version: 9.4.0 - resolution: "execa@npm:9.4.0" - dependencies: - "@sindresorhus/merge-streams": "npm:^4.0.0" - cross-spawn: "npm:^7.0.3" - figures: "npm:^6.1.0" - get-stream: "npm:^9.0.0" - human-signals: "npm:^8.0.0" - is-plain-obj: "npm:^4.1.0" - is-stream: "npm:^4.0.1" - npm-run-path: "npm:^6.0.0" - pretty-ms: "npm:^9.0.0" - signal-exit: "npm:^4.1.0" - strip-final-newline: "npm:^4.0.0" - yoctocolors: "npm:^2.0.0" - checksum: 10/a92be5d2b5baa84e6ef32fc38c620e1f4b5990399e88661563933ffbcd7be1ea28cc96bef059f14d45fee289061980c9452d2abb4786f4c6f492f04767387a67 - languageName: node - linkType: hard - "expand-brackets@npm:^2.1.4": version: 2.1.4 resolution: "expand-brackets@npm:2.1.4" @@ -11805,16 +11785,6 @@ __metadata: languageName: node linkType: hard -"npm-run-path@npm:^6.0.0": - version: 6.0.0 - resolution: "npm-run-path@npm:6.0.0" - dependencies: - path-key: "npm:^4.0.0" - unicorn-magic: "npm:^0.3.0" - checksum: 10/1a1b50aba6e6af7fd34a860ba2e252e245c4a59b316571a990356417c0cdf0414cabf735f7f52d9c330899cb56f0ab804a8e21fb12a66d53d7843e39ada4a3b6 - languageName: node - linkType: hard - "npm-user-validate@npm:^2.0.0": version: 2.0.0 resolution: "npm-user-validate@npm:2.0.0" @@ -15647,13 +15617,6 @@ __metadata: languageName: node linkType: hard -"unicorn-magic@npm:^0.3.0": - version: 0.3.0 - resolution: "unicorn-magic@npm:0.3.0" - checksum: 10/bdd7d7c522f9456f32a0b77af23f8854f9a7db846088c3868ec213f9550683ab6a2bdf3803577eacbafddb4e06900974385841ccb75338d17346ccef45f9cb01 - languageName: node - linkType: hard - "unified@npm:^9.0.0": version: 9.2.2 resolution: "unified@npm:9.2.2" From 42638aef68bea0c5bd94fd1d7cb9f5832fd8b46c Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Sat, 28 Sep 2024 14:10:54 +0200 Subject: [PATCH 54/69] fix: disable sourceMap generation in esm build --- packages/cli-core/tsconfig.esm.json | 3 ++- packages/cli-generate-http-client/tsconfig.esm.json | 3 ++- packages/cli-generate-swagger/tsconfig.esm.json | 3 ++- packages/cli-plugin-eslint/tsconfig.esm.json | 3 ++- packages/cli-plugin-jest/tsconfig.esm.json | 3 ++- packages/cli-plugin-mongoose/tsconfig.esm.json | 3 ++- packages/cli-plugin-oidc-provider/tsconfig.esm.json | 3 ++- packages/cli-plugin-passport/tsconfig.esm.json | 3 ++- packages/cli-plugin-prisma/tsconfig.esm.json | 3 ++- packages/cli-plugin-typegraphql/tsconfig.esm.json | 3 ++- packages/cli-plugin-typeorm/tsconfig.esm.json | 3 ++- packages/cli-plugin-vitest/tsconfig.esm.json | 3 ++- packages/cli-testing/tsconfig.esm.json | 3 ++- packages/cli/tsconfig.esm.json | 3 ++- 14 files changed, 28 insertions(+), 14 deletions(-) diff --git a/packages/cli-core/tsconfig.esm.json b/packages/cli-core/tsconfig.esm.json index 45d441a7d..54357f753 100644 --- a/packages/cli-core/tsconfig.esm.json +++ b/packages/cli-core/tsconfig.esm.json @@ -7,7 +7,8 @@ "declarationDir": "./lib/types", "declaration": true, "composite": true, - "noEmit": false + "noEmit": false, + "sourceMap": false }, "include": ["src", "src/**/*.json"], "exclude": [ diff --git a/packages/cli-generate-http-client/tsconfig.esm.json b/packages/cli-generate-http-client/tsconfig.esm.json index 45d441a7d..54357f753 100644 --- a/packages/cli-generate-http-client/tsconfig.esm.json +++ b/packages/cli-generate-http-client/tsconfig.esm.json @@ -7,7 +7,8 @@ "declarationDir": "./lib/types", "declaration": true, "composite": true, - "noEmit": false + "noEmit": false, + "sourceMap": false }, "include": ["src", "src/**/*.json"], "exclude": [ diff --git a/packages/cli-generate-swagger/tsconfig.esm.json b/packages/cli-generate-swagger/tsconfig.esm.json index 45d441a7d..54357f753 100644 --- a/packages/cli-generate-swagger/tsconfig.esm.json +++ b/packages/cli-generate-swagger/tsconfig.esm.json @@ -7,7 +7,8 @@ "declarationDir": "./lib/types", "declaration": true, "composite": true, - "noEmit": false + "noEmit": false, + "sourceMap": false }, "include": ["src", "src/**/*.json"], "exclude": [ diff --git a/packages/cli-plugin-eslint/tsconfig.esm.json b/packages/cli-plugin-eslint/tsconfig.esm.json index 45d441a7d..54357f753 100644 --- a/packages/cli-plugin-eslint/tsconfig.esm.json +++ b/packages/cli-plugin-eslint/tsconfig.esm.json @@ -7,7 +7,8 @@ "declarationDir": "./lib/types", "declaration": true, "composite": true, - "noEmit": false + "noEmit": false, + "sourceMap": false }, "include": ["src", "src/**/*.json"], "exclude": [ diff --git a/packages/cli-plugin-jest/tsconfig.esm.json b/packages/cli-plugin-jest/tsconfig.esm.json index 45d441a7d..54357f753 100644 --- a/packages/cli-plugin-jest/tsconfig.esm.json +++ b/packages/cli-plugin-jest/tsconfig.esm.json @@ -7,7 +7,8 @@ "declarationDir": "./lib/types", "declaration": true, "composite": true, - "noEmit": false + "noEmit": false, + "sourceMap": false }, "include": ["src", "src/**/*.json"], "exclude": [ diff --git a/packages/cli-plugin-mongoose/tsconfig.esm.json b/packages/cli-plugin-mongoose/tsconfig.esm.json index 45d441a7d..54357f753 100644 --- a/packages/cli-plugin-mongoose/tsconfig.esm.json +++ b/packages/cli-plugin-mongoose/tsconfig.esm.json @@ -7,7 +7,8 @@ "declarationDir": "./lib/types", "declaration": true, "composite": true, - "noEmit": false + "noEmit": false, + "sourceMap": false }, "include": ["src", "src/**/*.json"], "exclude": [ diff --git a/packages/cli-plugin-oidc-provider/tsconfig.esm.json b/packages/cli-plugin-oidc-provider/tsconfig.esm.json index 45d441a7d..54357f753 100644 --- a/packages/cli-plugin-oidc-provider/tsconfig.esm.json +++ b/packages/cli-plugin-oidc-provider/tsconfig.esm.json @@ -7,7 +7,8 @@ "declarationDir": "./lib/types", "declaration": true, "composite": true, - "noEmit": false + "noEmit": false, + "sourceMap": false }, "include": ["src", "src/**/*.json"], "exclude": [ diff --git a/packages/cli-plugin-passport/tsconfig.esm.json b/packages/cli-plugin-passport/tsconfig.esm.json index 45d441a7d..54357f753 100644 --- a/packages/cli-plugin-passport/tsconfig.esm.json +++ b/packages/cli-plugin-passport/tsconfig.esm.json @@ -7,7 +7,8 @@ "declarationDir": "./lib/types", "declaration": true, "composite": true, - "noEmit": false + "noEmit": false, + "sourceMap": false }, "include": ["src", "src/**/*.json"], "exclude": [ diff --git a/packages/cli-plugin-prisma/tsconfig.esm.json b/packages/cli-plugin-prisma/tsconfig.esm.json index 45d441a7d..54357f753 100644 --- a/packages/cli-plugin-prisma/tsconfig.esm.json +++ b/packages/cli-plugin-prisma/tsconfig.esm.json @@ -7,7 +7,8 @@ "declarationDir": "./lib/types", "declaration": true, "composite": true, - "noEmit": false + "noEmit": false, + "sourceMap": false }, "include": ["src", "src/**/*.json"], "exclude": [ diff --git a/packages/cli-plugin-typegraphql/tsconfig.esm.json b/packages/cli-plugin-typegraphql/tsconfig.esm.json index 45d441a7d..54357f753 100644 --- a/packages/cli-plugin-typegraphql/tsconfig.esm.json +++ b/packages/cli-plugin-typegraphql/tsconfig.esm.json @@ -7,7 +7,8 @@ "declarationDir": "./lib/types", "declaration": true, "composite": true, - "noEmit": false + "noEmit": false, + "sourceMap": false }, "include": ["src", "src/**/*.json"], "exclude": [ diff --git a/packages/cli-plugin-typeorm/tsconfig.esm.json b/packages/cli-plugin-typeorm/tsconfig.esm.json index 45d441a7d..54357f753 100644 --- a/packages/cli-plugin-typeorm/tsconfig.esm.json +++ b/packages/cli-plugin-typeorm/tsconfig.esm.json @@ -7,7 +7,8 @@ "declarationDir": "./lib/types", "declaration": true, "composite": true, - "noEmit": false + "noEmit": false, + "sourceMap": false }, "include": ["src", "src/**/*.json"], "exclude": [ diff --git a/packages/cli-plugin-vitest/tsconfig.esm.json b/packages/cli-plugin-vitest/tsconfig.esm.json index 45d441a7d..54357f753 100644 --- a/packages/cli-plugin-vitest/tsconfig.esm.json +++ b/packages/cli-plugin-vitest/tsconfig.esm.json @@ -7,7 +7,8 @@ "declarationDir": "./lib/types", "declaration": true, "composite": true, - "noEmit": false + "noEmit": false, + "sourceMap": false }, "include": ["src", "src/**/*.json"], "exclude": [ diff --git a/packages/cli-testing/tsconfig.esm.json b/packages/cli-testing/tsconfig.esm.json index 45d441a7d..54357f753 100644 --- a/packages/cli-testing/tsconfig.esm.json +++ b/packages/cli-testing/tsconfig.esm.json @@ -7,7 +7,8 @@ "declarationDir": "./lib/types", "declaration": true, "composite": true, - "noEmit": false + "noEmit": false, + "sourceMap": false }, "include": ["src", "src/**/*.json"], "exclude": [ diff --git a/packages/cli/tsconfig.esm.json b/packages/cli/tsconfig.esm.json index 45d441a7d..54357f753 100644 --- a/packages/cli/tsconfig.esm.json +++ b/packages/cli/tsconfig.esm.json @@ -7,7 +7,8 @@ "declarationDir": "./lib/types", "declaration": true, "composite": true, - "noEmit": false + "noEmit": false, + "sourceMap": false }, "include": ["src", "src/**/*.json"], "exclude": [ From 77a22c336739da21dc0781b979228f7ff4612e86 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sat, 28 Sep 2024 12:15:53 +0000 Subject: [PATCH 55/69] Github CI build: __run_2 v6.0.0-alpha.10 [ci skip] --- lerna.json | 2 +- package.json | 2 +- packages/barrels/package.json | 2 +- packages/cli-core/package.json | 2 +- packages/cli-generate-http-client/package.json | 2 +- packages/cli-generate-swagger/package.json | 2 +- packages/cli-plugin-eslint/package.json | 2 +- packages/cli-plugin-jest/package.json | 2 +- packages/cli-plugin-mongoose/package.json | 2 +- packages/cli-plugin-oidc-provider/package.json | 2 +- packages/cli-plugin-passport/package.json | 2 +- packages/cli-plugin-prisma/package.json | 2 +- packages/cli-plugin-typegraphql/package.json | 2 +- packages/cli-plugin-typeorm/package.json | 2 +- packages/cli-plugin-vitest/package.json | 2 +- packages/cli-testing/package.json | 2 +- packages/cli/package.json | 2 +- tools/typescript/package.json | 2 +- tools/vitest/package.json | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lerna.json b/lerna.json index d3c190693..eeb455a3a 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "packages": [ "packages/*" ], - "version": "6.0.0-alpha.9" + "version": "6.0.0-alpha.10" } \ No newline at end of file diff --git a/package.json b/package.json index 407186e2b..129df2ea0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@tsed/cli-root", - "version": "6.0.0-alpha.9", + "version": "6.0.0-alpha.10", "description": "CLI to bootstrap your Ts.ED project", "private": true, "type": "module", diff --git a/packages/barrels/package.json b/packages/barrels/package.json index abeea07af..40ff49b96 100644 --- a/packages/barrels/package.json +++ b/packages/barrels/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/barrels", "description": "A simple tool to generate barrels for your TypeScript project", - "version": "6.0.0-alpha.9", + "version": "6.0.0-alpha.10", "type": "module", "bin": "bin/barrels.js", "files": [], diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index 835481e0f..49c105c7a 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-core", "description": "Build your CLI with TypeScript and Decorators", - "version": "6.0.0-alpha.9", + "version": "6.0.0-alpha.10", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-generate-http-client/package.json b/packages/cli-generate-http-client/package.json index a3ef0b59d..3458d0306 100644 --- a/packages/cli-generate-http-client/package.json +++ b/packages/cli-generate-http-client/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-generate-http-client", "description": "Ts.ED CLI plugin. Export a command that generate an HTTP Client (axios or fetch) from your Ts.ED controllers and OS3 spec.", - "version": "6.0.0-alpha.9", + "version": "6.0.0-alpha.10", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-generate-swagger/package.json b/packages/cli-generate-swagger/package.json index a7ff6f352..66a376748 100644 --- a/packages/cli-generate-swagger/package.json +++ b/packages/cli-generate-swagger/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-generate-swagger", "description": "Ts.ED CLI plugin. Export a command that generate the swagger.json from your Ts.ED controllers and OS3 spec.", - "version": "6.0.0-alpha.9", + "version": "6.0.0-alpha.10", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-eslint/package.json b/packages/cli-plugin-eslint/package.json index 0bc8c95bb..6d49b9f5e 100644 --- a/packages/cli-plugin-eslint/package.json +++ b/packages/cli-plugin-eslint/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-eslint", "description": "Ts.ED CLI plugin. Add EsLint support", - "version": "6.0.0-alpha.9", + "version": "6.0.0-alpha.10", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-jest/package.json b/packages/cli-plugin-jest/package.json index 8cb56794c..be4c52aed 100644 --- a/packages/cli-plugin-jest/package.json +++ b/packages/cli-plugin-jest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-jest", "description": "Ts.ED CLI plugin. Add Jest support", - "version": "6.0.0-alpha.9", + "version": "6.0.0-alpha.10", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-mongoose/package.json b/packages/cli-plugin-mongoose/package.json index bc8050558..e41be8437 100644 --- a/packages/cli-plugin-mongoose/package.json +++ b/packages/cli-plugin-mongoose/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-mongoose", "description": "Ts.ED CLI plugin. Add Mongoose support", - "version": "6.0.0-alpha.9", + "version": "6.0.0-alpha.10", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-oidc-provider/package.json b/packages/cli-plugin-oidc-provider/package.json index 2e31b8bf0..f0d9270e2 100644 --- a/packages/cli-plugin-oidc-provider/package.json +++ b/packages/cli-plugin-oidc-provider/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-oidc-provider", "description": "Ts.ED CLI plugin. Add OIDC Provider", - "version": "6.0.0-alpha.9", + "version": "6.0.0-alpha.10", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-passport/package.json b/packages/cli-plugin-passport/package.json index f01a39d71..0cf55ff7b 100644 --- a/packages/cli-plugin-passport/package.json +++ b/packages/cli-plugin-passport/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-passport", "description": "Ts.ED CLI plugin. Add Passport.js support", - "version": "6.0.0-alpha.9", + "version": "6.0.0-alpha.10", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-prisma/package.json b/packages/cli-plugin-prisma/package.json index d7d92e7b4..fa525b3ed 100644 --- a/packages/cli-plugin-prisma/package.json +++ b/packages/cli-plugin-prisma/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-prisma", "description": "Ts.ED CLI plugin. Add Prisma project initialisation support.", - "version": "6.0.0-alpha.9", + "version": "6.0.0-alpha.10", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-typegraphql/package.json b/packages/cli-plugin-typegraphql/package.json index 9630adba7..b9872310c 100644 --- a/packages/cli-plugin-typegraphql/package.json +++ b/packages/cli-plugin-typegraphql/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-typegraphql", "description": "Ts.ED CLI plugin. Add TypeGraphql support.", - "version": "6.0.0-alpha.9", + "version": "6.0.0-alpha.10", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-typeorm/package.json b/packages/cli-plugin-typeorm/package.json index bb92db55e..b7f03ead2 100644 --- a/packages/cli-plugin-typeorm/package.json +++ b/packages/cli-plugin-typeorm/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-typeorm", "description": "Ts.ED CLI plugin. Add TypeORM support", - "version": "6.0.0-alpha.9", + "version": "6.0.0-alpha.10", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-vitest/package.json b/packages/cli-plugin-vitest/package.json index 6011aa050..1ab78f9ec 100644 --- a/packages/cli-plugin-vitest/package.json +++ b/packages/cli-plugin-vitest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-vitest", "description": "Ts.ED CLI plugin. Add Jest support", - "version": "6.0.0-alpha.9", + "version": "6.0.0-alpha.10", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-testing/package.json b/packages/cli-testing/package.json index c19d33002..1900d8d2c 100644 --- a/packages/cli-testing/package.json +++ b/packages/cli-testing/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-testing", "description": "Utils to test you CLI based on Ts.ED CLI", - "version": "6.0.0-alpha.9", + "version": "6.0.0-alpha.10", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli/package.json b/packages/cli/package.json index 67a0b8f99..a4ade3526 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli", "description": "CLI to bootstrap your Ts.ED project", - "version": "6.0.0-alpha.9", + "version": "6.0.0-alpha.10", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/tools/typescript/package.json b/tools/typescript/package.json index ff9621215..bcaf6f56a 100644 --- a/tools/typescript/package.json +++ b/tools/typescript/package.json @@ -1,6 +1,6 @@ { "name": "@tsed/typescript", - "version": "6.0.0-alpha.9", + "version": "6.0.0-alpha.10", "description": "Util to compile source", "type": "module", "private": true, diff --git a/tools/vitest/package.json b/tools/vitest/package.json index ddf2f0aef..1e66e8d1f 100644 --- a/tools/vitest/package.json +++ b/tools/vitest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/vitest", "type": "module", - "version": "6.0.0-alpha.9", + "version": "6.0.0-alpha.10", "private": true, "exports": { ".": "./index.js", From b913453121a8557192f3a2cd869b77af1b71ab08 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Sat, 28 Sep 2024 18:08:59 +0200 Subject: [PATCH 56/69] fix(cli-core): bump commander dependency to 12.1.0 --- package.json | 4 +- packages/cli-core/package.json | 2 +- packages/cli-core/src/services/CliService.ts | 11 +- .../cli-core/src/utils/mapCommanderOptions.ts | 7 +- .../integrations/command.integration.spec.ts | 4 +- .../cli-generate-http-client/package.json | 2 +- .../src/commands/GenerateHttpClientCmd.ts | 7 +- .../cli/src/commands/generate/GenerateCmd.ts | 2 +- yarn.lock | 256 +++++++----------- 9 files changed, 122 insertions(+), 173 deletions(-) diff --git a/package.json b/package.json index 129df2ea0..c2191b160 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "@tsed/normalize-path": ">=7.14.2", "axios": "^1.7.7", "chalk": "^5.3.0", - "commander": "^9.3.0", + "commander": "^12.1.0", "consolidate": "^1.0.4", "execa": "8.0.1", "figures": "^6.1.0", @@ -94,7 +94,7 @@ "husky": "9.1.6", "is-ci": "3.0.1", "lint-staged": "15.2.10", - "markdown-it": "13.0.2", + "markdown-it": "14.1.0", "prettier": "3.3.3", "semantic-release": "24.1.1", "semantic-release-slack-bot": "4.0.2", diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index 49c105c7a..ee92465d3 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -40,7 +40,7 @@ "axios": "^1.7.7", "chalk": "^5.3.0", "change-case": "^5.4.4", - "commander": "^9.3.0", + "commander": "^12.1.0", "consolidate": "^1.0.4", "create-frame": "^1.0.0", "enquirer": "^2.4.1", diff --git a/packages/cli-core/src/services/CliService.ts b/packages/cli-core/src/services/CliService.ts index f8ae1fea1..5a67b8d55 100644 --- a/packages/cli-core/src/services/CliService.ts +++ b/packages/cli-core/src/services/CliService.ts @@ -13,8 +13,8 @@ import type {CommandProvider} from "../interfaces/CommandProvider.js"; import {PackageManagersModule} from "../packageManagers/index.js"; import {createSubTasks, createTasksRunner} from "../utils/createTasksRunner.js"; import {getCommandMetadata} from "../utils/getCommandMetadata.js"; +import {mapCommanderOptions} from "../utils/index.js"; import {mapCommanderArgs} from "../utils/mapCommanderArgs.js"; -import {mapCommanderOptions} from "../utils/mapCommanderOptions.js"; import {parseOption} from "../utils/parseOption.js"; import {CliHooks} from "./CliHooks.js"; import {ProjectPackageJson} from "./ProjectPackageJson.js"; @@ -196,10 +196,13 @@ export class CliService { let cmd = this.program.command(name); - const onAction = (...commanderArgs: any[]) => { + const onAction = (commandName: string) => { const [, ...rawArgs] = cmd.args; - const mappedArgs = mapCommanderArgs(args, commanderArgs); - const allOpts = mapCommanderOptions(this.program.commands); + const mappedArgs = mapCommanderArgs( + args, + this.program.args.filter((arg) => commandName === arg) + ); + const allOpts = mapCommanderOptions(commandName, this.program.commands); const data = { ...allOpts, diff --git a/packages/cli-core/src/utils/mapCommanderOptions.ts b/packages/cli-core/src/utils/mapCommanderOptions.ts index 637347ab5..ab8962c8b 100644 --- a/packages/cli-core/src/utils/mapCommanderOptions.ts +++ b/packages/cli-core/src/utils/mapCommanderOptions.ts @@ -1,8 +1,13 @@ import type {Command} from "commander"; -export function mapCommanderOptions(commands: Command[]) { +export function mapCommanderOptions(commandName: string, commands: readonly Command[]) { const options: any = {}; + commands.forEach((command) => { + if (command.name() !== commandName) { + return; + } + Object.entries(command.opts()) .filter(([key]) => !key.startsWith("_") && !["commands", "options", "parent", "rawArgs", "args"].includes(key)) .forEach(([key, value]) => { diff --git a/packages/cli-core/test/integrations/command.integration.spec.ts b/packages/cli-core/test/integrations/command.integration.spec.ts index b756267ec..30335b8f3 100644 --- a/packages/cli-core/test/integrations/command.integration.spec.ts +++ b/packages/cli-core/test/integrations/command.integration.spec.ts @@ -13,7 +13,7 @@ describe("Command", () => { name: "test", description: "Command description", args: { - command: { + argument: { type: String, description: "Arg description" } @@ -41,7 +41,7 @@ describe("Command", () => { expect(TestCommand.prototype.$exec).toHaveBeenCalledWith({ bindLogger: true, - command: "subcmd", + argument: "subcmd", rawArgs: [], rootDir: undefined, verbose: false diff --git a/packages/cli-generate-http-client/package.json b/packages/cli-generate-http-client/package.json index 3458d0306..e3d7d5cd1 100644 --- a/packages/cli-generate-http-client/package.json +++ b/packages/cli-generate-http-client/package.json @@ -29,7 +29,7 @@ "@tsed/cli-core": "workspace:*", "@tsed/typescript": "workspace:*", "cross-env": "7.0.3", - "swagger-typescript-api": "^9.3.1", + "swagger-typescript-api": "^13.0.22", "typescript": "5.6.2", "vitest": "2.1.1" }, diff --git a/packages/cli-generate-http-client/src/commands/GenerateHttpClientCmd.ts b/packages/cli-generate-http-client/src/commands/GenerateHttpClientCmd.ts index ea5b87de9..f254cb09d 100644 --- a/packages/cli-generate-http-client/src/commands/GenerateHttpClientCmd.ts +++ b/packages/cli-generate-http-client/src/commands/GenerateHttpClientCmd.ts @@ -143,8 +143,9 @@ export class GenerateHttpClientCmd implements CommandProvider { } } as any); - const promises = files.map(({content, name}) => { - content = content + const promises = files.map((file) => { + const name = file.fileName; + file.fileContent = file.fileContent .replace("class Api", `class ${$ctx.name}`) .replace(".then((response) => response.data)", ".then((response) => response.data as T)") .replace('requestParams.headers.common = { Accept: "*/*" };', "") @@ -153,7 +154,7 @@ export class GenerateHttpClientCmd implements CommandProvider { .replace("(this.instance.defaults.headers || {})", "((this.instance.defaults.headers || {}) as any)"); console.log(`${$ctx.output}/${name}`, path.resolve(`${$ctx.output}/${name}`)); - return this.fs.writeFile(`${$ctx.output}/${name}`, content, {encoding: "utf8"}); + return this.fs.writeFile(`${$ctx.output}/${name}`, file.fileContent, {encoding: "utf8"}); }); return Promise.all(promises); diff --git a/packages/cli/src/commands/generate/GenerateCmd.ts b/packages/cli/src/commands/generate/GenerateCmd.ts index 0fee057ff..bada65667 100644 --- a/packages/cli/src/commands/generate/GenerateCmd.ts +++ b/packages/cli/src/commands/generate/GenerateCmd.ts @@ -63,7 +63,7 @@ const searchFactory = (list: any) => { } }, options: { - "-r, --route ": { + "--route ": { type: String, description: "The route for the controller generated file" }, diff --git a/yarn.lock b/yarn.lock index a0dba351a..170ae7de2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2283,7 +2283,7 @@ __metadata: axios: "npm:^1.7.7" chalk: "npm:^5.3.0" change-case: "npm:^5.4.4" - commander: "npm:^9.3.0" + commander: "npm:^12.1.0" consolidate: "npm:^1.0.4" create-frame: "npm:^1.0.0" cross-env: "npm:7.0.3" @@ -2326,7 +2326,7 @@ __metadata: "@tsed/typescript": "workspace:*" change-case: "npm:5.4.4" cross-env: "npm:7.0.3" - swagger-typescript-api: "npm:^9.3.1" + swagger-typescript-api: "npm:^13.0.22" tslib: "npm:2.7.0" typescript: "npm:5.6.2" vitest: "npm:2.1.1" @@ -2524,7 +2524,7 @@ __metadata: "@vitest/coverage-v8": "npm:^2.1.1" axios: "npm:^1.7.7" chalk: "npm:^5.3.0" - commander: "npm:^9.3.0" + commander: "npm:^12.1.0" concurrently: "npm:9.0.1" consolidate: "npm:^1.0.4" cross-env: "npm:7.0.3" @@ -2548,7 +2548,7 @@ __metadata: lerna: "npm:^8.1.8" lint-staged: "npm:15.2.10" listr2: "npm:^8.2.4" - markdown-it: "npm:13.0.2" + markdown-it: "npm:14.1.0" prettier: "npm:3.3.3" read-pkg-up: "npm:^11.0.0" registry-url: "npm:^6.0.1" @@ -2995,13 +2995,6 @@ __metadata: languageName: node linkType: hard -"@types/parse-json@npm:^4.0.0": - version: 4.0.0 - resolution: "@types/parse-json@npm:4.0.0" - checksum: 10/4df9de98150d2978afc2161482a3a8e6617883effba3223324f079de97ba7eabd7d84b90ced11c3f82b0c08d4a8383f678c9f73e9c41258f769b3fa234a2bb4f - languageName: node - linkType: hard - "@types/responselike@npm:^1.0.0": version: 1.0.3 resolution: "@types/responselike@npm:1.0.3" @@ -3018,10 +3011,10 @@ __metadata: languageName: node linkType: hard -"@types/swagger-schema-official@npm:2.0.21": - version: 2.0.21 - resolution: "@types/swagger-schema-official@npm:2.0.21" - checksum: 10/d5a3270810d22942eb82b6f43c9f5ea17ab2b5af6f9ba1eee9ff91f3f0c7258ac3663c4939bbbf5e376d5aac12661bc5c28814f4e3f7a026f0ccbd11e238ea24 +"@types/swagger-schema-official@npm:^2.0.25": + version: 2.0.25 + resolution: "@types/swagger-schema-official@npm:2.0.25" + checksum: 10/0ceec569f8841e327fcafa64e67722ae3f1e107254b7654505515ec5d05df79c03e79d8161445abef0ede5313b960e4d46d151bf2430eb171658f6d7522edd8d languageName: node linkType: hard @@ -4183,15 +4176,6 @@ __metadata: languageName: node linkType: hard -"axios@npm:^0.21.4": - version: 0.21.4 - resolution: "axios@npm:0.21.4" - dependencies: - follow-redirects: "npm:^1.14.0" - checksum: 10/da644592cb6f8f9f8c64fdabd7e1396d6769d7a4c1ea5f8ae8beb5c2eb90a823e3a574352b0b934ac62edc762c0f52647753dc54f7d07279127a7e5c4cd20272 - languageName: node - linkType: hard - "axios@npm:^1.7.4, axios@npm:^1.7.7": version: 1.7.7 resolution: "axios@npm:1.7.7" @@ -5136,6 +5120,13 @@ __metadata: languageName: node linkType: hard +"commander@npm:^12.1.0, commander@npm:~12.1.0": + version: 12.1.0 + resolution: "commander@npm:12.1.0" + checksum: 10/cdaeb672d979816853a4eed7f1310a9319e8b976172485c2a6b437ed0db0a389a44cfb222bfbde772781efa9f215bdd1b936f80d6b249485b465c6cb906e1f93 + languageName: node + linkType: hard + "commander@npm:^3.0.1": version: 3.0.2 resolution: "commander@npm:3.0.2" @@ -5143,27 +5134,6 @@ __metadata: languageName: node linkType: hard -"commander@npm:^6.2.1": - version: 6.2.1 - resolution: "commander@npm:6.2.1" - checksum: 10/25b88c2efd0380c84f7844b39cf18510da7bfc5013692d68cdc65f764a1c34e6c8a36ea6d72b6620e3710a930cf8fab2695bdec2bf7107a0f4fa30a3ef3b7d0e - languageName: node - linkType: hard - -"commander@npm:^9.3.0": - version: 9.5.0 - resolution: "commander@npm:9.5.0" - checksum: 10/41c49b3d0f94a1fbeb0463c85b13f15aa15a9e0b4d5e10a49c0a1d58d4489b549d62262b052ae0aa6cfda53299bee487bfe337825df15e342114dde543f82906 - languageName: node - linkType: hard - -"commander@npm:~12.1.0": - version: 12.1.0 - resolution: "commander@npm:12.1.0" - checksum: 10/cdaeb672d979816853a4eed7f1310a9319e8b976172485c2a6b437ed0db0a389a44cfb222bfbde772781efa9f215bdd1b936f80d6b249485b465c6cb906e1f93 - languageName: node - linkType: hard - "common-ancestor-path@npm:^1.0.1": version: 1.0.1 resolution: "common-ancestor-path@npm:1.0.1" @@ -5277,6 +5247,13 @@ __metadata: languageName: node linkType: hard +"consola@npm:^3.2.3": + version: 3.2.3 + resolution: "consola@npm:3.2.3" + checksum: 10/02972dcb048c337357a3628438e5976b8e45bcec22fdcfbe9cd17622992953c4d695d5152f141464a02deac769b1d23028e8ac87f56483838df7a6bbf8e0f5a2 + languageName: node + linkType: hard + "console-control-strings@npm:^1.1.0": version: 1.1.0 resolution: "console-control-strings@npm:1.1.0" @@ -5640,19 +5617,6 @@ __metadata: languageName: node linkType: hard -"cosmiconfig@npm:^7.0.0": - version: 7.0.1 - resolution: "cosmiconfig@npm:7.0.1" - dependencies: - "@types/parse-json": "npm:^4.0.0" - import-fresh: "npm:^3.2.1" - parse-json: "npm:^5.0.0" - path-type: "npm:^4.0.0" - yaml: "npm:^1.10.0" - checksum: 10/861bf4c2c9e88e6c50f14278b25bb0509c484623de11fadf3788a3d543bc7c45178aeebeb6657293b12dc8bd1b86d926c5f25c803c4dc3821d628a1b24c3d20b - languageName: node - linkType: hard - "cosmiconfig@npm:^8.2.0": version: 8.3.6 resolution: "cosmiconfig@npm:8.3.6" @@ -6059,6 +6023,13 @@ __metadata: languageName: node linkType: hard +"didyoumean@npm:^1.2.2": + version: 1.2.2 + resolution: "didyoumean@npm:1.2.2" + checksum: 10/de7f11b6a0c8c61018629b7f405bb9746d6e994ce87c1a4b7655c3c718442dc69037a3d46d804950604fd9cbe85c074f7b224a119fc1bda851690a74540c6cf8 + languageName: node + linkType: hard + "diff-sequences@npm:^29.6.3": version: 29.6.3 resolution: "diff-sequences@npm:29.6.3" @@ -6286,10 +6257,10 @@ __metadata: languageName: node linkType: hard -"entities@npm:~3.0.1": - version: 3.0.1 - resolution: "entities@npm:3.0.1" - checksum: 10/3706e0292ea3f3679720b3d3b1ed6290b164aaeb11116691a922a3acea144503871e0de2170b47671c3b735549b8b7f4741d0d3c2987e8f985ccaa0dd3762eba +"entities@npm:^4.4.0": + version: 4.5.0 + resolution: "entities@npm:4.5.0" + checksum: 10/ede2a35c9bce1aeccd055a1b445d41c75a14a2bb1cd22e242f20cf04d236cdcd7f9c859eb83f76885327bfae0c25bf03303665ee1ce3d47c5927b98b0e3e3d48 languageName: node linkType: hard @@ -6696,10 +6667,10 @@ __metadata: languageName: node linkType: hard -"eta@npm:^1.12.1": - version: 1.12.3 - resolution: "eta@npm:1.12.3" - checksum: 10/7319986d4cad453e17c2bff84ccf01fb56af5d3326aa37844a701fc628f090636ec2771d355052c8a9864c60323b7c2279c64e60c080f0f5a2ff46037601612b +"eta@npm:^2.2.0": + version: 2.2.0 + resolution: "eta@npm:2.2.0" + checksum: 10/31b0fd11f47ec7c626048f7bc6d95f0255a9aa21af059263d35d286aad7597b17c04ac0d92d49bbb62c430f5cb6920efbd93aabd527a5957f78c67150d33ccc3 languageName: node linkType: hard @@ -7221,16 +7192,6 @@ __metadata: languageName: node linkType: hard -"follow-redirects@npm:^1.14.0": - version: 1.15.1 - resolution: "follow-redirects@npm:1.15.1" - peerDependenciesMeta: - debug: - optional: true - checksum: 10/a57f93ce566d4602fe7b2f6cef8f8d3d053891b3d8f2feae7e97eec18aa0003d23aeec8e857801d93887eee27e1617276a16f6a3d5c9d78e45882346612462d5 - languageName: node - linkType: hard - "follow-redirects@npm:^1.15.4": version: 1.15.5 resolution: "follow-redirects@npm:1.15.5" @@ -9537,7 +9498,7 @@ __metadata: languageName: node linkType: hard -"js-yaml@npm:4.1.0, js-yaml@npm:^4.0.0, js-yaml@npm:^4.1.0": +"js-yaml@npm:4.1.0, js-yaml@npm:^4.1.0": version: 4.1.0 resolution: "js-yaml@npm:4.1.0" dependencies: @@ -10073,12 +10034,12 @@ __metadata: languageName: node linkType: hard -"linkify-it@npm:^4.0.1": - version: 4.0.1 - resolution: "linkify-it@npm:4.0.1" +"linkify-it@npm:^5.0.0": + version: 5.0.0 + resolution: "linkify-it@npm:5.0.0" dependencies: - uc.micro: "npm:^1.0.1" - checksum: 10/d0a786d2e3f02f46b6f4a9b466af9eb936fb68e86b7cd305933d5457b12fdc53a4d0e0b697b02dc2e7d84a51d2425d719598bb7b47af7e01911e492e07a97957 + uc.micro: "npm:^2.0.0" + checksum: 10/ef3b7609dda6ec0c0be8a7b879cea195f0d36387b0011660cd6711bba0ad82137f59b458b7e703ec74f11d88e7c1328e2ad9b855a8500c0ded67461a8c4519e6 languageName: node linkType: hard @@ -10601,7 +10562,7 @@ __metadata: languageName: node linkType: hard -"make-dir@npm:^3.0.0, make-dir@npm:^3.1.0": +"make-dir@npm:^3.0.0": version: 3.1.0 resolution: "make-dir@npm:3.1.0" dependencies: @@ -10666,18 +10627,19 @@ __metadata: languageName: node linkType: hard -"markdown-it@npm:13.0.2": - version: 13.0.2 - resolution: "markdown-it@npm:13.0.2" +"markdown-it@npm:14.1.0": + version: 14.1.0 + resolution: "markdown-it@npm:14.1.0" dependencies: argparse: "npm:^2.0.1" - entities: "npm:~3.0.1" - linkify-it: "npm:^4.0.1" - mdurl: "npm:^1.0.1" - uc.micro: "npm:^1.0.5" + entities: "npm:^4.4.0" + linkify-it: "npm:^5.0.0" + mdurl: "npm:^2.0.0" + punycode.js: "npm:^2.3.1" + uc.micro: "npm:^2.1.0" bin: - markdown-it: bin/markdown-it.js - checksum: 10/4f48271bbd44d16502efd4148d7c05ca1fb4b50719a07d34c91e8d16f8d065c558fed0fafe07cd13ca5958096bfe295b37cd4f042add7ec49f73c70154e75f58 + markdown-it: bin/markdown-it.mjs + checksum: 10/f34f921be178ed0607ba9e3e27c733642be445e9bb6b1dba88da7aafe8ba1bc5d2f1c3aa8f3fc33b49a902da4e4c08c2feadfafb290b8c7dda766208bb6483a9 languageName: node linkType: hard @@ -10823,10 +10785,10 @@ __metadata: languageName: node linkType: hard -"mdurl@npm:^1.0.1": - version: 1.0.1 - resolution: "mdurl@npm:1.0.1" - checksum: 10/ada367d01c9e81d07328101f187d5bd8641b71f33eab075df4caed935a24fa679e625f07108801d8250a5e4a99e5cd4be7679957a11424a3aa3e740d2bb2d5cb +"mdurl@npm:^2.0.0": + version: 2.0.0 + resolution: "mdurl@npm:2.0.0" + checksum: 10/1720349d4a53e401aa993241368e35c0ad13d816ad0b28388928c58ca9faa0cf755fa45f18ccbf64f4ce54a845a50ddce5c84e4016897b513096a68dac4b0158 languageName: node linkType: hard @@ -11353,15 +11315,6 @@ __metadata: languageName: node linkType: hard -"nanoid@npm:^3.1.22": - version: 3.3.4 - resolution: "nanoid@npm:3.3.4" - bin: - nanoid: bin/nanoid.cjs - checksum: 10/4f01aaf742452d8668d1d99a21218eb9eaa703c0291e7ec5bbb17a7c0ac56df3b791723ce4d429f53949b252e1ce26386a0aa6782fce10d44cd617d89c9fe9d2 - languageName: node - linkType: hard - "nanoid@npm:^3.3.7": version: 3.3.7 resolution: "nanoid@npm:3.3.7" @@ -11428,15 +11381,6 @@ __metadata: languageName: node linkType: hard -"node-emoji@npm:^1.10.0": - version: 1.11.0 - resolution: "node-emoji@npm:1.11.0" - dependencies: - lodash: "npm:^4.17.21" - checksum: 10/1d7ae9bcb0f23d7cdfcac5c3a90a6fd6ec584e6f7c70ff073f6122bfbed6c06284da7334092500d24e14162f5c4016e5dcd3355753cbd5b7e60de560a973248d - languageName: node - linkType: hard - "node-emoji@npm:^2.1.3": version: 2.1.3 resolution: "node-emoji@npm:2.1.3" @@ -12966,7 +12910,7 @@ __metadata: languageName: node linkType: hard -"prettier@npm:3.3.3": +"prettier@npm:3.3.3, prettier@npm:~3.3.3": version: 3.3.3 resolution: "prettier@npm:3.3.3" bin: @@ -12975,15 +12919,6 @@ __metadata: languageName: node linkType: hard -"prettier@npm:^2.2.1": - version: 2.7.1 - resolution: "prettier@npm:2.7.1" - bin: - prettier: bin-prettier.js - checksum: 10/9d29f81c1a470efca6851cd926a3e132a8d9c9d290c3d084c917c1c5aad5c392551406cf6012c724a136bd15911ede5eadc255d121c2761813b33a541a9c34c6 - languageName: node - linkType: hard - "pretty-format@npm:^29.7.0": version: 29.7.0 resolution: "pretty-format@npm:29.7.0" @@ -13110,6 +13045,13 @@ __metadata: languageName: node linkType: hard +"punycode.js@npm:^2.3.1": + version: 2.3.1 + resolution: "punycode.js@npm:2.3.1" + checksum: 10/f0e946d1edf063f9e3d30a32ca86d8ff90ed13ca40dad9c75d37510a04473340cfc98db23a905cc1e517b1e9deb0f6021dce6f422ace235c60d3c9ac47c5a16a + languageName: node + linkType: hard + "punycode@npm:^2.1.0": version: 2.3.1 resolution: "punycode@npm:2.3.1" @@ -13753,7 +13695,7 @@ __metadata: languageName: node linkType: hard -"rxjs@npm:>=7.8.1, rxjs@npm:^7.2.0, rxjs@npm:^7.8.1": +"rxjs@npm:>=7.8.1, rxjs@npm:^7.2.0, rxjs@npm:^7.5.4, rxjs@npm:^7.8.1": version: 7.8.1 resolution: "rxjs@npm:7.8.1" dependencies: @@ -13771,7 +13713,7 @@ __metadata: languageName: node linkType: hard -"rxjs@npm:^7.5.4, rxjs@npm:^7.5.5": +"rxjs@npm:^7.5.5": version: 7.8.0 resolution: "rxjs@npm:7.8.0" dependencies: @@ -14869,32 +14811,30 @@ __metadata: languageName: node linkType: hard -"swagger-typescript-api@npm:^9.3.1": - version: 9.3.1 - resolution: "swagger-typescript-api@npm:9.3.1" - dependencies: - "@types/swagger-schema-official": "npm:2.0.21" - axios: "npm:^0.21.4" - commander: "npm:^6.2.1" - cosmiconfig: "npm:^7.0.0" - eta: "npm:^1.12.1" - js-yaml: "npm:^4.0.0" +"swagger-typescript-api@npm:^13.0.22": + version: 13.0.22 + resolution: "swagger-typescript-api@npm:13.0.22" + dependencies: + "@types/swagger-schema-official": "npm:^2.0.25" + consola: "npm:^3.2.3" + cosmiconfig: "npm:^9.0.0" + didyoumean: "npm:^1.2.2" + eta: "npm:^2.2.0" + js-yaml: "npm:^4.1.0" lodash: "npm:^4.17.21" - make-dir: "npm:^3.1.0" - nanoid: "npm:^3.1.22" - node-emoji: "npm:^1.10.0" - prettier: "npm:^2.2.1" + nanoid: "npm:^3.3.7" + prettier: "npm:~3.3.3" swagger-schema-official: "npm:2.0.0-bab6bed" - swagger2openapi: "npm:^7.0.5" - typescript: "npm:^4.2.4" + swagger2openapi: "npm:^7.0.8" + typescript: "npm:~5.5.4" bin: - sta: index.js - swagger-typescript-api: index.js - checksum: 10/87da07bfdf496d4264a57f6dc2c34f19b5cae8cf9e7e0dc16afc765baf4df98563211267831817f795bb02ce3d4dd6ca4e2a28619bba3bb833a94bcda673f958 + sta: ./dist/cli.js + swagger-typescript-api: ./dist/cli.js + checksum: 10/a26f0077d72cce00ce2f911a69c77962eb24f301cafb281893e938d07b941e57ffa635006fc9d2acad0813ecf5cdd8d8e9af5ea382b7b17d9357aeb96e529e82 languageName: node linkType: hard -"swagger2openapi@npm:^7.0.5": +"swagger2openapi@npm:^7.0.8": version: 7.0.8 resolution: "swagger2openapi@npm:7.0.8" dependencies: @@ -15533,13 +15473,13 @@ __metadata: languageName: node linkType: hard -"typescript@npm:^4.2.4": - version: 4.9.5 - resolution: "typescript@npm:4.9.5" +"typescript@npm:~5.5.4": + version: 5.5.4 + resolution: "typescript@npm:5.5.4" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10/458f7220ab11e0fc191514cc41be1707645ec9a8c2d609448a448e18c522cef9646f58728f6811185a4c35613dacdf6c98cf8965c88b3541d0288c47291e4300 + checksum: 10/1689ccafef894825481fc3d856b4834ba3cc185a9c2878f3c76a9a1ef81af04194849840f3c69e7961e2312771471bb3b460ca92561e1d87599b26c37d0ffb6f languageName: node linkType: hard @@ -15563,20 +15503,20 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@npm%3A^4.2.4#optional!builtin": - version: 4.9.5 - resolution: "typescript@patch:typescript@npm%3A4.9.5#optional!builtin::version=4.9.5&hash=289587" +"typescript@patch:typescript@npm%3A~5.5.4#optional!builtin": + version: 5.5.4 + resolution: "typescript@patch:typescript@npm%3A5.5.4#optional!builtin::version=5.5.4&hash=d69c25" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10/5659316360b5cc2d6f5931b346401fa534107b68b60179cf14970e27978f0936c1d5c46f4b5b8175f8cba0430f522b3ce355b4b724c0ea36ce6c0347fab25afd + checksum: 10/2c065f0ef81855eac25c9b658a3c9da65ffc005260c12854c2286f40f3667e1b1ecf8bdbdd37b59aa0397920378ce7900bff8cb32e0f1c7af6fd86efc676718c languageName: node linkType: hard -"uc.micro@npm:^1.0.1, uc.micro@npm:^1.0.5": - version: 1.0.6 - resolution: "uc.micro@npm:1.0.6" - checksum: 10/6898bb556319a38e9cf175e3628689347bd26fec15fc6b29fa38e0045af63075ff3fea4cf1fdba9db46c9f0cbf07f2348cd8844889dd31ebd288c29fe0d27e7a +"uc.micro@npm:^2.0.0, uc.micro@npm:^2.1.0": + version: 2.1.0 + resolution: "uc.micro@npm:2.1.0" + checksum: 10/37197358242eb9afe367502d4638ac8c5838b78792ab218eafe48287b0ed28aaca268ec0392cc5729f6c90266744de32c06ae938549aee041fc93b0f9672d6b2 languageName: node linkType: hard From ce9766957dbe43598f409dee7c16eea8fdca110c Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Sun, 29 Sep 2024 09:53:37 +0200 Subject: [PATCH 57/69] fix(cli-core): bump minors dependencies --- package.json | 8 +- packages/cli-core/package.json | 2 +- packages/cli/package.json | 2 +- yarn.lock | 173 ++++++++++++++++++++------------- 4 files changed, 111 insertions(+), 74 deletions(-) diff --git a/package.json b/package.json index c2191b160..7fff36bd9 100644 --- a/package.json +++ b/package.json @@ -73,12 +73,12 @@ "devDependencies": { "@commitlint/cli": "19.5.0", "@commitlint/config-conventional": "19.5.0", - "@swc/core": "1.7.28", + "@swc/core": "1.7.26", "@swc/helpers": "0.5.13", - "@tsed/markdown-it-symbols": "3.20.4", + "@tsed/markdown-it-symbols": "3.20.8", "@tsed/monorepo-utils": "2.3.5", "@tsed/ts-doc": "^4.1.0", - "@types/node": "22.7.0", + "@types/node": "22.7.4", "@typescript-eslint/eslint-plugin": "8.7.0", "@typescript-eslint/parser": "8.7.0", "@vitest/coverage-v8": "^2.1.1", @@ -96,7 +96,7 @@ "lint-staged": "15.2.10", "markdown-it": "14.1.0", "prettier": "3.3.3", - "semantic-release": "24.1.1", + "semantic-release": "24.1.2", "semantic-release-slack-bot": "4.0.2", "ts-node": "^10.9.2", "typescript": "5.6.2", diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index ee92465d3..f42258751 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -31,7 +31,7 @@ "listr" ], "dependencies": { - "@npmcli/run-script": "8.1.0", + "@npmcli/run-script": "9.0.0", "@tsed/logger": ">=6.1.1", "@tsed/normalize-path": ">=7.14.2", "@types/fs-extra": "^11.0.4", diff --git a/packages/cli/package.json b/packages/cli/package.json index a4ade3526..bd7ceaad6 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -64,7 +64,7 @@ }, "dependencies": { "@swc-node/register": "^1.10.9", - "@swc/core": "^1.7.28", + "@swc/core": "1.7.26", "@swc/helpers": "^0.5.13", "@tsed/cli-core": "workspace:*", "@tsed/core": ">=7.14.2", diff --git a/yarn.lock b/yarn.lock index 170ae7de2..95a4f94ec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1087,6 +1087,13 @@ __metadata: languageName: node linkType: hard +"@npmcli/node-gyp@npm:^4.0.0": + version: 4.0.0 + resolution: "@npmcli/node-gyp@npm:4.0.0" + checksum: 10/edfbdc66dcb35b769d27f1d34b6149957a15fdf56d6f9dd01120720f2d56dbeb825e4b2fad0eebb36855f8a741a5128683c69c2d024412d799df843c32af3d5d + languageName: node + linkType: hard + "@npmcli/package-json@npm:5.2.0, @npmcli/package-json@npm:^5.1.0": version: 5.2.0 resolution: "@npmcli/package-json@npm:5.2.0" @@ -1126,6 +1133,15 @@ __metadata: languageName: node linkType: hard +"@npmcli/promise-spawn@npm:^8.0.0": + version: 8.0.0 + resolution: "@npmcli/promise-spawn@npm:8.0.0" + dependencies: + which: "npm:^4.0.0" + checksum: 10/7256800bc5254e389a2791ee2ddf48286539e2801c5da329fc00dc2ba929a156a4387c61875a325a9cd3fa1c3117e443179e206e63ec46e1ecda8e522c5aeefa + languageName: node + linkType: hard + "@npmcli/query@npm:^3.1.0": version: 3.1.0 resolution: "@npmcli/query@npm:3.1.0" @@ -1156,6 +1172,20 @@ __metadata: languageName: node linkType: hard +"@npmcli/run-script@npm:9.0.0": + version: 9.0.0 + resolution: "@npmcli/run-script@npm:9.0.0" + dependencies: + "@npmcli/node-gyp": "npm:^4.0.0" + "@npmcli/package-json": "npm:^5.0.0" + "@npmcli/promise-spawn": "npm:^8.0.0" + node-gyp: "npm:^10.0.0" + proc-log: "npm:^5.0.0" + which: "npm:^4.0.0" + checksum: 10/3768d74c486e95e09be74b8f35909ae2113c9d10feff1b704db3475528f15e2eec4ab5faf7b4f473cd28a772bfeb2133f819252671d7f217cbbd98e54e7ad307 + languageName: node + linkType: hard + "@npmcli/run-script@npm:^7.0.0, @npmcli/run-script@npm:^7.0.2, @npmcli/run-script@npm:^7.0.4": version: 7.0.4 resolution: "@npmcli/run-script@npm:7.0.4" @@ -1866,9 +1896,9 @@ __metadata: languageName: node linkType: hard -"@semantic-release/github@npm:^10.0.0": - version: 10.3.4 - resolution: "@semantic-release/github@npm:10.3.4" +"@semantic-release/github@npm:^11.0.0": + version: 11.0.0 + resolution: "@semantic-release/github@npm:11.0.0" dependencies: "@octokit/core": "npm:^6.0.0" "@octokit/plugin-paginate-rest": "npm:^11.0.0" @@ -1887,8 +1917,8 @@ __metadata: p-filter: "npm:^4.0.0" url-join: "npm:^5.0.0" peerDependencies: - semantic-release: ">=20.1.0" - checksum: 10/56df8a29c67dacfe2dc17fbb1772a0b975353a60bc1257f39f6cd3f011e7a45d1f393777d41358a126259c4df849cda360600b59738a189d08d48512a4540a3f + semantic-release: ">=24.1.0" + checksum: 10/a9ffb7eb0cddc04242cd83f002d025e230899ede643d0f0e9e47073021e176d6a8746d9465f1ca6b718323cb4bebd77db0878a2ca90b2ce6f97c8de31ef5529b languageName: node linkType: hard @@ -2071,90 +2101,90 @@ __metadata: languageName: node linkType: hard -"@swc/core-darwin-arm64@npm:1.7.28": - version: 1.7.28 - resolution: "@swc/core-darwin-arm64@npm:1.7.28" +"@swc/core-darwin-arm64@npm:1.7.26": + version: 1.7.26 + resolution: "@swc/core-darwin-arm64@npm:1.7.26" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@swc/core-darwin-x64@npm:1.7.28": - version: 1.7.28 - resolution: "@swc/core-darwin-x64@npm:1.7.28" +"@swc/core-darwin-x64@npm:1.7.26": + version: 1.7.26 + resolution: "@swc/core-darwin-x64@npm:1.7.26" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@swc/core-linux-arm-gnueabihf@npm:1.7.28": - version: 1.7.28 - resolution: "@swc/core-linux-arm-gnueabihf@npm:1.7.28" +"@swc/core-linux-arm-gnueabihf@npm:1.7.26": + version: 1.7.26 + resolution: "@swc/core-linux-arm-gnueabihf@npm:1.7.26" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@swc/core-linux-arm64-gnu@npm:1.7.28": - version: 1.7.28 - resolution: "@swc/core-linux-arm64-gnu@npm:1.7.28" +"@swc/core-linux-arm64-gnu@npm:1.7.26": + version: 1.7.26 + resolution: "@swc/core-linux-arm64-gnu@npm:1.7.26" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@swc/core-linux-arm64-musl@npm:1.7.28": - version: 1.7.28 - resolution: "@swc/core-linux-arm64-musl@npm:1.7.28" +"@swc/core-linux-arm64-musl@npm:1.7.26": + version: 1.7.26 + resolution: "@swc/core-linux-arm64-musl@npm:1.7.26" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@swc/core-linux-x64-gnu@npm:1.7.28": - version: 1.7.28 - resolution: "@swc/core-linux-x64-gnu@npm:1.7.28" +"@swc/core-linux-x64-gnu@npm:1.7.26": + version: 1.7.26 + resolution: "@swc/core-linux-x64-gnu@npm:1.7.26" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@swc/core-linux-x64-musl@npm:1.7.28": - version: 1.7.28 - resolution: "@swc/core-linux-x64-musl@npm:1.7.28" +"@swc/core-linux-x64-musl@npm:1.7.26": + version: 1.7.26 + resolution: "@swc/core-linux-x64-musl@npm:1.7.26" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@swc/core-win32-arm64-msvc@npm:1.7.28": - version: 1.7.28 - resolution: "@swc/core-win32-arm64-msvc@npm:1.7.28" +"@swc/core-win32-arm64-msvc@npm:1.7.26": + version: 1.7.26 + resolution: "@swc/core-win32-arm64-msvc@npm:1.7.26" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@swc/core-win32-ia32-msvc@npm:1.7.28": - version: 1.7.28 - resolution: "@swc/core-win32-ia32-msvc@npm:1.7.28" +"@swc/core-win32-ia32-msvc@npm:1.7.26": + version: 1.7.26 + resolution: "@swc/core-win32-ia32-msvc@npm:1.7.26" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@swc/core-win32-x64-msvc@npm:1.7.28": - version: 1.7.28 - resolution: "@swc/core-win32-x64-msvc@npm:1.7.28" +"@swc/core-win32-x64-msvc@npm:1.7.26": + version: 1.7.26 + resolution: "@swc/core-win32-x64-msvc@npm:1.7.26" conditions: os=win32 & cpu=x64 languageName: node linkType: hard -"@swc/core@npm:1.7.28, @swc/core@npm:^1.7.28": - version: 1.7.28 - resolution: "@swc/core@npm:1.7.28" +"@swc/core@npm:1.7.26": + version: 1.7.26 + resolution: "@swc/core@npm:1.7.26" dependencies: - "@swc/core-darwin-arm64": "npm:1.7.28" - "@swc/core-darwin-x64": "npm:1.7.28" - "@swc/core-linux-arm-gnueabihf": "npm:1.7.28" - "@swc/core-linux-arm64-gnu": "npm:1.7.28" - "@swc/core-linux-arm64-musl": "npm:1.7.28" - "@swc/core-linux-x64-gnu": "npm:1.7.28" - "@swc/core-linux-x64-musl": "npm:1.7.28" - "@swc/core-win32-arm64-msvc": "npm:1.7.28" - "@swc/core-win32-ia32-msvc": "npm:1.7.28" - "@swc/core-win32-x64-msvc": "npm:1.7.28" + "@swc/core-darwin-arm64": "npm:1.7.26" + "@swc/core-darwin-x64": "npm:1.7.26" + "@swc/core-linux-arm-gnueabihf": "npm:1.7.26" + "@swc/core-linux-arm64-gnu": "npm:1.7.26" + "@swc/core-linux-arm64-musl": "npm:1.7.26" + "@swc/core-linux-x64-gnu": "npm:1.7.26" + "@swc/core-linux-x64-musl": "npm:1.7.26" + "@swc/core-win32-arm64-msvc": "npm:1.7.26" + "@swc/core-win32-ia32-msvc": "npm:1.7.26" + "@swc/core-win32-x64-msvc": "npm:1.7.26" "@swc/counter": "npm:^0.1.3" "@swc/types": "npm:^0.1.12" peerDependencies: @@ -2183,7 +2213,7 @@ __metadata: peerDependenciesMeta: "@swc/helpers": optional: true - checksum: 10/a477e79387ecc8b68c2bdbbdc88cc61f27a02c5d00f0d77134f9e2de166786a4ee9f7388d6ffd44fc01bfef5311a15cc3132052bab72fb43246dc42705fedb60 + checksum: 10/8fb43420bdd1b774dc054c6629f87f733e76860b97130609c7374f3a48406bc0ae1a2dd0b3e3c10317c692b2eaa64747f1a690b309727a8d1411112e2d2a884e languageName: node linkType: hard @@ -2263,7 +2293,7 @@ __metadata: version: 0.0.0-use.local resolution: "@tsed/cli-core@workspace:packages/cli-core" dependencies: - "@npmcli/run-script": "npm:8.1.0" + "@npmcli/run-script": "npm:9.0.0" "@tsed/logger": "npm:>=6.1.1" "@tsed/normalize-path": "npm:>=7.14.2" "@tsed/typescript": "workspace:*" @@ -2509,16 +2539,16 @@ __metadata: dependencies: "@commitlint/cli": "npm:19.5.0" "@commitlint/config-conventional": "npm:19.5.0" - "@swc/core": "npm:1.7.28" + "@swc/core": "npm:1.7.26" "@swc/helpers": "npm:0.5.13" "@tsed/core": "npm:>=7.14.2" "@tsed/di": "npm:>=7.14.2" "@tsed/logger": "npm:>=6.2.1" - "@tsed/markdown-it-symbols": "npm:3.20.4" + "@tsed/markdown-it-symbols": "npm:3.20.8" "@tsed/monorepo-utils": "npm:2.3.5" "@tsed/normalize-path": "npm:>=7.14.2" "@tsed/ts-doc": "npm:^4.1.0" - "@types/node": "npm:22.7.0" + "@types/node": "npm:22.7.4" "@typescript-eslint/eslint-plugin": "npm:8.7.0" "@typescript-eslint/parser": "npm:8.7.0" "@vitest/coverage-v8": "npm:^2.1.1" @@ -2553,7 +2583,7 @@ __metadata: read-pkg-up: "npm:^11.0.0" registry-url: "npm:^6.0.1" rxjs: "npm:^7.8.1" - semantic-release: "npm:24.1.1" + semantic-release: "npm:24.1.2" semantic-release-slack-bot: "npm:4.0.2" semver: "npm:7.6.3" split: "npm:^1.0.1" @@ -2584,7 +2614,7 @@ __metadata: resolution: "@tsed/cli@workspace:packages/cli" dependencies: "@swc-node/register": "npm:^1.10.9" - "@swc/core": "npm:^1.7.28" + "@swc/core": "npm:1.7.26" "@swc/helpers": "npm:^0.5.13" "@tsed/cli-core": "workspace:*" "@tsed/core": "npm:>=7.14.2" @@ -2658,10 +2688,10 @@ __metadata: languageName: node linkType: hard -"@tsed/markdown-it-symbols@npm:3.20.4": - version: 3.20.4 - resolution: "@tsed/markdown-it-symbols@npm:3.20.4" - checksum: 10/118385ea3ea34e595a188945f356abde6ba38fb3f22d4c6a9b12dc1315ccbb98743a8a970a07c51b8bcc2cb6b7d0cb1e564bc978cc2b30f33e079cac79a41e81 +"@tsed/markdown-it-symbols@npm:3.20.8": + version: 3.20.8 + resolution: "@tsed/markdown-it-symbols@npm:3.20.8" + checksum: 10/9813c8e7cb9d4903787736887f08908e7a77289f8d7f3fada5b0a7cdd65d73a464c325c6928c7a9352232aa425ca62b112e5adf32440367473672dfb847e84cf languageName: node linkType: hard @@ -2972,12 +3002,12 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:22.7.0": - version: 22.7.0 - resolution: "@types/node@npm:22.7.0" +"@types/node@npm:22.7.4": + version: 22.7.4 + resolution: "@types/node@npm:22.7.4" dependencies: undici-types: "npm:~6.19.2" - checksum: 10/6476d94a4c0fbf60df56634063e8aa26da1152e7096daf374f1eb010eab1c7ef4cdb75ab2508480e82c0b56538e0e7bdfc72af47e7a4e4ace37f2035eddfd3c2 + checksum: 10/19ddab80c4eba2253c855ed67c9bbc47417183049d01e59010a738bd80d47338bab79fd1f44ae51516bd63a1db4bf21ddb38b16bf6401a2e93252068ec52e88b languageName: node linkType: hard @@ -12953,6 +12983,13 @@ __metadata: languageName: node linkType: hard +"proc-log@npm:^5.0.0": + version: 5.0.0 + resolution: "proc-log@npm:5.0.0" + checksum: 10/35610bdb0177d3ab5d35f8827a429fb1dc2518d9e639f2151ac9007f01a061c30e0c635a970c9b00c39102216160f6ec54b62377c92fac3b7bfc2ad4b98d195c + languageName: node + linkType: hard + "process-nextick-args@npm:~2.0.0": version: 2.0.1 resolution: "process-nextick-args@npm:2.0.1" @@ -13773,13 +13810,13 @@ __metadata: languageName: node linkType: hard -"semantic-release@npm:24.1.1": - version: 24.1.1 - resolution: "semantic-release@npm:24.1.1" +"semantic-release@npm:24.1.2": + version: 24.1.2 + resolution: "semantic-release@npm:24.1.2" dependencies: "@semantic-release/commit-analyzer": "npm:^13.0.0-beta.1" "@semantic-release/error": "npm:^4.0.0" - "@semantic-release/github": "npm:^10.0.0" + "@semantic-release/github": "npm:^11.0.0" "@semantic-release/npm": "npm:^12.0.0" "@semantic-release/release-notes-generator": "npm:^14.0.0-beta.1" aggregate-error: "npm:^5.0.0" @@ -13808,7 +13845,7 @@ __metadata: yargs: "npm:^17.5.1" bin: semantic-release: bin/semantic-release.js - checksum: 10/194a560c152755b95c50eb786ff98949e04fba1222c5c9312b0e847bd0c0bade291fda99469d4a36f1e790bfbc597f2fd5e4b32b7b1c3c82c6ba54297bec56a2 + checksum: 10/f84964268a7b75bfec2c7915ebe3cda3ccff3fcb7f3ed15165dd05781e564517bdaba1716d176ddcb84b2a7415b2e6d6e7dd080e974fda38560b20f48adb632d languageName: node linkType: hard From baeffaea1970467307e3bdd75553f319553668ad Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Sun, 29 Sep 2024 09:56:10 +0200 Subject: [PATCH 58/69] fix(cli): bump Ts.ED dependencies --- packages/cli/package.json | 16 +++--- yarn.lock | 104 ++++++++++++++++++++++++++------------ 2 files changed, 80 insertions(+), 40 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index bd7ceaad6..21bdae318 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -67,11 +67,11 @@ "@swc/core": "1.7.26", "@swc/helpers": "^0.5.13", "@tsed/cli-core": "workspace:*", - "@tsed/core": ">=7.14.2", - "@tsed/di": ">=7.14.2", + "@tsed/core": ">=7.83.3", + "@tsed/di": ">=7.83.3", "@tsed/logger": ">=6.2.1", - "@tsed/openspec": ">=7.14.2", - "@tsed/schema": ">=7.14.2", + "@tsed/openspec": ">=7.83.3", + "@tsed/schema": ">=7.83.3", "chalk": "^5.3.0", "change-case": "^5.4.4", "esm-module-alias": "^2.2.1", @@ -89,10 +89,10 @@ }, "peerDependencies": { "@tsed/cli-core": "workspace:*", - "@tsed/core": ">=7.14.2", - "@tsed/di": ">=7.14.2", + "@tsed/core": ">=7.83.3", + "@tsed/di": ">=7.83.3", "@tsed/logger": ">=6.2.1", - "@tsed/openspec": ">=7.14.2", - "@tsed/schema": ">=7.14.2" + "@tsed/openspec": ">=7.83.3", + "@tsed/schema": ">=7.83.3" } } diff --git a/yarn.lock b/yarn.lock index 95a4f94ec..4a8790c84 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2617,11 +2617,11 @@ __metadata: "@swc/core": "npm:1.7.26" "@swc/helpers": "npm:^0.5.13" "@tsed/cli-core": "workspace:*" - "@tsed/core": "npm:>=7.14.2" - "@tsed/di": "npm:>=7.14.2" + "@tsed/core": "npm:>=7.83.3" + "@tsed/di": "npm:>=7.83.3" "@tsed/logger": "npm:>=6.2.1" - "@tsed/openspec": "npm:>=7.14.2" - "@tsed/schema": "npm:>=7.14.2" + "@tsed/openspec": "npm:>=7.83.3" + "@tsed/schema": "npm:>=7.83.3" "@tsed/typescript": "workspace:*" "@types/change-case": "npm:^2.3.1" chalk: "npm:^5.3.0" @@ -2636,11 +2636,11 @@ __metadata: vitest: "npm:2.1.1" peerDependencies: "@tsed/cli-core": "workspace:*" - "@tsed/core": ">=7.14.2" - "@tsed/di": ">=7.14.2" + "@tsed/core": ">=7.83.3" + "@tsed/di": ">=7.83.3" "@tsed/logger": ">=6.2.1" - "@tsed/openspec": ">=7.14.2" - "@tsed/schema": ">=7.14.2" + "@tsed/openspec": ">=7.83.3" + "@tsed/schema": ">=7.83.3" bin: tsed: lib/esm/bin/tsed.js languageName: unknown @@ -2656,6 +2656,16 @@ __metadata: languageName: node linkType: hard +"@tsed/core@npm:>=7.83.3": + version: 7.83.3 + resolution: "@tsed/core@npm:7.83.3" + dependencies: + reflect-metadata: "npm:^0.2.1" + tslib: "npm:2.6.1" + checksum: 10/523764b7139ca3c5ace071a818e54e0d61bb8639169b50fdf1ce63d5327d172ce9291342c9d8717d356cbbdce87b0aeefa78b7cd222cc7e0828146875cade148 + languageName: node + linkType: hard + "@tsed/di@npm:>=7.14.2": version: 7.31.0 resolution: "@tsed/di@npm:7.31.0" @@ -2676,6 +2686,26 @@ __metadata: languageName: node linkType: hard +"@tsed/di@npm:>=7.83.3": + version: 7.83.3 + resolution: "@tsed/di@npm:7.83.3" + dependencies: + tslib: "npm:2.6.2" + peerDependencies: + "@tsed/core": 7.83.3 + "@tsed/logger": ">=6.7.5" + "@tsed/schema": 7.83.3 + peerDependenciesMeta: + "@tsed/core": + optional: false + "@tsed/logger": + optional: false + "@tsed/schema": + optional: false + checksum: 10/3b4d4b3b7fd47916d60e7caf937e0628f2857328eedc86edef1436136117e52f1b0a997e7d565af13e1b7eb216de8c36621fc16ea0978ce939382c74f0008957 + languageName: node + linkType: hard + "@tsed/logger@npm:>=6.1.1, @tsed/logger@npm:>=6.2.1": version: 6.6.2 resolution: "@tsed/logger@npm:6.6.2" @@ -2738,33 +2768,33 @@ __metadata: languageName: node linkType: hard -"@tsed/openspec@npm:7.31.0, @tsed/openspec@npm:>=7.14.2": - version: 7.31.0 - resolution: "@tsed/openspec@npm:7.31.0" - checksum: 10/0171c67e3f767b1ff18a192cbee01ecedf158cae08bb6414dd263bb9fa5d1da67d008fe08133d1fb844ed6b7ae91effa115554f2cad5380fe46e1794986527ad +"@tsed/openspec@npm:7.83.3, @tsed/openspec@npm:>=7.83.3": + version: 7.83.3 + resolution: "@tsed/openspec@npm:7.83.3" + checksum: 10/ec18cfe948fab4d7da7d007fa87a81875309a9fd56d70eedfaee0ab9163b3314276d22c1610b11ddf66eb4c0fa03fe2e19f1c7cd9d9c7587f9feb8e2f97bc8a5 languageName: node linkType: hard -"@tsed/schema@npm:>=7.14.2": - version: 7.31.0 - resolution: "@tsed/schema@npm:7.31.0" +"@tsed/schema@npm:>=7.83.3": + version: 7.83.3 + resolution: "@tsed/schema@npm:7.83.3" dependencies: - "@tsed/openspec": "npm:7.31.0" + "@tsed/openspec": "npm:7.83.3" change-case: "npm:^4.1.2" - fs-extra: "npm:^10.0.1" + fs-extra: "npm:^11.2.0" json-schema: "npm:0.4.0" picomatch: "npm:2.3.1" statuses: "npm:>=2.0.1" - tslib: "npm:2.5.0" + tslib: "npm:2.6.1" peerDependencies: - "@tsed/core": ^7.31.0 - "@tsed/openspec": ^7.31.0 + "@tsed/core": 7.83.3 + "@tsed/openspec": 7.83.3 peerDependenciesMeta: "@tsed/core": optional: false "@tsed/openspec": optional: false - checksum: 10/d6ab89d19d3797a93e7c14f2ac4bdcce88e10720a53abfdbfc0ce8d4d5299d343fd44758825b02724e84cc879e4bb018c27944e6609c61821dd50192471b98fe + checksum: 10/ea5176dac80a2df19d274ed83da7c60ff24c78631d441398f6ae926a72ff6820640062adcf976bc9b6e885a7ed157eb89f7cb5ded5852a149902b2af75d5903d languageName: node linkType: hard @@ -7343,17 +7373,6 @@ __metadata: languageName: node linkType: hard -"fs-extra@npm:^10.0.1": - version: 10.1.0 - resolution: "fs-extra@npm:10.1.0" - dependencies: - graceful-fs: "npm:^4.2.0" - jsonfile: "npm:^6.0.1" - universalify: "npm:^2.0.0" - checksum: 10/05ce2c3b59049bcb7b52001acd000e44b3c4af4ec1f8839f383ef41ec0048e3cfa7fd8a637b1bddfefad319145db89be91f4b7c1db2908205d38bf91e7d1d3b7 - languageName: node - linkType: hard - "fs-minipass@npm:^2.0.0": version: 2.1.0 resolution: "fs-minipass@npm:2.1.0" @@ -13347,6 +13366,13 @@ __metadata: languageName: node linkType: hard +"reflect-metadata@npm:^0.2.1": + version: 0.2.2 + resolution: "reflect-metadata@npm:0.2.2" + checksum: 10/1c93f9ac790fea1c852fde80c91b2760420069f4862f28e6fae0c00c6937a56508716b0ed2419ab02869dd488d123c4ab92d062ae84e8739ea7417fae10c4745 + languageName: node + linkType: hard + "reftools@npm:^1.1.9": version: 1.1.9 resolution: "reftools@npm:1.1.9" @@ -15321,6 +15347,20 @@ __metadata: languageName: node linkType: hard +"tslib@npm:2.6.1": + version: 2.6.1 + resolution: "tslib@npm:2.6.1" + checksum: 10/5cf1aa7ea4ca7ee9b8aa3d80eb7ee86634b307fbefcb948a831c2b13728e21e156ef7fb9edcbe21f05c08f65e4cf4480587086f31133491ba1a49c9e0b28fc75 + languageName: node + linkType: hard + +"tslib@npm:2.6.2": + version: 2.6.2 + resolution: "tslib@npm:2.6.2" + checksum: 10/bd26c22d36736513980091a1e356378e8b662ded04204453d353a7f34a4c21ed0afc59b5f90719d4ba756e581a162ecbf93118dc9c6be5acf70aa309188166ca + languageName: node + linkType: hard + "tslib@npm:2.7.0, tslib@npm:^2.6.2, tslib@npm:^2.6.3, tslib@npm:^2.7.0": version: 2.7.0 resolution: "tslib@npm:2.7.0" From 71f77dcc51e8b16ef7ff6a95f749efd8ebd2c2b2 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Sun, 29 Sep 2024 10:23:01 +0200 Subject: [PATCH 59/69] fix(cli): bump inquirer to v9 --- package.json | 12 +-- packages/cli-core/package.json | 5 +- yarn.lock | 157 +++++++++++++++++---------------- 3 files changed, 89 insertions(+), 85 deletions(-) diff --git a/package.json b/package.json index 7fff36bd9..9d5208954 100644 --- a/package.json +++ b/package.json @@ -44,10 +44,12 @@ }, "homepage": "https://github.com/tsedio/tsed-cli", "dependencies": { - "@tsed/core": ">=7.14.2", - "@tsed/di": ">=7.14.2", + "@tsed/core": ">=7.83.3", + "@tsed/di": ">=7.83.3", "@tsed/logger": ">=6.2.1", - "@tsed/normalize-path": ">=7.14.2", + "@tsed/normalize-path": ">=7.83.3", + "@tsed/openspec": ">=7.83.3", + "@tsed/schema": ">=7.83.3", "axios": "^1.7.7", "chalk": "^5.3.0", "commander": "^12.1.0", @@ -57,8 +59,8 @@ "fs-extra": "^11.2.0", "handlebars": "^4.7.8", "handlebars-helpers": "^0.10.0", - "inquirer": "^8.2.6", - "inquirer-autocomplete-prompt": "^2.0.1", + "inquirer": "^9.3.7", + "inquirer-autocomplete-prompt": "^3.0.1", "js-yaml": "^4.1.0", "lerna": "^8.1.8", "listr2": "^8.2.4", diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index f42258751..3d373668f 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -50,8 +50,8 @@ "globby": "^14.0.2", "handlebars": "^4.7.8", "handlebars-utils": "^1.0.6", - "inquirer": "^8.2.6", - "inquirer-autocomplete-prompt": "^2.0.1", + "inquirer": "^9.3.7", + "inquirer-autocomplete-prompt": "^3.0.1", "js-yaml": "^4.1.0", "listr2": "^8.2.4", "read-pkg-up": "^11.0.0", @@ -71,7 +71,6 @@ "@types/consolidate": "0.14.4", "@types/figures": "3.0.1", "@types/globby": "9.1.0", - "@types/inquirer": "9.0.7", "@types/js-yaml": "4.0.9", "@types/semver": "7.5.8", "@types/tunnel": "0.0.7", diff --git a/yarn.lock b/yarn.lock index 4a8790c84..a125e4067 100644 --- a/yarn.lock +++ b/yarn.lock @@ -613,6 +613,13 @@ __metadata: languageName: node linkType: hard +"@inquirer/figures@npm:^1.0.3": + version: 1.0.6 + resolution: "@inquirer/figures@npm:1.0.6" + checksum: 10/1b9023d331c41f09d0848b8920885d535cdaf52edd782009e003b2f3b2df6a6a6a26fb8ecd05eb3c3df3df9d080e042ca525438a1513cdcc4410f3eefce3e4e0 + languageName: node + linkType: hard + "@isaacs/cliui@npm:^8.0.2": version: 8.0.2 resolution: "@isaacs/cliui@npm:8.0.2" @@ -2302,7 +2309,7 @@ __metadata: "@types/figures": "npm:3.0.1" "@types/fs-extra": "npm:^11.0.4" "@types/globby": "npm:9.1.0" - "@types/inquirer": "npm:9.0.7" + "@types/inquirer": "npm:^9.0.7" "@types/js-yaml": "npm:4.0.9" "@types/semver": "npm:7.5.8" "@types/tunnel": "npm:0.0.7" @@ -2325,8 +2332,8 @@ __metadata: globby: "npm:^14.0.2" handlebars: "npm:^4.7.8" handlebars-utils: "npm:^1.0.6" - inquirer: "npm:^8.2.6" - inquirer-autocomplete-prompt: "npm:^2.0.1" + inquirer: "npm:^9.3.7" + inquirer-autocomplete-prompt: "npm:^3.0.1" js-yaml: "npm:^4.1.0" listr2: "npm:^8.2.4" read-pkg-up: "npm:^11.0.0" @@ -2541,12 +2548,14 @@ __metadata: "@commitlint/config-conventional": "npm:19.5.0" "@swc/core": "npm:1.7.26" "@swc/helpers": "npm:0.5.13" - "@tsed/core": "npm:>=7.14.2" - "@tsed/di": "npm:>=7.14.2" + "@tsed/core": "npm:>=7.83.3" + "@tsed/di": "npm:>=7.83.3" "@tsed/logger": "npm:>=6.2.1" "@tsed/markdown-it-symbols": "npm:3.20.8" "@tsed/monorepo-utils": "npm:2.3.5" - "@tsed/normalize-path": "npm:>=7.14.2" + "@tsed/normalize-path": "npm:>=7.83.3" + "@tsed/openspec": "npm:>=7.83.3" + "@tsed/schema": "npm:>=7.83.3" "@tsed/ts-doc": "npm:^4.1.0" "@types/node": "npm:22.7.4" "@typescript-eslint/eslint-plugin": "npm:8.7.0" @@ -2571,8 +2580,8 @@ __metadata: handlebars: "npm:^4.7.8" handlebars-helpers: "npm:^0.10.0" husky: "npm:9.1.6" - inquirer: "npm:^8.2.6" - inquirer-autocomplete-prompt: "npm:^2.0.1" + inquirer: "npm:^9.3.7" + inquirer-autocomplete-prompt: "npm:^3.0.1" is-ci: "npm:3.0.1" js-yaml: "npm:^4.1.0" lerna: "npm:^8.1.8" @@ -2646,16 +2655,6 @@ __metadata: languageName: unknown linkType: soft -"@tsed/core@npm:>=7.14.2": - version: 7.31.0 - resolution: "@tsed/core@npm:7.31.0" - dependencies: - reflect-metadata: "npm:^0.1.13" - tslib: "npm:2.5.0" - checksum: 10/8a25fd598a17d4cbf4757016440e0671765b1e11bf6002c98db12e35d2bb76845a94fa31b520a3ea2c37088372997b5a02be4364d162dc15729d9d374e93e90e - languageName: node - linkType: hard - "@tsed/core@npm:>=7.83.3": version: 7.83.3 resolution: "@tsed/core@npm:7.83.3" @@ -2666,26 +2665,6 @@ __metadata: languageName: node linkType: hard -"@tsed/di@npm:>=7.14.2": - version: 7.31.0 - resolution: "@tsed/di@npm:7.31.0" - dependencies: - tslib: "npm:2.5.0" - peerDependencies: - "@tsed/core": ^7.31.0 - "@tsed/logger": ">=6.2.2" - "@tsed/schema": ^7.31.0 - peerDependenciesMeta: - "@tsed/core": - optional: false - "@tsed/logger": - optional: false - "@tsed/schema": - optional: false - checksum: 10/72f53a0a8ed41198a11e339ce0e3821a1672d93e636873bc64b4b0a5737522ee5c686c776290e1e29706973633f80d6e2c5afb01ca97dfcfe3b786a25efcb144 - languageName: node - linkType: hard - "@tsed/di@npm:>=7.83.3": version: 7.83.3 resolution: "@tsed/di@npm:7.83.3" @@ -2768,6 +2747,16 @@ __metadata: languageName: node linkType: hard +"@tsed/normalize-path@npm:>=7.83.3": + version: 7.83.3 + resolution: "@tsed/normalize-path@npm:7.83.3" + dependencies: + normalize-path: "npm:3.0.0" + tslib: "npm:2.6.1" + checksum: 10/887db10f0444b98b6d0e8227353c388643ddb3c614a23e8bc8ac825f6bf0288aa3bd343b86930f08f84bcb6740b22b141390aef27d324dd98fc37c63b63164d0 + languageName: node + linkType: hard + "@tsed/openspec@npm:7.83.3, @tsed/openspec@npm:>=7.83.3": version: 7.83.3 resolution: "@tsed/openspec@npm:7.83.3" @@ -2960,7 +2949,7 @@ __metadata: languageName: node linkType: hard -"@types/inquirer@npm:9.0.7": +"@types/inquirer@npm:^9.0.7": version: 9.0.7 resolution: "@types/inquirer@npm:9.0.7" dependencies: @@ -3079,11 +3068,11 @@ __metadata: linkType: hard "@types/through@npm:*": - version: 0.0.30 - resolution: "@types/through@npm:0.0.30" + version: 0.0.33 + resolution: "@types/through@npm:0.0.33" dependencies: "@types/node": "npm:*" - checksum: 10/9578470db0b527c26e246a1220ae9bffc6bf47f20f89c54aac467c083ab1f7e16c00d9a7b4bb6cb4e2dfae465027270827e5908a6236063f6214625e50585d78 + checksum: 10/fd0b73f873a64ed5366d1d757c42e5dbbb2201002667c8958eda7ca02fff09d73de91360572db465ee00240c32d50c6039ea736d8eca374300f9664f93e8da39 languageName: node linkType: hard @@ -3765,6 +3754,13 @@ __metadata: languageName: node linkType: hard +"ansi-escapes@npm:^6.0.0": + version: 6.2.1 + resolution: "ansi-escapes@npm:6.2.1" + checksum: 10/3b064937dc8a0645ed8094bc8b09483ee718f3aa3139746280e6c2ea80e28c0a3ce66973d0f33e88e60021abbf67e5f877deabfc810e75edf8a19dfa128850be + languageName: node + linkType: hard + "ansi-escapes@npm:^6.2.0": version: 6.2.0 resolution: "ansi-escapes@npm:6.2.0" @@ -7101,6 +7097,16 @@ __metadata: languageName: node linkType: hard +"figures@npm:^5.0.0": + version: 5.0.0 + resolution: "figures@npm:5.0.0" + dependencies: + escape-string-regexp: "npm:^5.0.0" + is-unicode-supported: "npm:^1.2.0" + checksum: 10/951d18be2f450c90462c484eff9bda705293319bc2f17b250194a0cf1a291600db4cb283a6ce199d49380c95b08d85d822ce4b18d2f9242663fd5895476d667c + languageName: node + linkType: hard + "figures@npm:^6.1.0": version: 6.1.0 resolution: "figures@npm:6.1.0" @@ -8664,18 +8670,18 @@ __metadata: languageName: node linkType: hard -"inquirer-autocomplete-prompt@npm:^2.0.1": - version: 2.0.1 - resolution: "inquirer-autocomplete-prompt@npm:2.0.1" +"inquirer-autocomplete-prompt@npm:^3.0.1": + version: 3.0.1 + resolution: "inquirer-autocomplete-prompt@npm:3.0.1" dependencies: - ansi-escapes: "npm:^4.3.2" - figures: "npm:^3.2.0" + ansi-escapes: "npm:^6.0.0" + figures: "npm:^5.0.0" picocolors: "npm:^1.0.0" run-async: "npm:^2.4.1" - rxjs: "npm:^7.5.4" + rxjs: "npm:^7.5.6" peerDependencies: - inquirer: ^8.0.0 - checksum: 10/1c17ca6181f700edc465d6b4e34e0cfaa9b6b99d8f704750e372cb57ea3d5346adee71f96f204c8bf9db87735d9b7750eb7ce6794e26a485c8a87623233dbf8d + inquirer: ^9.1.0 + checksum: 10/758eb9a4487ffcd02fb6ea95a2751fa7aeac0d6a45f06ada07b2733406a693eb1f545f5d14dd2d688ddb84492ac5bb3a6cc70024cfbd8081e6660351c5a8c78e languageName: node linkType: hard @@ -8746,26 +8752,23 @@ __metadata: languageName: node linkType: hard -"inquirer@npm:^8.2.6": - version: 8.2.6 - resolution: "inquirer@npm:8.2.6" +"inquirer@npm:^9.3.7": + version: 9.3.7 + resolution: "inquirer@npm:9.3.7" dependencies: - ansi-escapes: "npm:^4.2.1" - chalk: "npm:^4.1.1" - cli-cursor: "npm:^3.1.0" - cli-width: "npm:^3.0.0" - external-editor: "npm:^3.0.3" - figures: "npm:^3.0.0" - lodash: "npm:^4.17.21" - mute-stream: "npm:0.0.8" + "@inquirer/figures": "npm:^1.0.3" + ansi-escapes: "npm:^4.3.2" + cli-width: "npm:^4.1.0" + external-editor: "npm:^3.1.0" + mute-stream: "npm:1.0.0" ora: "npm:^5.4.1" - run-async: "npm:^2.4.0" - rxjs: "npm:^7.5.5" - string-width: "npm:^4.1.0" - strip-ansi: "npm:^6.0.0" - through: "npm:^2.3.6" - wrap-ansi: "npm:^6.0.1" - checksum: 10/f642b9e5a94faaba54f277bdda2af0e0a6b592bd7f88c60e1614b5795b19336c7025e0c2923915d5f494f600a02fe8517413779a794415bb79a9563b061d68ab + run-async: "npm:^3.0.0" + rxjs: "npm:^7.8.1" + string-width: "npm:^4.2.3" + strip-ansi: "npm:^6.0.1" + wrap-ansi: "npm:^6.2.0" + yoctocolors-cjs: "npm:^2.1.2" + checksum: 10/92d0a0f55701e05a8dd3624eab0c03c6e96de18285cefdbef4edc5c1a77c8283361700e088db275ec5d5b36c45ff9428127125d78428e07ea4c5574f55b17176 languageName: node linkType: hard @@ -13359,13 +13362,6 @@ __metadata: languageName: node linkType: hard -"reflect-metadata@npm:^0.1.13": - version: 0.1.13 - resolution: "reflect-metadata@npm:0.1.13" - checksum: 10/732570da35d2d96f8fdd5aac60fb263aa92f6512eaded5962b052bd9e90f22a9dec5aaf0d7ff4bfe97646c9530e8444e8435c2d80b24d0bdf938b5d47f6f5b83 - languageName: node - linkType: hard - "reflect-metadata@npm:^0.2.1": version: 0.2.2 resolution: "reflect-metadata@npm:0.2.2" @@ -13758,7 +13754,7 @@ __metadata: languageName: node linkType: hard -"rxjs@npm:>=7.8.1, rxjs@npm:^7.2.0, rxjs@npm:^7.5.4, rxjs@npm:^7.8.1": +"rxjs@npm:>=7.8.1, rxjs@npm:^7.2.0, rxjs@npm:^7.5.6, rxjs@npm:^7.8.1": version: 7.8.1 resolution: "rxjs@npm:7.8.1" dependencies: @@ -16276,7 +16272,7 @@ __metadata: languageName: node linkType: hard -"wrap-ansi@npm:^6.0.1, wrap-ansi@npm:^6.2.0": +"wrap-ansi@npm:^6.2.0": version: 6.2.0 resolution: "wrap-ansi@npm:6.2.0" dependencies: @@ -16514,6 +16510,13 @@ __metadata: languageName: node linkType: hard +"yoctocolors-cjs@npm:^2.1.2": + version: 2.1.2 + resolution: "yoctocolors-cjs@npm:2.1.2" + checksum: 10/d731e3ba776a0ee19021d909787942933a6c2eafb2bbe85541f0c59aa5c7d475ce86fcb860d5803105e32244c3dd5ba875b87c4c6bf2d6f297da416aa54e556f + languageName: node + linkType: hard + "yoctocolors@npm:^2.0.0": version: 2.1.1 resolution: "yoctocolors@npm:2.1.1" From fed8427b4f1134931ba60425e7cc05fe059187a1 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sun, 29 Sep 2024 08:42:25 +0000 Subject: [PATCH 60/69] Github CI build: __run_2 v6.0.0-beta.1 [ci skip] --- lerna.json | 4 ++-- package.json | 2 +- packages/barrels/package.json | 2 +- packages/cli-core/package.json | 2 +- packages/cli-generate-http-client/package.json | 2 +- packages/cli-generate-swagger/package.json | 2 +- packages/cli-plugin-eslint/package.json | 2 +- packages/cli-plugin-jest/package.json | 2 +- packages/cli-plugin-mongoose/package.json | 2 +- packages/cli-plugin-oidc-provider/package.json | 2 +- packages/cli-plugin-passport/package.json | 2 +- packages/cli-plugin-prisma/package.json | 2 +- packages/cli-plugin-typegraphql/package.json | 2 +- packages/cli-plugin-typeorm/package.json | 2 +- packages/cli-plugin-vitest/package.json | 2 +- packages/cli-testing/package.json | 2 +- packages/cli/package.json | 2 +- tools/typescript/package.json | 2 +- tools/vitest/package.json | 2 +- 19 files changed, 20 insertions(+), 20 deletions(-) diff --git a/lerna.json b/lerna.json index ab05b2e18..2243b8474 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "packages": [ "packages/*" ], - "version": "6.0.0-alpha.10" -} + "version": "6.0.0-beta.1" +} \ No newline at end of file diff --git a/package.json b/package.json index 9d5208954..b7496d295 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@tsed/cli-root", - "version": "6.0.0-alpha.10", + "version": "6.0.0-beta.1", "description": "CLI to bootstrap your Ts.ED project", "private": true, "type": "module", diff --git a/packages/barrels/package.json b/packages/barrels/package.json index 25ffdd527..034f67a9b 100644 --- a/packages/barrels/package.json +++ b/packages/barrels/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/barrels", "description": "A simple tool to generate barrels for your TypeScript project", - "version": "6.0.0-alpha.10", + "version": "6.0.0-beta.1", "type": "module", "bin": "bin/barrels.js", "keywords": [ diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index 3d373668f..6916513e8 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-core", "description": "Build your CLI with TypeScript and Decorators", - "version": "6.0.0-alpha.10", + "version": "6.0.0-beta.1", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-generate-http-client/package.json b/packages/cli-generate-http-client/package.json index e3d7d5cd1..2194b6314 100644 --- a/packages/cli-generate-http-client/package.json +++ b/packages/cli-generate-http-client/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-generate-http-client", "description": "Ts.ED CLI plugin. Export a command that generate an HTTP Client (axios or fetch) from your Ts.ED controllers and OS3 spec.", - "version": "6.0.0-alpha.10", + "version": "6.0.0-beta.1", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-generate-swagger/package.json b/packages/cli-generate-swagger/package.json index 66a376748..61e3a8653 100644 --- a/packages/cli-generate-swagger/package.json +++ b/packages/cli-generate-swagger/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-generate-swagger", "description": "Ts.ED CLI plugin. Export a command that generate the swagger.json from your Ts.ED controllers and OS3 spec.", - "version": "6.0.0-alpha.10", + "version": "6.0.0-beta.1", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-eslint/package.json b/packages/cli-plugin-eslint/package.json index 6d49b9f5e..9c9f23f17 100644 --- a/packages/cli-plugin-eslint/package.json +++ b/packages/cli-plugin-eslint/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-eslint", "description": "Ts.ED CLI plugin. Add EsLint support", - "version": "6.0.0-alpha.10", + "version": "6.0.0-beta.1", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-jest/package.json b/packages/cli-plugin-jest/package.json index be4c52aed..8fc223298 100644 --- a/packages/cli-plugin-jest/package.json +++ b/packages/cli-plugin-jest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-jest", "description": "Ts.ED CLI plugin. Add Jest support", - "version": "6.0.0-alpha.10", + "version": "6.0.0-beta.1", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-mongoose/package.json b/packages/cli-plugin-mongoose/package.json index e41be8437..3a8b0a4da 100644 --- a/packages/cli-plugin-mongoose/package.json +++ b/packages/cli-plugin-mongoose/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-mongoose", "description": "Ts.ED CLI plugin. Add Mongoose support", - "version": "6.0.0-alpha.10", + "version": "6.0.0-beta.1", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-oidc-provider/package.json b/packages/cli-plugin-oidc-provider/package.json index f0d9270e2..711faeab9 100644 --- a/packages/cli-plugin-oidc-provider/package.json +++ b/packages/cli-plugin-oidc-provider/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-oidc-provider", "description": "Ts.ED CLI plugin. Add OIDC Provider", - "version": "6.0.0-alpha.10", + "version": "6.0.0-beta.1", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-passport/package.json b/packages/cli-plugin-passport/package.json index 0cf55ff7b..740b89fff 100644 --- a/packages/cli-plugin-passport/package.json +++ b/packages/cli-plugin-passport/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-passport", "description": "Ts.ED CLI plugin. Add Passport.js support", - "version": "6.0.0-alpha.10", + "version": "6.0.0-beta.1", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-prisma/package.json b/packages/cli-plugin-prisma/package.json index fa525b3ed..3508da579 100644 --- a/packages/cli-plugin-prisma/package.json +++ b/packages/cli-plugin-prisma/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-prisma", "description": "Ts.ED CLI plugin. Add Prisma project initialisation support.", - "version": "6.0.0-alpha.10", + "version": "6.0.0-beta.1", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-typegraphql/package.json b/packages/cli-plugin-typegraphql/package.json index b9872310c..1da411250 100644 --- a/packages/cli-plugin-typegraphql/package.json +++ b/packages/cli-plugin-typegraphql/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-typegraphql", "description": "Ts.ED CLI plugin. Add TypeGraphql support.", - "version": "6.0.0-alpha.10", + "version": "6.0.0-beta.1", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-typeorm/package.json b/packages/cli-plugin-typeorm/package.json index b7f03ead2..4a4ef3e48 100644 --- a/packages/cli-plugin-typeorm/package.json +++ b/packages/cli-plugin-typeorm/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-typeorm", "description": "Ts.ED CLI plugin. Add TypeORM support", - "version": "6.0.0-alpha.10", + "version": "6.0.0-beta.1", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-vitest/package.json b/packages/cli-plugin-vitest/package.json index 1ab78f9ec..29530da6d 100644 --- a/packages/cli-plugin-vitest/package.json +++ b/packages/cli-plugin-vitest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-vitest", "description": "Ts.ED CLI plugin. Add Jest support", - "version": "6.0.0-alpha.10", + "version": "6.0.0-beta.1", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-testing/package.json b/packages/cli-testing/package.json index 1900d8d2c..01c571fbc 100644 --- a/packages/cli-testing/package.json +++ b/packages/cli-testing/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-testing", "description": "Utils to test you CLI based on Ts.ED CLI", - "version": "6.0.0-alpha.10", + "version": "6.0.0-beta.1", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli/package.json b/packages/cli/package.json index 21bdae318..0813dd8d4 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli", "description": "CLI to bootstrap your Ts.ED project", - "version": "6.0.0-alpha.10", + "version": "6.0.0-beta.1", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/tools/typescript/package.json b/tools/typescript/package.json index bcaf6f56a..9d3c4e46c 100644 --- a/tools/typescript/package.json +++ b/tools/typescript/package.json @@ -1,6 +1,6 @@ { "name": "@tsed/typescript", - "version": "6.0.0-alpha.10", + "version": "6.0.0-beta.1", "description": "Util to compile source", "type": "module", "private": true, diff --git a/tools/vitest/package.json b/tools/vitest/package.json index 1e66e8d1f..0ce804d5c 100644 --- a/tools/vitest/package.json +++ b/tools/vitest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/vitest", "type": "module", - "version": "6.0.0-alpha.10", + "version": "6.0.0-beta.1", "private": true, "exports": { ".": "./index.js", From 425722fa21b0c8b91d71618608cb5e37f356bf97 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Sun, 6 Oct 2024 22:00:29 +0200 Subject: [PATCH 61/69] fix(cli): update tsed dependencies to v8 beta 1 --- package.json | 10 +- packages/cli-core/package.json | 4 +- .../cli-core/src/services/Renderer.spec.ts | 99 +++++----- packages/cli/package.json | 16 +- .../cli/src/commands/update/UpdateCmd.spec.ts | 18 +- packages/cli/src/constants/index.ts | 4 +- packages/cli/src/pipes/ClassNamePipe.spec.ts | 55 ++++-- .../cli/src/pipes/OutputFilePathPipe.spec.ts | 176 +++++++++--------- packages/cli/src/pipes/OutputFilePathPipe.ts | 7 +- yarn.lock | 111 +++++------ 10 files changed, 249 insertions(+), 251 deletions(-) diff --git a/package.json b/package.json index b7496d295..346f0d6ad 100644 --- a/package.json +++ b/package.json @@ -44,12 +44,12 @@ }, "homepage": "https://github.com/tsedio/tsed-cli", "dependencies": { - "@tsed/core": ">=7.83.3", - "@tsed/di": ">=7.83.3", + "@tsed/core": ">=8.0.0-beta.1", + "@tsed/di": ">=8.0.0-beta.1", "@tsed/logger": ">=6.2.1", - "@tsed/normalize-path": ">=7.83.3", - "@tsed/openspec": ">=7.83.3", - "@tsed/schema": ">=7.83.3", + "@tsed/normalize-path": ">=8.0.0-beta.1", + "@tsed/openspec": ">=8.0.0-beta.1", + "@tsed/schema": ">=8.0.0-beta.1", "axios": "^1.7.7", "chalk": "^5.3.0", "commander": "^12.1.0", diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index 6916513e8..168a4a72d 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -83,7 +83,7 @@ "vitest": "2.1.1" }, "peerDependencies": { - "@tsed/core": ">=7.14.2", - "@tsed/di": ">=7.14.2" + "@tsed/core": ">=8.0.0-beta.1", + "@tsed/di": ">=8.0.0-beta.1" } } diff --git a/packages/cli-core/src/services/Renderer.spec.ts b/packages/cli-core/src/services/Renderer.spec.ts index 5327bcb57..5fb161403 100644 --- a/packages/cli-core/src/services/Renderer.spec.ts +++ b/packages/cli-core/src/services/Renderer.spec.ts @@ -2,11 +2,13 @@ import {join} from "node:path"; // @ts-ignore import {FakeCliFs, normalizePath} from "@tsed/cli-testing"; +import {DITest} from "@tsed/di"; import Consolidate from "consolidate"; import {globby} from "globby"; import handlebars from "handlebars"; import {getTemplateDirectory} from "../utils/index.js"; +import {CliFs} from "./CliFs.js"; import {RootRendererService, SrcRendererService} from "./Renderer.js"; const TEMPLATE_DIR = getTemplateDirectory(join(import.meta.url, "../../../cli-plugin-jest/src/utils")); @@ -16,9 +18,21 @@ vi.mock("globby"); vi.mock("handlebars"); describe("Renderer", () => { + beforeEach(() => { + vi.mocked(globby as any).mockResolvedValue(["_partials/one.hbs", "_partials/two.hbs"]); + + return DITest.create({ + imports: [ + { + token: CliFs, + useClass: FakeCliFs + } + ] + }); + }); afterEach(() => { FakeCliFs.entries.clear(); - vi.mocked(globby as any).mockResolvedValue(["_partials/one.hbs", "_partials/two.hbs"]); + return DITest.reset(); }); describe("relativeFrom()", () => { @@ -26,12 +40,10 @@ describe("Renderer", () => { const service = new SrcRendererService(); // @ts-ignore - service.configuration = { - project: { - rootDir: "/home", - srcDir: "/src" - } - }; + service.configuration.set("project", { + rootDir: "/home", + srcDir: "/src" + }); expect(service.relativeFrom("/controller/users.spec.ts")).toEqual(".."); expect(normalizePath(service.relativeFrom("/controller/users/users.spec.ts"))).toEqual("../.."); @@ -49,20 +61,16 @@ describe("Renderer", () => { }; // @ts-ignore - service.configuration = { - project: { - rootDir: "/home", - srcDir: "/src" - } - }; + service.configuration.set("project", { + rootDir: "/home", + srcDir: "/src" + }); service.templateDir = "/tmpl"; // @ts-ignore Consolidate.handlebars.mockReturnValue("content"); - service.fs = new FakeCliFs() as any; - await service.render(path, data, options); expect(Consolidate.handlebars).toHaveBeenCalledWith("/tmpl/init/myfile.ts.hbs", {}); @@ -78,20 +86,16 @@ describe("Renderer", () => { }; // @ts-ignore - service.configuration = { - project: { - rootDir: "/home", - srcDir: "/src" - } - }; + service.configuration.set("project", { + rootDir: "/home", + srcDir: "/src" + }); service.templateDir = "/tmpl"; // @ts-ignore Consolidate.handlebars.mockReturnValue("content"); - service.fs = new FakeCliFs() as any; - await service.render(path, data, options); expect(Consolidate.handlebars).toHaveBeenCalledWith(normalizePath(`${TEMPLATE_DIR}/init/vi.config.js.hbs`), {}); @@ -106,20 +110,16 @@ describe("Renderer", () => { }; // @ts-ignore - service.configuration = { - project: { - rootDir: "/home", - srcDir: "/src" - } - }; + service.configuration.set("project", { + rootDir: "/home", + srcDir: "/src" + }); service.templateDir = "/tmpl"; // @ts-ignore Consolidate.handlebars.mockReturnValue("content"); - service.fs = new FakeCliFs() as any; - await service.render(path, data, options); expect(Consolidate.handlebars).toHaveBeenCalledWith(normalizePath(`${TEMPLATE_DIR}/init/vi.config.js.hbs`), {}); @@ -134,20 +134,16 @@ describe("Renderer", () => { }; // @ts-ignore - service.configuration = { - project: { - rootDir: "/home", - srcDir: "/src" - } - }; + service.configuration.set("project", { + rootDir: "/home", + srcDir: "/src" + }); service.templateDir = "/tmpl"; // @ts-ignore Consolidate.handlebars.mockReturnValue("content"); - service.fs = new FakeCliFs() as any; - await service.render(path, data, options); expect(Consolidate.handlebars).toHaveBeenCalledWith("/tmpl/init/config/myfile.ts.hbs", {}); @@ -163,20 +159,16 @@ describe("Renderer", () => { }; // @ts-ignore - service.configuration = { - project: { - rootDir: "/home", - srcDir: "/src" - } - }; + service.configuration.set("project", { + rootDir: "/home", + srcDir: "/src" + }); service.templateDir = "/tmpl"; // @ts-ignore Consolidate.handlebars.mockReturnValue("content"); - service.fs = new FakeCliFs() as any; - await service.render(path, data, options); expect(Consolidate.handlebars).toHaveBeenCalledWith("/tmpl/init/controllers/myfile.ts.hbs", {}); @@ -200,20 +192,16 @@ describe("Renderer", () => { }; // @ts-ignore - service.configuration = { - project: { - rootDir: "/home", - srcDir: "/src" - } - }; + service.configuration.set("project", { + rootDir: "/home", + srcDir: "/src" + }); service.templateDir = "/tmpl"; // @ts-ignore Consolidate.handlebars.mockReturnValue("content"); - service.fs = new FakeCliFs() as any; - await service.render(props.path, data, options); expect(Consolidate.handlebars).toHaveBeenCalledWith("/tmpl/init/src/controllers/pages/IndexController.ts.hbs", {}); @@ -223,7 +211,6 @@ describe("Renderer", () => { describe("loadPartials()", () => { it("should load partials", async () => { const rootRendererService = new RootRendererService(); - rootRendererService.fs = new FakeCliFs() as any; rootRendererService.fs.writeFile("/templateDir/_partials/one.hbs", "content"); rootRendererService.fs.writeFile("/templateDir/_partials/two.hbs", "content"); diff --git a/packages/cli/package.json b/packages/cli/package.json index 0813dd8d4..f964a6a7b 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -67,11 +67,11 @@ "@swc/core": "1.7.26", "@swc/helpers": "^0.5.13", "@tsed/cli-core": "workspace:*", - "@tsed/core": ">=7.83.3", - "@tsed/di": ">=7.83.3", + "@tsed/core": ">=8.0.0-beta.1", + "@tsed/di": ">=8.0.0-beta.1", "@tsed/logger": ">=6.2.1", - "@tsed/openspec": ">=7.83.3", - "@tsed/schema": ">=7.83.3", + "@tsed/openspec": ">=8.0.0-beta.1", + "@tsed/schema": ">=8.0.0-beta.1", "chalk": "^5.3.0", "change-case": "^5.4.4", "esm-module-alias": "^2.2.1", @@ -89,10 +89,10 @@ }, "peerDependencies": { "@tsed/cli-core": "workspace:*", - "@tsed/core": ">=7.83.3", - "@tsed/di": ">=7.83.3", + "@tsed/core": ">=8.0.0-beta.1", + "@tsed/di": ">=8.0.0-beta.1", "@tsed/logger": ">=6.2.1", - "@tsed/openspec": ">=7.83.3", - "@tsed/schema": ">=7.83.3" + "@tsed/openspec": ">=8.0.0-beta.1", + "@tsed/schema": ">=8.0.0-beta.1" } } diff --git a/packages/cli/src/commands/update/UpdateCmd.spec.ts b/packages/cli/src/commands/update/UpdateCmd.spec.ts index ba9aef0ea..79b090516 100644 --- a/packages/cli/src/commands/update/UpdateCmd.spec.ts +++ b/packages/cli/src/commands/update/UpdateCmd.spec.ts @@ -5,20 +5,20 @@ import {CliPlatformTest} from "@tsed/cli-testing"; import {UpdateCmd} from "./UpdateCmd.js"; const versions = { - "7.0.0-alpha.4": { + "8.0.0-alpha.4": { version: "6.0.0-alpha.4", dependencies: { "@tsed/logger": "^5.5.0" }, devDependencies: {} }, - "7.0.0-alpha.3": { + "8.0.0-alpha.3": { version: "5.56.0" }, - "7.0.0-alpha.2": { + "8.0.0-alpha.2": { version: "5.57.0" }, - "7.0.0-alpha.1": { + "8.0.0-alpha.1": { version: "5.55.0" } }; @@ -58,7 +58,7 @@ describe("UpdateCmd", () => { expect(result).toEqual([ { - choices: ["7.0.0-alpha.4", "7.0.0-alpha.3", "7.0.0-alpha.2", "7.0.0-alpha.1"], + choices: ["8.0.0-alpha.4", "8.0.0-alpha.3", "8.0.0-alpha.2", "8.0.0-alpha.1"], default: undefined, message: "Select a Ts.ED version", name: "version", @@ -134,15 +134,15 @@ describe("UpdateCmd", () => { command.versions = versions; await command.$exec({ - version: "7.0.0-alpha.4", + version: "8.0.0-alpha.4", verbose: false, rawArgs: [] }); expect(command.projectPackage.dependencies).toEqual({ - "@tsed/common": "7.0.0-alpha.4", - "@tsed/core": "7.0.0-alpha.4", - "@tsed/di": "7.0.0-alpha.4", + "@tsed/common": "8.0.0-alpha.4", + "@tsed/core": "8.0.0-alpha.4", + "@tsed/di": "8.0.0-alpha.4", "@tsed/logger": "^5.5.0" }); expect(command.projectPackage.devDependencies).toEqual({ diff --git a/packages/cli/src/constants/index.ts b/packages/cli/src/constants/index.ts index 2bf3a35cb..14fcc5dc8 100644 --- a/packages/cli/src/constants/index.ts +++ b/packages/cli/src/constants/index.ts @@ -6,8 +6,8 @@ const {path, packageJson} = readPackageUpSync({ })!; export const PKG = packageJson; -export const MINIMAL_TSED_VERSION = "7"; -export const DEFAULT_TSED_TAGS = "latest"; +export const MINIMAL_TSED_VERSION = "8"; +export const DEFAULT_TSED_TAGS = "beta"; export const IGNORE_VERSIONS = ["6.0.0"]; export const IGNORE_TAGS: false | RegExp = false; // /alpha|beta/ export const TEMPLATE_DIR = join(dirname(path), "templates"); diff --git a/packages/cli/src/pipes/ClassNamePipe.spec.ts b/packages/cli/src/pipes/ClassNamePipe.spec.ts index d172f6d2e..f61183f34 100644 --- a/packages/cli/src/pipes/ClassNamePipe.spec.ts +++ b/packages/cli/src/pipes/ClassNamePipe.spec.ts @@ -1,14 +1,21 @@ +import {ProjectPackageJson} from "@tsed/cli-core"; +import {DITest} from "@tsed/di"; + import {ProjectConvention} from "../interfaces/index.js"; -import {ProvidersInfoService} from "../services/ProvidersInfoService.js"; import {ClassNamePipe} from "./ClassNamePipe.js"; describe("ClassNamePipe", () => { - it("should return the className", () => { - const pipe = new ClassNamePipe(); - pipe.providers = new ProvidersInfoService(); - pipe.projectPackageJson = { - preferences: {} - } as any; + beforeEach(() => DITest.create()); + afterEach(() => DITest.reset()); + it("should return the className", async () => { + const pipe = await DITest.invoke(ClassNamePipe, [ + { + token: ProjectPackageJson, + use: { + preferences: {} + } + } + ]); pipe.providers.add({ name: "Controller", @@ -34,15 +41,37 @@ describe("ClassNamePipe", () => { }); expect(pipe.transform({type: "controller", name: "test"})).toEqual("TestController"); - expect(pipe.transform({type: "controller", name: "test", format: ProjectConvention.ANGULAR})).toEqual("test.controller"); - expect(pipe.transform({type: "controller", name: "HelloWorld", format: ProjectConvention.ANGULAR})).toEqual("hello-world.controller"); + expect( + pipe.transform({ + type: "controller", + name: "test", + format: ProjectConvention.ANGULAR + }) + ).toEqual("test.controller"); + expect( + pipe.transform({ + type: "controller", + name: "HelloWorld", + format: ProjectConvention.ANGULAR + }) + ).toEqual("hello-world.controller"); expect(pipe.transform({type: "server", name: "Server"})).toEqual("Server"); expect(pipe.transform({type: "server", name: "Server", format: ProjectConvention.ANGULAR})).toEqual("server"); expect(pipe.transform({type: "factory", name: "Connection"})).toEqual("Connection"); - expect(pipe.transform({type: "factory", name: "Connection", format: ProjectConvention.ANGULAR})).toEqual("connection.factory"); + expect( + pipe.transform({ + type: "factory", + name: "Connection", + format: ProjectConvention.ANGULAR + }) + ).toEqual("connection.factory"); expect(pipe.transform({type: "typeorm:datasource", name: "MySQLDatasource"})).toEqual("MySqlDatasource"); - expect(pipe.transform({type: "typeorm:datasource", name: "MySQLDatasource", format: ProjectConvention.ANGULAR})).toEqual( - "my-sql.datasource" - ); + expect( + pipe.transform({ + type: "typeorm:datasource", + name: "MySQLDatasource", + format: ProjectConvention.ANGULAR + }) + ).toEqual("my-sql.datasource"); }); }); diff --git a/packages/cli/src/pipes/OutputFilePathPipe.spec.ts b/packages/cli/src/pipes/OutputFilePathPipe.spec.ts index cb795b4f9..636f2c910 100644 --- a/packages/cli/src/pipes/OutputFilePathPipe.spec.ts +++ b/packages/cli/src/pipes/OutputFilePathPipe.spec.ts @@ -1,30 +1,61 @@ // @ts-ignore -import {normalizePath} from "@tsed/cli-testing"; +import {ProjectPackageJson} from "@tsed/cli-core"; +import {DITest} from "@tsed/di"; +import {normalizePath} from "@tsed/normalize-path"; import {ProvidersInfoService} from "../services/ProvidersInfoService.js"; import {ArchitectureConvention} from "./../interfaces/ArchitectureConvention.js"; import {ClassNamePipe} from "./ClassNamePipe.js"; import {OutputFilePathPipe} from "./OutputFilePathPipe.js"; +async function getPipeFixture(opts: any = {}) { + const providers = await DITest.invoke(ProvidersInfoService, []); + providers.add(opts.provider); + + const classPipe = await DITest.invoke(ClassNamePipe, [ + { + token: ProvidersInfoService, + use: providers + } + ]); + + const pipe = await DITest.invoke(OutputFilePathPipe, [ + { + token: ProvidersInfoService, + use: providers + }, + { + token: ClassNamePipe, + use: classPipe + }, + { + token: ProjectPackageJson, + use: { + preferences: opts.preferences || {} + } + } + ]); + + return { + pipe, + providers, + classPipe + }; +} + describe("OutputFilePathPipe", () => { + beforeEach(() => DITest.create()); + afterEach(() => DITest.reset()); describe("Ts.ED architecture", () => { - it("should return the output file", () => { - const providers = new ProvidersInfoService(); - providers.add({ - name: "Controller", - value: "controller", - model: "{{symbolName}}.controller" + it("should return the output file", async () => { + const {pipe} = await getPipeFixture({ + provider: { + name: "Controller", + value: "controller", + model: "{{symbolName}}.controller" + } }); - const classPipe = new ClassNamePipe(); - classPipe.providers = providers; - - const pipe = new OutputFilePathPipe(classPipe); - pipe.providers = providers; - pipe.projectPackageJson = { - preferences: {} - } as any; - expect(normalizePath(pipe.transform({type: "controller", name: "test"}))).toEqual("controllers/TestController"); expect( normalizePath( @@ -37,23 +68,15 @@ describe("OutputFilePathPipe", () => { ).toEqual("other/TestController"); expect(normalizePath(pipe.transform({type: "server", name: "server"}))).toEqual("Server"); }); - it("should return the output file (controller with subDir)", () => { - const providers = new ProvidersInfoService(); - providers.add({ - name: "Controller", - value: "controller", - model: "{{symbolName}}.controller" + it("should return the output file (controller with subDir)", async () => { + const {pipe} = await getPipeFixture({ + provider: { + name: "Controller", + value: "controller", + model: "{{symbolName}}.controller" + } }); - const classPipe = new ClassNamePipe(); - classPipe.providers = providers; - - const pipe = new OutputFilePathPipe(classPipe); - pipe.providers = providers; - pipe.projectPackageJson = { - preferences: {} - } as any; - expect( normalizePath( pipe.transform({ @@ -64,23 +87,15 @@ describe("OutputFilePathPipe", () => { ) ).toEqual("controllers/rest/TestController"); }); - it("should return the output file (datasource)", () => { - const providers = new ProvidersInfoService(); - providers.add({ - name: "TypeORM Datasource", - value: "typeorm:datasource", - model: "{{symbolName}}.datasource" + it("should return the output file (datasource)", async () => { + const {pipe} = await getPipeFixture({ + provider: { + name: "TypeORM Datasource", + value: "typeorm:datasource", + model: "{{symbolName}}.datasource" + } }); - const classPipe = new ClassNamePipe(); - classPipe.providers = providers; - - const pipe = new OutputFilePathPipe(classPipe); - pipe.providers = providers; - pipe.projectPackageJson = { - preferences: {} - } as any; - expect( normalizePath( pipe.transform({ @@ -92,24 +107,17 @@ describe("OutputFilePathPipe", () => { }); }); describe("Angular architecture", () => { - it("should return the output file", () => { - const providers = new ProvidersInfoService(); - providers.add({ - name: "Controller", - value: "controller", - model: "{{symbolName}}.controller" - }); - - const classPipe = new ClassNamePipe(); - classPipe.providers = providers; - - const pipe = new OutputFilePathPipe(classPipe); - pipe.providers = providers; - pipe.projectPackageJson = { + it("should return the output file", async () => { + const {pipe} = await getPipeFixture({ + provider: { + name: "Controller", + value: "controller", + model: "{{symbolName}}.controller" + }, preferences: { architecture: ArchitectureConvention.FEATURE } - } as any; + }); expect(normalizePath(pipe.transform({type: "controller", name: "test"}))).toEqual("TestController"); expect( @@ -123,24 +131,17 @@ describe("OutputFilePathPipe", () => { ).toEqual("TestController"); expect(normalizePath(pipe.transform({type: "server", name: "server"}))).toEqual("Server"); }); - it("should return the output file (controller with subDir)", () => { - const providers = new ProvidersInfoService(); - providers.add({ - name: "Controller", - value: "controller", - model: "{{symbolName}}.controller" - }); - - const classPipe = new ClassNamePipe(); - classPipe.providers = providers; - - const pipe = new OutputFilePathPipe(classPipe); - pipe.providers = providers; - pipe.projectPackageJson = { + it("should return the output file (controller with subDir)", async () => { + const {pipe} = await getPipeFixture({ + provider: { + name: "Controller", + value: "controller", + model: "{{symbolName}}.controller" + }, preferences: { architecture: ArchitectureConvention.FEATURE } - } as any; + }); expect( normalizePath( @@ -152,24 +153,17 @@ describe("OutputFilePathPipe", () => { ) ).toEqual("rest/TestController"); }); - it("should return the output file (datasource)", () => { - const providers = new ProvidersInfoService(); - providers.add({ - name: "TypeORM Datasource", - value: "typeorm:datasource", - model: "{{symbolName}}.datasource" - }); - - const classPipe = new ClassNamePipe(); - classPipe.providers = providers; - - const pipe = new OutputFilePathPipe(classPipe); - pipe.providers = providers; - pipe.projectPackageJson = { + it("should return the output file (datasource)", async () => { + const {pipe} = await getPipeFixture({ + provider: { + name: "TypeORM Datasource", + value: "typeorm:datasource", + model: "{{symbolName}}.datasource" + }, preferences: { architecture: ArchitectureConvention.FEATURE } - } as any; + }); expect( normalizePath( diff --git a/packages/cli/src/pipes/OutputFilePathPipe.ts b/packages/cli/src/pipes/OutputFilePathPipe.ts index 5259e5836..b84774383 100644 --- a/packages/cli/src/pipes/OutputFilePathPipe.ts +++ b/packages/cli/src/pipes/OutputFilePathPipe.ts @@ -9,12 +9,13 @@ import {ClassNamePipe} from "./ClassNamePipe.js"; @Injectable() export class OutputFilePathPipe { @Inject() - providers: ProvidersInfoService; + protected providers: ProvidersInfoService; @Inject() - projectPackageJson: ProjectPackageJson; + protected projectPackageJson: ProjectPackageJson; - constructor(private classNamePipe: ClassNamePipe) {} + @Inject() + protected classNamePipe: ClassNamePipe; transform(options: {name: string; type: string; subDir?: string; baseDir?: string; format?: ProjectConvention}) { options.format = options.format || this.projectPackageJson.preferences.convention || ProjectConvention.DEFAULT; diff --git a/yarn.lock b/yarn.lock index a125e4067..71c15f25e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2548,14 +2548,14 @@ __metadata: "@commitlint/config-conventional": "npm:19.5.0" "@swc/core": "npm:1.7.26" "@swc/helpers": "npm:0.5.13" - "@tsed/core": "npm:>=7.83.3" - "@tsed/di": "npm:>=7.83.3" + "@tsed/core": "npm:>=8.0.0-beta.1" + "@tsed/di": "npm:>=8.0.0-beta.1" "@tsed/logger": "npm:>=6.2.1" "@tsed/markdown-it-symbols": "npm:3.20.8" "@tsed/monorepo-utils": "npm:2.3.5" - "@tsed/normalize-path": "npm:>=7.83.3" - "@tsed/openspec": "npm:>=7.83.3" - "@tsed/schema": "npm:>=7.83.3" + "@tsed/normalize-path": "npm:>=8.0.0-beta.1" + "@tsed/openspec": "npm:>=8.0.0-beta.1" + "@tsed/schema": "npm:>=8.0.0-beta.1" "@tsed/ts-doc": "npm:^4.1.0" "@types/node": "npm:22.7.4" "@typescript-eslint/eslint-plugin": "npm:8.7.0" @@ -2626,11 +2626,11 @@ __metadata: "@swc/core": "npm:1.7.26" "@swc/helpers": "npm:^0.5.13" "@tsed/cli-core": "workspace:*" - "@tsed/core": "npm:>=7.83.3" - "@tsed/di": "npm:>=7.83.3" + "@tsed/core": "npm:>=8.0.0-beta.1" + "@tsed/di": "npm:>=8.0.0-beta.1" "@tsed/logger": "npm:>=6.2.1" - "@tsed/openspec": "npm:>=7.83.3" - "@tsed/schema": "npm:>=7.83.3" + "@tsed/openspec": "npm:>=8.0.0-beta.1" + "@tsed/schema": "npm:>=8.0.0-beta.1" "@tsed/typescript": "workspace:*" "@types/change-case": "npm:^2.3.1" chalk: "npm:^5.3.0" @@ -2645,35 +2645,36 @@ __metadata: vitest: "npm:2.1.1" peerDependencies: "@tsed/cli-core": "workspace:*" - "@tsed/core": ">=7.83.3" - "@tsed/di": ">=7.83.3" + "@tsed/core": ">=8.0.0-beta.1" + "@tsed/di": ">=8.0.0-beta.1" "@tsed/logger": ">=6.2.1" - "@tsed/openspec": ">=7.83.3" - "@tsed/schema": ">=7.83.3" + "@tsed/openspec": ">=8.0.0-beta.1" + "@tsed/schema": ">=8.0.0-beta.1" bin: tsed: lib/esm/bin/tsed.js languageName: unknown linkType: soft -"@tsed/core@npm:>=7.83.3": - version: 7.83.3 - resolution: "@tsed/core@npm:7.83.3" +"@tsed/core@npm:>=8.0.0-beta.1": + version: 8.0.0-beta.1 + resolution: "@tsed/core@npm:8.0.0-beta.1" dependencies: - reflect-metadata: "npm:^0.2.1" - tslib: "npm:2.6.1" - checksum: 10/523764b7139ca3c5ace071a818e54e0d61bb8639169b50fdf1ce63d5327d172ce9291342c9d8717d356cbbdce87b0aeefa78b7cd222cc7e0828146875cade148 + reflect-metadata: "npm:^0.2.2" + tslib: "npm:2.7.0" + checksum: 10/f77ad64acd6ead4906da0fa14a83f0f0c0e17c44e09b75582b6b6d036b9b5bea9a4ff18adacf4814ec80d4e9ef4595395fba27fd777f51d6337ab86508753d5c languageName: node linkType: hard -"@tsed/di@npm:>=7.83.3": - version: 7.83.3 - resolution: "@tsed/di@npm:7.83.3" +"@tsed/di@npm:>=8.0.0-beta.1": + version: 8.0.0-beta.1 + resolution: "@tsed/di@npm:8.0.0-beta.1" dependencies: - tslib: "npm:2.6.2" + tslib: "npm:2.7.0" + uuid: "npm:^10.0.0" peerDependencies: - "@tsed/core": 7.83.3 + "@tsed/core": 8.0.0-beta.1 "@tsed/logger": ">=6.7.5" - "@tsed/schema": 7.83.3 + "@tsed/schema": 8.0.0-beta.1 peerDependenciesMeta: "@tsed/core": optional: false @@ -2681,7 +2682,7 @@ __metadata: optional: false "@tsed/schema": optional: false - checksum: 10/3b4d4b3b7fd47916d60e7caf937e0628f2857328eedc86edef1436136117e52f1b0a997e7d565af13e1b7eb216de8c36621fc16ea0978ce939382c74f0008957 + checksum: 10/11cc540dd19c57a3ef37ec4dd06af5ea28f76325e75f4ef58fec055efbc879f9d0cbee72decd7085cb61d852c1e25bfe52aa7fd6a6c5ff94bd127f56085ee096 languageName: node linkType: hard @@ -2747,43 +2748,43 @@ __metadata: languageName: node linkType: hard -"@tsed/normalize-path@npm:>=7.83.3": - version: 7.83.3 - resolution: "@tsed/normalize-path@npm:7.83.3" +"@tsed/normalize-path@npm:>=8.0.0-beta.1": + version: 8.0.0-beta.1 + resolution: "@tsed/normalize-path@npm:8.0.0-beta.1" dependencies: normalize-path: "npm:3.0.0" - tslib: "npm:2.6.1" - checksum: 10/887db10f0444b98b6d0e8227353c388643ddb3c614a23e8bc8ac825f6bf0288aa3bd343b86930f08f84bcb6740b22b141390aef27d324dd98fc37c63b63164d0 + tslib: "npm:2.7.0" + checksum: 10/db461cbcdbb1421e68c204d2a2baf3b47202be21f743c085c9def501afceb2be3ad0973bd8f73f735f6c01c31eba9a88acf993f386cfe7270dd2ff85d9221c3c languageName: node linkType: hard -"@tsed/openspec@npm:7.83.3, @tsed/openspec@npm:>=7.83.3": - version: 7.83.3 - resolution: "@tsed/openspec@npm:7.83.3" - checksum: 10/ec18cfe948fab4d7da7d007fa87a81875309a9fd56d70eedfaee0ab9163b3314276d22c1610b11ddf66eb4c0fa03fe2e19f1c7cd9d9c7587f9feb8e2f97bc8a5 +"@tsed/openspec@npm:8.0.0-beta.1, @tsed/openspec@npm:>=8.0.0-beta.1": + version: 8.0.0-beta.1 + resolution: "@tsed/openspec@npm:8.0.0-beta.1" + checksum: 10/174ee3ed3db4d1179f9bdbc0603efd59791ff6cc25934f5a06e6417196ad7d3a173f508541d0e10c4848db421414e81cbf65a8ac19dbdfbe26269a605b499137 languageName: node linkType: hard -"@tsed/schema@npm:>=7.83.3": - version: 7.83.3 - resolution: "@tsed/schema@npm:7.83.3" +"@tsed/schema@npm:>=8.0.0-beta.1": + version: 8.0.0-beta.1 + resolution: "@tsed/schema@npm:8.0.0-beta.1" dependencies: - "@tsed/openspec": "npm:7.83.3" - change-case: "npm:^4.1.2" + "@tsed/openspec": "npm:8.0.0-beta.1" + change-case: "npm:^5.4.4" fs-extra: "npm:^11.2.0" json-schema: "npm:0.4.0" picomatch: "npm:2.3.1" - statuses: "npm:>=2.0.1" - tslib: "npm:2.6.1" + statuses: "npm:^2.0.1" + tslib: "npm:2.7.0" peerDependencies: - "@tsed/core": 7.83.3 - "@tsed/openspec": 7.83.3 + "@tsed/core": 8.0.0-beta.1 + "@tsed/openspec": 8.0.0-beta.1 peerDependenciesMeta: "@tsed/core": optional: false "@tsed/openspec": optional: false - checksum: 10/ea5176dac80a2df19d274ed83da7c60ff24c78631d441398f6ae926a72ff6820640062adcf976bc9b6e885a7ed157eb89f7cb5ded5852a149902b2af75d5903d + checksum: 10/77ddc49d60d65036b928558ee66bc4ac6847f957382859292629dd134d4892d4b12854290a5f509f09ed33ddd44067fa9340aa01db3c3b12b4a18dc6cae5eacb languageName: node linkType: hard @@ -4716,7 +4717,7 @@ __metadata: languageName: node linkType: hard -"change-case@npm:*, change-case@npm:^4.1.2": +"change-case@npm:*": version: 4.1.2 resolution: "change-case@npm:4.1.2" dependencies: @@ -13362,7 +13363,7 @@ __metadata: languageName: node linkType: hard -"reflect-metadata@npm:^0.2.1": +"reflect-metadata@npm:^0.2.2": version: 0.2.2 resolution: "reflect-metadata@npm:0.2.2" checksum: 10/1c93f9ac790fea1c852fde80c91b2760420069f4862f28e6fae0c00c6937a56508716b0ed2419ab02869dd488d123c4ab92d062ae84e8739ea7417fae10c4745 @@ -14517,7 +14518,7 @@ __metadata: languageName: node linkType: hard -"statuses@npm:>=2.0.1": +"statuses@npm:^2.0.1": version: 2.0.1 resolution: "statuses@npm:2.0.1" checksum: 10/18c7623fdb8f646fb213ca4051be4df7efb3484d4ab662937ca6fbef7ced9b9e12842709872eb3020cc3504b93bde88935c9f6417489627a7786f24f8031cbcb @@ -15343,20 +15344,6 @@ __metadata: languageName: node linkType: hard -"tslib@npm:2.6.1": - version: 2.6.1 - resolution: "tslib@npm:2.6.1" - checksum: 10/5cf1aa7ea4ca7ee9b8aa3d80eb7ee86634b307fbefcb948a831c2b13728e21e156ef7fb9edcbe21f05c08f65e4cf4480587086f31133491ba1a49c9e0b28fc75 - languageName: node - linkType: hard - -"tslib@npm:2.6.2": - version: 2.6.2 - resolution: "tslib@npm:2.6.2" - checksum: 10/bd26c22d36736513980091a1e356378e8b662ded04204453d353a7f34a4c21ed0afc59b5f90719d4ba756e581a162ecbf93118dc9c6be5acf70aa309188166ca - languageName: node - linkType: hard - "tslib@npm:2.7.0, tslib@npm:^2.6.2, tslib@npm:^2.6.3, tslib@npm:^2.7.0": version: 2.7.0 resolution: "tslib@npm:2.7.0" From fff12035a40533439a161778fbe8b94f162ad402 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Sun, 6 Oct 2024 22:20:02 +0200 Subject: [PATCH 62/69] feat(cli): add @tsed/platform-log-request module import on server.hbs --- .../cli-core/src/services/CliPackageJson.ts | 2 +- packages/cli-core/src/services/CliService.ts | 2 +- .../cli-core/src/utils/getCommandMetadata.ts | 5 ++-- packages/cli-core/src/utils/loadPlugins.ts | 2 +- packages/cli-core/tsconfig.spec.json | 23 ++++----------- .../init.integration.spec.ts.snap | 2 ++ .../init.integration.spec.ts.snap | 1 + .../init.integration.spec.ts.snap | 1 + .../src/commands/generate/GenerateCmd.spec.ts | 8 ++++++ packages/cli/src/commands/init/InitCmd.ts | 2 +- .../__snapshots__/fillImport.spec.ts.snap | 28 +++++++++++++++++++ packages/cli/src/utils/fillImports.ts | 1 + ...generate.async-factory.integration.spec.ts | 1 + .../generate.controller.integration.spec.ts | 2 +- ...nerate.decorator-class.integration.spec.ts | 1 + ...ate.decorator-endpoint.integration.spec.ts | 3 +- ...rate.decorator-generic.integration.spec.ts | 1 + ...erate.decorator-method.integration.spec.ts | 1 + ...e.decorator-middleware.integration.spec.ts | 1 + ...erate.exception-filter.integration.spec.ts | 1 + ...nerate.response-filter.integration.spec.ts | 2 +- .../init.integration.spec.ts.snap | 9 ++++++ .../init/init.integration.spec.ts | 15 +++++----- packages/cli/tsconfig.spec.json | 23 ++++----------- 24 files changed, 86 insertions(+), 51 deletions(-) diff --git a/packages/cli-core/src/services/CliPackageJson.ts b/packages/cli-core/src/services/CliPackageJson.ts index fb272e0f4..a1e389e3f 100644 --- a/packages/cli-core/src/services/CliPackageJson.ts +++ b/packages/cli-core/src/services/CliPackageJson.ts @@ -4,7 +4,7 @@ import {type PackageJson} from "../interfaces/PackageJson.js"; export type CliPackageJson = PackageJson; -export function CliPackageJson() { +export function CliPackageJson(): any { return Inject(CliPackageJson); } diff --git a/packages/cli-core/src/services/CliService.ts b/packages/cli-core/src/services/CliService.ts index 5a67b8d55..d97a08c5a 100644 --- a/packages/cli-core/src/services/CliService.ts +++ b/packages/cli-core/src/services/CliService.ts @@ -235,7 +235,7 @@ export class CliService { cmd = cmd.description(description); cmd = this.buildArguments(cmd, args); - cmd = cmd.action(onAction); + cmd = cmd.action(onAction as never); if (options) { cmd = this.buildOption(cmd, options, !!allowUnknownOption); diff --git a/packages/cli-core/src/utils/getCommandMetadata.ts b/packages/cli-core/src/utils/getCommandMetadata.ts index c3a66f0a0..972a4b3e6 100644 --- a/packages/cli-core/src/utils/getCommandMetadata.ts +++ b/packages/cli-core/src/utils/getCommandMetadata.ts @@ -1,10 +1,11 @@ -import {Store, Type} from "@tsed/core"; +import {Store} from "@tsed/core"; +import type {TokenProvider} from "@tsed/di"; import {CommandStoreKeys} from "../domains/CommandStoreKeys.js"; import type {CommandMetadata} from "../interfaces/CommandMetadata.js"; import type {CommandParameters} from "../interfaces/CommandParameters.js"; -export function getCommandMetadata(token: Type): CommandMetadata { +export function getCommandMetadata(token: TokenProvider): CommandMetadata { const { name, alias, diff --git a/packages/cli-core/src/utils/loadPlugins.ts b/packages/cli-core/src/utils/loadPlugins.ts index 012378caa..fa607280c 100644 --- a/packages/cli-core/src/utils/loadPlugins.ts +++ b/packages/cli-core/src/utils/loadPlugins.ts @@ -25,7 +25,7 @@ export async function loadPlugins(injector: InjectorService) { if (provider?.imports.length) { await all( - provider.imports.map(async (token) => { + provider.imports.map(async (token: any) => { injector.add(token, GlobalProviders.get(token)?.clone()); if (injector.settings.get("loaded")) { diff --git a/packages/cli-core/tsconfig.spec.json b/packages/cli-core/tsconfig.spec.json index 0f06288a8..27191d294 100644 --- a/packages/cli-core/tsconfig.spec.json +++ b/packages/cli-core/tsconfig.spec.json @@ -6,22 +6,11 @@ "declaration": false, "composite": false, "noEmit": true, - "paths": {}, - "types": [ - "vite/client", - "vitest/globals" - ] + "paths": { + "@tsed/cli-testing": ["../packages/cli-testing/src/index.ts"] + }, + "types": ["vite/client", "vitest/globals"] }, - "include": [ - "src/**/*.spec.ts", - "test/**/*.spec.ts", - "vitest.config.mts" - ], - "exclude": [ - "node_modules", - "test", - "lib", - "benchmark", - "coverage" - ] + "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], + "exclude": ["node_modules", "lib", "benchmark", "coverage"] } diff --git a/packages/cli-plugin-oidc-provider/test/init/__snapshots__/init.integration.spec.ts.snap b/packages/cli-plugin-oidc-provider/test/init/__snapshots__/init.integration.spec.ts.snap index b1a084080..5a2243fc9 100644 --- a/packages/cli-plugin-oidc-provider/test/init/__snapshots__/init.integration.spec.ts.snap +++ b/packages/cli-plugin-oidc-provider/test/init/__snapshots__/init.integration.spec.ts.snap @@ -64,6 +64,7 @@ exports[`Init OIDC Provider project > should generate a project with oidc 2`] = "import {join} from "path"; import {Configuration, Inject} from "@tsed/di"; import {PlatformApplication} from "@tsed/common"; +import "@tsed/platform-log-request"; // remove this import if you don't want log request import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; import "@tsed/oidc-provider"; @@ -179,6 +180,7 @@ exports[`Init OIDC Provider project > should generate a project with oidc and sw "import {join} from "path"; import {Configuration, Inject} from "@tsed/di"; import {PlatformApplication} from "@tsed/common"; +import "@tsed/platform-log-request"; // remove this import if you don't want log request import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; import "@tsed/swagger"; diff --git a/packages/cli-plugin-typegraphql/test/init/__snapshots__/init.integration.spec.ts.snap b/packages/cli-plugin-typegraphql/test/init/__snapshots__/init.integration.spec.ts.snap index 69ea17cd6..2a5c4d7ae 100644 --- a/packages/cli-plugin-typegraphql/test/init/__snapshots__/init.integration.spec.ts.snap +++ b/packages/cli-plugin-typegraphql/test/init/__snapshots__/init.integration.spec.ts.snap @@ -4,6 +4,7 @@ exports[`Init TypeGraphQL project > should generate a project with typegraphql 2 "import {join} from "path"; import {Configuration, Inject} from "@tsed/di"; import {PlatformApplication} from "@tsed/common"; +import "@tsed/platform-log-request"; // remove this import if you don't want log request import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; import "@tsed/typegraphql"; diff --git a/packages/cli-plugin-typeorm/test/integrations/init/__snapshots__/init.integration.spec.ts.snap b/packages/cli-plugin-typeorm/test/integrations/init/__snapshots__/init.integration.spec.ts.snap index 1b1b81e2e..69a170b88 100644 --- a/packages/cli-plugin-typeorm/test/integrations/init/__snapshots__/init.integration.spec.ts.snap +++ b/packages/cli-plugin-typeorm/test/integrations/init/__snapshots__/init.integration.spec.ts.snap @@ -4,6 +4,7 @@ exports[`TypeORM: Init cmd > should generate a project with the right options 2` "import {join} from "path"; import {Configuration, Inject} from "@tsed/di"; import {PlatformApplication} from "@tsed/common"; +import "@tsed/platform-log-request"; // remove this import if you don't want log request import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; import {config} from "./config/index.js"; diff --git a/packages/cli/src/commands/generate/GenerateCmd.spec.ts b/packages/cli/src/commands/generate/GenerateCmd.spec.ts index 65f79236d..d918f54d2 100644 --- a/packages/cli/src/commands/generate/GenerateCmd.spec.ts +++ b/packages/cli/src/commands/generate/GenerateCmd.spec.ts @@ -117,6 +117,10 @@ describe("GenerateCmd", () => { platformSymbol: undefined, barrels: '["./src/controllers/rest"]', imports: [ + { + from: "@tsed/platform-log-request", + comment: " // remove this import if you don't want log request" + }, {from: "@tsed/ajv"}, {symbols: "{config}", from: "./config/index.js"}, {symbols: "* as rest", from: "./controllers/rest/index.js"} @@ -171,6 +175,10 @@ describe("GenerateCmd", () => { platformSymbol: undefined, barrels: '["./src/controllers/rest"]', imports: [ + { + from: "@tsed/platform-log-request", + comment: " // remove this import if you don't want log request" + }, {from: "@tsed/ajv"}, {symbols: "{config}", from: "./config/index.js"}, {symbols: "* as rest", from: "./controllers/rest/index.js"} diff --git a/packages/cli/src/commands/init/InitCmd.ts b/packages/cli/src/commands/init/InitCmd.ts index 88bb00d83..2ea0a73b8 100644 --- a/packages/cli/src/commands/init/InitCmd.ts +++ b/packages/cli/src/commands/init/InitCmd.ts @@ -381,7 +381,7 @@ export class InitCmd implements CommandProvider { "@tsed/openspec": ctx.tsedVersion, "@tsed/platform-cache": ctx.tsedVersion, "@tsed/platform-exceptions": ctx.tsedVersion, - "@tsed/platform-log-middleware": ctx.tsedVersion, + "@tsed/platform-log-request": ctx.tsedVersion, "@tsed/platform-middlewares": ctx.tsedVersion, "@tsed/platform-params": ctx.tsedVersion, "@tsed/platform-response-filter": ctx.tsedVersion, diff --git a/packages/cli/src/utils/__snapshots__/fillImport.spec.ts.snap b/packages/cli/src/utils/__snapshots__/fillImport.spec.ts.snap index d050719fc..304d61cf2 100644 --- a/packages/cli/src/utils/__snapshots__/fillImport.spec.ts.snap +++ b/packages/cli/src/utils/__snapshots__/fillImport.spec.ts.snap @@ -7,6 +7,10 @@ exports[`fillImports() > should return barrels and imports files for ('arc_defau "express": false, "graphql": false, "imports": [ + { + "comment": " // remove this import if you don't want log request", + "from": "@tsed/platform-log-request", + }, { "from": "@tsed/ajv", }, @@ -41,6 +45,10 @@ exports[`fillImports() > should return barrels and imports files for ('arc_defau "express": false, "graphql": false, "imports": [ + { + "comment": " // remove this import if you don't want log request", + "from": "@tsed/platform-log-request", + }, { "from": "@tsed/ajv", }, @@ -79,6 +87,10 @@ exports[`fillImports() > should return barrels and imports files for ('arc_defau "express": false, "graphql": true, "imports": [ + { + "comment": " // remove this import if you don't want log request", + "from": "@tsed/platform-log-request", + }, { "from": "@tsed/ajv", }, @@ -135,6 +147,10 @@ exports[`fillImports() > should return barrels and imports files for ('feature', "express": false, "graphql": false, "imports": [ + { + "comment": " // remove this import if you don't want log request", + "from": "@tsed/platform-log-request", + }, { "from": "@tsed/ajv", }, @@ -162,6 +178,10 @@ exports[`fillImports() > should return barrels and imports files for ('feature', "express": false, "graphql": false, "imports": [ + { + "comment": " // remove this import if you don't want log request", + "from": "@tsed/platform-log-request", + }, { "from": "@tsed/ajv", }, @@ -196,6 +216,10 @@ exports[`fillImports() > should return barrels and imports files for ('feature', "express": false, "graphql": false, "imports": [ + { + "comment": " // remove this import if you don't want log request", + "from": "@tsed/platform-log-request", + }, { "from": "@tsed/ajv", }, @@ -234,6 +258,10 @@ exports[`fillImports() > should return barrels and imports files for ('feature', "express": false, "graphql": true, "imports": [ + { + "comment": " // remove this import if you don't want log request", + "from": "@tsed/platform-log-request", + }, { "from": "@tsed/ajv", }, diff --git a/packages/cli/src/utils/fillImports.ts b/packages/cli/src/utils/fillImports.ts index 242b71a51..b8ce1b602 100644 --- a/packages/cli/src/utils/fillImports.ts +++ b/packages/cli/src/utils/fillImports.ts @@ -19,6 +19,7 @@ export function fillImports(ctx: any) { ); ctx.imports = [ + {from: "@tsed/platform-log-request", comment: " // remove this import if you don't want log request"}, ctx.express && {from: "@tsed/platform-express", comment: " // /!\\ keep this import"}, ctx.koa && {from: "@tsed/platform-koa", comment: " // /!\\ keep this import"}, {from: "@tsed/ajv"}, diff --git a/packages/cli/test/integrations/generate/generate.async-factory.integration.spec.ts b/packages/cli/test/integrations/generate/generate.async-factory.integration.spec.ts index ac56b98a5..a478c3e93 100644 --- a/packages/cli/test/integrations/generate/generate.async-factory.integration.spec.ts +++ b/packages/cli/test/integrations/generate/generate.async-factory.integration.spec.ts @@ -1,3 +1,4 @@ +// @ts-ignore import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; import {GenerateCmd, TEMPLATE_DIR} from "../../../src/index.js"; diff --git a/packages/cli/test/integrations/generate/generate.controller.integration.spec.ts b/packages/cli/test/integrations/generate/generate.controller.integration.spec.ts index ec762b579..56c24f730 100644 --- a/packages/cli/test/integrations/generate/generate.controller.integration.spec.ts +++ b/packages/cli/test/integrations/generate/generate.controller.integration.spec.ts @@ -1,4 +1,4 @@ -import {CliService, ProjectPackageJson} from "@tsed/cli-core"; +// @ts-ignore import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; import {GenerateCmd, TEMPLATE_DIR} from "../../../src/index.js"; diff --git a/packages/cli/test/integrations/generate/generate.decorator-class.integration.spec.ts b/packages/cli/test/integrations/generate/generate.decorator-class.integration.spec.ts index 294824244..9218ac2e6 100644 --- a/packages/cli/test/integrations/generate/generate.decorator-class.integration.spec.ts +++ b/packages/cli/test/integrations/generate/generate.decorator-class.integration.spec.ts @@ -1,4 +1,5 @@ import {CliService, ProjectPackageJson} from "@tsed/cli-core"; +// @ts-ignore import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; import {GenerateCmd, TEMPLATE_DIR} from "../../../src/index.js"; diff --git a/packages/cli/test/integrations/generate/generate.decorator-endpoint.integration.spec.ts b/packages/cli/test/integrations/generate/generate.decorator-endpoint.integration.spec.ts index 84d9a5bfa..0740105dc 100644 --- a/packages/cli/test/integrations/generate/generate.decorator-endpoint.integration.spec.ts +++ b/packages/cli/test/integrations/generate/generate.decorator-endpoint.integration.spec.ts @@ -1,6 +1,5 @@ -import {CliService, ProjectPackageJson} from "@tsed/cli-core"; +// @ts-ignore import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; -import {resolve} from "path"; import {GenerateCmd, TEMPLATE_DIR} from "../../../src/index.js"; diff --git a/packages/cli/test/integrations/generate/generate.decorator-generic.integration.spec.ts b/packages/cli/test/integrations/generate/generate.decorator-generic.integration.spec.ts index a865cb667..a5cab6487 100644 --- a/packages/cli/test/integrations/generate/generate.decorator-generic.integration.spec.ts +++ b/packages/cli/test/integrations/generate/generate.decorator-generic.integration.spec.ts @@ -1,4 +1,5 @@ import {CliService, ProjectPackageJson} from "@tsed/cli-core"; +// @ts-ignore import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; import {GenerateCmd, TEMPLATE_DIR} from "../../../src/index.js"; diff --git a/packages/cli/test/integrations/generate/generate.decorator-method.integration.spec.ts b/packages/cli/test/integrations/generate/generate.decorator-method.integration.spec.ts index d1bcd6506..7b2c46089 100644 --- a/packages/cli/test/integrations/generate/generate.decorator-method.integration.spec.ts +++ b/packages/cli/test/integrations/generate/generate.decorator-method.integration.spec.ts @@ -1,4 +1,5 @@ import {CliService, ProjectPackageJson} from "@tsed/cli-core"; +// @ts-ignore import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; import {GenerateCmd, TEMPLATE_DIR} from "../../../src/index.js"; diff --git a/packages/cli/test/integrations/generate/generate.decorator-middleware.integration.spec.ts b/packages/cli/test/integrations/generate/generate.decorator-middleware.integration.spec.ts index d8f4cf046..cf376deb0 100644 --- a/packages/cli/test/integrations/generate/generate.decorator-middleware.integration.spec.ts +++ b/packages/cli/test/integrations/generate/generate.decorator-middleware.integration.spec.ts @@ -1,4 +1,5 @@ import {CliService, ProjectPackageJson} from "@tsed/cli-core"; +// @ts-ignore import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; import {GenerateCmd, TEMPLATE_DIR} from "../../../src/index.js"; diff --git a/packages/cli/test/integrations/generate/generate.exception-filter.integration.spec.ts b/packages/cli/test/integrations/generate/generate.exception-filter.integration.spec.ts index 213dabc85..4ae980f8d 100644 --- a/packages/cli/test/integrations/generate/generate.exception-filter.integration.spec.ts +++ b/packages/cli/test/integrations/generate/generate.exception-filter.integration.spec.ts @@ -1,4 +1,5 @@ import {CliService, ProjectPackageJson} from "@tsed/cli-core"; +// @ts-ignore import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; import {GenerateCmd, TEMPLATE_DIR} from "../../../src/index.js"; diff --git a/packages/cli/test/integrations/generate/generate.response-filter.integration.spec.ts b/packages/cli/test/integrations/generate/generate.response-filter.integration.spec.ts index e904bee73..2a591e76e 100644 --- a/packages/cli/test/integrations/generate/generate.response-filter.integration.spec.ts +++ b/packages/cli/test/integrations/generate/generate.response-filter.integration.spec.ts @@ -1,4 +1,4 @@ -import {CliService, ProjectPackageJson} from "@tsed/cli-core"; +// @ts-ignore import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; import {GenerateCmd, TEMPLATE_DIR} from "../../../src/index.js"; diff --git a/packages/cli/test/integrations/init/__snapshots__/init.integration.spec.ts.snap b/packages/cli/test/integrations/init/__snapshots__/init.integration.spec.ts.snap index 705d577af..4914c784f 100644 --- a/packages/cli/test/integrations/init/__snapshots__/init.integration.spec.ts.snap +++ b/packages/cli/test/integrations/init/__snapshots__/init.integration.spec.ts.snap @@ -4,6 +4,7 @@ exports[`Init cmd > Express.js > should generate a project with Arch FEATURE 2`] "import {join} from "path"; import {Configuration, Inject} from "@tsed/di"; import {PlatformApplication} from "@tsed/common"; +import "@tsed/platform-log-request"; // remove this import if you don't want log request import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; import "@tsed/swagger"; @@ -66,6 +67,7 @@ exports[`Init cmd > Express.js > should generate a project with Babel 2`] = ` "import {join} from "path"; import {Configuration, Inject} from "@tsed/di"; import {PlatformApplication} from "@tsed/common"; +import "@tsed/platform-log-request"; // remove this import if you don't want log request import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; import {config} from "./config/index.js"; @@ -117,6 +119,7 @@ exports[`Init cmd > Express.js > should generate a project with Bun 2`] = ` "import {join} from "path"; import {Configuration, Inject} from "@tsed/di"; import {PlatformApplication} from "@tsed/common"; +import "@tsed/platform-log-request"; // remove this import if you don't want log request import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; import {config} from "./config/index.js"; @@ -168,6 +171,7 @@ exports[`Init cmd > Express.js > should generate a project with Convention ANGUL "import {join} from "path"; import {Configuration, Inject} from "@tsed/di"; import {PlatformApplication} from "@tsed/common"; +import "@tsed/platform-log-request"; // remove this import if you don't want log request import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; import "@tsed/swagger"; @@ -230,6 +234,7 @@ exports[`Init cmd > Express.js > should generate a project with NPM 2`] = ` "import {join} from "path"; import {Configuration, Inject} from "@tsed/di"; import {PlatformApplication} from "@tsed/common"; +import "@tsed/platform-log-request"; // remove this import if you don't want log request import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; import {config} from "./config/index.js"; @@ -281,6 +286,7 @@ exports[`Init cmd > Express.js > should generate a project with Webpack 2`] = ` "import {join} from "path"; import {Configuration, Inject} from "@tsed/di"; import {PlatformApplication} from "@tsed/common"; +import "@tsed/platform-log-request"; // remove this import if you don't want log request import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; import {config} from "./config/index.js"; @@ -332,6 +338,7 @@ exports[`Init cmd > Express.js > should generate a project with swagger 2`] = ` "import {join} from "path"; import {Configuration, Inject} from "@tsed/di"; import {PlatformApplication} from "@tsed/common"; +import "@tsed/platform-log-request"; // remove this import if you don't want log request import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; import "@tsed/swagger"; @@ -394,6 +401,7 @@ exports[`Init cmd > Express.js > should generate a project with the right option "import {join} from "path"; import {Configuration, Inject} from "@tsed/di"; import {PlatformApplication} from "@tsed/common"; +import "@tsed/platform-log-request"; // remove this import if you don't want log request import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; import {config} from "./config/index.js"; @@ -445,6 +453,7 @@ exports[`Init cmd > Koa.js > should generate a project with the right options 2` "import {join} from "path"; import {Configuration, Inject} from "@tsed/di"; import {PlatformApplication} from "@tsed/common"; +import "@tsed/platform-log-request"; // remove this import if you don't want log request import "@tsed/platform-koa"; // /!\\ keep this import import "@tsed/ajv"; import {config} from "./config/index.js"; diff --git a/packages/cli/test/integrations/init/init.integration.spec.ts b/packages/cli/test/integrations/init/init.integration.spec.ts index 91f124146..5578a777c 100644 --- a/packages/cli/test/integrations/init/init.integration.spec.ts +++ b/packages/cli/test/integrations/init/init.integration.spec.ts @@ -1,4 +1,5 @@ import {PackageManager} from "@tsed/cli-core"; +// @ts-ignore import {CliPlatformTest, FakeCliFs} from "@tsed/cli-testing"; import {ensureDirSync, writeFileSync} from "fs-extra"; import {join} from "path"; @@ -87,7 +88,7 @@ describe("Init cmd", () => { "@tsed/platform-cache": "5.58.1", "@tsed/platform-exceptions": "5.58.1", "@tsed/platform-express": "5.58.1", - "@tsed/platform-log-middleware": "5.58.1", + "@tsed/platform-log-request": "5.58.1", "@tsed/platform-middlewares": "5.58.1", "@tsed/platform-params": "5.58.1", "@tsed/platform-response-filter": "5.58.1", @@ -197,7 +198,7 @@ describe("Init cmd", () => { "@tsed/platform-cache": "5.58.1", "@tsed/platform-exceptions": "5.58.1", "@tsed/platform-express": "5.58.1", - "@tsed/platform-log-middleware": "5.58.1", + "@tsed/platform-log-request": "5.58.1", "@tsed/platform-middlewares": "5.58.1", "@tsed/platform-params": "5.58.1", "@tsed/platform-response-filter": "5.58.1", @@ -288,7 +289,7 @@ describe("Init cmd", () => { "@tsed/platform-cache": "5.58.1", "@tsed/platform-exceptions": "5.58.1", "@tsed/platform-express": "5.58.1", - "@tsed/platform-log-middleware": "5.58.1", + "@tsed/platform-log-request": "5.58.1", "@tsed/platform-middlewares": "5.58.1", "@tsed/platform-params": "5.58.1", "@tsed/platform-response-filter": "5.58.1", @@ -380,7 +381,7 @@ describe("Init cmd", () => { "@tsed/platform-cache": "5.58.1", "@tsed/platform-exceptions": "5.58.1", "@tsed/platform-express": "5.58.1", - "@tsed/platform-log-middleware": "5.58.1", + "@tsed/platform-log-request": "5.58.1", "@tsed/platform-middlewares": "5.58.1", "@tsed/platform-params": "5.58.1", "@tsed/platform-response-filter": "5.58.1", @@ -473,7 +474,7 @@ describe("Init cmd", () => { "@tsed/platform-cache": "5.58.1", "@tsed/platform-exceptions": "5.58.1", "@tsed/platform-express": "5.58.1", - "@tsed/platform-log-middleware": "5.58.1", + "@tsed/platform-log-request": "5.58.1", "@tsed/platform-middlewares": "5.58.1", "@tsed/platform-params": "5.58.1", "@tsed/platform-response-filter": "5.58.1", @@ -566,7 +567,7 @@ describe("Init cmd", () => { "@tsed/platform-cache": "5.58.1", "@tsed/platform-exceptions": "5.58.1", "@tsed/platform-express": "5.58.1", - "@tsed/platform-log-middleware": "5.58.1", + "@tsed/platform-log-request": "5.58.1", "@tsed/platform-middlewares": "5.58.1", "@tsed/platform-params": "5.58.1", "@tsed/platform-response-filter": "5.58.1", @@ -795,7 +796,7 @@ describe("Init cmd", () => { "@tsed/platform-cache": "5.58.1", "@tsed/platform-exceptions": "5.58.1", "@tsed/platform-koa": "5.58.1", - "@tsed/platform-log-middleware": "5.58.1", + "@tsed/platform-log-request": "5.58.1", "@tsed/platform-middlewares": "5.58.1", "@tsed/platform-params": "5.58.1", "@tsed/platform-response-filter": "5.58.1", diff --git a/packages/cli/tsconfig.spec.json b/packages/cli/tsconfig.spec.json index 0f06288a8..ff1266f98 100644 --- a/packages/cli/tsconfig.spec.json +++ b/packages/cli/tsconfig.spec.json @@ -6,22 +6,11 @@ "declaration": false, "composite": false, "noEmit": true, - "paths": {}, - "types": [ - "vite/client", - "vitest/globals" - ] + "paths": { + "@tsed/cli-testing": ["../packages/cli-testing/src/index.ts"] + }, + "types": ["vite/client", "vitest/globals"] }, - "include": [ - "src/**/*.spec.ts", - "test/**/*.spec.ts", - "vitest.config.mts" - ], - "exclude": [ - "node_modules", - "test", - "lib", - "benchmark", - "coverage" - ] + "include": ["src/**/*.spec.ts", "test/**/*.spec.ts", "vitest.config.mts"], + "exclude": ["node_modules", "lib", "test/data", "benchmark", "coverage"] } From 20af2852b6303ddcf2c8e778c892997aca0f4816 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Thu, 10 Oct 2024 08:18:11 +0200 Subject: [PATCH 63/69] feat: bump Ts.ED dependencies to v8.0.0-beta.2 --- package.json | 10 +- packages/cli-core/src/utils/createInjector.ts | 22 ++-- packages/cli-testing/src/CliPlatformTest.ts | 59 +++------ packages/cli/package.json | 8 +- .../src/commands/generate/GenerateCmd.spec.ts | 118 +++++++++--------- yarn.lock | 72 +++++------ 6 files changed, 128 insertions(+), 161 deletions(-) diff --git a/package.json b/package.json index 346f0d6ad..6be64a88c 100644 --- a/package.json +++ b/package.json @@ -44,12 +44,12 @@ }, "homepage": "https://github.com/tsedio/tsed-cli", "dependencies": { - "@tsed/core": ">=8.0.0-beta.1", - "@tsed/di": ">=8.0.0-beta.1", + "@tsed/core": ">=8.0.0-beta.2", + "@tsed/di": ">=8.0.0-beta.2", "@tsed/logger": ">=6.2.1", - "@tsed/normalize-path": ">=8.0.0-beta.1", - "@tsed/openspec": ">=8.0.0-beta.1", - "@tsed/schema": ">=8.0.0-beta.1", + "@tsed/normalize-path": ">=8.0.0-beta.2", + "@tsed/openspec": ">=8.0.0-beta.2", + "@tsed/schema": ">=8.0.0-beta.2", "axios": "^1.7.7", "chalk": "^5.3.0", "commander": "^12.1.0", diff --git a/packages/cli-core/src/utils/createInjector.ts b/packages/cli-core/src/utils/createInjector.ts index b54114afb..cfb36692f 100644 --- a/packages/cli-core/src/utils/createInjector.ts +++ b/packages/cli-core/src/utils/createInjector.ts @@ -1,4 +1,4 @@ -import {type DIConfigurationOptions, InjectorService} from "@tsed/di"; +import {type DIConfigurationOptions, injector, InjectorService} from "@tsed/di"; import {Logger} from "@tsed/logger"; import {CliConfiguration} from "../services/CliConfiguration.js"; @@ -17,21 +17,21 @@ function createConfiguration(injector: InjectorService): CliConfiguration & TsED } export function createInjector(settings: Partial = {}) { - const injector = new InjectorService(); - injector.settings = createConfiguration(injector); - logger = injector.logger = new Logger(settings.name || "CLI"); + const inj = injector(); + inj.settings = createConfiguration(inj); + logger = inj.logger = new Logger(settings.name || "CLI"); - injector.addProvider(ProjectPackageJson); + inj.addProvider(ProjectPackageJson); - injector.settings.set(settings); + inj.settings.set(settings); /* istanbul ignore next */ - if (injector.settings.env === "test") { - injector.logger.stop(); + if (inj.settings.env === "test") { + inj.logger.stop(); } else { /* istanbul ignore next */ - injector.logger.level = injector.settings.logger?.level || "warn"; - injector.logger.appenders + inj.logger.level = inj.settings.logger?.level || "warn"; + inj.logger.appenders .set("stdout", { type: "stdout", layout: { @@ -50,5 +50,5 @@ export function createInjector(settings: Partial = {}) { }); } - return injector; + return inj; } diff --git a/packages/cli-testing/src/CliPlatformTest.ts b/packages/cli-testing/src/CliPlatformTest.ts index 6a572e522..7a926bb69 100644 --- a/packages/cli-testing/src/CliPlatformTest.ts +++ b/packages/cli-testing/src/CliPlatformTest.ts @@ -1,14 +1,18 @@ import { + $emit, CliCore, CliExeca, CliFs, CliHttpClient, CliService, + configuration, createInjector, DITest, Env, getCommandMetadata, + injector, InjectorService, + logger, ProjectPackageJson, resolveConfiguration, type TokenProvider @@ -21,11 +25,6 @@ import {FakeCliExeca} from "./FakeCliExeca.js"; import {FakeCliFs} from "./FakeCliFs.js"; import {FakeCliHttpClient} from "./FakeCliHttpClient.js"; -export interface InvokeOptions { - token: TokenProvider; - use: any; -} - export class CliPlatformTest extends DITest { static async bootstrap(options: Partial = {}) { options = resolveConfiguration({ @@ -39,9 +38,9 @@ export class CliPlatformTest extends DITest { ...options }); - DITest.injector = CliPlatformTest.createInjector(options); + CliPlatformTest.createInjector(options); - DITest.injector + injector() .addProvider(CliHttpClient, { useClass: FakeCliHttpClient }) @@ -53,9 +52,9 @@ export class CliPlatformTest extends DITest { }) .addProvider(CliCore); - await DITest.injector.load(); - await DITest.injector.emit("$onReady"); - await DITest.injector.emit("$loadPackageJson"); + await injector().load(); + await $emit("$onReady"); + await $emit("$loadPackageJson"); CliPlatformTest.get(CliService).load(); } @@ -66,13 +65,13 @@ export class CliPlatformTest extends DITest { ...options }); - DITest.injector = CliPlatformTest.createInjector(options); + CliPlatformTest.createInjector(options); - DITest.injector.addProvider(CliCore, { + injector().addProvider(CliCore, { useClass: rootModule }); - await DITest.injector.load(); + await injector().load(); } /** @@ -98,34 +97,6 @@ export class CliPlatformTest extends DITest { return injector; } - /** - * It injects services into the test function where you can alter, spy on, and manipulate them. - * - * The inject function has two parameters - * - * * an array of Service dependency injection tokens, - * * a test function whose parameters correspond exactly to each item in the injection token array. - * - * @param targets - * @param func - */ - static inject(targets: any[], func: (...args: any[]) => Promise | T): () => Promise { - return async (): Promise => { - if (!DITest.hasInjector()) { - await CliPlatformTest.create(); - } - - const injector: InjectorService = DITest.injector; - const deps = []; - - for (const target of targets) { - deps.push(injector.has(target) ? injector.get(target) : await injector.invoke(target)); - } - - return func(...deps); - }; - } - static setPackageJson(pkg: any) { const projectPackageJson = CliPlatformTest.get(ProjectPackageJson); @@ -140,11 +111,11 @@ export class CliPlatformTest extends DITest { static exec(cmdName: string, initialData: any) { const $ctx = new DIContext({ id: v4(), - injector: this.injector, - logger: this.injector.logger + injector: injector(), + logger: logger() }); - const metadata = this.injector.settings + const metadata = configuration() .get("commands") .map((token: TokenProvider) => getCommandMetadata(token)) .find((commandOpts: any) => cmdName === commandOpts.name); diff --git a/packages/cli/package.json b/packages/cli/package.json index f964a6a7b..0f65b2ed7 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -67,11 +67,11 @@ "@swc/core": "1.7.26", "@swc/helpers": "^0.5.13", "@tsed/cli-core": "workspace:*", - "@tsed/core": ">=8.0.0-beta.1", - "@tsed/di": ">=8.0.0-beta.1", + "@tsed/core": ">=8.0.0-beta.2", + "@tsed/di": ">=8.0.0-beta.2", "@tsed/logger": ">=6.2.1", - "@tsed/openspec": ">=8.0.0-beta.1", - "@tsed/schema": ">=8.0.0-beta.1", + "@tsed/openspec": ">=8.0.0-beta.2", + "@tsed/schema": ">=8.0.0-beta.2", "chalk": "^5.3.0", "change-case": "^5.4.4", "esm-module-alias": "^2.2.1", diff --git a/packages/cli/src/commands/generate/GenerateCmd.spec.ts b/packages/cli/src/commands/generate/GenerateCmd.spec.ts index d918f54d2..3adbb90d8 100644 --- a/packages/cli/src/commands/generate/GenerateCmd.spec.ts +++ b/packages/cli/src/commands/generate/GenerateCmd.spec.ts @@ -10,67 +10,63 @@ describe("GenerateCmd", () => { afterEach(() => CliPlatformTest.reset()); describe("$prompt", () => { - it( - "should return prompts dialog", - CliPlatformTest.inject([GenerateCmd], async (command: GenerateCmd) => { - // GIVEN - const options = {}; - - // WHEN - const result: any[] = (await command.$prompt(options)) as any[]; - - // THEN - expect(result[0]).toEqual({ - default: undefined, - message: "Which type of provider?", - name: "type", - source: expect.any(Function), - type: "autocomplete", - when: expect.any(Function) - }); - expect(result[1].message).toEqual("Which name?"); - expect(result[1].default({type: "name"})).toEqual("Name"); - expect(result[1].when).toEqual(true); - expect(result[3].message).toEqual("Which route?"); - expect(result[3].when({type: "controller"})).toEqual(true); - expect(result[3].when({type: "server"})).toEqual(true); - expect(result[3].when({type: "pipe"})).toEqual(false); - expect(result[3].default({type: "server"})).toEqual("/rest"); - expect(result[3].default({type: "other", name: "test"})).toEqual("/test"); - }) - ); - it( - "should return prompts dialog (with initial options)", - CliPlatformTest.inject([GenerateCmd], async (command: GenerateCmd) => { - // GIVEN - const options = { - type: "controller", - name: "Name" - }; - - // WHEN - const result: any[] = (await command.$prompt(options)) as any[]; - - // THEN - expect(result[0]).toEqual({ - default: "controller", - message: "Which type of provider?", - source: expect.any(Function), - name: "type", - type: "autocomplete", - when: expect.any(Function) - }); - expect(result[1].message).toEqual("Which name?"); - expect(result[1].default({type: "name"})).toEqual("Name"); - expect(result[1].when).toEqual(false); - expect(result[3].message).toEqual("Which route?"); - expect(result[3].when({type: "controller"})).toEqual(true); - expect(result[3].when({type: "server"})).toEqual(true); - expect(result[3].when({type: "pipe"})).toEqual(false); - expect(result[3].default({type: "server"})).toEqual("/rest"); - expect(result[3].default({type: "other", name: "test"})).toEqual("/name"); - }) - ); + it("should return prompts dialog", async () => { + const command = await CliPlatformTest.invoke(GenerateCmd); + // GIVEN + const options = {}; + + // WHEN + const result: any[] = (await command.$prompt(options)) as any[]; + + // THEN + expect(result[0]).toEqual({ + default: undefined, + message: "Which type of provider?", + name: "type", + source: expect.any(Function), + type: "autocomplete", + when: expect.any(Function) + }); + expect(result[1].message).toEqual("Which name?"); + expect(result[1].default({type: "name"})).toEqual("Name"); + expect(result[1].when).toEqual(true); + expect(result[3].message).toEqual("Which route?"); + expect(result[3].when({type: "controller"})).toEqual(true); + expect(result[3].when({type: "server"})).toEqual(true); + expect(result[3].when({type: "pipe"})).toEqual(false); + expect(result[3].default({type: "server"})).toEqual("/rest"); + expect(result[3].default({type: "other", name: "test"})).toEqual("/test"); + }); + it("should return prompts dialog (with initial options)", async () => { + const command = await CliPlatformTest.invoke(GenerateCmd); + // GIVEN + const options = { + type: "controller", + name: "Name" + }; + + // WHEN + const result: any[] = (await command.$prompt(options)) as any[]; + + // THEN + expect(result[0]).toEqual({ + default: "controller", + message: "Which type of provider?", + source: expect.any(Function), + name: "type", + type: "autocomplete", + when: expect.any(Function) + }); + expect(result[1].message).toEqual("Which name?"); + expect(result[1].default({type: "name"})).toEqual("Name"); + expect(result[1].when).toEqual(false); + expect(result[3].message).toEqual("Which route?"); + expect(result[3].when({type: "controller"})).toEqual(true); + expect(result[3].when({type: "server"})).toEqual(true); + expect(result[3].when({type: "pipe"})).toEqual(false); + expect(result[3].default({type: "server"})).toEqual("/rest"); + expect(result[3].default({type: "other", name: "test"})).toEqual("/name"); + }); }); describe("$exec", () => { it("should return tasks", async () => { diff --git a/yarn.lock b/yarn.lock index 71c15f25e..16ba32032 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2349,8 +2349,8 @@ __metadata: uuid: "npm:^10.0.0" vitest: "npm:2.1.1" peerDependencies: - "@tsed/core": ">=7.14.2" - "@tsed/di": ">=7.14.2" + "@tsed/core": ">=8.0.0-beta.1" + "@tsed/di": ">=8.0.0-beta.1" languageName: unknown linkType: soft @@ -2548,14 +2548,14 @@ __metadata: "@commitlint/config-conventional": "npm:19.5.0" "@swc/core": "npm:1.7.26" "@swc/helpers": "npm:0.5.13" - "@tsed/core": "npm:>=8.0.0-beta.1" - "@tsed/di": "npm:>=8.0.0-beta.1" + "@tsed/core": "npm:>=8.0.0-beta.2" + "@tsed/di": "npm:>=8.0.0-beta.2" "@tsed/logger": "npm:>=6.2.1" "@tsed/markdown-it-symbols": "npm:3.20.8" "@tsed/monorepo-utils": "npm:2.3.5" - "@tsed/normalize-path": "npm:>=8.0.0-beta.1" - "@tsed/openspec": "npm:>=8.0.0-beta.1" - "@tsed/schema": "npm:>=8.0.0-beta.1" + "@tsed/normalize-path": "npm:>=8.0.0-beta.2" + "@tsed/openspec": "npm:>=8.0.0-beta.2" + "@tsed/schema": "npm:>=8.0.0-beta.2" "@tsed/ts-doc": "npm:^4.1.0" "@types/node": "npm:22.7.4" "@typescript-eslint/eslint-plugin": "npm:8.7.0" @@ -2626,11 +2626,11 @@ __metadata: "@swc/core": "npm:1.7.26" "@swc/helpers": "npm:^0.5.13" "@tsed/cli-core": "workspace:*" - "@tsed/core": "npm:>=8.0.0-beta.1" - "@tsed/di": "npm:>=8.0.0-beta.1" + "@tsed/core": "npm:>=8.0.0-beta.2" + "@tsed/di": "npm:>=8.0.0-beta.2" "@tsed/logger": "npm:>=6.2.1" - "@tsed/openspec": "npm:>=8.0.0-beta.1" - "@tsed/schema": "npm:>=8.0.0-beta.1" + "@tsed/openspec": "npm:>=8.0.0-beta.2" + "@tsed/schema": "npm:>=8.0.0-beta.2" "@tsed/typescript": "workspace:*" "@types/change-case": "npm:^2.3.1" chalk: "npm:^5.3.0" @@ -2655,26 +2655,26 @@ __metadata: languageName: unknown linkType: soft -"@tsed/core@npm:>=8.0.0-beta.1": - version: 8.0.0-beta.1 - resolution: "@tsed/core@npm:8.0.0-beta.1" +"@tsed/core@npm:>=8.0.0-beta.2": + version: 8.0.0-beta.2 + resolution: "@tsed/core@npm:8.0.0-beta.2" dependencies: reflect-metadata: "npm:^0.2.2" tslib: "npm:2.7.0" - checksum: 10/f77ad64acd6ead4906da0fa14a83f0f0c0e17c44e09b75582b6b6d036b9b5bea9a4ff18adacf4814ec80d4e9ef4595395fba27fd777f51d6337ab86508753d5c + checksum: 10/f550f0940a2e4aced4c83ce5903e60cdaa5c48a78fb1bb7ecb9d77a355a2fa04779024764a925ffe407f00d4174669de238b826aa46ef7588dae472743b8e4eb languageName: node linkType: hard -"@tsed/di@npm:>=8.0.0-beta.1": - version: 8.0.0-beta.1 - resolution: "@tsed/di@npm:8.0.0-beta.1" +"@tsed/di@npm:>=8.0.0-beta.2": + version: 8.0.0-beta.2 + resolution: "@tsed/di@npm:8.0.0-beta.2" dependencies: tslib: "npm:2.7.0" uuid: "npm:^10.0.0" peerDependencies: - "@tsed/core": 8.0.0-beta.1 + "@tsed/core": 8.0.0-beta.2 "@tsed/logger": ">=6.7.5" - "@tsed/schema": 8.0.0-beta.1 + "@tsed/schema": 8.0.0-beta.2 peerDependenciesMeta: "@tsed/core": optional: false @@ -2682,7 +2682,7 @@ __metadata: optional: false "@tsed/schema": optional: false - checksum: 10/11cc540dd19c57a3ef37ec4dd06af5ea28f76325e75f4ef58fec055efbc879f9d0cbee72decd7085cb61d852c1e25bfe52aa7fd6a6c5ff94bd127f56085ee096 + checksum: 10/065c7883287428624a7f4275f156a4831b9c4750cad9d60984ebbbc20cf2fca45462d591bb1f6e8cfe4f79064a839950b96b567c767bc50a4ea2ebf28774b754 languageName: node linkType: hard @@ -2748,28 +2748,28 @@ __metadata: languageName: node linkType: hard -"@tsed/normalize-path@npm:>=8.0.0-beta.1": - version: 8.0.0-beta.1 - resolution: "@tsed/normalize-path@npm:8.0.0-beta.1" +"@tsed/normalize-path@npm:>=8.0.0-beta.2": + version: 8.0.0-beta.2 + resolution: "@tsed/normalize-path@npm:8.0.0-beta.2" dependencies: normalize-path: "npm:3.0.0" tslib: "npm:2.7.0" - checksum: 10/db461cbcdbb1421e68c204d2a2baf3b47202be21f743c085c9def501afceb2be3ad0973bd8f73f735f6c01c31eba9a88acf993f386cfe7270dd2ff85d9221c3c + checksum: 10/f9e1de2d7a1eeabd0385855e335ef7417cd5963ded38838b65a4f0179dd3928ddc870f02b3052ca26fe577901b03d333d1da9c7bcf3b0a79cb3770fdb6009a46 languageName: node linkType: hard -"@tsed/openspec@npm:8.0.0-beta.1, @tsed/openspec@npm:>=8.0.0-beta.1": - version: 8.0.0-beta.1 - resolution: "@tsed/openspec@npm:8.0.0-beta.1" - checksum: 10/174ee3ed3db4d1179f9bdbc0603efd59791ff6cc25934f5a06e6417196ad7d3a173f508541d0e10c4848db421414e81cbf65a8ac19dbdfbe26269a605b499137 +"@tsed/openspec@npm:8.0.0-beta.2, @tsed/openspec@npm:>=8.0.0-beta.2": + version: 8.0.0-beta.2 + resolution: "@tsed/openspec@npm:8.0.0-beta.2" + checksum: 10/79a7b913178b0b0967a109dc550c1aeea781d383b02abb02f30009cece2a196783dee0d1b202e4b2added05fdb6c9d1deeec9555e66f42a082d4300aabac9c32 languageName: node linkType: hard -"@tsed/schema@npm:>=8.0.0-beta.1": - version: 8.0.0-beta.1 - resolution: "@tsed/schema@npm:8.0.0-beta.1" +"@tsed/schema@npm:>=8.0.0-beta.2": + version: 8.0.0-beta.2 + resolution: "@tsed/schema@npm:8.0.0-beta.2" dependencies: - "@tsed/openspec": "npm:8.0.0-beta.1" + "@tsed/openspec": "npm:8.0.0-beta.2" change-case: "npm:^5.4.4" fs-extra: "npm:^11.2.0" json-schema: "npm:0.4.0" @@ -2777,14 +2777,14 @@ __metadata: statuses: "npm:^2.0.1" tslib: "npm:2.7.0" peerDependencies: - "@tsed/core": 8.0.0-beta.1 - "@tsed/openspec": 8.0.0-beta.1 + "@tsed/core": 8.0.0-beta.2 + "@tsed/openspec": 8.0.0-beta.2 peerDependenciesMeta: "@tsed/core": optional: false "@tsed/openspec": optional: false - checksum: 10/77ddc49d60d65036b928558ee66bc4ac6847f957382859292629dd134d4892d4b12854290a5f509f09ed33ddd44067fa9340aa01db3c3b12b4a18dc6cae5eacb + checksum: 10/205454f693369397af05984808e9ee7e816248d60eba2b3f280268eb120e0920ef7c6313a14333c88b024f3f4afa9a175983e7024703430ff51da989f528e83d languageName: node linkType: hard From 52e4d761f184e0495a6e49ca9bb9fcd0db8a6f83 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Thu, 10 Oct 2024 08:42:04 +0200 Subject: [PATCH 64/69] refactor: migrate core code base to functional API --- packages/cli-core/package.json | 4 +- packages/cli-core/src/CliCore.ts | 11 +-- .../src/services/CliDockerComposeYaml.ts | 13 +--- packages/cli-core/src/services/CliHooks.ts | 10 +-- .../cli-core/src/services/CliHttpClient.ts | 5 +- .../cli-core/src/services/CliHttpLogClient.ts | 6 +- packages/cli-core/src/services/CliLoadFile.ts | 9 +-- .../cli-core/src/services/CliPackageJson.ts | 6 +- packages/cli-core/src/services/CliPlugins.ts | 29 ++----- .../src/services/CliProxyAgent.spec.ts | 20 ++--- .../cli-core/src/services/CliProxyAgent.ts | 21 ++--- .../cli-core/src/services/CliRunScript.ts | 7 +- packages/cli-core/src/services/CliService.ts | 77 ++++++++++--------- packages/cli-core/src/services/CliYaml.ts | 5 +- .../src/services/NpmRegistryClient.ts | 5 +- .../src/services/ProjectPackageJson.ts | 44 +++++------ packages/cli-core/src/services/Renderer.ts | 15 ++-- packages/cli-core/src/utils/loadPlugins.ts | 31 ++++---- packages/cli/src/commands/add/AddCmd.ts | 13 +--- .../src/commands/generate/GenerateCmd.spec.ts | 2 +- .../cli/src/commands/generate/GenerateCmd.ts | 10 ++- packages/cli/src/commands/init/InitCmd.ts | 54 ++++--------- packages/cli/src/commands/run/RunCmd.ts | 13 +--- .../cli/src/commands/update/UpdateCmd.spec.ts | 2 + packages/cli/src/commands/update/UpdateCmd.ts | 16 ++-- packages/cli/src/pipes/ClassNamePipe.spec.ts | 6 ++ packages/cli/src/pipes/ClassNamePipe.ts | 11 +-- packages/cli/src/pipes/OutputFilePathPipe.ts | 13 +--- .../cli/src/platforms/InitPlatformsModule.ts | 5 +- packages/cli/src/runtimes/RuntimesModule.ts | 9 +-- yarn.lock | 4 +- 31 files changed, 202 insertions(+), 274 deletions(-) diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index 168a4a72d..ad764c155 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -83,7 +83,7 @@ "vitest": "2.1.1" }, "peerDependencies": { - "@tsed/core": ">=8.0.0-beta.1", - "@tsed/di": ">=8.0.0-beta.1" + "@tsed/core": ">=8.0.0-beta.2", + "@tsed/di": ">=8.0.0-beta.2" } } diff --git a/packages/cli-core/src/CliCore.ts b/packages/cli-core/src/CliCore.ts index 46a6bbb81..e2bc44605 100644 --- a/packages/cli-core/src/CliCore.ts +++ b/packages/cli-core/src/CliCore.ts @@ -1,5 +1,5 @@ import {Type} from "@tsed/core"; -import {Inject, InjectorService, Module} from "@tsed/di"; +import {inject, InjectorService, Module} from "@tsed/di"; import chalk from "chalk"; import {Command} from "commander"; import {join, resolve} from "path"; @@ -23,11 +23,8 @@ function isHelpManual(argv: string[]) { imports: [CliPackageJson, ProjectPackageJson, CliService, CliConfiguration] }) export class CliCore { - @Inject() - readonly injector: InjectorService; - - @Inject() - readonly cliService: CliService; + readonly injector = inject(InjectorService); + readonly cliService = inject(CliService); static checkNodeVersion(wanted: string, id: string) { if (!semver.satisfies(process.version, wanted)) { @@ -53,7 +50,7 @@ export class CliCore { const injector = this.createInjector(settings); - settings.plugins && (await loadPlugins(injector)); + settings.plugins && (await loadPlugins()); await this.loadInjector(injector, module); diff --git a/packages/cli-core/src/services/CliDockerComposeYaml.ts b/packages/cli-core/src/services/CliDockerComposeYaml.ts index 39442a921..ef533f009 100644 --- a/packages/cli-core/src/services/CliDockerComposeYaml.ts +++ b/packages/cli-core/src/services/CliDockerComposeYaml.ts @@ -1,5 +1,5 @@ import {setValue} from "@tsed/core"; -import {Inject, Injectable} from "@tsed/di"; +import {inject, Injectable} from "@tsed/di"; import {snakeCase} from "change-case"; import {join} from "path"; @@ -9,14 +9,9 @@ import {ProjectPackageJson} from "./ProjectPackageJson.js"; @Injectable() export class CliDockerComposeYaml { - @Inject() - protected cliYaml: CliYaml; - - @Inject() - protected fs: CliFs; - - @Inject() - protected projectPackageJson: ProjectPackageJson; + protected cliYaml = inject(CliYaml); + protected fs = inject(CliFs); + protected projectPackageJson = inject(ProjectPackageJson); read() { const path = "docker-compose.yml"; diff --git a/packages/cli-core/src/services/CliHooks.ts b/packages/cli-core/src/services/CliHooks.ts index 90e285ebc..7ee9c5dd6 100644 --- a/packages/cli-core/src/services/CliHooks.ts +++ b/packages/cli-core/src/services/CliHooks.ts @@ -1,17 +1,15 @@ -import {Inject, Injectable, InjectorService} from "@tsed/di"; +import {Injectable, injector} from "@tsed/di"; @Injectable() export class CliHooks { - @Inject() - injector: InjectorService; - async emit(hookName: string, cmd: string, ...args: any[]) { - const providers = this.injector.getProviders(); + const inj = injector(); + const providers = inj.getProviders(); let results: any = []; for (const provider of providers) { if (provider.useClass) { - const instance: any = this.injector.get(provider.token)!; + const instance: any = inj.get(provider.token)!; if (provider.store.has(hookName)) { const props = provider.store.get(hookName)[cmd]; diff --git a/packages/cli-core/src/services/CliHttpClient.ts b/packages/cli-core/src/services/CliHttpClient.ts index 33029c446..8c7f4bc64 100644 --- a/packages/cli-core/src/services/CliHttpClient.ts +++ b/packages/cli-core/src/services/CliHttpClient.ts @@ -1,5 +1,5 @@ import {cleanObject} from "@tsed/core"; -import {Inject, Injectable} from "@tsed/di"; +import {inject, Injectable} from "@tsed/di"; import axios, {type AxiosRequestConfig, type Method} from "axios"; import {stringify} from "querystring"; import {URL} from "url"; @@ -14,8 +14,7 @@ export interface CliHttpClientOptions extends AxiosRequestConfig, Record = {}) { diff --git a/packages/cli-core/src/services/CliLoadFile.ts b/packages/cli-core/src/services/CliLoadFile.ts index e76d37cd3..932d66a32 100644 --- a/packages/cli-core/src/services/CliLoadFile.ts +++ b/packages/cli-core/src/services/CliLoadFile.ts @@ -1,4 +1,4 @@ -import {Inject, Injectable} from "@tsed/di"; +import {inject, Injectable} from "@tsed/di"; import {default as Ajv, type Schema} from "ajv"; import {extname} from "path"; @@ -7,11 +7,8 @@ import {CliYaml} from "./CliYaml.js"; @Injectable() export class CliLoadFile { - @Inject() - protected cliYaml: CliYaml; - - @Inject() - protected cliFs: CliFs; + protected cliYaml: CliYaml = inject(CliYaml); + protected cliFs = inject(CliFs); // @ts-ignore #ajv: Ajv; diff --git a/packages/cli-core/src/services/CliPackageJson.ts b/packages/cli-core/src/services/CliPackageJson.ts index a1e389e3f..958e329a0 100644 --- a/packages/cli-core/src/services/CliPackageJson.ts +++ b/packages/cli-core/src/services/CliPackageJson.ts @@ -1,4 +1,4 @@ -import {Configuration, Inject, registerProvider} from "@tsed/di"; +import {Configuration, Inject, inject, registerProvider} from "@tsed/di"; import {type PackageJson} from "../interfaces/PackageJson.js"; @@ -8,6 +8,10 @@ export function CliPackageJson(): any { return Inject(CliPackageJson); } +export function cliPackageJson() { + return inject(CliPackageJson); +} + registerProvider({ provide: CliPackageJson, deps: [Configuration], diff --git a/packages/cli-core/src/services/CliPlugins.ts b/packages/cli-core/src/services/CliPlugins.ts index 9f493869c..4f81747f8 100644 --- a/packages/cli-core/src/services/CliPlugins.ts +++ b/packages/cli-core/src/services/CliPlugins.ts @@ -1,4 +1,4 @@ -import {Constant, Inject, Injectable, InjectorService} from "@tsed/di"; +import {constant, inject, Injectable} from "@tsed/di"; import chalk from "chalk"; import {CommandStoreKeys} from "../domains/CommandStoreKeys.js"; @@ -20,23 +20,12 @@ function mapPlugins({package: {name, description = "", ...otherProps}}: any) { @Injectable() export class CliPlugins { - @Constant("name") - name: string; - - @Inject(NpmRegistryClient) - private npmRegistryClient: NpmRegistryClient; - - @Inject(InjectorService) - private injector: InjectorService; - - @Inject(CliHooks) - private cliHooks: CliHooks; - - @Inject(ProjectPackageJson) - private packageJson: ProjectPackageJson; - - @Inject(PackageManagersModule) - private packageManagers: PackageManagersModule; + name = constant("name", ""); + readonly loadPlugins = loadPlugins; + private npmRegistryClient = inject(NpmRegistryClient); + private cliHooks = inject(CliHooks); + private packageJson = inject(ProjectPackageJson); + private packageManagers = inject(PackageManagersModule); async searchPlugins(keyword = "", options: any = {}) { const result = await this.npmRegistryClient.search(this.getKeyword(keyword), options); @@ -44,10 +33,6 @@ export class CliPlugins { return result.filter(({package: {name}}: any) => this.isPlugin(name)).map(mapPlugins); } - loadPlugins() { - return loadPlugins(this.injector); - } - addPluginsDependencies(ctx: any): Task[] { const plugins = Object.keys(this.packageJson.devDependencies).filter((name) => this.isPlugin(name)); diff --git a/packages/cli-core/src/services/CliProxyAgent.spec.ts b/packages/cli-core/src/services/CliProxyAgent.spec.ts index 8fc91ef1e..27087fd07 100644 --- a/packages/cli-core/src/services/CliProxyAgent.spec.ts +++ b/packages/cli-core/src/services/CliProxyAgent.spec.ts @@ -31,7 +31,7 @@ describe("CliPlugins", () => { await cliProxyAgent.resolveProxySettings(); - expect(cliProxyAgent.proxySettings).toEqual({url: "http://login:password@host:3000"}); + expect(cliProxyAgent.proxySettings.value).toEqual({url: "http://login:password@host:3000"}); }); it("should get proxy url from env (HTTP_PROXY -2)", async () => { @@ -46,7 +46,7 @@ describe("CliPlugins", () => { await cliProxyAgent.resolveProxySettings(); - expect(cliProxyAgent.proxySettings).toEqual({strictSsl: false, url: "https://login:password@host:3000"}); + expect(cliProxyAgent.proxySettings.value).toEqual({strictSsl: false, url: "https://login:password@host:3000"}); }); }); describe("from npm config", () => { @@ -73,11 +73,11 @@ describe("CliPlugins", () => { ]); // @ts-ignore - cliProxyAgent.proxySettings.url = undefined; + cliProxyAgent.proxySettings.value.url = undefined; await cliProxyAgent.resolveProxySettings(); - expect(cliProxyAgent.proxySettings).toEqual({ + expect(cliProxyAgent.proxySettings.value).toEqual({ url: "https://login:password@host:3000", strictSsl: false }); @@ -105,11 +105,11 @@ describe("CliPlugins", () => { ]); // @ts-ignore - cliProxyAgent.proxySettings.url = undefined; + cliProxyAgent.proxySettings.value.url = undefined; await cliProxyAgent.resolveProxySettings(); - expect(cliProxyAgent.proxySettings).toEqual({ + expect(cliProxyAgent.proxySettings.value).toEqual({ url: "https://login:password@host:3000", strictSsl: true }); @@ -137,11 +137,11 @@ describe("CliPlugins", () => { ]); // @ts-ignore - cliProxyAgent.proxySettings.url = undefined; + cliProxyAgent.proxySettings.value.url = undefined; await cliProxyAgent.resolveProxySettings(); - expect(cliProxyAgent.proxySettings).toEqual({ + expect(cliProxyAgent.proxySettings.value).toEqual({ url: "https://login:password@host:3000", strictSsl: true }); @@ -169,11 +169,11 @@ describe("CliPlugins", () => { ]); // @ts-ignore - cliProxyAgent.proxySettings.url = undefined; + cliProxyAgent.proxySettings.value.url = undefined; await cliProxyAgent.resolveProxySettings(); - expect(cliProxyAgent.proxySettings).toEqual({ + expect(cliProxyAgent.proxySettings.value).toEqual({ url: "https://host:3000", strictSsl: true }); diff --git a/packages/cli-core/src/services/CliProxyAgent.ts b/packages/cli-core/src/services/CliProxyAgent.ts index 43825cbc4..4282e4a63 100644 --- a/packages/cli-core/src/services/CliProxyAgent.ts +++ b/packages/cli-core/src/services/CliProxyAgent.ts @@ -1,4 +1,4 @@ -import {Configuration, Inject, Injectable, Value} from "@tsed/di"; +import {Configuration, Inject, inject, Injectable, refValue} from "@tsed/di"; import {camelCase} from "change-case"; import tunnel from "tunnel"; import {URL} from "url"; @@ -20,23 +20,18 @@ export interface CliProxySettings { } }) export class CliProxyAgent { - @Value("proxy", {}) - proxySettings: CliProxySettings; - - @Inject() - protected projectPackageJson: ProjectPackageJson; - - @Inject() - protected cliExeca: CliExeca; + readonly proxySettings = refValue("proxy", {} as never); + protected projectPackageJson = Inject(ProjectPackageJson); + protected cliExeca = inject(CliExeca); hasProxy() { - return !!this.proxySettings.url; + return !!this.proxySettings.value.url; } get(type: "http" | "https") { if (this.hasProxy()) { - const {strictSsl = true} = this.proxySettings; - const url = new URL(this.proxySettings.url); + const {strictSsl = true} = this.proxySettings.value; + const url = new URL(this.proxySettings.value.url); const protocol = url.protocol.replace(":", ""); const options = { @@ -92,7 +87,7 @@ export class CliProxyAgent { const url = httpsProxy || httpProxy || proxy; if (url) { - this.proxySettings = { + this.proxySettings.value = { url, strictSsl: coerce(strictSsl) !== false }; diff --git a/packages/cli-core/src/services/CliRunScript.ts b/packages/cli-core/src/services/CliRunScript.ts index 356560e25..ac521d4f5 100644 --- a/packages/cli-core/src/services/CliRunScript.ts +++ b/packages/cli-core/src/services/CliRunScript.ts @@ -1,20 +1,17 @@ // @ts-ignore import runScript from "@npmcli/run-script"; -import {Inject, Injectable} from "@tsed/di"; +import {inject, Injectable} from "@tsed/di"; import {ProjectPackageJson} from "./ProjectPackageJson.js"; @Injectable() export class CliRunScript { - @Inject() - projectPackageJson: ProjectPackageJson; - run(cmd: string, args: string[], options: any = {}) { return runScript({ event: "run", ...options, cmd: `${cmd} ${args.join(" ")}`, - path: options.cwd || this.projectPackageJson.dir, + path: options.cwd || inject(ProjectPackageJson).dir, env: options.env || {}, stdio: options.stdio || "inherit", banner: false diff --git a/packages/cli-core/src/services/CliService.ts b/packages/cli-core/src/services/CliService.ts index d97a08c5a..ef7ade980 100644 --- a/packages/cli-core/src/services/CliService.ts +++ b/packages/cli-core/src/services/CliService.ts @@ -1,5 +1,18 @@ import {classOf} from "@tsed/core"; -import {Constant, DIContext, getContext, Inject, Injectable, InjectorService, Provider, runInContext} from "@tsed/di"; +import { + $emit, + configuration, + constant, + destroyInjector, + DIContext, + getContext, + inject, + Injectable, + injector, + logger, + Provider, + runInContext +} from "@tsed/di"; import {Argument, Command} from "commander"; import Inquirer from "inquirer"; // @ts-ignore @@ -23,26 +36,12 @@ Inquirer.registerPrompt("autocomplete", inquirer_autocomplete_prompt); @Injectable() export class CliService { + readonly reinstallAfterRun = constant("project.reinstallAfterRun", false); readonly program = new Command(); - - @Constant("project.reinstallAfterRun", false) - reinstallAfterRun = false; - - @Constant("pkg", {version: "1.0.0"}) - protected pkg: any; - - @Inject() - protected injector: InjectorService; - - @Inject() - protected hooks: CliHooks; - - @Inject() - protected projectPkg: ProjectPackageJson; - - @Inject(PackageManagersModule) - protected packageManagers: PackageManagersModule; - + protected pkg: Record = constant("pkg", {version: "1.0.0"}); + protected hooks = inject(CliHooks); + protected projectPkg = inject(ProjectPackageJson); + protected packageManagers = inject(PackageManagersModule); private commands = new Map(); /** @@ -67,7 +66,7 @@ export class CliService { */ public runLifecycle(cmdName: string, data: any = {}, $ctx: DIContext) { return runInContext($ctx, async () => { - await this.injector.emit("$loadPackageJson"); + await $emit("$loadPackageJson"); data = await this.beforePrompt(cmdName, data); @@ -85,13 +84,13 @@ export class CliService { await this.exec(cmdName, data, $ctx); } catch (er) { - await this.injector.emit("$onFinish", er); - await this.injector.destroy(); + await $emit("$onFinish", er); + await destroyInjector(); throw er; } - await this.injector.emit("$onFinish"); - await this.injector.destroy(); + await $emit("$onFinish"); + await destroyInjector(); } public async exec(cmdName: string, data: any, $ctx: DIContext) { @@ -119,13 +118,14 @@ export class CliService { */ public async beforePrompt(cmdName: string, ctx: any = {}) { const provider = this.commands.get(cmdName); - const instance = this.injector.get(provider.useClass)!; + const instance = inject(provider.useClass)!; const verbose = ctx.verbose; if (instance.$beforePrompt) { ctx = await instance.$beforePrompt(JSON.parse(JSON.stringify(ctx))); ctx.verbose = verbose; } + return ctx; } @@ -136,7 +136,7 @@ export class CliService { */ public async prompt(cmdName: string, ctx: any = {}) { const provider = this.commands.get(cmdName); - const instance = this.injector.get(provider.useClass)!; + const instance = inject(provider.useClass)!; if (instance.$prompt) { const questions = [ @@ -163,7 +163,7 @@ export class CliService { public async getTasks(cmdName: string, data: any) { const $ctx = getContext()!; const provider = this.commands.get(cmdName); - const instance = this.injector.get(provider.token)!; + const instance = inject(provider.token)!; data = this.mapData(cmdName, data, $ctx); @@ -176,7 +176,7 @@ export class CliService { public async getPostInstallTasks(cmdName: string, data: any) { const provider = this.commands.get(cmdName); - const instance = this.injector.get(provider.useClass)!; + const instance = inject(provider.useClass)!; data = this.mapData(cmdName, data, getContext()!); @@ -214,16 +214,17 @@ export class CliService { const $ctx = new DIContext({ id: v4(), - injector: this.injector, - logger: this.injector.logger, - level: this.injector.logger.level, + injector: injector(), + logger: logger(), + level: logger().level, maxStackSize: 0, platform: "CLI" }); $ctx.set("data", data); $ctx.set("command", metadata); - this.injector.settings.set("command.metadata", metadata); + + configuration().set("command.metadata", metadata); return this.runLifecycle(name, data, $ctx); }; @@ -245,12 +246,14 @@ export class CliService { } private load() { - this.injector.getProviders("command").forEach((provider) => this.build(provider)); + injector() + .getProviders("command") + .forEach((provider) => this.build(provider)); } private mapData(cmdName: string, data: any, $ctx: DIContext) { const provider = this.commands.get(cmdName); - const instance = this.injector.get(provider.useClass)!; + const instance = inject(provider.useClass)!; const verbose = data.verbose; if (instance.$mapContext) { @@ -259,9 +262,9 @@ export class CliService { } if (data.verbose) { - this.injector.logger.level = "debug"; + logger().level = "debug"; } else { - this.injector.logger.level = "info"; + logger().level = "info"; } data.bindLogger = $ctx.get("command").bindLogger; diff --git a/packages/cli-core/src/services/CliYaml.ts b/packages/cli-core/src/services/CliYaml.ts index c7a18cfea..1916ab8e2 100644 --- a/packages/cli-core/src/services/CliYaml.ts +++ b/packages/cli-core/src/services/CliYaml.ts @@ -1,12 +1,11 @@ -import {Inject, Injectable} from "@tsed/di"; +import {inject, Injectable} from "@tsed/di"; import JsYaml from "js-yaml"; import {CliFs} from "./CliFs.js"; @Injectable() export class CliYaml { - @Inject() - protected fs: CliFs; + protected fs = inject(CliFs); async read(path: string) { const content = await this.fs.readFile(path, {encoding: "utf8"}); diff --git a/packages/cli-core/src/services/NpmRegistryClient.ts b/packages/cli-core/src/services/NpmRegistryClient.ts index 57641112b..6c9f29b28 100644 --- a/packages/cli-core/src/services/NpmRegistryClient.ts +++ b/packages/cli-core/src/services/NpmRegistryClient.ts @@ -1,4 +1,4 @@ -import {Inject, Injectable} from "@tsed/di"; +import {inject, Injectable} from "@tsed/di"; import registry_url from "registry-url"; import url from "url"; @@ -21,8 +21,7 @@ export const SCOPE_SEPARATOR = "%2f"; @Injectable() export class NpmRegistryClient { - @Inject(CliHttpClient) - private httpClient: CliHttpClient; + private httpClient = inject(CliHttpClient); static escapeName(name: string): string { // scoped packages contain slashes and the npm registry expects them to be escaped diff --git a/packages/cli-core/src/services/ProjectPackageJson.ts b/packages/cli-core/src/services/ProjectPackageJson.ts index bc2568390..a4b2bfbce 100644 --- a/packages/cli-core/src/services/ProjectPackageJson.ts +++ b/packages/cli-core/src/services/ProjectPackageJson.ts @@ -1,5 +1,5 @@ import {getValue, setValue} from "@tsed/core"; -import {Configuration, Injectable} from "@tsed/di"; +import {configuration, constant, inject, Injectable} from "@tsed/di"; import {dirname, join} from "path"; import {readPackageUpSync} from "read-pkg-up"; @@ -40,14 +40,11 @@ function mapPackages(deps: any) { export class ProjectPackageJson { public rewrite = false; public reinstall = false; - public GH_TOKEN: string; + protected fs = inject(CliFs); private raw: PackageJson; - constructor( - @Configuration() private configuration: Configuration, - protected fs: CliFs - ) { + constructor() { this.setRaw({ name: "", version: "1.0.0", @@ -64,11 +61,11 @@ export class ProjectPackageJson { } get dir() { - return String(this.configuration.project?.rootDir); + return String(constant("project.rootDir")); } set dir(dir: string) { - this.configuration.project.rootDir = dir; + configuration().project.rootDir = dir; this.read(); } @@ -110,7 +107,7 @@ export class ProjectPackageJson { } get preferences(): ProjectPreferences { - return this.raw[this.configuration.name]; + return this.raw[constant("name")!]; } $loadPackageJson() { @@ -128,12 +125,13 @@ export class ProjectPackageJson { } setRaw(pkg: any) { - const projectPreferences = this.configuration.defaultProjectPreferences; - const preferences = getValue(pkg, this.configuration.name); + const config = configuration(); + const projectPreferences = config.defaultProjectPreferences; + const preferences = getValue(pkg, config.name); this.raw = { ...pkg, - [this.configuration.name]: { + [config.name]: { ...(projectPreferences && projectPreferences(pkg)), ...preferences } @@ -198,7 +196,7 @@ export class ProjectPackageJson { } setPreference(key: keyof ProjectPreferences, value: any) { - setValue(this.raw, `${this.configuration.name}.${key}`, value); + setValue(this.raw, `${constant("name")}.${key}`, value); this.rewrite = true; return; @@ -276,7 +274,7 @@ export class ProjectPackageJson { this.reinstall = false; this.rewrite = false; - const cwd = this.configuration.get("project.rootDir"); + const cwd = constant("project.rootDir"); const pkgPath = join(String(cwd), "package.json"); const pkg = this.fs.readJsonSync(pkgPath, {encoding: "utf8"}); @@ -296,9 +294,11 @@ export class ProjectPackageJson { ...pkg.devDependencies }; - pkg[this.configuration.name] = { - ...this.raw[this.configuration.name], - ...pkg[this.configuration.name] + const name = constant("name")!; + + pkg[name] = { + ...this.raw[name], + ...pkg[name] }; this.raw = pkg; @@ -307,9 +307,9 @@ export class ProjectPackageJson { } protected getPackageJson() { - const cwd = this.configuration.get("project.rootDir"); - const disableReadUpPkg = this.configuration.get("command.metadata.disableReadUpPkg"); - const name = this.configuration.get("name"); + const cwd = constant("project.rootDir"); + const disableReadUpPkg = constant("command.metadata.disableReadUpPkg"); + const name = constant("name")!; const pkgPath = join(String(cwd), "package.json"); const fileExists = this.fs.exists(pkgPath); @@ -321,7 +321,7 @@ export class ProjectPackageJson { if (result && result.path) { const pkgPath = dirname(result.path); - this.configuration.set("project.root", pkgPath); + configuration().set("project.root", pkgPath); const pkg = this.fs.readJsonSync(result.path, {encoding: "utf8"}); @@ -331,7 +331,7 @@ export class ProjectPackageJson { if (disableReadUpPkg && fileExists) { const pkg = this.fs.readJsonSync(pkgPath, {encoding: "utf8"}); - this.configuration.set("project.root", pkgPath); + configuration().set("project.root", pkgPath); return {...this.getEmptyPackageJson(name), ...pkg} as any; } diff --git a/packages/cli-core/src/services/Renderer.ts b/packages/cli-core/src/services/Renderer.ts index 6315a1d08..c444dcf18 100644 --- a/packages/cli-core/src/services/Renderer.ts +++ b/packages/cli-core/src/services/Renderer.ts @@ -1,7 +1,7 @@ import "../utils/hbs/index.js"; import {isString} from "@tsed/core"; -import {Configuration, Constant, Inject, Injectable} from "@tsed/di"; +import {Configuration, constant, inject, Injectable} from "@tsed/di"; import {normalizePath} from "@tsed/normalize-path"; import Consolidate from "consolidate"; import fs from "fs-extra"; @@ -25,15 +25,10 @@ export interface RenderOptions { } export abstract class Renderer { - @Constant("templateDir") - templateDir: string; - - @Inject() - fs: CliFs; - cache = new Set(); - - @Configuration() - protected configuration: Configuration; + public templateDir = constant("templateDir", ""); + readonly fs = inject(CliFs); + readonly cache = new Set(); + protected configuration = inject(Configuration); abstract get rootDir(): string; diff --git a/packages/cli-core/src/utils/loadPlugins.ts b/packages/cli-core/src/utils/loadPlugins.ts index fa607280c..cb61727dd 100644 --- a/packages/cli-core/src/utils/loadPlugins.ts +++ b/packages/cli-core/src/utils/loadPlugins.ts @@ -1,4 +1,4 @@ -import {GlobalProviders, InjectorService} from "@tsed/di"; +import {GlobalProviders, injector, logger} from "@tsed/di"; import chalk from "chalk"; import figures from "figures"; @@ -7,12 +7,13 @@ import {ProjectPackageJson} from "../services/ProjectPackageJson.js"; const all = (promises: any[]) => Promise.all(promises); -export async function loadPlugins(injector: InjectorService) { - const name = injector.settings.get("name"); - const rootDir = injector.settings.get("project.rootDir"); +export async function loadPlugins() { + const $inj = injector(); + const name = $inj.settings.get("name"); + const rootDir = $inj.settings.get("project.rootDir"); - const projectPackageJson = injector.invoke(ProjectPackageJson); - const fs = injector.invoke(CliFs); + const projectPackageJson = $inj.invoke(ProjectPackageJson); + const fs = $inj.invoke(CliFs); const promises = Object.keys(projectPackageJson.allDependencies) .filter((mod) => mod.startsWith(`@${name}/cli-plugin`) || mod.includes(`${name}-cli-plugin`)) @@ -20,30 +21,30 @@ export async function loadPlugins(injector: InjectorService) { try { const {default: plugin} = await fs.importModule(mod, rootDir); - if (!injector.has(plugin)) { + if (!$inj.has(plugin)) { const provider = GlobalProviders.get(plugin)?.clone(); if (provider?.imports.length) { await all( provider.imports.map(async (token: any) => { - injector.add(token, GlobalProviders.get(token)?.clone()); + $inj.add(token, GlobalProviders.get(token)?.clone()); - if (injector.settings.get("loaded")) { - await injector.invoke(token); + if ($inj.settings.get("loaded")) { + await $inj.invoke(token); } }) ); } - injector.add(plugin, provider); + $inj.add(plugin, provider); - if (injector.settings.get("loaded")) { - await injector.invoke(plugin); + if ($inj.settings.get("loaded")) { + await $inj.invoke(plugin); } } - injector.logger.info(chalk.green(figures.tick), mod, "module loaded"); + logger().info(chalk.green(figures.tick), mod, "module loaded"); } catch (er) { - injector.logger.warn(chalk.red(figures.cross), "Fail to load plugin", mod); + logger().warn(chalk.red(figures.cross), "Fail to load plugin", mod); } }); diff --git a/packages/cli/src/commands/add/AddCmd.ts b/packages/cli/src/commands/add/AddCmd.ts index 400f2d3ef..6c215cc2d 100644 --- a/packages/cli/src/commands/add/AddCmd.ts +++ b/packages/cli/src/commands/add/AddCmd.ts @@ -4,12 +4,12 @@ import { Command, type CommandProvider, createSubTasks, + inject, PackageManagersModule, ProjectPackageJson, type QuestionOptions, type Task } from "@tsed/cli-core"; -import {Inject} from "@tsed/di"; export interface AddCmdOptions extends CliDefaultOptions { name: string; @@ -26,14 +26,9 @@ export interface AddCmdOptions extends CliDefaultOptions { } }) export class AddCmd implements CommandProvider { - @Inject(CliPlugins) - cliPlugins: CliPlugins; - - @Inject(ProjectPackageJson) - packageJson: ProjectPackageJson; - - @Inject(PackageManagersModule) - packageManagers: PackageManagersModule; + protected cliPlugins = inject(CliPlugins); + protected packageJson = inject(ProjectPackageJson); + protected packageManagers = inject(PackageManagersModule); $prompt(initialOptions: any): QuestionOptions { return [ diff --git a/packages/cli/src/commands/generate/GenerateCmd.spec.ts b/packages/cli/src/commands/generate/GenerateCmd.spec.ts index 3adbb90d8..e043f270f 100644 --- a/packages/cli/src/commands/generate/GenerateCmd.spec.ts +++ b/packages/cli/src/commands/generate/GenerateCmd.spec.ts @@ -1,5 +1,5 @@ // @ts-ignore -import {SrcRendererService} from "@tsed/cli-core"; +import {InjectorService, SrcRendererService} from "@tsed/cli-core"; // @ts-ignore import {CliPlatformTest} from "@tsed/cli-testing"; diff --git a/packages/cli/src/commands/generate/GenerateCmd.ts b/packages/cli/src/commands/generate/GenerateCmd.ts index bada65667..2cf69d22c 100644 --- a/packages/cli/src/commands/generate/GenerateCmd.ts +++ b/packages/cli/src/commands/generate/GenerateCmd.ts @@ -1,4 +1,12 @@ -import {type CliDefaultOptions, Command, type CommandProvider, Inject, ProjectPackageJson, SrcRendererService} from "@tsed/cli-core"; +import { + type CliDefaultOptions, + Command, + type CommandProvider, + Inject, + inject, + ProjectPackageJson, + SrcRendererService +} from "@tsed/cli-core"; import {normalizePath} from "@tsed/normalize-path"; import {kebabCase, pascalCase} from "change-case"; import {globbySync} from "globby"; diff --git a/packages/cli/src/commands/init/InitCmd.ts b/packages/cli/src/commands/init/InitCmd.ts index 2ea0a73b8..d01f9f7eb 100644 --- a/packages/cli/src/commands/init/InitCmd.ts +++ b/packages/cli/src/commands/init/InitCmd.ts @@ -2,7 +2,7 @@ import { CliExeca, CliFs, CliLoadFile, - CliPackageJson, + cliPackageJson, CliPlugins, CliService, Command, @@ -11,6 +11,7 @@ import { createSubTasks, createTasksRunner, Inject, + inject, PackageManager, PackageManagersModule, ProjectPackageJson, @@ -103,44 +104,19 @@ import {getFeaturesPrompt} from "./prompts/getFeaturesPrompt.js"; disableReadUpPkg: true }) export class InitCmd implements CommandProvider { - @Configuration() - protected configuration: Configuration; - - @Inject() - protected cliPlugins: CliPlugins; - - @Inject() - protected packageJson: ProjectPackageJson; - - @Inject() - protected packageManagers: PackageManagersModule; - - @Inject() - protected runtimes: RuntimesModule; - - @Inject() - protected platforms: InitPlatformsModule; - - @CliPackageJson() - protected cliPackageJson: CliPackageJson; - - @Inject() - protected cliService: CliService; - - @Inject() - protected cliLoadFile: CliLoadFile; - - @Inject() - protected rootRenderer: RootRendererService; - - @Inject() - protected outputFilePathPipe: OutputFilePathPipe; - - @Inject() - protected execa: CliExeca; - - @Inject() - protected fs: CliFs; + protected configuration = inject(Configuration); + protected cliPlugins = inject(CliPlugins); + protected packageJson = inject(ProjectPackageJson); + protected packageManagers = inject(PackageManagersModule); + protected runtimes = inject(RuntimesModule); + protected platforms = inject(InitPlatformsModule); + protected cliPackageJson = cliPackageJson(); + protected cliService = inject(CliService); + protected cliLoadFile = inject(CliLoadFile); + protected rootRenderer = inject(RootRendererService); + protected outputFilePathPipe = inject(OutputFilePathPipe); + protected execa = inject(CliExeca); + protected fs = inject(CliFs); checkPrecondition(ctx: InitCmdContext) { const isValid = (types: any, value: any) => (value ? Object.values(types).includes(value) : true); diff --git a/packages/cli/src/commands/run/RunCmd.ts b/packages/cli/src/commands/run/RunCmd.ts index 81aeb8fad..c14a7f53f 100644 --- a/packages/cli/src/commands/run/RunCmd.ts +++ b/packages/cli/src/commands/run/RunCmd.ts @@ -1,4 +1,4 @@ -import {CliFs, CliRunScript, Command, type CommandProvider, normalizePath, ProjectPackageJson, type Tasks} from "@tsed/cli-core"; +import {CliFs, CliRunScript, Command, type CommandProvider, inject, normalizePath, ProjectPackageJson, type Tasks} from "@tsed/cli-core"; import {Inject} from "@tsed/di"; export interface RunCmdContext { @@ -27,14 +27,9 @@ export interface RunCmdContext { allowUnknownOption: true }) export class RunCmd implements CommandProvider { - @Inject() - fs: CliFs; - - @Inject() - projectPackageJson: ProjectPackageJson; - - @Inject() - runScript: CliRunScript; + protected fs = inject(CliFs); + protected projectPackageJson = inject(ProjectPackageJson); + protected runScript = inject(CliRunScript); async $exec(ctx: RunCmdContext): Promise { const cmd = "node"; diff --git a/packages/cli/src/commands/update/UpdateCmd.spec.ts b/packages/cli/src/commands/update/UpdateCmd.spec.ts index 79b090516..80b427be2 100644 --- a/packages/cli/src/commands/update/UpdateCmd.spec.ts +++ b/packages/cli/src/commands/update/UpdateCmd.spec.ts @@ -139,12 +139,14 @@ describe("UpdateCmd", () => { rawArgs: [] }); + // @ts-ignore expect(command.projectPackage.dependencies).toEqual({ "@tsed/common": "8.0.0-alpha.4", "@tsed/core": "8.0.0-alpha.4", "@tsed/di": "8.0.0-alpha.4", "@tsed/logger": "^5.5.0" }); + // @ts-ignore expect(command.projectPackage.devDependencies).toEqual({ "@tsed/cli-plugin-eslint": "1.5.0", "@tsed/cli-plugin-typeorm": "1.5.0" diff --git a/packages/cli/src/commands/update/UpdateCmd.ts b/packages/cli/src/commands/update/UpdateCmd.ts index 112f1deff..f5b790b4c 100644 --- a/packages/cli/src/commands/update/UpdateCmd.ts +++ b/packages/cli/src/commands/update/UpdateCmd.ts @@ -5,6 +5,7 @@ import { type CommandProvider, createSubTasks, Inject, + inject, NpmRegistryClient, PackageManagersModule, ProjectPackageJson, @@ -43,17 +44,10 @@ function shouldUpdate(pkg: string) { options: {} }) export class UpdateCmd implements CommandProvider { - @Inject(NpmRegistryClient) - npmRegistryClient: NpmRegistryClient; - - @Inject(ProjectPackageJson) - projectPackage: ProjectPackageJson; - - @Inject(PackageManagersModule) - packageManagers: PackageManagersModule; - - @CliPackageJson() - cliPackage: CliPackageJson; + protected npmRegistryClient = inject(NpmRegistryClient); + protected projectPackage = inject(ProjectPackageJson); + protected packageManagers = inject(PackageManagersModule); + protected cliPackage = inject(CliPackageJson); private versions: any; diff --git a/packages/cli/src/pipes/ClassNamePipe.spec.ts b/packages/cli/src/pipes/ClassNamePipe.spec.ts index f61183f34..480b0afdc 100644 --- a/packages/cli/src/pipes/ClassNamePipe.spec.ts +++ b/packages/cli/src/pipes/ClassNamePipe.spec.ts @@ -2,6 +2,7 @@ import {ProjectPackageJson} from "@tsed/cli-core"; import {DITest} from "@tsed/di"; import {ProjectConvention} from "../interfaces/index.js"; +import {ProvidersInfoService} from "../services/ProvidersInfoService.js"; import {ClassNamePipe} from "./ClassNamePipe.js"; describe("ClassNamePipe", () => { @@ -17,23 +18,28 @@ describe("ClassNamePipe", () => { } ]); + // @ts-ignore pipe.providers.add({ name: "Controller", value: "controller", model: "{{symbolName}}.controller" }); + // @ts-ignore pipe.providers.add({ name: "Factory", value: "factory", model: "{{symbolName}}.factory?" }); + // @ts-ignore pipe.providers.add({ name: "Factory", value: "factory", model: "{{symbolName}}.factory?" }); + + // @ts-ignore pipe.providers.add({ name: "TypeORM Datasource", value: "typeorm:datasource", diff --git a/packages/cli/src/pipes/ClassNamePipe.ts b/packages/cli/src/pipes/ClassNamePipe.ts index b6292654f..7cda514e5 100644 --- a/packages/cli/src/pipes/ClassNamePipe.ts +++ b/packages/cli/src/pipes/ClassNamePipe.ts @@ -1,5 +1,5 @@ -import {Injectable, ProjectPackageJson} from "@tsed/cli-core"; -import {Inject} from "@tsed/di"; +import {ProjectPackageJson} from "@tsed/cli-core"; +import {inject, Injectable} from "@tsed/di"; import {kebabCase, pascalCase} from "change-case"; import {basename} from "path"; @@ -8,11 +8,8 @@ import {ProvidersInfoService} from "../services/ProvidersInfoService.js"; @Injectable() export class ClassNamePipe { - @Inject() - providers: ProvidersInfoService; - - @Inject() - projectPackageJson: ProjectPackageJson; + protected providers: ProvidersInfoService = inject(ProvidersInfoService); + protected projectPackageJson = inject(ProjectPackageJson); transform(options: {name: string; type: string; format?: ProjectConvention}) { const format = options.format || this.projectPackageJson.preferences.convention || ProjectConvention.DEFAULT; diff --git a/packages/cli/src/pipes/OutputFilePathPipe.ts b/packages/cli/src/pipes/OutputFilePathPipe.ts index b84774383..dc665def4 100644 --- a/packages/cli/src/pipes/OutputFilePathPipe.ts +++ b/packages/cli/src/pipes/OutputFilePathPipe.ts @@ -1,4 +1,4 @@ -import {Injectable, ProjectPackageJson} from "@tsed/cli-core"; +import {inject, Injectable, ProjectPackageJson} from "@tsed/cli-core"; import {Inject} from "@tsed/di"; import {dirname, join} from "path"; @@ -8,14 +8,9 @@ import {ClassNamePipe} from "./ClassNamePipe.js"; @Injectable() export class OutputFilePathPipe { - @Inject() - protected providers: ProvidersInfoService; - - @Inject() - protected projectPackageJson: ProjectPackageJson; - - @Inject() - protected classNamePipe: ClassNamePipe; + protected providers = inject(ProvidersInfoService); + protected projectPackageJson = inject(ProjectPackageJson); + protected classNamePipe = inject(ClassNamePipe); transform(options: {name: string; type: string; subDir?: string; baseDir?: string; format?: ProjectConvention}) { options.format = options.format || this.projectPackageJson.preferences.convention || ProjectConvention.DEFAULT; diff --git a/packages/cli/src/platforms/InitPlatformsModule.ts b/packages/cli/src/platforms/InitPlatformsModule.ts index 624ea0d43..526976e1a 100644 --- a/packages/cli/src/platforms/InitPlatformsModule.ts +++ b/packages/cli/src/platforms/InitPlatformsModule.ts @@ -1,4 +1,4 @@ -import {Inject} from "@tsed/cli-core"; +import {Inject, injectMany} from "@tsed/cli-core"; import {Module} from "@tsed/di"; import type {InitBasePlatform} from "./supports/InitBasePlatform.js"; @@ -9,7 +9,8 @@ import {InitKoaPlatform} from "./supports/InitKoaPlatform.js"; imports: [InitExpressPlatform, InitKoaPlatform] }) export class InitPlatformsModule { - constructor(@Inject("platform:init") private platforms: InitBasePlatform[]) {} + private platforms = injectMany("platform:init"); + get(name: string) { return this.platforms.find((platform) => platform.name === name)!; } diff --git a/packages/cli/src/runtimes/RuntimesModule.ts b/packages/cli/src/runtimes/RuntimesModule.ts index 395beaba2..e5bfe2fe9 100644 --- a/packages/cli/src/runtimes/RuntimesModule.ts +++ b/packages/cli/src/runtimes/RuntimesModule.ts @@ -1,5 +1,5 @@ import {PackageManagersModule, ProjectPackageJson} from "@tsed/cli-core"; -import {Inject, Module} from "@tsed/di"; +import {Inject, inject, Module} from "@tsed/di"; import {BabelRuntime} from "./supports/BabelRuntime.js"; import {BaseRuntime} from "./supports/BaseRuntime.js"; @@ -15,11 +15,8 @@ export interface RuntimeInitOptions extends Record { imports: [NodeRuntime, BabelRuntime, WebpackRuntime, BunRuntime] }) export class RuntimesModule { - @Inject() - protected projectPackageJson: ProjectPackageJson; - - @Inject() - protected packagesManager: PackageManagersModule; + protected projectPackageJson = inject(ProjectPackageJson); + protected packagesManager = inject(PackageManagersModule); constructor(@Inject("runtime") protected runtimes: BaseRuntime[]) { this.runtimes = runtimes.filter((manager) => manager.has()); diff --git a/yarn.lock b/yarn.lock index 16ba32032..9307e16bd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2349,8 +2349,8 @@ __metadata: uuid: "npm:^10.0.0" vitest: "npm:2.1.1" peerDependencies: - "@tsed/core": ">=8.0.0-beta.1" - "@tsed/di": ">=8.0.0-beta.1" + "@tsed/core": ">=8.0.0-beta.2" + "@tsed/di": ">=8.0.0-beta.2" languageName: unknown linkType: soft From 66c9b671ea11403d0a7331417ca7ae2760d33a56 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Thu, 10 Oct 2024 08:58:19 +0200 Subject: [PATCH 65/69] refactor: migrate plugins code to functional API --- .../src/commands/GenerateHttpClientCmd.ts | 18 ++++--------- .../src/commands/GenerateSwaggerCmd.ts | 16 +++--------- .../src/hooks/EslintInitHook.ts | 13 +++------- .../src/CliPluginJestModule.ts | 10 +++---- .../src/CliPluginMongooseModule.ts | 6 ++--- .../src/hooks/MongooseGenerateHook.ts | 19 +++++--------- .../src/hooks/MongooseInitHook.ts | 19 +++----------- .../src/services/CliMongoose.ts | 9 +++---- .../src/CliPluginOidcProviderModule.ts | 6 ++--- .../src/hooks/OidcProviderInitHook.ts | 15 +++-------- .../src/CliPluginPassportModule.ts | 5 ++-- .../src/hooks/PassportGenerateHook.ts | 16 ++++-------- .../src/services/PassportClient.ts | 5 ++-- .../src/CliPluginPrismaModule.ts | 8 ++---- .../src/commands/PrismaCmd.ts | 5 ++-- .../src/hooks/PrismaInitHook.ts | 16 +++--------- .../src/TypeGraphqlModule.ts | 5 ++-- .../src/hooks/TypeGraphqlInitHook.ts | 12 +++------ .../src/CliPluginTypeORMModule.ts | 6 ++--- .../src/hooks/TypeORMGenerateHook.ts | 13 +++------- .../src/hooks/TypeORMInitHook.ts | 26 +++---------------- .../src/CliPluginVitestModule.ts | 10 +++---- .../src/hooks/VitestGenerateHook.ts | 5 ++-- 23 files changed, 72 insertions(+), 191 deletions(-) diff --git a/packages/cli-generate-http-client/src/commands/GenerateHttpClientCmd.ts b/packages/cli-generate-http-client/src/commands/GenerateHttpClientCmd.ts index f254cb09d..cda858b09 100644 --- a/packages/cli-generate-http-client/src/commands/GenerateHttpClientCmd.ts +++ b/packages/cli-generate-http-client/src/commands/GenerateHttpClientCmd.ts @@ -1,6 +1,6 @@ -import {CliFs, Command, type CommandProvider, Inject, Type} from "@tsed/cli-core"; +import {CliFs, Command, type CommandProvider, constant, inject, Type} from "@tsed/cli-core"; import {isString} from "@tsed/core"; -import {Constant, InjectorService} from "@tsed/di"; +import {InjectorService} from "@tsed/di"; import {camelCase} from "change-case"; import path, {join, resolve} from "path"; import {generateApi, type Hooks, type RawRouteInfo, type RouteNameInfo} from "swagger-typescript-api"; @@ -48,17 +48,9 @@ export interface GenerateHttpClientOpts { } }) export class GenerateHttpClientCmd implements CommandProvider { - @Inject() - injector: InjectorService; - - @Inject() - protected fs: CliFs; - - @Constant("server") - protected serverModule: Type; - - @Constant("httpClient", {hooks: {}}) - protected options: Partial; + protected fs = inject(CliFs); + protected serverModule = constant>("server"); + protected options = constant>("httpClient", {hooks: {}}); $mapContext($ctx: GenerateHttpClientCtx) { return {...$ctx, output: resolve(join(process.cwd(), $ctx.output))}; diff --git a/packages/cli-generate-swagger/src/commands/GenerateSwaggerCmd.ts b/packages/cli-generate-swagger/src/commands/GenerateSwaggerCmd.ts index a869a0244..1e36c0c95 100644 --- a/packages/cli-generate-swagger/src/commands/GenerateSwaggerCmd.ts +++ b/packages/cli-generate-swagger/src/commands/GenerateSwaggerCmd.ts @@ -1,4 +1,4 @@ -import {CliFs, CliYaml, Command, type CommandProvider, Constant, Inject, InjectorService, Type} from "@tsed/cli-core"; +import {CliFs, CliYaml, Command, type CommandProvider, Constant, constant, Inject, inject, InjectorService, Type} from "@tsed/cli-core"; import path, {join, resolve} from "path"; export interface GenerateSwaggerCtx { @@ -17,17 +17,9 @@ export interface GenerateSwaggerCtx { } }) export class GenerateSwaggerCmd implements CommandProvider { - @Inject() - injector: InjectorService; - - @Inject() - protected fs: CliFs; - - @Inject() - protected cliYaml: CliYaml; - - @Constant("server") - protected serverModule: Type; + protected fs = inject(CliFs); + protected cliYaml = inject(CliYaml); + protected serverModule = constant>("server"); $mapContext($ctx: GenerateSwaggerCtx) { return {...$ctx, output: resolve(join(process.cwd(), $ctx.output))}; diff --git a/packages/cli-plugin-eslint/src/hooks/EslintInitHook.ts b/packages/cli-plugin-eslint/src/hooks/EslintInitHook.ts index 897375fe7..8e6e1de7e 100644 --- a/packages/cli-plugin-eslint/src/hooks/EslintInitHook.ts +++ b/packages/cli-plugin-eslint/src/hooks/EslintInitHook.ts @@ -1,18 +1,13 @@ import type {InitCmdContext} from "@tsed/cli"; -import {Inject, Injectable, OnExec, OnPostInstall, PackageManagersModule, ProjectPackageJson, RootRendererService} from "@tsed/cli-core"; +import {inject, Injectable, OnExec, OnPostInstall, PackageManagersModule, ProjectPackageJson, RootRendererService} from "@tsed/cli-core"; import {TEMPLATE_DIR} from "../utils/templateDir.js"; @Injectable() export class EslintInitHook { - @Inject() - protected packageJson: ProjectPackageJson; - - @Inject() - protected packageManagers: PackageManagersModule; - - @Inject() - protected rootRenderer: RootRendererService; + protected packageJson = inject(ProjectPackageJson); + protected packageManagers = inject(PackageManagersModule); + protected rootRenderer = inject(RootRendererService); @OnExec("init") onExec(ctx: InitCmdContext) { diff --git a/packages/cli-plugin-jest/src/CliPluginJestModule.ts b/packages/cli-plugin-jest/src/CliPluginJestModule.ts index d7f2662b5..56ff5dd66 100644 --- a/packages/cli-plugin-jest/src/CliPluginJestModule.ts +++ b/packages/cli-plugin-jest/src/CliPluginJestModule.ts @@ -1,6 +1,5 @@ import {RuntimesModule} from "@tsed/cli"; -import {Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core"; -import {Inject} from "@tsed/di"; +import {inject, Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core"; import {JestGenerateHook} from "./hooks/JestGenerateHook.js"; import {JestInitHook} from "./hooks/JestInitHook.js"; @@ -9,11 +8,8 @@ import {JestInitHook} from "./hooks/JestInitHook.js"; imports: [JestInitHook, JestGenerateHook] }) export class CliPluginJestModule { - @Inject() - runtimes: RuntimesModule; - - @Inject() - packageJson: ProjectPackageJson; + protected runtimes = inject(RuntimesModule); + protected packageJson = inject(ProjectPackageJson); @OnAdd("@tsed/cli-plugin-jest") install() { diff --git a/packages/cli-plugin-mongoose/src/CliPluginMongooseModule.ts b/packages/cli-plugin-mongoose/src/CliPluginMongooseModule.ts index b62048b66..13ab2eac5 100644 --- a/packages/cli-plugin-mongoose/src/CliPluginMongooseModule.ts +++ b/packages/cli-plugin-mongoose/src/CliPluginMongooseModule.ts @@ -1,5 +1,4 @@ -import {Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core"; -import {Inject} from "@tsed/di"; +import {inject, Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core"; import {MongooseGenerateHook} from "./hooks/MongooseGenerateHook.js"; import {MongooseInitHook} from "./hooks/MongooseInitHook.js"; @@ -9,8 +8,7 @@ import {CliMongoose} from "./services/CliMongoose.js"; imports: [MongooseInitHook, MongooseGenerateHook, CliMongoose] }) export class CliPluginMongooseModule { - @Inject() - packageJson: ProjectPackageJson; + protected packageJson = inject(ProjectPackageJson); @OnAdd("@tsed/cli-plugin-mongoose") install() { diff --git a/packages/cli-plugin-mongoose/src/hooks/MongooseGenerateHook.ts b/packages/cli-plugin-mongoose/src/hooks/MongooseGenerateHook.ts index 782037ee6..e2d4267ca 100644 --- a/packages/cli-plugin-mongoose/src/hooks/MongooseGenerateHook.ts +++ b/packages/cli-plugin-mongoose/src/hooks/MongooseGenerateHook.ts @@ -1,5 +1,5 @@ import {type GenerateCmdContext, ProvidersInfoService} from "@tsed/cli"; -import {CliDockerComposeYaml, Inject, OnExec, ProjectPackageJson, SrcRendererService, type Tasks} from "@tsed/cli-core"; +import {CliDockerComposeYaml, inject, OnExec, ProjectPackageJson, SrcRendererService, type Tasks} from "@tsed/cli-core"; import {Injectable} from "@tsed/di"; import {camelCase, kebabCase} from "change-case"; // @ts-ignore @@ -10,18 +10,11 @@ import {TEMPLATE_DIR} from "../utils/templateDir.js"; @Injectable() export class MongooseGenerateHook { - @Inject() - projectPackageJson: ProjectPackageJson; - - @Inject() - srcRenderService: SrcRendererService; - - @Inject() - cliMongoose: CliMongoose; - - packages: any[]; - @Inject() - protected cliDockerComposeYaml: CliDockerComposeYaml; + protected projectPackageJson = inject(ProjectPackageJson); + protected srcRenderService = inject(SrcRendererService); + protected cliMongoose = inject(CliMongoose); + protected packages: any[]; + protected cliDockerComposeYaml = inject(CliDockerComposeYaml); constructor(private providersInfoService: ProvidersInfoService) { providersInfoService diff --git a/packages/cli-plugin-mongoose/src/hooks/MongooseInitHook.ts b/packages/cli-plugin-mongoose/src/hooks/MongooseInitHook.ts index 53f680abb..c9396beaf 100644 --- a/packages/cli-plugin-mongoose/src/hooks/MongooseInitHook.ts +++ b/packages/cli-plugin-mongoose/src/hooks/MongooseInitHook.ts @@ -1,25 +1,14 @@ import type {InitCmdContext} from "@tsed/cli"; -import {CliDockerComposeYaml, Inject, OnExec, ProjectPackageJson, RootRendererService, SrcRendererService} from "@tsed/cli-core"; +import {CliDockerComposeYaml, inject, OnExec, ProjectPackageJson} from "@tsed/cli-core"; import {Injectable} from "@tsed/di"; import {CliMongoose} from "../services/CliMongoose.js"; @Injectable() export class MongooseInitHook { - @Inject() - cliMongoose: CliMongoose; - - @Inject() - protected packageJson: ProjectPackageJson; - - @Inject() - protected rootRenderer: RootRendererService; - - @Inject() - protected srcRenderer: SrcRendererService; - - @Inject() - protected cliDockerComposeYaml: CliDockerComposeYaml; + protected cliMongoose = inject(CliMongoose); + protected packageJson = inject(ProjectPackageJson); + protected cliDockerComposeYaml = inject(CliDockerComposeYaml); @OnExec("init") onExec(ctx: InitCmdContext) { diff --git a/packages/cli-plugin-mongoose/src/services/CliMongoose.ts b/packages/cli-plugin-mongoose/src/services/CliMongoose.ts index 2e499e6ef..6cb77a6a8 100644 --- a/packages/cli-plugin-mongoose/src/services/CliMongoose.ts +++ b/packages/cli-plugin-mongoose/src/services/CliMongoose.ts @@ -1,4 +1,4 @@ -import {Inject, Injectable, ProjectPackageJson, SrcRendererService} from "@tsed/cli-core"; +import {inject, Injectable, ProjectPackageJson, SrcRendererService} from "@tsed/cli-core"; import {camelCase, constantCase, kebabCase} from "change-case"; import {basename, join} from "path"; @@ -6,11 +6,8 @@ import {TEMPLATE_DIR} from "../utils/templateDir.js"; @Injectable() export class CliMongoose { - @Inject() - projectPackageJson: ProjectPackageJson; - - @Inject() - protected srcRenderer: SrcRendererService; + protected projectPackageJson = inject(ProjectPackageJson); + protected srcRenderer = inject(SrcRendererService); async writeConfig(name: string, options: any = {}) { await this.srcRenderer.render( diff --git a/packages/cli-plugin-oidc-provider/src/CliPluginOidcProviderModule.ts b/packages/cli-plugin-oidc-provider/src/CliPluginOidcProviderModule.ts index 16b4c3390..5ca352160 100644 --- a/packages/cli-plugin-oidc-provider/src/CliPluginOidcProviderModule.ts +++ b/packages/cli-plugin-oidc-provider/src/CliPluginOidcProviderModule.ts @@ -1,5 +1,4 @@ -import {Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core"; -import {Inject} from "@tsed/di"; +import {inject, Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core"; import {OidcProviderInitHook} from "./hooks/OidcProviderInitHook.js"; @@ -7,8 +6,7 @@ import {OidcProviderInitHook} from "./hooks/OidcProviderInitHook.js"; imports: [OidcProviderInitHook] }) export class CliPluginOidcProviderModule { - @Inject() - packageJson: ProjectPackageJson; + protected packageJson = inject(ProjectPackageJson); @OnAdd("@tsed/cli-plugin-oidc-provider") install() { diff --git a/packages/cli-plugin-oidc-provider/src/hooks/OidcProviderInitHook.ts b/packages/cli-plugin-oidc-provider/src/hooks/OidcProviderInitHook.ts index 6d6c6b182..55415bcb2 100644 --- a/packages/cli-plugin-oidc-provider/src/hooks/OidcProviderInitHook.ts +++ b/packages/cli-plugin-oidc-provider/src/hooks/OidcProviderInitHook.ts @@ -1,22 +1,13 @@ import type {InitCmdContext} from "@tsed/cli"; -import {CliDockerComposeYaml, Inject, OnExec, ProjectPackageJson, RootRendererService, SrcRendererService} from "@tsed/cli-core"; +import {inject, OnExec, ProjectPackageJson, RootRendererService} from "@tsed/cli-core"; import {Injectable} from "@tsed/di"; import {TEMPLATE_DIR} from "../utils/templateDir.js"; @Injectable() export class OidcProviderInitHook { - @Inject() - protected packageJson: ProjectPackageJson; - - @Inject() - protected rootRenderer: RootRendererService; - - @Inject() - protected srcRenderer: SrcRendererService; - - @Inject() - protected cliDockerComposeYaml: CliDockerComposeYaml; + protected packageJson = inject(ProjectPackageJson); + protected rootRenderer = inject(RootRendererService); @OnExec("init") onExec(ctx: InitCmdContext) { diff --git a/packages/cli-plugin-passport/src/CliPluginPassportModule.ts b/packages/cli-plugin-passport/src/CliPluginPassportModule.ts index e889861c5..1389ca775 100644 --- a/packages/cli-plugin-passport/src/CliPluginPassportModule.ts +++ b/packages/cli-plugin-passport/src/CliPluginPassportModule.ts @@ -1,4 +1,4 @@ -import {Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core"; +import {inject, Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core"; import {Inject} from "@tsed/di"; import {PassportGenerateHook} from "./hooks/PassportGenerateHook.js"; @@ -7,8 +7,7 @@ import {PassportGenerateHook} from "./hooks/PassportGenerateHook.js"; imports: [PassportGenerateHook] }) export class CliPluginPassportModule { - @Inject() - packageJson: ProjectPackageJson; + protected packageJson = inject(ProjectPackageJson); @OnAdd("@tsed/cli-plugin-passport") install() { diff --git a/packages/cli-plugin-passport/src/hooks/PassportGenerateHook.ts b/packages/cli-plugin-passport/src/hooks/PassportGenerateHook.ts index 0b08ff626..30067f9a7 100644 --- a/packages/cli-plugin-passport/src/hooks/PassportGenerateHook.ts +++ b/packages/cli-plugin-passport/src/hooks/PassportGenerateHook.ts @@ -1,5 +1,5 @@ import {type GenerateCmdContext, ProvidersInfoService} from "@tsed/cli"; -import {Inject, OnExec, OnPrompt, ProjectPackageJson, SrcRendererService, type Tasks} from "@tsed/cli-core"; +import {inject, OnExec, OnPrompt, ProjectPackageJson, SrcRendererService, type Tasks} from "@tsed/cli-core"; import {Injectable} from "@tsed/di"; import {kebabCase} from "change-case"; @@ -12,16 +12,10 @@ export interface PassportGenerateOptions extends GenerateCmdContext { @Injectable() export class PassportGenerateHook { - @Inject() - projectPackageJson: ProjectPackageJson; - - @Inject() - srcRenderService: SrcRendererService; - - @Inject() - passportClient: PassportClient; - - packages: any[]; + protected projectPackageJson = inject(ProjectPackageJson); + protected srcRenderService = inject(SrcRendererService); + protected passportClient = inject(PassportClient); + protected packages: any[]; constructor(private providersInfoService: ProvidersInfoService) { providersInfoService.add( diff --git a/packages/cli-plugin-passport/src/services/PassportClient.ts b/packages/cli-plugin-passport/src/services/PassportClient.ts index 2d0876c12..ea05c445c 100644 --- a/packages/cli-plugin-passport/src/services/PassportClient.ts +++ b/packages/cli-plugin-passport/src/services/PassportClient.ts @@ -1,11 +1,10 @@ -import {CliHttpClient, Inject, Injectable} from "@tsed/cli-core"; +import {CliHttpClient, inject, Injectable} from "@tsed/cli-core"; const HOST = "http://www.passportjs.org/packages"; @Injectable() export class PassportClient { - @Inject(CliHttpClient) - httpClient: CliHttpClient; + protected httpClient = inject(CliHttpClient); async getPackages(): Promise { const result = await this.httpClient.get(`${HOST}/-/all.json`, {}); diff --git a/packages/cli-plugin-prisma/src/CliPluginPrismaModule.ts b/packages/cli-plugin-prisma/src/CliPluginPrismaModule.ts index 08488e654..d926b29bd 100644 --- a/packages/cli-plugin-prisma/src/CliPluginPrismaModule.ts +++ b/packages/cli-plugin-prisma/src/CliPluginPrismaModule.ts @@ -1,5 +1,4 @@ -import {Module, ProjectPackageJson} from "@tsed/cli-core"; -import {Inject} from "@tsed/di"; +import {Module} from "@tsed/cli-core"; import {PrismaCmd} from "./commands/PrismaCmd.js"; import {PrismaInitHook} from "./hooks/PrismaInitHook.js"; @@ -7,7 +6,4 @@ import {PrismaInitHook} from "./hooks/PrismaInitHook.js"; @Module({ imports: [PrismaInitHook, PrismaCmd] }) -export class CliPluginPrismaModule { - @Inject() - packageJson: ProjectPackageJson; -} +export class CliPluginPrismaModule {} diff --git a/packages/cli-plugin-prisma/src/commands/PrismaCmd.ts b/packages/cli-plugin-prisma/src/commands/PrismaCmd.ts index 447afb32b..2f9eee353 100644 --- a/packages/cli-plugin-prisma/src/commands/PrismaCmd.ts +++ b/packages/cli-plugin-prisma/src/commands/PrismaCmd.ts @@ -1,4 +1,4 @@ -import {type CliDefaultOptions, Command, type CommandProvider, Inject} from "@tsed/cli-core"; +import {type CliDefaultOptions, Command, type CommandProvider, inject} from "@tsed/cli-core"; import {CliPrisma} from "../services/CliPrisma.js"; @@ -20,8 +20,7 @@ export interface PrismaContext extends CliDefaultOptions { allowUnknownOption: true }) export class PrismaCmd implements CommandProvider { - @Inject() - cli: CliPrisma; + protected cli = inject(CliPrisma); $exec(ctx: PrismaContext) { return [ diff --git a/packages/cli-plugin-prisma/src/hooks/PrismaInitHook.ts b/packages/cli-plugin-prisma/src/hooks/PrismaInitHook.ts index 48aa0172f..058eb93a2 100644 --- a/packages/cli-plugin-prisma/src/hooks/PrismaInitHook.ts +++ b/packages/cli-plugin-prisma/src/hooks/PrismaInitHook.ts @@ -1,22 +1,14 @@ import type {InitCmdContext} from "@tsed/cli"; -import {CliService, Inject, OnExec, PackageManagersModule, ProjectPackageJson} from "@tsed/cli-core"; +import {inject, OnExec, PackageManagersModule, ProjectPackageJson} from "@tsed/cli-core"; import {Injectable} from "@tsed/di"; import {CliPrisma} from "../services/CliPrisma.js"; @Injectable() export class PrismaInitHook { - @Inject() - protected cliPrisma: CliPrisma; - - @Inject() - protected cliService: CliService; - - @Inject() - protected packageJson: ProjectPackageJson; - - @Inject() - protected packageManagers: PackageManagersModule; + protected cliPrisma = inject(CliPrisma); + protected packageJson = inject(ProjectPackageJson); + protected packageManagers = inject(PackageManagersModule); @OnExec("init") onExec(ctx: InitCmdContext) { diff --git a/packages/cli-plugin-typegraphql/src/TypeGraphqlModule.ts b/packages/cli-plugin-typegraphql/src/TypeGraphqlModule.ts index 271508b44..1790e1b2b 100644 --- a/packages/cli-plugin-typegraphql/src/TypeGraphqlModule.ts +++ b/packages/cli-plugin-typegraphql/src/TypeGraphqlModule.ts @@ -1,4 +1,4 @@ -import {Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core"; +import {inject, Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core"; import {Inject} from "@tsed/di"; import {TypeGraphqlInitHook} from "./hooks/TypeGraphqlInitHook.js"; @@ -7,8 +7,7 @@ import {TypeGraphqlInitHook} from "./hooks/TypeGraphqlInitHook.js"; imports: [TypeGraphqlInitHook] }) export class TypeGraphqlModule { - @Inject() - packageJson: ProjectPackageJson; + protected packageJson = inject(ProjectPackageJson); @OnAdd("@tsed/cli-plugin-typegraphql") install(ctx: any) { diff --git a/packages/cli-plugin-typegraphql/src/hooks/TypeGraphqlInitHook.ts b/packages/cli-plugin-typegraphql/src/hooks/TypeGraphqlInitHook.ts index d4be0a1a6..2b5dadf42 100644 --- a/packages/cli-plugin-typegraphql/src/hooks/TypeGraphqlInitHook.ts +++ b/packages/cli-plugin-typegraphql/src/hooks/TypeGraphqlInitHook.ts @@ -1,19 +1,13 @@ import type {InitCmdContext} from "@tsed/cli"; -import {Inject, OnExec, ProjectPackageJson, RootRendererService, SrcRendererService} from "@tsed/cli-core"; +import {inject, OnExec, ProjectPackageJson, RootRendererService} from "@tsed/cli-core"; import {Injectable} from "@tsed/di"; import {TEMPLATE_DIR} from "../utils/templateDir.js"; @Injectable() export class TypeGraphqlInitHook { - @Inject() - protected packageJson: ProjectPackageJson; - - @Inject() - protected rootRenderer: RootRendererService; - - @Inject() - protected srcRenderer: SrcRendererService; + protected packageJson = inject(ProjectPackageJson); + protected rootRenderer = inject(RootRendererService); @OnExec("init") onExec(ctx: InitCmdContext) { diff --git a/packages/cli-plugin-typeorm/src/CliPluginTypeORMModule.ts b/packages/cli-plugin-typeorm/src/CliPluginTypeORMModule.ts index 123359b73..765b8bc97 100644 --- a/packages/cli-plugin-typeorm/src/CliPluginTypeORMModule.ts +++ b/packages/cli-plugin-typeorm/src/CliPluginTypeORMModule.ts @@ -1,5 +1,4 @@ -import {Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core"; -import {Inject} from "@tsed/di"; +import {inject, Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core"; import {TypeORMGenerateHook} from "./hooks/TypeORMGenerateHook.js"; import {TypeORMInitHook} from "./hooks/TypeORMInitHook.js"; @@ -8,8 +7,7 @@ import {TypeORMInitHook} from "./hooks/TypeORMInitHook.js"; imports: [TypeORMInitHook, TypeORMGenerateHook] }) export class CliPluginTypeORMModule { - @Inject() - packageJson: ProjectPackageJson; + protected packageJson = inject(ProjectPackageJson); @OnAdd("@tsed/cli-plugin-typeorm") install() { diff --git a/packages/cli-plugin-typeorm/src/hooks/TypeORMGenerateHook.ts b/packages/cli-plugin-typeorm/src/hooks/TypeORMGenerateHook.ts index e4e11bdbc..7f6841b1f 100644 --- a/packages/cli-plugin-typeorm/src/hooks/TypeORMGenerateHook.ts +++ b/packages/cli-plugin-typeorm/src/hooks/TypeORMGenerateHook.ts @@ -1,5 +1,5 @@ import {FeaturesMap, type GenerateCmdContext, ProvidersInfoService} from "@tsed/cli"; -import {CliDockerComposeYaml, Inject, OnExec, OnPrompt, ProjectPackageJson, SrcRendererService, type Tasks} from "@tsed/cli-core"; +import {CliDockerComposeYaml, inject, OnExec, OnPrompt, ProjectPackageJson, SrcRendererService, type Tasks} from "@tsed/cli-core"; import {Injectable} from "@tsed/di"; import {camelCase} from "change-case"; @@ -12,14 +12,9 @@ export interface TypeORMGenerateOptions extends GenerateCmdContext { @Injectable() export class TypeORMGenerateHook { - @Inject() - protected projectPackageJson: ProjectPackageJson; - - @Inject() - protected srcRenderService: SrcRendererService; - - @Inject() - protected cliDockerComposeYaml: CliDockerComposeYaml; + protected projectPackageJson = inject(ProjectPackageJson); + protected srcRenderService = inject(SrcRendererService); + protected cliDockerComposeYaml = inject(CliDockerComposeYaml); constructor(private providersInfoService: ProvidersInfoService) { providersInfoService.add( diff --git a/packages/cli-plugin-typeorm/src/hooks/TypeORMInitHook.ts b/packages/cli-plugin-typeorm/src/hooks/TypeORMInitHook.ts index 7a6b8aadd..10481f6d2 100644 --- a/packages/cli-plugin-typeorm/src/hooks/TypeORMInitHook.ts +++ b/packages/cli-plugin-typeorm/src/hooks/TypeORMInitHook.ts @@ -1,13 +1,5 @@ import type {InitCmdContext} from "@tsed/cli"; -import { - CliDockerComposeYaml, - CliService, - Inject, - OnExec, - ProjectPackageJson, - RootRendererService, - SrcRendererService -} from "@tsed/cli-core"; +import {CliService, inject, OnExec, ProjectPackageJson} from "@tsed/cli-core"; import {Injectable} from "@tsed/di"; import {pascalCase} from "change-case"; @@ -17,20 +9,8 @@ function getDatabase(ctx: InitCmdContext) { @Injectable() export class TypeORMInitHook { - @Inject() - protected cliService: CliService; - - @Inject() - protected packageJson: ProjectPackageJson; - - @Inject() - protected rootRenderer: RootRendererService; - - @Inject() - protected srcRenderer: SrcRendererService; - - @Inject() - protected cliDockerComposeYaml: CliDockerComposeYaml; + protected cliService = inject(CliService); + protected packageJson = inject(ProjectPackageJson); @OnExec("init") onExec(ctx: InitCmdContext) { diff --git a/packages/cli-plugin-vitest/src/CliPluginVitestModule.ts b/packages/cli-plugin-vitest/src/CliPluginVitestModule.ts index 5ec0cd05b..e5ad4d2e4 100644 --- a/packages/cli-plugin-vitest/src/CliPluginVitestModule.ts +++ b/packages/cli-plugin-vitest/src/CliPluginVitestModule.ts @@ -1,6 +1,5 @@ import {RuntimesModule} from "@tsed/cli"; -import {Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core"; -import {Inject} from "@tsed/di"; +import {inject, Module, OnAdd, ProjectPackageJson} from "@tsed/cli-core"; import {VitestGenerateHook} from "./hooks/VitestGenerateHook.js"; import {VitestInitHook} from "./hooks/VitestInitHook.js"; @@ -9,11 +8,8 @@ import {VitestInitHook} from "./hooks/VitestInitHook.js"; imports: [VitestInitHook, VitestGenerateHook] }) export class CliPluginVitestModule { - @Inject() - runtimes: RuntimesModule; - - @Inject() - packageJson: ProjectPackageJson; + protected runtimes = inject(RuntimesModule); + protected packageJson = inject(ProjectPackageJson); @OnAdd("@tsed/cli-plugin-vitest") install() { diff --git a/packages/cli-plugin-vitest/src/hooks/VitestGenerateHook.ts b/packages/cli-plugin-vitest/src/hooks/VitestGenerateHook.ts index 82a3e2955..01a3ae9bc 100644 --- a/packages/cli-plugin-vitest/src/hooks/VitestGenerateHook.ts +++ b/packages/cli-plugin-vitest/src/hooks/VitestGenerateHook.ts @@ -1,13 +1,12 @@ import type {GenerateCmdContext} from "@tsed/cli"; -import {Inject, Injectable, OnExec, SrcRendererService, type Tasks} from "@tsed/cli-core"; +import {inject, Injectable, OnExec, SrcRendererService, type Tasks} from "@tsed/cli-core"; import {normalizePath} from "@tsed/normalize-path"; import {TEMPLATE_DIR} from "../utils/templateDir.js"; @Injectable() export class VitestGenerateHook { - @Inject() - srcRenderService: SrcRendererService; + protected srcRenderService = inject(SrcRendererService); @OnExec("generate") onGenerateExec(ctx: GenerateCmdContext): Tasks { From 68b6c5d03ffcda4213839144b899fd05cdafc65d Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 10 Oct 2024 15:31:06 +0000 Subject: [PATCH 66/69] Github CI build: __run_2 v6.0.0-beta.2 [ci skip] --- lerna.json | 2 +- package.json | 2 +- packages/barrels/package.json | 2 +- packages/cli-core/package.json | 2 +- packages/cli-generate-http-client/package.json | 2 +- packages/cli-generate-swagger/package.json | 2 +- packages/cli-plugin-eslint/package.json | 2 +- packages/cli-plugin-jest/package.json | 2 +- packages/cli-plugin-mongoose/package.json | 2 +- packages/cli-plugin-oidc-provider/package.json | 2 +- packages/cli-plugin-passport/package.json | 2 +- packages/cli-plugin-prisma/package.json | 2 +- packages/cli-plugin-typegraphql/package.json | 2 +- packages/cli-plugin-typeorm/package.json | 2 +- packages/cli-plugin-vitest/package.json | 2 +- packages/cli-testing/package.json | 2 +- packages/cli/package.json | 2 +- tools/typescript/package.json | 2 +- tools/vitest/package.json | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lerna.json b/lerna.json index 2243b8474..4cd40224c 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "packages": [ "packages/*" ], - "version": "6.0.0-beta.1" + "version": "6.0.0-beta.2" } \ No newline at end of file diff --git a/package.json b/package.json index 6be64a88c..e6ad5e463 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@tsed/cli-root", - "version": "6.0.0-beta.1", + "version": "6.0.0-beta.2", "description": "CLI to bootstrap your Ts.ED project", "private": true, "type": "module", diff --git a/packages/barrels/package.json b/packages/barrels/package.json index 034f67a9b..4638183b8 100644 --- a/packages/barrels/package.json +++ b/packages/barrels/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/barrels", "description": "A simple tool to generate barrels for your TypeScript project", - "version": "6.0.0-beta.1", + "version": "6.0.0-beta.2", "type": "module", "bin": "bin/barrels.js", "keywords": [ diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index ad764c155..ae889d7dc 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-core", "description": "Build your CLI with TypeScript and Decorators", - "version": "6.0.0-beta.1", + "version": "6.0.0-beta.2", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-generate-http-client/package.json b/packages/cli-generate-http-client/package.json index 2194b6314..f10c3e2a4 100644 --- a/packages/cli-generate-http-client/package.json +++ b/packages/cli-generate-http-client/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-generate-http-client", "description": "Ts.ED CLI plugin. Export a command that generate an HTTP Client (axios or fetch) from your Ts.ED controllers and OS3 spec.", - "version": "6.0.0-beta.1", + "version": "6.0.0-beta.2", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-generate-swagger/package.json b/packages/cli-generate-swagger/package.json index 61e3a8653..57f140dbd 100644 --- a/packages/cli-generate-swagger/package.json +++ b/packages/cli-generate-swagger/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-generate-swagger", "description": "Ts.ED CLI plugin. Export a command that generate the swagger.json from your Ts.ED controllers and OS3 spec.", - "version": "6.0.0-beta.1", + "version": "6.0.0-beta.2", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-eslint/package.json b/packages/cli-plugin-eslint/package.json index 9c9f23f17..2e36a016f 100644 --- a/packages/cli-plugin-eslint/package.json +++ b/packages/cli-plugin-eslint/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-eslint", "description": "Ts.ED CLI plugin. Add EsLint support", - "version": "6.0.0-beta.1", + "version": "6.0.0-beta.2", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-jest/package.json b/packages/cli-plugin-jest/package.json index 8fc223298..a2511396a 100644 --- a/packages/cli-plugin-jest/package.json +++ b/packages/cli-plugin-jest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-jest", "description": "Ts.ED CLI plugin. Add Jest support", - "version": "6.0.0-beta.1", + "version": "6.0.0-beta.2", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-mongoose/package.json b/packages/cli-plugin-mongoose/package.json index 3a8b0a4da..7c3683ccb 100644 --- a/packages/cli-plugin-mongoose/package.json +++ b/packages/cli-plugin-mongoose/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-mongoose", "description": "Ts.ED CLI plugin. Add Mongoose support", - "version": "6.0.0-beta.1", + "version": "6.0.0-beta.2", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-oidc-provider/package.json b/packages/cli-plugin-oidc-provider/package.json index 711faeab9..b4544f98e 100644 --- a/packages/cli-plugin-oidc-provider/package.json +++ b/packages/cli-plugin-oidc-provider/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-oidc-provider", "description": "Ts.ED CLI plugin. Add OIDC Provider", - "version": "6.0.0-beta.1", + "version": "6.0.0-beta.2", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-passport/package.json b/packages/cli-plugin-passport/package.json index 740b89fff..f31116df3 100644 --- a/packages/cli-plugin-passport/package.json +++ b/packages/cli-plugin-passport/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-passport", "description": "Ts.ED CLI plugin. Add Passport.js support", - "version": "6.0.0-beta.1", + "version": "6.0.0-beta.2", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-prisma/package.json b/packages/cli-plugin-prisma/package.json index 3508da579..bd2cf9eda 100644 --- a/packages/cli-plugin-prisma/package.json +++ b/packages/cli-plugin-prisma/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-prisma", "description": "Ts.ED CLI plugin. Add Prisma project initialisation support.", - "version": "6.0.0-beta.1", + "version": "6.0.0-beta.2", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-typegraphql/package.json b/packages/cli-plugin-typegraphql/package.json index 1da411250..e6bf43299 100644 --- a/packages/cli-plugin-typegraphql/package.json +++ b/packages/cli-plugin-typegraphql/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-typegraphql", "description": "Ts.ED CLI plugin. Add TypeGraphql support.", - "version": "6.0.0-beta.1", + "version": "6.0.0-beta.2", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-typeorm/package.json b/packages/cli-plugin-typeorm/package.json index 4a4ef3e48..0ef0369bb 100644 --- a/packages/cli-plugin-typeorm/package.json +++ b/packages/cli-plugin-typeorm/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-typeorm", "description": "Ts.ED CLI plugin. Add TypeORM support", - "version": "6.0.0-beta.1", + "version": "6.0.0-beta.2", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-vitest/package.json b/packages/cli-plugin-vitest/package.json index 29530da6d..4f1b015b1 100644 --- a/packages/cli-plugin-vitest/package.json +++ b/packages/cli-plugin-vitest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-vitest", "description": "Ts.ED CLI plugin. Add Jest support", - "version": "6.0.0-beta.1", + "version": "6.0.0-beta.2", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-testing/package.json b/packages/cli-testing/package.json index 01c571fbc..b42101668 100644 --- a/packages/cli-testing/package.json +++ b/packages/cli-testing/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-testing", "description": "Utils to test you CLI based on Ts.ED CLI", - "version": "6.0.0-beta.1", + "version": "6.0.0-beta.2", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli/package.json b/packages/cli/package.json index 0f65b2ed7..6fba380e5 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli", "description": "CLI to bootstrap your Ts.ED project", - "version": "6.0.0-beta.1", + "version": "6.0.0-beta.2", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/tools/typescript/package.json b/tools/typescript/package.json index 9d3c4e46c..ad3997c32 100644 --- a/tools/typescript/package.json +++ b/tools/typescript/package.json @@ -1,6 +1,6 @@ { "name": "@tsed/typescript", - "version": "6.0.0-beta.1", + "version": "6.0.0-beta.2", "description": "Util to compile source", "type": "module", "private": true, diff --git a/tools/vitest/package.json b/tools/vitest/package.json index 0ce804d5c..156236013 100644 --- a/tools/vitest/package.json +++ b/tools/vitest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/vitest", "type": "module", - "version": "6.0.0-beta.1", + "version": "6.0.0-beta.2", "private": true, "exports": { ".": "./index.js", From e6a62e2f3026b6bf3edf454deb68970e2c1ee7c7 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Sat, 12 Oct 2024 12:33:53 +0200 Subject: [PATCH 67/69] fix: bump Ts.ED dependencies to v8.0.0-beta.3 --- package.json | 10 +-- packages/cli-core/package.json | 4 +- .../cli-generate-http-client/package.json | 2 +- packages/cli-generate-swagger/package.json | 2 +- .../generate/generic.integration.hbs | 2 +- .../templates/generate/generic.spec.hbs | 2 +- .../templates/generate/server.integration.hbs | 2 +- .../generate.controller.integration.spec.ts | 4 +- .../src/CliPluginMongooseModule.ts | 4 +- .../oidc/InteractionsController.spec.ts | 6 +- .../oidc/InteractionsController.ts | 2 +- .../init/src/interactions/AbortInteraction.ts | 2 +- .../interactions/ConsentInteraction.spec.ts | 14 ++-- .../src/interactions/ConsentInteraction.ts | 6 +- .../src/interactions/CustomInteraction.ts | 16 ++-- .../src/interactions/LoginInteraction.spec.ts | 32 ++++---- .../init/src/interactions/LoginInteraction.ts | 15 ++-- .../init.integration.spec.ts.snap | 4 +- .../src/CliPluginPassportModule.ts | 2 +- .../templates/generic.protocol.hbs | 3 +- .../templates/passport-http.protocol.hbs | 3 +- .../templates/passport-local.protocol.hbs | 3 +- .../init.integration.spec.ts.snap | 2 +- .../init.integration.spec.ts.snap | 2 +- .../generate/generic.integration.hbs | 2 +- .../templates/generate/generic.spec.hbs | 2 +- .../templates/generate/server.integration.hbs | 2 +- .../generate.controller.integration.spec.ts | 4 +- packages/cli/package.json | 8 +- packages/cli/src/commands/init/InitCmd.ts | 3 +- .../cli/src/commands/update/UpdateCmd.spec.ts | 6 +- packages/cli/src/commands/update/UpdateCmd.ts | 2 +- .../generate/decorator.middleware.hbs | 2 +- packages/cli/templates/generate/server.hbs | 2 +- .../init/src/config/logger/index.ts.hbs | 7 +- packages/cli/templates/init/src/index.ts.hbs | 2 +- .../init.integration.spec.ts.snap | 18 ++--- .../init/init.integration.spec.ts | 14 ++-- yarn.lock | 76 +++++++++---------- 39 files changed, 145 insertions(+), 149 deletions(-) diff --git a/package.json b/package.json index e6ad5e463..067b7956f 100644 --- a/package.json +++ b/package.json @@ -44,12 +44,12 @@ }, "homepage": "https://github.com/tsedio/tsed-cli", "dependencies": { - "@tsed/core": ">=8.0.0-beta.2", - "@tsed/di": ">=8.0.0-beta.2", + "@tsed/core": ">=8.0.0-beta.3", + "@tsed/di": ">=8.0.0-beta.3", "@tsed/logger": ">=6.2.1", - "@tsed/normalize-path": ">=8.0.0-beta.2", - "@tsed/openspec": ">=8.0.0-beta.2", - "@tsed/schema": ">=8.0.0-beta.2", + "@tsed/normalize-path": ">=8.0.0-beta.3", + "@tsed/openspec": ">=8.0.0-beta.3", + "@tsed/schema": ">=8.0.0-beta.3", "axios": "^1.7.7", "chalk": "^5.3.0", "commander": "^12.1.0", diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index ae889d7dc..29a70e709 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -83,7 +83,7 @@ "vitest": "2.1.1" }, "peerDependencies": { - "@tsed/core": ">=8.0.0-beta.2", - "@tsed/di": ">=8.0.0-beta.2" + "@tsed/core": ">=8.0.0-beta.3", + "@tsed/di": ">=8.0.0-beta.3" } } diff --git a/packages/cli-generate-http-client/package.json b/packages/cli-generate-http-client/package.json index f10c3e2a4..4598eeb1d 100644 --- a/packages/cli-generate-http-client/package.json +++ b/packages/cli-generate-http-client/package.json @@ -34,7 +34,7 @@ "vitest": "2.1.1" }, "peerDependencies": { - "@tsed/common": ">=7.14.2", + "@tsed/platform-http": ">=7.14.2", "@tsed/swagger": ">=7.14.2", "swagger-typescript-api": "^9.3.1" }, diff --git a/packages/cli-generate-swagger/package.json b/packages/cli-generate-swagger/package.json index 57f140dbd..c272e29e5 100644 --- a/packages/cli-generate-swagger/package.json +++ b/packages/cli-generate-swagger/package.json @@ -33,7 +33,7 @@ "vitest": "2.1.1" }, "peerDependencies": { - "@tsed/common": ">=7.14.2", + "@tsed/platform-http": ">=7.14.2", "@tsed/swagger": ">=7.14.2" }, "peerDependenciesMeta": { diff --git a/packages/cli-plugin-jest/templates/generate/generic.integration.hbs b/packages/cli-plugin-jest/templates/generate/generic.integration.hbs index 8e10288f7..6168931f0 100644 --- a/packages/cli-plugin-jest/templates/generate/generic.integration.hbs +++ b/packages/cli-plugin-jest/templates/generate/generic.integration.hbs @@ -1,4 +1,4 @@ -import { PlatformTest } from "@tsed/common"; +import { PlatformTest } from "@tsed/platform-http"; import SuperTest from "supertest"; import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; import { Server } from "{{relativeSrcPath}}/Server.js"; diff --git a/packages/cli-plugin-jest/templates/generate/generic.spec.hbs b/packages/cli-plugin-jest/templates/generate/generic.spec.hbs index 5b6fea37d..677d68bed 100644 --- a/packages/cli-plugin-jest/templates/generate/generic.spec.hbs +++ b/packages/cli-plugin-jest/templates/generate/generic.spec.hbs @@ -1,4 +1,4 @@ -import { PlatformTest } from "@tsed/common"; +import { PlatformTest } from "@tsed/platform-http"; import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; describe("{{symbolName}}", () => { diff --git a/packages/cli-plugin-jest/templates/generate/server.integration.hbs b/packages/cli-plugin-jest/templates/generate/server.integration.hbs index 3d38a1943..cd49f5642 100644 --- a/packages/cli-plugin-jest/templates/generate/server.integration.hbs +++ b/packages/cli-plugin-jest/templates/generate/server.integration.hbs @@ -1,4 +1,4 @@ -import { PlatformTest } from "@tsed/common"; +import { PlatformTest } from "@tsed/platform-http"; import SuperTest from "supertest"; import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; diff --git a/packages/cli-plugin-jest/test/integrations/generate/generate.controller.integration.spec.ts b/packages/cli-plugin-jest/test/integrations/generate/generate.controller.integration.spec.ts index c35a6a620..fce0c9709 100644 --- a/packages/cli-plugin-jest/test/integrations/generate/generate.controller.integration.spec.ts +++ b/packages/cli-plugin-jest/test/integrations/generate/generate.controller.integration.spec.ts @@ -37,7 +37,7 @@ describe("Generate Controller", () => { ]); const result = FakeCliFs.entries.get("project-name/src/controllers/TestController.integration.spec.ts"); - expect(result).toContain('import { PlatformTest } from "@tsed/common";'); + expect(result).toContain('import { PlatformTest } from "@tsed/platform-http";'); expect(result).toContain('import SuperTest from "supertest";'); expect(result).toContain('import { Server } from "../Server.js";'); expect(result).toContain('import { TestController } from "./TestController.js";'); @@ -67,7 +67,7 @@ describe("Generate Controller", () => { ]); const result = FakeCliFs.entries.get("project-name/src/controllers/users/UserController.integration.spec.ts"); - expect(result).toContain('import { PlatformTest } from "@tsed/common";'); + expect(result).toContain('import { PlatformTest } from "@tsed/platform-http";'); expect(result).toContain('import SuperTest from "supertest";'); expect(result).toContain('import { Server } from "../../Server.js";'); expect(result).toContain('import { UserController } from "./UserController.js";'); diff --git a/packages/cli-plugin-mongoose/src/CliPluginMongooseModule.ts b/packages/cli-plugin-mongoose/src/CliPluginMongooseModule.ts index 13ab2eac5..bd107c48c 100644 --- a/packages/cli-plugin-mongoose/src/CliPluginMongooseModule.ts +++ b/packages/cli-plugin-mongoose/src/CliPluginMongooseModule.ts @@ -13,12 +13,12 @@ export class CliPluginMongooseModule { @OnAdd("@tsed/cli-plugin-mongoose") install() { this.packageJson.addDependencies({ - "@tsed/mongoose": this.packageJson.dependencies["@tsed/common"], + "@tsed/mongoose": this.packageJson.dependencies["@tsed/platform-http"], mongoose: "latest" }); this.packageJson.addDevDependencies({ - "@tsed/testing-mongoose": this.packageJson.dependencies["@tsed/common"] + "@tsed/testing-mongoose": this.packageJson.dependencies["@tsed/platform-http"] }); } } diff --git a/packages/cli-plugin-oidc-provider/templates/init/src/controllers/oidc/InteractionsController.spec.ts b/packages/cli-plugin-oidc-provider/templates/init/src/controllers/oidc/InteractionsController.spec.ts index 37c29372d..7d8c854ea 100644 --- a/packages/cli-plugin-oidc-provider/templates/init/src/controllers/oidc/InteractionsController.spec.ts +++ b/packages/cli-plugin-oidc-provider/templates/init/src/controllers/oidc/InteractionsController.spec.ts @@ -1,7 +1,7 @@ -import { PlatformTest } from "@tsed/common"; +import {PlatformTest} from "@tsed/platform-http"; -import { getOidcContextFixture } from "../../interactions/__mock__/oidcContext.fixture.js"; -import { InteractionsController } from "./InteractionsController.js"; +import {getOidcContextFixture} from "../../interactions/__mock__/oidcContext.fixture.js"; +import {InteractionsController} from "./InteractionsController.js"; describe("InteractionsController", () => { beforeEach(() => PlatformTest.create()); diff --git a/packages/cli-plugin-oidc-provider/templates/init/src/controllers/oidc/InteractionsController.ts b/packages/cli-plugin-oidc-provider/templates/init/src/controllers/oidc/InteractionsController.ts index 2b1c0bcd1..7667d16b2 100644 --- a/packages/cli-plugin-oidc-provider/templates/init/src/controllers/oidc/InteractionsController.ts +++ b/packages/cli-plugin-oidc-provider/templates/init/src/controllers/oidc/InteractionsController.ts @@ -1,4 +1,4 @@ -import {Get, PathParams} from "@tsed/common"; +import {Get, PathParams} from "@tsed/platform-http"; import {Interactions, OidcCtx} from "@tsed/oidc-provider"; import {Name} from "@tsed/schema"; import * as interactions from "../../interactions/index.js"; diff --git a/packages/cli-plugin-oidc-provider/templates/init/src/interactions/AbortInteraction.ts b/packages/cli-plugin-oidc-provider/templates/init/src/interactions/AbortInteraction.ts index ea8805ff8..6d8acfa2e 100644 --- a/packages/cli-plugin-oidc-provider/templates/init/src/interactions/AbortInteraction.ts +++ b/packages/cli-plugin-oidc-provider/templates/init/src/interactions/AbortInteraction.ts @@ -1,4 +1,4 @@ -import {Inject} from "@tsed/common"; +import {Inject} from "@tsed/platform-http"; import {Interaction, OidcCtx, OidcProvider, InteractionMethods} from "@tsed/oidc-provider"; import {View} from "@tsed/platform-views"; import {Name} from "@tsed/schema"; diff --git a/packages/cli-plugin-oidc-provider/templates/init/src/interactions/ConsentInteraction.spec.ts b/packages/cli-plugin-oidc-provider/templates/init/src/interactions/ConsentInteraction.spec.ts index f5c8cd918..dea595d06 100644 --- a/packages/cli-plugin-oidc-provider/templates/init/src/interactions/ConsentInteraction.spec.ts +++ b/packages/cli-plugin-oidc-provider/templates/init/src/interactions/ConsentInteraction.spec.ts @@ -1,12 +1,12 @@ -import { PlatformTest } from "@tsed/common"; +import {PlatformTest} from "@tsed/platform-http"; -import { getOidcContextFixture } from "./__mock__/oidcContext.fixture.js"; -import { ConsentInteraction } from "./ConsentInteraction.js"; +import {getOidcContextFixture} from "./__mock__/oidcContext.fixture.js"; +import {ConsentInteraction} from "./ConsentInteraction.js"; async function createInteractionFixture() { const interaction = await PlatformTest.invoke(ConsentInteraction, []); - return { interaction }; + return {interaction}; } describe("ConsentInteraction", () => { @@ -15,7 +15,7 @@ describe("ConsentInteraction", () => { describe("$prompt()", () => { it("should return consent context", async () => { - const { interaction } = await createInteractionFixture(); + const {interaction} = await createInteractionFixture(); const oidcContext = getOidcContextFixture(); const result = await interaction.$prompt(oidcContext); @@ -36,7 +36,7 @@ describe("ConsentInteraction", () => { }); describe("confirm()", () => { it("should control all consentement", async () => { - const { interaction } = await createInteractionFixture(); + const {interaction} = await createInteractionFixture(); const oidcContext = getOidcContextFixture(); oidcContext.prompt.name = "consent"; @@ -65,7 +65,7 @@ describe("ConsentInteraction", () => { expect(grant.addOIDCClaims).toHaveBeenCalledWith(["claims"]); expect(grant.addResourceScope).toHaveBeenCalledWith("indicator", "scopes"); expect(grant.save).toHaveBeenCalledWith(); - expect(oidcContext.interactionFinished).toHaveBeenCalledWith({ consent: { grantId: "grantId" } }, { mergeWithLastSubmission: true }); + expect(oidcContext.interactionFinished).toHaveBeenCalledWith({consent: {grantId: "grantId"}}, {mergeWithLastSubmission: true}); }); }); }); diff --git a/packages/cli-plugin-oidc-provider/templates/init/src/interactions/ConsentInteraction.ts b/packages/cli-plugin-oidc-provider/templates/init/src/interactions/ConsentInteraction.ts index 56aa2f339..169647461 100644 --- a/packages/cli-plugin-oidc-provider/templates/init/src/interactions/ConsentInteraction.ts +++ b/packages/cli-plugin-oidc-provider/templates/init/src/interactions/ConsentInteraction.ts @@ -1,6 +1,6 @@ -import {Inject, Post, View} from "@tsed/common"; +import {Post, View, Name} from "@tsed/schema"; +import {Inject} from "@tsed/di"; import {Interaction, OidcCtx, OidcProvider} from "@tsed/oidc-provider"; -import {Name} from "@tsed/schema"; @Interaction({ name: "consent", @@ -32,7 +32,7 @@ export class ConsentInteraction { missingOIDClaims: string[]; }; - const { missingOIDCScope, missingOIDClaims, missingResourceScopes } = details; + const {missingOIDCScope, missingOIDClaims, missingResourceScopes} = details; if (missingOIDCScope) { grant.addOIDCScope(missingOIDCScope.join(" ")); diff --git a/packages/cli-plugin-oidc-provider/templates/init/src/interactions/CustomInteraction.ts b/packages/cli-plugin-oidc-provider/templates/init/src/interactions/CustomInteraction.ts index 1dca0b8f4..ba95becb8 100644 --- a/packages/cli-plugin-oidc-provider/templates/init/src/interactions/CustomInteraction.ts +++ b/packages/cli-plugin-oidc-provider/templates/init/src/interactions/CustomInteraction.ts @@ -1,8 +1,7 @@ -import {View} from "@tsed/common"; import {Env} from "@tsed/core"; import {Constant} from "@tsed/di"; import {Interaction, InteractionMethods, OidcCtx, OidcSession, Params, Prompt, Uid} from "@tsed/oidc-provider"; -import {Name} from "@tsed/schema"; +import {Name, View} from "@tsed/schema"; import {interactionPolicy, KoaContextWithOIDC} from "oidc-provider"; import Check = interactionPolicy.Check; @@ -15,8 +14,7 @@ export class CustomInteraction implements InteractionMethods { @Constant("env") env: Env; - $onCreate() { - } + $onCreate() {} /** * return checks conditions. See: https://github.com/panva/node-oidc-provider/blob/main/docs/README.md#interactionspolicy @@ -24,7 +22,7 @@ export class CustomInteraction implements InteractionMethods { checks() { return [ new Check("no_session", "End-User authentication is required", (ctx) => { - const { oidc } = ctx; + const {oidc} = ctx; if (oidc.session?.accountId) { // @ts-ignore @@ -41,12 +39,12 @@ export class CustomInteraction implements InteractionMethods { * return checks conditions. See: https://github.com/panva/node-oidc-provider/blob/main/docs/README.md#interactionspolicy */ details(ctx: KoaContextWithOIDC) { - const { oidc } = ctx; + const {oidc} = ctx; return { - ...(oidc.params?.max_age === undefined ? undefined : { max_age: oidc.params.max_age }), - ...(oidc.params?.login_hint === undefined ? undefined : { login_hint: oidc.params.login_hint }), - ...(oidc.params?.id_token_hint === undefined ? undefined : { id_token_hint: oidc.params.id_token_hint }) + ...(oidc.params?.max_age === undefined ? undefined : {max_age: oidc.params.max_age}), + ...(oidc.params?.login_hint === undefined ? undefined : {login_hint: oidc.params.login_hint}), + ...(oidc.params?.id_token_hint === undefined ? undefined : {id_token_hint: oidc.params.id_token_hint}) }; } diff --git a/packages/cli-plugin-oidc-provider/templates/init/src/interactions/LoginInteraction.spec.ts b/packages/cli-plugin-oidc-provider/templates/init/src/interactions/LoginInteraction.spec.ts index 7413380e7..dedd3290a 100644 --- a/packages/cli-plugin-oidc-provider/templates/init/src/interactions/LoginInteraction.spec.ts +++ b/packages/cli-plugin-oidc-provider/templates/init/src/interactions/LoginInteraction.spec.ts @@ -1,10 +1,10 @@ -import { PlatformTest } from "@tsed/common"; -import { catchAsyncError } from "@tsed/core"; -import { BadRequest } from "@tsed/exceptions"; +import {PlatformTest} from "@tsed/platform-http"; +import {catchAsyncError} from "@tsed/core"; +import {BadRequest} from "@tsed/exceptions"; -import { Accounts } from "../services/Accounts.js"; -import { getOidcContextFixture } from "./__mock__/oidcContext.fixture.js"; -import { LoginInteraction } from "./LoginInteraction.js"; +import {Accounts} from "../services/Accounts.js"; +import {getOidcContextFixture} from "./__mock__/oidcContext.fixture.js"; +import {LoginInteraction} from "./LoginInteraction.js"; async function createInteractionFixture() { const accounts = { @@ -18,7 +18,7 @@ async function createInteractionFixture() { } ]); - return { interaction, accounts }; + return {interaction, accounts}; } describe("LoginInteraction", () => { @@ -30,7 +30,7 @@ describe("LoginInteraction", () => { describe("$prompt()", () => { it("should return the prompt login context", async () => { - const { interaction } = await createInteractionFixture(); + const {interaction} = await createInteractionFixture(); const oidcContext = getOidcContextFixture(); const result = await interaction.$prompt(oidcContext); @@ -51,7 +51,7 @@ describe("LoginInteraction", () => { }); }); it("should throw error when the Client is unauthorized", async () => { - const { interaction } = await createInteractionFixture(); + const {interaction} = await createInteractionFixture(); const oidcContext = getOidcContextFixture(); (oidcContext.checkClientId as vi.Mock).mockRejectedValue(new Error("Unknown given client_id: client_id")); @@ -64,10 +64,10 @@ describe("LoginInteraction", () => { }); describe("submit()", () => { it("should find account", async () => { - const { interaction, accounts } = await createInteractionFixture(); + const {interaction, accounts} = await createInteractionFixture(); const oidcContext = getOidcContextFixture(); - const payload = { email: "email@email.com", password: "pwd" }; + const payload = {email: "email@email.com", password: "pwd"}; accounts.authenticate.mockResolvedValue({ accountId: "id" @@ -77,13 +77,13 @@ describe("LoginInteraction", () => { expect(result).toEqual(undefined); expect(oidcContext.checkInteractionName).toHaveBeenCalledWith("login"); - expect(oidcContext.interactionFinished).toHaveBeenCalledWith({ login: { accountId: "id" } }); + expect(oidcContext.interactionFinished).toHaveBeenCalledWith({login: {accountId: "id"}}); }); it("should return to the login page and return the right context page", async () => { - const { interaction, accounts } = await createInteractionFixture(); + const {interaction, accounts} = await createInteractionFixture(); const oidcContext = getOidcContextFixture(); - const payload = { email: "email@email.com", password: "pwd" }; + const payload = {email: "email@email.com", password: "pwd"}; accounts.authenticate.mockResolvedValue(null); @@ -106,7 +106,7 @@ describe("LoginInteraction", () => { expect(oidcContext.interactionFinished).not.toHaveBeenCalled(); }); it("should fail if the prompt name is incorrect", async () => { - const { interaction } = await createInteractionFixture(); + const {interaction} = await createInteractionFixture(); const oidcContext = getOidcContextFixture(); oidcContext.prompt.name = "unknown"; @@ -114,7 +114,7 @@ describe("LoginInteraction", () => { throw new BadRequest("Bad interaction name"); }); - const payload = { email: "email@email.com", password: "pwd" }; + const payload = {email: "email@email.com", password: "pwd"}; const error = await catchAsyncError(() => interaction.submit(payload, oidcContext)); diff --git a/packages/cli-plugin-oidc-provider/templates/init/src/interactions/LoginInteraction.ts b/packages/cli-plugin-oidc-provider/templates/init/src/interactions/LoginInteraction.ts index 753047038..4492ce28d 100644 --- a/packages/cli-plugin-oidc-provider/templates/init/src/interactions/LoginInteraction.ts +++ b/packages/cli-plugin-oidc-provider/templates/init/src/interactions/LoginInteraction.ts @@ -1,8 +1,8 @@ -import {BodyParams, Inject, Post, View} from "@tsed/common"; +import {BodyParams} from "@tsed/platform-params"; import {Env} from "@tsed/core"; -import {Constant} from "@tsed/di"; +import {Constant, Inject} from "@tsed/di"; import {Interaction, OidcCtx} from "@tsed/oidc-provider"; -import {Name} from "@tsed/schema"; +import {Name, Post, View} from "@tsed/schema"; import {Accounts} from "../services/Accounts.js"; @Interaction({ @@ -20,9 +20,7 @@ export class LoginInteraction { $onCreate() {} @View("login") - async $prompt( - @OidcCtx() oidcCtx: OidcCtx - ): Promise { + async $prompt(@OidcCtx() oidcCtx: OidcCtx): Promise { await oidcCtx.checkClientId(); return oidcCtx.interactionPrompt({ @@ -33,10 +31,7 @@ export class LoginInteraction { @Post("/login") @View("login") - async submit( - @BodyParams() payload: any, - @OidcCtx() oidcCtx: OidcCtx - ) { + async submit(@BodyParams() payload: any, @OidcCtx() oidcCtx: OidcCtx) { oidcCtx.checkInteractionName("login"); const account = await this.accounts.authenticate(payload.email, payload.password); diff --git a/packages/cli-plugin-oidc-provider/test/init/__snapshots__/init.integration.spec.ts.snap b/packages/cli-plugin-oidc-provider/test/init/__snapshots__/init.integration.spec.ts.snap index 5a2243fc9..d823b9e46 100644 --- a/packages/cli-plugin-oidc-provider/test/init/__snapshots__/init.integration.spec.ts.snap +++ b/packages/cli-plugin-oidc-provider/test/init/__snapshots__/init.integration.spec.ts.snap @@ -63,7 +63,7 @@ exports[`Init OIDC Provider project > should generate a project with oidc 1`] = exports[`Init OIDC Provider project > should generate a project with oidc 2`] = ` "import {join} from "path"; import {Configuration, Inject} from "@tsed/di"; -import {PlatformApplication} from "@tsed/common"; +import {PlatformApplication} from "@tsed/platform-http"; import "@tsed/platform-log-request"; // remove this import if you don't want log request import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; @@ -179,7 +179,7 @@ exports[`Init OIDC Provider project > should generate a project with oidc and sw exports[`Init OIDC Provider project > should generate a project with oidc and swagger 2`] = ` "import {join} from "path"; import {Configuration, Inject} from "@tsed/di"; -import {PlatformApplication} from "@tsed/common"; +import {PlatformApplication} from "@tsed/platform-http"; import "@tsed/platform-log-request"; // remove this import if you don't want log request import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; diff --git a/packages/cli-plugin-passport/src/CliPluginPassportModule.ts b/packages/cli-plugin-passport/src/CliPluginPassportModule.ts index 1389ca775..5d697eb08 100644 --- a/packages/cli-plugin-passport/src/CliPluginPassportModule.ts +++ b/packages/cli-plugin-passport/src/CliPluginPassportModule.ts @@ -12,7 +12,7 @@ export class CliPluginPassportModule { @OnAdd("@tsed/cli-plugin-passport") install() { this.packageJson.addDependencies({ - "@tsed/passport": this.packageJson.dependencies["@tsed/common"], + "@tsed/passport": this.packageJson.dependencies["@tsed/platform-http"], passport: "latest" }); diff --git a/packages/cli-plugin-passport/templates/generic.protocol.hbs b/packages/cli-plugin-passport/templates/generic.protocol.hbs index 066be2b35..7a53036e6 100644 --- a/packages/cli-plugin-passport/templates/generic.protocol.hbs +++ b/packages/cli-plugin-passport/templates/generic.protocol.hbs @@ -1,4 +1,5 @@ -import {BodyParams, Req} from "@tsed/common"; +import {Req} from "@tsed/platform-http"; +import {BodyParams} from "@tsed/platform-params"; import {OnInstall, OnVerify, Protocol, Args} from "@tsed/passport"; import {Strategy} from "{{passportPackage}}"; diff --git a/packages/cli-plugin-passport/templates/passport-http.protocol.hbs b/packages/cli-plugin-passport/templates/passport-http.protocol.hbs index 1093b72e2..5434a828f 100644 --- a/packages/cli-plugin-passport/templates/passport-http.protocol.hbs +++ b/packages/cli-plugin-passport/templates/passport-http.protocol.hbs @@ -1,4 +1,5 @@ -import {BodyParams, Req} from "@tsed/common"; +import {Req} from "@tsed/platform-http"; +import {BodyParams} from "@tsed/platform-params"; import {OnInstall, OnVerify, Protocol} from "@tsed/passport"; import {BasicStrategy} from "passport-http"; diff --git a/packages/cli-plugin-passport/templates/passport-local.protocol.hbs b/packages/cli-plugin-passport/templates/passport-local.protocol.hbs index 5506bb9ef..ef5f212b4 100644 --- a/packages/cli-plugin-passport/templates/passport-local.protocol.hbs +++ b/packages/cli-plugin-passport/templates/passport-local.protocol.hbs @@ -1,4 +1,5 @@ -import {BodyParams, Req} from "@tsed/common"; +import {Req} from "@tsed/platform-http"; +import {BodyParams} from "@tsed/platform-params"; import {OnInstall, OnVerify, Protocol} from "@tsed/passport"; import {IStrategyOptions, Strategy} from "passport-local"; diff --git a/packages/cli-plugin-typegraphql/test/init/__snapshots__/init.integration.spec.ts.snap b/packages/cli-plugin-typegraphql/test/init/__snapshots__/init.integration.spec.ts.snap index 2a5c4d7ae..e9fa4a4d4 100644 --- a/packages/cli-plugin-typegraphql/test/init/__snapshots__/init.integration.spec.ts.snap +++ b/packages/cli-plugin-typegraphql/test/init/__snapshots__/init.integration.spec.ts.snap @@ -3,7 +3,7 @@ exports[`Init TypeGraphQL project > should generate a project with typegraphql 2`] = ` "import {join} from "path"; import {Configuration, Inject} from "@tsed/di"; -import {PlatformApplication} from "@tsed/common"; +import {PlatformApplication} from "@tsed/platform-http"; import "@tsed/platform-log-request"; // remove this import if you don't want log request import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; diff --git a/packages/cli-plugin-typeorm/test/integrations/init/__snapshots__/init.integration.spec.ts.snap b/packages/cli-plugin-typeorm/test/integrations/init/__snapshots__/init.integration.spec.ts.snap index 69a170b88..74695f2eb 100644 --- a/packages/cli-plugin-typeorm/test/integrations/init/__snapshots__/init.integration.spec.ts.snap +++ b/packages/cli-plugin-typeorm/test/integrations/init/__snapshots__/init.integration.spec.ts.snap @@ -3,7 +3,7 @@ exports[`TypeORM: Init cmd > should generate a project with the right options 2`] = ` "import {join} from "path"; import {Configuration, Inject} from "@tsed/di"; -import {PlatformApplication} from "@tsed/common"; +import {PlatformApplication} from "@tsed/platform-http"; import "@tsed/platform-log-request"; // remove this import if you don't want log request import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; diff --git a/packages/cli-plugin-vitest/templates/generate/generic.integration.hbs b/packages/cli-plugin-vitest/templates/generate/generic.integration.hbs index 7ae889373..6f7e9720e 100644 --- a/packages/cli-plugin-vitest/templates/generate/generic.integration.hbs +++ b/packages/cli-plugin-vitest/templates/generate/generic.integration.hbs @@ -1,5 +1,5 @@ import { expect, describe, it, afterAll, beforeAll } from "vitest"; -import { PlatformTest } from "@tsed/common"; +import { PlatformTest } from "@tsed/platform-http"; import SuperTest from "supertest"; import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; import { Server } from "{{relativeSrcPath}}/Server.js"; diff --git a/packages/cli-plugin-vitest/templates/generate/generic.spec.hbs b/packages/cli-plugin-vitest/templates/generate/generic.spec.hbs index d4b0f0e40..527e10fd1 100644 --- a/packages/cli-plugin-vitest/templates/generate/generic.spec.hbs +++ b/packages/cli-plugin-vitest/templates/generate/generic.spec.hbs @@ -1,5 +1,5 @@ import { expect, describe, it, beforeEach, afterEach } from "vitest"; -import { PlatformTest } from "@tsed/common"; +import { PlatformTest } from "@tsed/platform-http"; import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; describe("{{symbolName}}", () => { diff --git a/packages/cli-plugin-vitest/templates/generate/server.integration.hbs b/packages/cli-plugin-vitest/templates/generate/server.integration.hbs index 56a775546..5d7f4db0d 100644 --- a/packages/cli-plugin-vitest/templates/generate/server.integration.hbs +++ b/packages/cli-plugin-vitest/templates/generate/server.integration.hbs @@ -1,5 +1,5 @@ import { expect, describe, it, beforeAll, afterAll } from "vitest"; -import { PlatformTest } from "@tsed/common"; +import { PlatformTest } from "@tsed/platform-http"; import SuperTest from "supertest"; import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; diff --git a/packages/cli-plugin-vitest/test/integrations/generate/generate.controller.integration.spec.ts b/packages/cli-plugin-vitest/test/integrations/generate/generate.controller.integration.spec.ts index c35a6a620..fce0c9709 100644 --- a/packages/cli-plugin-vitest/test/integrations/generate/generate.controller.integration.spec.ts +++ b/packages/cli-plugin-vitest/test/integrations/generate/generate.controller.integration.spec.ts @@ -37,7 +37,7 @@ describe("Generate Controller", () => { ]); const result = FakeCliFs.entries.get("project-name/src/controllers/TestController.integration.spec.ts"); - expect(result).toContain('import { PlatformTest } from "@tsed/common";'); + expect(result).toContain('import { PlatformTest } from "@tsed/platform-http";'); expect(result).toContain('import SuperTest from "supertest";'); expect(result).toContain('import { Server } from "../Server.js";'); expect(result).toContain('import { TestController } from "./TestController.js";'); @@ -67,7 +67,7 @@ describe("Generate Controller", () => { ]); const result = FakeCliFs.entries.get("project-name/src/controllers/users/UserController.integration.spec.ts"); - expect(result).toContain('import { PlatformTest } from "@tsed/common";'); + expect(result).toContain('import { PlatformTest } from "@tsed/platform-http";'); expect(result).toContain('import SuperTest from "supertest";'); expect(result).toContain('import { Server } from "../../Server.js";'); expect(result).toContain('import { UserController } from "./UserController.js";'); diff --git a/packages/cli/package.json b/packages/cli/package.json index 6fba380e5..daa668537 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -67,11 +67,11 @@ "@swc/core": "1.7.26", "@swc/helpers": "^0.5.13", "@tsed/cli-core": "workspace:*", - "@tsed/core": ">=8.0.0-beta.2", - "@tsed/di": ">=8.0.0-beta.2", + "@tsed/core": ">=8.0.0-beta.3", + "@tsed/di": ">=8.0.0-beta.3", "@tsed/logger": ">=6.2.1", - "@tsed/openspec": ">=8.0.0-beta.2", - "@tsed/schema": ">=8.0.0-beta.2", + "@tsed/openspec": ">=8.0.0-beta.3", + "@tsed/schema": ">=8.0.0-beta.3", "chalk": "^5.3.0", "change-case": "^5.4.4", "esm-module-alias": "^2.2.1", diff --git a/packages/cli/src/commands/init/InitCmd.ts b/packages/cli/src/commands/init/InitCmd.ts index d01f9f7eb..0d054f778 100644 --- a/packages/cli/src/commands/init/InitCmd.ts +++ b/packages/cli/src/commands/init/InitCmd.ts @@ -347,7 +347,6 @@ export class InitCmd implements CommandProvider { addDependencies(ctx: InitCmdContext) { this.packageJson.addDependencies({ - "@tsed/common": ctx.tsedVersion, "@tsed/core": ctx.tsedVersion, "@tsed/di": ctx.tsedVersion, "@tsed/ajv": ctx.tsedVersion, @@ -355,6 +354,7 @@ export class InitCmd implements CommandProvider { "@tsed/schema": ctx.tsedVersion, "@tsed/json-mapper": ctx.tsedVersion, "@tsed/openspec": ctx.tsedVersion, + "@tsed/platform-http": ctx.tsedVersion, "@tsed/platform-cache": ctx.tsedVersion, "@tsed/platform-exceptions": ctx.tsedVersion, "@tsed/platform-log-request": ctx.tsedVersion, @@ -363,7 +363,6 @@ export class InitCmd implements CommandProvider { "@tsed/platform-response-filter": ctx.tsedVersion, "@tsed/platform-views": ctx.tsedVersion, "@tsed/logger": "latest", - "@tsed/logger-file": "latest", "@tsed/engines": "latest", "@tsed/barrels": "latest", ajv: "latest", diff --git a/packages/cli/src/commands/update/UpdateCmd.spec.ts b/packages/cli/src/commands/update/UpdateCmd.spec.ts index 80b427be2..9a2ad0bea 100644 --- a/packages/cli/src/commands/update/UpdateCmd.spec.ts +++ b/packages/cli/src/commands/update/UpdateCmd.spec.ts @@ -40,7 +40,7 @@ describe("UpdateCmd", () => { const npmClientRegistry = { info(pkg: string) { - if (pkg === "@tsed/common") { + if (pkg === "@tsed/platform-http") { return {versions}; } } @@ -103,7 +103,7 @@ describe("UpdateCmd", () => { dependencies: { "@tsed/core": "5.50.1", "@tsed/di": "5.50.1", - "@tsed/common": "5.50.1", + "@tsed/platform-http": "5.50.1", "@tsed/logger": "5.4.0" }, devDependencies: { @@ -141,7 +141,7 @@ describe("UpdateCmd", () => { // @ts-ignore expect(command.projectPackage.dependencies).toEqual({ - "@tsed/common": "8.0.0-alpha.4", + "@tsed/platform-http": "8.0.0-alpha.4", "@tsed/core": "8.0.0-alpha.4", "@tsed/di": "8.0.0-alpha.4", "@tsed/logger": "^5.5.0" diff --git a/packages/cli/src/commands/update/UpdateCmd.ts b/packages/cli/src/commands/update/UpdateCmd.ts index f5b790b4c..f9bb511bd 100644 --- a/packages/cli/src/commands/update/UpdateCmd.ts +++ b/packages/cli/src/commands/update/UpdateCmd.ts @@ -108,7 +108,7 @@ export class UpdateCmd implements CommandProvider { } private async getAvailableVersions() { - const {versions} = await this.npmRegistryClient.info("@tsed/common", 10); + const {versions} = await this.npmRegistryClient.info("@tsed/platform-http", 10); this.versions = versions; return Object.keys(versions) diff --git a/packages/cli/templates/generate/decorator.middleware.hbs b/packages/cli/templates/generate/decorator.middleware.hbs index 69eafbeb5..aeb0b0a62 100644 --- a/packages/cli/templates/generate/decorator.middleware.hbs +++ b/packages/cli/templates/generate/decorator.middleware.hbs @@ -1,7 +1,7 @@ import {useDecorators, StoreSet} from "@tsed/core"; import {Middleware{{#eq middlewarePosition "before"}}, UseBefore{{/eq}}{{#eq middlewarePosition "after"}}, UseAfter{{/eq}}\} from "@tsed/platform-middlewares"; import {Context} from "@tsed/platform-params"; -import {Req, Res} from "@tsed/common"; +import {Req, Res} from "@tsed/platform-http"; export interface {{symbolName}}Options { diff --git a/packages/cli/templates/generate/server.hbs b/packages/cli/templates/generate/server.hbs index 998c2ca02..85d83094f 100644 --- a/packages/cli/templates/generate/server.hbs +++ b/packages/cli/templates/generate/server.hbs @@ -1,6 +1,6 @@ import {join} from "path"; import {Configuration, Inject} from "@tsed/di"; -import {PlatformApplication} from "@tsed/common"; +import {PlatformApplication} from "@tsed/platform-http"; {{#forEach imports}}{{#if tsIngore}} // @ts-ignore {{/if}}import {{symbols}}{{#if symbols}} from {{/if}}"{{from}}";{{comment}} diff --git a/packages/cli/templates/init/src/config/logger/index.ts.hbs b/packages/cli/templates/init/src/config/logger/index.ts.hbs index e489d465f..b800621a6 100644 --- a/packages/cli/templates/init/src/config/logger/index.ts.hbs +++ b/packages/cli/templates/init/src/config/logger/index.ts.hbs @@ -1,5 +1,6 @@ -import {$log, PlatformLoggerSettings} from "@tsed/common"; -import {isProduction} from "../envs/index"; +import {DILoggerOptions} from "@tsed/di"; +import {$log} from "@tsed/logger"; +import {isProduction} from "../envs/index.js"; if (isProduction) { $log.appenders.set("stdout", { @@ -19,6 +20,6 @@ if (isProduction) { }); } -export default { +export default { disableRoutesSummary: isProduction }; diff --git a/packages/cli/templates/init/src/index.ts.hbs b/packages/cli/templates/init/src/index.ts.hbs index a95058e99..a131cfcf0 100644 --- a/packages/cli/templates/init/src/index.ts.hbs +++ b/packages/cli/templates/init/src/index.ts.hbs @@ -1,4 +1,4 @@ -import {$log} from "@tsed/common"; +import {$log} from "@tsed/logger"; import { {{platformSymbol}} } from "@tsed/platform-{{platform}}"; import {Server} from "./{{entryServer}}.js"; diff --git a/packages/cli/test/integrations/init/__snapshots__/init.integration.spec.ts.snap b/packages/cli/test/integrations/init/__snapshots__/init.integration.spec.ts.snap index 4914c784f..de14ed6f9 100644 --- a/packages/cli/test/integrations/init/__snapshots__/init.integration.spec.ts.snap +++ b/packages/cli/test/integrations/init/__snapshots__/init.integration.spec.ts.snap @@ -3,7 +3,7 @@ exports[`Init cmd > Express.js > should generate a project with Arch FEATURE 2`] = ` "import {join} from "path"; import {Configuration, Inject} from "@tsed/di"; -import {PlatformApplication} from "@tsed/common"; +import {PlatformApplication} from "@tsed/platform-http"; import "@tsed/platform-log-request"; // remove this import if you don't want log request import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; @@ -66,7 +66,7 @@ export class Server { exports[`Init cmd > Express.js > should generate a project with Babel 2`] = ` "import {join} from "path"; import {Configuration, Inject} from "@tsed/di"; -import {PlatformApplication} from "@tsed/common"; +import {PlatformApplication} from "@tsed/platform-http"; import "@tsed/platform-log-request"; // remove this import if you don't want log request import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; @@ -118,7 +118,7 @@ export class Server { exports[`Init cmd > Express.js > should generate a project with Bun 2`] = ` "import {join} from "path"; import {Configuration, Inject} from "@tsed/di"; -import {PlatformApplication} from "@tsed/common"; +import {PlatformApplication} from "@tsed/platform-http"; import "@tsed/platform-log-request"; // remove this import if you don't want log request import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; @@ -170,7 +170,7 @@ export class Server { exports[`Init cmd > Express.js > should generate a project with Convention ANGULAR 2`] = ` "import {join} from "path"; import {Configuration, Inject} from "@tsed/di"; -import {PlatformApplication} from "@tsed/common"; +import {PlatformApplication} from "@tsed/platform-http"; import "@tsed/platform-log-request"; // remove this import if you don't want log request import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; @@ -233,7 +233,7 @@ export class Server { exports[`Init cmd > Express.js > should generate a project with NPM 2`] = ` "import {join} from "path"; import {Configuration, Inject} from "@tsed/di"; -import {PlatformApplication} from "@tsed/common"; +import {PlatformApplication} from "@tsed/platform-http"; import "@tsed/platform-log-request"; // remove this import if you don't want log request import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; @@ -285,7 +285,7 @@ export class Server { exports[`Init cmd > Express.js > should generate a project with Webpack 2`] = ` "import {join} from "path"; import {Configuration, Inject} from "@tsed/di"; -import {PlatformApplication} from "@tsed/common"; +import {PlatformApplication} from "@tsed/platform-http"; import "@tsed/platform-log-request"; // remove this import if you don't want log request import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; @@ -337,7 +337,7 @@ export class Server { exports[`Init cmd > Express.js > should generate a project with swagger 2`] = ` "import {join} from "path"; import {Configuration, Inject} from "@tsed/di"; -import {PlatformApplication} from "@tsed/common"; +import {PlatformApplication} from "@tsed/platform-http"; import "@tsed/platform-log-request"; // remove this import if you don't want log request import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; @@ -400,7 +400,7 @@ export class Server { exports[`Init cmd > Express.js > should generate a project with the right options 2`] = ` "import {join} from "path"; import {Configuration, Inject} from "@tsed/di"; -import {PlatformApplication} from "@tsed/common"; +import {PlatformApplication} from "@tsed/platform-http"; import "@tsed/platform-log-request"; // remove this import if you don't want log request import "@tsed/platform-express"; // /!\\ keep this import import "@tsed/ajv"; @@ -452,7 +452,7 @@ export class Server { exports[`Init cmd > Koa.js > should generate a project with the right options 2`] = ` "import {join} from "path"; import {Configuration, Inject} from "@tsed/di"; -import {PlatformApplication} from "@tsed/common"; +import {PlatformApplication} from "@tsed/platform-http"; import "@tsed/platform-log-request"; // remove this import if you don't want log request import "@tsed/platform-koa"; // /!\\ keep this import import "@tsed/ajv"; diff --git a/packages/cli/test/integrations/init/init.integration.spec.ts b/packages/cli/test/integrations/init/init.integration.spec.ts index 5578a777c..374a73893 100644 --- a/packages/cli/test/integrations/init/init.integration.spec.ts +++ b/packages/cli/test/integrations/init/init.integration.spec.ts @@ -79,7 +79,6 @@ describe("Init cmd", () => { { "dependencies": { "@tsed/ajv": "5.58.1", - "@tsed/common": "5.58.1", "@tsed/core": "5.58.1", "@tsed/di": "5.58.1", "@tsed/exceptions": "5.58.1", @@ -88,6 +87,7 @@ describe("Init cmd", () => { "@tsed/platform-cache": "5.58.1", "@tsed/platform-exceptions": "5.58.1", "@tsed/platform-express": "5.58.1", + "@tsed/platform-http": "5.58.1", "@tsed/platform-log-request": "5.58.1", "@tsed/platform-middlewares": "5.58.1", "@tsed/platform-params": "5.58.1", @@ -189,7 +189,6 @@ describe("Init cmd", () => { { "dependencies": { "@tsed/ajv": "5.58.1", - "@tsed/common": "5.58.1", "@tsed/core": "5.58.1", "@tsed/di": "5.58.1", "@tsed/exceptions": "5.58.1", @@ -198,6 +197,7 @@ describe("Init cmd", () => { "@tsed/platform-cache": "5.58.1", "@tsed/platform-exceptions": "5.58.1", "@tsed/platform-express": "5.58.1", + "@tsed/platform-http": "5.58.1", "@tsed/platform-log-request": "5.58.1", "@tsed/platform-middlewares": "5.58.1", "@tsed/platform-params": "5.58.1", @@ -280,7 +280,6 @@ describe("Init cmd", () => { { "dependencies": { "@tsed/ajv": "5.58.1", - "@tsed/common": "5.58.1", "@tsed/core": "5.58.1", "@tsed/di": "5.58.1", "@tsed/exceptions": "5.58.1", @@ -289,6 +288,7 @@ describe("Init cmd", () => { "@tsed/platform-cache": "5.58.1", "@tsed/platform-exceptions": "5.58.1", "@tsed/platform-express": "5.58.1", + "@tsed/platform-http": "5.58.1", "@tsed/platform-log-request": "5.58.1", "@tsed/platform-middlewares": "5.58.1", "@tsed/platform-params": "5.58.1", @@ -372,7 +372,6 @@ describe("Init cmd", () => { { "dependencies": { "@tsed/ajv": "5.58.1", - "@tsed/common": "5.58.1", "@tsed/core": "5.58.1", "@tsed/di": "5.58.1", "@tsed/exceptions": "5.58.1", @@ -381,6 +380,7 @@ describe("Init cmd", () => { "@tsed/platform-cache": "5.58.1", "@tsed/platform-exceptions": "5.58.1", "@tsed/platform-express": "5.58.1", + "@tsed/platform-http": "5.58.1", "@tsed/platform-log-request": "5.58.1", "@tsed/platform-middlewares": "5.58.1", "@tsed/platform-params": "5.58.1", @@ -465,7 +465,6 @@ describe("Init cmd", () => { { "dependencies": { "@tsed/ajv": "5.58.1", - "@tsed/common": "5.58.1", "@tsed/core": "5.58.1", "@tsed/di": "5.58.1", "@tsed/exceptions": "5.58.1", @@ -474,6 +473,7 @@ describe("Init cmd", () => { "@tsed/platform-cache": "5.58.1", "@tsed/platform-exceptions": "5.58.1", "@tsed/platform-express": "5.58.1", + "@tsed/platform-http": "5.58.1", "@tsed/platform-log-request": "5.58.1", "@tsed/platform-middlewares": "5.58.1", "@tsed/platform-params": "5.58.1", @@ -558,7 +558,6 @@ describe("Init cmd", () => { { "dependencies": { "@tsed/ajv": "5.58.1", - "@tsed/common": "5.58.1", "@tsed/core": "5.58.1", "@tsed/di": "5.58.1", "@tsed/exceptions": "5.58.1", @@ -567,6 +566,7 @@ describe("Init cmd", () => { "@tsed/platform-cache": "5.58.1", "@tsed/platform-exceptions": "5.58.1", "@tsed/platform-express": "5.58.1", + "@tsed/platform-http": "5.58.1", "@tsed/platform-log-request": "5.58.1", "@tsed/platform-middlewares": "5.58.1", "@tsed/platform-params": "5.58.1", @@ -787,7 +787,6 @@ describe("Init cmd", () => { { "dependencies": { "@tsed/ajv": "5.58.1", - "@tsed/common": "5.58.1", "@tsed/core": "5.58.1", "@tsed/di": "5.58.1", "@tsed/exceptions": "5.58.1", @@ -795,6 +794,7 @@ describe("Init cmd", () => { "@tsed/openspec": "5.58.1", "@tsed/platform-cache": "5.58.1", "@tsed/platform-exceptions": "5.58.1", + "@tsed/platform-http": "5.58.1", "@tsed/platform-koa": "5.58.1", "@tsed/platform-log-request": "5.58.1", "@tsed/platform-middlewares": "5.58.1", diff --git a/yarn.lock b/yarn.lock index 9307e16bd..3b4569da1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2349,8 +2349,8 @@ __metadata: uuid: "npm:^10.0.0" vitest: "npm:2.1.1" peerDependencies: - "@tsed/core": ">=8.0.0-beta.2" - "@tsed/di": ">=8.0.0-beta.2" + "@tsed/core": ">=8.0.0-beta.3" + "@tsed/di": ">=8.0.0-beta.3" languageName: unknown linkType: soft @@ -2368,7 +2368,7 @@ __metadata: typescript: "npm:5.6.2" vitest: "npm:2.1.1" peerDependencies: - "@tsed/common": ">=7.14.2" + "@tsed/platform-http": ">=7.14.2" "@tsed/swagger": ">=7.14.2" swagger-typescript-api: ^9.3.1 peerDependenciesMeta: @@ -2392,7 +2392,7 @@ __metadata: typescript: "npm:5.6.2" vitest: "npm:2.1.1" peerDependencies: - "@tsed/common": ">=7.14.2" + "@tsed/platform-http": ">=7.14.2" "@tsed/swagger": ">=7.14.2" peerDependenciesMeta: "@tsed/swagger": @@ -2548,14 +2548,14 @@ __metadata: "@commitlint/config-conventional": "npm:19.5.0" "@swc/core": "npm:1.7.26" "@swc/helpers": "npm:0.5.13" - "@tsed/core": "npm:>=8.0.0-beta.2" - "@tsed/di": "npm:>=8.0.0-beta.2" + "@tsed/core": "npm:>=8.0.0-beta.3" + "@tsed/di": "npm:>=8.0.0-beta.3" "@tsed/logger": "npm:>=6.2.1" "@tsed/markdown-it-symbols": "npm:3.20.8" "@tsed/monorepo-utils": "npm:2.3.5" - "@tsed/normalize-path": "npm:>=8.0.0-beta.2" - "@tsed/openspec": "npm:>=8.0.0-beta.2" - "@tsed/schema": "npm:>=8.0.0-beta.2" + "@tsed/normalize-path": "npm:>=8.0.0-beta.3" + "@tsed/openspec": "npm:>=8.0.0-beta.3" + "@tsed/schema": "npm:>=8.0.0-beta.3" "@tsed/ts-doc": "npm:^4.1.0" "@types/node": "npm:22.7.4" "@typescript-eslint/eslint-plugin": "npm:8.7.0" @@ -2626,11 +2626,11 @@ __metadata: "@swc/core": "npm:1.7.26" "@swc/helpers": "npm:^0.5.13" "@tsed/cli-core": "workspace:*" - "@tsed/core": "npm:>=8.0.0-beta.2" - "@tsed/di": "npm:>=8.0.0-beta.2" + "@tsed/core": "npm:>=8.0.0-beta.3" + "@tsed/di": "npm:>=8.0.0-beta.3" "@tsed/logger": "npm:>=6.2.1" - "@tsed/openspec": "npm:>=8.0.0-beta.2" - "@tsed/schema": "npm:>=8.0.0-beta.2" + "@tsed/openspec": "npm:>=8.0.0-beta.3" + "@tsed/schema": "npm:>=8.0.0-beta.3" "@tsed/typescript": "workspace:*" "@types/change-case": "npm:^2.3.1" chalk: "npm:^5.3.0" @@ -2655,26 +2655,26 @@ __metadata: languageName: unknown linkType: soft -"@tsed/core@npm:>=8.0.0-beta.2": - version: 8.0.0-beta.2 - resolution: "@tsed/core@npm:8.0.0-beta.2" +"@tsed/core@npm:>=8.0.0-beta.3": + version: 8.0.0-beta.4 + resolution: "@tsed/core@npm:8.0.0-beta.4" dependencies: reflect-metadata: "npm:^0.2.2" tslib: "npm:2.7.0" - checksum: 10/f550f0940a2e4aced4c83ce5903e60cdaa5c48a78fb1bb7ecb9d77a355a2fa04779024764a925ffe407f00d4174669de238b826aa46ef7588dae472743b8e4eb + checksum: 10/dcafd7089056bd3dafe795ef603401644c1c43527127bc91d875f3a297d59fd8e5fca1aca234d457ebe60011385b46bef2c5930c94b0e681140f659b46887366 languageName: node linkType: hard -"@tsed/di@npm:>=8.0.0-beta.2": - version: 8.0.0-beta.2 - resolution: "@tsed/di@npm:8.0.0-beta.2" +"@tsed/di@npm:>=8.0.0-beta.3": + version: 8.0.0-beta.4 + resolution: "@tsed/di@npm:8.0.0-beta.4" dependencies: tslib: "npm:2.7.0" uuid: "npm:^10.0.0" peerDependencies: - "@tsed/core": 8.0.0-beta.2 + "@tsed/core": 8.0.0-beta.4 "@tsed/logger": ">=6.7.5" - "@tsed/schema": 8.0.0-beta.2 + "@tsed/schema": 8.0.0-beta.4 peerDependenciesMeta: "@tsed/core": optional: false @@ -2682,7 +2682,7 @@ __metadata: optional: false "@tsed/schema": optional: false - checksum: 10/065c7883287428624a7f4275f156a4831b9c4750cad9d60984ebbbc20cf2fca45462d591bb1f6e8cfe4f79064a839950b96b567c767bc50a4ea2ebf28774b754 + checksum: 10/03564b791e144090a80c94383d5d664339557d338ba90eff9ea6663f127279c29ac00b6731b3554d2faa67bc7cc14553c588029a1f34cfdfd3352f19c3d29cd1 languageName: node linkType: hard @@ -2748,28 +2748,28 @@ __metadata: languageName: node linkType: hard -"@tsed/normalize-path@npm:>=8.0.0-beta.2": - version: 8.0.0-beta.2 - resolution: "@tsed/normalize-path@npm:8.0.0-beta.2" +"@tsed/normalize-path@npm:>=8.0.0-beta.3": + version: 8.0.0-beta.4 + resolution: "@tsed/normalize-path@npm:8.0.0-beta.4" dependencies: normalize-path: "npm:3.0.0" tslib: "npm:2.7.0" - checksum: 10/f9e1de2d7a1eeabd0385855e335ef7417cd5963ded38838b65a4f0179dd3928ddc870f02b3052ca26fe577901b03d333d1da9c7bcf3b0a79cb3770fdb6009a46 + checksum: 10/c97a6064be2a538aa9175065142f58c847132f376ae99a6953936774cdb6d79f4e2475bd14751a6220a5e6b01fdc82d91b841ec26d1963e5e2a76d1501daa9f5 languageName: node linkType: hard -"@tsed/openspec@npm:8.0.0-beta.2, @tsed/openspec@npm:>=8.0.0-beta.2": - version: 8.0.0-beta.2 - resolution: "@tsed/openspec@npm:8.0.0-beta.2" - checksum: 10/79a7b913178b0b0967a109dc550c1aeea781d383b02abb02f30009cece2a196783dee0d1b202e4b2added05fdb6c9d1deeec9555e66f42a082d4300aabac9c32 +"@tsed/openspec@npm:8.0.0-beta.4, @tsed/openspec@npm:>=8.0.0-beta.3": + version: 8.0.0-beta.4 + resolution: "@tsed/openspec@npm:8.0.0-beta.4" + checksum: 10/19e312a64d90ab966749a732b96d007b375b3305eca8e7d9ef80550dec210aa39adc60e99842a80e57cc5a4043101cf683aaa95ca2a91447730d5e98b98b51d6 languageName: node linkType: hard -"@tsed/schema@npm:>=8.0.0-beta.2": - version: 8.0.0-beta.2 - resolution: "@tsed/schema@npm:8.0.0-beta.2" +"@tsed/schema@npm:>=8.0.0-beta.3": + version: 8.0.0-beta.4 + resolution: "@tsed/schema@npm:8.0.0-beta.4" dependencies: - "@tsed/openspec": "npm:8.0.0-beta.2" + "@tsed/openspec": "npm:8.0.0-beta.4" change-case: "npm:^5.4.4" fs-extra: "npm:^11.2.0" json-schema: "npm:0.4.0" @@ -2777,14 +2777,14 @@ __metadata: statuses: "npm:^2.0.1" tslib: "npm:2.7.0" peerDependencies: - "@tsed/core": 8.0.0-beta.2 - "@tsed/openspec": 8.0.0-beta.2 + "@tsed/core": 8.0.0-beta.4 + "@tsed/openspec": 8.0.0-beta.4 peerDependenciesMeta: "@tsed/core": optional: false "@tsed/openspec": optional: false - checksum: 10/205454f693369397af05984808e9ee7e816248d60eba2b3f280268eb120e0920ef7c6313a14333c88b024f3f4afa9a175983e7024703430ff51da989f528e83d + checksum: 10/65e424fdaa356ca483100eb0852d3f25dadf8c47f735e47ea09d1c498f710f3488e24668270aa9b5905976741b703399e10621e05739c00c436c20dc9aaaec03 languageName: node linkType: hard From 680aecac16b693210ff03493ff9c58abf0f2c6bd Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sat, 12 Oct 2024 11:51:55 +0000 Subject: [PATCH 68/69] Github CI build: __run_2 v6.0.0-beta.3 [ci skip] --- lerna.json | 2 +- package.json | 2 +- packages/barrels/package.json | 2 +- packages/cli-core/package.json | 2 +- packages/cli-generate-http-client/package.json | 2 +- packages/cli-generate-swagger/package.json | 2 +- packages/cli-plugin-eslint/package.json | 2 +- packages/cli-plugin-jest/package.json | 2 +- packages/cli-plugin-mongoose/package.json | 2 +- packages/cli-plugin-oidc-provider/package.json | 2 +- packages/cli-plugin-passport/package.json | 2 +- packages/cli-plugin-prisma/package.json | 2 +- packages/cli-plugin-typegraphql/package.json | 2 +- packages/cli-plugin-typeorm/package.json | 2 +- packages/cli-plugin-vitest/package.json | 2 +- packages/cli-testing/package.json | 2 +- packages/cli/package.json | 2 +- tools/typescript/package.json | 2 +- tools/vitest/package.json | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lerna.json b/lerna.json index 4cd40224c..6705309da 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "packages": [ "packages/*" ], - "version": "6.0.0-beta.2" + "version": "6.0.0-beta.3" } \ No newline at end of file diff --git a/package.json b/package.json index 067b7956f..0bb3911e7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@tsed/cli-root", - "version": "6.0.0-beta.2", + "version": "6.0.0-beta.3", "description": "CLI to bootstrap your Ts.ED project", "private": true, "type": "module", diff --git a/packages/barrels/package.json b/packages/barrels/package.json index 4638183b8..962200674 100644 --- a/packages/barrels/package.json +++ b/packages/barrels/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/barrels", "description": "A simple tool to generate barrels for your TypeScript project", - "version": "6.0.0-beta.2", + "version": "6.0.0-beta.3", "type": "module", "bin": "bin/barrels.js", "keywords": [ diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index 29a70e709..dc3962cd9 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-core", "description": "Build your CLI with TypeScript and Decorators", - "version": "6.0.0-beta.2", + "version": "6.0.0-beta.3", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-generate-http-client/package.json b/packages/cli-generate-http-client/package.json index 4598eeb1d..a205f54b1 100644 --- a/packages/cli-generate-http-client/package.json +++ b/packages/cli-generate-http-client/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-generate-http-client", "description": "Ts.ED CLI plugin. Export a command that generate an HTTP Client (axios or fetch) from your Ts.ED controllers and OS3 spec.", - "version": "6.0.0-beta.2", + "version": "6.0.0-beta.3", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-generate-swagger/package.json b/packages/cli-generate-swagger/package.json index c272e29e5..784d6b59b 100644 --- a/packages/cli-generate-swagger/package.json +++ b/packages/cli-generate-swagger/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-generate-swagger", "description": "Ts.ED CLI plugin. Export a command that generate the swagger.json from your Ts.ED controllers and OS3 spec.", - "version": "6.0.0-beta.2", + "version": "6.0.0-beta.3", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-eslint/package.json b/packages/cli-plugin-eslint/package.json index 2e36a016f..eb8031bb8 100644 --- a/packages/cli-plugin-eslint/package.json +++ b/packages/cli-plugin-eslint/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-eslint", "description": "Ts.ED CLI plugin. Add EsLint support", - "version": "6.0.0-beta.2", + "version": "6.0.0-beta.3", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-jest/package.json b/packages/cli-plugin-jest/package.json index a2511396a..2769fd54f 100644 --- a/packages/cli-plugin-jest/package.json +++ b/packages/cli-plugin-jest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-jest", "description": "Ts.ED CLI plugin. Add Jest support", - "version": "6.0.0-beta.2", + "version": "6.0.0-beta.3", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-mongoose/package.json b/packages/cli-plugin-mongoose/package.json index 7c3683ccb..487fce5bc 100644 --- a/packages/cli-plugin-mongoose/package.json +++ b/packages/cli-plugin-mongoose/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-mongoose", "description": "Ts.ED CLI plugin. Add Mongoose support", - "version": "6.0.0-beta.2", + "version": "6.0.0-beta.3", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-oidc-provider/package.json b/packages/cli-plugin-oidc-provider/package.json index b4544f98e..101bb04f1 100644 --- a/packages/cli-plugin-oidc-provider/package.json +++ b/packages/cli-plugin-oidc-provider/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-oidc-provider", "description": "Ts.ED CLI plugin. Add OIDC Provider", - "version": "6.0.0-beta.2", + "version": "6.0.0-beta.3", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-passport/package.json b/packages/cli-plugin-passport/package.json index f31116df3..aa4c642e9 100644 --- a/packages/cli-plugin-passport/package.json +++ b/packages/cli-plugin-passport/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-passport", "description": "Ts.ED CLI plugin. Add Passport.js support", - "version": "6.0.0-beta.2", + "version": "6.0.0-beta.3", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-prisma/package.json b/packages/cli-plugin-prisma/package.json index bd2cf9eda..5999f1ae3 100644 --- a/packages/cli-plugin-prisma/package.json +++ b/packages/cli-plugin-prisma/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-prisma", "description": "Ts.ED CLI plugin. Add Prisma project initialisation support.", - "version": "6.0.0-beta.2", + "version": "6.0.0-beta.3", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-typegraphql/package.json b/packages/cli-plugin-typegraphql/package.json index e6bf43299..82e605c15 100644 --- a/packages/cli-plugin-typegraphql/package.json +++ b/packages/cli-plugin-typegraphql/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-typegraphql", "description": "Ts.ED CLI plugin. Add TypeGraphql support.", - "version": "6.0.0-beta.2", + "version": "6.0.0-beta.3", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-typeorm/package.json b/packages/cli-plugin-typeorm/package.json index 0ef0369bb..45bb595b2 100644 --- a/packages/cli-plugin-typeorm/package.json +++ b/packages/cli-plugin-typeorm/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-typeorm", "description": "Ts.ED CLI plugin. Add TypeORM support", - "version": "6.0.0-beta.2", + "version": "6.0.0-beta.3", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-plugin-vitest/package.json b/packages/cli-plugin-vitest/package.json index 4f1b015b1..f2d374368 100644 --- a/packages/cli-plugin-vitest/package.json +++ b/packages/cli-plugin-vitest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-plugin-vitest", "description": "Ts.ED CLI plugin. Add Jest support", - "version": "6.0.0-beta.2", + "version": "6.0.0-beta.3", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli-testing/package.json b/packages/cli-testing/package.json index b42101668..404c5fe6c 100644 --- a/packages/cli-testing/package.json +++ b/packages/cli-testing/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli-testing", "description": "Utils to test you CLI based on Ts.ED CLI", - "version": "6.0.0-beta.2", + "version": "6.0.0-beta.3", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/packages/cli/package.json b/packages/cli/package.json index daa668537..4a7eab475 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/cli", "description": "CLI to bootstrap your Ts.ED project", - "version": "6.0.0-beta.2", + "version": "6.0.0-beta.3", "type": "module", "main": "./lib/esm/index.js", "source": "./src/index.ts", diff --git a/tools/typescript/package.json b/tools/typescript/package.json index ad3997c32..4c02cb6e2 100644 --- a/tools/typescript/package.json +++ b/tools/typescript/package.json @@ -1,6 +1,6 @@ { "name": "@tsed/typescript", - "version": "6.0.0-beta.2", + "version": "6.0.0-beta.3", "description": "Util to compile source", "type": "module", "private": true, diff --git a/tools/vitest/package.json b/tools/vitest/package.json index 156236013..d0c621171 100644 --- a/tools/vitest/package.json +++ b/tools/vitest/package.json @@ -1,7 +1,7 @@ { "name": "@tsed/vitest", "type": "module", - "version": "6.0.0-beta.2", + "version": "6.0.0-beta.3", "private": true, "exports": { ".": "./index.js", From 6c07b4ba02198e7ffdb760b037f1a83a5c715a6f Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Sat, 12 Oct 2024 20:20:16 +0200 Subject: [PATCH 69/69] fix: bump Ts.ED dependencies to v8.0.0-beta.5 --- package.json | 10 +-- packages/cli-core/package.json | 4 +- .../generate/generic.integration.hbs | 2 +- .../templates/generate/server.integration.hbs | 2 +- .../generate.controller.integration.spec.ts | 4 +- .../generate/generic.integration.hbs | 2 +- .../templates/generate/generic.spec.hbs | 2 +- .../generate.controller.integration.spec.ts | 4 +- packages/cli/package.json | 16 ++-- yarn.lock | 80 +++++++++---------- 10 files changed, 63 insertions(+), 63 deletions(-) diff --git a/package.json b/package.json index 0bb3911e7..0e5acb213 100644 --- a/package.json +++ b/package.json @@ -44,12 +44,12 @@ }, "homepage": "https://github.com/tsedio/tsed-cli", "dependencies": { - "@tsed/core": ">=8.0.0-beta.3", - "@tsed/di": ">=8.0.0-beta.3", + "@tsed/core": ">=8.0.0-beta.5", + "@tsed/di": ">=8.0.0-beta.5", "@tsed/logger": ">=6.2.1", - "@tsed/normalize-path": ">=8.0.0-beta.3", - "@tsed/openspec": ">=8.0.0-beta.3", - "@tsed/schema": ">=8.0.0-beta.3", + "@tsed/normalize-path": ">=8.0.0-beta.5", + "@tsed/openspec": ">=8.0.0-beta.5", + "@tsed/schema": ">=8.0.0-beta.5", "axios": "^1.7.7", "chalk": "^5.3.0", "commander": "^12.1.0", diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index dc3962cd9..e8aec41d7 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -83,7 +83,7 @@ "vitest": "2.1.1" }, "peerDependencies": { - "@tsed/core": ">=8.0.0-beta.3", - "@tsed/di": ">=8.0.0-beta.3" + "@tsed/core": ">=8.0.0-beta.5", + "@tsed/di": ">=8.0.0-beta.5" } } diff --git a/packages/cli-plugin-jest/templates/generate/generic.integration.hbs b/packages/cli-plugin-jest/templates/generate/generic.integration.hbs index 6168931f0..6b386b113 100644 --- a/packages/cli-plugin-jest/templates/generate/generic.integration.hbs +++ b/packages/cli-plugin-jest/templates/generate/generic.integration.hbs @@ -1,4 +1,4 @@ -import { PlatformTest } from "@tsed/platform-http"; +import { PlatformTest } from "@tsed/platform-http/testing"; import SuperTest from "supertest"; import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; import { Server } from "{{relativeSrcPath}}/Server.js"; diff --git a/packages/cli-plugin-jest/templates/generate/server.integration.hbs b/packages/cli-plugin-jest/templates/generate/server.integration.hbs index cd49f5642..134f57f46 100644 --- a/packages/cli-plugin-jest/templates/generate/server.integration.hbs +++ b/packages/cli-plugin-jest/templates/generate/server.integration.hbs @@ -1,4 +1,4 @@ -import { PlatformTest } from "@tsed/platform-http"; +import { PlatformTest } from "@tsed/platform-http/testing"; import SuperTest from "supertest"; import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; diff --git a/packages/cli-plugin-jest/test/integrations/generate/generate.controller.integration.spec.ts b/packages/cli-plugin-jest/test/integrations/generate/generate.controller.integration.spec.ts index fce0c9709..62e5a0693 100644 --- a/packages/cli-plugin-jest/test/integrations/generate/generate.controller.integration.spec.ts +++ b/packages/cli-plugin-jest/test/integrations/generate/generate.controller.integration.spec.ts @@ -37,7 +37,7 @@ describe("Generate Controller", () => { ]); const result = FakeCliFs.entries.get("project-name/src/controllers/TestController.integration.spec.ts"); - expect(result).toContain('import { PlatformTest } from "@tsed/platform-http";'); + expect(result).toContain('import { PlatformTest } from "@tsed/platform-http/testing";'); expect(result).toContain('import SuperTest from "supertest";'); expect(result).toContain('import { Server } from "../Server.js";'); expect(result).toContain('import { TestController } from "./TestController.js";'); @@ -67,7 +67,7 @@ describe("Generate Controller", () => { ]); const result = FakeCliFs.entries.get("project-name/src/controllers/users/UserController.integration.spec.ts"); - expect(result).toContain('import { PlatformTest } from "@tsed/platform-http";'); + expect(result).toContain('import { PlatformTest } from "@tsed/platform-http/testing";'); expect(result).toContain('import SuperTest from "supertest";'); expect(result).toContain('import { Server } from "../../Server.js";'); expect(result).toContain('import { UserController } from "./UserController.js";'); diff --git a/packages/cli-plugin-vitest/templates/generate/generic.integration.hbs b/packages/cli-plugin-vitest/templates/generate/generic.integration.hbs index 6f7e9720e..6b3f4f6a4 100644 --- a/packages/cli-plugin-vitest/templates/generate/generic.integration.hbs +++ b/packages/cli-plugin-vitest/templates/generate/generic.integration.hbs @@ -1,5 +1,5 @@ import { expect, describe, it, afterAll, beforeAll } from "vitest"; -import { PlatformTest } from "@tsed/platform-http"; +import { PlatformTest } from "@tsed/platform-http/testing"; import SuperTest from "supertest"; import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; import { Server } from "{{relativeSrcPath}}/Server.js"; diff --git a/packages/cli-plugin-vitest/templates/generate/generic.spec.hbs b/packages/cli-plugin-vitest/templates/generate/generic.spec.hbs index 527e10fd1..7a6391925 100644 --- a/packages/cli-plugin-vitest/templates/generate/generic.spec.hbs +++ b/packages/cli-plugin-vitest/templates/generate/generic.spec.hbs @@ -1,5 +1,5 @@ import { expect, describe, it, beforeEach, afterEach } from "vitest"; -import { PlatformTest } from "@tsed/platform-http"; +import { PlatformTest } from "@tsed/platform-http/testing"; import { {{symbolName}} } from "./{{symbolPathBasename}}.js"; describe("{{symbolName}}", () => { diff --git a/packages/cli-plugin-vitest/test/integrations/generate/generate.controller.integration.spec.ts b/packages/cli-plugin-vitest/test/integrations/generate/generate.controller.integration.spec.ts index fce0c9709..62e5a0693 100644 --- a/packages/cli-plugin-vitest/test/integrations/generate/generate.controller.integration.spec.ts +++ b/packages/cli-plugin-vitest/test/integrations/generate/generate.controller.integration.spec.ts @@ -37,7 +37,7 @@ describe("Generate Controller", () => { ]); const result = FakeCliFs.entries.get("project-name/src/controllers/TestController.integration.spec.ts"); - expect(result).toContain('import { PlatformTest } from "@tsed/platform-http";'); + expect(result).toContain('import { PlatformTest } from "@tsed/platform-http/testing";'); expect(result).toContain('import SuperTest from "supertest";'); expect(result).toContain('import { Server } from "../Server.js";'); expect(result).toContain('import { TestController } from "./TestController.js";'); @@ -67,7 +67,7 @@ describe("Generate Controller", () => { ]); const result = FakeCliFs.entries.get("project-name/src/controllers/users/UserController.integration.spec.ts"); - expect(result).toContain('import { PlatformTest } from "@tsed/platform-http";'); + expect(result).toContain('import { PlatformTest } from "@tsed/platform-http/testing";'); expect(result).toContain('import SuperTest from "supertest";'); expect(result).toContain('import { Server } from "../../Server.js";'); expect(result).toContain('import { UserController } from "./UserController.js";'); diff --git a/packages/cli/package.json b/packages/cli/package.json index 4a7eab475..97989d0e3 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -67,11 +67,11 @@ "@swc/core": "1.7.26", "@swc/helpers": "^0.5.13", "@tsed/cli-core": "workspace:*", - "@tsed/core": ">=8.0.0-beta.3", - "@tsed/di": ">=8.0.0-beta.3", + "@tsed/core": ">=8.0.0-beta.5", + "@tsed/di": ">=8.0.0-beta.5", "@tsed/logger": ">=6.2.1", - "@tsed/openspec": ">=8.0.0-beta.3", - "@tsed/schema": ">=8.0.0-beta.3", + "@tsed/openspec": ">=8.0.0-beta.5", + "@tsed/schema": ">=8.0.0-beta.5", "chalk": "^5.3.0", "change-case": "^5.4.4", "esm-module-alias": "^2.2.1", @@ -89,10 +89,10 @@ }, "peerDependencies": { "@tsed/cli-core": "workspace:*", - "@tsed/core": ">=8.0.0-beta.1", - "@tsed/di": ">=8.0.0-beta.1", + "@tsed/core": ">=8.0.0-beta.5", + "@tsed/di": ">=8.0.0-beta.5", "@tsed/logger": ">=6.2.1", - "@tsed/openspec": ">=8.0.0-beta.1", - "@tsed/schema": ">=8.0.0-beta.1" + "@tsed/openspec": ">=8.0.0-beta.5", + "@tsed/schema": ">=8.0.0-beta.5" } } diff --git a/yarn.lock b/yarn.lock index 3b4569da1..c9bac4fcd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2349,8 +2349,8 @@ __metadata: uuid: "npm:^10.0.0" vitest: "npm:2.1.1" peerDependencies: - "@tsed/core": ">=8.0.0-beta.3" - "@tsed/di": ">=8.0.0-beta.3" + "@tsed/core": ">=8.0.0-beta.5" + "@tsed/di": ">=8.0.0-beta.5" languageName: unknown linkType: soft @@ -2548,14 +2548,14 @@ __metadata: "@commitlint/config-conventional": "npm:19.5.0" "@swc/core": "npm:1.7.26" "@swc/helpers": "npm:0.5.13" - "@tsed/core": "npm:>=8.0.0-beta.3" - "@tsed/di": "npm:>=8.0.0-beta.3" + "@tsed/core": "npm:>=8.0.0-beta.5" + "@tsed/di": "npm:>=8.0.0-beta.5" "@tsed/logger": "npm:>=6.2.1" "@tsed/markdown-it-symbols": "npm:3.20.8" "@tsed/monorepo-utils": "npm:2.3.5" - "@tsed/normalize-path": "npm:>=8.0.0-beta.3" - "@tsed/openspec": "npm:>=8.0.0-beta.3" - "@tsed/schema": "npm:>=8.0.0-beta.3" + "@tsed/normalize-path": "npm:>=8.0.0-beta.5" + "@tsed/openspec": "npm:>=8.0.0-beta.5" + "@tsed/schema": "npm:>=8.0.0-beta.5" "@tsed/ts-doc": "npm:^4.1.0" "@types/node": "npm:22.7.4" "@typescript-eslint/eslint-plugin": "npm:8.7.0" @@ -2626,11 +2626,11 @@ __metadata: "@swc/core": "npm:1.7.26" "@swc/helpers": "npm:^0.5.13" "@tsed/cli-core": "workspace:*" - "@tsed/core": "npm:>=8.0.0-beta.3" - "@tsed/di": "npm:>=8.0.0-beta.3" + "@tsed/core": "npm:>=8.0.0-beta.5" + "@tsed/di": "npm:>=8.0.0-beta.5" "@tsed/logger": "npm:>=6.2.1" - "@tsed/openspec": "npm:>=8.0.0-beta.3" - "@tsed/schema": "npm:>=8.0.0-beta.3" + "@tsed/openspec": "npm:>=8.0.0-beta.5" + "@tsed/schema": "npm:>=8.0.0-beta.5" "@tsed/typescript": "workspace:*" "@types/change-case": "npm:^2.3.1" chalk: "npm:^5.3.0" @@ -2645,36 +2645,36 @@ __metadata: vitest: "npm:2.1.1" peerDependencies: "@tsed/cli-core": "workspace:*" - "@tsed/core": ">=8.0.0-beta.1" - "@tsed/di": ">=8.0.0-beta.1" + "@tsed/core": ">=8.0.0-beta.5" + "@tsed/di": ">=8.0.0-beta.5" "@tsed/logger": ">=6.2.1" - "@tsed/openspec": ">=8.0.0-beta.1" - "@tsed/schema": ">=8.0.0-beta.1" + "@tsed/openspec": ">=8.0.0-beta.5" + "@tsed/schema": ">=8.0.0-beta.5" bin: tsed: lib/esm/bin/tsed.js languageName: unknown linkType: soft -"@tsed/core@npm:>=8.0.0-beta.3": - version: 8.0.0-beta.4 - resolution: "@tsed/core@npm:8.0.0-beta.4" +"@tsed/core@npm:>=8.0.0-beta.5": + version: 8.0.0-beta.5 + resolution: "@tsed/core@npm:8.0.0-beta.5" dependencies: reflect-metadata: "npm:^0.2.2" tslib: "npm:2.7.0" - checksum: 10/dcafd7089056bd3dafe795ef603401644c1c43527127bc91d875f3a297d59fd8e5fca1aca234d457ebe60011385b46bef2c5930c94b0e681140f659b46887366 + checksum: 10/2f11058e3e3e603f0027f4070793732f4b95919109649cb8ca322af24853194c53d852b16bcbfacf478d9efb65b4d0f74bc33fad5592beb23860569c959e0b9c languageName: node linkType: hard -"@tsed/di@npm:>=8.0.0-beta.3": - version: 8.0.0-beta.4 - resolution: "@tsed/di@npm:8.0.0-beta.4" +"@tsed/di@npm:>=8.0.0-beta.5": + version: 8.0.0-beta.5 + resolution: "@tsed/di@npm:8.0.0-beta.5" dependencies: tslib: "npm:2.7.0" uuid: "npm:^10.0.0" peerDependencies: - "@tsed/core": 8.0.0-beta.4 + "@tsed/core": 8.0.0-beta.5 "@tsed/logger": ">=6.7.5" - "@tsed/schema": 8.0.0-beta.4 + "@tsed/schema": 8.0.0-beta.5 peerDependenciesMeta: "@tsed/core": optional: false @@ -2682,7 +2682,7 @@ __metadata: optional: false "@tsed/schema": optional: false - checksum: 10/03564b791e144090a80c94383d5d664339557d338ba90eff9ea6663f127279c29ac00b6731b3554d2faa67bc7cc14553c588029a1f34cfdfd3352f19c3d29cd1 + checksum: 10/e08dffe91a118e5f01dffbaa942657164d6ccf5b1a36555a15705fe0a73f91c945d6e067919f4167c05afeaf7d6e8dcc8d8173075dc6ad8e3325a5eea5b891ae languageName: node linkType: hard @@ -2748,28 +2748,28 @@ __metadata: languageName: node linkType: hard -"@tsed/normalize-path@npm:>=8.0.0-beta.3": - version: 8.0.0-beta.4 - resolution: "@tsed/normalize-path@npm:8.0.0-beta.4" +"@tsed/normalize-path@npm:>=8.0.0-beta.5": + version: 8.0.0-beta.5 + resolution: "@tsed/normalize-path@npm:8.0.0-beta.5" dependencies: normalize-path: "npm:3.0.0" tslib: "npm:2.7.0" - checksum: 10/c97a6064be2a538aa9175065142f58c847132f376ae99a6953936774cdb6d79f4e2475bd14751a6220a5e6b01fdc82d91b841ec26d1963e5e2a76d1501daa9f5 + checksum: 10/056e7c3f8c9cb066ec88e49ac604775d646ab0fa7ab4d3a107be7cc689b9d970ad777fb770bdea8faa7613a39fe6e7ec6f3bc4a56135190ef115719ae74bd8e9 languageName: node linkType: hard -"@tsed/openspec@npm:8.0.0-beta.4, @tsed/openspec@npm:>=8.0.0-beta.3": - version: 8.0.0-beta.4 - resolution: "@tsed/openspec@npm:8.0.0-beta.4" - checksum: 10/19e312a64d90ab966749a732b96d007b375b3305eca8e7d9ef80550dec210aa39adc60e99842a80e57cc5a4043101cf683aaa95ca2a91447730d5e98b98b51d6 +"@tsed/openspec@npm:8.0.0-beta.5, @tsed/openspec@npm:>=8.0.0-beta.5": + version: 8.0.0-beta.5 + resolution: "@tsed/openspec@npm:8.0.0-beta.5" + checksum: 10/d49599b0304119816d703bb21ab365de8dccf56f68e34146764b3387fdbdd8b560d3b83ff3b605f730a285e06bbd788488e99aa6bf31237fa6792a2dd9bb25d2 languageName: node linkType: hard -"@tsed/schema@npm:>=8.0.0-beta.3": - version: 8.0.0-beta.4 - resolution: "@tsed/schema@npm:8.0.0-beta.4" +"@tsed/schema@npm:>=8.0.0-beta.5": + version: 8.0.0-beta.5 + resolution: "@tsed/schema@npm:8.0.0-beta.5" dependencies: - "@tsed/openspec": "npm:8.0.0-beta.4" + "@tsed/openspec": "npm:8.0.0-beta.5" change-case: "npm:^5.4.4" fs-extra: "npm:^11.2.0" json-schema: "npm:0.4.0" @@ -2777,14 +2777,14 @@ __metadata: statuses: "npm:^2.0.1" tslib: "npm:2.7.0" peerDependencies: - "@tsed/core": 8.0.0-beta.4 - "@tsed/openspec": 8.0.0-beta.4 + "@tsed/core": 8.0.0-beta.5 + "@tsed/openspec": 8.0.0-beta.5 peerDependenciesMeta: "@tsed/core": optional: false "@tsed/openspec": optional: false - checksum: 10/65e424fdaa356ca483100eb0852d3f25dadf8c47f735e47ea09d1c498f710f3488e24668270aa9b5905976741b703399e10621e05739c00c436c20dc9aaaec03 + checksum: 10/5b46d5eff2f03232cb2852e1bb7ff24767b3dd389ab6582d1d817f0ff8de4eb67c6870b6df8d101aee1b77b67e150f8a56f85a13fe30bbf4a44708ddb977ecc2 languageName: node linkType: hard