Merge 90e2a89 into 5d910e5

mipengine · Nov 1, 2017 · 2032b4f · 2032b4f
2 parents 5d910e5 + 90e2a89
commit 2032b4f
Show file tree

Hide file tree

Showing 9 changed files with 160 additions and 66 deletions.
diff --git a/cases/212.json b/cases/212.json
@@ -1 +1 @@
-[]
+[]
diff --git a/cases/213.html b/cases/213.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html mip="" lang="zh-CN">
+
+<head>
+    <meta charset="utf-8">
+    <title></title>
+    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+    <link rel="canonical" href="https://www.baidu.com">
+    <link rel="stylesheet" href="https://mipcache.bdstatic.com/static/v1/mip.css">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge">
+    <script src="https://mipcache.bdstatic.com/static/v1/mip.js"></script>
+    <script async src="https://mipcache.bdstatic.com/static/v1/mip-ad/mip-ad.js"></script>
+</head>
+
+<body>
+    <mip-form method="get" url="https://www.mipengine.org?we=123">
+        <input type="text" name="username" validatetarget="username" validatetype="must" placeholder="姓名">
+        <div target="username">姓名不能为空</div>
+        <input type="number" name="age" validatetarget="age" validatetype="must" placeholder="年龄">
+        <div target="age">年龄不能为空</div>
+        <input type="submit" value="提交">
+    </mip-form>
+    <mip-vd-baidu src="https://www.mipengine.org/static/img/banner2_wise_ab3d9a7.png" title="title" poster="https://www.mipengine.org/static/img/banner2_wise_ab3d9a7.png"></mip-vd-baidu>
+    <script src="https://mipcache.bdstatic.com/static/v1/mip-form/mip-form.js"></script>
+    <script type="text/javascript" src="https://mipcache.bdstatic.com/static/v1/mip-ad/mip-ad.js"></script>
+    <script type="application/json" src="https://mipcache.bdstatic.com/static/v1/mip-sidebar/mip-sidebar.js"></script>
+    <script type="" src="https://mipcache.bdstatic.com/static/v1/mip-showmore/mip-showmore.js"></script>
+    <script type="application/json">
+    {
+        a:1
+    }
+    </script>
+    <script async src="https://mipcache.bdstatic.com/static/v1/mip-vd-baidu/mip-vd-baidu.js"></script>
+</body>
+
+</html>
diff --git a/cases/213.json b/cases/213.json
@@ -0,0 +1,26 @@
+[
+    {
+        "message": "标签'script'的强制性属性'async'缺失",
+        "code": "06200501",
+        "line": 11,
+        "col": 5,
+        "offset": 387,
+        "input": "    <script src=\"https://mipcache.bdstatic.com/static/v1/mip.js\"></script>"
+    },
+    {
+        "message": "标签'script'中的属性'type'的属性值'application/json'无效",
+        "code": "06200301",
+        "line": 26,
+        "col": 5,
+        "offset": 1366,
+        "input": "    <script type=\"application/json\" src=\"https://mipcache.bdstatic.com/static/v1/mip-sidebar/mip-sidebar.js\"></script>"
+    },
+    {
+        "message": "标签'script'中的属性'type'的属性值''无效",
+        "code": "06200301",
+        "line": 27,
+        "col": 5,
+        "offset": 1485,
+        "input": "    <script type=\"\" src=\"https://mipcache.bdstatic.com/static/v1/mip-showmore/mip-showmore.js\"></script>"
+    }
+]
diff --git a/cases/README.md b/cases/README.md
@@ -106,3 +106,5 @@
 201|template中：标签'style'的直接父标签应该是'head'，而不是'body'
 202|标签'a'中的属性'href'的属性值'sms:'无效
 203|标签'mip-video'中的既无属性'src'也无子节点 source
