Skip to content

Commit acff6ec

Browse files
sokrasokra
committed
move BasicEvaluatedExpression and JavascriptParserHelpers to javascript directory
1 parent a3c6584 commit acff6ec

19 files changed

+41
-37
lines changed

‎lib/APIPlugin.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55

66
"use strict";
77

8-
const {
9-
toConstantDependency,
10-
evaluateToString
11-
} = require("./JavascriptParserHelpers");
128
const RuntimeGlobals = require("./RuntimeGlobals");
139
const WebpackError = require("./WebpackError");
1410
const ConstDependency = require("./dependencies/ConstDependency");
11+
const {
12+
toConstantDependency,
13+
evaluateToString
14+
} = require("./javascript/JavascriptParserHelpers");
1515
const ChunkNameRuntimeModule = require("./runtime/ChunkNameRuntimeModule");
1616
const GetFullHashRuntimeModule = require("./runtime/GetFullHashRuntimeModule");
1717

‎lib/CommonJsStuffPlugin.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55

66
"use strict";
77

8-
const {
9-
evaluateToIdentifier,
10-
expressionIsUnsupported,
11-
toConstantDependency
12-
} = require("./JavascriptParserHelpers");
138
const RuntimeGlobals = require("./RuntimeGlobals");
149
const RuntimeModule = require("./RuntimeModule");
1510
const Template = require("./Template");
1611
const ModuleDecoratorDependency = require("./dependencies/ModuleDecoratorDependency");
1712
const RuntimeRequirementsDependency = require("./dependencies/RuntimeRequirementsDependency");
13+
const {
14+
evaluateToIdentifier,
15+
expressionIsUnsupported,
16+
toConstantDependency
17+
} = require("./javascript/JavascriptParserHelpers");
1818

1919
class CommonJsStuffPlugin {
2020
apply(compiler) {

‎lib/ConstPlugin.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
"use strict";
77

8-
const { evaluateToString } = require("./JavascriptParserHelpers");
98
const CachedConstDependency = require("./dependencies/CachedConstDependency");
109
const ConstDependency = require("./dependencies/ConstDependency");
10+
const { evaluateToString } = require("./javascript/JavascriptParserHelpers");
1111

1212
/** @typedef {import("./Compiler")} Compiler */
1313

‎lib/DefinePlugin.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
"use strict";
77

8-
const BasicEvaluatedExpression = require("./BasicEvaluatedExpression");
8+
const RuntimeGlobals = require("./RuntimeGlobals");
9+
const ConstDependency = require("./dependencies/ConstDependency");
10+
const BasicEvaluatedExpression = require("./javascript/BasicEvaluatedExpression");
911
const {
1012
approve,
1113
evaluateToString,
1214
toConstantDependency
13-
} = require("./JavascriptParserHelpers");
14-
const RuntimeGlobals = require("./RuntimeGlobals");
15-
const ConstDependency = require("./dependencies/ConstDependency");
15+
} = require("./javascript/JavascriptParserHelpers");
1616

1717
/** @typedef {import("./Compiler")} Compiler */
1818
/** @typedef {import("./javascript/JavascriptParser")} JavascriptParser */

‎lib/HotModuleReplacementPlugin.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@
88
const { SyncBailHook } = require("tapable");
99
const { RawSource } = require("webpack-sources");
1010
const HotUpdateChunk = require("./HotUpdateChunk");
11-
const {
12-
evaluateToIdentifier,
13-
evaluateToString,
14-
toConstantDependency
15-
} = require("./JavascriptParserHelpers");
1611
const NormalModule = require("./NormalModule");
1712
const RuntimeGlobals = require("./RuntimeGlobals");
1813
const ModuleHotAcceptDependency = require("./dependencies/ModuleHotAcceptDependency");
1914
const ModuleHotDeclineDependency = require("./dependencies/ModuleHotDeclineDependency");
2015
const ModuleHotDependency = require("./dependencies/ModuleHotDependency");
2116
const HotModuleReplacementRuntimeModule = require("./hmr/HotModuleReplacementRuntimeModule");
2217
const JavascriptParser = require("./javascript/JavascriptParser");
18+
const {
19+
evaluateToIdentifier,
20+
evaluateToString,
21+
toConstantDependency
22+
} = require("./javascript/JavascriptParserHelpers");
2323
const { find } = require("./util/SetHelpers");
2424
const { compareModulesById } = require("./util/comparators");
2525

‎lib/NodeStuffPlugin.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66
"use strict";
77

8+
const CachedConstDependency = require("./dependencies/CachedConstDependency");
89
const {
910
evaluateToString,
1011
expressionIsUnsupported
11-
} = require("./JavascriptParserHelpers");
12-
const CachedConstDependency = require("./dependencies/CachedConstDependency");
12+
} = require("./javascript/JavascriptParserHelpers");
1313
const { relative } = require("./util/fs");
1414

1515
/** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */

‎lib/ProvidePlugin.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
"use strict";
77

8-
const { approve } = require("./JavascriptParserHelpers");
98
const ConstDependency = require("./dependencies/ConstDependency");
109
const ProvidedDependency = require("./dependencies/ProvidedDependency");
10+
const { approve } = require("./javascript/JavascriptParserHelpers");
1111

1212
/** @typedef {import("./Compiler")} Compiler */
1313

‎lib/RequireJsStuffPlugin.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55

66
"use strict";
77

8-
const { toConstantDependency } = require("./JavascriptParserHelpers");
98
const RuntimeGlobals = require("./RuntimeGlobals");
109
const ConstDependency = require("./dependencies/ConstDependency");
10+
const {
11+
toConstantDependency
12+
} = require("./javascript/JavascriptParserHelpers");
1113

