Skip to content

Commit

Permalink
bump deps and fix config
Browse files Browse the repository at this point in the history
  • Loading branch information
yyx990803 committed Nov 8, 2016
1 parent 2170ae3 commit 7b69134
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 30 deletions.
21 changes: 11 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,28 +27,29 @@
"homepage": "https://github.com/vuejs/vue-devtools#readme",
"devDependencies": {
"buble": "^0.14.0",
"buble-loader": "github:yyx990803/buble-loader",
"chromedriver": "^2.21.2",
"cross-env": "^1.0.5",
"css-loader": "^0.23.0",
"eslint": "^2.0.0",
"eslint-config-vue": "^1.0.0",
"eslint-plugin-html": "^1.5.1",
"buble-loader": "^0.3.2",
"chromedriver": "^2.25.1",
"cross-env": "^3.1.3",
"css-loader": "^0.25.0",
"eslint": "^3.9.1",
"eslint-config-vue": "^2.0.0",
"eslint-plugin-vue": "^1.0.0",
"file-loader": "^0.9.0",
"nightwatch": "^0.9.4",
"nightwatch-helpers": "^1.2.0",
"selenium-server": "2.52.0",
"stylus": "^0.54.5",
"stylus-loader": "^2.1.1",
"url-loader": "^0.5.6",
"vue-loader": "^9.7.0",
"vue-loader": "^9.8.1",
"webpack": "^2.1.0-beta.25",
"webpack-dev-server": "^2.1.0-beta.0"
},
"dependencies": {
"circular-json-es6": "^2.0.0",
"lodash.debounce": "^4.0.6",
"vue": "^2.0.0-rc.3",
"vuex": "^2.0.0-rc.4"
"nightwatch-helpers": "^1.2.0",
"vue": "^2.0.0",
"vuex": "^2.0.0"
}
}
10 changes: 9 additions & 1 deletion shells/chrome/webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
var path = require('path')
var webpack = require('webpack')

var bubleOptions = {
objectAssign: 'Object.assign'
}

module.exports = {
entry: {
hook: './src/hook.js',
Expand All @@ -25,10 +29,14 @@ module.exports = {
test: /\.js$/,
loader: 'buble',
exclude: /node_modules|vue\/dist|vuex\/dist/,
options: bubleOptions
},
{
test: /\.vue$/,
loader: 'vue'
loader: 'vue',
options: {
buble: bubleOptions
}
},
{
test: /\.(png|woff2)$/,
Expand Down
11 changes: 10 additions & 1 deletion shells/dev/webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
var path = require('path')

var bubleOptions = {
objectAssign: 'Object.assign'
}

module.exports = {
entry: {
devtools: './src/devtools.js',
Expand All @@ -14,6 +18,7 @@ module.exports = {
},
resolve: {
alias: {
vue$: 'vue/dist/vue.js',
src: path.resolve(__dirname, '../../src')
}
},
Expand All @@ -23,10 +28,14 @@ module.exports = {
test: /\.js$/,
loader: 'buble',
exclude: /node_modules|vue\/dist|vuex\/dist/,
options: bubleOptions
},
{
test: /\.vue$/,
loader: 'vue'
loader: 'vue',
options: {
buble: bubleOptions
}
},
{
test: /\.(png|woff2)$/,
Expand Down
18 changes: 0 additions & 18 deletions test/assertions/elementCount.js

This file was deleted.

0 comments on commit 7b69134

Please sign in to comment.