+212|标签'mip-vd-baidu'必须包含'title'（非空）, 'poster'（非空）, 'src'（http[s]或//开头）属性
+213|标签'script'在head中使用时应该家'async'属性
diff --git a/dist/mip-validator.js b/dist/mip-validator.js
@@ -2941,7 +2941,7 @@ if (typeof Object.create === 'function') {
 /*!
  * Determine if an object is a Buffer
  *
- * @author   Feross Aboukhadijeh <feross@feross.org> <http://feross.org>
+ * @author   Feross Aboukhadijeh <https://feross.org>
  * @license  MIT
  */
 
@@ -16755,7 +16755,7 @@ function hasOwnProperty(obj, prop) {
 },{"./support/isBuffer":56,"_process":36,"inherits":55}],58:[function(require,module,exports){
 module.exports={
     "name": "mip-validator",
-    "version": "1.5.9",
+    "version": "1.5.10",
     "description": "MIP validator",
     "main": "index.js",
     "dependencies": {
@@ -16811,6 +16811,9 @@ module.exports={
         "supertest": "^2.0.1",
         "uglifyjs": "^2.4.10"
     },
+    "engines": {
+        "node": ">=4.0.0"
+    },
     "scripts": {
         "test": "DEBUG='mip-validator:' mocha",
         "lint": "eslint src/ test/ bin/ index.js",
@@ -16940,10 +16943,31 @@ module.exports={
 
         }
     },
-    "script": [{
+    "script": [
+    {
         "mandatory": {
-             "type": "/^(text\/javascript)?/",
-             "src": "/^(https:)?\/\/(mipcache.bdstatic.com\/static\/mipmain)|(m.baidu.com\/static\/ala\/sf\/static\/)|((https:)?\/\/mipcache.bdstatic.com\/static\/v\\d\/)|((https:)?\/\/c.mipcdn.com\/static\/v\\d\/)|((https:)?\/\/c.mipcdn.com\/static\/mipmain)/"
+            "type": "/^(text\/javascript)?/",
+            "src": "/^(https:)?\/\/(mipcache.bdstatic.com\/static\/mipmain)|(m.baidu.com\/static\/ala\/sf\/static\/)|((https:)?\/\/mipcache.bdstatic.com\/static\/v\\d\/)|((https:)?\/\/c.mipcdn.com\/static\/v\\d\/)|((https:)?\/\/c.mipcdn.com\/static\/mipmain)/"
+        }
+    },
+    {
+        "match": {
+            "src": "/^(https:)?\/\/(mipcache.bdstatic.com\/static\/mipmain)|(m.baidu.com\/static\/ala\/sf\/static\/)|((https:)?\/\/mipcache.bdstatic.com\/static\/v\\d\/)|((https:)?\/\/c.mipcdn.com\/static\/v\\d\/)|((https:)?\/\/c.mipcdn.com\/static\/mipmain)/"
+        },
+        "attrs": {
+            "type": {
+                "value": "/^(text\/javascript)$/"
+            }
+        }
+    }, {
+        "match_ancestor": "head",
+        "match": {
+            "src": "/^(https:)?\/\/(mipcache.bdstatic.com\/static\/mipmain)|(m.baidu.com\/static\/ala\/sf\/static\/)|((https:)?\/\/mipcache.bdstatic.com\/static\/v\\d\/)|((https:)?\/\/c.mipcdn.com\/static\/v\\d\/)|((https:)?\/\/c.mipcdn.com\/static\/mipmain)/"
+        },
+        "attrs": {
+            "async": {
+                "mandatory": true
+            }
         }
     }, {
         "disallow": true,
@@ -16953,15 +16977,6 @@ module.exports={
         }
     }, {
         "disallowed_ancestor": "template"
-    },{
-         "attrs": {
-            "async": [{
-                "match": {
-                    "match_ancestor": "head"
-                },
-                "mandatory": true
-            }]
-        }
     }],
     "mip-input": {
         "mandatory_ancestor": "mip-form",

diff --git a/dist/mip-validator.min.js b/dist/mip-validator.min.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "mip-validator",
-    "version": "1.5.9",
+    "version": "1.5.10",
     "description": "MIP validator",
     "main": "index.js",
     "dependencies": {
@@ -56,6 +56,9 @@
         "supertest": "^2.0.1",
         "uglifyjs": "^2.4.10"
     },
+    "engines": {
+        "node": ">=4.0.0"
+    },
     "scripts": {
         "test": "DEBUG='mip-validator:' mocha",
         "lint": "eslint src/ test/ bin/ index.js",