Skip to content

Commit e44ff39

Browse files
authored
Merge pull request #19 from Yproximite/feature/ISSUE-18
Upgrade dependencies
2 parents c0a8fe3 + b323251 commit e44ff39

File tree

4 files changed

+1277
-632
lines changed

4 files changed

+1277
-632
lines changed

package.json

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -22,46 +22,46 @@
2222
"test": "jest --coverage"
2323
},
2424
"dependencies": {
25-
"babel-plugin-transform-runtime": "^6.0.0",
26-
"babel-preset-es2015": "^6.0.0",
27-
"babel-preset-stage-2": "^6.0.0",
25+
"babel-plugin-transform-runtime": "^6.23.0",
26+
"babel-preset-es2015": "^6.24.1",
27+
"babel-preset-stage-2": "^6.24.1",
2828
"loader-utils": "^1.1.0",
2929
"vue": "^2.1.8"
3030
},
3131
"devDependencies": {
32-
"autoprefixer": "^6.4.0",
33-
"babel-core": "^6.1.21",
34-
"babel-jest": "^20.0.3",
35-
"babel-loader": "^6.1.0",
36-
"babel-preset-es2015": "^6.0.0",
37-
"babel-preset-stage-2": "^6.0.0",
38-
"coveralls": "^2.11.15",
39-
"cross-env": "^3.0.0",
40-
"css-loader": "^0.25.0",
41-
"eslint": "^4.2.0",
32+
"autoprefixer": "^7.1.6",
33+
"babel-core": "^6.26.0",
34+
"babel-jest": "^21.2.0",
35+
"babel-loader": "^7.1.2",
36+
"babel-preset-es2015": "^6.24.1",
37+
"babel-preset-stage-2": "^6.24.1",
38+
"coveralls": "^3.0.0",
39+
"cross-env": "^5.1.0",
40+
"css-loader": "^0.28.7",
41+
"eslint": "^4.9.0",
4242
"eslint-config-standard": "^10.2.1",
4343
"eslint-loader": "^1.9.0",
44-
"eslint-plugin-html": "^3.0.0",
45-
"eslint-plugin-import": "^2.7.0",
46-
"eslint-plugin-node": "^5.1.0",
47-
"eslint-plugin-promise": "^3.5.0",
44+
"eslint-plugin-html": "^3.2.2",
45+
"eslint-plugin-import": "^2.8.0",
46+
"eslint-plugin-node": "^5.2.1",
47+
"eslint-plugin-promise": "^3.6.0",
4848
"eslint-plugin-standard": "^3.0.1",
49-
"file-loader": "^0.9.0",
50-
"jest": "^20.0.4",
51-
"jest-vue-preprocessor": "^1.0.1",
52-
"jsdom": "^11.1.0",
53-
"less": "^2.7.2",
49+
"file-loader": "^1.1.5",
50+
"jest": "^21.2.1",
51+
"jest-vue-preprocessor": "^1.3.1",
52+
"jsdom": "^11.3.0",
53+
"less": "^2.7.3",
5454
"less-loader": "^4.0.5",
55-
"node-sass": "^3.4.1",
55+
"node-sass": "^4.5.3",
5656
"pre-commit": "^1.2.2",
57-
"pug": "^2.0.0-beta6",
58-
"sass-loader": "^3.1.1",
59-
"vue": "^2.4.0",
60-
"vue-loader": "^12.1.0",
61-
"vue-server-renderer": "^2.4.1",
62-
"vue-template-compiler": "^2.3.3",
63-
"webpack": "^2.7.0",
64-
"webpack-dev-server": "^2.4.5"
57+
"pug": "^2.0.0-rc.4",
58+
"sass-loader": "^6.0.6",
59+
"vue": "^2.5.2",
60+
"vue-loader": "^13.3.0",
61+
"vue-server-renderer": "^2.5.2",
62+
"vue-template-compiler": "^2.5.2",
63+
"webpack": "^3.8.1",
64+
"webpack-dev-server": "^2.9.3"
6565
},
6666
"pre-commit": [
6767
"lint"
@@ -77,6 +77,8 @@
7777
}
7878
},
7979
"browserify": {
80-
"transform": ["vueify"]
80+
"transform": [
81+
"vueify"
82+
]
8183
}
8284
}

src/BetterInputTag.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@
2626
</template>
2727

2828
<script>
29-
/*eslint-disable*/
29+
/* eslint-disable */
3030
const validators = {
3131
email: new RegExp(/^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/),
3232
url: new RegExp(/^(https?|ftp|rmtp|mms):\/\/(([A-Z0-9][A-Z0-9_-]*)(\.[A-Z0-9][A-Z0-9_-]*)+)(:(\d+))?\/?/i),
3333
text: new RegExp(/^[a-zA-Z]+$/),
3434
digits: new RegExp(/^[\d() \.\:\-\+#]+$/),
3535
isodate: new RegExp(/^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$/)
3636
}
37-
/*eslint-enable*/
37+
/* eslint-enable */
3838
3939
export default {
4040
name: 'InputTag',

test/BetterInputTag.spec.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ describe('BetterInputTag.vue', () => {
1212

1313
beforeEach((cb) => {
1414
BetterInputTagComponent = new ClonedComponent({
15-
data () { return { tags: [] } }
15+
propsData: { tags: [] }
1616
}).$mount()
1717
cb()
1818
})
@@ -63,8 +63,7 @@ describe('BetterInputTag.vue', () => {
6363

6464
describe('read-only="true"', () => {
6565
const BetterInputTagComponentReadOnly = new ClonedComponent({
66-
data () { return { tags: [] } },
67-
propsData: { readOnly: true }
66+
propsData: { tags: [], readOnly: true }
6867
}).$mount()
6968

7069
it('should have a read-only CSS class and shouldn\'t have a remove tag button', () => {
@@ -93,7 +92,7 @@ describe('BetterInputTag.vue', () => {
9392

9493
describe('tags="[1,2,3]"', () => {
9594
const BetterInputTagComponentWithTags = new ClonedComponent({
96-
data () { return { tags: ['Jerry', 'Kramer', 'Elaine'] } }
95+
propsData: { tags: ['Jerry', 'Kramer', 'Elaine'] }
9796
}).$mount()
9897

9998
it('should load the tags', () => {
@@ -115,7 +114,7 @@ describe('BetterInputTag.vue', () => {
115114
describe('placeholder="Add Tag"', () => {
116115
const placeholder = 'Add Tag'
117116
const BetterInputTagComponentWithPlaceholder = new ClonedComponent({
118-
data () { return { placeholder } }
117+
propsData: { placeholder }
119118
}).$mount()
120119

121120
it('should have a placeholder', () => {

0 commit comments

Comments
 (0)