Destructure 'require' to improve readability

This commit is contained in:
Florent Cailhol 2018-03-22 12:05:58 +01:00
parent d668a23fdc
commit 3983803d30
54 changed files with 102 additions and 109 deletions

View File

@ -5,7 +5,7 @@
"use strict";
const ConcatSource = require("webpack-sources").ConcatSource;
const { ConcatSource } = require("webpack-sources");
const Template = require("./Template");
class AmdMainTemplatePlugin {

View File

@ -5,7 +5,7 @@
"use strict";
const ConcatSource = require("webpack-sources").ConcatSource;
const { ConcatSource } = require("webpack-sources");
const ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
const Template = require("./Template");

View File

@ -4,9 +4,7 @@
*/
"use strict";
const Tapable = require("tapable").Tapable;
const SyncWaterfallHook = require("tapable").SyncWaterfallHook;
const SyncHook = require("tapable").SyncHook;
const { Tapable, SyncWaterfallHook, SyncHook } = require("tapable");
module.exports = class ChunkTemplate extends Tapable {
constructor(outputOptions) {

View File

@ -6,11 +6,14 @@
const asyncLib = require("neo-async");
const util = require("util");
const Tapable = require("tapable").Tapable;
const SyncHook = require("tapable").SyncHook;
const SyncBailHook = require("tapable").SyncBailHook;
const SyncWaterfallHook = require("tapable").SyncWaterfallHook;
const AsyncSeriesHook = require("tapable").AsyncSeriesHook;
const { CachedSource } = require("webpack-sources");
const {
Tapable,
SyncHook,
SyncBailHook,
SyncWaterfallHook,
AsyncSeriesHook
} = require("tapable");
const EntryModuleNotFoundError = require("./EntryModuleNotFoundError");
const ModuleNotFoundError = require("./ModuleNotFoundError");
const ModuleDependencyWarning = require("./ModuleDependencyWarning");
@ -26,7 +29,6 @@ const RuntimeTemplate = require("./RuntimeTemplate");
const Dependency = require("./Dependency");
const ChunkRenderError = require("./ChunkRenderError");
const AsyncDependencyToInitialChunkError = require("./AsyncDependencyToInitialChunkError");
const CachedSource = require("webpack-sources").CachedSource;
const Stats = require("./Stats");
const Semaphore = require("./util/Semaphore");
const createHash = require("./util/createHash");

View File

@ -7,11 +7,13 @@
const asyncLib = require("neo-async");
const path = require("path");
const util = require("util");
const Tapable = require("tapable").Tapable;
const SyncHook = require("tapable").SyncHook;
const SyncBailHook = require("tapable").SyncBailHook;
const AsyncParallelHook = require("tapable").AsyncParallelHook;
const AsyncSeriesHook = require("tapable").AsyncSeriesHook;
const {
Tapable,
SyncHook,
SyncBailHook,
AsyncParallelHook,
AsyncSeriesHook
} = require("tapable");
const Compilation = require("./Compilation");
const Stats = require("./Stats");
@ -21,7 +23,7 @@ const ContextModuleFactory = require("./ContextModuleFactory");
const ResolverFactory = require("./ResolverFactory");
const RequestShortener = require("./RequestShortener");
const makePathsRelative = require("./util/identifier").makePathsRelative;
const { makePathsRelative } = require("./util/identifier");
const ConcurrentCompilationError = require("./ConcurrentCompilationError");
class Compiler extends Tapable {

View File

@ -5,9 +5,8 @@
"use strict";
const path = require("path");
const util = require("util");
const { OriginalSource, RawSource } = require("webpack-sources");
const Module = require("./Module");
const OriginalSource = require("webpack-sources").OriginalSource;
const RawSource = require("webpack-sources").RawSource;
const AsyncDependenciesBlock = require("./AsyncDependenciesBlock");
const Template = require("./Template");

View File

@ -7,9 +7,11 @@
const asyncLib = require("neo-async");
const path = require("path");
const Tapable = require("tapable").Tapable;
const AsyncSeriesWaterfallHook = require("tapable").AsyncSeriesWaterfallHook;
const SyncWaterfallHook = require("tapable").SyncWaterfallHook;
const {
Tapable,
AsyncSeriesWaterfallHook,
SyncWaterfallHook
} = require("tapable");
const ContextModule = require("./ContextModule");
const ContextElementDependency = require("./dependencies/ContextElementDependency");

View File

@ -4,9 +4,9 @@
*/
"use strict";
const { OriginalSource, RawSource } = require("webpack-sources");
const Module = require("./Module");
const OriginalSource = require("webpack-sources").OriginalSource;
const RawSource = require("webpack-sources").RawSource;
const WebpackMissingModule = require("./dependencies/WebpackMissingModule");
const DelegatedSourceDependency = require("./dependencies/DelegatedSourceDependency");
const DelegatedExportsDependency = require("./dependencies/DelegatedExportsDependency");

View File

@ -4,8 +4,7 @@
*/
"use strict";
const ReplaceSource = require("webpack-sources").ReplaceSource;
const RawSource = require("webpack-sources").RawSource;
const { RawSource, ReplaceSource } = require("webpack-sources");
class DependenciesBlockVariable {
constructor(name, expression, dependencies) {

View File

@ -4,8 +4,8 @@
*/
"use strict";
const { RawSource } = require("webpack-sources");
const Module = require("./Module");
const RawSource = require("webpack-sources").RawSource;
class DllModule extends Module {
constructor(context, dependencies, name, type) {

View File

@ -4,7 +4,7 @@
*/
"use strict";
const Tapable = require("tapable").Tapable;
const { Tapable } = require("tapable");
const DllModule = require("./DllModule");
class DllModuleFactory extends Tapable {

View File

@ -4,7 +4,7 @@
*/
"use strict";
const RawSource = require("webpack-sources").RawSource;
const { RawSource } = require("webpack-sources");
const ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
const cache = new WeakMap();

View File

@ -4,7 +4,7 @@
*/
"use strict";
const RawSource = require("webpack-sources").RawSource;
const { RawSource } = require("webpack-sources");
const ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
class EvalSourceMapDevToolModuleTemplatePlugin {

View File

@ -4,7 +4,7 @@
*/
"use strict";
const ConcatSource = require("webpack-sources").ConcatSource;
const { ConcatSource } = require("webpack-sources");
const accessorToObjectAccess = accessor => {
return accessor.map(a => `[${JSON.stringify(a)}]`).join("");

View File

@ -3,9 +3,9 @@
Author Tobias Koppers @sokra
*/
"use strict";
const { OriginalSource, RawSource } = require("webpack-sources");
const Module = require("./Module");
const OriginalSource = require("webpack-sources").OriginalSource;
const RawSource = require("webpack-sources").RawSource;
const WebpackMissingModule = require("./dependencies/WebpackMissingModule");
const Template = require("./Template");

View File

@ -4,7 +4,7 @@
*/
"use strict";
const ConcatSource = require("webpack-sources").ConcatSource;
const { ConcatSource } = require("webpack-sources");
const Template = require("./Template");
class FunctionModuleTemplatePlugin {

View File

@ -3,15 +3,16 @@
Author Tobias Koppers @sokra
*/
"use strict";
const { SyncBailHook } = require("tapable");
const { RawSource } = require("webpack-sources");
const Template = require("./Template");
const ModuleHotAcceptDependency = require("./dependencies/ModuleHotAcceptDependency");
const ModuleHotDeclineDependency = require("./dependencies/ModuleHotDeclineDependency");
const RawSource = require("webpack-sources").RawSource;
const ConstDependency = require("./dependencies/ConstDependency");
const NullFactory = require("./NullFactory");
const ParserHelpers = require("./ParserHelpers");
const createHash = require("./util/createHash");
const SyncBailHook = require("tapable").SyncBailHook;
module.exports = class HotModuleReplacementPlugin {
constructor(options) {

View File

@ -6,9 +6,7 @@
const Template = require("./Template");
const Chunk = require("./Chunk");
const Tapable = require("tapable").Tapable;
const SyncWaterfallHook = require("tapable").SyncWaterfallHook;
const SyncHook = require("tapable").SyncHook;
const { Tapable, SyncWaterfallHook, SyncHook } = require("tapable");
module.exports = class HotUpdateChunkTemplate extends Tapable {
constructor(outputOptions) {

View File

@ -4,8 +4,7 @@
*/
"use strict";
const RawSource = require("webpack-sources").RawSource;
const ReplaceSource = require("webpack-sources").ReplaceSource;
const { RawSource, ReplaceSource } = require("webpack-sources");
// TODO: clean up this file
// replace with newer constructs

View File

@ -6,7 +6,7 @@
const Parser = require("./Parser");
const Template = require("./Template");
const ConcatSource = require("webpack-sources").ConcatSource;
const { ConcatSource } = require("webpack-sources");
const JavascriptGenerator = require("./JavascriptGenerator");
class JavascriptModulesPlugin {

View File

@ -4,7 +4,7 @@
*/
"use strict";
const ConcatSource = require("webpack-sources").ConcatSource;
const { ConcatSource } = require("webpack-sources");
const stringifySafe = data =>
JSON.stringify(data).replace(

View File

@ -4,15 +4,19 @@
*/
"use strict";
const ConcatSource = require("webpack-sources").ConcatSource;
const OriginalSource = require("webpack-sources").OriginalSource;
const PrefixSource = require("webpack-sources").PrefixSource;
const RawSource = require("webpack-sources").RawSource;
const {
ConcatSource,
OriginalSource,
PrefixSource,
RawSource
} = require("webpack-sources");
const {
Tapable,
SyncWaterfallHook,
SyncHook,
SyncBailHook
} = require("tapable");
const Template = require("./Template");
const Tapable = require("tapable").Tapable;
const SyncWaterfallHook = require("tapable").SyncWaterfallHook;
const SyncHook = require("tapable").SyncHook;
const SyncBailHook = require("tapable").SyncBailHook;
// require function shortcuts:
// __webpack_require__.s = the module id of the entry point

View File

@ -5,7 +5,7 @@
"use strict";
const WebpackError = require("./WebpackError");
const cutOffLoaderExecution = require("./ErrorHelpers").cutOffLoaderExecution;
const { cutOffLoaderExecution } = require("./ErrorHelpers");
class ModuleBuildError extends WebpackError {
constructor(module, err) {

View File

@ -5,7 +5,7 @@
"use strict";
const WebpackError = require("./WebpackError");
const cleanUp = require("./ErrorHelpers").cleanUp;
const { cleanUp } = require("./ErrorHelpers");
class ModuleError extends WebpackError {
constructor(module, err) {

View File

@ -4,9 +4,7 @@
*/
"use strict";
const Tapable = require("tapable").Tapable;
const SyncWaterfallHook = require("tapable").SyncWaterfallHook;
const SyncHook = require("tapable").SyncHook;
const { Tapable, SyncWaterfallHook, SyncHook } = require("tapable");
module.exports = class ModuleTemplate extends Tapable {
constructor(runtimeTemplate) {

View File

@ -5,7 +5,7 @@
"use strict";
const WebpackError = require("./WebpackError");
const cleanUp = require("./ErrorHelpers").cleanUp;
const { cleanUp } = require("./ErrorHelpers");
class ModuleWarning extends WebpackError {
constructor(module, warning) {

View File

@ -4,9 +4,7 @@
*/
"use strict";
const Tapable = require("tapable").Tapable;
const SyncHook = require("tapable").SyncHook;
const MultiHook = require("tapable").MultiHook;
const { Tapable, SyncHook, MultiHook } = require("tapable");
const asyncLib = require("neo-async");
const MultiWatching = require("./MultiWatching");
const MultiStats = require("./MultiStats");

View File

@ -6,7 +6,7 @@
const Module = require("./Module");
const Template = require("./Template");
const RawSource = require("webpack-sources").RawSource;
const { RawSource } = require("webpack-sources");
class MultiModule extends Module {
constructor(context, dependencies, name) {

View File

@ -4,7 +4,7 @@
*/
"use strict";
const Tapable = require("tapable").Tapable;
const { Tapable } = require("tapable");
const MultiModule = require("./MultiModule");
module.exports = class MultiModuleFactory extends Tapable {

View File

@ -7,12 +7,14 @@
const path = require("path");
const NativeModule = require("module");
const SourceMapSource = require("webpack-sources").SourceMapSource;
const OriginalSource = require("webpack-sources").OriginalSource;
const RawSource = require("webpack-sources").RawSource;
const CachedSource = require("webpack-sources").CachedSource;
const LineToLineMappedSource = require("webpack-sources")
.LineToLineMappedSource;
const {
CachedSource,
LineToLineMappedSource,
OriginalSource,
RawSource,
SourceMapSource
} = require("webpack-sources");
const { getContext, runLoaders } = require("loader-runner");
const WebpackError = require("./WebpackError");
const Module = require("./Module");
@ -21,9 +23,6 @@ const ModuleBuildError = require("./ModuleBuildError");
const ModuleError = require("./ModuleError");
const ModuleWarning = require("./ModuleWarning");
const runLoaders = require("loader-runner").runLoaders;
const getContext = require("loader-runner").getContext;
const asString = buf => {
if (Buffer.isBuffer(buf)) {
return buf.toString("utf-8");

View File

@ -5,12 +5,14 @@
"use strict";
const asyncLib = require("neo-async");
const Tapable = require("tapable").Tapable;
const AsyncSeriesWaterfallHook = require("tapable").AsyncSeriesWaterfallHook;
const SyncWaterfallHook = require("tapable").SyncWaterfallHook;
const SyncBailHook = require("tapable").SyncBailHook;
const SyncHook = require("tapable").SyncHook;
const HookMap = require("tapable").HookMap;
const {
Tapable,
AsyncSeriesWaterfallHook,
SyncWaterfallHook,
SyncBailHook,
SyncHook,
HookMap
} = require("tapable");
const NormalModule = require("./NormalModule");
const RawModule = require("./RawModule");
const RuleSet = require("./RuleSet");

View File

@ -7,8 +7,7 @@
// Syntax: https://developer.mozilla.org/en/SpiderMonkey/Parser_API
const acorn = require("acorn-dynamic-import").default;
const Tapable = require("tapable").Tapable;
const SyncBailHook = require("tapable").SyncBailHook;
const { Tapable, SyncBailHook } = require("tapable");
const HookMap = require("tapable/lib/HookMap");
const vm = require("vm");
const BasicEvaluatedExpression = require("./BasicEvaluatedExpression");

View File

@ -5,8 +5,7 @@
"use strict";
const Module = require("./Module");
const OriginalSource = require("webpack-sources").OriginalSource;
const RawSource = require("webpack-sources").RawSource;
const { OriginalSource, RawSource } = require("webpack-sources");
module.exports = class RawModule extends Module {
constructor(source, identifier, readableIdentifier) {

View File

@ -4,10 +4,7 @@
*/
"use strict";
const Tapable = require("tapable").Tapable;
const HookMap = require("tapable").HookMap;
const SyncHook = require("tapable").SyncHook;
const SyncWaterfallHook = require("tapable").SyncWaterfallHook;
const { Tapable, HookMap, SyncHook, SyncWaterfallHook } = require("tapable");
const Factory = require("enhanced-resolve").ResolverFactory;
module.exports = class ResolverFactory extends Tapable {

View File

@ -4,7 +4,7 @@
*/
"use strict";
const ConcatSource = require("webpack-sources").ConcatSource;
const { ConcatSource } = require("webpack-sources");
class SetVarMainTemplatePlugin {
constructor(varExpression, copyObject) {

View File

@ -5,8 +5,7 @@
"use strict";
const path = require("path");
const ConcatSource = require("webpack-sources").ConcatSource;
const RawSource = require("webpack-sources").RawSource;
const { ConcatSource, RawSource } = require("webpack-sources");
const ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
const SourceMapDevToolModuleOptionsPlugin = require("./SourceMapDevToolModuleOptionsPlugin");
const createHash = require("./util/createHash");

View File

@ -4,7 +4,7 @@
*/
"use strict";
const ConcatSource = require("webpack-sources").ConcatSource;
const { ConcatSource } = require("webpack-sources");
const START_LOWERCASE_ALPHABET_CODE = "a".charCodeAt(0);
const START_UPPERCASE_ALPHABET_CODE = "A".charCodeAt(0);

View File

@ -4,8 +4,7 @@
*/
"use strict";
const ConcatSource = require("webpack-sources").ConcatSource;
const OriginalSource = require("webpack-sources").OriginalSource;
const { ConcatSource, OriginalSource } = require("webpack-sources");
const Template = require("./Template");
function accessorToObjectAccess(accessor) {

View File

@ -7,7 +7,7 @@
// Syntax: https://developer.mozilla.org/en/SpiderMonkey/Parser_API
const Tapable = require("tapable").Tapable;
const { Tapable } = require("tapable");
const WebAssemblyImportDependency = require("./dependencies/WebAssemblyImportDependency");
class WebAssemblyParser extends Tapable {

View File

@ -1,5 +1,5 @@
const fs = require("fs");
const Trace = require("chrome-trace-event").Tracer;
const { Tracer } = require("chrome-trace-event");
const validateOptions = require("schema-utils");
const schema = require("../../schemas/plugins/debug/ProfilingPlugin.json");
let inspector = undefined;
@ -76,7 +76,7 @@ class Profiler {
* @returns {{trace: ?, counter: number, profiler: Profiler, end: Function}} The trace object
*/
function createTrace(outputPath) {
const trace = new Trace({
const trace = new Tracer({
noStream: true
});
const profiler = new Profiler(inspector);

View File

@ -4,12 +4,12 @@
*/
"use strict";
const { SyncBailHook } = require("tapable");
const HarmonyImportSideEffectDependency = require("./HarmonyImportSideEffectDependency");
const HarmonyImportSpecifierDependency = require("./HarmonyImportSpecifierDependency");
const HarmonyAcceptImportDependency = require("./HarmonyAcceptImportDependency");
const HarmonyAcceptDependency = require("./HarmonyAcceptDependency");
const ConstDependency = require("./ConstDependency");
const SyncBailHook = require("tapable").SyncBailHook;
module.exports = class HarmonyImportDependencyParserPlugin {
constructor(moduleOptions) {

View File

@ -5,7 +5,7 @@
"use strict";
const ConcatSource = require("webpack-sources").ConcatSource;
const { ConcatSource } = require("webpack-sources");
class NodeChunkTemplatePlugin {
apply(chunkTemplate) {

View File

@ -4,7 +4,7 @@
*/
"use strict";
const ConcatSource = require("webpack-sources").ConcatSource;
const { ConcatSource } = require("webpack-sources");
class NodeHotUpdateChunkTemplatePlugin {
apply(hotUpdateChunkTemplate) {

View File

@ -5,7 +5,7 @@
"use strict";
const identifierUtils = require("../util/identifier");
const intersect = require("../util/SetHelpers").intersect;
const { intersect } = require("../util/SetHelpers");
const validateOptions = require("schema-utils");
const schema = require("../../schemas/plugins/optimize/AggressiveSplittingPlugin.json");

View File

@ -8,8 +8,7 @@ const Module = require("../Module");
const Template = require("../Template");
const Parser = require("../Parser");
const eslintScope = require("eslint-scope");
const ReplaceSource = require("webpack-sources").ReplaceSource;
const ConcatSource = require("webpack-sources").ConcatSource;
const { ConcatSource, ReplaceSource } = require("webpack-sources");
const HarmonyImportDependency = require("../dependencies/HarmonyImportDependency");
const HarmonyImportSideEffectDependency = require("../dependencies/HarmonyImportSideEffectDependency");
const HarmonyImportSpecifierDependency = require("../dependencies/HarmonyImportSpecifierDependency");

View File

@ -5,7 +5,7 @@
"use strict";
const Queue = require("../util/Queue");
const intersect = require("../util/SetHelpers").intersect;
const { intersect } = require("../util/SetHelpers");
const getParentChunksWithModule = (currentChunk, module) => {
const chunks = [];

View File

@ -7,7 +7,7 @@
const crypto = require("crypto");
const SortableSet = require("../util/SortableSet");
const GraphHelpers = require("../GraphHelpers");
const isSubset = require("../util/SetHelpers").isSubset;
const { isSubset } = require("../util/SetHelpers");
const hashFilename = name => {
return crypto

View File

@ -4,7 +4,7 @@
*/
"use strict";
const RawSource = require("webpack-sources").RawSource;
const { RawSource } = require("webpack-sources");
const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
class WasmModuleTemplatePlugin {

View File

@ -4,7 +4,7 @@
*/
"use strict";
const ConcatSource = require("webpack-sources").ConcatSource;
const { ConcatSource } = require("webpack-sources");
class JsonpChunkTemplatePlugin {
apply(chunkTemplate) {

View File

@ -4,7 +4,7 @@
*/
"use strict";
const ConcatSource = require("webpack-sources").ConcatSource;
const { ConcatSource } = require("webpack-sources");
class JsonpExportMainTemplatePlugin {
constructor(name) {

View File

@ -4,7 +4,7 @@
*/
"use strict";
const ConcatSource = require("webpack-sources").ConcatSource;
const { ConcatSource } = require("webpack-sources");
class JsonpHotUpdateChunkTemplatePlugin {
apply(hotUpdateChunkTemplate) {

View File

@ -4,8 +4,8 @@
*/
"use strict";
const { SyncWaterfallHook } = require("tapable");
const Template = require("../Template");
const SyncWaterfallHook = require("tapable").SyncWaterfallHook;
class JsonpMainTemplatePlugin {
apply(mainTemplate) {

View File

@ -4,7 +4,7 @@
*/
"use strict";
const ConcatSource = require("webpack-sources").ConcatSource;
const { ConcatSource } = require("webpack-sources");
class WebWorkerChunkTemplatePlugin {
apply(chunkTemplate) {

View File

@ -3,7 +3,7 @@
Author Tobias Koppers @sokra
*/
"use strict";
const ConcatSource = require("webpack-sources").ConcatSource;
const { ConcatSource } = require("webpack-sources");
class WebWorkerHotUpdateChunkTemplatePlugin {
apply(hotUpdateChunkTemplate) {