From 64c7cb33ee29103abdbaef9a1000caaae125a249 Mon Sep 17 00:00:00 2001 From: Romain Lenzotti Date: Wed, 3 Apr 2024 10:59:35 +0200 Subject: [PATCH] fix: fix wrong esm import in the code base --- package.json | 2 +- packages/cli-core/package.json | 2 +- packages/cli-core/src/services/CliService.ts | 2 +- packages/cli-core/src/services/Renderer.ts | 6 +++--- packages/cli-generate-http-client/package.json | 2 +- packages/cli-generate-swagger/package.json | 2 +- packages/cli-plugin-eslint/package.json | 5 ++--- packages/cli-plugin-jest/package.json | 5 ++--- packages/cli-plugin-mocha/package.json | 5 ++--- packages/cli-plugin-mongoose/package.json | 5 ++--- packages/cli-plugin-oidc-provider/package.json | 2 +- packages/cli-plugin-passport/package.json | 5 ++--- packages/cli-plugin-prisma/package.json | 5 ++--- packages/cli-plugin-typegraphql/package.json | 2 +- packages/cli-plugin-typeorm/package.json | 5 ++--- packages/cli-plugin-vitest/package.json | 5 ++--- packages/cli-testing/package.json | 5 ++--- packages/cli/package.json | 2 +- tools/eslint/package.json | 6 ++---- tools/jest/package.json | 6 ++---- tools/typescript/package.json | 6 ++---- yarn.lock | 10 +++++----- 22 files changed, 40 insertions(+), 55 deletions(-) diff --git a/package.json b/package.json index e05309974..792688ce5 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "@swc/helpers": "^0.5.1", "@swc/jest": "^0.2.26", "@tsed/markdown-it-symbols": "3.20.4", - "@tsed/monorepo-utils": "2.1.1", + "@tsed/monorepo-utils": "2.1.2", "@tsed/ts-doc": "^4.1.0", "@types/jest": "28.1.7", "@types/node": "18.7.8", diff --git a/packages/cli-core/package.json b/packages/cli-core/package.json index f14e4b4af..f15055604 100644 --- a/packages/cli-core/package.json +++ b/packages/cli-core/package.json @@ -94,4 +94,4 @@ "@tsed/core": ">=7.14.2", "@tsed/di": ">=7.14.2" } -} \ No newline at end of file +} diff --git a/packages/cli-core/src/services/CliService.ts b/packages/cli-core/src/services/CliService.ts index 1a29879bb..e06efffc9 100644 --- a/packages/cli-core/src/services/CliService.ts +++ b/packages/cli-core/src/services/CliService.ts @@ -17,7 +17,7 @@ import {ProjectPackageJson} from "./ProjectPackageJson"; import inquirer_autocomplete_prompt from "inquirer-autocomplete-prompt"; import {mapCommanderOptions} from "../utils/mapCommanderOptions"; import {CommandMetadata} from "../interfaces/CommandMetadata"; -import {PackageManagersModule} from "../packageManagers"; +import {PackageManagersModule} from "../packageManagers/index"; Inquirer.registerPrompt("autocomplete", inquirer_autocomplete_prompt); diff --git a/packages/cli-core/src/services/Renderer.ts b/packages/cli-core/src/services/Renderer.ts index e26102488..e84ca1a14 100644 --- a/packages/cli-core/src/services/Renderer.ts +++ b/packages/cli-core/src/services/Renderer.ts @@ -1,13 +1,13 @@ import {isString} from "@tsed/core"; import {Configuration, Constant, Inject, Injectable} from "@tsed/di"; import Consolidate from "consolidate"; -import {existsSync} from "fs-extra"; +import fs from "fs-extra"; import normalizePath from "normalize-path"; import globby from "globby"; import {basename, dirname, join, relative} from "path"; import {Observable} from "rxjs"; import {CliFs} from "./CliFs"; -import "../utils/hbs"; +import "../utils/hbs/index"; import handlebars from "handlebars"; import {insertImport} from "../utils/renderer/insertImport"; import {insertAfter} from "../utils/renderer/insertAfter"; @@ -121,7 +121,7 @@ export abstract class Renderer { templateExists(path: string, options: Partial = {}) { const {templateDir} = this.mapOptions(path, options); - return existsSync(join(templateDir, path)); + return fs.existsSync(join(templateDir, path)); } async scan(pattern: string[], options: any = {}): Promise { diff --git a/packages/cli-generate-http-client/package.json b/packages/cli-generate-http-client/package.json index 1b3327e99..39e093fc7 100644 --- a/packages/cli-generate-http-client/package.json +++ b/packages/cli-generate-http-client/package.json @@ -47,4 +47,4 @@ "optional": false } } -} \ No newline at end of file +} diff --git a/packages/cli-generate-swagger/package.json b/packages/cli-generate-swagger/package.json index 89f4722bb..404f2cd23 100644 --- a/packages/cli-generate-swagger/package.json +++ b/packages/cli-generate-swagger/package.json @@ -45,4 +45,4 @@ "optional": false } } -} \ No newline at end of file +} diff --git a/packages/cli-plugin-eslint/package.json b/packages/cli-plugin-eslint/package.json index e138103e0..4d4586f21 100644 --- a/packages/cli-plugin-eslint/package.json +++ b/packages/cli-plugin-eslint/package.json @@ -31,6 +31,5 @@ }, "dependencies": { "tslib": "2.3.1" - }, - "peerDependencies": {} -} \ No newline at end of file + } +} diff --git a/packages/cli-plugin-jest/package.json b/packages/cli-plugin-jest/package.json index 9c238c5d2..7414251fa 100644 --- a/packages/cli-plugin-jest/package.json +++ b/packages/cli-plugin-jest/package.json @@ -31,6 +31,5 @@ }, "dependencies": { "tslib": "2.3.1" - }, - "peerDependencies": {} -} \ No newline at end of file + } +} diff --git a/packages/cli-plugin-mocha/package.json b/packages/cli-plugin-mocha/package.json index 7f407b4d9..831f5a47d 100644 --- a/packages/cli-plugin-mocha/package.json +++ b/packages/cli-plugin-mocha/package.json @@ -31,6 +31,5 @@ }, "dependencies": { "tslib": "2.3.1" - }, - "peerDependencies": {} -} \ No newline at end of file + } +} diff --git a/packages/cli-plugin-mongoose/package.json b/packages/cli-plugin-mongoose/package.json index 80b27b459..38b8fa59d 100644 --- a/packages/cli-plugin-mongoose/package.json +++ b/packages/cli-plugin-mongoose/package.json @@ -33,6 +33,5 @@ "cross-env": "7.0.3", "eslint": "8.22.0", "jest": "29.5.0" - }, - "peerDependencies": {} -} \ No newline at end of file + } +} diff --git a/packages/cli-plugin-oidc-provider/package.json b/packages/cli-plugin-oidc-provider/package.json index dc2b5cb6a..592330121 100644 --- a/packages/cli-plugin-oidc-provider/package.json +++ b/packages/cli-plugin-oidc-provider/package.json @@ -40,4 +40,4 @@ "@tsed/cli": "5.1.1", "@tsed/cli-core": "5.1.1" } -} \ No newline at end of file +} diff --git a/packages/cli-plugin-passport/package.json b/packages/cli-plugin-passport/package.json index e38b662c9..c9ca270b9 100644 --- a/packages/cli-plugin-passport/package.json +++ b/packages/cli-plugin-passport/package.json @@ -33,6 +33,5 @@ "cross-env": "7.0.3", "eslint": "8.22.0", "jest": "29.5.0" - }, - "peerDependencies": {} -} \ No newline at end of file + } +} diff --git a/packages/cli-plugin-prisma/package.json b/packages/cli-plugin-prisma/package.json index 74f089d47..9cff8ad9a 100644 --- a/packages/cli-plugin-prisma/package.json +++ b/packages/cli-plugin-prisma/package.json @@ -32,6 +32,5 @@ "cross-env": "7.0.3", "eslint": "8.22.0", "jest": "29.5.0" - }, - "peerDependencies": {} -} \ No newline at end of file + } +} diff --git a/packages/cli-plugin-typegraphql/package.json b/packages/cli-plugin-typegraphql/package.json index 763dc38d7..ccf6102f7 100644 --- a/packages/cli-plugin-typegraphql/package.json +++ b/packages/cli-plugin-typegraphql/package.json @@ -40,4 +40,4 @@ "@tsed/cli": "5.1.1", "@tsed/cli-core": "5.1.1" } -} \ No newline at end of file +} diff --git a/packages/cli-plugin-typeorm/package.json b/packages/cli-plugin-typeorm/package.json index b7e883429..f6aa78211 100644 --- a/packages/cli-plugin-typeorm/package.json +++ b/packages/cli-plugin-typeorm/package.json @@ -32,6 +32,5 @@ "cross-env": "7.0.3", "eslint": "8.22.0", "jest": "29.5.0" - }, - "peerDependencies": {} -} \ No newline at end of file + } +} diff --git a/packages/cli-plugin-vitest/package.json b/packages/cli-plugin-vitest/package.json index 7f1151499..478ff1d62 100644 --- a/packages/cli-plugin-vitest/package.json +++ b/packages/cli-plugin-vitest/package.json @@ -31,6 +31,5 @@ }, "dependencies": { "tslib": "2.3.1" - }, - "peerDependencies": {} -} \ No newline at end of file + } +} diff --git a/packages/cli-testing/package.json b/packages/cli-testing/package.json index 9469cb19f..0524212ae 100644 --- a/packages/cli-testing/package.json +++ b/packages/cli-testing/package.json @@ -40,6 +40,5 @@ "cross-env": "7.0.3", "eslint": "8.22.0", "jest": "29.5.0" - }, - "peerDependencies": {} -} \ No newline at end of file + } +} diff --git a/packages/cli/package.json b/packages/cli/package.json index b0292cb07..33d69de5a 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -96,4 +96,4 @@ "@tsed/openspec": ">=7.14.2", "@tsed/schema": ">=7.14.2" } -} \ No newline at end of file +} diff --git a/tools/eslint/package.json b/tools/eslint/package.json index 940789124..57d320d60 100644 --- a/tools/eslint/package.json +++ b/tools/eslint/package.json @@ -12,7 +12,5 @@ "@tsed/jest-config": "5.1.1", "cross-env": "7.0.3", "jest": "29.5.0" - }, - "dependencies": {}, - "peerDependencies": {} -} \ No newline at end of file + } +} diff --git a/tools/jest/package.json b/tools/jest/package.json index 62eb8e68a..3f652c65c 100644 --- a/tools/jest/package.json +++ b/tools/jest/package.json @@ -10,7 +10,5 @@ "devDependencies": { "cross-env": "7.0.3", "jest": "29.5.0" - }, - "dependencies": {}, - "peerDependencies": {} -} \ No newline at end of file + } +} diff --git a/tools/typescript/package.json b/tools/typescript/package.json index bc797148e..2cec39cc4 100644 --- a/tools/typescript/package.json +++ b/tools/typescript/package.json @@ -15,7 +15,5 @@ "@tsed/jest-config": "5.1.1", "cross-env": "7.0.3", "jest": "29.5.0" - }, - "dependencies": {}, - "peerDependencies": {} -} \ No newline at end of file + } +} diff --git a/yarn.lock b/yarn.lock index a0d1e6982..a195edd02 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3543,7 +3543,7 @@ __metadata: "@tsed/di": "npm:>=7.14.2" "@tsed/logger": "npm:>=6.2.1" "@tsed/markdown-it-symbols": "npm:3.20.4" - "@tsed/monorepo-utils": "npm:2.1.1" + "@tsed/monorepo-utils": "npm:2.1.2" "@tsed/normalize-path": "npm:>=7.14.2" "@tsed/ts-doc": "npm:^4.1.0" "@types/jest": "npm:28.1.7" @@ -3723,9 +3723,9 @@ __metadata: languageName: node linkType: hard -"@tsed/monorepo-utils@npm:2.1.1": - version: 2.1.1 - resolution: "@tsed/monorepo-utils@npm:2.1.1" +"@tsed/monorepo-utils@npm:2.1.2": + version: 2.1.2 + resolution: "@tsed/monorepo-utils@npm:2.1.2" dependencies: "@samverschueren/stream-to-observable": "npm:>=0.3.1" "@typescript-eslint/typescript-estree": "npm:>=6.20.0" @@ -3752,7 +3752,7 @@ __metadata: semantic-release: ">=19" bin: monorepo: bin/monorepo.js - checksum: 10/a97ce2a04535e79a7763c8952d78cbac9c560c24d653cf6248766f77497c9eb35abb3bed0510ce3d98f6d26624007eff1d30df2a5d68916b1e1d7dc9d0c43ab0 + checksum: 10/839fdd5a50e893a61f2bfdabec82296504bd5b060fe6211ed6e591e473b9979b3a4c4b7eba427e836d54bee0788c89d56fe72e5088d70e5acaa22305958fb21f languageName: node linkType: hard