1214
/** @typedef {import("./Compiler")} Compiler */
1315

‎lib/dependencies/AMDPlugin.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55

66
"use strict";
77

8+
const RuntimeGlobals = require("../RuntimeGlobals");
89
const {
910
approve,
1011
evaluateToIdentifier,
1112
evaluateToString,
1213
toConstantDependency
13-
} = require("../JavascriptParserHelpers");
14-
const RuntimeGlobals = require("../RuntimeGlobals");
14+
} = require("../javascript/JavascriptParserHelpers");
1515

1616
const AMDDefineDependency = require("./AMDDefineDependency");
1717
const AMDDefineDependencyParserPlugin = require("./AMDDefineDependencyParserPlugin");

‎lib/dependencies/CommonJsPlugin.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const {
2222
evaluateToIdentifier,
2323
evaluateToString,
2424
toConstantDependency
25-
} = require("../JavascriptParserHelpers");
25+
} = require("../javascript/JavascriptParserHelpers");
2626

2727
class CommonJsPlugin {
2828
constructor(options) {

‎lib/dependencies/CommonJsRequireDependencyParserPlugin.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55

66
"use strict";
77

8-
const { toConstantDependency } = require("../JavascriptParserHelpers");
98
const RuntimeGlobals = require("../RuntimeGlobals");
9+
const {
10+
toConstantDependency
11+
} = require("../javascript/JavascriptParserHelpers");
1012
const CommonJsRequireContextDependency = require("./CommonJsRequireContextDependency");
1113
const CommonJsRequireDependency = require("./CommonJsRequireDependency");
1214
const ContextDependencyHelpers = require("./ContextDependencyHelpers");

‎lib/dependencies/ContextDependencyHelpers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
"use strict";
77

8-
/** @typedef {import("../BasicEvaluatedExpression")} BasicEvaluatedExpression */
8+
/** @typedef {import("../javascript/BasicEvaluatedExpression")} BasicEvaluatedExpression */
99
/** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
1010
/** @typedef {import("./ContextDependency")} ContextDependency */
1111
/** @typedef {import("./ContextDependency").ContextDependencyOptions} ContextDependencyOptions */

‎lib/dependencies/RequireEnsurePlugin.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const RequireEnsureDependenciesBlockParserPlugin = require("./RequireEnsureDepen
1313
const {
1414
evaluateToString,
1515
toConstantDependency
16-
} = require("../JavascriptParserHelpers");
16+
} = require("../javascript/JavascriptParserHelpers");
1717

1818
class RequireEnsurePlugin {
1919
apply(compiler) {

‎lib/dependencies/RequireIncludePlugin.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const RequireIncludeDependencyParserPlugin = require("./RequireIncludeDependency
1111
const {
1212
evaluateToString,
1313
toConstantDependency
14-
} = require("../JavascriptParserHelpers");
14+
} = require("../javascript/JavascriptParserHelpers");
1515

1616
class RequireIncludePlugin {
1717
apply(compiler) {

‎lib/dependencies/SystemPlugin.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55

66
"use strict";
77

8+
const RuntimeGlobals = require("../RuntimeGlobals");
9+
const WebpackError = require("../WebpackError");
810
const {
911
evaluateToString,
1012
expressionIsUnsupported,
1113
toConstantDependency
12-
} = require("../JavascriptParserHelpers");
13-
const RuntimeGlobals = require("../RuntimeGlobals");
14-
const WebpackError = require("../WebpackError");
14+
} = require("../javascript/JavascriptParserHelpers");
1515
const ConstDependency = require("./ConstDependency");
1616
const SystemRuntimeModule = require("./SystemRuntimeModule");
1717

‎lib/BasicEvaluatedExpression.js renamed to ‎lib/javascript/BasicEvaluatedExpression.js

File renamed without changes.

‎lib/javascript/JavascriptParser.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
const { Parser } = require("acorn");
99
const { SyncBailHook, HookMap } = require("tapable");
1010
const vm = require("vm");
11-
const BasicEvaluatedExpression = require("../BasicEvaluatedExpression");
1211
const StackedMap = require("../util/StackedMap");
12+
const BasicEvaluatedExpression = require("./BasicEvaluatedExpression");
1313

1414
/** @typedef {import("estree").ArrayExpression} ArrayExpressionNode */
1515
/** @typedef {import("estree").BinaryExpression} BinaryExpressionNode */

‎lib/JavascriptParserHelpers.js renamed to ‎lib/javascript/JavascriptParserHelpers.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
"use strict";
77

8+
const UnsupportedFeatureWarning = require("../UnsupportedFeatureWarning");
9+
const ConstDependency = require("../dependencies/ConstDependency");
810
const BasicEvaluatedExpression = require("./BasicEvaluatedExpression");
9-
const UnsupportedFeatureWarning = require("./UnsupportedFeatureWarning");
10-
const ConstDependency = require("./dependencies/ConstDependency");
1111

1212
exports.toConstantDependency = (parser, value, runtimeRequirements) => {
1313
return function constDependency(expr) {

‎test/JavascriptParser.unittest.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
22

3-
const BasicEvaluatedExpression = require("../lib/BasicEvaluatedExpression");
3+
const BasicEvaluatedExpression = require("../lib/javascript/BasicEvaluatedExpression");
44
const JavascriptParser = require("../lib/javascript/JavascriptParser");
55

66
describe("JavascriptParser", () => {

0 commit comments

Comments
 (0)