feat: use @eggjs/tsconfig (#109)

eggjs · Aug 31, 2023 · 5b0a976 · 5b0a976
1 parent 68642dc
commit 5b0a976
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 38 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -10,8 +10,6 @@
       "windows": { "runtimeExecutable": "npm.cmd" },
       "runtimeArgs": [ "run", "test-local", "--", "--inspect-brk=9229" ],
       "console": "integratedTerminal",
-      "protocol": "auto",
-      "port": 9229,
       "autoAttachChildProcesses": true
     }
   ]

diff --git a/package.json b/package.json
@@ -18,15 +18,15 @@
   },
   "scripts": {
     "clean": "tsc -b --clean",
-    "build": "tsc -d",
-    "build:w": "tsc -d -w",
+    "tsc": "tsc -d",
+    "tsc:w": "tsc -d -w",
     "lint": "eslint . --ext .ts",
-    "check": "npm run build && npm run lint",
+    "check": "npm run tsc && npm run lint",
     "test": "npm run check && npm run test-local",
     "test-local": "egg-bin test --ts",
-    "prepublish": "del dist && npm run build",
+    "prepublishOnly": "del dist && npm run tsc",
     "cov": "egg-bin cov --ts",
-    "ci": "npm run check && npm run cov"
+    "ci": "npm run check && npm run cov && npm run tsc"
   },
   "keywords": [
     "egg",

diff --git a/src/command.ts b/src/command.ts
@@ -2,9 +2,8 @@
 import path from 'path';
 import { Command } from 'commander';
 import assert from 'assert';
-import packInfo from '../package.json';
 import TsHelper, { defaultConfig } from './core';
-import { loadModules, writeJsConfig, checkMaybeIsJsProj } from './utils';
+import { loadModules, writeJsConfig, checkMaybeIsJsProj, getPkgInfo } from './utils';
 
 export interface CommandOption {
   version?: string;
@@ -19,8 +18,12 @@ export default class Commander {
   constructor(options?: CommandOption) {
     this.commands = loadModules<SubCommand>(path.resolve(__dirname, './cmd'), true);
     this.tsHelperClazz = options?.tsHelperClazz || TsHelper;
+    let version = options?.version;
+    if (!version) {
+      version = getPkgInfo(path.dirname(__dirname)).version;
+    }
     this.program = new Command()
-      .version(options?.version || packInfo.version, '-v, --version')
+      .version(version!, '-v, --version')
       .usage('[commands] [options]')
       .option('-w, --watch', 'Watching files, d.ts would recreated while file changed')
       .option('-c, --cwd [path]', 'Egg application base dir (default: process.cwd)')

diff --git a/src/config.ts b/src/config.ts
@@ -1,8 +1,10 @@
 import path from 'path';
-import packInfo from '../package.json';
+import { getPkgInfo } from './utils';
 
-export const tmpDir = path.resolve(__dirname, '../.tmp');
-export const eggInfoPath = path.resolve(tmpDir, './eggInfo.json');
+const root = path.dirname(__dirname);
+const packInfo = getPkgInfo(root);
+export const tmpDir = path.join(root, '.tmp');
+export const eggInfoPath = path.resolve(tmpDir, 'eggInfo.json');
 export const dtsCommentRE = new RegExp(`^\\/\\/ [\\w ]+ ${packInfo.name}(@\\d+\\.\\d+\\.\\d+)?`);
 export const dtsComment =
   `// This file is created by ${packInfo.name}@${packInfo.version}\n` +

diff --git a/src/utils.ts b/src/utils.ts
@@ -3,9 +3,9 @@ import glob from 'globby';
 import path from 'path';
 import ts from 'typescript';
 import yn from 'yn';
-import { eggInfoPath, tmpDir } from './config';
 import { execFileSync, execFile, ExecFileOptions } from 'child_process';
 import JSON5 from 'json5';
+import { eggInfoPath, tmpDir } from './config';
 
 export const JS_CONFIG = {
   include: [ '**/*' ],
@@ -383,7 +383,7 @@ export function parseJson(jsonStr: string) {
 
 // load package.json
 export function getPkgInfo(cwd: string) {
-  return readJson(path.resolve(cwd, './package.json'));
+  return readJson(path.resolve(cwd, 'package.json'));
 }
 
 // read json file

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,30 +1,12 @@
 {
+  "extends": "@eggjs/tsconfig",
   "compilerOptions": {
-    "strict": true,
-    "target": "es2017",
-    "module": "commonjs",
-    "moduleResolution": "nodenext",
+    "target": "ES2021",
     "outDir": "dist",
     "rootDir": "src",
-    "noImplicitAny": false,
-    "allowSyntheticDefaultImports": true,
-    "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
-    "esModuleInterop": true,
-    "allowJs": false,
-    "pretty": true,
-    "declaration": true,
-    "declarationMap": true,
-    "noEmitOnError": false,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "allowUnreachableCode": false,
-    "allowUnusedLabels": false,
-    "strictPropertyInitialization": false,
-    "noFallthroughCasesInSwitch": true,
-    "skipLibCheck": true,
-    "skipDefaultLibCheck": true,
-    "importHelpers": true
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "allowUnreachableCode": true
   },
   "include": [
     "./src/**/*",