fix(mini-runner): 修复 windows 下编译后 taro 引用错误的问题

NervJS · Dec 3, 2019 · 094b6ac · 094b6ac
1 parent 8ce0d6a
commit 094b6ac
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/packages/taro-mini-runner/src/loaders/fileParseLoader.ts b/packages/taro-mini-runner/src/loaders/fileParseLoader.ts
@@ -14,7 +14,8 @@ import {
   taroJsRedux,
   QUICKAPP_SPECIAL_COMPONENTS,
   PARSE_AST_TYPE,
-  NODE_MODULES_REG
+  NODE_MODULES_REG,
+  excludeReplaceTaroFrameworkPkgs
 } from '../utils/constants'
 import {
   isNpmPkg,
@@ -192,9 +193,6 @@ function processAst (
         )
         return
       }
-      if (NODE_MODULES_REG.test(sourceFilePath) && sourceFilePath.indexOf(taroMiniAppFramework) >= 0) {
-        return
-      }
       if (isNpmPkg(value)) {
         if (value === taroJsComponents) {
           if (isQuickApp) {
@@ -219,7 +217,10 @@ function processAst (
             if (defaultSpecifier) {
               taroImportDefaultName = defaultSpecifier
             }
-            value = taroMiniAppFramework
+            excludeReplaceTaroFrameworkPkgs.add(taroMiniAppFramework)
+            if (!Array.from(excludeReplaceTaroFrameworkPkgs).some(item => sourceFilePath.replace(/\\/g, '/').indexOf(item) >= 0)) {
+              value = taroMiniAppFramework
+            }
           } else if (value === taroJsRedux) {
             specifiers.forEach(item => {
               if (item.type === 'ImportSpecifier') {
@@ -250,9 +251,6 @@ function processAst (
           callee.name = NON_WEBPACK_REQUIRE
           return
         }
-        if (NODE_MODULES_REG.test(sourceFilePath) && sourceFilePath.indexOf(taroMiniAppFramework) >= 0) {
-          return
-        }
         if (isNpmPkg(value)) {
           if (value === taroJsComponents) {
             if (isQuickApp) {
@@ -275,7 +273,10 @@ function processAst (
                 const id = parentNode.declarations[0].id
                 if (value === taroJsFramework && id.type === 'Identifier') {
                   taroImportDefaultName = id.name
-                  value = taroMiniAppFramework
+                  excludeReplaceTaroFrameworkPkgs.add(taroMiniAppFramework)
+                  if (!Array.from(excludeReplaceTaroFrameworkPkgs).some(item => sourceFilePath.replace(/\\/g, '/').indexOf(item) >= 0)) {
+                    value = taroMiniAppFramework
+                  }
                 } else if (value === taroJsRedux) {
                   const declarations = parentNode.declarations
                   declarations.forEach(item => {

diff --git a/packages/taro-mini-runner/src/utils/constants.ts b/packages/taro-mini-runner/src/utils/constants.ts
@@ -217,6 +217,8 @@ export const taroJsComponents = '@tarojs/components'
 export const taroJsQuickAppComponents = '@tarojs/components-qa'
 export const taroJsFramework = '@tarojs/taro'
 export const taroJsRedux = '@tarojs/redux'
+export const taroJsMobx = '@tarojs/mobx'
+export const taroJsMobxCommon = '@tarojs/mobx-common'
 
 export const DEVICE_RATIO_NAME = 'deviceRatio'
 export const isWindows = os.platform() === 'win32'
@@ -301,3 +303,5 @@ export const processTypeMap: IProcessTypeMap = {
     color: 'blue'
   }
 }
+
+export const excludeReplaceTaroFrameworkPkgs = new Set([taroJsRedux, taroJsMobx, taroJsMobxCommon])