move BasicEvaluatedExpression and JavascriptParserHelpers to javascript directory

lib/APIPlugin.js

@@ -5,13 +5,13 @@
 
 "use strict";
 
-const {
-	toConstantDependency,
-	evaluateToString
-} = require("./JavascriptParserHelpers");
 const RuntimeGlobals = require("./RuntimeGlobals");
 const WebpackError = require("./WebpackError");
 const ConstDependency = require("./dependencies/ConstDependency");
+const {
+	toConstantDependency,
+	evaluateToString
+} = require("./javascript/JavascriptParserHelpers");
 const ChunkNameRuntimeModule = require("./runtime/ChunkNameRuntimeModule");
 const GetFullHashRuntimeModule = require("./runtime/GetFullHashRuntimeModule");
 

lib/CommonJsStuffPlugin.js

@@ -5,16 +5,16 @@
 
 "use strict";
 
-const {
-	evaluateToIdentifier,
-	expressionIsUnsupported,
-	toConstantDependency
-} = require("./JavascriptParserHelpers");
 const RuntimeGlobals = require("./RuntimeGlobals");
 const RuntimeModule = require("./RuntimeModule");
 const Template = require("./Template");
 const ModuleDecoratorDependency = require("./dependencies/ModuleDecoratorDependency");
 const RuntimeRequirementsDependency = require("./dependencies/RuntimeRequirementsDependency");
+const {
+	evaluateToIdentifier,
+	expressionIsUnsupported,
+	toConstantDependency
+} = require("./javascript/JavascriptParserHelpers");
 
 class CommonJsStuffPlugin {
 	apply(compiler) {

lib/ConstPlugin.js

@@ -5,9 +5,9 @@
 
 "use strict";
 
-const { evaluateToString } = require("./JavascriptParserHelpers");
 const CachedConstDependency = require("./dependencies/CachedConstDependency");
 const ConstDependency = require("./dependencies/ConstDependency");
+const { evaluateToString } = require("./javascript/JavascriptParserHelpers");
 
 /** @typedef {import("./Compiler")} Compiler */
 

lib/DefinePlugin.js

@@ -5,14 +5,14 @@
 
 "use strict";
 
-const BasicEvaluatedExpression = require("./BasicEvaluatedExpression");
+const RuntimeGlobals = require("./RuntimeGlobals");
+const ConstDependency = require("./dependencies/ConstDependency");
+const BasicEvaluatedExpression = require("./javascript/BasicEvaluatedExpression");
 const {
 	approve,
 	evaluateToString,
 	toConstantDependency
-} = require("./JavascriptParserHelpers");
-const RuntimeGlobals = require("./RuntimeGlobals");
-const ConstDependency = require("./dependencies/ConstDependency");
+} = require("./javascript/JavascriptParserHelpers");
 
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./javascript/JavascriptParser")} JavascriptParser */

lib/HotModuleReplacementPlugin.js

@@ -8,11 +8,6 @@
 const { SyncBailHook } = require("tapable");
 const { RawSource } = require("webpack-sources");
 const HotUpdateChunk = require("./HotUpdateChunk");
-const {
-	evaluateToIdentifier,
-	evaluateToString,
-	toConstantDependency
-} = require("./JavascriptParserHelpers");
 const NormalModule = require("./NormalModule");
 const RuntimeGlobals = require("./RuntimeGlobals");
 const ModuleHotAcceptDependency = require("./dependencies/ModuleHotAcceptDependency");
@@ -20,6 +15,11 @@ const ModuleHotDeclineDependency = require("./dependencies/ModuleHotDeclineDepen
 const ModuleHotDependency = require("./dependencies/ModuleHotDependency");
 const HotModuleReplacementRuntimeModule = require("./hmr/HotModuleReplacementRuntimeModule");
 const JavascriptParser = require("./javascript/JavascriptParser");
+const {
+	evaluateToIdentifier,
+	evaluateToString,
+	toConstantDependency
+} = require("./javascript/JavascriptParserHelpers");
 const { find } = require("./util/SetHelpers");
 const { compareModulesById } = require("./util/comparators");
 

lib/NodeStuffPlugin.js

@@ -5,11 +5,11 @@
 
 "use strict";
 
+const CachedConstDependency = require("./dependencies/CachedConstDependency");
 const {
 	evaluateToString,
 	expressionIsUnsupported
-} = require("./JavascriptParserHelpers");
-const CachedConstDependency = require("./dependencies/CachedConstDependency");
+} = require("./javascript/JavascriptParserHelpers");
 const { relative } = require("./util/fs");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */

lib/ProvidePlugin.js

@@ -5,9 +5,9 @@
 
 "use strict";
 
-const { approve } = require("./JavascriptParserHelpers");
 const ConstDependency = require("./dependencies/ConstDependency");
 const ProvidedDependency = require("./dependencies/ProvidedDependency");
+const { approve } = require("./javascript/JavascriptParserHelpers");
 
 /** @typedef {import("./Compiler")} Compiler */
 

lib/RequireJsStuffPlugin.js

@@ -5,9 +5,11 @@
 
 "use strict";
 
-const { toConstantDependency } = require("./JavascriptParserHelpers");
 const RuntimeGlobals = require("./RuntimeGlobals");
 const ConstDependency = require("./dependencies/ConstDependency");
+const {
+	toConstantDependency
+} = require("./javascript/JavascriptParserHelpers");
 
 /** @typedef {import("./Compiler")} Compiler */
 

lib/dependencies/AMDPlugin.js

@@ -5,13 +5,13 @@
 
 "use strict";
 
+const RuntimeGlobals = require("../RuntimeGlobals");
 const {
 	approve,
 	evaluateToIdentifier,
 	evaluateToString,
 	toConstantDependency
-} = require("../JavascriptParserHelpers");
-const RuntimeGlobals = require("../RuntimeGlobals");
+} = require("../javascript/JavascriptParserHelpers");
 
 const AMDDefineDependency = require("./AMDDefineDependency");
 const AMDDefineDependencyParserPlugin = require("./AMDDefineDependencyParserPlugin");

