From c0b111ba0c8b9c08d29047eed1a8d3ea43d2e735 Mon Sep 17 00:00:00 2001
From: duanlian <505441575@qq.com>
Date: Sun, 3 Dec 2017 00:45:23 +0800
Subject: [PATCH 01/10] wepy-cli: Added aliasFields feature && mainFields
 feature

---
 packages/wepy-cli/src/compile-script.js |   6 +-
 packages/wepy-cli/src/compile-style.js  |  10 +-
 packages/wepy-cli/src/compile-wpy.js    |  13 ++-
 packages/wepy-cli/src/compile.js        |   2 +-
 packages/wepy-cli/src/resolve.js        | 122 +++++++++++++++++++++---
 packages/wepy-cli/src/util.js           |   4 +
 6 files changed, 137 insertions(+), 20 deletions(-)

diff --git a/packages/wepy-cli/src/compile-script.js b/packages/wepy-cli/src/compile-script.js
index debbf54ed..5662b199d 100644
--- a/packages/wepy-cli/src/compile-script.js
+++ b/packages/wepy-cli/src/compile-script.js
@@ -43,8 +43,10 @@ export default {
             if (config.output === 'ant' && lib === 'wepy') {
                 lib = 'wepy-ant';
             }
-            lib = resolve.resolveAlias(lib);
-            if (path.isAbsolute(lib)) {
+            lib = resolve.resolveAlias(lib, opath);
+            if (lib === 'false') {
+                return `{}`
+            } else if (path.isAbsolute(lib)) {
                 source = lib;
                 target = util.getDistPath(source);
             } else if (lib[0] === '.') { // require('./something'');
diff --git a/packages/wepy-cli/src/compile-style.js b/packages/wepy-cli/src/compile-style.js
index 071837d17..ea379a35f 100644
--- a/packages/wepy-cli/src/compile-style.js
+++ b/packages/wepy-cli/src/compile-style.js
@@ -99,12 +99,14 @@ export default {
                 requires.forEach((r) => {
                     let comsrc = null;
                     isNPM = false;
-                    if (path.isAbsolute(r)) {
-                        if (path.extname(r) === '' && util.isFile(r + ext)) {
-                            comsrc = r + ext;
+                    let lib = resolve.resolveAlias(r, opath, ext);
+  
+                    if (path.isAbsolute(lib)) {
+                        if (path.extname(lib) === '' && util.isFile(lib + ext)) {
+                            comsrc = lib + ext;
                         }
                     } else {
-                        let lib = resolve.resolveAlias(r);
+                        // let lib = resolve.resolveAlias(r, opath);
                         if (path.isAbsolute(lib)) {
                             comsrc = lib;
                         } else {
diff --git a/packages/wepy-cli/src/compile-wpy.js b/packages/wepy-cli/src/compile-wpy.js
index cd9d5e6c4..e3fc5ee90 100644
--- a/packages/wepy-cli/src/compile-wpy.js
+++ b/packages/wepy-cli/src/compile-wpy.js
@@ -254,7 +254,8 @@ export default {
         (() => {
             let coms = {};
             rst.script.code.replace(/import\s*([\w\-\_]*)\s*from\s*['"]([\w\-\_\.\/\@]*)['"]/ig, (match, com, path) => {
-                coms[com] = path;
+                if (path !== 'false')
+                    coms[com] = path;
             });
 
             let match = rst.script.code.match(/[\s\r\n]components\s*=[\s\r\n]*/);
@@ -373,7 +374,7 @@ export default {
                 }
             });
             if (Object.keys(props).length) {
-                rst.script.code =rst.script.code.replace(/[\s\r\n]components\s*=[\s\r\n]*/, (match, item, index) => {
+                rst.script.code = rst.script.code.replace(/[\s\r\n]components\s*=[\s\r\n]*/, (match, item, index) => {
                     return `$repeat = ${JSON.stringify($repeat)};\r\n$props = ${JSON.stringify(props)};\r\n$events = ${JSON.stringify(events)};\r\n${match}`;
                 });
             }
@@ -471,6 +472,14 @@ export default {
                     } else {
                         requires.push(path.join(opath.dir, wpy.template.components[k]));
                     }
+                    
+                    // 去重
+                    // Example:
+                    // components = {
+                    //     Count1: '../components/count',
+                    //     Count2: '../components/count'
+                    // };
+                    requires = util.unique(requires)
                 }
             }
             try {
diff --git a/packages/wepy-cli/src/compile.js b/packages/wepy-cli/src/compile.js
index d64e2cce6..21a440878 100644
--- a/packages/wepy-cli/src/compile.js
+++ b/packages/wepy-cli/src/compile.js
@@ -50,7 +50,7 @@ export default {
                 reg = new RegExp('\\' + ext + '$');
                 if (!reg.test(importpath))
                     importpath = importpath + ext;
-                let resolved = resolve.resolveAlias(importpath);
+                let resolved = resolve.resolveAlias(importpath, opath);
                 let compath;
                 if (path.isAbsolute(resolved)) {
                     compath = path.resolve(resolved);
diff --git a/packages/wepy-cli/src/resolve.js b/packages/wepy-cli/src/resolve.js
index f5353b2e4..361d2a852 100644
--- a/packages/wepy-cli/src/resolve.js
+++ b/packages/wepy-cli/src/resolve.js
@@ -10,17 +10,67 @@
 
 import path from 'path';
 import util from './util';
+import cache from './cache'
+
+const DEFAULT_MODULES = ['node_modules'];
+const DEFAULT_ALIASFIELDS = ['wepy', 'weapp', 'browser'];
+const DEFAULT_MAINFIELDS = ['wepy', 'weapp', 'browser', 'module', 'main'];
 
 export default {
     init (config) {
-        this.modules = config.modules || ['node_modules'];
         this.alias = config.alias;
-
-        if (typeof this.modules === 'string') {
-            this.modules = [this.modules];
-        }
-
-        let cwd = process.cwd();
+        this.modules = config.modules || DEFAULT_MODULES;
+        this.aliasFields = config.aliasFields || DEFAULT_ALIASFIELDS;
+        this.mainFields = config.mainFields || DEFAULT_MAINFIELDS;
+        
+        ['modules', 'aliasFields', 'mainFields'].forEach(opt => {
+            typeof this[opt] === 'string' && (
+                this[opt] = [].concat(this[opt])
+            );
+        });
+  
+        let pkgFile = util.getPkg();
+        let pkg = JSON.parse(pkgFile);
+        let cwd = util.currentDir;
+        let ext = cache.getExt();
+        
+        // 优先级递减
+        this.aliasFields.forEach(fields => {
+            // 归类
+            util.isObject(pkg[fields]) && Object.keys(pkg[fields] || {}).forEach(key => {
+                // module形式的fieldsAlias归置于alias中，例： "xyz": "./src/xyz.js"，alias优先级较大
+                if (key.indexOf('.') === -1) {
+                    // => "xyz"、"xyz-xyz"
+                    let value;
+                    if (!pkg[fields][key]) {
+                        value = 'false'
+                    } else {
+                        value = path.resolve(cwd, pkg[fields][key])
+                    }
+                  
+                    // fields中key或value路径后缀与配置缺省值相同时，replace后缀
+                    if (path.extname(value) === ext)
+                        value = value.replace(ext, '')
+                  
+                    this.alias = Object.assign({}, { [key]: value }, this.alias || {});
+                }
+                // fields转换："./src/index.wpy" => "src/index.wpy"后合并至fieldsAlias中
+                if (!path.isAbsolute(key) && path.extname(key)) {
+                    // => "./src/xyz.js"、"src/xyz.js"
+                    let value = path.resolve(cwd, pkg[fields][key])
+                    key = path.resolve(cwd, key)
+                  
+                    // fields中key或value路径后缀与配置缺省值相同时，replace后缀
+                    if (path.extname(key) === ext)
+                        key = key.replace(ext, '')
+                  
+                    if (path.extname(value) === ext)
+                        value = value.replace(ext, '')
+                  
+                    this.fieldsAlias = Object.assign({}, { [key]: value }, this.fieldsAlias || {});
+                }
+            });
+        });
 
         this.modulePaths = this.modules.map(v => {
             if (path.isAbsolute(v)) {
@@ -95,10 +145,19 @@ export default {
         if (!o) {
             return null;
         }
-        let main = o.pkg.main || 'index.js';
-        if (o.pkg.browser && typeof o.pkg.browser === 'string') {
-            main = o.pkg.browser;
+
+        // 优先级递减
+        let mainField, main
+        for (let i = 0, l = this.mainFields.length; i < l; i++) {
+            mainField = this.mainFields[i];
+            if (o.pkg[mainField] && typeof o.pkg[mainField] === 'string') {
+                main = o.pkg[mainField];
+                break;
+            }
         }
+
+        main = main || 'index.js';
+
         return {
             file: main,
             modulePath: o.modulePath,
@@ -106,14 +165,53 @@ export default {
             dir: o.dir
         };
     },
+  
+    resolveFieldsAlias (lib) {
+        return lib && this.fieldsAlias && this.fieldsAlias[lib]
+            ? this.fieldsAlias[lib]
+            : lib;
+    },
+  
+    replaceFieldsAlias (currentAlias, opath) {
+        let absolutePath;
+        
+        if (path.isAbsolute(currentAlias)) {
+            absolutePath = currentAlias
+          
+            currentAlias = this.resolveFieldsAlias(absolutePath) !== absolutePath
+                ? this.resolveFieldsAlias(absolutePath)
+                : currentAlias;
+        } else if (currentAlias[0] === '.') {
+            absolutePath = path.join(opath.dir, currentAlias);
+            
+            currentAlias = this.resolveFieldsAlias(absolutePath) !== absolutePath
+                ? this.resolveFieldsAlias(absolutePath)
+                : currentAlias;
+        } else if (
+            currentAlias.indexOf('/') === -1 || // require('asset');
+            currentAlias.indexOf('/') === currentAlias.length - 1 || // require('a/b/something/')
+            (currentAlias[0] === '@' && currentAlias.indexOf('/') !== -1 && currentAlias.lastIndexOf('/') === currentAlias.indexOf('/')) // require('@abc/something')
+        ) {
+            const mainFile = this.getMainFile(currentAlias);
+            
+            if (mainFile) {
+                absolutePath = path.join(mainFile.dir, mainFile.file);
+                currentAlias = this.resolveFieldsAlias(absolutePath) !== absolutePath
+                    ? this.resolveFieldsAlias(absolutePath)
+                    : currentAlias;
+            }
+        }
+        return currentAlias;
+    },
 
-    resolveAlias (lib) {
+    resolveAlias (lib, opath) {
         if (!this.alias)
             return lib;
         if (this._cacheAlias[lib]) {
             return this._cacheAlias[lib];
         }
         let rst = lib;
+        let ext = cache.getExt();
 
         for (let k in this.alias) {
             let alias = this.alias[k];
@@ -135,6 +233,8 @@ export default {
         if (!this._cacheAlias[lib]) {
             this._cacheAlias[lib] = lib;
         }
+        // replace field alias
+        this._cacheAlias[lib] = this.replaceFieldsAlias(this._cacheAlias[lib], opath)
         return this._cacheAlias[lib];
     }   
 }
\ No newline at end of file
diff --git a/packages/wepy-cli/src/util.js b/packages/wepy-cli/src/util.js
index f89420827..e764c572c 100644
--- a/packages/wepy-cli/src/util.js
+++ b/packages/wepy-cli/src/util.js
@@ -478,6 +478,10 @@ const utils = {
         let ignoreFile = path.join(this.currentDir, path.sep, '.wepyignore');
         return this.isFile(ignoreFile) ? this.readFile(ignoreFile) : '';
     },
+    getPkg () {
+        let pkgFile = path.join(this.currentDir, path.sep, 'package.json');
+        return this.isFile(pkgFile) ? this.readFile(pkgFile) : '{}';
+    },
     getFiles (dir = process.cwd(), prefix = '') {
         let cfiles = cache.getFileList(dir);
         if (cfiles)

From 6fef14ea5c76a8507d1291fe82a20582a55bd4c0 Mon Sep 17 00:00:00 2001
From: duanlian <505441575@qq.com>
Date: Sun, 3 Dec 2017 20:33:58 +0800
Subject: [PATCH 02/10] wepy-cli: [aliasFields Feature]removed ineffectiveness
 determine statements

---
 packages/wepy-cli/src/compile-wpy.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/wepy-cli/src/compile-wpy.js b/packages/wepy-cli/src/compile-wpy.js
index e3fc5ee90..f63ac0b05 100644
--- a/packages/wepy-cli/src/compile-wpy.js
+++ b/packages/wepy-cli/src/compile-wpy.js
@@ -254,8 +254,7 @@ export default {
         (() => {
             let coms = {};
             rst.script.code.replace(/import\s*([\w\-\_]*)\s*from\s*['"]([\w\-\_\.\/\@]*)['"]/ig, (match, com, path) => {
-                if (path !== 'false')
-                    coms[com] = path;
+                coms[com] = path;
             });
 
             let match = rst.script.code.match(/[\s\r\n]components\s*=[\s\r\n]*/);

From e3ebbb5012eb8eb09825659df0eaa433294084cd Mon Sep 17 00:00:00 2001
From: duanlian <505441575@qq.com>
Date: Sun, 3 Dec 2017 20:36:19 +0800
Subject: [PATCH 03/10] wepy-cli: [aliasFields Feature]update resolve.js &&
 fixed typos

---
 packages/wepy-cli/src/compile-style.js |  2 +-
 packages/wepy-cli/src/resolve.js       | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/wepy-cli/src/compile-style.js b/packages/wepy-cli/src/compile-style.js
index ea379a35f..7b4d1257a 100644
--- a/packages/wepy-cli/src/compile-style.js
+++ b/packages/wepy-cli/src/compile-style.js
@@ -99,7 +99,7 @@ export default {
                 requires.forEach((r) => {
                     let comsrc = null;
                     isNPM = false;
-                    let lib = resolve.resolveAlias(r, opath, ext);
+                    let lib = resolve.resolveAlias(r, opath);
   
                     if (path.isAbsolute(lib)) {
                         if (path.extname(lib) === '' && util.isFile(lib + ext)) {
diff --git a/packages/wepy-cli/src/resolve.js b/packages/wepy-cli/src/resolve.js
index 361d2a852..f7fcbd680 100644
--- a/packages/wepy-cli/src/resolve.js
+++ b/packages/wepy-cli/src/resolve.js
@@ -43,29 +43,29 @@ export default {
                     // => "xyz"、"xyz-xyz"
                     let value;
                     if (!pkg[fields][key]) {
-                        value = 'false'
+                        value = 'false';
                     } else {
-                        value = path.resolve(cwd, pkg[fields][key])
+                        value = path.resolve(cwd, pkg[fields][key]);
                     }
                   
                     // fields中key或value路径后缀与配置缺省值相同时，replace后缀
                     if (path.extname(value) === ext)
-                        value = value.replace(ext, '')
+                        value = value.replace(ext, '');
                   
                     this.alias = Object.assign({}, { [key]: value }, this.alias || {});
                 }
                 // fields转换："./src/index.wpy" => "src/index.wpy"后合并至fieldsAlias中
-                if (!path.isAbsolute(key) && path.extname(key)) {
+                if (!path.isAbsolute(key)) {
                     // => "./src/xyz.js"、"src/xyz.js"
-                    let value = path.resolve(cwd, pkg[fields][key])
-                    key = path.resolve(cwd, key)
+                    let value = path.resolve(cwd, pkg[fields][key]);
+                    key = path.resolve(cwd, key);
                   
                     // fields中key或value路径后缀与配置缺省值相同时，replace后缀
                     if (path.extname(key) === ext)
-                        key = key.replace(ext, '')
+                        key = key.replace(ext, '');
                   
                     if (path.extname(value) === ext)
-                        value = value.replace(ext, '')
+                        value = value.replace(ext, '');
                   
                     this.fieldsAlias = Object.assign({}, { [key]: value }, this.fieldsAlias || {});
                 }
@@ -176,7 +176,7 @@ export default {
         let absolutePath;
         
         if (path.isAbsolute(currentAlias)) {
-            absolutePath = currentAlias
+            absolutePath = currentAlias;
           
             currentAlias = this.resolveFieldsAlias(absolutePath) !== absolutePath
                 ? this.resolveFieldsAlias(absolutePath)
@@ -234,7 +234,7 @@ export default {
             this._cacheAlias[lib] = lib;
         }
         // replace field alias
-        this._cacheAlias[lib] = this.replaceFieldsAlias(this._cacheAlias[lib], opath)
+        this._cacheAlias[lib] = this.replaceFieldsAlias(this._cacheAlias[lib], opath);
         return this._cacheAlias[lib];
     }   
 }
\ No newline at end of file

From b37f6219fade584bf994a7f42240c6a35ec1c2c2 Mon Sep 17 00:00:00 2001
From: duanlian <505441575@qq.com>
Date: Sun, 3 Dec 2017 22:44:36 +0800
Subject: [PATCH 04/10] wepy-cli: [aliasFields Feature]update resolve.js

---
 packages/wepy-cli/src/resolve.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/wepy-cli/src/resolve.js b/packages/wepy-cli/src/resolve.js
index f7fcbd680..dc6619c00 100644
--- a/packages/wepy-cli/src/resolve.js
+++ b/packages/wepy-cli/src/resolve.js
@@ -53,10 +53,8 @@ export default {
                         value = value.replace(ext, '');
                   
                     this.alias = Object.assign({}, { [key]: value }, this.alias || {});
-                }
-                // fields转换："./src/index.wpy" => "src/index.wpy"后合并至fieldsAlias中
-                if (!path.isAbsolute(key)) {
-                    // => "./src/xyz.js"、"src/xyz.js"
+                } else if (!path.isAbsolute(key)) {
+                    // relative path
                     let value = path.resolve(cwd, pkg[fields][key]);
                     key = path.resolve(cwd, key);
                   

From a5d5d43ea800113bce5d3be990bfef1a9511446d Mon Sep 17 00:00:00 2001
From: duanlian <505441575@qq.com>
Date: Sun, 3 Dec 2017 22:45:05 +0800
Subject: [PATCH 05/10] wepy-cli: [aliasFields Feature]Added examples

---
 .../wepy-cli/templates/template/package.json  |  4 ++
 .../template/src/components/wepy-list.wpy     | 55 +++++++++++++++++++
 .../template/src/pages/index-redux.wpy        |  6 +-
 .../templates/template/src/pages/index.wpy    |  5 +-
 .../templates/template/wepy.config.js         |  1 +
 5 files changed, 69 insertions(+), 2 deletions(-)
 create mode 100644 packages/wepy-cli/templates/template/src/components/wepy-list.wpy

diff --git a/packages/wepy-cli/templates/template/package.json b/packages/wepy-cli/templates/template/package.json
index db59540a7..af4d83220 100644
--- a/packages/wepy-cli/templates/template/package.json
+++ b/packages/wepy-cli/templates/template/package.json
@@ -8,6 +8,10 @@
     "build": "cross-env NODE_ENV=production wepy build --no-cache",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
+  "wepy": {
+    "module-a": false,
+    "./src/components/list": "./src/components/wepy-list.wpy"
+  },
   "author": "",
   "license": "MIT"
 }
diff --git a/packages/wepy-cli/templates/template/src/components/wepy-list.wpy b/packages/wepy-cli/templates/template/src/components/wepy-list.wpy
new file mode 100644
index 000000000..07ac10620
--- /dev/null
+++ b/packages/wepy-cli/templates/template/src/components/wepy-list.wpy
@@ -0,0 +1,55 @@
+<style lang="less">
+    .mylist:odd {
+        color: red;
+    }
+    .mylist:even {
+        color: green;
+    }
+</style>
+<template>
+    <view class="wepy-list">
+        <view>
+            <button @tap="add" size="mini">添加列表another</button>
+        </view>
+        <block wx:for-items="{{list}}" wx:for-index="index" wx:for-item="item" wx:key="id">
+            <view @tap="tap" class="mylist">
+                <text>{{item.id}}</text>: {{item.title}}
+            </view>
+        </block>
+    </view>
+</template>
+<script>
+  import wepy from 'wepy'
+
+  export default class ListAnother extends wepy.component {
+    data = {
+      list: [
+        {
+          id: '0',
+          title: 'loading'
+        }
+      ]
+    }
+
+    events = {
+      'index-broadcast': (...args) => {
+        let $event = args[args.length - 1]
+        console.log(`${this.$name} receive ${$event.name} from ${$event.source.name}`)
+      }
+    }
+
+    methods = {
+      tap () {
+        // this.num = this.num + 1
+        console.log(this.$name + ' tap')
+      },
+      add () {
+        let len = this.list.length
+        this.list.push({id: len + 1, title: 'title_' + len})
+      }
+    }
+
+    onLoad () {
+    }
+  }
+</script>
diff --git a/packages/wepy-cli/templates/template/src/pages/index-redux.wpy b/packages/wepy-cli/templates/template/src/pages/index-redux.wpy
index b76ad3a41..8f06f82e1 100644
--- a/packages/wepy-cli/templates/template/src/pages/index-redux.wpy
+++ b/packages/wepy-cli/templates/template/src/pages/index-redux.wpy
@@ -84,12 +84,16 @@
   import wepy from 'wepy'
   import { connect } from 'wepy-redux'
   import List from '../components/list'
-  import Panel from '../components/panel'
+  import Panel from '@/components/panel' // alias example
   import Counter from 'counter' // alias example
+  import List from '../components/list' // aliasFields example
+  import moduleA from 'module-a' // aliasFields ignore module example
   import Group from '../components/group'
   import Toast from 'wepy-com-toast'
   import testMixin from '../mixins/test'
 
+  console.log('moduleA ignored: ', moduleA) // => moduleA ignored: {}
+
   @connect({
     num (state) {
       return state.counter.num
diff --git a/packages/wepy-cli/templates/template/src/pages/index.wpy b/packages/wepy-cli/templates/template/src/pages/index.wpy
index df70212ac..07e416084 100644
--- a/packages/wepy-cli/templates/template/src/pages/index.wpy
+++ b/packages/wepy-cli/templates/template/src/pages/index.wpy
@@ -79,13 +79,16 @@
 
 <script>
   import wepy from 'wepy'
-  import List from '../components/list'
   import Panel from '@/components/panel' // alias example
   import Counter from 'counter' // alias example
+  import List from '../components/list' // aliasFields example
+  import moduleA from 'module-a' // aliasFields ignore module example
   import Group from '../components/group'
   import Toast from 'wepy-com-toast'
   import testMixin from '../mixins/test'
 
+  console.log('moduleA ignored: ', moduleA) // => moduleA ignored: {}
+
   export default class Index extends wepy.page {
     config = {
       navigationBarTitleText: 'test'
diff --git a/packages/wepy-cli/templates/template/wepy.config.js b/packages/wepy-cli/templates/template/wepy.config.js
index e586c4c4b..eb78f5342 100644
--- a/packages/wepy-cli/templates/template/wepy.config.js
+++ b/packages/wepy-cli/templates/template/wepy.config.js
@@ -17,6 +17,7 @@ module.exports = {
       counter: path.join(__dirname, 'src/components/counter'),
       '@': path.join(__dirname, 'src')
     },
+    aliasFields: ['wepy'],
     modules: ['node_modules']
   },
   compilers: {

From f6d73e379b5eafca2ffa600ffbbfebbb757bac94 Mon Sep 17 00:00:00 2001
From: Gcaufy <gcaufy@gmail.com>
Date: Mon, 25 Dec 2017 18:09:48 +0800
Subject: [PATCH 06/10] cli: added resolveSelfFields

---
 packages/wepy-cli/src/resolve.js | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/packages/wepy-cli/src/resolve.js b/packages/wepy-cli/src/resolve.js
index dc6619c00..d2ad942df 100644
--- a/packages/wepy-cli/src/resolve.js
+++ b/packages/wepy-cli/src/resolve.js
@@ -22,7 +22,7 @@ export default {
         this.modules = config.modules || DEFAULT_MODULES;
         this.aliasFields = config.aliasFields || DEFAULT_ALIASFIELDS;
         this.mainFields = config.mainFields || DEFAULT_MAINFIELDS;
-        
+
         ['modules', 'aliasFields', 'mainFields'].forEach(opt => {
             typeof this[opt] === 'string' && (
                 this[opt] = [].concat(this[opt])
@@ -131,6 +131,14 @@ export default {
         }
         if (!pkg)
             return null;
+
+        // make sure fields is used in this package.
+        pkg._activeFields = [];
+        this.aliasFields.forEach(field => {
+            if (pkg[field]) {
+                pkg._activeFields.push(field);
+            }
+        });
         return {
             pkg: pkg,
             modulePath: o.modulePath,
@@ -163,6 +171,26 @@ export default {
             dir: o.dir
         };
     },
+
+    /*
+    resolve package with contains different fields
+     */
+    resolveSelfFields (dir, pkg, lib) {
+        for (let i = 0, l = pkg._activeFields.length; i < l; i++) {
+            let field = pkg[pkg._activeFields[i]];
+            if (field) {
+                for (let k in field) {
+                    // in Window, path may be dist\a\b, but in package.json it is ./dist/a/b, so can not just simply use ===
+                    let matchPath = path.join(dir, k);
+                    let requirePath = path.join(dir, lib);
+                    if (matchPath === requirePath || matchPath === requirePath + path.extname(matchPath)) {
+                        return field[k];
+                    }
+                }
+            }
+        }
+        return null;
+    },
   
     resolveFieldsAlias (lib) {
         return lib && this.fieldsAlias && this.fieldsAlias[lib]
@@ -235,4 +263,4 @@ export default {
         this._cacheAlias[lib] = this.replaceFieldsAlias(this._cacheAlias[lib], opath);
         return this._cacheAlias[lib];
     }   
-}
\ No newline at end of file
+}

From d42040deb0c72e7df8c690016896f0feec924e4c Mon Sep 17 00:00:00 2001
From: Gcaufy <gcaufy@gmail.com>
Date: Mon, 25 Dec 2017 18:10:39 +0800
Subject: [PATCH 07/10] cli: added resolveSelfFields

---
 packages/wepy-cli/src/compile-script.js | 39 ++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/packages/wepy-cli/src/compile-script.js b/packages/wepy-cli/src/compile-script.js
index 5662b199d..878ccc4b6 100644
--- a/packages/wepy-cli/src/compile-script.js
+++ b/packages/wepy-cli/src/compile-script.js
@@ -24,20 +24,19 @@ let appPath, npmPath, src, dist;
 
 export default {
     resolveDeps (code, type, opath) {
-
         let params = cache.getParams();
         let config = cache.getConfig();
         let wpyExt = params.wpyExt;
-        let npmInfo = opath.npm;
 
 
         return code.replace(/require\(['"]([\w\d_\-\.\/@]+)['"]\)/ig, (match, lib) => {
+            let npmInfo = opath.npm;
+            
             if (lib === './_wepylogs.js') {
                 return match;
             }
             let resolved = lib;
 
-
             let target = '', source = '', ext = '', needCopy = false;
 
             if (config.output === 'ant' && lib === 'wepy') {
@@ -50,7 +49,19 @@ export default {
                 source = lib;
                 target = util.getDistPath(source);
             } else if (lib[0] === '.') { // require('./something'');
-                source = path.join(opath.dir, lib);  // e:/src/util
+                let resolvedLib;
+                if (npmInfo && npmInfo.pkg._activeFields.length) {
+                    resolvedLib = resolve.resolveSelfFields(npmInfo.dir, npmInfo.pkg, path.join(path.relative(npmInfo.dir, opath.dir), lib));
+                }
+                if (resolvedLib) {
+                    source = path.join(npmInfo.dir, resolvedLib);
+                    lib = path.relative(opath.dir, source);
+                    if (lib[0] !== '.') {
+                        lib = './' + lib;
+                    }
+                } else {
+                    source = path.join(opath.dir, lib);
+                }
                 if (type === 'npm') {
                     target = path.join(npmPath, path.relative(npmInfo.modulePath, source));
                     needCopy = true;
@@ -63,6 +74,11 @@ export default {
                 lib.indexOf('/') === lib.length - 1 || // reqiore('a/b/something/')
                 (lib[0] === '@' && lib.indexOf('/') !== -1 && lib.lastIndexOf('/') === lib.indexOf('/')) // require('@abc/something')
             ) {  
+                // require('stream') -> browsers: emitter->emitter-component;
+                if (npmInfo && npmInfo.pkg._activeFields.length) {
+                    let resolvedLib = resolve.resolveSelfFields(npmInfo.dir, npmInfo.pkg, lib);
+                    lib = resolvedLib ? resolvedLib : lib;
+                }
 
                 let mainFile = resolve.getMainFile(lib);
 
@@ -73,12 +89,19 @@ export default {
                     lib: lib,
                     dir: mainFile.dir,
                     modulePath: mainFile.modulePath,
-                    file: mainFile.file
+                    file: mainFile.file,
+                    pkg: mainFile.pkg
                 };
-                source = path.join(mainFile.dir, mainFile.file);
-                target = path.join(npmPath, lib, mainFile.file);
 
-                lib += path.sep + mainFile.file;
+                let resolvedFile;
+                if (mainFile.pkg && mainFile.pkg._activeFields.length) {
+                    resolvedFile = resolve.resolveSelfFields(mainFile.dir, mainFile.pkg, mainFile.file);
+                }
+                resolvedFile = resolvedFile ? resolvedFile : mainFile.file;
+                source = path.join(mainFile.dir, resolvedFile);
+                target = path.join(npmPath, lib, resolvedFile);
+
+                lib += path.sep + resolvedFile;
                 ext = '';
                 needCopy = true;
             } else { // require('babel-runtime/regenerator')

From 599a6608aa1369b127031eec540404f3303e1a2d Mon Sep 17 00:00:00 2001
From: Gcaufy <gcaufy@gmail.com>
Date: Mon, 25 Dec 2017 20:14:28 +0800
Subject: [PATCH 08/10] cli: fixed alias resolve

---
 packages/wepy-cli/src/resolve.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/wepy-cli/src/resolve.js b/packages/wepy-cli/src/resolve.js
index d2ad942df..fd4d930f6 100644
--- a/packages/wepy-cli/src/resolve.js
+++ b/packages/wepy-cli/src/resolve.js
@@ -253,6 +253,9 @@ export default {
             } else {
                 if ((lib.indexOf(k) === 0 && lib === k) || (lib !== k && lib.indexOf(k + '/') === 0)) {
                     this._cacheAlias[lib] = lib.replace(k, alias);
+                    if (this._cacheAlias[lib] !== 'false') {
+                        this._cacheAlias[lib] = path.resolve(this._cacheAlias[lib]);
+                    }
                 }
             }
         }

From a77e76bbae258312cee0d0c62623221c53703ec1 Mon Sep 17 00:00:00 2001
From: Gcaufy <gcaufy@gmail.com>
Date: Mon, 25 Dec 2017 20:15:30 +0800
Subject: [PATCH 09/10] web: added resolve option for web

---
 packages/wepy-cli/src/compile.js | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/packages/wepy-cli/src/compile.js b/packages/wepy-cli/src/compile.js
index 21a440878..e35f0232f 100644
--- a/packages/wepy-cli/src/compile.js
+++ b/packages/wepy-cli/src/compile.js
@@ -168,6 +168,7 @@ export default {
             util.error('没有检测到wepy.config.js文件, 请执行`wepy new demo`创建');
             return false;
         }
+
         resolve.init(wepyrc.resolve || {});
         loader.attach(resolve);
 
@@ -204,11 +205,17 @@ export default {
 
 
         if (config.output === 'web') {
-            wepyrc.web = wepyrc.web || {};
-            wepyrc.web.dist = wepyrc.web.dist || 'web';
-            wepyrc.web.src = wepyrc.web.src || 'src';
+            wepyrc.build = wepyrc.build || {};
+            wepyrc.build.web = wepyrc.build.web || {};
+            wepyrc.build.web.dist = wepyrc.build.web.dist || 'web';
+            wepyrc.build.web.src = wepyrc.build.web.src || 'src';
+            if (wepyrc.build.web.resolve)
+                wepyrc.resolve = Object.assign({}, wepyrc.resolve, wepyrc.build.web.resolve);
             wepyrc.output = 'web';
 
+            resolve.init(wepyrc.resolve || {});
+            loader.attach(resolve);
+
             if (!resolve.getPkg('wepy-web')) {
                 util.log('正在尝试安装缺失资源 wepy-web，请稍等。', '信息');
                 util.exec(`npm install wepy-web --save`).then(d => {
@@ -221,11 +228,17 @@ export default {
                 return false;
             }
         } else if (config.output === 'ant') {
-            wepyrc.ant = wepyrc.ant || {};
-            wepyrc.ant.dist = wepyrc.ant.dist || 'ant';
-            wepyrc.ant.src = wepyrc.ant.src || 'src';
+            wepyrc.build = wepyrc.build || {};
+            wepyrc.build.ant = wepyrc.build.ant || {};
+            wepyrc.build.ant.dist = wepyrc.build.ant.dist || 'ant';
+            wepyrc.build.ant.src = wepyrc.build.ant.src || 'src';
+            if (wepyrc.build.ant.resolve)
+                wepyrc.resolve = Object.assign({}, wepyrc.resolve, wepyrc.build.ant.resolve);
             wepyrc.output = 'ant';
 
+            resolve.init(wepyrc.resolve || {});
+            loader.attach(resolve);
+
             if (!resolve.getPkg('wepy-ant')) {
                 util.log('正在尝试安装缺失资源 wepy-ant，请稍等。', '信息');
                 util.exec(`npm install wepy-ant --save`).then(d => {
@@ -238,6 +251,7 @@ export default {
                 return false;
             }
         }
+
         return true;
     },
 
@@ -395,4 +409,4 @@ export default {
                 });
         }
     }
-}
\ No newline at end of file
+}

From beec097ee6b7b9e5dd4d237f6b81b447c6e01856 Mon Sep 17 00:00:00 2001
From: Gcaufy <gcaufy@gmail.com>
Date: Mon, 25 Dec 2017 20:16:24 +0800
Subject: [PATCH 10/10] web: fixed aliasFields for wepy-web

---
 packages/wepy-cli/src/web/compile-script.js | 49 +++++++++++++++++----
 1 file changed, 40 insertions(+), 9 deletions(-)

diff --git a/packages/wepy-cli/src/web/compile-script.js b/packages/wepy-cli/src/web/compile-script.js
index f42fe5a47..b63cc4a31 100644
--- a/packages/wepy-cli/src/web/compile-script.js
+++ b/packages/wepy-cli/src/web/compile-script.js
@@ -41,7 +41,7 @@ export default {
 
         let depences = [];
 
-        wpy.script.code = wpy.script.code.replace(/require\(['"]([\w\d_\-\.\/]+)['"]\)/ig, (match, lib) => {
+        wpy.script.code = wpy.script.code.replace(/require\(['"]([\w\d_\-\.\/@]+)['"]\)/ig, (match, lib) => {
 
             if (lib === 'wepy') 
                 lib = 'wepy-web';
@@ -52,14 +52,35 @@ export default {
 
             let dep = {}, npmInfo;
 
-            lib = resolve.resolveAlias(lib);
+            lib = resolve.resolveAlias(lib, opath);
 
-            if (path.isAbsolute(lib)) {
+            if (lib === 'false') {
+                return '{}';
+            } else if (path.isAbsolute(lib)) {
                 source = lib;
             } else if (lib[0] === '.') { // require('./something'');
-                source = path.join(opath.dir, lib);  // e:/src/util
+                let resolvedLib;
+                if (wpy.npm && wpy.npm.pkg._activeFields.length) {
+                    resolvedLib = resolve.resolveSelfFields(wpy.npm.dir, wpy.npm.pkg, path.join(path.relative(wpy.npm.dir, opath.dir), lib));
+                }
+                if (resolvedLib) {
+                    source = path.join(wpy.npm.dir, resolvedLib);
+                    lib = path.relative(opath.dir, source);
+                    if (lib[0] !== '.') {
+                        lib = './' + lib;
+                    }
+                } else {
+                    source = path.join(opath.dir, lib);
+                }
+                npmInfo = wpy.npm;  // relative path in npm package
             } else if (lib.indexOf('/') === -1 || lib.indexOf('/') === lib.length - 1) {  //        require('asset');
 
+                // require('stream') -> browsers: emitter->emitter-component;
+                if (wpy.npm && wpy.npm.pkg._activeFields.length) {
+                    let resolvedLib = resolve.resolveSelfFields(wpy.npm.dir, wpy.npm.pkg, lib);
+                    lib = resolvedLib ? resolvedLib : lib;
+                }
+
                 let o = resolve.getMainFile(lib);
                 if (!o) {
                     let relative = path.relative(util.currentDir, wpy.script.src);
@@ -67,16 +88,24 @@ export default {
                 }
                 let pkg = o.pkg;
                 let main = pkg.main || 'index.js';
+
+                let resolvedFile;
+                if (o.pkg && o.pkg._activeFields.length) {
+                    resolvedFile = resolve.resolveSelfFields(o.dir, o.pkg, o.file);
+                }
+                resolvedFile = resolvedFile ? resolvedFile : o.file;
+
+
                 if (lib === 'axios') {
-                    main = path.join('dist', 'axios.js');
+                    resolvedFile = path.join('dist', 'axios.js');
                 } else if (lib === 'vue') {
-                    main = path.join('dist', 'vue.js');
+                    resolvedFile = path.join('dist', 'vue.js');
                 }
                 if (pkg.browser && typeof pkg.browser === 'string') {
-                    main = pkg.browser;
+                    resolvedFile = pkg.browser;
                 }
-                source = path.join(o.dir, main);
-                lib += path.sep + main;
+                source = path.join(o.dir, resolvedFile);
+                lib += path.sep + resolvedFile;
                 npmInfo = o;
             } else { // require('babel-runtime/regenerator')
                 //console.log('3: ' + lib);
@@ -96,6 +125,8 @@ export default {
                     source += wpyExt;
                 } else if (util.isFile(source + '.js')) {
                     source += '.js';
+                } else if (util.isDir(source) && util.isFile(source + path.sep + 'index.js')) {
+                    source += path.sep + 'index.js';
                 } else {
                     source = null;
                 }