Skip to content

Commit 4b8e7f4

Browse files
committed
update dep
1 parent 97c2ab2 commit 4b8e7f4

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

circle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
machine:
22
node:
3-
version: 4.0.0
3+
version: 4

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"autoprefixer": "^6.0.3",
2727
"hash-sum": "^1.0.2",
2828
"loader-utils": "^0.2.10",
29-
"object-assign": "^3.0.0",
29+
"object-assign": "^4.0.0",
3030
"parse5": "^1.5.0",
3131
"postcss": "^5.0.10",
3232
"postcss-selector-parser": "^1.1.2"

test/test.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ var path = require('path')
33
var webpack = require('webpack')
44
var jsdom = require('jsdom')
55
var expect = require('chai').expect
6-
var assign = require('object-assign')
76
var rimraf = require('rimraf')
87
var hash = require('hash-sum')
98
var SourceMapConsumer = require('source-map').SourceMapConsumer
@@ -41,7 +40,7 @@ describe('vue-loader', function () {
4140
}
4241

4342
function test (options, assert) {
44-
var config = assign({}, globalConfig, options)
43+
var config = Object.assign({}, globalConfig, options)
4544
webpack(config, function (err) {
4645
if (err) throw err
4746
getFile('test.build.js', function (data) {
@@ -132,7 +131,7 @@ describe('vue-loader', function () {
132131
})
133132

134133
it('source map', function (done) {
135-
var config = assign({}, globalConfig, {
134+
var config = Object.assign({}, globalConfig, {
136135
entry: './test/fixtures/basic.js',
137136
devtool: 'source-map'
138137
})

0 commit comments

Comments
 (0)