Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

split lodash requires #460

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const fs = require('fs')
const path = require('path')
const _ = require('lodash')
const merge = require('lodash.merge')

const getAssetKind = require('./lib/getAssetKind')
const isHMRUpdate = require('./lib/isHMRUpdate')
Expand All @@ -11,7 +11,7 @@ const createQueuedWriter = require('./lib/output/createQueuedWriter')
const createOutputWriter = require('./lib/output/createOutputWriter')

function AssetsWebpackPlugin (options) {
this.options = _.merge({}, {
this.options = merge({}, {
filename: 'webpack-assets.json',
prettyPrint: false,
update: false,
Expand Down
4 changes: 2 additions & 2 deletions lib/output/createOutputWriter.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const path = require('path')
const fs = require('fs')
const _ = require('lodash')
const merge = require('lodash.merge')

const error = require('../utils/error')

Expand Down Expand Up @@ -60,7 +60,7 @@ module.exports = function (options) {
oldAssets = {}
}

const assets = orderAssets(_.merge({}, oldAssets, newAssets), options)
const assets = orderAssets(merge({}, oldAssets, newAssets), options)
const output = options.processOutput(assets)
if (output !== data) {
localFs.writeFile(outputPath, output, function (err) {
Expand Down
4 changes: 2 additions & 2 deletions lib/utils/error.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const _ = require('lodash')
const assign = require('lodash.assign')

module.exports = function pluginError (message, previousError) {
const err = new Error('[AssetsWebpackPlugin] ' + message)

return previousError ? _.assign(err, previousError) : err
return previousError ? assign(err, previousError) : err
}
7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "assets-webpack-plugin",
"version": "7.1.1",
"version": "7.1.2",
"description": "Emits a json file with assets paths",
"main": "dist/index.js",
"engines": {
Expand Down Expand Up @@ -51,7 +51,10 @@
"dependencies": {
"camelcase": "^6.0.0",
"escape-string-regexp": "4.0.0",
"lodash": "^4.17.21"
"lodash.assign": "^4.2.0",
"lodash.isregexp": "^4.0.1",
"lodash.isstring": "^4.0.1",
"lodash.merge": "^4.6.2"
},
"peerDependencies": {
"webpack": ">=5.0.0"
Expand Down
8 changes: 5 additions & 3 deletions test/utils/expectOutput.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/* eslint-disable no-unused-expressions */

const _ = require('lodash')
const isRegExp = require('lodash.isregexp')
const isString = require('lodash.isstring')

const expect = require('chai').expect
const webpack = require('webpack')
const fs = require('fs')
Expand Down Expand Up @@ -31,9 +33,9 @@ module.exports = function (outputDir) {

const content = fs.readFileSync(path.join(outputDir, outputFile)).toString()

if (_.isRegExp(expectedResult)) {
if (isRegExp(expectedResult)) {
expect(content).to.match(expectedResult)
} else if (_.isString(expectedResult)) {
} else if (isString(expectedResult)) {
expect(content).to.contain(expectedResult)
} else {
// JSON object provided
Expand Down