fix: yargs import for esm cli entry-point

tada5hi · May 29, 2023 · 3d46dff · 3d46dff
1 parent aa65095
commit 3d46dff
Show file tree

Hide file tree

Showing 4 changed files with 107 additions and 30 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -62,7 +62,7 @@
     "license": "MIT",
     "dependencies": {
         "@faker-js/faker": "^8.0.2",
-        "locter": "^1.1.0",
+        "locter": "^1.1.2",
         "pascal-case": "^3.1.2",
         "rapiq": "^0.8.1",
         "reflect-metadata": "^0.1.13",
@@ -90,7 +90,7 @@
         "rollup": "^3.23.0",
         "semantic-release": "^21.0.2",
         "ts-jest": "^27.1.4",
-        "typeorm": "^0.3.15",
+        "typeorm": "^0.3.16",
         "typescript": "^4.9.5",
         "vitepress": "^1.0.0-beta.1",
         "vue": "^3.2.47"

diff --git a/rollup.config.mjs b/rollup.config.mjs
@@ -6,7 +6,7 @@
  */
 
 import resolve from '@rollup/plugin-node-resolve';
-import { transform } from "@swc/core";
+import {transform} from "@swc/core";
 import pkg from './package.json' assert {type: 'json'};
 import path from "node:path";
 
@@ -42,15 +42,14 @@ const swc = () => {
     }
 }
 
-const external = [
-    ...Object.keys(pkg.dependencies || {}),
-    ...Object.keys(pkg.peerDependencies || {}),
-    /^typeorm/,
-]
 export default [
     {
         input: './src/cli/index.ts',
-        external,
+        external: [
+            ...Object.keys(pkg.dependencies || {}),
+            ...Object.keys(pkg.peerDependencies || {}),
+            /^yargs/
+        ],
         plugins: [
             {
                 resolveId(source, importer, options) {
@@ -80,7 +79,6 @@ export default [
 
             // Compile TypeScript/JavaScript files
             swc()
-
         ],
         output: [
             {
@@ -99,8 +97,11 @@ export default [
 
         // Specify here external modules which you don't want to include in your bundle (for instance: 'lodash', 'moment' etc.)
         // https://rollupjs.org/guide/en/#external
-        external,
-
+        external: [
+            ...Object.keys(pkg.dependencies || {}),
+            ...Object.keys(pkg.peerDependencies || {}),
+            /^typeorm/,
+        ],
         plugins: [
             // Allows node_modules resolution
             resolve({ extensions}),
@@ -116,7 +117,22 @@ export default [
             }, {
                 file: pkg.module,
                 format: 'esm',
-                sourcemap: true
+                sourcemap: true,
+                plugins: [
+                    {
+                        generateBundle(outputOptions, bundle, isWrite) {
+                            for (const fileName in bundle) {
+                                const chunk = bundle[fileName];
+                                if (chunk.type === 'chunk') {
+                                    chunk.code = chunk.code.replace(
+                                        /import\s*{([\w\s,]+)}\s*from\s*(['"])typeorm([^'"]+)(['"])/g,
+                                        "import {$1} from $2typeorm$3.js$4"
+                                    );
+                                }
+                            }
+                        }
+                    }
+                ]
             }
         ]
     }

diff --git a/src/cli/index.ts b/src/cli/index.ts
@@ -1,15 +1,16 @@
 #!/usr/bin/env node
 import 'reflect-metadata';
+import process from 'node:process';
 import yargs from 'yargs';
+import { hideBin } from 'yargs/helpers';
 
 import {
     DatabaseCreateCommand,
     DatabaseDropCommand,
     SeedCommand,
 } from './commands';
 
-// eslint-disable-next-line no-unused-expressions,@typescript-eslint/no-unused-expressions
-yargs
+yargs(hideBin(process.argv))
     .scriptName('typeorm-extension')
     .usage('Usage: $0 <command> [options]')
     .demandCommand(1)
@@ -20,4 +21,4 @@ yargs
     .alias('v', 'version')
     .help('h')
     .alias('h', 'help')
-    .argv;
+    .parse();