Skip to content

Commit

Permalink
Lint
Browse files Browse the repository at this point in the history
  • Loading branch information
Dafrok committed Apr 27, 2017
1 parent 48d0537 commit 8f3e233
Show file tree
Hide file tree
Showing 39 changed files with 160 additions and 154 deletions.
22 changes: 22 additions & 0 deletions .eslintrc.js
@@ -0,0 +1,22 @@
module.exports = {
root: true,
parser: 'babel-eslint',
parserOptions: {
sourceType: 'module'
},
// https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
extends: 'standard',
// required to lint *.vue files
plugins: [
'html'
],
// add your custom rules here
'rules': {
// allow paren-less arrow functions
'arrow-parens': 0,
// allow async-await
'generator-star-spacing': 0,
// allow debugger during development
'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
}
}
1 change: 1 addition & 0 deletions .travis.yml
Expand Up @@ -4,6 +4,7 @@ node_js:
branches:
only: master
script:
- npm run test
- npm run build:docs
after_script:
- cp ./docs/favicon.png ./dist/
Expand Down
11 changes: 5 additions & 6 deletions build/webpack.docs.config.js
@@ -1,5 +1,4 @@
const path = require('path')
const webpack = require('webpack')
const HtmlWebpackPlugin = require('html-webpack-plugin')

module.exports = {
Expand All @@ -12,12 +11,12 @@ module.exports = {
rules: [
{
test: /\.vue$/,
use: ['vue-loader'],
use: ['vue-loader', 'eslint-loader'],
exclude: /_cache/
},
{
test: /\.js$/,
use: ['babel-loader'],
use: ['babel-loader', 'eslint-loader'],
exclude: [/node_modules/, /md/]
},
{
Expand Down Expand Up @@ -45,13 +44,13 @@ module.exports = {
},
resolve: {
alias: {
'@': __dirname + '/../src',
docs: __dirname + '/../docs/src',
'@': path.resolve(__dirname, '../src'),
docs: path.resolve(__dirname, '../docs/src')
}
},
plugins: [
new HtmlWebpackPlugin({
template: './docs/template/index.html'
template: path.resolve(__dirname, '../docs/template/index.html')
})
]
}
5 changes: 2 additions & 3 deletions build/webpack.prod.config.js
@@ -1,5 +1,4 @@
const path = require('path')
const webpack = require('webpack')

module.exports = {
entry: './src/index.js',
Expand All @@ -24,7 +23,7 @@ module.exports = {
},
resolve: {
alias: {
'@': __dirname + '/../src'
'@': path.resolve(__dirname, '../src')
}
},
}
}
2 changes: 1 addition & 1 deletion docs/components/App.vue
Expand Up @@ -99,4 +99,4 @@ h2 {
color: #3f51b5;
border-right: 2px solid #3f51b5;
}
</style>
</style>
2 changes: 1 addition & 1 deletion docs/components/CateView.vue
@@ -1,3 +1,3 @@
<template lang="pug">
router-view
</template>
</template>
2 changes: 1 addition & 1 deletion docs/components/DocPreview.vue
Expand Up @@ -31,4 +31,4 @@
.mdl-textfield {
width: 100%;
}
</style>
</style>
2 changes: 1 addition & 1 deletion docs/components/Drawer.vue
@@ -1,4 +1,4 @@
<template lang="pug">
nav.mdl-navigation
slot
</template>
</template>
4 changes: 2 additions & 2 deletions docs/components/RootFrame.vue
Expand Up @@ -43,7 +43,7 @@ export default {
},
methods: {
close () {
document.querySelector('.mdl-layout__obfuscator').classList.remove('is-visible');
document.querySelector('.mdl-layout__obfuscator').classList.remove('is-visible')
this.$refs.drawer.classList.remove('is-visible')
}
},
Expand All @@ -55,4 +55,4 @@ export default {
})
}
}
</script>
</script>
10 changes: 5 additions & 5 deletions docs/main.js
Expand Up @@ -14,25 +14,25 @@ import 'material-design-lite/material.min.js'
import 'material-design-icons/iconfont/material-icons.css'
import './fonts/iconfont.css'

