fix(alita): 修复window平台下 usingComponents路径错误

areslabs · Jan 3, 2020 · efe12c1 · efe12c1
1 parent 228620d
commit efe12c1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/extractWxCompFiles/copyPackageWxComponents.ts b/src/extractWxCompFiles/copyPackageWxComponents.ts
@@ -96,7 +96,7 @@ function getRelativeChunks(moduleInfos, dirname) {
     for(let i = 0; i < allModuleRes.length; i ++) {
         const res = allModuleRes[i]
 
-        if (res.includes(`${dirname}/`)) {
+        if (res.includes(`${dirname}${path.sep}`)) {
             moduleInfos[res].chunks.forEach(c => {
                 chunks.add(c)
             })

diff --git a/src/extractWxCompFiles/extractJSONFile.ts b/src/extractWxCompFiles/extractJSONFile.ts
@@ -128,9 +128,11 @@ function getFinalPath(element, source, module, info, defaultSpecifier, chunk, js
     let requireDefault = true
     if (source === 'react-native') {
         requireAbsolutePath = getCompPath(chunk, source, `WX${element}`)
+        requireAbsolutePath = path.resolve(configure.inputFullpath, '.' + requireAbsolutePath)//configure.inputFullpath  + (requireAbsolutePath .replace(/\\/g, '/'))
         jsonRelativeFiles.add(source)
     } else if (judgeLibPath(source) && source === getLibPath(source) && getCompPath(chunk, source, element)) {
         requireAbsolutePath = getCompPath(chunk, source, element)
+        requireAbsolutePath = path.resolve(configure.inputFullpath, '.' + requireAbsolutePath)
         jsonRelativeFiles.add(source)
     } else {
         const deepSeekResult = deepSeekPath(element, info.deps[source], defaultSpecifier, chunk)
@@ -143,7 +145,8 @@ function getFinalPath(element, source, module, info, defaultSpecifier, chunk, js
     if (chunk !== '_rn_') {
         const subpageDir = chunk.replace('/_rn_', '')
         module = module
-            .replace(configure.inputFullpath, configure.inputFullpath + '/' + subpageDir)
+            .replace(configure.inputFullpath, configure.inputFullpath + path.sep + subpageDir)
+
     }
 
     let sp = shortPath(requireAbsolutePath, module)