update package.json && eslint (#15)

Author: LeeeeeeM

.eslintrc

@@ -1,4 +1,5 @@
 {
+  "extends": ["standard", "prettier"],
   "parserOptions": {
     "ecmaVersion": 6,
     "sourceType": "module"
@@ -9,134 +10,13 @@
     "node": true,
     "mocha": true
   },
-
   "globals": {
-    "document": false,
-    "navigator": false,
-    "window": false,
-    "location": false,
-    "callNative": false,
-    "callJS": false,
-    "ENV_PLATFORM": false,
-    "ENV_PHASE": false
+    "ENV_PLATFORM": false
   },
-
   "rules": {
-    "accessor-pairs": 2,
-    "arrow-spacing": [2, { "before": true, "after": true }],
-    "block-spacing": [2, "always"],
-    "brace-style": [0, "stroustrup", { "allowSingleLine": true }],
-    "camelcase": [2, { "properties": "never" }],
-    "comma-dangle": [2, "never"],
-    "comma-spacing": [2, { "before": false, "after": true }],
-    "comma-style": [2, "last"],
-    "constructor-super": 2,
-    "curly": [2, "multi-line"],
-    "dot-location": [2, "property"],
-    "eol-last": 2,
-    "eqeqeq": [2, "allow-null"],
-    "generator-star-spacing": [2, { "before": true, "after": true }],
-    "handle-callback-err": [2, "^(err|error)$" ],
-    "indent": [2, 2, { "SwitchCase": 1 }],
-    "key-spacing": [2, { "beforeColon": false, "afterColon": true }],
-    "keyword-spacing": [2, { "before": true, "after": true }],
-    "new-cap": [2, { "newIsCap": true, "capIsNew": false }],
-    "new-parens": 2,
-    "no-array-constructor": 2,
-    "no-caller": 2,
-    "no-class-assign": 2,
-    "no-cond-assign": 2,
-    "no-const-assign": 2,
-    "no-control-regex": 2,
-    "no-debugger": 2,
-    "no-delete-var": 2,
-    "no-dupe-args": 2,
-    "no-dupe-class-members": 2,
-    "no-dupe-keys": 2,
-    "no-duplicate-case": 2,
-    "no-empty-character-class": 2,
-    "no-empty-pattern": 2,
-    "no-eval": 2,
-    "no-ex-assign": 2,
-    "no-extend-native": 2,
-    "no-extra-bind": 2,
-    "no-extra-boolean-cast": 2,
-    "no-extra-parens": [2, "functions"],
-    "no-fallthrough": 2,
-    "no-floating-decimal": 2,
-    "no-func-assign": 2,
-    "no-implied-eval": 2,
-    "no-inner-declarations": [2, "functions"],
-    "no-invalid-regexp": 2,
-    "no-irregular-whitespace": 2,
-    "no-iterator": 2,
-    "no-label-var": 2,
-    "no-labels": [2, { "allowLoop": false, "allowSwitch": false }],
-    "no-lone-blocks": 2,
-    "no-mixed-spaces-and-tabs": 2,
-    "no-multi-spaces": 2,
-    "no-multi-str": 2,
-    "no-multiple-empty-lines": [2, { "max": 1 }],
-    "no-native-reassign": 2,
-    "no-negated-in-lhs": 2,
-    "no-new-object": 2,
-    "no-new-require": 2,
-    "no-new-symbol": 2,
-    "no-new-wrappers": 2,
-    "no-obj-calls": 2,
-    "no-octal": 2,
-    "no-octal-escape": 2,
-    "no-path-concat": 2,
-    "no-proto": 2,
-    "no-redeclare": 2,
-    "no-regex-spaces": 2,
-    "no-return-assign": [2, "except-parens"],
-    "no-self-assign": 2,
-    "no-self-compare": 2,
-    "no-sequences": 2,
-    "no-shadow-restricted-names": 2,
-    "no-spaced-func": 2,
-    "no-sparse-arrays": 2,
-    "no-this-before-super": 2,
-    "no-throw-literal": 2,
-    "no-trailing-spaces": 2,
-    "no-undef": 2,
-    "no-undef-init": 2,
-    "no-unexpected-multiline": 2,
-    "no-unmodified-loop-condition": 2,
-    "no-unneeded-ternary": [2, { "defaultAssignment": false }],
-    "no-unreachable": 2,
-    "no-unsafe-finally": 2,
-    "no-unused-vars": [2, { "vars": "all", "args": "none" }],
-    "no-useless-call": 2,
-    "no-useless-computed-key": 2,
-    "no-useless-constructor": 2,
-    "no-useless-escape": 2,
-    "no-whitespace-before-property": 2,
-    "no-with": 2,
-    "one-var": [2, { "initialized": "never" }],
-    "padded-blocks": [2, "never"],
-    "quotes": [2, "single", {"avoidEscape": true, "allowTemplateLiterals": true}],
-    "semi": [2, "never"],
-    "semi-spacing": [2, { "before": false, "after": true }],
-    "space-before-blocks": [2, "always"],
-    "space-before-function-paren": [0, "always"],
-    "space-in-parens": [2, "never"],
-    "space-infix-ops": 2,
-    "space-unary-ops": [2, { "words": true, "nonwords": false }],
-    "spaced-comment": [2, "always", { "markers": ["global", "globals", "eslint", "eslint-disable", "*package", "!", ","] }],
-    "template-curly-spacing": [2, "never"],
-    "use-isnan": 2,
-    "valid-typeof": 2,
-    "wrap-iife": [2, "any"],
-    "yield-star-spacing": [2, "both"],
-    "yoda": [2, "never"],
-
-    "no-var": 2,
-    "prefer-const": 2,
-    "object-curly-spacing": [2, "always", {
-      "objectsInObjects": false
-    }],
-    "array-bracket-spacing": [2, "never"]
+    "no-new-func": 0,
+    "standard/computed-property-even-spacing": 0,
+    "standard/no-callback-literal": 0,
+    "promise/param-names": 0
   }
 }

.npmignore

@@ -9,4 +9,11 @@ babel.config.js
 dist/debug
 dist/release/output
 
-**/*.js.map
+**/*.js.map
+*.md
+*.pdf
+
+.gitignore
+.eslintrc
+.eslintignore
+.prettierignore

.prettierignore

@@ -0,0 +1,4 @@
+dist/**
+/test/build/**
+/src/dsls/vue/vm/factory.js
+/src/dsls/vue/vm/factory-with-compiler.js

config/rollup.config.js

@@ -5,18 +5,21 @@
 import path from 'path'
 import fs from 'fs'
 
-import json from 'rollup-plugin-json'  // 通过import引入json文件
-import eslint from 'rollup-plugin-eslint'  // 代码风格检查
-import nodeResolve from 'rollup-plugin-node-resolve'  // 解析npm包
-import commonjs from 'rollup-plugin-commonjs'  // commonJS转换为ES6
-import buble from 'rollup-plugin-buble'  // 转化相应的v8版本的ES6语法特性
+import json from 'rollup-plugin-json' // 通过import引入json文件
+import { eslint } from 'rollup-plugin-eslint' // 代码风格检查
+import nodeResolve from 'rollup-plugin-node-resolve' // 解析npm包
+import commonjs from 'rollup-plugin-commonjs' // commonJS转换为ES6
+import buble from 'rollup-plugin-buble' // 转化相应的v8版本的ES6语法特性
 import replace from 'rollup-plugin-replace' // Likely with DefinePlugin
 import { terser } from 'rollup-plugin-terser' // terser用来混淆ES6代码
 import alias from 'rollup-plugin-alias'
 
 const pkg = require('../package.json')
 const version = pkg.version
-const date = new Date().toISOString().split('T')[0].replace(/-/g, '')
+const date = new Date()
+  .toISOString()
+  .split('T')[0]
+  .replace(/-/g, '')
 
 // 配置环境
 const nodeConf = parse()
@@ -62,25 +65,20 @@ const rollConf = {
       }
     }),
     replace({
-      exclude: [
-        'node_modules/**',
-        'package.json'
-      ],
+      exclude: ['node_modules/**', 'package.json'],
       values: rollInject
     })
   ]
 }
 
 if (nodeConf.NODE_PHASE === 'dv') {
-}
-else {
+} else {
   // Uglify
   rollConf.plugins.push(terser())
 }
 
 if (nodeConf.NODE_PLATFORM === 'h5') {
-}
-else {
+} else {
 }
 
 const confList = nodeConf.list.map(item => {
@@ -93,7 +91,7 @@ export default confList
 /**
  * 解析NODE环境的参数
  */
-function parse (config) {
+function parse(config) {
   config = config || {}
   // 平台：na
   config.NODE_PLATFORM = process.env.NODE_PLATFORM
@@ -126,7 +124,7 @@ function parse (config) {
  * @param {string} env debug/release
  * @param {string} moduleSrc module文件夹位置
  */
-function collectExportList (env, dslsSrc) {
+function collectExportList(env, dslsSrc) {
   const list = []
 
   fs.readdirSync(dslsSrc).forEach(dir => {

dist/release/output/infras-ext.js

@@ -1,10 +1,11 @@
 {
   "name": "quickapp-dsls",
-  "version": "0.0.8",
+  "version": "0.1.3",
   "description": "dsls-for-quickapp",
   "scripts": {
+    "prettier": "prettier \"**/*.{md,js,json}\" --write",
     "build": "npm run native && npm run native:release",
-    "clear": "rm -rf dist/*",
+    "clear": "rm -rf dist/debug && rm -rf dist/release/dsls",
     "native": "npm run na:dv",
     "native:release": "npm run na:ol",
     "na": "npm run na:dv -- -w",
@@ -20,26 +21,53 @@
   },
   "keywords": [],
   "main": "dist/release/dsls/vue.js",
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  },
+  "lint-staged": {
+    "*.{js,json,css,md}": [
+      "prettier --write",
+      "git add"
+    ]
+  },
+  "prettier": {
+    "tabWidth": 2,
+    "printWidth": 100,
+    "semi": false,
+    "trailingComma": "none",
+    "singleQuote": true
+  },
   "devDependencies": {
     "@babel/cli": "^7.2.3",
     "app-module-path": "^2.2.0",
     "chai": "^3.5.0",
     "cross-env": "^3.2.4",
     "crypto-js": "^3.1.9-1",
     "css-loader": "^0.28.11",
-    "eslint": "^3.12.1",
+    "eslint": "^5.15.0",
+    "eslint-config-prettier": "^4.1.0",
+    "eslint-config-standard": "^12.0.0",
+    "eslint-plugin-import": "^2.16.0",
+    "eslint-plugin-node": "^8.0.1",
+    "eslint-plugin-promise": "^4.0.1",
+    "eslint-plugin-standard": "^4.0.0",
     "hap-toolkit": "^0.2.0",
+    "husky": "^1.3.1",
     "json-loader": "0.5.4",
+    "lint-staged": "^8.1.4",
     "loader-utils": "~0.2.14",
     "mini-css-extract-plugin": "^0.4.5",
     "mocha": "^5.2.0",
+    "prettier": "^1.16.4",
     "reify": "^0.3.8",
     "rollup": "^0.68.0",
     "rollup-plugin-alias": "^1.4.0",
     "rollup-plugin-babel": "^2.7.1",
     "rollup-plugin-buble": "^0.19.6",
     "rollup-plugin-commonjs": "^5.0.5",
-    "rollup-plugin-eslint": "^3.0.0",
+    "rollup-plugin-eslint": "^5.0.0",
     "rollup-plugin-json": "^2.0.2",
     "rollup-plugin-node-resolve": "^2.0.0",
     "rollup-plugin-postcss": "^0.2.0",

dist/release/output/infras.js

@@ -16,11 +16,11 @@ import { updatePageActions } from './misc'
  * 初始化页面
  * @param {object} page page实例
  * @param {string} code 页面代码字符串
- * @param {object} data app传入的数据
+ * @param {object} query app传入的数据
  * @param {object} globals 全局变量
  * @return {object}
  */
-function initPage(page, code, data, globals) {
+function initPage(page, code, query, globals) {
   const instanceId = page.id
 
   // 对原有streamer实例方法进行拦截
@@ -44,7 +44,7 @@ function initPage(page, code, data, globals) {
   })
 
   // instance实例上挂载Vue实例
-  const Vue = (instance.Vue = createVueModuleInstance(instanceId, { page: page }, data))
+  const Vue = (instance.Vue = createVueModuleInstance(instanceId, { page: page }, query))
 
   // 实例代码执行需要的全局参数
   const instanceVars = Object.assign(

dist/release/output/styling.js

@@ -54,8 +54,8 @@ function postHook(webpackConf, defaults, options) {
       if (stats.isFile() && jsReg.test(subFile)) {
         // 正则紧接上文
         const key = `test/build/dsls/${subFile.replace(
-          /(.*)(test(\/|\\)suite(\/|\\)dsls(\/|\\))(.*)(\b(app|index)\b\.vue$)/,
-          (...args) => args[6]
+          /(.*)(test[\\/]suite[\\/]dsls[\\/])(.*)(\b(app|index)\b\.vue$)/,
+          ($0, $1, $2, $3) => $3
         )}${type}`
         webpackConf.entry[key] = `${subFile}?vueType=${type === 'app' ? 'app' : 'page'}`
         console.log('### App Loader ### 添加 entry: ', key)