Skip to content

Commit 63b4523

Browse files
ooflorentooflorent
committed
Pass 'context' as constructor argument
1 parent 24b046e commit 63b4523

File tree

9 files changed

+16
-19
lines changed

9 files changed

+16
-19
lines changed

‎lib/ContextModule.js‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,8 @@ class ContextModule extends Module {
1717
// resolveDependencies: (fs: FS, options: ContextOptions, (err: Error?, dependencies: Dependency[]) => void) => void
1818
// options: ContextOptions
1919
constructor(resolveDependencies, options) {
20-
super("javascript/dynamic");
21-
22-
// Info from Factory
23-
this.resolveDependencies = resolveDependencies;
24-
let resource, resourceQuery;
20+
let resource;
21+
let resourceQuery;
2522
const queryIdx = options.resource.indexOf("?");
2623
if(queryIdx >= 0) {
2724
resource = options.resource.substr(0, queryIdx);
@@ -30,11 +27,15 @@ class ContextModule extends Module {
3027
resource = options.resource;
3128
resourceQuery = "";
3229
}
30+
31+
super("javascript/dynamic", resource);
32+
33+
// Info from Factory
34+
this.resolveDependencies = resolveDependencies;
3335
this.options = Object.assign({}, options, {
3436
resource: resource,
3537
resourceQuery: resourceQuery
3638
});
37-
this.context = this.options.resource;
3839
if(options.resolveOptions !== undefined)
3940
this.resolveOptions = options.resolveOptions;
4041

‎lib/DelegatedModule.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const DelegatedExportsDependency = require("./dependencies/DelegatedExportsDepen
1313

1414
class DelegatedModule extends Module {
1515
constructor(sourceRequest, data, type, userRequest, originalRequest) {
16-
super("javascript/dynamic");
16+
super("javascript/dynamic", null);
1717

1818
// Info from Factory
1919
this.sourceRequest = sourceRequest;

‎lib/DllModule.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@ const RawSource = require("webpack-sources").RawSource;
99

1010
class DllModule extends Module {
1111
constructor(context, dependencies, name, type) {
12-
super("javascript/dynamic");
12+
super("javascript/dynamic", context);
1313

1414
// Info from Factory
15-
this.context = context;
1615
this.dependencies = dependencies;
1716
this.name = name;
1817
this.type = type;

‎lib/ExternalModule.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const Template = require("./Template");
1111

1212
class ExternalModule extends Module {
1313
constructor(request, type, userRequest) {
14-
super("javascript/dynamic");
14+
super("javascript/dynamic", null);
1515

1616
// Info from Factory
1717
this.request = request;

‎lib/Module.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@ const sortByDebugId = (a, b) => {
2525

2626
class Module extends DependenciesBlock {
2727

28-
constructor(type) {
28+
constructor(type, context = null) {
2929
super();
3030
this.type = type;
31+
this.context = context;
3132

3233
// Unique Id
3334
this.debugId = debugId++;
@@ -37,8 +38,6 @@ class Module extends DependenciesBlock {
3738
this.renderedHash = undefined;
3839

3940
// Info from Factory
40-
// TODO refactor: pass as constructor argument
41-
this.context = null;
4241
this.resolveOptions = EMPTY_RESOLVE_OPTIONS;
4342
this.factoryMeta = {};
4443

‎lib/MultiModule.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@ const RawSource = require("webpack-sources").RawSource;
1111
class MultiModule extends Module {
1212

1313
constructor(context, dependencies, name) {
14-
super("javascript/dynamic");
14+
super("javascript/dynamic", context);
1515

1616
// Info from Factory
17-
this.context = context;
1817
this.dependencies = dependencies;
1918
this.name = name;
2019
}

‎lib/NormalModule.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class NormalModule extends Module {
7575
generator,
7676
resolveOptions
7777
}) {
78-
super(type);
78+
super(type, getContext(resource));
7979

8080
// Info from Factory
8181
this.request = request;
@@ -85,7 +85,6 @@ class NormalModule extends Module {
8585
this.parser = parser;
8686
this.generator = generator;
8787
this.resource = resource;
88-
this.context = getContext(resource);
8988
this.loaders = loaders;
9089
if(resolveOptions !== undefined)
9190
this.resolveOptions = resolveOptions;

‎lib/RawModule.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const RawSource = require("webpack-sources").RawSource;
1111
module.exports = class RawModule extends Module {
1212

1313
constructor(source, identifier, readableIdentifier) {
14-
super("javascript/dynamic");
14+
super("javascript/dynamic", null);
1515
this.sourceStr = source;
1616
this.identifierStr = identifier || this.sourceStr;
1717
this.readableIdentifierStr = readableIdentifier || this.identifierStr;

‎lib/optimize/ConcatenatedModule.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ const getPathInAst = (ast, node) => {
194194

195195
class ConcatenatedModule extends Module {
196196
constructor(rootModule, modules) {
197-
super("javascript/esm");
197+
super("javascript/esm", null);
198198
super.setChunks(rootModule._chunks);
199199

200200
// Info from Factory

0 commit comments

Comments
 (0)