Merge branch 'master' of https://github.com/ecomfe/okam

ecomfe · Feb 14, 2019 · 486cea0 · 486cea0
2 parents d10af8d + a8783c7
commit 486cea0
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # ChangeLog
 
+## 2019-02-14
+
+### [email protected]
+* **Bug修复**
+    * 修复 `okam-core` 依赖安装在项目源码根目录的父级目录依赖处理问题 ([cf16dfd](https://github.com/ecomfe/okam/commit/cf16dfd))
+
 ## 2019-02-10
 
 ### [email protected]

diff --git a/packages/okam-build/lib/build/BuildManager.js b/packages/okam-build/lib/build/BuildManager.js
@@ -136,7 +136,7 @@ class BuildManager extends EventEmitter {
         }
 
         // replace module okam-core/na/index.js content using specified app env module
-        if (file.path === 'node_modules/okam-core/src/na/index.js') {
+        if (file.path.indexOf('node_modules/okam-core/src/na/index.js') !== -1) {
             let naEnvModuleId = `../${this.appType}/env`;
             file.content = `'use strict;'\nexport * from '${naEnvModuleId}';\n`;
             this.envFileUpdated = true;

diff --git a/packages/okam-build/lib/build/init-build-options.js b/packages/okam-build/lib/build/init-build-options.js
@@ -118,7 +118,7 @@ function initBuildOptions(appType, options, cliOpts = {}) {
         buildConf.server = false;
     }
 
-    const rootDir = buildConf.root || process.cwd();
+    const rootDir = path.resolve(process.cwd(), buildConf.root || '.');
     buildConf.root = rootDir;
 
     // init output config

diff --git a/packages/okam-build/lib/processor/FileFactory.js b/packages/okam-build/lib/processor/FileFactory.js
@@ -239,12 +239,15 @@ class FileFactory extends EventEmitter {
             return;
         }
 
+        // considering npm dependencies maybe installed in
+        // the parent dir of the current project root, so here should remove `../`
+        const testPath = filePath.replace(/^(\.\.\/)+/, '');
         let result;
         Object.keys(rebaseDir).some(originalDir => {
             let newDir = rebaseDir[originalDir];
-            if (filePath.indexOf(originalDir) === 0) {
+            if (testPath.indexOf(originalDir) === 0) {
                 result = resolveDepModuleNewPath(
-                    filePath, originalDir, newDir
+                    testPath, originalDir, newDir
                 );
                 return true;
             }

diff --git a/packages/okam-build/package.json b/packages/okam-build/package.json
@@ -1,6 +1,6 @@
 {
   "name": "okam-build",
-  "version": "0.4.20",
+  "version": "0.4.21",
   "description": "The build tool for Okam develop framework",
   "main": "index.js",
   "keywords": [