feat: update rollup config and demo

7 years ago · 410007d2d5
parent 82f77ad9e7
commit 410007d2d5
16 changed files with 277 additions and 116 deletions
--- a/.babelrc
+++ b/.babelrc
@ -3,8 +3,8 @@
    ["env",
    {
      "targets": {
-        "browsers": "last 2 versions, > 1%, ie >= 6, Android >= 4, iOS >= 6, and_uc > 9",
-        "node": "0.10"
+        "browsers": "last 2 versions, > 1%, ie >= 11",
+        "node": "8.0"
      },
      "modules": false,
      "loose": false
--- a/config/rollup.config.aio.js
+++ b/config/rollup.config.aio.js
@ -1,10 +1,10 @@
 // rollup.config.js

-var babel = require('rollup-plugin-babel');
-var nodeResolve = require('rollup-plugin-node-resolve');
-var commonjs = require('rollup-plugin-commonjs');
-
-var common = require('./rollup.js');
+import babel from 'rollup-plugin-babel';
+import nodeResolve from 'rollup-plugin-node-resolve';
+import commonjs from 'rollup-plugin-commonjs';
+import { uglify } from 'rollup-plugin-uglify';
+import common from './rollup';

 export default {
    input: 'src/index.js',
@ -28,5 +28,20 @@ export default {
            runtimeHelpers: true,
            exclude: 'node_modules/**',
        }),
+        uglify({
+            compress: {
+                drop_debugger: true,
+                drop_console: true,
+            },
+            output: {
+                comments: (node, comment) => {
+                    if (comment.type === 'comment2') {
+                        // multiline comment
+                        return /@preserve|@license|@cc_on/i.test(comment.value);
+                    }
+                    return false;
+                },
+            },
+        }),
    ],
 };
--- a/config/rollup.config.js
+++ b/config/rollup.config.js
@ -1,7 +1,7 @@
 // rollup.config.js

-var babel = require('rollup-plugin-babel');
-var common = require('./rollup.js');
+import babel from 'rollup-plugin-babel';
+import common from './rollup';

 export default {
    input: 'src/index.js',
@ -15,7 +15,7 @@ export default {
    plugins: [
        babel({
            runtimeHelpers: true,
-            exclude: 'node_modules/**'
-        })
-    ]
+            exclude: 'node_modules/**',
+        }),
+    ],
 };
--- a/config/rollup.js
+++ b/config/rollup.js
@ -1,17 +1,18 @@
-var pkg = require('../package.json');
+const pkg = require('../package.json');

-// 兼容 qrcode-decoder 和 @yugasun/qrcode-decoder 
-var name = pkg.name.split('/').pop();
-var version = pkg.version;
+// 兼容 qrcode-decoder 和 @yugasun/qrcode-decoder
+const name = pkg.name.split('/').pop();
+const { version } = pkg;

