From 410007d2d567d8545e11cf8d89fe7ade531147eb Mon Sep 17 00:00:00 2001 From: yugasun Date: Wed, 21 Nov 2018 22:46:12 +0800 Subject: [PATCH] feat: update rollup config and demo --- .babelrc | 4 +- config/rollup.config.aio.js | 25 ++- config/rollup.config.js | 10 +- config/rollup.js | 19 +- {test => demo}/assets/duck.jpg | Bin {test => demo}/assets/qrcode-video.mp4 | Bin {test => demo}/assets/qrcode.png | Bin demo/camera.html | 2 +- demo/image.html | 6 +- demo/index.aio.js | 7 + demo/index.html | 6 +- demo/video.html | 4 +- package.json | 10 +- src/index.js | 8 +- test/test.js | 6 +- yarn.lock | 286 ++++++++++++++++++------- 16 files changed, 277 insertions(+), 116 deletions(-) rename {test => demo}/assets/duck.jpg (100%) rename {test => demo}/assets/qrcode-video.mp4 (100%) rename {test => demo}/assets/qrcode.png (100%) create mode 100644 demo/index.aio.js diff --git a/.babelrc b/.babelrc index 557bb55..42f6ccf 100644 --- 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 diff --git a/config/rollup.config.aio.js b/config/rollup.config.aio.js index 14b9e63..e4cce05 100644 --- 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; + }, + }, + }), ], }; diff --git a/config/rollup.config.js b/config/rollup.config.js index ea3f1a9..47b818a 100644 --- 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/**', + }), + ], }; diff --git a/config/rollup.js b/config/rollup.js index 78a7373..116299b 100644 --- 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, +}; diff --git a/test/assets/duck.jpg b/demo/assets/duck.jpg similarity index 100% rename from test/assets/duck.jpg rename to demo/assets/duck.jpg diff --git a/test/assets/qrcode-video.mp4 b/demo/assets/qrcode-video.mp4 similarity index 100% rename from test/assets/qrcode-video.mp4 rename to demo/assets/qrcode-video.mp4 diff --git a/test/assets/qrcode.png b/demo/assets/qrcode.png similarity index 100% rename from test/assets/qrcode.png rename to demo/assets/qrcode.png diff --git a/demo/camera.html b/demo/camera.html index 97f38cb..c9011f5 100644 --- a/demo/camera.html +++ b/demo/camera.html @@ -9,7 +9,7 @@
- + + + +