diff --git a/lib/AmdMainTemplatePlugin.js b/lib/AmdMainTemplatePlugin.js index fe63c23b1..0b78abc59 100644 --- a/lib/AmdMainTemplatePlugin.js +++ b/lib/AmdMainTemplatePlugin.js @@ -5,7 +5,7 @@ "use strict"; -const ConcatSource = require("webpack-sources").ConcatSource; +const { ConcatSource } = require("webpack-sources"); const Template = require("./Template"); class AmdMainTemplatePlugin { diff --git a/lib/BannerPlugin.js b/lib/BannerPlugin.js index 97e383ceb..dc1c46021 100644 --- a/lib/BannerPlugin.js +++ b/lib/BannerPlugin.js @@ -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"); diff --git a/lib/ChunkTemplate.js b/lib/ChunkTemplate.js index 13f554b13..3d06dd114 100644 --- a/lib/ChunkTemplate.js +++ b/lib/ChunkTemplate.js @@ -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) { diff --git a/lib/Compilation.js b/lib/Compilation.js index 836d71437..cb6542790 100644 --- a/lib/Compilation.js +++ b/lib/Compilation.js @@ -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"); diff --git a/lib/Compiler.js b/lib/Compiler.js index 26baa6fff..c49bc2635 100644 --- a/lib/Compiler.js +++ b/lib/Compiler.js @@ -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 { diff --git a/lib/ContextModule.js b/lib/ContextModule.js index 0c2c5b2d4..b9c5e6614 100644 --- a/lib/ContextModule.js +++ b/lib/ContextModule.js @@ -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"); diff --git a/lib/ContextModuleFactory.js b/lib/ContextModuleFactory.js index 8ffad567f..80f13eac1 100644 --- a/lib/ContextModuleFactory.js +++ b/lib/ContextModuleFactory.js @@ -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"); diff --git a/lib/DelegatedModule.js b/lib/DelegatedModule.js index cd5fc0f81..c25605424 100644 --- a/lib/DelegatedModule.js +++ b/lib/DelegatedModule.js @@ -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"); diff --git a/lib/DependenciesBlockVariable.js b/lib/DependenciesBlockVariable.js index e26e56dfa..abb990b44 100644 --- a/lib/DependenciesBlockVariable.js +++ b/lib/DependenciesBlockVariable.js @@ -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) { diff --git a/lib/DllModule.js b/lib/DllModule.js index be798d5da..c0a45d731 100644 --- a/lib/DllModule.js +++ b/lib/DllModule.js @@ -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) { diff --git a/lib/DllModuleFactory.js b/lib/DllModuleFactory.js index f4339694a..f5d12ddc4 100644 --- a/lib/DllModuleFactory.js +++ b/lib/DllModuleFactory.js @@ -4,7 +4,7 @@ */ "use strict"; -const Tapable = require("tapable").Tapable; +const { Tapable } = require("tapable"); const DllModule = require("./DllModule"); class DllModuleFactory extends Tapable { diff --git a/lib/EvalDevToolModuleTemplatePlugin.js b/lib/EvalDevToolModuleTemplatePlugin.js index c86b61a74..13795ada2 100644 --- a/lib/EvalDevToolModuleTemplatePlugin.js +++ b/lib/EvalDevToolModuleTemplatePlugin.js @@ -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(); diff --git a/lib/EvalSourceMapDevToolModuleTemplatePlugin.js b/lib/EvalSourceMapDevToolModuleTemplatePlugin.js index 4fffc5ef5..726cd4a94 100644 --- a/lib/EvalSourceMapDevToolModuleTemplatePlugin.js +++ b/lib/EvalSourceMapDevToolModuleTemplatePlugin.js @@ -4,7 +4,7 @@ */ "use strict"; -const RawSource = require("webpack-sources").RawSource; +const { RawSource } = require("webpack-sources"); const ModuleFilenameHelpers = require("./ModuleFilenameHelpers"); class EvalSourceMapDevToolModuleTemplatePlugin { diff --git a/lib/ExportPropertyMainTemplatePlugin.js b/lib/ExportPropertyMainTemplatePlugin.js index f8ef522ea..28d119e5f 100644 --- a/lib/ExportPropertyMainTemplatePlugin.js +++ b/lib/ExportPropertyMainTemplatePlugin.js @@ -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(""); diff --git a/lib/ExternalModule.js b/lib/ExternalModule.js index 6a0b16799..2636e9046 100644 --- a/lib/ExternalModule.js +++ b/lib/ExternalModule.js @@ -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"); diff --git a/lib/FunctionModuleTemplatePlugin.js b/lib/FunctionModuleTemplatePlugin.js index 0dd8ff637..4b4d8e1f6 100644 --- a/lib/FunctionModuleTemplatePlugin.js +++ b/lib/FunctionModuleTemplatePlugin.js @@ -4,7 +4,7 @@ */ "use strict"; -const ConcatSource = require("webpack-sources").ConcatSource; +const { ConcatSource } = require("webpack-sources"); const Template = require("./Template"); class FunctionModuleTemplatePlugin { diff --git a/lib/HotModuleReplacementPlugin.js b/lib/HotModuleReplacementPlugin.js index aec1c0a52..2ceccf123 100644 --- a/lib/HotModuleReplacementPlugin.js +++ b/lib/HotModuleReplacementPlugin.js @@ -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) { diff --git a/lib/HotUpdateChunkTemplate.js b/lib/HotUpdateChunkTemplate.js index f1c7c372b..3fdda9472 100644 --- a/lib/HotUpdateChunkTemplate.js +++ b/lib/HotUpdateChunkTemplate.js @@ -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) { diff --git a/lib/JavascriptGenerator.js b/lib/JavascriptGenerator.js index 94315ce93..85b4294df 100644 --- a/lib/JavascriptGenerator.js +++ b/lib/JavascriptGenerator.js @@ -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 diff --git a/lib/JavascriptModulesPlugin.js b/lib/JavascriptModulesPlugin.js index 2239f3df0..4e7db2642 100644 --- a/lib/JavascriptModulesPlugin.js +++ b/lib/JavascriptModulesPlugin.js @@ -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 { diff --git a/lib/JsonGenerator.js b/lib/JsonGenerator.js index 3b7c56f1a..508ae5ccc 100644 --- a/lib/JsonGenerator.js +++ b/lib/JsonGenerator.js @@ -4,7 +4,7 @@ */ "use strict"; -const ConcatSource = require("webpack-sources").ConcatSource; +const { ConcatSource } = require("webpack-sources"); const stringifySafe = data => JSON.stringify(data).replace( diff --git a/lib/MainTemplate.js b/lib/MainTemplate.js index d27f5d148..7aaeb60ec 100644 --- a/lib/MainTemplate.js +++ b/lib/MainTemplate.js @@ -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 diff --git a/lib/ModuleBuildError.js b/lib/ModuleBuildError.js index 00efad164..13504344c 100644 --- a/lib/ModuleBuildError.js +++ b/lib/ModuleBuildError.js @@ -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) { diff --git a/lib/ModuleError.js b/lib/ModuleError.js index 234971bb6..750d4182d 100644 --- a/lib/ModuleError.js +++ b/lib/ModuleError.js @@ -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) { diff --git a/lib/ModuleTemplate.js b/lib/ModuleTemplate.js index 7dcc17630..8560ba3b0 100644 --- a/lib/ModuleTemplate.js +++ b/lib/ModuleTemplate.js @@ -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) { diff --git a/lib/ModuleWarning.js b/lib/ModuleWarning.js index 360bf9b4b..ee1610461 100644 --- a/lib/ModuleWarning.js +++ b/lib/ModuleWarning.js @@ -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) { diff --git a/lib/MultiCompiler.js b/lib/MultiCompiler.js index 1f941fe7f..a21e971c2 100644 --- a/lib/MultiCompiler.js +++ b/lib/MultiCompiler.js @@ -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"); diff --git a/lib/MultiModule.js b/lib/MultiModule.js index 19aa25cb6..36dd0b0cf 100644 --- a/lib/MultiModule.js +++ b/lib/MultiModule.js @@ -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) { diff --git a/lib/MultiModuleFactory.js b/lib/MultiModuleFactory.js index f0af1fdab..5d29b2056 100644 --- a/lib/MultiModuleFactory.js +++ b/lib/MultiModuleFactory.js @@ -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 { diff --git a/lib/NormalModule.js b/lib/NormalModule.js index 600d9d0fb..c447468cd 100644 --- a/lib/NormalModule.js +++ b/lib/NormalModule.js @@ -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"); diff --git a/lib/NormalModuleFactory.js b/lib/NormalModuleFactory.js index 147bfaae3..5f5690abd 100644 --- a/lib/NormalModuleFactory.js +++ b/lib/NormalModuleFactory.js @@ -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"); diff --git a/lib/Parser.js b/lib/Parser.js index 30c7f4b81..028f5342e 100644 --- a/lib/Parser.js +++ b/lib/Parser.js @@ -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"); diff --git a/lib/RawModule.js b/lib/RawModule.js index 85f1a0ead..94fc8c43d 100644 --- a/lib/RawModule.js +++ b/lib/RawModule.js @@ -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) { diff --git a/lib/ResolverFactory.js b/lib/ResolverFactory.js index 6d3aedd03..47028ee7f 100644 --- a/lib/ResolverFactory.js +++ b/lib/ResolverFactory.js @@ -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 { diff --git a/lib/SetVarMainTemplatePlugin.js b/lib/SetVarMainTemplatePlugin.js index 414881e67..441a585d2 100644 --- a/lib/SetVarMainTemplatePlugin.js +++ b/lib/SetVarMainTemplatePlugin.js @@ -4,7 +4,7 @@ */ "use strict"; -const ConcatSource = require("webpack-sources").ConcatSource; +const { ConcatSource } = require("webpack-sources"); class SetVarMainTemplatePlugin { constructor(varExpression, copyObject) { diff --git a/lib/SourceMapDevToolPlugin.js b/lib/SourceMapDevToolPlugin.js index e57938668..b207f7a0a 100644 --- a/lib/SourceMapDevToolPlugin.js +++ b/lib/SourceMapDevToolPlugin.js @@ -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"); diff --git a/lib/Template.js b/lib/Template.js index d045e3241..4f83f2bae 100644 --- a/lib/Template.js +++ b/lib/Template.js @@ -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); diff --git a/lib/UmdMainTemplatePlugin.js b/lib/UmdMainTemplatePlugin.js index 1c50288a9..2ce6ac622 100644 --- a/lib/UmdMainTemplatePlugin.js +++ b/lib/UmdMainTemplatePlugin.js @@ -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) { diff --git a/lib/WebAssemblyParser.js b/lib/WebAssemblyParser.js index 1740b70a8..7b610c06c 100644 --- a/lib/WebAssemblyParser.js +++ b/lib/WebAssemblyParser.js @@ -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 { diff --git a/lib/debug/ProfilingPlugin.js b/lib/debug/ProfilingPlugin.js index ebeae5608..368365569 100644 --- a/lib/debug/ProfilingPlugin.js +++ b/lib/debug/ProfilingPlugin.js @@ -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); diff --git a/lib/dependencies/HarmonyImportDependencyParserPlugin.js b/lib/dependencies/HarmonyImportDependencyParserPlugin.js index 20e51bef3..4c975fc06 100644 --- a/lib/dependencies/HarmonyImportDependencyParserPlugin.js +++ b/lib/dependencies/HarmonyImportDependencyParserPlugin.js @@ -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) { diff --git a/lib/node/NodeChunkTemplatePlugin.js b/lib/node/NodeChunkTemplatePlugin.js index 25e2eedd0..292182a97 100644 --- a/lib/node/NodeChunkTemplatePlugin.js +++ b/lib/node/NodeChunkTemplatePlugin.js @@ -5,7 +5,7 @@ "use strict"; -const ConcatSource = require("webpack-sources").ConcatSource; +const { ConcatSource } = require("webpack-sources"); class NodeChunkTemplatePlugin { apply(chunkTemplate) { diff --git a/lib/node/NodeHotUpdateChunkTemplatePlugin.js b/lib/node/NodeHotUpdateChunkTemplatePlugin.js index 6a01d5529..bbd2e12a6 100644 --- a/lib/node/NodeHotUpdateChunkTemplatePlugin.js +++ b/lib/node/NodeHotUpdateChunkTemplatePlugin.js @@ -4,7 +4,7 @@ */ "use strict"; -const ConcatSource = require("webpack-sources").ConcatSource; +const { ConcatSource } = require("webpack-sources"); class NodeHotUpdateChunkTemplatePlugin { apply(hotUpdateChunkTemplate) { diff --git a/lib/optimize/AggressiveSplittingPlugin.js b/lib/optimize/AggressiveSplittingPlugin.js index d7ad68be0..b68357e9a 100644 --- a/lib/optimize/AggressiveSplittingPlugin.js +++ b/lib/optimize/AggressiveSplittingPlugin.js @@ -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"); diff --git a/lib/optimize/ConcatenatedModule.js b/lib/optimize/ConcatenatedModule.js index 2fede826a..baec4953c 100644 --- a/lib/optimize/ConcatenatedModule.js +++ b/lib/optimize/ConcatenatedModule.js @@ -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"); diff --git a/lib/optimize/RemoveParentModulesPlugin.js b/lib/optimize/RemoveParentModulesPlugin.js index 1317349c5..91cd43cff 100644 --- a/lib/optimize/RemoveParentModulesPlugin.js +++ b/lib/optimize/RemoveParentModulesPlugin.js @@ -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 = []; diff --git a/lib/optimize/SplitChunksPlugin.js b/lib/optimize/SplitChunksPlugin.js index ea35dd9dc..6fa62304d 100644 --- a/lib/optimize/SplitChunksPlugin.js +++ b/lib/optimize/SplitChunksPlugin.js @@ -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 diff --git a/lib/wasm/WasmModuleTemplatePlugin.js b/lib/wasm/WasmModuleTemplatePlugin.js index 752033e72..54dbdf348 100644 --- a/lib/wasm/WasmModuleTemplatePlugin.js +++ b/lib/wasm/WasmModuleTemplatePlugin.js @@ -4,7 +4,7 @@ */ "use strict"; -const RawSource = require("webpack-sources").RawSource; +const { RawSource } = require("webpack-sources"); const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency"); class WasmModuleTemplatePlugin { diff --git a/lib/web/JsonpChunkTemplatePlugin.js b/lib/web/JsonpChunkTemplatePlugin.js index 161b6cf24..4028e5abf 100644 --- a/lib/web/JsonpChunkTemplatePlugin.js +++ b/lib/web/JsonpChunkTemplatePlugin.js @@ -4,7 +4,7 @@ */ "use strict"; -const ConcatSource = require("webpack-sources").ConcatSource; +const { ConcatSource } = require("webpack-sources"); class JsonpChunkTemplatePlugin { apply(chunkTemplate) { diff --git a/lib/web/JsonpExportMainTemplatePlugin.js b/lib/web/JsonpExportMainTemplatePlugin.js index 46e400587..c29740493 100644 --- a/lib/web/JsonpExportMainTemplatePlugin.js +++ b/lib/web/JsonpExportMainTemplatePlugin.js @@ -4,7 +4,7 @@ */ "use strict"; -const ConcatSource = require("webpack-sources").ConcatSource; +const { ConcatSource } = require("webpack-sources"); class JsonpExportMainTemplatePlugin { constructor(name) { diff --git a/lib/web/JsonpHotUpdateChunkTemplatePlugin.js b/lib/web/JsonpHotUpdateChunkTemplatePlugin.js index a31d5dc6e..bff023c05 100644 --- a/lib/web/JsonpHotUpdateChunkTemplatePlugin.js +++ b/lib/web/JsonpHotUpdateChunkTemplatePlugin.js @@ -4,7 +4,7 @@ */ "use strict"; -const ConcatSource = require("webpack-sources").ConcatSource; +const { ConcatSource } = require("webpack-sources"); class JsonpHotUpdateChunkTemplatePlugin { apply(hotUpdateChunkTemplate) { diff --git a/lib/web/JsonpMainTemplatePlugin.js b/lib/web/JsonpMainTemplatePlugin.js index 5252d2673..c5ec864d0 100644 --- a/lib/web/JsonpMainTemplatePlugin.js +++ b/lib/web/JsonpMainTemplatePlugin.js @@ -4,8 +4,8 @@ */ "use strict"; +const { SyncWaterfallHook } = require("tapable"); const Template = require("../Template"); -const SyncWaterfallHook = require("tapable").SyncWaterfallHook; class JsonpMainTemplatePlugin { apply(mainTemplate) { diff --git a/lib/webworker/WebWorkerChunkTemplatePlugin.js b/lib/webworker/WebWorkerChunkTemplatePlugin.js index 7699c8298..f44ca26cd 100644 --- a/lib/webworker/WebWorkerChunkTemplatePlugin.js +++ b/lib/webworker/WebWorkerChunkTemplatePlugin.js @@ -4,7 +4,7 @@ */ "use strict"; -const ConcatSource = require("webpack-sources").ConcatSource; +const { ConcatSource } = require("webpack-sources"); class WebWorkerChunkTemplatePlugin { apply(chunkTemplate) { diff --git a/lib/webworker/WebWorkerHotUpdateChunkTemplatePlugin.js b/lib/webworker/WebWorkerHotUpdateChunkTemplatePlugin.js index 6977ba0fd..8b0261194 100644 --- a/lib/webworker/WebWorkerHotUpdateChunkTemplatePlugin.js +++ b/lib/webworker/WebWorkerHotUpdateChunkTemplatePlugin.js @@ -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) {