From def5396c151c7e4257fd60bbf8b759d897807fbe Mon Sep 17 00:00:00 2001
From: JiM-W <550116990@qq.com>
Date: Wed, 24 Jun 2020 17:18:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=87=E4=BB=B6=E5=A4=B9=E5=B8=A6?=
 =?UTF-8?q?=E6=9C=89=E6=95=B0=E5=AD=97=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  3 +--
 .../test/src/loaderMethods.test.js            |  6 ++---
 .../src/pages/{page1.cml => pagea.cml}        |  0
 .../test/getInterfaceCode.test.js             | 16 ++++++------
 .../com1.alipay.cml => coma/coma.alipay.cml}  |  0
 .../com1.baidu.cml => coma/coma.baidu.cml}    |  0
 .../com1.interface => coma/coma.interface}    |  0
 .../{com1/com1.web.cml => coma/coma.web.cml}  |  0
 .../com1.weex.cml => coma/coma.weex.cml}      |  0
 .../{com1/com1.wx.cml => coma/coma.wx.cml}    |  0
 .../com2.baidu.cml => comb/comb.baidu.cml}    |  0
 .../com2.interface => comb/comb.interface}    |  0
 .../test/lib/components/first/first.interface |  4 +--
 .../components/first/{test1.js => test.js}    |  0
 .../test/lib/components/third.interface       |  4 +--
 ...{include1.interface => includea.interface} |  0
 ...{include2.interface => includeb.interface} |  0
 .../{page1/page1.cml => pagea/pagea.cml}      |  0
 .../{page2/page2.cml => pageb/pageb.cml}      |  0
 .../test/demo-project/src/router.config.json  |  2 +-
 packages/mvvm-pack/test/demoPlugin.js         | 26 +++++++++----------
 .../mvvm-pack/test/mvvmGraphPlugin.test.js    | 14 +++++-----
 22 files changed, 37 insertions(+), 38 deletions(-)
 rename packages/chameleon-loader/test/src/project/src/pages/{page1.cml => pagea.cml} (100%)
 rename packages/mvvm-interface-parser/test/lib/components/{com1/com1.alipay.cml => coma/coma.alipay.cml} (100%)
 rename packages/mvvm-interface-parser/test/lib/components/{com1/com1.baidu.cml => coma/coma.baidu.cml} (100%)
 rename packages/mvvm-interface-parser/test/lib/components/{com1/com1.interface => coma/coma.interface} (100%)
 rename packages/mvvm-interface-parser/test/lib/components/{com1/com1.web.cml => coma/coma.web.cml} (100%)
 rename packages/mvvm-interface-parser/test/lib/components/{com1/com1.weex.cml => coma/coma.weex.cml} (100%)
 rename packages/mvvm-interface-parser/test/lib/components/{com1/com1.wx.cml => coma/coma.wx.cml} (100%)
 rename packages/mvvm-interface-parser/test/lib/components/{com2/com2.baidu.cml => comb/comb.baidu.cml} (100%)
 rename packages/mvvm-interface-parser/test/lib/components/{com2/com2.interface => comb/comb.interface} (100%)
 rename packages/mvvm-interface-parser/test/lib/components/first/{test1.js => test.js} (100%)
 rename packages/mvvm-interface-parser/test/lib/components/third/{include1.interface => includea.interface} (100%)
 rename packages/mvvm-interface-parser/test/lib/components/third/{include2.interface => includeb.interface} (100%)
 rename packages/mvvm-pack/test/demo-project/src/pages/{page1/page1.cml => pagea/pagea.cml} (100%)
 rename packages/mvvm-pack/test/demo-project/src/pages/{page2/page2.cml => pageb/pageb.cml} (100%)

