Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 23 additions & 11 deletions lib/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let { abort } = require("faucet-pipeline-core/lib/util");
let { abort, repr } = require("faucet-pipeline-core/lib/util");
let makeAutoprefixer = require("./make-autoprefixer");
let makeSassRenderer = require("./make-sass-renderer");

Expand All @@ -8,14 +8,14 @@
plugin: faucetSass
};

function faucetSass(config, assetManager, { browsers, compact, sourcemaps } = {}) {
function faucetSass(config, assetManager, { compact, sourcemaps } = {}) {
let bundlers = config.map(bundleConfig =>
makeBundler(bundleConfig, assetManager, { browsers, compact, sourcemaps }));
makeBundler(bundleConfig, assetManager, { compact, sourcemaps }));

return filepaths => Promise.all(bundlers.map(bundle => bundle(filepaths)));
}

function makeBundler(config, assetManager, { browsers, compact, sourcemaps } = {}) {
function makeBundler(config, assetManager, { compact, sourcemaps } = {}) {
let { browserslist, fingerprint } = config;

if(!config.source || !config.target) {
Expand All @@ -25,13 +25,7 @@
let source = assetManager.resolvePath(config.source);
let target = assetManager.resolvePath(config.target, { enforceRelative: true });

if(browserslist === false) {
browsers = null;
} else if(browserslist) {
browsers = browsers[browserslist];
} else {
browsers = browsers.defaults;
}
let browsers = determineBrowsers(browserslist, assetManager.referenceDir);

let renderSass = makeSassRenderer(source, target, assetManager, sourcemaps, compact);
let autoprefix = makeAutoprefixer(source, assetManager, sourcemaps, browsers);
Expand Down Expand Up @@ -66,6 +60,24 @@
};
}

function determineBrowsers(browserslistEnv, referenceDir) {
if(browserslistEnv === false) {
return null;
}

let browserslist = require("browserslist");
let browsers = browserslist.findConfig(referenceDir) || {};

if(browserslistEnv) {
if(!browsers[browserslistEnv]) {
abort(`ERROR: The browserslist environment ${repr(browserslistEnv)} you requested is not defined`);

Check warning on line 73 in lib/index.js

View workflow job for this annotation

GitHub Actions / build (18.x)

This line has a length of 111. Maximum allowed is 90

Check warning on line 73 in lib/index.js

View workflow job for this annotation

GitHub Actions / build (latest)

This line has a length of 111. Maximum allowed is 90

Check warning on line 73 in lib/index.js

View workflow job for this annotation

GitHub Actions / build (22.x)

This line has a length of 111. Maximum allowed is 90
}
return browsers[browserslistEnv];
}

return browsers.defaults;
}

function previouslyIncluded(filepaths, previouslyIncludedFiles) {
return previouslyIncludedFiles === undefined ||
filepaths.some(filepath => previouslyIncludedFiles.
Expand Down
2 changes: 1 addition & 1 deletion lib/make-sass-renderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ let sass = require("sass");
module.exports = function(inputFileName, target, assetManager, sourcemaps, compact) {
let sassOptions = {
style: compact ? "compressed" : "expanded",
loadPaths: [assetManager.packagesDir],
loadPaths: [assetManager.resolvePath("./node_modules")],
sourceMap: sourcemaps,
functions: {
"asset-url($assetName)": args => {
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
},
"dependencies": {
"autoprefixer": "~10.4.20",
"browserslist": "^4.24.4",
"faucet-pipeline-core": "^2.0.0 || ^3.0.0",
"postcss": "~8.5.1",
"sass": "~1.86.0"
Expand Down
3 changes: 1 addition & 2 deletions test/test_prefix_with_different_browserslist/.browserslistrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[default]
chrome 64

[development]
[legacy]
IE 10
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module.exports = {
sass: [{
source: "./src/index.scss",
target: "./dist/bundle.css",
browserslist: "development"
browserslist: "legacy"
}],
manifest: {
target: "./dist/manifest.json",
Expand Down