Skip to content

Commit

Permalink
fix: fix wrong esm import in the code base
Browse files Browse the repository at this point in the history
  • Loading branch information
Romakita committed Apr 3, 2024
1 parent a03850a commit 64c7cb3
Show file tree
Hide file tree
Showing 22 changed files with 40 additions and 55 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,4 @@
"@tsed/core": ">=7.14.2",
"@tsed/di": ">=7.14.2"
}
}
}
2 changes: 1 addition & 1 deletion packages/cli-core/src/services/CliService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
6 changes: 3 additions & 3 deletions packages/cli-core/src/services/Renderer.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand Down Expand Up @@ -121,7 +121,7 @@ export abstract class Renderer {
templateExists(path: string, options: Partial<RenderOptions> = {}) {
const {templateDir} = this.mapOptions(path, options);

return existsSync(join(templateDir, path));
return fs.existsSync(join(templateDir, path));
}

async scan(pattern: string[], options: any = {}): Promise<string[]> {
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-generate-http-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@
"optional": false
}
}
}
}
2 changes: 1 addition & 1 deletion packages/cli-generate-swagger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@
"optional": false
}
}
}
}
5 changes: 2 additions & 3 deletions packages/cli-plugin-eslint/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,5 @@
},
"dependencies": {
"tslib": "2.3.1"
},
"peerDependencies": {}
}
}
}
5 changes: 2 additions & 3 deletions packages/cli-plugin-jest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,5 @@
},
"dependencies": {
"tslib": "2.3.1"
},
"peerDependencies": {}
}
}
}
5 changes: 2 additions & 3 deletions packages/cli-plugin-mocha/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,5 @@
},
"dependencies": {
"tslib": "2.3.1"
},
"peerDependencies": {}
}
}
}
5 changes: 2 additions & 3 deletions packages/cli-plugin-mongoose/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,5 @@
"cross-env": "7.0.3",
"eslint": "8.22.0",
"jest": "29.5.0"
},
"peerDependencies": {}
}
}
}
2 changes: 1 addition & 1 deletion packages/cli-plugin-oidc-provider/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@
"@tsed/cli": "5.1.1",
"@tsed/cli-core": "5.1.1"
}
}
}
5 changes: 2 additions & 3 deletions packages/cli-plugin-passport/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,5 @@
"cross-env": "7.0.3",
"eslint": "8.22.0",
"jest": "29.5.0"
},
"peerDependencies": {}
}
}
}
5 changes: 2 additions & 3 deletions packages/cli-plugin-prisma/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,5 @@
"cross-env": "7.0.3",
"eslint": "8.22.0",
"jest": "29.5.0"
},
"peerDependencies": {}
}
}
}
2 changes: 1 addition & 1 deletion packages/cli-plugin-typegraphql/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@
"@tsed/cli": "5.1.1",
"@tsed/cli-core": "5.1.1"
}
}
}
5 changes: 2 additions & 3 deletions packages/cli-plugin-typeorm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,5 @@
"cross-env": "7.0.3",
"eslint": "8.22.0",
"jest": "29.5.0"
},
"peerDependencies": {}
}
}
}
5 changes: 2 additions & 3 deletions packages/cli-plugin-vitest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,5 @@
},
"dependencies": {
"tslib": "2.3.1"
},
"peerDependencies": {}
}
}
}
5 changes: 2 additions & 3 deletions packages/cli-testing/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,5 @@
"cross-env": "7.0.3",
"eslint": "8.22.0",
"jest": "29.5.0"
},
"peerDependencies": {}
}
}
}
2 changes: 1 addition & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,4 +96,4 @@
"@tsed/openspec": ">=7.14.2",
"@tsed/schema": ">=7.14.2"
}
}
}
6 changes: 2 additions & 4 deletions tools/eslint/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,5 @@
"@tsed/jest-config": "5.1.1",
"cross-env": "7.0.3",
"jest": "29.5.0"
},
"dependencies": {},
"peerDependencies": {}
}
}
}
6 changes: 2 additions & 4 deletions tools/jest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,5 @@
"devDependencies": {
"cross-env": "7.0.3",
"jest": "29.5.0"
},
"dependencies": {},
"peerDependencies": {}
}
}
}
6 changes: 2 additions & 4 deletions tools/typescript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,5 @@
"@tsed/jest-config": "5.1.1",
"cross-env": "7.0.3",
"jest": "29.5.0"
},
"dependencies": {},
"peerDependencies": {}
}
}
}
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -3752,7 +3752,7 @@ __metadata:
semantic-release: ">=19"
bin:
monorepo: bin/monorepo.js
checksum: 10/a97ce2a04535e79a7763c8952d78cbac9c560c24d653cf6248766f77497c9eb35abb3bed0510ce3d98f6d26624007eff1d30df2a5d68916b1e1d7dc9d0c43ab0
checksum: 10/839fdd5a50e893a61f2bfdabec82296504bd5b060fe6211ed6e591e473b9979b3a4c4b7eba427e836d54bee0788c89d56fe72e5088d70e5acaa22305958fb21f
languageName: node
linkType: hard

Expand Down

0 comments on commit 64c7cb3

Please sign in to comment.