Browse Source

Prettify source code

tags/v4.29.2
Tobias Koppers 10 months ago
parent
commit
b25ff237bb
19 changed files with 70 additions and 80 deletions
  1. +2
    -2
      benchmark/benchmark.js
  2. +2
    -2
      declarations.d.ts
  3. +1
    -1
      declarations/WebpackOptions.d.ts
  4. +7
    -9
      declarations/plugins/BannerPlugin.d.ts
  5. +2
    -2
      declarations/plugins/IgnorePlugin.d.ts
  6. +2
    -2
      declarations/plugins/ProgressPlugin.d.ts
  7. +2
    -2
      lib/AmdMainTemplatePlugin.js
  8. +2
    -3
      lib/JsonGenerator.js
  9. +2
    -2
      lib/Parser.js
  10. +2
    -2
      lib/Stats.js
  11. +6
    -6
      lib/UmdMainTemplatePlugin.js
  12. +2
    -2
      lib/WatchIgnorePlugin.js
  13. +8
    -8
      lib/WebpackOptionsApply.js
  14. +4
    -8
      lib/WebpackOptionsDefaulter.js
  15. +1
    -1
      lib/optimize/SideEffectsFlagPlugin.js
  16. +15
    -15
      lib/optimize/SplitChunksPlugin.js
  17. +4
    -6
      lib/util/StackedSetMap.js
  18. +2
    -2
      lib/util/deterministicGrouping.js
  19. +4
    -5
      lib/util/identifier.js

+ 2
- 2
benchmark/benchmark.js View File

