Skip to content
This repository was archived by the owner on Feb 1, 2020. It is now read-only.

Commit 8f0d75e

Browse files
FflorielFfloriel
committed
Remove css files from content
- filter content file to remove css files - remove console.log - remove purify options not present in purgecss
1 parent 75f880b commit 8f0d75e

File tree

3 files changed

+28
-45
lines changed

3 files changed

+28
-45
lines changed

‎lib/purgecss-webpack-plugin.es.js‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -62,30 +62,24 @@ class PurgecssPlugin {
6262
const output = this.options.verbose ? messageCb => console.info(...messageCb()) : () => {};
6363

6464
compilation.plugin('additional-assets', cb => {
65-
// Go through chunks and purify as configured
65+
// Go through chunks and purge as configured
6666
compilation.chunks.forEach(({ name: chunkName, files: files$$1, modules }) => {
67-
console.log('chunkForEach');
68-
const assetsToPurify = assets(compilation.assets, ['.css']).filter(asset => files$$1.indexOf(asset.name) >= 0);
67+
const assetsToPurge = assets(compilation.assets, ['.css']).filter(asset => files$$1.indexOf(asset.name) >= 0);
6968

70-
output(() => ['Assets to purify:', assetsToPurify.map(({ name }) => name).join(', ')]);
71-
console.log(assetsToPurify);
69+
output(() => ['Assets to purge:', assetsToPurge.map(({ name }) => name).join(', ')]);
7270

73-
assetsToPurify.forEach(({ name, asset }) => {
74-
console.log('assetsToPurify');
75-
const filesToSearch = entries(entryPaths$$1, chunkName).concat(files(modules, this.options.moduleExtensions || [], file => file.resource));
71+
assetsToPurge.forEach(({ name, asset }) => {
72+
const filesToSearch = entries(entryPaths$$1, chunkName).concat(files(modules, this.options.moduleExtensions || [], file => file.resource)).filter(v => !v.endsWith('.css'));
7673

7774
output(() => ['Files to search for used rules:', filesToSearch.join(', ')]);
7875

79-
// Compile through Purify and attach to output.
76+
// Compile through Purgecss and attach to output.
8077
// This loses sourcemaps should there be any!
8178
const purgecss = new Purgecss({
82-
content: [filesToSearch],
83-
css: [asset.source],
84-
stdin: true,
85-
info: this.options.verbose,
86-
minify: this.options.minimize
79+
content: filesToSearch,
80+
css: [asset.source()],
81+
stdin: true
8782
});
88-
console.log(purgecss.purge());
8983
compilation.assets[name] = new ConcatSource(purgecss.purge()[0].css);
9084
});
9185
});

‎lib/purgecss-webpack-plugin.js‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -66,30 +66,24 @@ class PurgecssPlugin {
6666
const output = this.options.verbose ? messageCb => console.info(...messageCb()) : () => {};
6767

6868
compilation.plugin('additional-assets', cb => {
69-
// Go through chunks and purify as configured
69+
// Go through chunks and purge as configured
7070
compilation.chunks.forEach(({ name: chunkName, files: files$$1, modules }) => {
71-
console.log('chunkForEach');
72-
const assetsToPurify = assets(compilation.assets, ['.css']).filter(asset => files$$1.indexOf(asset.name) >= 0);
71+
const assetsToPurge = assets(compilation.assets, ['.css']).filter(asset => files$$1.indexOf(asset.name) >= 0);
7372

74-
output(() => ['Assets to purify:', assetsToPurify.map(({ name }) => name).join(', ')]);
75-
console.log(assetsToPurify);
73+
output(() => ['Assets to purge:', assetsToPurge.map(({ name }) => name).join(', ')]);
7674

77-
assetsToPurify.forEach(({ name, asset }) => {
78-
console.log('assetsToPurify');
79-
const filesToSearch = entries(entryPaths$$1, chunkName).concat(files(modules, this.options.moduleExtensions || [], file => file.resource));
75+
assetsToPurge.forEach(({ name, asset }) => {
76+
const filesToSearch = entries(entryPaths$$1, chunkName).concat(files(modules, this.options.moduleExtensions || [], file => file.resource)).filter(v => !v.endsWith('.css'));
8077

8178
output(() => ['Files to search for used rules:', filesToSearch.join(', ')]);
8279

83-
// Compile through Purify and attach to output.
80+
// Compile through Purgecss and attach to output.
8481
// This loses sourcemaps should there be any!
8582
const purgecss = new Purgecss({
86-
content: [filesToSearch],
87-
css: [asset.source],
88-
stdin: true,
89-
info: this.options.verbose,
90-
minify: this.options.minimize
83+
content: filesToSearch,
84+
css: [asset.source()],
85+
stdin: true
9186
});
92-
console.log(purgecss.purge());
9387
compilation.assets[name] = new webpackSources.ConcatSource(purgecss.purge()[0].css);
9488
});
9589
});

‎src/index.js‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,19 @@ export default class PurgecssPlugin {
2525
: () => {}
2626

2727
compilation.plugin('additional-assets', cb => {
28-
// Go through chunks and purify as configured
28+
// Go through chunks and purge as configured
2929
compilation.chunks.forEach(
3030
({ name: chunkName, files, modules }) => {
31-
console.log('chunkForEach')
32-
const assetsToPurify = search
31+
const assetsToPurge = search
3332
.assets(compilation.assets, ['.css'])
3433
.filter(asset => files.indexOf(asset.name) >= 0)
3534

3635
output(() => [
37-
'Assets to purify:',
38-
assetsToPurify.map(({ name }) => name).join(', ')
36+
'Assets to purge:',
37+
assetsToPurge.map(({ name }) => name).join(', ')
3938
])
40-
console.log(assetsToPurify)
4139

42-
assetsToPurify.forEach(({ name, asset }) => {
43-
console.log('assetsToPurify')
40+
assetsToPurge.forEach(({ name, asset }) => {
4441
const filesToSearch = parse
4542
.entries(entryPaths, chunkName)
4643
.concat(
@@ -50,22 +47,20 @@ export default class PurgecssPlugin {
5047
file => file.resource
5148
)
5249
)
50+
.filter(v => !v.endsWith('.css'))
5351

5452
output(() => [
5553
'Files to search for used rules:',
5654
filesToSearch.join(', ')
5755
])
5856

59-
// Compile through Purify and attach to output.
57+
// Compile through Purgecss and attach to output.
6058
// This loses sourcemaps should there be any!
6159
const purgecss = new Purgecss({
62-
content: [filesToSearch],
63-
css: [asset.source],
64-
stdin: true,
65-
info: this.options.verbose,
66-
minify: this.options.minimize
60+
content: filesToSearch,
61+
css: [asset.source()],
62+
stdin: true
6763
})
68-
console.log(purgecss.purge())
6964
compilation.assets[name] = new ConcatSource(
7065
purgecss.purge()[0].css
7166
)

0 commit comments

Comments
 (0)