fix

pack.config.js

@@ -4,13 +4,11 @@
  * @date    2018-08-04 01:00:06
  */
 
-'use strict'
-
 require('es.shim')
 const fs = require('iofs')
 const path = require('path')
 const chokidar = require('chokidar')
-const uglify = require('uglify-es')
+const { minify } = require('terser')
 const chalk = require('chalk')
 const config = require('./package.json')
 const log = console.log
@@ -137,8 +135,11 @@ function packAndCompress() {
    */
   log('正在打包 anot.js...')
   let normalVerPack = Buffer.concat([PAD_START, normalVer, PAD_END]).toString()
-  fs.echo(comment() + uglify.minify(normalVerPack).code, './dist/anot.js')
+
-  log(chalk.green('anot.js 打包压缩完成!'))
+  minify(normalVerPack, { sourceMap: false }).then(res => {
+    fs.echo(comment() + res.code, './dist/anot.js')
+    log(chalk.green('anot.js 打包压缩完成!'))
+  })
 
   /**
    * --------------------------------------------------------
@@ -148,11 +149,10 @@ function packAndCompress() {
   log('正在打包 anot.touch.js...')
   let touchVerPack = Buffer.concat([PAD_START, touchVer, PAD_END]).toString()
 
-  fs.echo(
+  minify(touchVerPack, { sourceMap: false }).then(res => {
-    comment({ touch: true }) + uglify.minify(touchVerPack).code,
+    fs.echo(comment({ touch: true }) + res.code, './dist/anot.touch.js')
-    './dist/anot.touch.js'
+    log(chalk.green('anot.touch.js 打包压缩完成!'))
-  )
+  })
-  log(chalk.green('anot.touch.js 打包压缩完成!'))
 }
 
 let args = process.argv.slice(2)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "anot",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "description": "Anot - 迷你mvvm框架",
   "main": "dist/anot.js",
   "files": ["dist"],
@@ -14,9 +14,9 @@
   "devDependencies": {
     "chalk": "^2.4.1",
     "chokidar": "^2.0.4",
-    "es.shim": "^1.1.2",
+    "es.shim": "^2.0.1",
-    "iofs": "^1.1.0",
+    "iofs": "^1.5.2",
-    "uglify-es": "^3.3.9"
+    "terser": "^5.0.0"
   },
   "repository": "https://github.com/yutent/anot.js.git",
   "author": "yutent",

src/02-core.js

@@ -4,14 +4,7 @@ let Anot = function(el) {
 }
 
 /*视浏览器情况采用最快的异步回调*/
-Anot.nextTick = new (function() {
+Anot.nextTick = (function() {
-  // jshint ignore:line
-  let tickImmediate = window.setImmediate
-  let tickObserver = window.MutationObserver
-  if (tickImmediate) {
-    return tickImmediate.bind(window)
-  }
-
   let queue = []
   function callback() {
     let n = queue.length
@@ -21,21 +14,16 @@ Anot.nextTick = new (function() {
     queue = queue.slice(n)
   }
 
-  if (tickObserver) {
+  let node = document.createTextNode('<!-- -->')
-    let node = document.createTextNode('anot')
+  new MutationObserver(callback).observe(node, { characterData: true })
-    new tickObserver(callback).observe(node, { characterData: true }) // jshint ignore:line
-    let bool = false
-    return function(fn) {
-      queue.push(fn)
-      bool = !bool
-      node.data = bool
-    }
-  }
 
+  let bool = false
   return function(fn) {
-    setTimeout(fn, 4)
+    queue.push(fn)
+    bool = !bool
+    node.data = bool
   }
-})() // jshint ignore:line
+})()
 
 /*********************************************************************
  *                 Anot的静态方法定义区                              *
@@ -97,10 +85,7 @@ Anot.PropsTypes.isBoolean = function() {
 /*判定是否是一个朴素的javascript对象（Object），不是DOM对象，不是BOM对象，不是自定义类的实例*/
 Anot.isPlainObject = function(obj) {
   // 简单的 typeof obj === "object"检测，会致使用isPlainObject(window)在opera下通不过
-  return (
+  return serialize.call(obj) === '[object Object]' && Object.getPrototypeOf(obj) === oproto
-    serialize.call(obj) === '[object Object]' &&
-    Object.getPrototypeOf(obj) === oproto
-  )
 }
 
 let VMODELS = (Anot.vmodels = {}) //所有vmodel都储存在这里
@@ -180,11 +165,7 @@ Anot.mix = Anot.fn.mix = function() {
         if (target === copy) {
           continue
         }
-        if (
+        if (deep && copy && (Anot.isPlainObject(copy) || (copyIsArray = Array.isArray(copy)))) {
-          deep &&
-          copy &&
-          (Anot.isPlainObject(copy) || (copyIsArray = Array.isArray(copy)))
-        ) {
           if (copyIsArray) {
             copyIsArray = false
             clone = src && Array.isArray(src) ? src : []
@@ -290,11 +271,11 @@ Anot.mix({
       t = t.trim()
       let hook = hooks[t]
       if (typeof hook === 'object') {
-        t = hook.type || type
+        t = hook.type || t
-        phase = hook.phase || !!phase
+        phase = hook.phase || phase
         fn = hook.fix ? hook.fix(el, fn) : fn
       }
-      el.addEventListener(t, fn, phase)
+      el.addEventListener(t, fn, !!phase)
     })
     return fn
   },
@@ -307,10 +288,10 @@ Anot.mix({
       t = t.trim()
       let hook = hooks[t]
       if (typeof hook === 'object') {
-        t = hook.type || type
+        t = hook.type || t
-        phase = hook.phase || !!phase
+        phase = hook.phase || phase
       }
-      el.removeEventListener(t, fn, phase)
+      el.removeEventListener(t, fn, !!phase)
     })
   },
   /*读写删除元素节点的样式*/
@@ -478,10 +459,9 @@ Anot.mix({
   },
   //获取url的参数
   search: function(key) {
-    key += ''
     let uri = location.search
 
-    if (!key || !uri) {
+    if (!uri) {
       return null
     }
     uri = decode(uri)
@@ -505,7 +485,11 @@ Anot.mix({
         obj[tmp[0]] = tmp[1]
       }
     }
-    return obj.hasOwnProperty(key) ? obj[key] : null
+    if (key) {
+      return obj.hasOwnProperty(key) ? obj[key] : null
+    } else {
+      return obj
+    }
   },
   //复制文本到粘贴板
   copy: function(txt) {