Fix local loader cann't be resolve.

weexteam · Feb 4, 2018 · 346f7c3 · 346f7c3
1 parent e4a525a
commit 346f7c3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "weex-builder",
-  "version": "0.3.12",
+  "version": "0.3.13",
   "main": "index.js",
   "bin": "bin/weex-builder.js",
   "repository": {

diff --git a/src/weexBuilder.js b/src/weexBuilder.js
@@ -10,12 +10,10 @@ const utils = require('./utils');
 
 class WeexBuilder extends WebpackBuilder {
   constructor (source, dest, options = {}) {
-    if (options.ext && typeof options.ext === 'string') {
-      options.ext = options.ext.split(/,|\|/).filter(e => defaultExt.indexOf(e) === -1).concat(defaultExt).join('|');
-    }
-    else {
+    if (!(options.ext && typeof options.ext === 'string')) {
       options.ext = defaultExt.join('|');
     }
+
     super(source, dest, options);
   }
   initConfig () {
@@ -114,7 +112,7 @@ class WeexBuilder extends WebpackBuilder {
          * See: https://webpack.js.org/configuration/resolve/#resolveloader
          */
         resolveLoader: {
-          modules: [path.join(__dirname, '../node_modules')],
+          modules: [path.join(__dirname, '../node_modules'), path.resolve('node_modules')],
           extensions: ['.js', '.json'],
           mainFields: ['loader', 'main'],
           moduleExtensions: ['-loader']