fix: ts build cwd (#396)

* fix: fix build cwd * fix/remove conflict * fix: build default include * fix: golbby file filter * fix: concat files * fix: item instead of file
midwayjs · Feb 20, 2020 · 83732f9 · 83732f9
1 parent 7a8ec94
commit 83732f9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 17 deletions.
diff --git a/packages/midway-bin/lib/cmd/build.js b/packages/midway-bin/lib/cmd/build.js
@@ -300,30 +300,18 @@ class BuildCommand extends Command {
   }
 
   async tsCfg2CliArgs(cwd, argv, args) {
-    const cfg = argv.tsConfig
+    const cfg = argv.tsConfig;
     // https://www.typescriptlang.org/docs/handbook/tsconfig-json.html
-    /**
-     * Files
-     */
-    for (const file of cfg.files || []) {
-      if (/\.tsx?$/.test(file)) {
-        args.push(file);
-      }
-    }
-
     /**
      * include & exclude
      */
     const files = await globby(
       [].concat(
-        // include
-        cfg.include ? cfg.include : './',
-        // exclude
-        (cfg.exclude || []).map(str => '!' + str)
+        cfg.files || [],
+        cfg.include ? cfg.include : 'src/**/*', // include
+        (cfg.exclude || []).map(str => '!' + str) // exclude
       ),
-      {
-        cwd: argv.srcDir ? path.join(argv.srcDir, '..') : cwd,
-      }
+      { cwd }
     );
     for (const item of files) {
       if (/\.tsx?$/.test(item)) {

diff --git a/...y-bin/test/fixtures/ts-dir-no-config/a.ts → ...n/test/fixtures/ts-dir-no-config/src/a.ts b/...y-bin/test/fixtures/ts-dir-no-config/a.ts → ...n/test/fixtures/ts-dir-no-config/src/a.ts