Skip to content

Commit

Permalink
feat: passthrough nukecss options
Browse files Browse the repository at this point in the history
  • Loading branch information
patrickhulce committed Apr 17, 2017
1 parent 9e2dd40 commit 67eb71f
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 6 deletions.
6 changes: 2 additions & 4 deletions lib/handlers/css-handler.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
const _ = require('lodash')
const nukecss = require('nukecss')
const RawSource = require('webpack-sources').RawSource
const SourceMapSource = require('webpack-sources').SourceMapSource

Expand All @@ -16,11 +14,11 @@ class CssHandler extends Handler {
nukeCssOpts.sourceMap = {
from: name,
to: name,
inline: _.get(this._options, 'sourceMap.inline', false),
inline: false,
}
}

const nuked = nukecss(sourceContent, input, nukeCssOpts)
const nuked = this.nuke(sourceContent, input, nukeCssOpts)
return this._options.sourceMap && nuked.map ?
new SourceMapSource(nuked.css, name, nuked.map, input, inputSourceMap) :
new RawSource(nuked.css || nuked)
Expand Down
7 changes: 7 additions & 0 deletions lib/handlers/handler.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
const nukecss = require('nukecss')

class Handler {
constructor(options = {}) {
this._options = options
}

nuke(sources, css, options) {
options = Object.assign({}, this._options.nukecssOptions, options)
return nukecss(sources, css, options)
}
}

module.exports = Handler
3 changes: 1 addition & 2 deletions lib/handlers/js-handler.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ const assert = require('assert')

const _ = require('lodash')
const esprima = require('esprima')
const nukecss = require('nukecss')
const debug = require('debug')('nukecss-webpack:js-handler')
const ReplaceSource = require('webpack-sources').ReplaceSource

Expand Down Expand Up @@ -119,7 +118,7 @@ class JsHandler extends Handler {
const startIndex = allCode.indexOf(code)
const endIndex = startIndex + code.length
try {
const replacement = JsHandler.replaceCss(code, css => nukecss(sourceContent, css))
const replacement = JsHandler.replaceCss(code, css => this.nuke(sourceContent, css))
replacementAsset.replace(startIndex, endIndex, replacement)
} catch (err) {
// eslint-disable-next-line no-console
Expand Down
1 change: 1 addition & 0 deletions lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ class NukeCssPlugin {
sourceMap: false,
sourceWhitelist: [],
sourceBlacklist: [],
nukecssOptions: {},
}, options)

this._handlers = {
Expand Down
3 changes: 3 additions & 0 deletions test/fixtures/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ module.exports = {
sourceMap: true,
sourceWhitelist: ['whitelisted/'],
sourceBlacklist: ['blacklisted.js'],
nukecssOptions: {
whitelist: ['unused-but-whitelisted']
}
}),
new webpack.optimize.UglifyJsPlugin({sourceMap: true}),
]
Expand Down
4 changes: 4 additions & 0 deletions test/fixtures/whitelisted/entry.extracted.css
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ a:hover {
content: 'fa';
}

.unused-but-whitelisted {
content: 'fa';
}

.html-found {
color: white;
}
Expand Down
4 changes: 4 additions & 0 deletions test/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,4 +89,8 @@ describe('NukeCssPlugin', () => {
expect(fileStats['out.css'].content).to.contain('.html-found')
expect(fileStats['out.css'].content).to.not.contain('.html-ignored')
})

it('should use nukecss options specified', () => {
expect(fileStats['out.css'].content).to.contain('.unused-but-whitelisted')
})
})

0 comments on commit 67eb71f

Please sign in to comment.