Skip to content

Commit 49795c6

Browse files
committed
use Object.assign
1 parent d8d2f0e commit 49795c6

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

lib/loader.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
var loaderUtils = require('loader-utils')
2-
var assign = require('object-assign')
3-
var parse = require('./parser')
41
var path = require('path')
5-
var normalize = require('./normalize')
2+
var parse = require('./parser')
63
var genId = require('./gen-id')
4+
var normalize = require('./normalize')
5+
var loaderUtils = require('loader-utils')
76

87
// internal lib loaders
98
var selectorPath = normalize.lib('selector')
9+
var styleRewriterPath = normalize.lib('style-rewriter')
1010
var templateLoaderPath = normalize.lib('template-loader')
1111
var templateCompilerPath = normalize.lib('template-compiler')
12-
var styleRewriterPath = normalize.lib('style-rewriter')
1312
var componentNormalizerPath = normalize.lib('component-normalizer')
1413

1514
// dep loaders
@@ -61,7 +60,7 @@ module.exports = function (content) {
6160

6261
// check if there are custom loaders specified via
6362
// webpack config, otherwise use defaults
64-
var loaders = assign({}, defaultLoaders, options.loaders)
63+
var loaders = Object.assign({}, defaultLoaders, options.loaders)
6564

6665
function getRequire (type, part, index, scoped) {
6766
return 'require(' +

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
"js-beautify": "^1.6.3",
3535
"loader-utils": "^0.2.10",
3636
"lru-cache": "^4.0.1",
37-
"object-assign": "^4.0.0",
3837
"postcss": "^5.0.10",
3938
"postcss-selector-parser": "^2.0.0",
4039
"source-map": "^0.5.6",

0 commit comments

Comments
 (0)