Vue.use(VueRouter);
Vue.use(VueRouter)
Vue.use(BaiduMap, {
ak: 'oW2UEhdth2tRbEE4FUpF9E5YVDCIPYih'
})

Vue.component('doc-preview', DocPreview)

const router = new VueRouter({
routes,
linkActiveClass: 'is-active',
routes,
linkActiveClass: 'is-active'
})

router.afterEach(route => {
let blocks = document.querySelectorAll('pre code')
Array.prototype.forEach.call(blocks, Hljs.highlightBlock)
})

new Vue({
export default new Vue({
el: '#app',
router,
render: h => h(App)
})
})
8 changes: 4 additions & 4 deletions docs/routes.js
Expand Up @@ -38,7 +38,7 @@ export default [
{
// 首页
path: '/',
name: 'VUE BAIDU MAP',
name: 'VUE BAIDU MAP',
component: DocIndex,
meta: 'hidden'
},
Expand Down Expand Up @@ -79,7 +79,7 @@ export default [
path: 'bm-view',
component: DocBmView,
name: '地图视图'
},
}
]
},
{
Expand Down Expand Up @@ -214,7 +214,7 @@ export default [
path: 'item',
name: '菜单项',
component: DocContextMenuItem
},
}
]
}
]
]
12 changes: 11 additions & 1 deletion package.json
Expand Up @@ -10,7 +10,8 @@
"build:docs": "webpack -p --config ./build/webpack.docs.config.js",
"build": "webpack -p --config ./build/webpack.prod.config.js",
"dev": "webpack-dev-server --content-base docs --config ./build/webpack.docs.config.js --hot --inline",
"deploy": "npm run build && npm run build:docs"
"deploy": "npm run build && npm run build:docs",
"test": "eslint --ext .js,.vue src docs build"
},
"repository": {
"type": "git",
Expand All @@ -32,12 +33,21 @@
"homepage": "https://github.com/Dafrok/vue-baidu-map#readme",
"devDependencies": {
"babel-core": "^6.21.0",
"babel-eslint": "^7.2.3",
"babel-loader": "^6.2.10",
"babel-plugin-add-module-exports": "^0.2.1",
"babel-plugin-transform-es2015-modules-umd": "^6.24.0",
"babel-preset-es2015": "^6.18.0",
"bulma": "^0.3.0",
"css-loader": "^0.26.1",
"eslint": "^3.19.0",
"eslint-config-standard": "^10.2.1",
"eslint-loader": "^1.7.1",
"eslint-plugin-html": "^2.0.1",
"eslint-plugin-import": "^2.2.0",
"eslint-plugin-node": "^4.2.2",
"eslint-plugin-promise": "^3.5.0",
"eslint-plugin-standard": "^3.0.1",
"file-loader": "^0.10.0",
"font-awesome": "^4.7.0",
"github-markdown-css": "^2.4.1",
Expand Down
1 change: 0 additions & 1 deletion src/base/bindEvent.js
Expand Up @@ -6,4 +6,3 @@ export default function (instance) {
})
})
}

