fix(cli): 修正对快应用包名的判断，close #4005

NervJS · Jul 30, 2019 · 49ab3e0 · 49ab3e0
1 parent d5db7f4
commit 49ab3e0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/packages/taro-cli/src/mini/astProcess.ts b/packages/taro-cli/src/mini/astProcess.ts
@@ -448,8 +448,9 @@ export function parseAst (
         value = replaceAliasPath(sourceFilePath, value, pathAlias)
         source.value = value
       }
+
       const quickappPkgs = quickappManifest ? quickappManifest.features : []
-      if (isNpmPkg(value) && !isQuickappPkg(value, quickappPkgs) && !notExistNpmList.has(value)) {
+      if (isNpmPkg(value) && !(isQuickApp && isQuickappPkg(value, quickappPkgs)) && !notExistNpmList.has(value)) {
         if (value === taroJsComponents) {
           if (isQuickApp) {
             specifiers.forEach(specifier => {
@@ -555,7 +556,7 @@ export function parseAst (
           args[0].value = value
         }
         const quickappPkgs = quickappManifest ? quickappManifest.features : []
-        if (isNpmPkg(value) && !isQuickappPkg(value, quickappPkgs) && !notExistNpmList.has(value)) {
+        if (isNpmPkg(value) && !(isQuickApp && isQuickappPkg(value, quickappPkgs)) && !notExistNpmList.has(value)) {
           if (value === taroJsComponents) {
             if (isQuickApp) {
               if (parentNode.declarations.length === 1 && parentNode.declarations[0].init) {

diff --git a/packages/taro-cli/src/util/index.ts b/packages/taro-cli/src/util/index.ts
@@ -496,7 +496,7 @@ export function copyFiles (appPath: string, copyConfig: ICopyOptions | void) {
 }
 
 export function isQuickappPkg (name: string, quickappPkgs: any[] = []): boolean {
-  const isQuickappPkg = /^@[a-zA-Z]{1,}\.[a-zA-Z]{1,}/.test(name)
+  const isQuickappPkg = /^@(system|service)\.[a-zA-Z]{1,}/.test(name)
   let hasSetInManifest = false
   quickappPkgs.forEach(item => {
     if (item.name === name.replace(/^@/, '')) {

diff --git a/packages/taro-cli/src/util/resolve_npm_files.ts b/packages/taro-cli/src/util/resolve_npm_files.ts
@@ -155,7 +155,7 @@ function analyzeImportUrl ({
 }) {
   if (excludeRequire.indexOf(requirePath) < 0) {
     const quickappPkgs = quickappManifest ? quickappManifest.features : []
-    if (isQuickappPkg(requirePath, quickappPkgs)) {
+    if (buildAdapter === BUILD_TYPES.QUICKAPP && isQuickappPkg(requirePath, quickappPkgs)) {
       return
     }
     if (isNpmPkg(requirePath)) {