lib/dependencies/CommonJsPlugin.js

@@ -22,7 +22,7 @@ const {
 	evaluateToIdentifier,
 	evaluateToString,
 	toConstantDependency
-} = require("../JavascriptParserHelpers");
+} = require("../javascript/JavascriptParserHelpers");
 
 class CommonJsPlugin {
 	constructor(options) {

lib/dependencies/CommonJsRequireDependencyParserPlugin.js

@@ -5,8 +5,10 @@
 
 "use strict";
 
-const { toConstantDependency } = require("../JavascriptParserHelpers");
 const RuntimeGlobals = require("../RuntimeGlobals");
+const {
+	toConstantDependency
+} = require("../javascript/JavascriptParserHelpers");
 const CommonJsRequireContextDependency = require("./CommonJsRequireContextDependency");
 const CommonJsRequireDependency = require("./CommonJsRequireDependency");
 const ContextDependencyHelpers = require("./ContextDependencyHelpers");

lib/dependencies/ContextDependencyHelpers.js

@@ -5,7 +5,7 @@
 
 "use strict";
 
-/** @typedef {import("../BasicEvaluatedExpression")} BasicEvaluatedExpression */
+/** @typedef {import("../javascript/BasicEvaluatedExpression")} BasicEvaluatedExpression */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
 /** @typedef {import("./ContextDependency")} ContextDependency */
 /** @typedef {import("./ContextDependency").ContextDependencyOptions} ContextDependencyOptions */

lib/dependencies/RequireEnsurePlugin.js

@@ -13,7 +13,7 @@ const RequireEnsureDependenciesBlockParserPlugin = require("./RequireEnsureDepen
 const {
 	evaluateToString,
 	toConstantDependency
-} = require("../JavascriptParserHelpers");
+} = require("../javascript/JavascriptParserHelpers");
 
 class RequireEnsurePlugin {
 	apply(compiler) {

lib/dependencies/RequireIncludePlugin.js

@@ -11,7 +11,7 @@ const RequireIncludeDependencyParserPlugin = require("./RequireIncludeDependency
 const {
 	evaluateToString,
 	toConstantDependency
-} = require("../JavascriptParserHelpers");
+} = require("../javascript/JavascriptParserHelpers");
 
 class RequireIncludePlugin {
 	apply(compiler) {

lib/dependencies/SystemPlugin.js

@@ -5,13 +5,13 @@
 
 "use strict";
 
+const RuntimeGlobals = require("../RuntimeGlobals");
+const WebpackError = require("../WebpackError");
 const {
 	evaluateToString,
 	expressionIsUnsupported,
 	toConstantDependency
-} = require("../JavascriptParserHelpers");
-const RuntimeGlobals = require("../RuntimeGlobals");
-const WebpackError = require("../WebpackError");
+} = require("../javascript/JavascriptParserHelpers");
 const ConstDependency = require("./ConstDependency");
 const SystemRuntimeModule = require("./SystemRuntimeModule");
 

lib/javascript/JavascriptParser.js

@@ -8,8 +8,8 @@
 const { Parser } = require("acorn");
 const { SyncBailHook, HookMap } = require("tapable");
 const vm = require("vm");
-const BasicEvaluatedExpression = require("../BasicEvaluatedExpression");
 const StackedMap = require("../util/StackedMap");
+const BasicEvaluatedExpression = require("./BasicEvaluatedExpression");
 
 /** @typedef {import("estree").ArrayExpression} ArrayExpressionNode */
 /** @typedef {import("estree").BinaryExpression} BinaryExpressionNode */

lib/javascript/JavascriptParserHelpers.js

@@ -5,9 +5,9 @@
 
 "use strict";
 
+const UnsupportedFeatureWarning = require("../UnsupportedFeatureWarning");
+const ConstDependency = require("../dependencies/ConstDependency");
 const BasicEvaluatedExpression = require("./BasicEvaluatedExpression");
-const UnsupportedFeatureWarning = require("./UnsupportedFeatureWarning");
-const ConstDependency = require("./dependencies/ConstDependency");
 
 exports.toConstantDependency = (parser, value, runtimeRequirements) => {
 	return function constDependency(expr) {

test/JavascriptParser.unittest.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const BasicEvaluatedExpression = require("../lib/BasicEvaluatedExpression");
+const BasicEvaluatedExpression = require("../lib/javascript/BasicEvaluatedExpression");
 const JavascriptParser = require("../lib/javascript/JavascriptParser");
 
 describe("JavascriptParser", () => {