-var banner = 
-`/*!
+const banner = `/* @preserve
 * qrcode-decoder ${version} (https://github.com/yugasun/qrcode-decoder)
 * API https://github.com/yugasun/qrcode-decoder/blob/master/doc/api.md
- * Copyright 2017-${(new Date).getFullYear()} yugasun. All Rights Reserved
+ * Copyright 2017-${new Date().getFullYear()} yugasun. All Rights Reserved
 * Licensed under MIT (https://github.com/yugasun/qrcode-decoder/blob/master/LICENSE)
 */
 `;

-exports.name = name;
-exports.banner = banner;
+export default {
+    name,
+    banner,
+};
--- a/demo/assets/duck.jpg
+++ b/demo/assets/duck.jpg
--- a/demo/assets/qrcode-video.mp4
+++ b/demo/assets/qrcode-video.mp4
--- a/demo/assets/qrcode.png
+++ b/demo/assets/qrcode.png
--- a/demo/camera.html
+++ b/demo/camera.html
@ -9,7 +9,7 @@
        <hr />
        <video id="video" autoplay></video>

-        <script src="../dist/index.aio.js"></script>
+        <script src="./index.aio.js"></script>
        <script type="text/javascript">
            function main() {
                var qr = new QrcodeDecoder();
--- a/demo/image.html
+++ b/demo/image.html
@ -7,8 +7,8 @@
    <body>
        <button id="decode">Decode!</button><br>
        <span id="result"></span><br>
-        <!-- <img src="../test/assets/qrcode.png" alt="qr code" /> -->
-        <script src="../dist/index.aio.js"></script>
+        <!-- <img src="./assets/qrcode.png" alt="qr code" /> -->
+        <script src="./index.aio.js"></script>
        <script type="module">
            function main() {
                var qr = new QrcodeDecoder();
@ -19,7 +19,7 @@

                btn.onclick = async () => {
                    // you can also decode from image path
-                    const code = await qr.decodeFromImage('../test/assets/qrcode.png');
+                    const code = await qr.decodeFromImage('./assets/qrcode.png');
                    // const code = qr.decodeFromImage(img);
                    console.log(code);
                    result.innerText = code.data;
--- a/demo/index.aio.js
+++ b/demo/index.aio.js
--- a/demo/index.html
+++ b/demo/index.html
@ -9,9 +9,9 @@
    <h1>QrcodeDecoder</h1>
    <h2>Examples</h2>
    <ul>
-      <li><a href="camera.html">Camera</a></li>
-      <li><a href="image.html">Image</a></li>
-      <li><a href="video.html">Video</a></li>
+        <li><a href="image.html">Image</a></li>
+        <li><a href="video.html">Video</a></li>
+        <li><a href="camera.html">Camera</a></li>
    </ul>

  </body>
--- a/demo/video.html
+++ b/demo/video.html
@ -8,9 +8,9 @@
        <button id="start">Start</button> <button id="stop">Stop</button><br />
        <span id="result">Click start to scan qrcode.</span><br />

-        <video src="../test/assets/qrcode-video.mp4"></video>
+        <video src="./assets/qrcode-video.mp4"></video>

-        <script src="../dist/index.aio.js"></script>
+        <script src="./index.aio.js"></script>
        <script type="text/javascript">
            function main() {
                var video = document.querySelector('video');
--- a/package.json
+++ b/package.json
@ -12,10 +12,12 @@
    "build:self": "rollup -c config/rollup.config.js",
    "build:esm": "rollup -c config/rollup.config.esm.js",
    "build:aio": "rollup -c config/rollup.config.aio.js",
-    "build": "npm run clean && npm run build:self && npm run build:esm &&  npm run build:aio",
+    "build": "npm run clean && npm run build:self && npm run build:esm &&  npm run build:aio && npm run copy-file",
+    "copy-file": "cp dist/index.aio.js demo/",
    "test": "npm run lint && npm run build",
    "zuul-test": "zuul --local 8080 --ui mocha-bdd -- test/test.js",
-    "release": "git commit -am $npm_package_version && git tag $npm_package_version && git push && git push --tags"
+    "release": "git commit -am $npm_package_version && git tag $npm_package_version && git push && git push --tags",
+    "deploy": "gh-pages -d demo --remote origin"
  },
  "author": "yugasun",
  "license": "MIT",
@ -37,14 +39,16 @@
    "eslint-config-airbnb-base": "^13.1.0",
    "eslint-plugin-import": "^2.14.0",
    "expect.js": "0.3.1",
+    "gh-pages": "^2.0.1",
    "jsdom": "^13.0.0",
    "mocha": "3.5.3",
    "mocha-jsdom": "^2.0.0",
    "rimraf": "2.6.2",
-    "rollup": "0.57.1",
+    "rollup": "^0.67.3",
    "rollup-plugin-babel": "3.0.3",
    "rollup-plugin-commonjs": "8.3.0",
    "rollup-plugin-node-resolve": "3.0.3",
+    "rollup-plugin-uglify": "^6.0.0",
    "zuul": "^3.12.0"
  },
  "dependencies": {
--- a/src/index.js
+++ b/src/index.js
@ -259,10 +259,10 @@ class QrcodeDecoder {
        } else if (typeof img === 'string') {
            imgDom = document.createElement('img');
            imgDom.src = img;
-            // const proms = () => new Promise((resolve) => {
-            //     imgDom.onload = () => resolve(true);
-            // });
-            // await proms();
+            const proms = () => new Promise((resolve) => {
+                imgDom.onload = () => resolve(true);
+            });
+            await proms();
        }

        let code = false;
--- a/test/test.js
+++ b/test/test.js
@ -18,7 +18,7 @@ describe('QrcodeDecoder', function () {
    describe('decodeFromImage', function () {
        it('decode image from img element', function (done) {
            const img = document.createElement('img');
-            img.src = 'test/assets/qrcode.png';
+            img.src = 'demo/assets/qrcode.png';
            img.onload = async function () {
                const result = await qr.decodeFromImage(img);
                expect(result.data).to.equal('192.168.1.13:3000');
@ -28,7 +28,7 @@ describe('QrcodeDecoder', function () {
        });

        it('decode image from img url', async function () {
-            const result = await qr.decodeFromImage('test/assets/qrcode.png');
+            const result = await qr.decodeFromImage('demo/assets/qrcode.png');
            expect(result.data).to.equal('192.168.1.13:3000');
        });

@ -47,7 +47,7 @@ describe('QrcodeDecoder', function () {
        it('decode from a video with qrcode', async function () {
            const video = document.createElement('video');
            video.setAttribute('autoplay', true);
-            video.setAttribute('src', 'test/assets/qrcode-video.mp4');
+            video.setAttribute('src', 'demo/assets/qrcode-video.mp4');

            const result = await qr.decodeFromVideo(video);
            expect(result.data).to.equal('192.168.1.13:3000');
--- a/yarn.lock
+++ b/yarn.lock
@ -2,6 +2,22 @@
 # yarn lockfile v1


+"@babel/code-frame@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
+  integrity sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==
+  dependencies:
+    "@babel/highlight" "^7.0.0"
+
+"@babel/highlight@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
+  integrity sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==
+  dependencies:
+    chalk "^2.0.0"
+    esutils "^2.0.2"
+    js-tokens "^4.0.0"
+
 "@jsmini/is@0.4.0":
  version "0.4.0"
  resolved "http://registry.npm.taobao.org/@jsmini/is/download/@jsmini/is-0.4.0.tgz#d345203ace0e0ff0ff64afd30aa825de9146bc08"
@ -12,19 +28,15 @@
  version "0.4.0"
  resolved "http://registry.npm.taobao.org/@jsmini/type/download/@jsmini/type-0.4.0.tgz#777e3d7b7aa25607b29d2e6d114af21c3a41f225"

-"@types/acorn@^4.0.3":
-  version "4.0.3"
-  resolved "http://registry.npm.taobao.org/@types/acorn/download/@types/acorn-4.0.3.tgz#d1f3e738dde52536f9aad3d3380d14e448820afd"
-  dependencies:
-    "@types/estree" "*"
-
-"@types/estree@*":
+"@types/estree@0.0.39":
  version "0.0.39"
-  resolved "http://registry.npm.taobao.org/@types/estree/download/@types/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
+  integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==

-"@types/estree@0.0.38":
-  version "0.0.38"
-  resolved "http://registry.npm.taobao.org/@types/estree/download/@types/estree-0.0.38.tgz#c1be40aa933723c608820a99a373a16d215a1ca2"
+"@types/node@*":
+  version "10.12.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.9.tgz#a07bfa74331471e1dc22a47eb72026843f7b95c8"
+  integrity sha512-eajkMXG812/w3w4a1OcBlaTwsFPO5F7fJ/amy+tieQxEMWBlbV1JGSjkFM+zkHNf81Cad+dfIRA+IBkvmvdAeA==

 JSON2@0.1.0:
  version "0.1.0"
@ -63,12 +75,6 @@ accepts@~1.3.5:
    mime-types "~2.1.18"
    negotiator "0.6.1"

-acorn-dynamic-import@^3.0.0:
-  version "3.0.0"
-  resolved "http://registry.npm.taobao.org/acorn-dynamic-import/download/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278"
-  dependencies:
-    acorn "^5.0.0"
-
 acorn-dynamic-import@^4.0.0:
  version "4.0.0"
  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948"
@ -103,7 +109,7 @@ acorn@^3.0.4:
  version "3.3.0"
  resolved "http://registry.npm.taobao.org/acorn/download/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"

-acorn@^5.0.0, acorn@^5.2.1, acorn@^5.5.0, acorn@^5.5.3:
+acorn@^5.2.1, acorn@^5.5.0, acorn@^5.5.3:
  version "5.7.3"
  resolved "http://registry.npm.taobao.org/acorn/download/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"

@ -341,7 +347,7 @@ async@1.x:
  version "1.5.2"
  resolved "http://registry.npmjs.org/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"

-async@^2.5.0:
+async@^2.5.0, async@^2.6.1:
  version "2.6.1"
  resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
  dependencies:
@ -1523,6 +1529,11 @@ commander@2.9.0:
  dependencies:
    graceful-readlink ">= 1.0.0"

+commander@^2.18.0:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
+  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
+
 commander@~2.17.1:
  version "2.17.1"
  resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
@ -1775,12 +1786,6 @@ date-now@^0.1.4:
  version "0.1.4"
  resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"

-date-time@^2.1.0:
-  version "2.1.0"
-  resolved "http://registry.npm.taobao.org/date-time/download/date-time-2.1.0.tgz#0286d1b4c769633b3ca13e1e62558d2dbdc2eba2"
-  dependencies:
-    time-zone "^1.0.0"
-
 debug@*:
  version "4.1.0"
  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.0.tgz#373687bffa678b38b1cd91f861b63850035ddc87"
@ -2011,6 +2016,11 @@ elliptic@^6.0.0:
    minimalistic-assert "^1.0.0"
    minimalistic-crypto-utils "^1.0.0"

+email-addresses@^3.0.1:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/email-addresses/-/email-addresses-3.0.3.tgz#fc3c6952f68da24239914e982c8a7783bc2ed96d"
+  integrity sha512-kUlSC06PVvvjlMRpNIl3kR1NRXLEe86VQ7N0bQeaCZb2g+InShCeHQp/JvyYNTugMnRN2NvJhHlc3q12MWbbpg==
+
 emitter-component@1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/emitter-component/-/emitter-component-1.0.0.tgz#f04dd18fc3dc3e9a74cbc0f310b088666e4c016f"
@ -2472,6 +2482,28 @@ filename-regex@^2.0.0:
  version "2.0.1"
  resolved "http://registry.npm.taobao.org/filename-regex/download/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"

+filename-reserved-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-1.0.0.tgz#e61cf805f0de1c984567d0386dc5df50ee5af7e4"
+  integrity sha1-5hz4BfDeHJhFZ9A4bcXfUO5a9+Q=
+
+filenamify-url@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/filenamify-url/-/filenamify-url-1.0.0.tgz#b32bd81319ef5863b73078bed50f46a4f7975f50"
+  integrity sha1-syvYExnvWGO3MHi+1Q9GpPeXX1A=
+  dependencies:
+    filenamify "^1.0.0"
+    humanize-url "^1.0.0"
+
+filenamify@^1.0.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/filenamify/-/filenamify-1.2.1.tgz#a9f2ffd11c503bed300015029272378f1f1365a5"
+  integrity sha1-qfL/0RxQO+0wABUCknI3jx8TZaU=
+  dependencies:
+    filename-reserved-regex "^1.0.0"
+    strip-outer "^1.0.0"
+    trim-repeated "^1.0.0"
+
 fileset@0.1.x:
  version "0.1.8"
  resolved "https://registry.yarnpkg.com/fileset/-/fileset-0.1.8.tgz#506b91a9396eaa7e32fb42a84077c7a0c736b741"
@ -2630,6 +2662,15 @@ fresh@0.5.2:
  version "0.5.2"
  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"

+fs-extra@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
+  integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
 fs-extra@~0.8.1:
  version "0.8.1"
  resolved "http://registry.npmjs.org/fs-extra/-/fs-extra-0.8.1.tgz#0e5779ffbfedf511bc755595c7f03c06d4b43e8d"
@ -2699,6 +2740,20 @@ getpass@^0.1.1:
  dependencies:
    assert-plus "^1.0.0"

+gh-pages@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/gh-pages/-/gh-pages-2.0.1.tgz#aefe47a43b8d9d2aa3130576b33fe95641e29a2f"
+  integrity sha512-uFlk3bukljeiWKQ2XvPfjcSi/ou7IfoDf2p+Fj672saLAr8bnOdFVqI/JSgrSgInKpCg5BksxEwGUl++dbg8Dg==
+  dependencies:
+    async "^2.6.1"
+    commander "^2.18.0"
+    email-addresses "^3.0.1"
+    filenamify-url "^1.0.0"
+    fs-extra "^7.0.0"
+    globby "^6.1.0"
+    graceful-fs "^4.1.11"
+    rimraf "^2.6.2"
+
 glob-base@^0.3.0:
  version "0.3.0"
  resolved "http://registry.npm.taobao.org/glob-base/download/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
@ -2788,6 +2843,17 @@ globby@^5.0.0:
    pify "^2.0.0"
    pinkie-promise "^2.0.0"

+globby@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
+  integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=
+  dependencies:
+    array-union "^1.0.1"
+    glob "^7.0.3"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
 globs-to-files@1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/globs-to-files/-/globs-to-files-1.0.0.tgz#54490f6d1f4b9fd2de9d99445146ffb37550380d"
@ -2803,7 +2869,7 @@ graceful-fs@^3.0.2:
  dependencies:
    natives "^1.1.0"

-graceful-fs@^4.1.11:
+graceful-fs@^4.1.11, graceful-fs@^4.1.6:
  version "4.1.15"
  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"

@ -3021,6 +3087,14 @@ humanize-duration@2.4.0:
  version "2.4.0"
  resolved "http://registry.npmjs.org/humanize-duration/-/humanize-duration-2.4.0.tgz#04da89e6784af1c881b06ebc9f494dda07b08a17"

+humanize-url@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/humanize-url/-/humanize-url-1.0.1.tgz#f4ab99e0d288174ca4e1e50407c55fbae464efff"
+  integrity sha1-9KuZ4NKIF0yk4eUEB8VfuuRk7/8=
+  dependencies:
+    normalize-url "^1.0.0"
+    strip-url-auth "^1.0.0"
+
 iconv-lite@0.4.23:
  version "0.4.23"
  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
@ -3286,6 +3360,11 @@ is-path-inside@^1.0.0:
  dependencies:
    path-is-inside "^1.0.1"

+is-plain-obj@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
+
 is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
  version "2.0.4"
  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
@ -3304,12 +3383,6 @@ is-promise@^2.1.0:
  version "2.1.0"
  resolved "http://registry.npm.taobao.org/is-promise/download/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"

-is-reference@^1.1.0:
-  version "1.1.0"
-  resolved "http://registry.npm.taobao.org/is-reference/download/is-reference-1.1.0.tgz#50e6ef3f64c361e2c53c0416cdc9420037f2685b"
-  dependencies:
-    "@types/estree" "0.0.38"
-
 is-regex@^1.0.4:
  version "1.0.4"
  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
@ -3417,7 +3490,14 @@ istanbul@^0.2.8:
    which "1.0.x"
    wordwrap "0.0.x"

-"js-tokens@^3.0.0 || ^4.0.0":
+jest-worker@^23.2.0:
+  version "23.2.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-23.2.0.tgz#faf706a8da36fae60eb26957257fa7b5d8ea02b9"
+  integrity sha1-+vcGqNo2+uYOsmlXJX+ntdjqArk=
+  dependencies:
+    merge-stream "^1.0.1"
+
+"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
  version "4.0.0"
  resolved "http://registry.npm.taobao.org/js-tokens/download/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"

@ -3540,6 +3620,13 @@ json5@^0.5.1:
  version "0.5.1"
  resolved "http://registry.npm.taobao.org/json5/download/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"

+jsonfile@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
 jsonfile@~1.1.0:
  version "1.1.1"
  resolved "http://registry.npmjs.org/jsonfile/-/jsonfile-1.1.1.tgz#da4fd6ad77f1a255203ea63c7bc32dc31ef64433"
@ -3641,10 +3728,6 @@ localtunnel@1.5.0:
    optimist "0.3.4"
    request "2.11.4"

-locate-character@^2.0.5:
-  version "2.0.5"
-  resolved "http://registry.npm.taobao.org/locate-character/download/locate-character-2.0.5.tgz#f2d2614d49820ecb3c92d80d193b8db755f74c0f"
-
 locate-path@^2.0.0:
  version "2.0.0"
  resolved "http://registry.npm.taobao.org/locate-path/download/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
@ -3825,6 +3908,13 @@ merge-descriptors@1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"

+merge-stream@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
+  integrity sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=
+  dependencies:
+    readable-stream "^2.0.1"
+
 methods@0.0.1:
  version "0.0.1"
  resolved "https://registry.yarnpkg.com/methods/-/methods-0.0.1.tgz#277c90f8bef39709645a8371c51c3b6c648e068c"
@ -4177,6 +4267,16 @@ normalize-path@^2.0.0, normalize-path@^2.0.1:
  dependencies:
    remove-trailing-separator "^1.0.1"

+normalize-url@^1.0.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
+  integrity sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=
+  dependencies:
+    object-assign "^4.0.1"
+    prepend-http "^1.0.0"
+    query-string "^4.1.0"
+    sort-keys "^1.0.0"
+
 npm-bundled@^1.0.1:
  version "1.0.5"
  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979"
@ -4430,10 +4530,6 @@ parse-json@^2.2.0:
  dependencies:
    error-ex "^1.2.0"

-parse-ms@^1.0.0:
-  version "1.0.1"
-  resolved "http://registry.npm.taobao.org/parse-ms/download/parse-ms-1.0.1.tgz#56346d4749d78f23430ca0c713850aef91aa361d"
-
 parse5@4.0.0:
  version "4.0.0"
  resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
@ -4548,16 +4644,15 @@ prelude-ls@~1.1.2:
  version "1.1.2"
  resolved "http://registry.npm.taobao.org/prelude-ls/download/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"

+prepend-http@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
+  integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
+
 preserve@^0.2.0:
  version "0.2.0"
  resolved "http://registry.npm.taobao.org/preserve/download/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"

-pretty-ms@^3.1.0:
-  version "3.2.0"
-  resolved "http://registry.npm.taobao.org/pretty-ms/download/pretty-ms-3.2.0.tgz#87a8feaf27fc18414d75441467d411d6e6098a25"
-  dependencies:
-    parse-ms "^1.0.0"
-
 private@^0.1.6, private@^0.1.7, private@^0.1.8:
  version "0.1.8"
  resolved "http://registry.npm.taobao.org/private/download/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
@ -4640,6 +4735,14 @@ qs@~1.2.0:
  version "1.2.2"
  resolved "https://registry.yarnpkg.com/qs/-/qs-1.2.2.tgz#19b57ff24dc2a99ce1f8bdf6afcda59f8ef61f88"

+query-string@^4.1.0:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
+  integrity sha1-u7aTucqRXCMlFbIosaArYJBD2+s=
+  dependencies:
+    object-assign "^4.1.0"
+    strict-uri-encode "^1.0.0"
+
 querystring-es3@~0.2.0:
  version "0.2.1"
  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
@ -4738,7 +4841,7 @@ readable-stream@^1.0.27-1, readable-stream@~1.1.11, readable-stream@~1.1.8, read
    isarray "0.0.1"
    string_decoder "~0.10.x"

-readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.3.6, readable-stream@~2.3.6:
+readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.3.6, readable-stream@~2.3.6:
  version "2.3.6"
  resolved "http://registry.npm.taobao.org/readable-stream/download/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
  dependencies:
@ -4925,10 +5028,6 @@ require-main-filename@^1.0.1:
  version "1.0.1"
  resolved "http://registry.npm.taobao.org/require-main-filename/download/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"

-require-relative@^0.8.7:
-  version "0.8.7"
-  resolved "http://registry.npm.taobao.org/require-relative/download/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de"
-
 require-uncached@^1.0.3:
  version "1.0.3"
  resolved "http://registry.npm.taobao.org/require-uncached/download/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
@ -4973,7 +5072,7 @@ ret@~0.1.10:
  version "0.1.15"
  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"

-rimraf@2.6.2, rimraf@^2.2.8, rimraf@^2.6.1:
+rimraf@2.6.2, rimraf@^2.2.8, rimraf@^2.6.1, rimraf@^2.6.2:
  version "2.6.2"
  resolved "http://registry.npm.taobao.org/rimraf/download/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
  dependencies:
@ -5014,6 +5113,16 @@ rollup-plugin-node-resolve@3.0.3:
    is-module "^1.0.0"
    resolve "^1.1.6"

+rollup-plugin-uglify@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-uglify/-/rollup-plugin-uglify-6.0.0.tgz#15aa8919e5cdc63b7cfc9319c781788b40084ce4"
+  integrity sha512-XtzZd159QuOaXNvcxyBcbUCSoBsv5YYWK+7ZwUyujSmISst8avRfjWlp7cGu8T2O52OJnpEBvl+D4WLV1k1iQQ==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    jest-worker "^23.2.0"
+    serialize-javascript "^1.5.0"
+    uglify-js "^3.4.9"
+
 rollup-pluginutils@^1.5.0:
  version "1.5.2"
  resolved "http://registry.npm.taobao.org/rollup-pluginutils/download/rollup-pluginutils-1.5.2.tgz#1e156e778f94b7255bfa1b3d0178be8f5c552408"
@ -5028,21 +5137,13 @@ rollup-pluginutils@^2.0.1:
    estree-walker "^0.5.2"
    micromatch "^2.3.11"

-rollup@0.57.1:
-  version "0.57.1"
-  resolved "http://registry.npm.taobao.org/rollup/download/rollup-0.57.1.tgz#0bb28be6151d253f67cf4a00fea48fb823c74027"
+rollup@^0.67.3:
+  version "0.67.3"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.67.3.tgz#55475b1b62c43220c3b4bd7edc5846233932f50b"
+  integrity sha512-TyNQCz97rKuVVbsKUTXfwIjV7UljWyTVd7cTMuE+aqlQ7WJslkYF5QaYGjMLR2BlQtUOO5CAxSVnpQ55iYp5jg==
  dependencies:
-    "@types/acorn" "^4.0.3"
-    acorn "^5.5.3"
-    acorn-dynamic-import "^3.0.0"
-    date-time "^2.1.0"
-    is-reference "^1.1.0"
-    locate-character "^2.0.5"
-    pretty-ms "^3.1.0"
-    require-relative "^0.8.7"
-    rollup-pluginutils "^2.0.1"
-    signal-exit "^3.0.2"
-    sourcemap-codec "^1.4.1"
+    "@types/estree" "0.0.39"
+    "@types/node" "*"

 run-async@^2.2.0:
  version "2.3.0"
@ -5123,6 +5224,11 @@ sequence@2.x:
  version "2.2.1"
  resolved "https://registry.yarnpkg.com/sequence/-/sequence-2.2.1.tgz#7f5617895d44351c0a047e764467690490a16b03"

+serialize-javascript@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe"
+  integrity sha512-Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ==
+
 serve-static@1.13.2:
  version "1.13.2"
  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
@ -5259,6 +5365,13 @@ sntp@0.2.x:
  dependencies:
    hoek "0.9.x"

+sort-keys@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
+  integrity sha1-RBttTTRnmPG05J6JIK37oOVD+a0=
+  dependencies:
+    is-plain-obj "^1.0.0"
+
 source-map-cjs@~0.1.31:
  version "0.1.32"
  resolved "https://registry.yarnpkg.com/source-map-cjs/-/source-map-cjs-0.1.32.tgz#b113f00065b484f4d3a1123ef084046a56228ce7"
@ -5307,10 +5420,6 @@ source-map@~0.2.0:
  dependencies:
    amdefine ">=0.0.4"

-sourcemap-codec@^1.4.1:
-  version "1.4.3"
-  resolved "http://registry.npm.taobao.org/sourcemap-codec/download/sourcemap-codec-1.4.3.tgz#0ba615b73ec35112f63c2f2d9e7c3f87282b0e33"
-
 spdx-correct@^3.0.0:
  version "3.0.2"
  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.2.tgz#19bb409e91b47b1ad54159243f7312a858db3c2e"
@ -5457,6 +5566,11 @@ stream-splicer@^2.0.0:
    inherits "^2.0.1"
    readable-stream "^2.0.2"

+strict-uri-encode@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
+  integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
+
 string-width@^1.0.1:
  version "1.0.2"
  resolved "http://registry.npm.taobao.org/string-width/download/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
@ -5510,6 +5624,18 @@ strip-json-comments@~2.0.1:
  version "2.0.1"
  resolved "http://registry.npm.taobao.org/strip-json-comments/download/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"

+strip-outer@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/strip-outer/-/strip-outer-1.0.1.tgz#b2fd2abf6604b9d1e6013057195df836b8a9d631"
+  integrity sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==
+  dependencies:
+    escape-string-regexp "^1.0.2"
+
+strip-url-auth@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/strip-url-auth/-/strip-url-auth-1.0.1.tgz#22b0fa3a41385b33be3f331551bbb837fa0cd7ae"
+  integrity sha1-IrD6OkE4WzO+PzMVUbu4N/oM164=
+
 subarg@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2"
@ -5646,10 +5772,6 @@ through@2.3.4:
  version "2.3.8"
  resolved "http://registry.npm.taobao.org/through/download/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"

-time-zone@^1.0.0:
-  version "1.0.0"
-  resolved "http://registry.npm.taobao.org/time-zone/download/time-zone-1.0.0.tgz#99c5bf55958966af6d06d83bdf3800dc82faec5d"
-
 timers-browserify@^1.0.1:
  version "1.4.2"
  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-1.4.2.tgz#c9c58b575be8407375cb5e2462dacee74359f41d"
@ -5705,6 +5827,13 @@ tr46@^1.0.1:
  dependencies:
    punycode "^2.1.0"

+trim-repeated@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/trim-repeated/-/trim-repeated-1.0.0.tgz#e3646a2ea4e891312bf7eace6cfb05380bc01c21"
+  integrity sha1-42RqLqTokTEr9+rObPsFOAvAHCE=
+  dependencies:
+    escape-string-regexp "^1.0.2"
+
 trim-right@^1.0.1:
  version "1.0.1"
  resolved "http://registry.npm.taobao.org/trim-right/download/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
@ -5744,7 +5873,7 @@ typedarray@^0.0.6, typedarray@~0.0.5:
  version "0.0.6"
  resolved "http://registry.npm.taobao.org/typedarray/download/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"

-uglify-js@^3.1.4:
+uglify-js@^3.1.4, uglify-js@^3.4.9:
  version "3.4.9"
  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
  dependencies:
@ -5789,6 +5918,11 @@ union-value@^1.0.0:
    is-extendable "^0.1.1"
    set-value "^0.4.3"

+universalify@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+
 unpipe@1.0.0, unpipe@~1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"