Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Drake Costa authored and Drake Costa committed Oct 14, 2018
2 parents 3286651 + b98b7bb commit 6134da3
Show file tree
Hide file tree
Showing 6 changed files with 2,093 additions and 1,538 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Expand Up @@ -29,3 +29,4 @@ after_script:
branches:
only:
- master
- /^greenkeeper/.*$/
64 changes: 32 additions & 32 deletions example/package.json
Expand Up @@ -4,25 +4,25 @@
"private": true,
"dependencies": {
"@saeris/vue-spinners": "^1.0.5",
"emotion": "9.2.6",
"v-click-outside": "1.0.5",
"emotion": "9.2.12",
"v-click-outside": "2.0.1",
"vue": "^2.5.2",
"vue-class-component": "6.2.0",
"vue-color": "2.6.0",
"vue-emotion": "0.4.2"
},
"devDependencies": {
"autoprefixer": "^7.1.2",
"autoprefixer": "^9.1.5",
"babel-core": "^6.22.1",
"babel-eslint": "^8.2.1",
"babel-eslint": "^10.0.1",
"babel-helper-vue-jsx-merge-props": "^2.0.3",
"babel-jest": "^21.0.2",
"babel-loader": "^7.1.1",
"babel-jest": "^23.6.0",
"babel-loader": "^8.0.4",
"babel-plugin-jsx-vue-functional": "2.1.0",
"babel-plugin-syntax-flow": "6.18.0",
"babel-plugin-syntax-jsx": "^6.18.0",
"babel-plugin-transform-class-properties": "6.24.1",
"babel-plugin-transform-decorators-legacy": "1.3.4",
"babel-plugin-transform-decorators-legacy": "1.3.5",
"babel-plugin-transform-es2015-modules-commonjs": "^6.26.0",
"babel-plugin-transform-flow-strip-types": "6.22.0",
"babel-plugin-transform-runtime": "^6.22.0",
Expand All @@ -32,40 +32,40 @@
"babel-preset-stage-2": "^6.22.0",
"chalk": "^2.0.1",
"copy-webpack-plugin": "^4.0.1",
"css-loader": "^0.28.0",
"eslint": "^4.15.0",
"eslint-config-airbnb-base": "^11.3.0",
"eslint-friendly-formatter": "^3.0.0",
"eslint-import-resolver-webpack": "^0.8.3",
"eslint-loader": "^1.7.1",
"css-loader": "^1.0.0",
"eslint": "^5.6.1",
"eslint-config-airbnb-base": "^13.1.0",
"eslint-friendly-formatter": "^4.0.1",
"eslint-import-resolver-webpack": "^0.10.1",
"eslint-loader": "^2.1.1",
"eslint-plugin-import": "^2.7.0",
"eslint-plugin-vue": "^4.0.0",
"extract-text-webpack-plugin": "^3.0.0",
"file-loader": "^1.1.4",
"flow-bin": "0.78.0",
"file-loader": "^2.0.0",
"flow-bin": "0.82.0",
"friendly-errors-webpack-plugin": "^1.6.1",
"html-webpack-plugin": "^2.30.1",
"jest": "^22.0.4",
"jest-serializer-vue": "^0.3.0",
"html-webpack-plugin": "^3.2.0",
"jest": "^23.6.0",
"jest-serializer-vue": "^2.0.2",
"node-notifier": "^5.1.2",
"optimize-css-assets-webpack-plugin": "^3.2.0",
"ora": "^1.2.0",
"optimize-css-assets-webpack-plugin": "^5.0.1",
"ora": "^3.0.0",
"portfinder": "^1.0.13",
"postcss-import": "^11.0.0",
"postcss-loader": "^2.0.8",
"postcss-url": "^7.2.1",
"postcss-import": "^12.0.0",
"postcss-loader": "^3.0.0",
"postcss-url": "^8.0.0",
"rimraf": "^2.6.0",
"semver": "^5.3.0",
"shelljs": "^0.7.6",
"uglifyjs-webpack-plugin": "^1.1.1",
"url-loader": "^0.5.8",
"vue-jest": "^1.0.2",
"vue-loader": "^13.3.0",
"vue-style-loader": "^3.0.1",
"shelljs": "^0.8.2",
"uglifyjs-webpack-plugin": "^2.0.1",
"url-loader": "^1.1.1",
"vue-jest": "^2.6.0",
"vue-loader": "^15.4.2",
"vue-style-loader": "^4.1.2",
"vue-template-compiler": "^2.5.2",
"webpack": "^3.6.0",
"webpack-bundle-analyzer": "^2.9.0",
"webpack-dev-server": "^2.9.1",
"webpack": "^4.20.2",
"webpack-bundle-analyzer": "^3.0.2",
"webpack-dev-server": "^3.1.9",
"webpack-merge": "^4.1.0"
},
"browserslist": [
Expand Down

0 comments on commit 6134da3

Please sign in to comment.