Merge branch '1.0.4' into 'master'

1.0.4

See merge request beatles-component/new-open-chameleon-sets!125

Author: wangmengjun

.eslintrc.js

@@ -0,0 +1,21 @@
+module.exports = {
+    root:true,
+    env: {
+      browser: true,
+      es6: true,
+    },
+    extends: [
+      'standard',
+    ],
+    globals: {
+      Atomics: 'readonly',
+      SharedArrayBuffer: 'readonly'
+    },
+    parserOptions: {
+      ecmaVersion: 2018,
+      parser:'babel-eslint'
+    },
+    rules: {
+      'semi':[2,'always']
+    }
+  }

CHANGELOG.md

@@ -1,9 +1,18 @@
+## [1.0.4]
+  - 支持mock文件更新实时重新编译
+  - 支持分包页面依赖的js更新，打包结果重新编译
+  - 优化dev模式内存占用
+  - 修复分包模式下组件js抽离的时候重复对页面js抽离的操作
+
+## [1.0.4-alpha.2]
+  - 扩展新端增加内置环境变量 NODE_ENV
+  - 支持模板多态语法
+
 ## [1.0.4-alpha.1]
 
   - 解决分包内组件js分包不彻底，优化包体积40%左右
   - 支持原生小程序组件的导入也是函数式的
   - 支持公用样式以文件的形式 @import
-  - 支持模板多态语法
 
 ## [1.0.3]
 

commitlint.config.js

@@ -0,0 +1,17 @@
+//git commit -m"feat: 新增功能"
+//规范团队commit规范，参考commitlint-angular https://www.npmjs.com/package/@commitlint/config-angular
+module.exports = {
+  extends: ['@commitlint/config-angular'],
+  rules: {
+    'type-enum': [2, 'always', [
+      "feat", "fix", "docs", "style", "refactor", "test", "chore", "revert"
+    ]],
+    'subject-full-stop': [0, 'never'],
+    'subject-case': [0, 'never'],
+  }
+};
+
+//[build, ci, docs, feat, fix, perf, refactor, revert, style, test]
+
+
+

lerna.json

