Skip to content

Commit aed2eac

Browse files
FflorielFfloriel
committed
add prettier
1 parent 3d28eae commit aed2eac

File tree

9 files changed

+141
-131
lines changed

9 files changed

+141
-131
lines changed

‎client/containers/utils.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
import React from 'react';
22
import { MenuItem } from 'react-bootstrap';
33

4-
54
export function getMenuItems(buildNumber, selectBuild) {
65
const menuItems = [];
76
for (let i = buildNumber; i > 0; i -= 1) {
8-
menuItems.push(<MenuItem onClick={selectBuild} data-build={i} key={`build${i}`}>Build {i}</MenuItem>);
7+
menuItems.push(
8+
<MenuItem onClick={selectBuild} data-build={i} key={`build${i}`}>
9+
Build {i}
10+
</MenuItem>
11+
);
912
}
1013
return menuItems;
1114
}

‎package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
"build": "webpack --env development",
1111
"confirm": "webpack --env confirm",
1212
"launch": "webpack --env launch",
13-
"trial": "webpack --env trial"
13+
"trial": "webpack --env trial",
14+
"prettier": "npx prettier --write --single-quote '**/*.js'"
1415
},
1516
"repository": {
1617
"type": "git",
@@ -38,6 +39,7 @@
3839
"jest": "^22.0.4",
3940
"json-loader": "^0.5.7",
4041
"opener": "^1.4.3",
42+
"prettier": "^1.10.2",
4143
"purify-css": "^1.2.5",
4244
"purifycss-webpack": "^0.7.0",
4345
"style-loader": "^0.18.2",

‎plugin/npm-module/monitor.js

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,20 @@ const parseStats = require('./utils/parser');
99

1010
module.exports = class MonitorStats {
1111
constructor(options) {
12-
this.options = Object.assign({
13-
target: '../monitor/stats.json',
14-
jsonOpts: {
15-
source: false,
16-
chunkModules: true
12+
this.options = Object.assign(
13+
{
14+
target: '../monitor/stats.json',
15+
jsonOpts: {
16+
source: false,
17+
chunkModules: true
18+
},
19+
launch: false,
20+
capture: true,
21+
port: 8081,
22+
excludeSourceMaps: true
1723
},
18-
launch: false,
19-
capture: true,
20-
port: 8081,
21-
excludeSourceMaps: true
22-
}, options);
24+
options
25+
);
2326
}
2427

2528
apply(compiler) {
@@ -37,13 +40,15 @@ module.exports = class MonitorStats {
3740
.reduce((arr, el) => arr.concat(el))
3841
.filter(file => /\.js($|\?)/.test(file))
3942
.filter(file => compilation.assets[file])
40-
.forEach((file) => {
43+
.forEach(file => {
4144
const source = compilation.assets[file].source();
4245
const minified = source.split(/\r\n|\r|\n/).length < 25;
43-
const miniSize = minified ? false : babel.transform(source, { compact: true }).code.length;
46+
const miniSize = minified
47+
? false
48+
: babel.transform(source, { compact: true }).code.length;
4449
const obj = {
4550
name: file,
46-
minified,
51+
minified
4752
};
4853
if (miniSize) obj.miniSize = miniSize;
4954
isMinified.push(obj);
@@ -60,7 +65,7 @@ module.exports = class MonitorStats {
6065
.filter(file => compilation.assets[file])
6166
.reduce((concat, file) => {
6267
const sourceCSS = compilation.assets[file].source();
63-
return concat += sourceCSS;
68+
return (concat += sourceCSS);
6469
}, '');
6570
unPureSize = css.length;
6671
const js = compilation.chunks
@@ -70,7 +75,7 @@ module.exports = class MonitorStats {
7075
.filter(file => compilation.assets[file])
7176
.reduce((concat, file) => {
7277
const sourceJs = compilation.assets[file].source();
73-
return concat += sourceJs;
78+
return (concat += sourceJs);
7479
}, '');
7580

7681
const purified = purifycss(js || '', css || '', { minify: false });
@@ -79,7 +84,7 @@ module.exports = class MonitorStats {
7984
});
8085

8186
// CHECK IF TARGET DIRECTORY EXISTS...
82-
const targetDir = path.dirname(target)
87+
const targetDir = path.dirname(target);
8388
if (!fs.existsSync(targetDir)) {
8489
// ...make directory if it does not
8590
mkdirp.sync(targetDir);
@@ -93,7 +98,7 @@ module.exports = class MonitorStats {
9398
data = [];
9499
}
95100

96-
compiler.plugin('done', (stats) => {
101+
compiler.plugin('done', stats => {
97102
if (this.options.capture) {
98103
stats = stats.toJson(jsonOpts);
99104
const prev = data[data.length - 1];
@@ -108,8 +113,8 @@ module.exports = class MonitorStats {
108113
) {
109114
console.log('Writing new build');
110115
// Add minified data
111-
parsed.assets.forEach((asset) => {
112-
isMinified.forEach((minify) => {
116+
parsed.assets.forEach(asset => {
117+
isMinified.forEach(minify => {
113118
if (asset.name === minify.name) {
114119
asset.miniSize = minify.miniSize;
115120
asset.minified = minify.minified;

‎plugin/npm-module/utils/__mocks__/mock-stats.js

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// Mock a typical stats output, specifying what calculated valuables should be so
22
// that the test isn't brittle
33

4-
const sumAssetSize = (sum, size) => sum + size
5-
const sourceMapAssetsSizes = [2894415]
6-
const assetSizes = [3535, 2864415]
7-
const summedMapAssetsSize = sourceMapAssetsSizes.reduce(sumAssetSize, 0)
8-
const summedAssetsSize = assetSizes.reduce(sumAssetSize, 0)
4+
const sumAssetSize = (sum, size) => sum + size;
5+
const sourceMapAssetsSizes = [2894415];
6+
const assetSizes = [3535, 2864415];
7+
const summedMapAssetsSize = sourceMapAssetsSizes.reduce(sumAssetSize, 0);
8+
const summedAssetsSize = assetSizes.reduce(sumAssetSize, 0);
99

1010
export default () => ({
1111
allAssetsSize: summedAssetsSize + summedMapAssetsSize,
@@ -20,23 +20,23 @@ export default () => ({
2020
{
2121
chunks: [],
2222
name: 'logo.png',
23-
size: assetSizes[0],
23+
size: assetSizes[0]
2424
},
2525
{
2626
chunks: [0], // References the included chunks by id
2727
name: 'app.js',
28-
size: assetSizes[1],
28+
size: assetSizes[1]
2929
},
3030
{
3131
chunks: [0],
3232
name: 'app.js.map',
33-
size: sourceMapAssetsSizes[0],
34-
},
33+
size: sourceMapAssetsSizes[0]
34+
}
3535
],
3636
chunks: [
3737
{
3838
size: 978983,
39-
files: ['test-missing-modules.js'],
39+
files: ['test-missing-modules.js']
4040
},
4141
{
4242
size: 2864415,
@@ -45,15 +45,15 @@ export default () => ({
4545
{
4646
name: './node_modules/react/react.js',
4747
size: 56,
48-
id: 0,
48+
id: 0
4949
},
5050
{
5151
name: './node_modules/babel-runtime/helpers/classCallCheck.js',
5252
size: 208,
53-
id: 1,
54-
},
55-
],
56-
},
57-
],
58-
},
59-
})
53+
id: 1
54+
}
55+
]
56+
}
57+
]
58+
}
59+
});

‎plugin/npm-module/utils/parser.js

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
module.exports = (stats, target, options) => {
22
stats.assets = stats.assets.filter(asset => {
3-
if (asset.name === target) return false
3+
if (asset.name === target) return false;
44
// Filter out source maps by testing for file name ending with .map
5-
if (options.excludeSourceMaps) return !/\.map$/.test(asset.name)
6-
return true
7-
})
5+
if (options.excludeSourceMaps) return !/\.map$/.test(asset.name);
6+
return true;
7+
});
88

99
return {
1010
timeStamp: Date.now(),
@@ -17,20 +17,19 @@ module.exports = (stats, target, options) => {
1717
assets: stats.assets.map(asset => ({
1818
name: asset.name,
1919
chunks: asset.chunks,
20-
size: asset.size,
20+
size: asset.size
2121
})),
2222

2323
chunks: stats.chunks.map(chunk => ({
2424
size: chunk.size,
2525
files: chunk.files,
26-
modules: chunk.modules ?
27-
chunk.modules.map(module => ({
28-
name: module.name,
29-
size: module.size,
30-
id: module.id,
31-
}))
32-
: [],
33-
})),
34-
26+
modules: chunk.modules
27+
? chunk.modules.map(module => ({
28+
name: module.name,
29+
size: module.size,
30+
id: module.id
31+
}))
32+
: []
33+
}))
3534
};
3635
};

‎plugin/npm-module/utils/parser.spec.js

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
1-
import parser from './parser'
2-
import mockStats from './__mocks__/mock-stats'
1+
import parser from './parser';
2+
import mockStats from './__mocks__/mock-stats';
33

4-
const target = '/usr/local/code/webpackmonitor/monitor/stats.json'
4+
const target = '/usr/local/code/webpackmonitor/monitor/stats.json';
55

66
describe('utils/parser', () => {
77
it('includes the stats meta data in parsed data', () => {
8-
const { stats } = mockStats()
9-
const result = parser(stats, target, {})
8+
const { stats } = mockStats();
9+
const result = parser(stats, target, {});
1010

11-
expect(stats.time).toEqual(result.time)
12-
expect(stats.hash).toEqual(result.hash)
13-
expect(stats.errors).toEqual(result.errors)
14-
})
11+
expect(stats.time).toEqual(result.time);
12+
expect(stats.hash).toEqual(result.hash);
13+
expect(stats.errors).toEqual(result.errors);
14+
});
1515

1616
it('includes source maps when excludeSourceMaps is false', () => {
17-
const { stats, allAssetsSize, allAssetsLength } = mockStats()
18-
const result = parser(stats, target, { excludeSourceMaps: false })
17+
const { stats, allAssetsSize, allAssetsLength } = mockStats();
18+
const result = parser(stats, target, { excludeSourceMaps: false });
1919

20-
expect(result.assets.length).toEqual(allAssetsLength)
21-
expect(result.size).toEqual(allAssetsSize)
22-
})
20+
expect(result.assets.length).toEqual(allAssetsLength);
21+
expect(result.size).toEqual(allAssetsSize);
22+
});
2323

2424
it('filters out source maps when excludeSourceMaps is true', () => {
25-
const { stats, sourceAssetsSize, sourceAssetsLength } = mockStats()
26-
const result = parser(stats, target, { excludeSourceMaps: true })
25+
const { stats, sourceAssetsSize, sourceAssetsLength } = mockStats();
26+
const result = parser(stats, target, { excludeSourceMaps: true });
2727

28-
expect(result.assets.length).toEqual(sourceAssetsLength)
29-
expect(result.size).toEqual(sourceAssetsSize)
30-
})
28+
expect(result.assets.length).toEqual(sourceAssetsLength);
29+
expect(result.size).toEqual(sourceAssetsSize);
30+
});
3131

3232
it('ensures every chunk has a modules array', () => {
33-
const { stats } = mockStats()
34-
const result = parser(stats, target, {})
33+
const { stats } = mockStats();
34+
const result = parser(stats, target, {});
3535

3636
result.chunks.forEach(chunk => {
37-
expect(Array.isArray(chunk.modules)).toBeTruthy()
38-
})
39-
})
40-
})
37+
expect(Array.isArray(chunk.modules)).toBeTruthy();
38+
});
39+
});
40+
});

‎plugin/npm-module/utils/server.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ module.exports = (data, port, update) => {
77
const app = express();
88
const url = `http://localhost:${port}/`;
99
const options = {
10-
root: path.join(__dirname, '..', 'build'),
10+
root: path.join(__dirname, '..', 'build')
1111
};
1212

1313
app.use(express.static(options.root));
1414
app.use('/css', express.static(path.join(__dirname, '..', 'build', 'css')));
15-
15+
1616
app.get('/', (req, res) => {
1717
res.sendFile('index.html', options);
1818
});
@@ -23,7 +23,10 @@ module.exports = (data, port, update) => {
2323

2424
app.listen(port, () => {
2525
opener(url);
26-
console.log(colors.bold('\nWebpack-Monitor'), `is running on port ${port}!`);
26+
console.log(
27+
colors.bold('\nWebpack-Monitor'),
28+
`is running on port ${port}!`
29+
);
2730
console.log(colors.italic.red('Press ctrl C to exit'));
2831
});
2932
};

0 commit comments

Comments
 (0)