opensourcemirror
/
webpack
mirror of https://github.com/webpack/webpack.git
1
0
Fork 0
Code Issues Releases Wiki Activity

refactor: code

This commit is contained in:
evilebottnawi 2019-10-11 16:46:57 +03:00 committed by Tobias Koppers
parent 8729dc3abe
commit 8198ffb3e6
35 changed files with 68 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/AmdTemplatePlugin.js
View File

@ -7,9 +7,9 @@
const { ConcatSource } = require("webpack-sources");
const ExternalModule = require("./ExternalModule");
const JavascriptModulesPlugin = require("./JavascriptModulesPlugin");
const RuntimeGlobals = require("./RuntimeGlobals");
const Template = require("./Template");
const JavascriptModulesPlugin = require("./javascript/JavascriptModulesPlugin");
/** @typedef {import("./Compiler")} Compiler */

2
lib/ChunkTemplate.js
View File

@ -11,7 +11,7 @@ const memorize = require("./util/memorize");
/** @typedef {import("./Compilation")} Compilation */
const getJavascriptModulesPlugin = memorize(() =>
require("./JavascriptModulesPlugin")
require("./javascript/JavascriptModulesPlugin")
);
// TODO webpack 6 remove this class

2
lib/CompatibilityPlugin.js
View File

@ -8,7 +8,7 @@
const ConstDependency = require("./dependencies/ConstDependency");
/** @typedef {import("./Compiler")} Compiler */
/** @typedef {import("./JavascriptParser")} JavascriptParser */
/** @typedef {import("./javascript/JavascriptParser")} JavascriptParser */
const nestedWebpackRequireTag = Symbol("nested __webpack_require__");

2
lib/DefinePlugin.js
View File

@ -15,7 +15,7 @@ const RuntimeGlobals = require("./RuntimeGlobals");
const ConstDependency = require("./dependencies/ConstDependency");
/** @typedef {import("./Compiler")} Compiler */
/** @typedef {import("./JavascriptParser")} JavascriptParser */
/** @typedef {import("./javascript/JavascriptParser")} JavascriptParser */
/** @typedef {null|undefined|RegExp|Function|string|number} CodeValuePrimitive */
/** @typedef {CodeValuePrimitive|Record<string, CodeValuePrimitive>|RuntimeValue} CodeValue */

2
lib/EvalDevToolModulePlugin.js
View File

@ -6,8 +6,8 @@
"use strict";
const { RawSource } = require("webpack-sources");
const JavascriptModulesPlugin = require("./JavascriptModulesPlugin");
const ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
const JavascriptModulesPlugin = require("./javascript/JavascriptModulesPlugin");
/** @typedef {import("webpack-sources").Source} Source */
/** @typedef {import("./Compiler")} Compiler */

2
lib/EvalSourceMapDevToolPlugin.js
View File

@ -6,10 +6,10 @@
"use strict";
const { RawSource } = require("webpack-sources");
const JavascriptModulesPlugin = require("./JavascriptModulesPlugin");
const ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
const NormalModule = require("./NormalModule");
const SourceMapDevToolModuleOptionsPlugin = require("./SourceMapDevToolModuleOptionsPlugin");
const JavascriptModulesPlugin = require("./javascript/JavascriptModulesPlugin");
/** @typedef {import("webpack-sources").Source} Source */
/** @typedef {import("./Compiler")} Compiler */

2
lib/ExportPropertyTemplatePlugin.js
View File

@ -6,8 +6,8 @@
"use strict";
const { ConcatSource } = require("webpack-sources");
const JavascriptModulesPlugin = require("./JavascriptModulesPlugin");
const { UsageState } = require("./ModuleGraph");
const JavascriptModulesPlugin = require("./javascript/JavascriptModulesPlugin");
/** @typedef {import("./Compiler")} Compiler */

2
lib/ExportsInfoApiPlugin.js
View File