@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "1.0.4-alpha.1",
+  "version": "1.0.4",
   "command": {
     "publish": {
       "allowBranch": "master",

package.json

@@ -11,8 +11,26 @@
   "author": "Chameleon-Team",
   "license": "Apache 2.0",
   "devDependencies": {
+    "@commitlint/cli": "^8.2.0",
+    "@commitlint/config-angular": "^8.2.0",
+    "babel-eslint": "^10.0.3",
+    "eslint": "^6.8.0",
+    "eslint-config-standard": "^14.1.0",
+    "eslint-plugin-import": "^2.19.1",
+    "eslint-plugin-node": "^11.0.0",
+    "eslint-plugin-promise": "^4.2.1",
+    "eslint-plugin-standard": "^4.0.1",
+    "eslint-plugin-vue": "^6.0.2",
+    "husky": "^3.1.0",
     "istanbul": "^0.4.5",
-    "lerna": "^3.5.1"
+    "lerna": "^3.5.1",
+    "lint-staged": "^9.5.0"
+  },
+  "husky": {
+    "hooks": {
+      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS",
+      "pre-commit": "lint-staged"
+    }
   },
   "dependencies": {
     "babel-core": "^6.26.3",
@@ -23,5 +41,8 @@
     "mocha": "*",
     "nyc": "*",
     "rimraf": "^2.6.3"
+  },
+  "lint-staged": {
+    "packages/**/*.js": "eslint --fix"
   }
 }

packages/babel-plugin-chameleon-import/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-chameleon-import",
-  "version": "1.0.4-alpha.1",
+  "version": "1.0.4",
   "description": "Component modular import plugin for babel.",
   "repository": {
     "type": "git",

packages/chameleon-css-loader/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chameleon-css-loader",
-  "version": "1.0.4-alpha.1",
+  "version": "1.0.4",
   "description": "chameleon样式处理",
   "main": "index.js",
   "scripts": {

packages/chameleon-css-loader/test/parser-test/miniapp.test.js

@@ -2,6 +2,7 @@ const parseCss = require('../../parser/miniapp.js');
 const expect = require('chai').expect;
 
 let source = `body {width:100cpx;font-size:26px;/* height:200px; */}`;
+let alipayCSS = `.cls1{color:red} .cls2{width:100cpx;height:200cpx;}  .cls3:{font-size:30cpx;}`
 describe('parse/miniapp', function() {
   it('parse cssstyle px to rpx but leave comment in style alone', function() {
     let result = parseCss(source,{
@@ -10,6 +11,13 @@ describe('parse/miniapp', function() {
     });
     expect(/100rpx/.test(result)).to.be.ok;
   })
+  it('parse cssstyle px to rpx but leave comment in style alone', function() {
+    let result = parseCss(alipayCSS,{
+      cmlType:'alipay',
+      filePath:"/src/page/index.cml"
+    });
+    expect(/100rpx/.test(result)).to.be.ok;
+  })
   it('parse cssstyle px to rpx but leave comment in style alone', function() {
     let result = parseCss(source,{
       cmlType:'wx',

packages/chameleon-css-loader/test/parser-test/weex.test.js

@@ -58,13 +58,18 @@ describe('parse/weex', function() {
   .e {
     margin: 10px 20px 5px 15px;
   }
+  .f {
+    border-style:solid;
+    border-width:10cpx;
+    border-color:red;
+    flex-flow:row;
+  }
 `;
 
   it('margin', function() {
 
     let result = parseCss(css);// body {width:1rem;}
-    console.log(result);
-    expect(result).to.equal(`.a {\n  margin-left: 10px;\n}\n\n.b {\n  margin-top: 10px;\n  margin-right: 10px;\n  margin-bottom: 10px;\n  margin-left: 10px;\n}\n\n.c {\n  margin-top: 10px;\n  margin-right: 20px;\n  margin-bottom: 10px;\n  margin-left: 20px;\n}\n\n.d {\n  margin-top: 10px;\n  margin-right: 20px;\n  margin-bottom: 10px;\n  margin-left: 20px;\n}\n\n.e {\n  margin-top: 10px;\n  margin-right: 20px;\n  margin-bottom: 5px;\n  margin-left: 15px;\n}`);
+    expect(result).to.equal('.a {\n  margin-left: 10px;\n}\n\n.b {\n  margin-top: 10px;\n  margin-right: 10px;\n  margin-bottom: 10px;\n  margin-left: 10px;\n}\n\n.c {\n  margin-top: 10px;\n  margin-right: 20px;\n  margin-bottom: 10px;\n  margin-left: 20px;\n}\n\n.d {\n  margin-top: 10px;\n  margin-right: 20px;\n  margin-bottom: 10px;\n  margin-left: 20px;\n}\n\n.e {\n  margin-top: 10px;\n  margin-right: 20px;\n  margin-bottom: 5px;\n  margin-left: 15px;\n}\n\n.f {\n  border-top-style: solid;\n  border-right-style: solid;\n  border-bottom-style: solid;\n  border-left-style: solid;\n  border-top-width: 10px;\n  border-right-width: 10px;\n  border-bottom-width: 10px;\n  border-left-width: 10px;\n  border-top-color: red;\n  border-right-color: red;\n  border-bottom-color: red;\n  border-left-color: red;\n  flex-direction: row;\n}');
   })
 
 })

packages/chameleon-dev-proxy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chameleon-dev-proxy",
-  "version": "1.0.4-alpha.1",
+  "version": "1.0.4",
   "description": "cml开发环境代理服务模块",
   "main": "index.js",
   "author": "Chameleon-Team",

packages/chameleon-errors-webpack-plugin/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.4-alpha.1",
+  "version": "1.0.4",
   "name": "chameleon-errors-webpack-plugin",
   "main": "index.js",
   "author": "Chameleon-Team",

packages/chameleon-linter/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chameleon-linter",
-  "version": "1.0.4-alpha.1",
+  "version": "1.0.4",
   "description": "cml规范校验工具",
   "main": "index.js",
   "scripts": {
@@ -24,10 +24,10 @@
     "@babel/traverse": "^7.1.4",
     "bulk-require": "^1.0.1",
     "chalk": "^2.4.1",
-    "chameleon-tool-utils": "1.0.4-alpha.1",
-    "cml-component-parser": "1.0.4-alpha.1",
-    "cml-htmllint": "1.0.4-alpha.1",
-    "cml-js-parser": "1.0.4-alpha.1",
+    "chameleon-tool-utils": "1.0.4",
+    "cml-component-parser": "1.0.4",
+    "cml-htmllint": "1.0.4",
+    "cml-js-parser": "1.0.4",
     "commander": "^2.19.0",
     "glob": "^7.1.3",
     "json-lint": "^0.1.0",

packages/chameleon-loader/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chameleon-loader",
-  "version": "1.0.4-alpha.1",
+  "version": "1.0.4",
   "description": "chameleon cml文件处理loader",
   "main": "src/index.js",
   "directories": {
@@ -18,18 +18,18 @@
     "@babel/types": "^7.3.4",
     "babel-generator": "6.26.1",
     "babel-traverse": "6.26.0",
-    "chameleon-template-parse": "1.0.4-alpha.1",
-    "chameleon-tool-utils": "1.0.4-alpha.1",
+    "chameleon-template-parse": "1.0.4",
+    "chameleon-tool-utils": "1.0.4",
     "consolidate": "0.14.0",
     "de-indent": "1.0.2",
     "fs-extra": "^7.0.1",
     "hash-sum": "1.0.2",
     "he": "1.1.0",
     "loader-utils": "1.1.0",
     "lru-cache": "4.1.1",
-    "mvvm-interface-parser": "1.0.4-alpha.1",
+    "mvvm-interface-parser": "1.0.4",
     "resolve": "1.4.0",
-    "runtime-check": "1.0.4-alpha.1",
+    "runtime-check": "1.0.4",
     "source-map": "0.6.1",
     "vue-style-loader": "4.0.1"
   },

packages/chameleon-loader/src/loader.js

@@ -10,7 +10,7 @@ const fs = require('fs');
 const {getVueRunTimeSnippet} = require('./cml-compile/runtime/index.js');
 
 var compileTemplate = require('chameleon-template-parse');
-
+const preParseMultiTemplate = require('chameleon-template-parse').preParseMultiTemplate;
 var jsonHandler = require('./cml-compile/json-handle.js');
 const { getScriptCode } = require('./interface-check/getScriptCode.js');
 const cmlUtils = require('chameleon-tool-utils');
@@ -259,6 +259,7 @@ module.exports = function (content) {
     if (type !== 'app') {
       let parseTemplate = parts.template && parts.template[0];
       let templateContent = (parseTemplate && parseTemplate.content) || '';
+      templateContent = preParseMultiTemplate(`<template>${templateContent}</template>`,cmlType,{needTranJSX:true,needDelTemplate:true});
       let lang = (parseTemplate && parseTemplate.lang) || 'cml';
       //content是不带template标签的内容；
       let compileResult = ASTcompileTemplate(templateContent, {
@@ -360,17 +361,14 @@ module.exports = function (content) {
   function webWeexHandler() {
     //主要是对模板进行编译和script进行拼接  vue组件的注册
     const parseTemplate = (parts.template && parts.template[0]) || {};
-    const templateContent = parseTemplate.content || '';
+    let templateContent = parseTemplate.content || '';
+    if(type !== 'app'){
+      templateContent = preParseMultiTemplate(`<template>${templateContent}</template>`,cmlType,{needTranJSX:true,needDelTemplate:true});
+    }
     const lang = parseTemplate.lang || 'cml';
     const parseScript = (parts.script && parts.script[0]) || {};
     const scriptContent = parseScript.content || '';
     let newTemplate = handleTemplate();
-    // if(type === 'app') {
-    //   newTemplate = newTemplate.replace(/<app[\s\S]*?\/app>/,`<div class="app" bubble="true">
-    //   <router-view ></router-view> 
-    // </div>`)
-    
-    // }
     if(type === 'app') {
       if (cmlType == 'web') {
         newTemplate = newTemplate.replace(/<app[\s\S]*?\/app>/,`<router-view class="app" bubble="true"></router-view> `)

packages/chameleon-miniapp-target/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chameleon-miniapp-target",
-  "version": "1.0.4-alpha.1",
+  "version": "1.0.4",
   "description": "chameleon 小程序webpack的target",
   "main": "src/index.js",
   "scripts": {
@@ -14,7 +14,7 @@
     "webpack": "^3.12.0"
   },
   "dependencies": {
-    "chameleon-tool-utils": "1.0.4-alpha.1"
+    "chameleon-tool-utils": "1.0.4"
   },
   "mail": "ChameleonCore@didiglobal.com",
   "gitHead": "5ddcde4330774710f7646559446e008f7785ce00"

packages/chameleon-mixins/miniapp-utils/px2cpx.js

@@ -15,6 +15,10 @@ _.px2cpx = function(px) {
       const { windowWidth } = my.getSystemInfoSync();
       return windowWidth;
     }
+    if(platform === 'qq'){
+      const { windowWidth } = qq.getSystemInfoSync();
+      return windowWidth;
+    }
   }
 
   viewportWidth = viewportWidth || getViewportSize();

packages/chameleon-mixins/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chameleon-mixins",
-  "version": "1.0.4-alpha.1",
+  "version": "1.0.4",
   "description": "chameleon-mixins",
   "main": "index.js",
   "scripts": {
@@ -12,7 +12,7 @@
   "license": "Apache",
   "devDependencies": {
     "chai": "^4.2.0",
-    "chameleon-css-loader": "1.0.4-alpha.1",
+    "chameleon-css-loader": "1.0.4",
     "coveralls": "^2.11.9",
     "eslint": "^5.9.0",
     "gulp": "^3.9.1",

packages/chameleon-template-parse/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chameleon-template-parse",
-  "version": "1.0.4-alpha.1",
+  "version": "1.0.4",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -24,9 +24,9 @@
   },
   "devDependencies": {
     "chai": "^4.2.0",
-    "chameleon-css-loader": "1.0.4-alpha.1",
-    "chameleon-mixins": "1.0.4-alpha.1",
-    "chameleon-tool-utils": "1.0.4-alpha.1",
+    "chameleon-css-loader": "1.0.4",
+    "chameleon-mixins": "1.0.4",
+    "chameleon-tool-utils": "1.0.4",
     "clean-webpack-plugin": "^0.1.19",
     "coveralls": "^2.11.9",
     "eslint": "^5.9.0",