diff --git a/docs/faq.md b/docs/faq.md index b728c409e7..81e3a9fc41 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -160,13 +160,13 @@ make sure to use the `outDir` compiler option to prevent Also, if you want to use the ts-node CLI, you can execute TypeORM the following way: ``` -ts-node ./node_modules/.bin/typeorm schema:sync +npx typeorm-ts-node-commonjs schema:sync ``` For ESM projects use this instead: ``` -node --loader ts-node/esm ./node_modules/.bin/typeorm schema:sync +npx typeorm-ts-node-esm schema:sync ``` ## How to use Webpack for the backend? diff --git a/docs/migrations.md b/docs/migrations.md index 3b42f00033..82efabbe6a 100644 --- a/docs/migrations.md +++ b/docs/migrations.md @@ -140,19 +140,13 @@ typeorm migration:run Example with `ts-node`: ``` -ts-node --transpile-only ./node_modules/typeorm/cli.js migration:run +npx typeorm-ts-node-commonjs migration:run ``` Example with `ts-node` in ESM projects: ``` -node --loader ts-node/esm ./node_modules/typeorm/cli.js migration:run -``` - -Example `ts-node` not using `node_modules` directly: - -``` -ts-node $(yarn bin typeorm) migration:run +npx typeorm-ts-node-esm migration:run ``` This command will execute all pending migrations and run them in a sequence ordered by their timestamps. diff --git a/docs/using-cli.md b/docs/using-cli.md index 8828ea2a09..0d58d88dc2 100644 --- a/docs/using-cli.md +++ b/docs/using-cli.md @@ -42,7 +42,7 @@ Add typeorm command under scripts section in package.json ``` "scripts": { ... - "typeorm": "node --require ts-node/register ./node_modules/typeorm/cli.js" + "typeorm": "typeorm-ts-node-commonjs" } ``` @@ -51,7 +51,7 @@ For ESM projects add this instead: ``` "scripts": { ... - "typeorm": "node --loader ts-node/esm ./node_modules/typeorm/cli.js" + "typeorm": "typeorm-ts-node-esm" } ``` diff --git a/docs/zh_CN/faq.md b/docs/zh_CN/faq.md index 704f6e6b89..1bc09d0f0d 100644 --- a/docs/zh_CN/faq.md +++ b/docs/zh_CN/faq.md @@ -168,7 +168,7 @@ createConnection({ 此外，如果要使用 ts-node CLI，可以通过以下方式执行 TypeORM： ``` -ts-node ./node_modules/bin/typeorm schema:sync +npx typeorm-ts-node-commonjs schema:sync ``` ## 后端如何使用Webpack？ diff --git a/docs/zh_CN/migrations.md b/docs/zh_CN/migrations.md index 46b11d7dc8..11b47b356a 100644 --- a/docs/zh_CN/migrations.md +++ b/docs/zh_CN/migrations.md @@ -138,7 +138,7 @@ typeorm migration:run `ts-node`的示例： ``` -ts-node ./node_modules/typeorm/cli.js migration:run +npx typeorm-ts-node-commonjs migration:run ``` 此命令将执行所有挂起的迁移，并按其时间戳排序的顺序运行它们。 diff --git a/docs/zh_CN/using-cli.md b/docs/zh_CN/using-cli.md index 424adce3fb..62c9bdb154 100644 --- a/docs/zh_CN/using-cli.md +++ b/docs/zh_CN/using-cli.md @@ -24,7 +24,7 @@ 你可以在项目中设置 ts-node 以简化操作，如下所示： ``` -npm install -g ts-node +npm install ts-node --save-dev ``` 在 package.json 中的 scripts 下添加 typeorm 命令 @@ -32,7 +32,7 @@ npm install -g ts-node ``` "script" { ... - "typeorm": "ts-node -r tsconfig-paths/register ./node_modules/typeorm/cli.js" + "typeorm": "typeorm-ts-node-commonjs" } ``` diff --git a/package-lock.json b/package-lock.json index ebbdc0026c..9c531c326c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "typeorm", - "version": "0.3.0-rc.38", + "version": "0.3.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "typeorm", - "version": "0.3.0-rc.38", + "version": "0.3.1", "license": "MIT", "dependencies": { "@sqltools/formatter": "^1.2.2", @@ -28,6 +28,8 @@ "yargs": "^17.3.1" }, "bin": { + "typeorm-ts-node-commonjs": "./cli-ts-node-commonjs.js", + "typeorm-ts-node-esm": "./cli-ts-node-esm.js", "typeorm": "cli.js" }, "devDependencies": { @@ -79,7 +81,7 @@ "source-map-support": "^0.5.19", "sql.js": "^1.4.0", "sqlite3": "^5.0.2", - "ts-node": "^9.1.1", + "ts-node": "^10.7.0", "typeorm-aurora-data-api-driver": "^2.0.0", "typescript": "^4.6.2" }, @@ -104,6 +106,7 @@ "redis": "^3.1.1", "sql.js": "^1.4.0", "sqlite3": "^5.0.2", + "ts-node": "^10.7.0", "typeorm-aurora-data-api-driver": "^2.0.0" }, "peerDependenciesMeta": { @@ -149,6 +152,9 @@ "sqlite3": { "optional": true }, + "ts-node": { + "optional": true + }, "typeorm-aurora-data-api-driver": { "optional": true } @@ -667,6 +673,27 @@ "node": ">=4" } }, + "node_modules/@cspotcode/source-map-consumer": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz", + "integrity": "sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==", + "dev": true, + "engines": { + "node": ">= 12" + } + }, + "node_modules/@cspotcode/source-map-support": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.7.0.tgz", + "integrity": "sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA==", + "dev": true, + "dependencies": { + "@cspotcode/source-map-consumer": "0.8.0" + }, + "engines": { + "node": ">=12" + } + }, "node_modules/@gulp-sourcemaps/identity-map": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-2.0.1.tgz", @@ -854,6 +881,30 @@ "node": ">= 6" } }, + "node_modules/@tsconfig/node10": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz", + "integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==", + "dev": true + }, + "node_modules/@tsconfig/node12": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz", + "integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==", + "dev": true + }, + "node_modules/@tsconfig/node14": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz", + "integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==", + "dev": true + }, + "node_modules/@tsconfig/node16": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz", + "integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==", + "dev": true + }, "node_modules/@types/app-root-path": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/@types/app-root-path/-/app-root-path-1.2.4.tgz", @@ -1293,6 +1344,27 @@ "node": ">=6.5" } }, + "node_modules/acorn": { + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz", + "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-walk": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", + "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==", + "dev": true, + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/adal-node": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/adal-node/-/adal-node-0.2.3.tgz", @@ -11486,29 +11558,46 @@ } }, "node_modules/ts-node": { - "version": "9.1.1", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-9.1.1.tgz", - "integrity": "sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==", - "dev": true, - "dependencies": { + "version": "10.7.0", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.7.0.tgz", + "integrity": "sha512-TbIGS4xgJoX2i3do417KSaep1uRAW/Lu+WAL2doDHC0D6ummjirVOXU5/7aiZotbQ5p1Zp9tP7U6cYhA0O7M8A==", + "dev": true, + "dependencies": { + "@cspotcode/source-map-support": "0.7.0", + "@tsconfig/node10": "^1.0.7", + "@tsconfig/node12": "^1.0.7", + "@tsconfig/node14": "^1.0.0", + "@tsconfig/node16": "^1.0.2", + "acorn": "^8.4.1", + "acorn-walk": "^8.1.1", "arg": "^4.1.0", "create-require": "^1.1.0", "diff": "^4.0.1", "make-error": "^1.1.1", - "source-map-support": "^0.5.17", + "v8-compile-cache-lib": "^3.0.0", "yn": "3.1.1" }, "bin": { "ts-node": "dist/bin.js", + "ts-node-cwd": "dist/bin-cwd.js", + "ts-node-esm": "dist/bin-esm.js", "ts-node-script": "dist/bin-script.js", "ts-node-transpile-only": "dist/bin-transpile.js", "ts-script": "dist/bin-script-deprecated.js" }, - "engines": { - "node": ">=10.0.0" - }, "peerDependencies": { + "@swc/core": ">=1.2.50", + "@swc/wasm": ">=1.2.50", + "@types/node": "*", "typescript": ">=2.7" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "@swc/wasm": { + "optional": true + } } }, "node_modules/ts-node/node_modules/diff": { @@ -11795,6 +11884,12 @@ "uuid": "dist/bin/uuid" } }, + "node_modules/v8-compile-cache-lib": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.0.tgz", + "integrity": "sha512-mpSYqfsFvASnSn5qMiwrr4VKfumbPyONLCOPmsR3A6pTY/r0+tSaVbgPWSAIuzbk3lCTa+FForeTiO+wBQGkjA==", + "dev": true + }, "node_modules/v8flags": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz", @@ -12672,6 +12767,21 @@ } } }, + "@cspotcode/source-map-consumer": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz", + "integrity": "sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==", + "dev": true + }, + "@cspotcode/source-map-support": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.7.0.tgz", + "integrity": "sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA==", + "dev": true, + "requires": { + "@cspotcode/source-map-consumer": "0.8.0" + } + }, "@gulp-sourcemaps/identity-map": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-2.0.1.tgz", @@ -12830,6 +12940,30 @@ "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", "dev": true }, + "@tsconfig/node10": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz", + "integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==", + "dev": true + }, + "@tsconfig/node12": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz", + "integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==", + "dev": true + }, + "@tsconfig/node14": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz", + "integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==", + "dev": true + }, + "@tsconfig/node16": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz", + "integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==", + "dev": true + }, "@types/app-root-path": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/@types/app-root-path/-/app-root-path-1.2.4.tgz", @@ -13228,6 +13362,18 @@ "event-target-shim": "^5.0.0" } }, + "acorn": { + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz", + "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==", + "dev": true + }, + "acorn-walk": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", + "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==", + "dev": true + }, "adal-node": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/adal-node/-/adal-node-0.2.3.tgz", @@ -21261,16 +21407,23 @@ "dev": true }, "ts-node": { - "version": "9.1.1", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-9.1.1.tgz", - "integrity": "sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==", - "dev": true, - "requires": { + "version": "10.7.0", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.7.0.tgz", + "integrity": "sha512-TbIGS4xgJoX2i3do417KSaep1uRAW/Lu+WAL2doDHC0D6ummjirVOXU5/7aiZotbQ5p1Zp9tP7U6cYhA0O7M8A==", + "dev": true, + "requires": { + "@cspotcode/source-map-support": "0.7.0", + "@tsconfig/node10": "^1.0.7", + "@tsconfig/node12": "^1.0.7", + "@tsconfig/node14": "^1.0.0", + "@tsconfig/node16": "^1.0.2", + "acorn": "^8.4.1", + "acorn-walk": "^8.1.1", "arg": "^4.1.0", "create-require": "^1.1.0", "diff": "^4.0.1", "make-error": "^1.1.1", - "source-map-support": "^0.5.17", + "v8-compile-cache-lib": "^3.0.0", "yn": "3.1.1" }, "dependencies": { @@ -21500,6 +21653,12 @@ "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" }, + "v8-compile-cache-lib": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.0.tgz", + "integrity": "sha512-mpSYqfsFvASnSn5qMiwrr4VKfumbPyONLCOPmsR3A6pTY/r0+tSaVbgPWSAIuzbk3lCTa+FForeTiO+wBQGkjA==", + "dev": true + }, "v8flags": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz", diff --git a/package.json b/package.json index 2b831032de..bab02841c1 100644 --- a/package.json +++ b/package.json @@ -129,7 +129,7 @@ "source-map-support": "^0.5.19", "sql.js": "^1.4.0", "sqlite3": "^5.0.2", - "ts-node": "^9.1.1", + "ts-node": "^10.7.0", "typeorm-aurora-data-api-driver": "^2.0.0", "typescript": "^4.6.2", "prettier": "^2.5.1" @@ -149,6 +149,7 @@ "redis": "^3.1.1", "sql.js": "^1.4.0", "sqlite3": "^5.0.2", + "ts-node": "^10.7.0", "typeorm-aurora-data-api-driver": "^2.0.0" }, "peerDependenciesMeta": { @@ -194,6 +195,9 @@ "sqlite3": { "optional": true }, + "ts-node": { + "optional": true + }, "typeorm-aurora-data-api-driver": { "optional": true } @@ -228,7 +232,11 @@ "format": "prettier --write \"./src/**/*.ts\" \"./test/**/*.ts\" \"./sample/**/*.ts\"", "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 2" }, - "bin": "./cli.js", + "bin": { + "typeorm": "./cli.js", + "typeorm-ts-node-commonjs": "./cli-ts-node-commonjs.js", + "typeorm-ts-node-esm": "./cli-ts-node-esm.js" + }, "funding": "https://opencollective.com/typeorm", "collective": { "type": "opencollective", diff --git a/src/cli-ts-node-commonjs.ts b/src/cli-ts-node-commonjs.ts new file mode 100644 index 0000000000..4418dde3cf --- /dev/null +++ b/src/cli-ts-node-commonjs.ts @@ -0,0 +1,2 @@ +#!/usr/bin/env node --require ts-node/register +import "./cli" diff --git a/src/cli-ts-node-esm.ts b/src/cli-ts-node-esm.ts new file mode 100644 index 0000000000..a389da1ebf --- /dev/null +++ b/src/cli-ts-node-esm.ts @@ -0,0 +1,2 @@ +#!/usr/bin/env node --loader ts-node/esm --no-warnings +import "./cli" diff --git a/src/commands/InitCommand.ts b/src/commands/InitCommand.ts index fea5495401..0f61eaaa9f 100644 --- a/src/commands/InitCommand.ts +++ b/src/commands/InitCommand.ts @@ -691,14 +691,12 @@ Steps to run this project: if (projectIsEsm) Object.assign(packageJson.scripts, { start: /*(docker ? "docker-compose up && " : "") + */ "node --loader ts-node/esm src/index.ts", - typeorm: - "node --loader ts-node/esm ./node_modules/typeorm/cli.js", + typeorm: "typeorm-ts-node-esm", }) else Object.assign(packageJson.scripts, { start: /*(docker ? "docker-compose up && " : "") + */ "ts-node src/index.ts", - typeorm: - "node --require ts-node/register ./node_modules/typeorm/cli.js", + typeorm: "typeorm-ts-node-commonjs", }) return JSON.stringify(packageJson, undefined, 3)