2 changes: 1 addition & 1 deletion src/base/events.js
Expand Up @@ -108,4 +108,4 @@ export default {
'click',
'dblclick'
]
}
}
12 changes: 6 additions & 6 deletions src/base/factory.js
@@ -1,24 +1,24 @@
export function createPoint(BMap, options = {}) {
export function createPoint (BMap, options = {}) {
const {lng, lat} = options
return new BMap.Point(parseFloat(lng), parseFloat(lat))
}

export function createPixel(BMap, options = {}) {
export function createPixel (BMap, options = {}) {
const {x, y} = options
return new BMap.Pixel(parseFloat(x), parseFloat(y))
}

export function createBounds(BMap, options = {}) {
export function createBounds (BMap, options = {}) {
const {sw, ne} = options
return new BMap.Bounds(createPoint(BMap, sw), createPoint(BMap, ne))
}

export function createSize(BMap, options = {}) {
export function createSize (BMap, options = {}) {
const {width, height} = options
return new BMap.Size(parseFloat(width), parseFloat(height))
}

export function createIcon(BMap, options = {}) {
export function createIcon (BMap, options = {}) {
const {url, size, opts = {}} = options
return new BMap.Icon(url, createSize(BMap, size), {
anchor: opts.anchor && createSize(BMap, opts.anchor),
Expand All @@ -35,4 +35,4 @@ export function createLabel (BMap, options = {}) {
position: opts.position && createPoint(BMap, opts.position),
enableMassClear: opts.enableMassClear
})
}
}
6 changes: 3 additions & 3 deletions src/base/mixins/common.js
Expand Up @@ -35,13 +35,13 @@ class Mixin {
this.$nextTick(() => {
const {map, originInstance} = this
try {
map[types[prop.type].unload](this.originInstance)
map[types[prop.type].unload](originInstance)
} catch (e) {}
})
}
}
this.mounted = function () {
const {BMap, map} = this.$parent
const {map} = this.$parent
const {ready} = this
map ? ready() : this.$parent.$on('ready', ready)
}
Expand All @@ -51,4 +51,4 @@ class Mixin {
}
}

export default type => new Mixin({type})
export default type => new Mixin({type})
4 changes: 2 additions & 2 deletions src/context-menu/Item.vue
Expand Up @@ -8,7 +8,7 @@ export default {
props: {
callback: {
type: Function,
default: new Function
default: function () {}
},
text: {
type: String
Expand Down Expand Up @@ -58,4 +58,4 @@ export default {
this.reload()
}
}
</script>
</script>
4 changes: 2 additions & 2 deletions src/context-menu/Menu.vue
Expand Up @@ -33,7 +33,7 @@ export default {
target: parent
})
}, {
width: this.width,
width,
id: item.id,
iconUrl: item.iconUrl
})
Expand All @@ -44,4 +44,4 @@ export default {
}
}
}
</script>
</script>
8 changes: 3 additions & 5 deletions src/controls/CityList.vue
Expand Up @@ -3,13 +3,11 @@ import commonMixin from '@/base/mixins/common.js'
export default {
name: 'bm-city-list',
render () {
return
},
render () {},
mixins: [commonMixin('control')],
props: {
anchor: {
type: String,
type: String
},
offset: {
type: Object
Expand Down Expand Up @@ -40,4 +38,4 @@ export default {
}
}
}
</script>
</script>
8 changes: 3 additions & 5 deletions src/controls/Copyright.vue
Expand Up @@ -3,9 +3,7 @@ import commonMixin from '@/base/mixins/common.js'
export default {
name: 'bm-copyright',
render () {
return
},
render () {},
mixins: [commonMixin('control')],
props: ['anchor', 'offset', 'copyright'],
watch: {
Expand Down Expand Up @@ -34,7 +32,7 @@ export default {
const {removeCopyright, getCopyrightCollection} = this.originInstance
const copyrightList = getCopyrightCollection()
copyrightList && copyrightList.forEach(item => {
this.originInstance.removeCopyright(item.id)
removeCopyright(item.id)
})
this.copyright && this.copyright.forEach(item => {
const bounds = item.bounds
Expand All @@ -50,4 +48,4 @@ export default {
}
}
}
</script>
</script>
8 changes: 3 additions & 5 deletions src/controls/Geolocation.vue
Expand Up @@ -4,13 +4,11 @@ import bindEvents from '@/base/bindEvent.js'
export default {
name: 'bm-geolocation',
render () {
return
},
render () {},
mixins: [commonMixin('control')],
props: {
anchor: {
type: String,
type: String
},
offset: {
type: Object
Expand Down Expand Up @@ -56,4 +54,4 @@ export default {
}
}
}
</script>
</script>

0 comments on commit 8f3e233

Please sign in to comment.