@ -9,7 +9,7 @@ const ConstDependency = require("./dependencies/ConstDependency");
const ExportsInfoDependency = require("./dependencies/ExportsInfoDependency");
/** @typedef {import("./Compiler")} Compiler */
/** @typedef {import("./JavascriptParser")} JavascriptParser */
/** @typedef {import("./javascript/JavascriptParser")} JavascriptParser */
class ExportsInfoApiPlugin {
/**

2
lib/HotModuleReplacementPlugin.js
View File

@ -8,7 +8,6 @@
const { SyncBailHook } = require("tapable");
const { RawSource } = require("webpack-sources");
const HotUpdateChunk = require("./HotUpdateChunk");
const JavascriptParser = require("./JavascriptParser");
const {
evaluateToIdentifier,
evaluateToString,
@ -20,6 +19,7 @@ const ModuleHotAcceptDependency = require("./dependencies/ModuleHotAcceptDepende
const ModuleHotDeclineDependency = require("./dependencies/ModuleHotDeclineDependency");
const ModuleHotDependency = require("./dependencies/ModuleHotDependency");
const HotModuleReplacementRuntimeModule = require("./hmr/HotModuleReplacementRuntimeModule");
const JavascriptParser = require("./javascript/JavascriptParser");
const { find } = require("./util/SetHelpers");
const { compareModulesById } = require("./util/comparators");

2
lib/MainTemplate.js
View File

@ -27,7 +27,7 @@ const memorize = require("./util/memorize");
/** @typedef {import("./Template").RenderManifestEntry} RenderManifestEntry} */
const getJavascriptModulesPlugin = memorize(() =>
require("./JavascriptModulesPlugin")
require("./javascript/JavascriptModulesPlugin")
);
// TODO webpack 6 remove this class

2
lib/ModuleInfoHeaderPlugin.js
View File

@ -6,8 +6,8 @@
"use strict";
const { ConcatSource } = require("webpack-sources");
const JavascriptModulesPlugin = require("./JavascriptModulesPlugin");
const Template = require("./Template");
const JavascriptModulesPlugin = require("./javascript/JavascriptModulesPlugin");
/** @typedef {import("./Compiler")} Compiler */
/** @typedef {import("./ModuleTemplate")} ModuleTemplate */

2
lib/ModuleTemplate.js
View File

@ -19,7 +19,7 @@ const memorize = require("./util/memorize");
/** @typedef {import("./util/Hash")} Hash */
const getJavascriptModulesPlugin = memorize(() =>
require("./JavascriptModulesPlugin")
require("./javascript/JavascriptModulesPlugin")
);
/**

2
lib/SetVarTemplatePlugin.js
View File

@ -6,8 +6,8 @@
"use strict";
const { ConcatSource } = require("webpack-sources");
const JavascriptModulesPlugin = require("./JavascriptModulesPlugin");
const RuntimeGlobals = require("./RuntimeGlobals");
const JavascriptModulesPlugin = require("./javascript/JavascriptModulesPlugin");
/** @typedef {import("./Compiler")} Compiler */

2
lib/SystemTemplatePlugin.js
View File

@ -7,9 +7,9 @@
const { ConcatSource } = require("webpack-sources");
const ExternalModule = require("./ExternalModule");
const JavascriptModulesPlugin = require("./JavascriptModulesPlugin");
const RuntimeGlobals = require("./RuntimeGlobals");
const Template = require("./Template");
const JavascriptModulesPlugin = require("./javascript/JavascriptModulesPlugin");
/** @typedef {import("./Compiler")} Compiler */

2
lib/UmdTemplatePlugin.js
View File

@ -7,9 +7,9 @@
const { ConcatSource, OriginalSource } = require("webpack-sources");
const ExternalModule = require("./ExternalModule");
const JavascriptModulesPlugin = require("./JavascriptModulesPlugin");
const RuntimeGlobals = require("./RuntimeGlobals");
const Template = require("./Template");
const JavascriptModulesPlugin = require("./javascript/JavascriptModulesPlugin");
/** @typedef {import("webpack-sources").Source} Source */
/** @typedef {import("../declarations/WebpackOptions").LibraryCustomUmdCommentObject} LibraryCustomUmdCommentObject */

4
lib/WebpackOptionsApply.js
View File

@ -7,8 +7,8 @@
const OptionsApply = require("./OptionsApply");
const JavascriptModulesPlugin = require("./JavascriptModulesPlugin");
const JsonModulesPlugin = require("./JsonModulesPlugin");
const JavascriptModulesPlugin = require("./javascript/JavascriptModulesPlugin");
const JsonModulesPlugin = require("./json/JsonModulesPlugin");
const LoaderTargetPlugin = require("./LoaderTargetPlugin");

2
lib/debug/ProfilingPlugin.js
View File

@ -308,7 +308,7 @@ const interceptAllParserHooks = (moduleFactory, tracer) => {
const interceptAllJavascriptModulesPluginHooks = (compilation, tracer) => {
interceptAllHooksFor(
{
hooks: require("../JavascriptModulesPlugin").getCompilationHooks(
hooks: require("../javascript/JavascriptModulesPlugin").getCompilationHooks(
compilation
)
},

2
lib/dependencies/ContextDependencyHelpers.js
View File

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

3
lib/index.js
View File

@ -56,7 +56,8 @@ exportPlugins(module.exports, {
Generator: () => require("./Generator"),
HotModuleReplacementPlugin: () => require("./HotModuleReplacementPlugin"),
IgnorePlugin: () => require("./IgnorePlugin"),
JavascriptModulesPlugin: () => require("./JavascriptModulesPlugin"),
JavascriptModulesPlugin: () =>
require("./javascript/JavascriptModulesPlugin"),
LibManifestPlugin: () => require("./LibManifestPlugin"),
LibraryTemplatePlugin: () => require("./LibraryTemplatePlugin"),
LoaderOptionsPlugin: () => require("./LoaderOptionsPlugin"),

18
lib/JavascriptGenerator.js → lib/javascript/JavascriptGenerator.js
View File

@ -7,17 +7,17 @@
const util = require("util");
const { ConcatSource, RawSource, ReplaceSource } = require("webpack-sources");
const Generator = require("./Generator");
const Generator = require("../Generator");
/** @typedef {import("webpack-sources").Source} Source */
/** @typedef {import("./DependenciesBlock")} DependenciesBlock */
/** @typedef {import("./Dependency")} Dependency */
/** @typedef {import("./DependencyTemplates")} DependencyTemplates */
/** @typedef {import("./Generator").GenerateContext} GenerateContext */
/** @typedef {import("./InitFragment")} InitFragment */
/** @typedef {import("./Module")} Module */
/** @typedef {import("./NormalModule")} NormalModule */
/** @typedef {import("./RuntimeTemplate")} RuntimeTemplate */
/** @typedef {import("../DependenciesBlock")} DependenciesBlock */
/** @typedef {import("../Dependency")} Dependency */
/** @typedef {import("../DependencyTemplates")} DependencyTemplates */
/** @typedef {import("../Generator").GenerateContext} GenerateContext */
/** @typedef {import("../InitFragment")} InitFragment */
/** @typedef {import("../Module")} Module */
/** @typedef {import("../NormalModule")} NormalModule */
/** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
// TODO: clean up this file
// replace with newer constructs

34
lib/JavascriptModulesPlugin.js → lib/javascript/JavascriptModulesPlugin.js
View File

@ -12,27 +12,27 @@ const {
PrefixSource,
RawSource
} = require("webpack-sources");
const Compilation = require("./Compilation");
const { tryRunOrWebpackError } = require("./HookWebpackError");
const HotUpdateChunk = require("./HotUpdateChunk");
const Compilation = require("../Compilation");
const { tryRunOrWebpackError } = require("../HookWebpackError");
const HotUpdateChunk = require("../HotUpdateChunk");
const RuntimeGlobals = require("../RuntimeGlobals");
const Template = require("../Template");
const { compareModulesByIdentifier } = require("../util/comparators");
const createHash = require("../util/createHash");
const JavascriptGenerator = require("./JavascriptGenerator");
const JavascriptParser = require("./JavascriptParser");
const RuntimeGlobals = require("./RuntimeGlobals");
const Template = require("./Template");
const { compareModulesByIdentifier } = require("./util/comparators");
const createHash = require("./util/createHash");
/** @typedef {import("webpack-sources").Source} Source */
/** @typedef {import("./Chunk")} Chunk */
/** @typedef {import("./ChunkGraph")} ChunkGraph */
/** @typedef {import("./Compilation").ChunkHashContext} ChunkHashContext */
/** @typedef {import("./Compiler")} Compiler */
/** @typedef {import("./DependencyTemplates")} DependencyTemplates */
/** @typedef {import("./Module")} Module */
/** @typedef {import("./Module").CodeGenerationResult} CodeGenerationResult */
/** @typedef {import("./ModuleGraph")} ModuleGraph */
/** @typedef {import("./RuntimeTemplate")} RuntimeTemplate */
/** @typedef {import("./util/Hash")} Hash */
/** @typedef {import("../Chunk")} Chunk */
/** @typedef {import("../ChunkGraph")} ChunkGraph */
/** @typedef {import("../Compilation").ChunkHashContext} ChunkHashContext */
/** @typedef {import("../Compiler")} Compiler */
/** @typedef {import("../DependencyTemplates")} DependencyTemplates */
/** @typedef {import("../Module")} Module */
/** @typedef {import("../Module").CodeGenerationResult} CodeGenerationResult */
/** @typedef {import("../ModuleGraph")} ModuleGraph */
/** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
/** @typedef {import("../util/Hash")} Hash */
/**
* @param {Chunk} chunk a chunk

6
lib/JavascriptParser.js → lib/javascript/JavascriptParser.js
View File

@ -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");
const StackedMap = require("../util/StackedMap");
/** @typedef {import("estree").ArrayExpression} ArrayExpressionNode */
/** @typedef {import("estree").BinaryExpression} BinaryExpressionNode */
@ -38,7 +38,7 @@ const StackedMap = require("./util/StackedMap");
// Syntax: https://developer.mozilla.org/en/SpiderMonkey/Parser_API
const parser = Parser.extend(require("./parsing/importAwaitAcornPlugin"));
const parser = Parser.extend(require("../parsing/importAwaitAcornPlugin"));
class VariableInfo {
/**

10
lib/JsonGenerator.js → lib/json/JsonGenerator.js
View File

@ -6,13 +6,13 @@
"use strict";
const { ConcatSource, RawSource } = require("webpack-sources");
const Generator = require("./Generator");
const { UsageState } = require("./ModuleGraph");
const RuntimeGlobals = require("./RuntimeGlobals");
const Generator = require("../Generator");
const { UsageState } = require("../ModuleGraph");
const RuntimeGlobals = require("../RuntimeGlobals");
/** @typedef {import("webpack-sources").Source} Source */
/** @typedef {import("./Generator").GenerateContext} GenerateContext */
/** @typedef {import("./NormalModule")} NormalModule */
/** @typedef {import("../Generator").GenerateContext} GenerateContext */
/** @typedef {import("../NormalModule")} NormalModule */
const stringifySafe = data => {
const stringified = JSON.stringify(data);

2
lib/JsonModulesPlugin.js → lib/json/JsonModulesPlugin.js
View File

@ -8,7 +8,7 @@
const JsonGenerator = require("./JsonGenerator");
const JsonParser = require("./JsonParser");
/** @typedef {import("./Compiler")} Compiler */
/** @typedef {import("../Compiler")} Compiler */
class JsonModulesPlugin {
/**

4
lib/JsonParser.js → lib/json/JsonParser.js
View File

@ -6,9 +6,9 @@
"use strict";
const parseJson = require("json-parse-better-errors");
const StaticExportsDependency = require("./dependencies/StaticExportsDependency");
const StaticExportsDependency = require("../dependencies/StaticExportsDependency");
/** @typedef {import("./NormalModule").ParserState} ParserState */
/** @typedef {import("../NormalModule").ParserState} ParserState */
class JsonParser {
/**

2
lib/node/NodeTemplatePlugin.js
View File

@ -6,9 +6,9 @@
"use strict";
const { ConcatSource } = require("webpack-sources");
const JavascriptModulesPlugin = require("../JavascriptModulesPlugin");
const RuntimeGlobals = require("../RuntimeGlobals");
const Template = require("../Template");
const JavascriptModulesPlugin = require("../javascript/JavascriptModulesPlugin");
const ReadFileChunkLoadingRuntimeModule = require("./ReadFileChunkLoadingRuntimeModule");
const RequireChunkLoadingRuntimeModule = require("./RequireChunkLoadingRuntimeModule");

2
lib/node/ReadFileChunkLoadingRuntimeModule.js
View File

@ -4,10 +4,10 @@
"use strict";
const chunkHasJs = require("../JavascriptModulesPlugin").chunkHasJs;
const RuntimeGlobals = require("../RuntimeGlobals");
const RuntimeModule = require("../RuntimeModule");
const Template = require("../Template");
const chunkHasJs = require("../javascript/JavascriptModulesPlugin").chunkHasJs;
const compileBooleanMatcher = require("../util/compileBooleanMatcher");
class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {

2
lib/node/RequireChunkLoadingRuntimeModule.js
View File

@ -4,10 +4,10 @@
"use strict";
const chunkHasJs = require("../JavascriptModulesPlugin").chunkHasJs;
const RuntimeGlobals = require("../RuntimeGlobals");
const RuntimeModule = require("../RuntimeModule");
const Template = require("../Template");
const chunkHasJs = require("../javascript/JavascriptModulesPlugin").chunkHasJs;
const compileBooleanMatcher = require("../util/compileBooleanMatcher");
class RequireChunkLoadingRuntimeModule extends RuntimeModule {

2
lib/optimize/ConcatenatedModule.js
View File

@ -12,7 +12,6 @@ const {
ReplaceSource
} = require("webpack-sources");
const DependencyTemplate = require("../DependencyTemplate");
const JavascriptParser = require("../JavascriptParser");
const Module = require("../Module");
const { UsageState } = require("../ModuleGraph");
const RuntimeGlobals = require("../RuntimeGlobals");
@ -26,6 +25,7 @@ const HarmonyExportSpecifierDependency = require("../dependencies/HarmonyExportS
const HarmonyImportDependency = require("../dependencies/HarmonyImportDependency");
const HarmonyImportSideEffectDependency = require("../dependencies/HarmonyImportSideEffectDependency");
const HarmonyImportSpecifierDependency = require("../dependencies/HarmonyImportSpecifierDependency");
const JavascriptParser = require("../javascript/JavascriptParser");
const LazySet = require("../util/LazySet");
const createHash = require("../util/createHash");
const contextify = require("../util/identifier").contextify;

2
lib/optimize/InnerGraphPlugin.js
View File

@ -12,7 +12,7 @@ const PureExpressionDependency = require("../dependencies/PureExpressionDependen
/** @typedef {import("../Compiler")} Compiler */
/** @typedef {import("../Dependency")} Dependency */
/** @typedef {import("../JavascriptParser")} JavascriptParser */
/** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
const topLevelSymbolTag = Symbol("top level symbol");

2
lib/web/JsonpChunkLoadingRuntimeModule.js
View File

@ -4,10 +4,10 @@
"use strict";
const chunkHasJs = require("../JavascriptModulesPlugin").chunkHasJs;
const RuntimeGlobals = require("../RuntimeGlobals");
const RuntimeModule = require("../RuntimeModule");
const Template = require("../Template");
const chunkHasJs = require("../javascript/JavascriptModulesPlugin").chunkHasJs;
const compileBooleanMatcher = require("../util/compileBooleanMatcher");
const getEntryInfo = require("./JsonpHelpers").getEntryInfo;

2
lib/web/JsonpExportTemplatePlugin.js
View File

@ -6,8 +6,8 @@
"use strict";
const { ConcatSource } = require("webpack-sources");
const JavascriptModulesPlugin = require("../JavascriptModulesPlugin");
const RuntimeGlobals = require("../RuntimeGlobals");
const JavascriptModulesPlugin = require("../javascript/JavascriptModulesPlugin");
/** @typedef {import("../Compiler")} Compiler */

2
lib/web/JsonpTemplatePlugin.js
View File

@ -9,9 +9,9 @@ const { SyncWaterfallHook } = require("tapable");
const { ConcatSource } = require("webpack-sources");
const Compilation = require("../Compilation");
const HotUpdateChunk = require("../HotUpdateChunk");
const JavascriptModulesPlugin = require("../JavascriptModulesPlugin");
const RuntimeGlobals = require("../RuntimeGlobals");
const Template = require("../Template");
const JavascriptModulesPlugin = require("../javascript/JavascriptModulesPlugin");
const JsonpChunkLoadingRuntimeModule = require("./JsonpChunkLoadingRuntimeModule");
const getEntryInfo = require("./JsonpHelpers").getEntryInfo;

2
lib/webworker/WebWorkerTemplatePlugin.js
View File

@ -7,9 +7,9 @@
const { ConcatSource } = require("webpack-sources");
const HotUpdateChunk = require("../HotUpdateChunk");
const JavascriptModulesPlugin = require("../JavascriptModulesPlugin");
const RuntimeGlobals = require("../RuntimeGlobals");
const Template = require("../Template");
const JavascriptModulesPlugin = require("../javascript/JavascriptModulesPlugin");
const ImportScriptsChunkLoadingRuntimeModule = require("./ImportScriptsChunkLoadingRuntimeModule");
/** @typedef {import("../Compiler")} Compiler */

2
test/JavascriptParser.unittest.js
View File

@ -1,7 +1,7 @@
"use strict";
const BasicEvaluatedExpression = require("../lib/BasicEvaluatedExpression");
const JavascriptParser = require("../lib/JavascriptParser");
const JavascriptParser = require("../lib/javascript/JavascriptParser");
describe("JavascriptParser", () => {
/* eslint-disable no-undef */