wepy-cli: Added aliasFields feature && mainFields feature #595

dlhandsome · 2017-12-02T17:13:00Z

添加了wepy-cli对aliasFields及mainFields的支持

aliasFields

default config

resolve.aliasFields：['wepy', 'weapp', 'browser'](优先级递减)

package.json

{
  "wepy": {
      "module-a": false,  // import a from 'module-a'  => var a = {}
      "count": "./src/components/count-wepy.wpy",  // 如果alias中存在count，alias优先
      "./src/list.wpy": "./src/components/list-wepy.wpy"  // files must be replaced
  }
}

mainFields

default config

resolve.mainFields: ['wepy', 'weapp', 'browser', 'module', 'main'](优先级递减)

npm package.json

{
  "wepy": "lib/wepy-com-swiper.wpy",  // npm包将会以wepy的键值作为入口加载
  "browser": "lib/swiper.js"
}

Gcaufy · 2017-12-03T07:18:07Z

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);


这里lib是怎么得到 string的false呢，配置中是配置的 'module-a': false
另外：require('module-a') 编译为 require('{}') 好像也不对吧

如果在aliasFields中有配置 'module-a': false时，{'module-a': false}会被extends到alias上，'module-a'经resolveAlias后被替换成 'false'(可参考这里)
var a = require('module-a')经由这步是会编译为 var a = {}的
如：

