Skip to content

Commit f96f77a

Browse files
KocalKocal
committed
eslint --fix
1 parent 1805861 commit f96f77a

Some content is hidden

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

42 files changed

+1017
-993
lines changed

‎lib/package-helper.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ function isPackageInstalled(packageConfig) {
6666
try {
6767
require.resolve(packageConfig.name);
6868
return true;
69-
} catch (e) {
69+
} catch {
7070
return false;
7171
}
7272
}
@@ -79,7 +79,7 @@ function isPackageInstalled(packageConfig) {
7979
function getPackageVersion(packageName) {
8080
try {
8181
return require(`${packageName}/package.json`).version;
82-
} catch (e) {
82+
} catch {
8383
return null;
8484
}
8585
}

‎lib/utils/package-up.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ function findUpSync(name, { cwd = process.cwd() } = {}) {
5252
if (stats && stats.isFile()) {
5353
return filePath;
5454
}
55-
} catch (e) {}
55+
} catch {}
5656

5757
directory = path.dirname(directory);
5858
}

‎lib/webpack-manifest-plugin/helpers.js

Lines changed: 96 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -1,115 +1,123 @@
1+
/*
2+
* This file is part of the Symfony Webpack Encore package.
3+
*
4+
* (c) Fabien Potencier <[email protected]>
5+
*
6+
* For the full copyright and license information, please view the LICENSE
7+
* file that was distributed with this source code.
8+
*/
19
const { dirname, join, basename } = require('path');
210

311
const generateManifest = (compilation, files, { generate, seed = {} }) => {
4-
let result;
5-
if (generate) {
6-
const entrypointsArray = Array.from(compilation.entrypoints.entries());
7-
const entrypoints = entrypointsArray.reduce(
8-
(e, [name, entrypoint]) => Object.assign(e, { [name]: entrypoint.getFiles() }),
9-
{}
10-
);
11-
result = generate(seed, files, entrypoints);
12-
} else {
13-
result = files.reduce(
14-
(manifest, file) => Object.assign(manifest, { [file.name]: file.path }),
15-
seed
16-
);
17-
}
12+
let result;
13+
if (generate) {
14+
const entrypointsArray = Array.from(compilation.entrypoints.entries());
15+
const entrypoints = entrypointsArray.reduce(
16+
(e, [name, entrypoint]) => Object.assign(e, { [name]: entrypoint.getFiles() }),
17+
{}
18+
);
19+
result = generate(seed, files, entrypoints);
20+
} else {
21+
result = files.reduce(
22+
(manifest, file) => Object.assign(manifest, { [file.name]: file.path }),
23+
seed
24+
);
25+
}
1826

19-
return result;
27+
return result;
2028
};
2129

2230
const getFileType = (fileName, { transformExtensions }) => {
23-
const replaced = fileName.replace(/\?.*/, '');
24-
const split = replaced.split('.');
25-
const extension = split.pop();
26-
return transformExtensions.test(extension) ? `${split.pop()}.${extension}` : extension;
31+
const replaced = fileName.replace(/\?.*/, '');
32+
const split = replaced.split('.');
33+
const extension = split.pop();
34+
return transformExtensions.test(extension) ? `${split.pop()}.${extension}` : extension;
2735
};
2836

2937
const reduceAssets = (files, asset, moduleAssets) => {
30-
let name;
31-
if (moduleAssets[asset.name]) {
32-
name = moduleAssets[asset.name];
33-
} else if (asset.info.sourceFilename) {
34-
name = join(dirname(asset.name), basename(asset.info.sourceFilename));
35-
}
38+
let name;
39+
if (moduleAssets[asset.name]) {
40+
name = moduleAssets[asset.name];
41+
} else if (asset.info.sourceFilename) {
42+
name = join(dirname(asset.name), basename(asset.info.sourceFilename));
43+
}
3644

37-
if (name) {
38-
return files.concat({
39-
path: asset.name,
40-
name,
41-
isInitial: false,
42-
isChunk: false,
43-
isAsset: true,
44-
isModuleAsset: true
45-
});
46-
}
45+
if (name) {
46+
return files.concat({
47+
path: asset.name,
48+
name,
49+
isInitial: false,
50+
isChunk: false,
51+
isAsset: true,
52+
isModuleAsset: true
53+
});
54+
}
4755

48-
const isEntryAsset = asset.chunks && asset.chunks.length > 0;
49-
if (isEntryAsset) {
50-
return files;
51-
}
56+
const isEntryAsset = asset.chunks && asset.chunks.length > 0;
57+
if (isEntryAsset) {
58+
return files;
59+
}
5260

53-
return files.concat({
54-
path: asset.name,
55-
name: asset.name,
56-
isInitial: false,
57-
isChunk: false,
58-
isAsset: true,
59-
isModuleAsset: false
60-
});
61+
return files.concat({
62+
path: asset.name,
63+
name: asset.name,
64+
isInitial: false,
65+
isChunk: false,
66+
isAsset: true,
67+
isModuleAsset: false
68+
});
6169
};
6270

