From f27fa0122d6e5549c04d557ac2e7c7778f21439a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Wed, 16 Aug 2017 23:06:28 +0800 Subject: [PATCH] Clear up warnings when running test cases. --- build/bin/build-components.js | 19 +++++++++++++++++-- build/webpack.config.dev.js | 2 +- package.json | 6 +----- packages/cell-swipe/src/cell-swipe.vue | 5 ----- packages/dialog/src/dialog.js | 3 --- test/unit/components/checkbox.vue | 2 +- test/unit/get-webpack-conf.js | 4 ++-- test/unit/specs/dialog.spec.js | 8 ++++---- yarn.lock | 12 ------------ 9 files changed, 26 insertions(+), 35 deletions(-) diff --git a/build/bin/build-components.js b/build/bin/build-components.js index 0d48bbcf0..84a81f81c 100644 --- a/build/bin/build-components.js +++ b/build/bin/build-components.js @@ -1,3 +1,6 @@ +/** + * 编译 components 到 lib 目录 + */ const fs = require('fs-extra'); const path = require('path'); const compiler = require('vue-sfc-compiler'); @@ -5,9 +8,16 @@ const libDir = path.resolve(__dirname, '../../lib'); const srcDir = path.resolve(__dirname, '../../packages'); require('shelljs/global'); +// 清空 lib 目录 fs.emptyDirSync(libDir); + +// 复制 packages fs.copySync(srcDir, libDir); + +// 编译所有 .vue 文件到 .js compileVueFiles(libDir); + +// babel 编译 exec('cross-env BABEL_ENV=commonjs babel lib --out-dir lib'); function compileVueFiles(dir) { @@ -16,11 +26,16 @@ function compileVueFiles(dir) { files.forEach(file => { const absolutePath = path.resolve(dir, file); + // 移除 vant-css if (file.indexOf('vant-css') !== -1) { fs.removeSync(absolutePath); - } else if (isDir(absolutePath)) { + } + // 遍历文件夹 + else if (isDir(absolutePath)) { return compileVueFiles(absolutePath); - } else if (/\.vue$/.test(file)) { + } + // 编译 .vue 文件 + else if (/\.vue$/.test(file)) { const source = fs.readFileSync(absolutePath, 'utf-8'); fs.removeSync(absolutePath); diff --git a/build/webpack.config.dev.js b/build/webpack.config.dev.js index 6b8a482da..737712be8 100644 --- a/build/webpack.config.dev.js +++ b/build/webpack.config.dev.js @@ -67,7 +67,7 @@ module.exports = { }, { test: /\.js$/, - exclude: /node_modules|vue-router\/|vue-loader\/|vue-hot-reload-api\//, + exclude: /node_modules|vue-router\/|vue-loader\//, loader: 'babel-loader' }, { diff --git a/package.json b/package.json index e5752e03c..0989f64e9 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,6 @@ "babel-cli": "^6.14.0", "babel-core": "^6.25.0", "babel-loader": "^7.1.1", - "babel-plugin-external-helpers": "^6.22.0", "babel-plugin-module-resolver": "^2.7.1", "babel-plugin-syntax-jsx": "^6.18.0", "babel-plugin-transform-object-rest-spread": "^6.23.0", @@ -103,7 +102,6 @@ "uppercamelcase": "^3.0.0", "url-loader": "^0.5.9", "vue": "^2.4.2", - "vue-hot-reload-api": "^2.1.0", "vue-html-loader": "^1.2.4", "vue-loader": "^13.0.4", "vue-markdown-loader": "^2.0.0", @@ -111,11 +109,9 @@ "vue-sfc-compiler": "^0.0.1", "vue-style-loader": "^3.0.0", "vue-template-compiler": "^2.4.2", - "vue-template-es2015-compiler": "^1.5.3", "webpack": "^3.5.4", "webpack-dev-server": "^2.7.1", "webpack-merge": "^4.1.0", - "zan-doc": "0.1.12", - "zan-rollup-plugin-alias": "1.0.1" + "zan-doc": "0.1.12" } } diff --git a/packages/cell-swipe/src/cell-swipe.vue b/packages/cell-swipe/src/cell-swipe.vue index 21eb446f3..00acbfe11 100644 --- a/packages/cell-swipe/src/cell-swipe.vue +++ b/packages/cell-swipe/src/cell-swipe.vue @@ -51,12 +51,10 @@ this.wrap = this.$refs.cell.querySelector('.van-cell-wrapper'); this.leftElm = this.$refs.left; this.leftWrapElm = this.leftElm.parentNode; - this.leftDefaultTransform = this.translate3d(-this.leftWidth - 1); this.leftWrapElm.style.webkitTransform = this.leftDefaultTransform; this.rightElm = this.$refs.right; this.rightWrapElm = this.rightElm.parentNode; - this.rightDefaultTransform = this.translate3d(this.rightWidth); this.rightWrapElm.style.webkitTransform = this.rightDefaultTransform; }, methods: { @@ -100,14 +98,12 @@ }, 0); }, startDrag(evt) { - console.log('startDrag') evt = evt.changedTouches ? evt.changedTouches[0] : evt; this.dragging = true; this.start.x = evt.pageX; this.start.y = evt.pageY; }, onDrag(evt) { - console.log('onDrag') if (this.opened) { !this.swiping && this.swipeMove(0); this.opened = false; @@ -132,7 +128,6 @@ this.swipeMove(offsetLeft); }, endDrag() { - console.log('endDrag') if (!this.swiping) return; this.swipeLeaveTransition(this.offsetLeft > 0 ? -1 : 1); } diff --git a/packages/dialog/src/dialog.js b/packages/dialog/src/dialog.js index bb1fed2f4..d82f3e9b2 100644 --- a/packages/dialog/src/dialog.js +++ b/packages/dialog/src/dialog.js @@ -19,7 +19,6 @@ const defaultCallback = action => { }; const initInstance = () => { - console.log('init instance'); instance = new DialogConstructor({ el: document.createElement('div') }); @@ -37,7 +36,6 @@ const showNextDialog = () => { /* istanbul ignore else */ if (!instance.value && dialogQueue.length > 0) { - console.log('shift instance'); currentDialog = dialogQueue.shift(); const { options } = currentDialog; @@ -57,7 +55,6 @@ const showNextDialog = () => { var DialogBox = options => { return new Promise((resolve, reject) => { // eslint-disable-line - console.log('push instance'); dialogQueue.push({ options: { ...options }, callback: options.callback, diff --git a/test/unit/components/checkbox.vue b/test/unit/components/checkbox.vue index f74a62a12..f3d5d7484 100644 --- a/test/unit/components/checkbox.vue +++ b/test/unit/components/checkbox.vue @@ -1,6 +1,6 @@ diff --git a/test/unit/get-webpack-conf.js b/test/unit/get-webpack-conf.js index 0ef3fc5d4..09fad3cbe 100644 --- a/test/unit/get-webpack-conf.js +++ b/test/unit/get-webpack-conf.js @@ -45,12 +45,12 @@ const webpackConfig = { { enforce: 'pre', test: /\.js$/, - exclude: /node_modules|vue-router\/|vue-loader\/|vue-hot-reload-api\/|docs|test|src\/index|src\/utils|src\/mixins|packages\/swipe/, + exclude: /node_modules|vue-router\/|vue-loader\/|docs|test|src\/index|src\/utils|src\/mixins|packages\/swipe/, use: ['isparta-loader'] }, { test: /\.js$/, - exclude: /node_modules|vue-router\/|vue-loader\/|vue-hot-reload-api\//, + exclude: /node_modules|vue-router\/|vue-loader\//, use: ['babel-loader'] }, { diff --git a/test/unit/specs/dialog.spec.js b/test/unit/specs/dialog.spec.js index aa006b88f..be92b4e3c 100644 --- a/test/unit/specs/dialog.spec.js +++ b/test/unit/specs/dialog.spec.js @@ -3,7 +3,7 @@ import Vue from 'vue'; describe('Dialog', () => { afterEach(() => { - const el = document.querySelector('.van-dialog-wrapper'); + const el = document.querySelector('.van-dialog'); if (!el) return; if (el.parentNode) { el.parentNode.removeChild(el); @@ -20,7 +20,7 @@ describe('Dialog', () => { done(); }); - expect(document.querySelector('.van-dialog-wrapper')).to.exist; + expect(document.querySelector('.van-dialog')).to.exist; expect(document.querySelector('.van-dialog__cancel').style.display).to.equal('none'); setTimeout(() => { @@ -34,7 +34,7 @@ describe('Dialog', () => { message: 'message' }); - expect(document.querySelector('.van-dialog-wrapper')).to.exist; + expect(document.querySelector('.van-dialog')).to.exist; }); it('create a confirm dialog with callback', (done) => { @@ -47,7 +47,7 @@ describe('Dialog', () => { } }); - expect(document.querySelector('.van-dialog-wrapper')).to.exist; + expect(document.querySelector('.van-dialog')).to.exist; setTimeout(() => { document.querySelector('.van-dialog__cancel').click(); expect(dialogAction).to.equal('cancel'); diff --git a/yarn.lock b/yarn.lock index b5405d2db..2c5df0a93 100644 --- a/yarn.lock +++ b/yarn.lock @@ -547,12 +547,6 @@ babel-plugin-check-es2015-constants@^6.22.0: dependencies: babel-runtime "^6.22.0" -babel-plugin-external-helpers@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-external-helpers/-/babel-plugin-external-helpers-6.22.0.tgz#2285f48b02bd5dede85175caf8c62e86adccefa1" - dependencies: - babel-runtime "^6.22.0" - babel-plugin-module-resolver@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-2.7.1.tgz#18be3c42ddf59f7a456c9e0512cd91394f6e4be1" @@ -7593,9 +7587,3 @@ zan-doc@0.1.12: markdown-it "^8.3.1" markdown-it-container "^2.0.0" node-watch "^0.5.5" - -zan-rollup-plugin-alias@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/zan-rollup-plugin-alias/-/zan-rollup-plugin-alias-1.0.1.tgz#5004b659cdac960a83d75d4b3f8480b3982fbdd8" - dependencies: - slash "^1.0.0"