feat: 支持任意地址链接

ximing · Jul 29, 2019 · f3921c5 · f3921c5
1 parent ddc13bf
commit f3921c5
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 14 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "mpbuild",
-    "version": "1.2.2",
+    "version": "1.2.3",
     "description": "",
     "main": "src/index.js",
     "scripts": {

diff --git a/src/helper.js b/src/helper.js
@@ -3,6 +3,7 @@
  */
 const pathAlias = require('path-alias');
 const path = require('path');
+const os = require('os');
 
 module.exports = class Helper {
     constructor(mpb) {
@@ -23,6 +24,9 @@ module.exports = class Helper {
             const newPath = pathAlias(filePath);
             if (newPath !== filePath) return newPath;
         }
+        if(filePath.includes(os.homedir())){
+            return filePath;
+        }
         if (filePath[0] === '/') {
             return path.resolve(this.mpb.config.src, filePath.substr(1));
         }

diff --git a/src/loader/json-loader.js b/src/loader/json-loader.js
@@ -6,17 +6,17 @@ module.exports = function(opts) {
         try {
             let contents = JSON.parse(asset.contents);
             if (contents.extends) {
-                if (typeof contents.extends === 'string') {
-                    let filePath = '';
-                    if (contents.extends[0] === '.') {
-                        filePath = path.resolve(asset.dir, contents.extends);
-                    } else {
+                if(typeof contents.extends === 'string'){
+                    let filePath= '';
+                    if(contents.extends[0]==='.'){
+                         filePath = path.resolve(asset.dir, contents.extends);
+                    }else{
                         filePath = path.join(this.src, contents.extends);
                     }
                     contents = _.merge({}, contents, require(filePath));
-                    delete contents.extends;
+                    delete contents['extends'];
                     asset.contents = JSON.stringify(contents);
-                } else {
+                }else{
                     console.error('[json-loader] extends 必须为字符串');
                 }
             }

diff --git a/src/loader/ts-loader-next/index.js b/src/loader/ts-loader-next/index.js
@@ -5,22 +5,22 @@ const gulp = require('gulp');
 const ts = require('gulp-typescript');
 const through = require('through2');
 const plumber = require('gulp-plumber');
-const { default: PQueue } = require('p-queue');
-
+const {default: PQueue} = require('p-queue');
 const queue = new PQueue({ concurrency: 1 });
 
 // const tsCompileQStream = require('./gulp-typescript-compile-queue');
 
 module.exports = function(opts = {}) {
     const tsProject = ts.createProject('tsconfig.json');
     return async function(asset) {
-        // Solution to "Error: gulp-typescript: A project cannot be used in two compilations * at the same time. Create multiple projects with createProject instead."  https://gist.github.com/smac89/49f3b076cd987e0875ba9bfb3fe81ef9 not work
+        //Solution to "Error: gulp-typescript: A project cannot be used in two compilations * at the same time. Create multiple projects with createProject instead."  https://gist.github.com/smac89/49f3b076cd987e0875ba9bfb3fe81ef9 not work
         let errorCount = 0,
             file;
         asset.contents = await queue.add(
             () =>
                 new Promise((res) => {
-                    gulp.src(asset.path)
+                    gulp
+                        .src(asset.path)
                         .pipe(
                             plumber({
                                 errorHandler() {

diff --git a/src/loaderManager.js b/src/loaderManager.js
@@ -66,7 +66,7 @@ module.exports = class LoaderManager {
         this.rules = [];
         for (let i = this.mpb.config.module.rules.length - 1; i >= 0; i--) {
             const rule = this.mpb.config.module.rules[i];
-            const { use, test, exclude, include } = rule;
+            let { use, test, exclude, include } = rule;
             for (let j = use.length - 1; j >= 0; j--) {
                 const { loader, options } = use[j];
                 if (!use[j].loaderInstance) {

diff --git a/src/plugin/handleJSDep.js b/src/plugin/handleJSDep.js
@@ -80,7 +80,9 @@ module.exports = class HandleJSDep {
                                             libOutputPath
                                         );
                                         if (node.arguments[0].value[0] !== '.') {
-                                            node.arguments[0].value = `./${node.arguments[0].value}`;
+                                            node.arguments[0].value = `./${
+                                                node.arguments[0].value
+                                            }`;
                                         }
                                         deps.push({
                                             libPath,