6371
const reduceChunk = (files, chunk, options, auxiliaryFiles) => {
64-
// auxiliary files contain things like images, fonts AND, most
65-
// importantly, other files like .map sourcemap files
66-
// we modify the auxiliaryFiles so that we can add any of these
67-
// to the manifest that was not added by another method
68-
// (sourcemaps files are not added via any other method)
69-
Array.from(chunk.auxiliaryFiles || []).forEach((auxiliaryFile) => {
70-
auxiliaryFiles[auxiliaryFile] = {
71-
path: auxiliaryFile,
72-
name: basename(auxiliaryFile),
73-
isInitial: false,
74-
isChunk: false,
75-
isAsset: true,
76-
isModuleAsset: true
77-
};
78-
});
72+
// auxiliary files contain things like images, fonts AND, most
73+
// importantly, other files like .map sourcemap files
74+
// we modify the auxiliaryFiles so that we can add any of these
75+
// to the manifest that was not added by another method
76+
// (sourcemaps files are not added via any other method)
77+
Array.from(chunk.auxiliaryFiles || []).forEach((auxiliaryFile) => {
78+
auxiliaryFiles[auxiliaryFile] = {
79+
path: auxiliaryFile,
80+
name: basename(auxiliaryFile),
81+
isInitial: false,
82+
isChunk: false,
83+
isAsset: true,
84+
isModuleAsset: true
85+
};
86+
});
7987

80-
return Array.from(chunk.files).reduce((prev, path) => {
81-
let name = chunk.name ? chunk.name : null;
82-
// chunk name, or for nameless chunks, just map the files directly.
83-
name = name
84-
? options.useEntryKeys && !path.endsWith('.map')
85-
? name
86-
: `${name}.${getFileType(path, options)}`
87-
: path;
88+
return Array.from(chunk.files).reduce((prev, path) => {
89+
let name = chunk.name ? chunk.name : null;
90+
// chunk name, or for nameless chunks, just map the files directly.
91+
name = name
92+
? options.useEntryKeys && !path.endsWith('.map')
93+
? name
94+
: `${name}.${getFileType(path, options)}`
95+
: path;
8896

89-
return prev.concat({
90-
path,
91-
chunk,
92-
name,
93-
isInitial: chunk.isOnlyInitial(),
94-
isChunk: true,
95-
isAsset: false,
96-
isModuleAsset: false
97-
});
98-
}, files);
97+
return prev.concat({
98+
path,
99+
chunk,
100+
name,
101+
isInitial: chunk.isOnlyInitial(),
102+
isChunk: true,
103+
isAsset: false,
104+
isModuleAsset: false
105+
});
106+
}, files);
99107
};
100108

101109
const standardizeFilePaths = (file) => {
102-
const result = Object.assign({}, file);
103-
result.name = file.name.replace(/\\/g, '/');
104-
result.path = file.path.replace(/\\/g, '/');
105-
return result;
110+
const result = Object.assign({}, file);
111+
result.name = file.name.replace(/\\/g, '/');
112+
result.path = file.path.replace(/\\/g, '/');
113+
return result;
106114
};
107115

108116
const transformFiles = (files, options) =>
109-
['filter', 'map', 'sort']
110-
.filter((fname) => !!options[fname])
117+
['filter', 'map', 'sort']
118+
.filter((fname) => !!options[fname])
111119
// TODO: deprecate these
112-
.reduce((prev, fname) => prev[fname](options[fname]), files)
113-
.map(standardizeFilePaths);
120+
.reduce((prev, fname) => prev[fname](options[fname]), files)
121+
.map(standardizeFilePaths);
114122

115123
module.exports = { generateManifest, reduceAssets, reduceChunk, transformFiles };

0 commit comments

Comments
 (0)