Skip to content

Commit 51b0df7

Browse files
sokrasokra
authored
Merge pull request webpack#6835 from webpack/refactor/destruct_require
Destructure 'require' to improve readability
2 parents d668a23 + 3983803 commit 51b0df7

54 files changed

Lines changed: 102 additions & 109 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎lib/AmdMainTemplatePlugin.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-
const ConcatSource = require("webpack-sources").ConcatSource;
8+
const { ConcatSource } = require("webpack-sources");
99
const Template = require("./Template");
1010

1111
class AmdMainTemplatePlugin {

‎lib/BannerPlugin.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-
const ConcatSource = require("webpack-sources").ConcatSource;
8+
const { ConcatSource } = require("webpack-sources");
99
const ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
1010
const Template = require("./Template");
1111

‎lib/ChunkTemplate.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
*/
55
"use strict";
66

7-
const Tapable = require("tapable").Tapable;
8-
const SyncWaterfallHook = require("tapable").SyncWaterfallHook;
9-
const SyncHook = require("tapable").SyncHook;
7+
const { Tapable, SyncWaterfallHook, SyncHook } = require("tapable");
108

119
module.exports = class ChunkTemplate extends Tapable {
1210
constructor(outputOptions) {

‎lib/Compilation.js‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,14 @@
66

77
const asyncLib = require("neo-async");
88
const util = require("util");
9-
const Tapable = require("tapable").Tapable;
10-
const SyncHook = require("tapable").SyncHook;
11-
const SyncBailHook = require("tapable").SyncBailHook;
12-
const SyncWaterfallHook = require("tapable").SyncWaterfallHook;
13-
const AsyncSeriesHook = require("tapable").AsyncSeriesHook;
9+
const { CachedSource } = require("webpack-sources");
10+
const {
11+
Tapable,
12+
SyncHook,
13+
SyncBailHook,
14+
SyncWaterfallHook,
15+
AsyncSeriesHook
16+
} = require("tapable");
1417
const EntryModuleNotFoundError = require("./EntryModuleNotFoundError");
1518
const ModuleNotFoundError = require("./ModuleNotFoundError");
1619
const ModuleDependencyWarning = require("./ModuleDependencyWarning");
@@ -26,7 +29,6 @@ const RuntimeTemplate = require("./RuntimeTemplate");
2629
const Dependency = require("./Dependency");
2730
const ChunkRenderError = require("./ChunkRenderError");
2831
const AsyncDependencyToInitialChunkError = require("./AsyncDependencyToInitialChunkError");
29-
const CachedSource = require("webpack-sources").CachedSource;
3032
const Stats = require("./Stats");
3133
const Semaphore = require("./util/Semaphore");
3234
const createHash = require("./util/createHash");

‎lib/Compiler.js‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@
77
const asyncLib = require("neo-async");
88
const path = require("path");
99
const util = require("util");
10-
const Tapable = require("tapable").Tapable;
11-
const SyncHook = require("tapable").SyncHook;
12-
const SyncBailHook = require("tapable").SyncBailHook;
13-
const AsyncParallelHook = require("tapable").AsyncParallelHook;
14-
const AsyncSeriesHook = require("tapable").AsyncSeriesHook;
10+
const {
11+
Tapable,
12+
SyncHook,
13+
SyncBailHook,
14+
AsyncParallelHook,
15+
AsyncSeriesHook
16+
} = require("tapable");
1517

1618
const Compilation = require("./Compilation");
1719
const Stats = require("./Stats");
@@ -21,7 +23,7 @@ const ContextModuleFactory = require("./ContextModuleFactory");
2123
const ResolverFactory = require("./ResolverFactory");
2224

2325
const RequestShortener = require("./RequestShortener");
24-
const makePathsRelative = require("./util/identifier").makePathsRelative;
26+
const { makePathsRelative } = require("./util/identifier");
2527
const ConcurrentCompilationError = require("./ConcurrentCompilationError");
2628

2729
class Compiler extends Tapable {

‎lib/ContextModule.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
"use strict";
66
const path = require("path");
77
const util = require("util");
8+
const { OriginalSource, RawSource } = require("webpack-sources");
89
const Module = require("./Module");
9-
const OriginalSource = require("webpack-sources").OriginalSource;
10-
const RawSource = require("webpack-sources").RawSource;
1110
const AsyncDependenciesBlock = require("./AsyncDependenciesBlock");
1211
const Template = require("./Template");
1312

‎lib/ContextModuleFactory.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@
77
const asyncLib = require("neo-async");
88
const path = require("path");
99

10-
const Tapable = require("tapable").Tapable;
11-
const AsyncSeriesWaterfallHook = require("tapable").AsyncSeriesWaterfallHook;
12-
const SyncWaterfallHook = require("tapable").SyncWaterfallHook;
10+
const {
11+
Tapable,
12+
AsyncSeriesWaterfallHook,
13+
SyncWaterfallHook
14+
} = require("tapable");
1315
const ContextModule = require("./ContextModule");
1416
const ContextElementDependency = require("./dependencies/ContextElementDependency");
1517

‎lib/DelegatedModule.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
*/
55
"use strict";
66

7+
const { OriginalSource, RawSource } = require("webpack-sources");
8+
79
const Module = require("./Module");
8-
const OriginalSource = require("webpack-sources").OriginalSource;
9-
const RawSource = require("webpack-sources").RawSource;
1010
const WebpackMissingModule = require("./dependencies/WebpackMissingModule");
1111
const DelegatedSourceDependency = require("./dependencies/DelegatedSourceDependency");
1212
const DelegatedExportsDependency = require("./dependencies/DelegatedExportsDependency");

‎lib/DependenciesBlockVariable.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
*/
55
"use strict";
66

7-
const ReplaceSource = require("webpack-sources").ReplaceSource;
8-
const RawSource = require("webpack-sources").RawSource;
7+
const { RawSource, ReplaceSource } = require("webpack-sources");
98

109
class DependenciesBlockVariable {
1110
constructor(name, expression, dependencies) {

‎lib/DllModule.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*/
55
"use strict";
66

7+
const { RawSource } = require("webpack-sources");
78
const Module = require("./Module");
8-
const RawSource = require("webpack-sources").RawSource;
99

1010
class DllModule extends Module {
1111
constructor(context, dependencies, name, type) {

0 commit comments

Comments
 (0)