fix(cli): wxa file import other source file should rename to target w…

…xa filename
WeBankFinTech · Aug 27, 2019 · 524600b · 524600b
1 parent 5de7216
commit 524600b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/packages/wxa-cli/src/compilers/wxa.js b/packages/wxa-cli/src/compilers/wxa.js
@@ -113,12 +113,10 @@ export default class WxaCompiler {
                     });
                 }
 
-                if (!rstTypeObject.src) {
-                    let opath = path.parse(filepath);
-
-
-                    rstTypeObject.src = opath.dir + path.sep + opath.name + '.' + rstTypeObject.type;
-                }
+                // if (!rstTypeObject.src) {
+                // }
+                let opath = path.parse(filepath);
+                rstTypeObject.src = opath.dir + path.sep + opath.name + '.' + rstTypeObject.type;
 
                 rstTypeObject.$from = filepath;
 

diff --git a/packages/wxa-cli/src/optimizer/index.js b/packages/wxa-cli/src/optimizer/index.js
@@ -37,6 +37,11 @@ export default class Optimizer {
     }
 
     async do(dep, indexedMap) {
+        if (!dep.src) {
+            // deadcode normally
+            debugger;
+            return;
+        }
         const text = path.relative(this.cwd, dep.src);
         this.progress.draw(text, 'Optimizing', !this.cmdOptions.verbose);
         switch (this.wxaConfigs.target) {

diff --git a/packages/wxa-cli/src/schedule.js b/packages/wxa-cli/src/schedule.js
@@ -118,12 +118,12 @@ class Schedule {
 
     async $doDPA() {
         let tasks = [];
-        // while (this.$depPending.length) {
+        while (this.$depPending.length) {
             let dep = this.$depPending.shift();
 
             // debug('file to parse %O', dep);
             tasks.push(this.$parse(dep));
-        // }
+        }
 
         let succ = await Promise.all(tasks);
 
@@ -331,7 +331,7 @@ class Schedule {
             child = indexedModule;
         }
 
-        if (child.color !== COLOR.COMPILED) this.$depPending.push(child);
+        if (~[COLOR.CHANGED, COLOR.COMPILE_ERROR, COLOR.INIT].indexOf(child.color)) this.$depPending.push(child);
         if (child.color === COLOR.INIT) this.$indexOfModule.set(child.src, child);
 
         return child;