Skip to content

Commit

Permalink
Merge pull request #75 from utatti/webpack-4
Browse files Browse the repository at this point in the history
Use Webpack 4 and upgrade dev dependencies
  • Loading branch information
云淇淋 authored Apr 18, 2018
2 parents c438331 + 264f060 commit b753920
Show file tree
Hide file tree
Showing 11 changed files with 6,459 additions and 2,863 deletions.
21 changes: 12 additions & 9 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
ecmaFeatures:
modules: true
parserOptions:
sourceType: module

env:
es6: true
browser: true

extends:
- 'eslint:recommended'
- 'plugin:vue/essential'

rules:
indent: [ 1, 2, SwitchCase: 1 ]
quotes: [ 1, single ]
linebreak-style: [ 1, unix ]
semi: [ 1, always ]
Expand All @@ -12,9 +19,5 @@ rules:
space-infix-ops: [ 1 ]
no-multi-spaces: [ 1 ]
no-fallthrough: [ 0 ]

env:
es6: true
browser: true

extends: 'eslint:recommended'
'vue/require-v-for-key': 'off'
'vue/script-indent': [ 1, 2, { baseIndent: 1 }]
4 changes: 2 additions & 2 deletions example/example.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<swipe-item class="slide2">Slide2</swipe-item>
<swipe-item class="slide3">Slide3</swipe-item>
</swipe>

<br>

<h1>Change swipe</h1>
Expand All @@ -18,7 +18,7 @@

<button @click="goto(2)">goto page 3</button>
<button @click="goto(0)">goto page 1</button>

<br>

<h1>Drag single swipe</h1>
Expand Down
4 changes: 2 additions & 2 deletions example/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<meta charset="UTF-8">
<meta name="MobileOptimized" content="320">
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no, minimal-ui, maximum-scale=1.0, minimum-scale=1.0">
<link rel="stylesheet" href="/dist/vue-swipe.css" charset="utf-8">
<title>vue-swipe examples</title>
</head>
<body>
<div id="app"></div>

<script src="../node_modules/vue/dist/vue.js"></script>
<script type="text/javascript" src="/example/dist/example.js"></script>
<script type="text/javascript" src="/dist/example.js"></script>
</body>
</html>
1 change: 1 addition & 0 deletions example/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Vue from 'vue';
import Example from './example.vue';

new Vue({
Expand Down
Loading

0 comments on commit b753920

Please sign in to comment.