Skip to content

Commit 7131578

Browse files
committed
fix: drop webpack version detector
1 parent 57ebe41 commit 7131578

File tree

4 files changed

+10
-28
lines changed

4 files changed

+10
-28
lines changed

lib/loader.js

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ const SVGCompiler = require('svg-baker');
44

55
const { NAMESPACE } = require('./config');
66
const configure = require('./configurator');
7-
const { getWebpackVersion } = require('./utils');
87
const Exceptions = require('./exceptions');
98

109
let svgCompiler = new SVGCompiler();
@@ -31,13 +30,8 @@ module.exports = function loader(content) {
3130

3231
const configObj = { context: loaderContext };
3332

34-
if (getWebpackVersion.IS_4) {
35-
configObj.config = loaderContext.query;
36-
configObj.target = loaderContext.target;
37-
} else {
38-
configObj.config = matchedRules;
39-
configObj.target = loaderContext.options.target || loaderContext.target;
40-
}
33+
configObj.config = matchedRules;
34+
configObj.target = loaderContext.target;
4135

4236
/**
4337
* @type {SVGSpriteLoaderConfig}

lib/plugin.js

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,9 @@ const {
99
MappedList,
1010
replaceInModuleSource,
1111
replaceSpritePlaceholder,
12-
getWebpackVersion,
1312
getMatchedRule
1413
} = require('./utils');
1514

16-
const webpackVersion = parseInt(getWebpackVersion(), 10);
17-
1815
const defaultConfig = {
1916
plainSprite: false,
2017
spriteAttrs: {}
@@ -187,21 +184,15 @@ class SVGSpritePlugin {
187184
chunks.forEach((chunk) => {
188185
let modules;
189186

190-
switch (webpackVersion) {
191-
case 4:
192-
modules = Array.from(chunk.modulesIterable);
193-
break;
194-
case 3:
195-
modules = chunk.mapModules();
196-
break;
197-
default:
198-
({ modules } = chunk);
199-
break;
187+
if (chunk.modulesIterable) {
188+
modules = Array.from(chunk.modulesIterable);
189+
} else {
190+
modules = chunk.modules;
200191
}
201192

202193
modules
203-
// dirty hack to identify modules extracted by extract-text-webpack-plugin
204-
// TODO refactor
194+
// dirty hack to identify modules extracted by extract-text-webpack-plugin
195+
// TODO refactor
205196
.filter(module => '_originalModule' in module)
206197
.forEach(module => replaceInModuleSource(module, replacements));
207198
});

lib/utils/get-module-chunk.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
const webpackVersion = require('./get-webpack-version');
2-
31
/**
42
* Find nearest module chunk (not sure that is reliable method, but who cares).
53
* @see http://stackoverflow.com/questions/43202761/how-to-determine-all-module-chunks-in-webpack
@@ -10,9 +8,9 @@ const webpackVersion = require('./get-webpack-version');
108
function getModuleChunk(module, modules) {
119
let chunks;
1210

13-
if (webpackVersion.IS_4) {
11+
if (module.chunksIterable) {
1412
chunks = Array.from(module.chunksIterable);
15-
} else if (parseInt(webpackVersion(), 10) >= 3) {
13+
} else if (module.mapChunks) {
1614
chunks = module.mapChunks();
1715
} else {
1816
chunks = module.chunks;

lib/utils/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ module.exports.getAllModules = require('./get-all-modules');
55
// module.exports.getLoaderOptions = require('./get-loader-options');
66
module.exports.getModuleChunk = require('./get-module-chunk');
77
module.exports.getMatchedRule = require('./get-matched-rule');
8-
module.exports.getWebpackVersion = require('./get-webpack-version');
98
module.exports.isModuleShouldBeExtracted = require('./is-module-should-be-extracted');
109
module.exports.interpolate = require('./interpolate');
1110
module.exports.isWebpack1 = require('./is-webpack-1');

0 commit comments

Comments
 (0)