@@ -206,8 +206,8 @@ const tests = {
const suite = new Benchmark.Suite();

Object.keys(tests)
.filter(
name => (process.argv.length > 2 ? name.includes(process.argv[2]) : true)
.filter(name =>
process.argv.length > 2 ? name.includes(process.argv[2]) : true
)
.forEach(name => {
const test = tests[name];

+ 2
- 2
declarations.d.ts View File

@@ -234,8 +234,8 @@ interface RuleSetConditionsRecursive
extends Array<import("./declarations/WebpackOptions").RuleSetCondition> {}
interface RuleSetConditionsAbsoluteRecursive
extends Array<
import("./declarations/WebpackOptions").RuleSetConditionAbsolute
> {}
import("./declarations/WebpackOptions").RuleSetConditionAbsolute
> {}

/**
* Global variable declarations

+ 1
- 1
declarations/WebpackOptions.d.ts View File

@@ -15,7 +15,7 @@ export type Entry = EntryDynamic | EntryStatic;
* This interface was referenced by `WebpackOptions`'s JSON-Schema
* via the `definition` "EntryDynamic".
*/
export type EntryDynamic = (() => EntryStatic | Promise<EntryStatic>);
export type EntryDynamic = () => EntryStatic | Promise<EntryStatic>;
/**
* This interface was referenced by `WebpackOptions`'s JSON-Schema
* via the `definition` "EntryStatic".

+ 7
- 9
declarations/plugins/BannerPlugin.d.ts View File

@@ -11,15 +11,13 @@ export type BannerPluginArgument =
/**
* The banner as function, it will be wrapped in a comment
*/
export type BannerFunction = (
data: {
hash: string;
chunk: import("../../lib/Chunk");
filename: string;
basename: string;
query: string;
}
) => string;
export type BannerFunction = (data: {
hash: string;
chunk: import("../../lib/Chunk");
filename: string;
basename: string;
query: string;
}) => string;
export type Rules = Rule[] | Rule;
export type Rule = RegExp | string;


+ 2
- 2
declarations/plugins/IgnorePlugin.d.ts View File

@@ -19,9 +19,9 @@ export type IgnorePluginOptions =
/**
* A filter function for context
*/
checkContext?: ((context: string) => boolean);
checkContext?: (context: string) => boolean;
/**
* A filter function for resource and context
*/
checkResource?: ((resource: string, context: string) => boolean);
checkResource?: (resource: string, context: string) => boolean;
};

+ 2
- 2
declarations/plugins/ProgressPlugin.d.ts View File

@@ -8,11 +8,11 @@ export type ProgressPluginArgument = ProgressPluginOptions | HandlerFunction;
/**
* Function that executes for every progress step
*/
export type HandlerFunction = ((
export type HandlerFunction = (
percentage: number,
msg: string,
...args: string[]
) => void);
) => void;

export interface ProgressPluginOptions {
/**

+ 2
- 2
lib/AmdMainTemplatePlugin.js View File

@@ -40,8 +40,8 @@ class AmdMainTemplatePlugin {
const onRenderWithEntry = (source, chunk, hash) => {
const externals = chunk.getModules().filter(m => m.external);
const externalsDepsArray = JSON.stringify(
externals.map(
m => (typeof m.request === "object" ? m.request.amd : m.request)
externals.map(m =>
typeof m.request === "object" ? m.request.amd : m.request
)
);
const externalsArguments = externals

+ 2
- 3
lib/JsonGenerator.js View File

@@ -12,9 +12,8 @@ const stringifySafe = data => {
return undefined; // Invalid JSON
}

return stringified.replace(
/\u2028|\u2029/g,
str => (str === "\u2029" ? "\\u2029" : "\\u2028")
return stringified.replace(/\u2028|\u2029/g, str =>
str === "\u2029" ? "\\u2029" : "\\u2028"
); // invalid in JavaScript but valid JSON
};


+ 2
- 2
lib/Parser.js View File

@@ -1335,8 +1335,8 @@ class Parser extends Tapable {
statement.kind === "const"
? this.hooks.varDeclarationConst
: statement.kind === "let"
? this.hooks.varDeclarationLet
: this.hooks.varDeclarationVar;
? this.hooks.varDeclarationLet
: this.hooks.varDeclarationVar;
for (const declarator of statement.declarations) {
switch (declarator.type) {
case "VariableDeclarator": {

+ 2
- 2
lib/Stats.js View File

@@ -288,8 +288,8 @@ class Stats {
e.chunk.hasRuntime()
? " [entry]"
: e.chunk.canBeInitial()
? " [initial]"
: ""
? " [initial]"
: ""
}\n`;
}
if (e.file) {

+ 6
- 6
lib/UmdMainTemplatePlugin.js View File

@@ -236,12 +236,12 @@ class UmdMainTemplatePlugin {
amdFactory +
");\n"
: this.names.amd && this.namedDefine === true
? " define(" +
libraryName(this.names.amd) +
", [], " +
amdFactory +
");\n"
: " define([], " + amdFactory + ");\n") +
? " define(" +
libraryName(this.names.amd) +
", [], " +
amdFactory +
");\n"
: " define([], " + amdFactory + ");\n") +
(this.names.root || this.names.commonjs
? getAuxilaryComment("commonjs") +
" else if(typeof exports === 'object')\n" +

+ 2
- 2
lib/WatchIgnorePlugin.js View File

@@ -17,8 +17,8 @@ class IgnoringWatchFileSystem {

watch(files, dirs, missing, startTime, options, callback, callbackUndelayed) {
const ignored = path =>
this.paths.some(
p => (p instanceof RegExp ? p.test(path) : path.indexOf(p) === 0)
this.paths.some(p =>
p instanceof RegExp ? p.test(path) : path.indexOf(p) === 0
);

const notIgnored = path => !ignored(path);

+ 8
- 8
lib/WebpackOptionsApply.js View File

@@ -260,10 +260,10 @@ class WebpackOptionsApply extends OptionsApply {
"MappingURL=[url]\n//# source" +
"MappingURL=[url]\n*/"
: legacy
? "\n/*\n//@ source" + "MappingURL=[url]\n*/"
: modern
? "\n//# source" + "MappingURL=[url]"
: null;
? "\n/*\n//@ source" + "MappingURL=[url]\n*/"
: modern
? "\n//# source" + "MappingURL=[url]"
: null;
const Plugin = evalWrapped
? EvalSourceMapDevToolPlugin
: SourceMapDevToolPlugin;
@@ -286,10 +286,10 @@ class WebpackOptionsApply extends OptionsApply {
legacy && modern
? "\n//@ sourceURL=[url]\n//# sourceURL=[url]"
: legacy
? "\n//@ sourceURL=[url]"
: modern
? "\n//# sourceURL=[url]"
: null;
? "\n//@ sourceURL=[url]"
: modern
? "\n//# sourceURL=[url]"
: null;
new EvalDevToolModulePlugin({
sourceUrlComment: comment,
moduleFilenameTemplate: options.output.devtoolModuleFilenameTemplate,

+ 4
- 8
lib/WebpackOptionsDefaulter.js View File

@@ -33,10 +33,8 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {

this.set("entry", "./src");

this.set(
"devtool",
"make",
options => (options.mode === "development" ? "eval" : false)
this.set("devtool", "make", options =>
options.mode === "development" ? "eval" : false
);
this.set("cache", "make", options => options.mode === "development");

@@ -193,10 +191,8 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
});
this.set("performance.maxAssetSize", 250000);
this.set("performance.maxEntrypointSize", 250000);
this.set(
"performance.hints",
"make",
options => (isProductionLikeMode(options) ? "warning" : false)
this.set("performance.hints", "make", options =>
isProductionLikeMode(options) ? "warning" : false
);

this.set("optimization", "call", value => Object.assign({}, value));

+ 1
- 1
lib/optimize/SideEffectsFlagPlugin.js View File

@@ -123,7 +123,7 @@ class SideEffectsFlagPlugin {
dep,
reason.explanation
? reason.explanation +
" (skipped side-effect-free modules)"
" (skipped side-effect-free modules)"
: "(skipped side-effect-free modules)"
);
// removing the currect reason, by not adding it to the newReasons array

+ 15
- 15
lib/optimize/SplitChunksPlugin.js View File

@@ -534,8 +534,8 @@ module.exports = class SplitChunksPlugin {
cacheGroupSource.minSize !== undefined
? cacheGroupSource.minSize
: cacheGroupSource.enforce
? 0
: this.options.minSize,
? 0
: this.options.minSize,
minSizeForMaxSize:
cacheGroupSource.minSize !== undefined
? cacheGroupSource.minSize
@@ -544,26 +544,26 @@ module.exports = class SplitChunksPlugin {
cacheGroupSource.maxSize !== undefined
? cacheGroupSource.maxSize
: cacheGroupSource.enforce
? 0
: this.options.maxSize,
? 0
: this.options.maxSize,
minChunks:
cacheGroupSource.minChunks !== undefined
? cacheGroupSource.minChunks
: cacheGroupSource.enforce
? 1
: this.options.minChunks,
? 1
: this.options.minChunks,
maxAsyncRequests:
cacheGroupSource.maxAsyncRequests !== undefined
? cacheGroupSource.maxAsyncRequests
: cacheGroupSource.enforce
? Infinity
: this.options.maxAsyncRequests,
? Infinity
: this.options.maxAsyncRequests,
maxInitialRequests:
cacheGroupSource.maxInitialRequests !== undefined
? cacheGroupSource.maxInitialRequests
: cacheGroupSource.enforce
? Infinity
: this.options.maxInitialRequests,
? Infinity
: this.options.maxInitialRequests,
getName:
cacheGroupSource.getName !== undefined
? cacheGroupSource.getName
@@ -683,11 +683,11 @@ module.exports = class SplitChunksPlugin {
const maxRequests = chunk.isOnlyInitial()
? item.cacheGroup.maxInitialRequests
: chunk.canBeInitial()
? Math.min(
item.cacheGroup.maxInitialRequests,
item.cacheGroup.maxAsyncRequests
)
: item.cacheGroup.maxAsyncRequests;
? Math.min(
item.cacheGroup.maxInitialRequests,
item.cacheGroup.maxAsyncRequests
)
: item.cacheGroup.maxAsyncRequests;
return (
!isFinite(maxRequests) || getRequests(chunk) < maxRequests
);

+ 4
- 6
lib/util/StackedSetMap.js View File

@@ -96,12 +96,10 @@ class StackedSetMap {

asPairArray() {
this._compress();
return Array.from(
this.map.entries(),
pair =>
/** @type {[TODO, TODO]} */ (pair[1] === UNDEFINED_MARKER
? [pair[0], undefined]
: pair)
return Array.from(this.map.entries(), pair =>
/** @type {[TODO, TODO]} */ (pair[1] === UNDEFINED_MARKER
? [pair[0], undefined]
: pair)
);
}


+ 2
- 2
lib/util/deterministicGrouping.js View File

@@ -156,8 +156,8 @@ module.exports = ({ maxSize, minSize, items, getSize, getKey }) => {
// We hit an edgecase where the working set is already smaller than minSize
// We merge it with the smallest result node to keep minSize intact
if (result.length > 0) {
const smallestGroup = result.reduce(
(min, group) => (min.size > group.size ? group : min)
const smallestGroup = result.reduce((min, group) =>
min.size > group.size ? group : min
);
for (const node of initialGroup.nodes) smallestGroup.nodes.push(node);
smallestGroup.nodes.sort((a, b) => {

+ 4
- 5
lib/util/identifier.js View File

@@ -36,11 +36,10 @@ const normalizePathSeparator = p => p.replace(/\\/g, "/");
const _makePathsRelative = (context, identifier) => {
return identifier
.split(/([|! ])/)
.map(
str =>
looksLikeAbsolutePath(str)
? normalizePathSeparator(path.relative(context, str))
: str
.map(str =>
looksLikeAbsolutePath(str)
? normalizePathSeparator(path.relative(context, str))
: str
)
.join("");
};

Loading…
Cancel
Save