diff --git a/package.json b/package.json
index 85348a27..c6d5dcd1 100644
--- a/package.json
+++ b/package.json
@@ -28,8 +28,7 @@
   },
   "husky": {
     "hooks": {
-      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS",
-      "pre-commit": "lint-staged"
+      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
     }
   },
   "dependencies": {
diff --git a/packages/chameleon-loader/test/src/loaderMethods.test.js b/packages/chameleon-loader/test/src/loaderMethods.test.js
index 178b7740..1f6a8d6b 100644
--- a/packages/chameleon-loader/test/src/loaderMethods.test.js
+++ b/packages/chameleon-loader/test/src/loaderMethods.test.js
@@ -8,7 +8,7 @@ describe('prepareParseUsingComponents', function() {
       scroller: '/npm/cml-ui/scroller/scroller'
     }
     let loaderContext = {
-      resourcePath: path.join(__dirname, './project/src/pages/page1.cml')
+      resourcePath: path.join(__dirname, './project/src/pages/pagea.cml')
     }
 
     let context = path.join(__dirname, './project');
@@ -34,7 +34,7 @@ describe('prepareParseUsingComponents', function() {
       scroller: './../npm/cml-ui/scroller/scroller'
     }
     let loaderContext = {
-      resourcePath: path.join(__dirname, './project/src/pages/page1.cml')
+      resourcePath: path.join(__dirname, './project/src/pages/pagea.cml')
     }
 
     let context = path.join(__dirname, './project');
@@ -46,7 +46,7 @@ describe('prepareParseUsingComponents', function() {
     });
 
     let expectPath = path.join(__dirname, './project/node_modules/cml-ui/scroller/scroller.cml')
-    result.forEach(item=>{
+    result.forEach(item => {
       if (item.tagName === 'scroller') {
         expect(item.filePath).to.be.equal(expectPath);
         expect(item.isNative).to.be.equal(false);
diff --git a/packages/chameleon-loader/test/src/project/src/pages/page1.cml b/packages/chameleon-loader/test/src/project/src/pages/pagea.cml
similarity index 100%
rename from packages/chameleon-loader/test/src/project/src/pages/page1.cml
rename to packages/chameleon-loader/test/src/project/src/pages/pagea.cml
diff --git a/packages/mvvm-interface-parser/test/getInterfaceCode.test.js b/packages/mvvm-interface-parser/test/getInterfaceCode.test.js
index 0d521e91..6890ddeb 100644
--- a/packages/mvvm-interface-parser/test/getInterfaceCode.test.js
+++ b/packages/mvvm-interface-parser/test/getInterfaceCode.test.js
@@ -31,7 +31,7 @@ describe('mvvm-interface-parser/getInterfaceCode', function() {
     try {
       getInterfaceCode({interfacePath, content});
     } catch (e) {
-      expect(!!~e.message.indexOf(`not find <script cml-type='interface'></script>`)).to.be.equal(true)
+      expect(!!~e.message.indexOf('not find <script cml-type=\'interface\'></script>')).to.be.equal(true)
     }
   })
 
@@ -41,7 +41,7 @@ describe('mvvm-interface-parser/getInterfaceCode', function() {
     try {
       getInterfaceCode({interfacePath, content});
     } catch (e) {
-      expect(!!~e.message.indexOf(`multi <script cml-type='interface'></script>`)).to.be.equal(true)
+      expect(!!~e.message.indexOf('multi <script cml-type=\'interface\'></script>')).to.be.equal(true)
     }
   })
 
@@ -51,7 +51,7 @@ describe('mvvm-interface-parser/getInterfaceCode', function() {
     try {
       getInterfaceCode({interfacePath, content});
     } catch (e) {
-      expect(!!~e.message.indexOf(`not find file: `)).to.be.equal(true)
+      expect(!!~e.message.indexOf('not find file: ')).to.be.equal(true)
     }
   })
 
@@ -61,27 +61,27 @@ describe('mvvm-interface-parser/getInterfaceCode', function() {
     try {
       getInterfaceCode({interfacePath, content});
     } catch (e) {
-      expect(!!~e.message.indexOf(`multi <script cml-type='interface'></script> has define in `)).to.be.equal(true)
+      expect(!!~e.message.indexOf('multi <script cml-type=\'interface\'></script> has define in ')).to.be.equal(true)
     }
   })
 
   it('include src error', function() {
-    const interfacePath = path.join(__dirname, './lib/components/third/include1.interface');
+    const interfacePath = path.join(__dirname, './lib/components/third/includea.interface');
     const content = fs.readFileSync(interfacePath, {encoding: 'utf-8'});
     try {
       getInterfaceCode({interfacePath, content});
     } catch (e) {
-      expect(!!~e.message.indexOf(`not define include src attribute in`)).to.be.equal(true)
+      expect(!!~e.message.indexOf('not define include src attribute in')).to.be.equal(true)
     }
   })
 
   it('include src not file', function() {
-    const interfacePath = path.join(__dirname, './lib/components/third/include2.interface');
+    const interfacePath = path.join(__dirname, './lib/components/third/includeb.interface');
     const content = fs.readFileSync(interfacePath, {encoding: 'utf-8'});
     try {
       getInterfaceCode({interfacePath, content});
     } catch (e) {
-      expect(!!~e.message.indexOf(`not find file:`)).to.be.equal(true)
+      expect(!!~e.message.indexOf('not find file:')).to.be.equal(true)
     }
   })
 })
diff --git a/packages/mvvm-interface-parser/test/lib/components/com1/com1.alipay.cml b/packages/mvvm-interface-parser/test/lib/components/coma/coma.alipay.cml
similarity index 100%
rename from packages/mvvm-interface-parser/test/lib/components/com1/com1.alipay.cml
rename to packages/mvvm-interface-parser/test/lib/components/coma/coma.alipay.cml
diff --git a/packages/mvvm-interface-parser/test/lib/components/com1/com1.baidu.cml b/packages/mvvm-interface-parser/test/lib/components/coma/coma.baidu.cml
similarity index 100%
rename from packages/mvvm-interface-parser/test/lib/components/com1/com1.baidu.cml
rename to packages/mvvm-interface-parser/test/lib/components/coma/coma.baidu.cml
diff --git a/packages/mvvm-interface-parser/test/lib/components/com1/com1.interface b/packages/mvvm-interface-parser/test/lib/components/coma/coma.interface
similarity index 100%
rename from packages/mvvm-interface-parser/test/lib/components/com1/com1.interface
rename to packages/mvvm-interface-parser/test/lib/components/coma/coma.interface
diff --git a/packages/mvvm-interface-parser/test/lib/components/com1/com1.web.cml b/packages/mvvm-interface-parser/test/lib/components/coma/coma.web.cml
similarity index 100%
rename from packages/mvvm-interface-parser/test/lib/components/com1/com1.web.cml
rename to packages/mvvm-interface-parser/test/lib/components/coma/coma.web.cml
diff --git a/packages/mvvm-interface-parser/test/lib/components/com1/com1.weex.cml b/packages/mvvm-interface-parser/test/lib/components/coma/coma.weex.cml
similarity index 100%
rename from packages/mvvm-interface-parser/test/lib/components/com1/com1.weex.cml
rename to packages/mvvm-interface-parser/test/lib/components/coma/coma.weex.cml
diff --git a/packages/mvvm-interface-parser/test/lib/components/com1/com1.wx.cml b/packages/mvvm-interface-parser/test/lib/components/coma/coma.wx.cml
similarity index 100%
rename from packages/mvvm-interface-parser/test/lib/components/com1/com1.wx.cml
rename to packages/mvvm-interface-parser/test/lib/components/coma/coma.wx.cml
diff --git a/packages/mvvm-interface-parser/test/lib/components/com2/com2.baidu.cml b/packages/mvvm-interface-parser/test/lib/components/comb/comb.baidu.cml
similarity index 100%
rename from packages/mvvm-interface-parser/test/lib/components/com2/com2.baidu.cml
rename to packages/mvvm-interface-parser/test/lib/components/comb/comb.baidu.cml
diff --git a/packages/mvvm-interface-parser/test/lib/components/com2/com2.interface b/packages/mvvm-interface-parser/test/lib/components/comb/comb.interface
similarity index 100%
rename from packages/mvvm-interface-parser/test/lib/components/com2/com2.interface
rename to packages/mvvm-interface-parser/test/lib/components/comb/comb.interface
diff --git a/packages/mvvm-interface-parser/test/lib/components/first/first.interface b/packages/mvvm-interface-parser/test/lib/components/first/first.interface
index 0001aef5..ed054daf 100644
--- a/packages/mvvm-interface-parser/test/lib/components/first/first.interface
+++ b/packages/mvvm-interface-parser/test/lib/components/first/first.interface
@@ -6,8 +6,8 @@ interface FirstInterface {
 </script>
 
 <script cml-type="web">
-import test1 from './test1.js';
-const requireModule = require('./test1.js');
+import test from './test.js';
+const requireModule = require('./test.js');
 import cml from 'chameleon-api';
 
 class Method implements FirstInterface {
diff --git a/packages/mvvm-interface-parser/test/lib/components/first/test1.js b/packages/mvvm-interface-parser/test/lib/components/first/test.js
similarity index 100%
rename from packages/mvvm-interface-parser/test/lib/components/first/test1.js
rename to packages/mvvm-interface-parser/test/lib/components/first/test.js
diff --git a/packages/mvvm-interface-parser/test/lib/components/third.interface b/packages/mvvm-interface-parser/test/lib/components/third.interface
index a463612b..6fdd32d7 100644
--- a/packages/mvvm-interface-parser/test/lib/components/third.interface
+++ b/packages/mvvm-interface-parser/test/lib/components/third.interface
@@ -1,8 +1,8 @@
 
 <script cml-type="interface" src="./thirdinterface.js"></script>
 <script cml-type="web">
-import test1 from './test1.js';
-const requireModule = require('./test1.js');
+import test from './test.js';
+const requireModule = require('./test.js');
 import cml from 'chameleon-api';
 
 class Method implements FirstInterface {
diff --git a/packages/mvvm-interface-parser/test/lib/components/third/include1.interface b/packages/mvvm-interface-parser/test/lib/components/third/includea.interface
similarity index 100%
rename from packages/mvvm-interface-parser/test/lib/components/third/include1.interface
rename to packages/mvvm-interface-parser/test/lib/components/third/includea.interface
diff --git a/packages/mvvm-interface-parser/test/lib/components/third/include2.interface b/packages/mvvm-interface-parser/test/lib/components/third/includeb.interface
similarity index 100%
rename from packages/mvvm-interface-parser/test/lib/components/third/include2.interface
rename to packages/mvvm-interface-parser/test/lib/components/third/includeb.interface
diff --git a/packages/mvvm-pack/test/demo-project/src/pages/page1/page1.cml b/packages/mvvm-pack/test/demo-project/src/pages/pagea/pagea.cml
similarity index 100%
rename from packages/mvvm-pack/test/demo-project/src/pages/page1/page1.cml
rename to packages/mvvm-pack/test/demo-project/src/pages/pagea/pagea.cml
diff --git a/packages/mvvm-pack/test/demo-project/src/pages/page2/page2.cml b/packages/mvvm-pack/test/demo-project/src/pages/pageb/pageb.cml
similarity index 100%
rename from packages/mvvm-pack/test/demo-project/src/pages/page2/page2.cml
rename to packages/mvvm-pack/test/demo-project/src/pages/pageb/pageb.cml
diff --git a/packages/mvvm-pack/test/demo-project/src/router.config.json b/packages/mvvm-pack/test/demo-project/src/router.config.json
index 2f5f2788..daa9a387 100644
--- a/packages/mvvm-pack/test/demo-project/src/router.config.json
+++ b/packages/mvvm-pack/test/demo-project/src/router.config.json
@@ -4,7 +4,7 @@
   "routes":[
     {
       "url": "/cml/h5/index",
-      "path": "/pages/page1/page1",
+      "path": "/pages/pagea/pagea",
       "name": "首页",
       "mock": "index.php"
     }
diff --git a/packages/mvvm-pack/test/demoPlugin.js b/packages/mvvm-pack/test/demoPlugin.js
index d6004f76..ea815041 100644
--- a/packages/mvvm-pack/test/demoPlugin.js
+++ b/packages/mvvm-pack/test/demoPlugin.js
@@ -101,34 +101,34 @@ module.exports = class DemoPlugin {
 
     })
 
-   /**
+    /**
     * 编译other类型节点
     * currentNode 当前节点
     */
-   compiler.hook('config-json', function(jsonObj) {
+    compiler.hook('config-json', function(jsonObj) {
       jsonObj.name = 'chameleon';
-   })
+    })
 
     /**
        * 编译结束进入打包阶段
        */
     compiler.hook('pack', function(projectGraph) {
-      compiler.writeFile('static/test1.js', 'dd')
-      compiler.writeFile('static/css1.css', '.class1 {color: red;}')
+      compiler.writeFile('static/test.js', 'dd')
+      compiler.writeFile('static/css.css', '.class1 {color: red;}')
     })
 
     cml.projectRoot = path.join(__dirname, 'demo-project');
     cml.config = {
       get() {
-         return {
-         subProject: ['cml-subproject'],
-            wx: {
-               dev: {
-               minimize: true,
-               hash: true
-               }
+        return {
+          subProject: ['cml-subproject'],
+          wx: {
+            dev: {
+              minimize: true,
+              hash: true
             }
-         }
+          }
+        }
       }
     }
     let result = compiler.getRouterConfig();
diff --git a/packages/mvvm-pack/test/mvvmGraphPlugin.test.js b/packages/mvvm-pack/test/mvvmGraphPlugin.test.js
index c0aeed46..0caa719d 100644
--- a/packages/mvvm-pack/test/mvvmGraphPlugin.test.js
+++ b/packages/mvvm-pack/test/mvvmGraphPlugin.test.js
@@ -187,7 +187,7 @@ describe('mvvmGraphPlugin.js', function() {
           dependencies: [],
           _publicPath: 'static.chameleon.com',
           request: 'request',
-          resource: '/pages/page1.cml',
+          resource: '/pages/pagea.cml',
           rawRequest: 'rawRequest',
           id: 'id'
         }
@@ -199,7 +199,7 @@ describe('mvvmGraphPlugin.js', function() {
           dependencies: [],
           _publicPath: 'static.chameleon.com',
           request: 'request',
-          resource: '/pages/page2.cml',
+          resource: '/pages/pageb.cml',
           rawRequest: 'rawRequest',
           id: 'id'
         }
@@ -243,7 +243,7 @@ describe('mvvmGraphPlugin.js', function() {
 
         let templateModule = {
           _source: {
-            _value: `<view></view>`
+            _value: '<view></view>'
           },
           _moduleType: 'template',
           dependencies: [],
@@ -255,7 +255,7 @@ describe('mvvmGraphPlugin.js', function() {
 
         let json1Module = {
           _source: {
-            _value: `{"a":"a"}`
+            _value: '{"a":"a"}'
           },
           _moduleType: 'json',
           dependencies: [],
@@ -266,7 +266,7 @@ describe('mvvmGraphPlugin.js', function() {
         }
         let json2Module = {
           _source: {
-            _value: `module.exports = {a:'a'}`
+            _value: 'module.exports = {a:\'a\'}'
           },
           _moduleType: 'json',
           dependencies: [],
@@ -278,7 +278,7 @@ describe('mvvmGraphPlugin.js', function() {
 
         let scriptModule = {
           _source: {
-            _value: `module.exports = {}`
+            _value: 'module.exports = {}'
           },
           _moduleType: 'script',
           dependencies: [],
@@ -308,7 +308,7 @@ describe('mvvmGraphPlugin.js', function() {
               module: scriptModule
             }],
             request: 'request',
-            resource: '/pages/page1.cml',
+            resource: '/pages/pagea.cml',
             rawRequest: 'rawRequest',
             id: 'id'
 
-- 
GitLab