let code = `var a = require('module-a')` code = code.replace(/require\(['"]([\w\d_\-\.\/@]+)['"]\)/ig, function (match, lib) { return '{}' }) console.log(code) // => var a = {}

Gcaufy · 2017-12-03T07:21:01Z

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')


这里是编译前的代码，那这里的 import xxx from 'false' 是哪里来的呢。

嗯...这里判断无效

Gcaufy · 2017-12-03T07:21:33Z

packages/wepy-cli/src/compile-wpy.js

+                    //     Count1: '../components/count',
+                    //     Count2: '../components/count'
+                    // };
+                    requires = util.unique(requires)


Gcaufy · 2017-12-03T07:24:45Z

packages/wepy-cli/src/resolve.js

+                    this.alias = Object.assign({}, { [key]: value }, this.alias || {});
+                }
+                // fields转换："./src/index.wpy" => "src/index.wpy"后合并至fieldsAlias中
+                if (!path.isAbsolute(key) && path.extname(key)) {


相对路径，不带后缀的怎么处理呢。

这里漏了，我补一下，这种情况下理想结果应该是命中后会被替换

Gcaufy · 2017-12-03T07:26:38Z

另外test case呢

dlhandsome · 2017-12-02T17:22:11Z

packages/wepy-cli/src/compile-style.js

-                    if (path.isAbsolute(r)) {
-                        if (path.extname(r) === '' && util.isFile(r + ext)) {
-                            comsrc = r + ext;
+                    let lib = resolve.resolveAlias(r, opath, ext);


ext没必要传进去...

dlhandsome · 2017-12-03T11:42:20Z

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);


如果在aliasFields中有配置 'module-a': false时，{'module-a': false}会被extends到alias上，'module-a'经resolveAlias后被替换成 'false'(可参考这里)
var a = require('module-a')经由这步是会编译为 var a = {}的
如：

let code = `var a = require('module-a')` code = code.replace(/require\(['"]([\w\d_\-\.\/@]+)['"]\)/ig, function (match, lib) { return '{}' }) console.log(code) // => var a = {}

dlhandsome · 2017-12-03T11:56:37Z

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')


嗯...这里判断无效

dlhandsome · 2017-12-03T12:06:15Z

packages/wepy-cli/src/resolve.js

+                    this.alias = Object.assign({}, { [key]: value }, this.alias || {});
+                }
+                // fields转换："./src/index.wpy" => "src/index.wpy"后合并至fieldsAlias中
+                if (!path.isAbsolute(key) && path.extname(key)) {


这里漏了，我补一下，这种情况下理想结果应该是命中后会被替换

dlhandsome · 2017-12-03T12:10:16Z

test case 我补一下

dlhandsome · 2017-12-03T12:17:47Z

packages/wepy-cli/src/resolve.js

+                    // => "xyz"、"xyz-xyz"
+                    let value;
+                    if (!pkg[fields][key]) {
+                        value = 'false'


这里得到string类型的'false'

…ements

dlhandsome · 2017-12-03T14:50:21Z

@leeyeh 看看符合要求吗

leeyeh · 2017-12-04T01:06:16Z

LGTM.

非常感谢。

coveralls · 2017-12-25T10:15:18Z

Changes Unknown when pulling d42040d on dlhandsome:master into ** on Tencent:master**.

coveralls · 2017-12-25T10:17:45Z

Changes Unknown when pulling d42040d on dlhandsome:master into ** on Tencent:master**.

Gcaufy · 2017-12-25T10:27:26Z

@leeyeh @dlhandsome

Test：

$ npm i leancloud-storage --save

$ vi ./src/app.wpy
// added import
import ls from 'leancloud-storage';

$ vi ./node_modules/leancloud-storage/dist/av-weapp-min.js
// added to the first line for testing relative 
var lq = require('./node/index-live-query');

$ wepy build --no-cache

Relevant PR: leancloud/javascript-sdk#529

wepy-cli: Added aliasFields feature && mainFields feature

c0b111b

Gcaufy mentioned this pull request Dec 3, 2017

Added aliasFields feature #572

Closed

Gcaufy reviewed Dec 3, 2017

View reviewed changes

dlhandsome commented Dec 3, 2017

View reviewed changes

dlhandsome added 4 commits December 3, 2017 20:33

wepy-cli: [aliasFields Feature]removed ineffectiveness determine stat…

6fef14e

…ements

wepy-cli: [aliasFields Feature]update resolve.js && fixed typos

e3ebbb5

wepy-cli: [aliasFields Feature]update resolve.js

b37f621

wepy-cli: [aliasFields Feature]Added examples

a5d5d43

Gcaufy added 2 commits December 25, 2017 18:09

cli: added resolveSelfFields

f6d73e3

cli: added resolveSelfFields

d42040d

Gcaufy added 4 commits December 25, 2017 20:14

cli: fixed alias resolve

599a660

web: added resolve option for web

a77e76b

web: fixed aliasFields for wepy-web

beec097

Merge branch 'master' into master

ff15607

Gcaufy merged commit ff15607 into Tencent:master Dec 25, 2017

Gcaufy mentioned this pull request Dec 25, 2017

cli: added aliasFields and mainFields #691

Merged

5 tasks

leeyeh mentioned this pull request Dec 25, 2017

added stream in dependence leancloud/javascript-sdk#529

Closed

Gcaufy mentioned this pull request Mar 7, 2018

如何编译 node_modules 中的 es6 模块？ #1045

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

wepy-cli: Added aliasFields feature && mainFields feature #595

wepy-cli: Added aliasFields feature && mainFields feature #595

dlhandsome commented Dec 2, 2017 •

edited

Gcaufy Dec 3, 2017

dlhandsome Dec 3, 2017 •

edited

Gcaufy Dec 3, 2017

Gcaufy Dec 3, 2017

dlhandsome Dec 3, 2017 •

edited

Gcaufy Dec 3, 2017

Gcaufy Dec 3, 2017

dlhandsome Dec 3, 2017

Gcaufy commented Dec 3, 2017

dlhandsome Dec 2, 2017

dlhandsome Dec 3, 2017 •

edited

dlhandsome Dec 3, 2017 •

edited

dlhandsome Dec 3, 2017

dlhandsome commented Dec 3, 2017

dlhandsome Dec 3, 2017

Gcaufy Dec 3, 2017

dlhandsome commented Dec 3, 2017

leeyeh commented Dec 4, 2017

coveralls commented Dec 25, 2017

coveralls commented Dec 25, 2017

Gcaufy commented Dec 25, 2017 •

edited

wepy-cli: Added aliasFields feature && mainFields feature #595

wepy-cli: Added aliasFields feature && mainFields feature #595

Conversation

dlhandsome commented Dec 2, 2017 • edited

添加了wepy-cli对aliasFields及mainFields的支持

aliasFields

mainFields

Choose a reason for hiding this comment

dlhandsome Dec 3, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dlhandsome Dec 3, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Gcaufy commented Dec 3, 2017

Choose a reason for hiding this comment

dlhandsome Dec 3, 2017 • edited

Choose a reason for hiding this comment

dlhandsome Dec 3, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dlhandsome commented Dec 3, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dlhandsome commented Dec 3, 2017

leeyeh commented Dec 4, 2017

coveralls commented Dec 25, 2017

coveralls commented Dec 25, 2017

Gcaufy commented Dec 25, 2017 • edited

dlhandsome commented Dec 2, 2017 •

edited

dlhandsome Dec 3, 2017 •

edited

dlhandsome Dec 3, 2017 •

edited

dlhandsome Dec 3, 2017 •

edited

dlhandsome Dec 3, 2017 •

edited

Gcaufy commented Dec 25, 2017 •

edited