Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[gulpfile.js] Use the regular defines in the preprocessCSS function

Browse Source 
Rather than *manually* specifying a "mode", we can simply use the regular `defines` directly instead. To improve consistency, in the `external/builder/builder.js` file, a couple of parameters are also re-named.
This commit is contained in:
Jonas Jenwald 2022-03-15 13:53:49 +01:00
parent 489e9ff7d3
commit 5180bafb8f
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
external/builder/builder.js vendored
View File

@ -199,7 +199,7 @@ function preprocess(inFilename, outFilename, defines) {
} }
exports.preprocess = preprocess; exports.preprocess = preprocess;
function preprocessCSS(mode, source, destination) { function preprocessCSS(inFilename, outFilename, defines) {
function hasPrefixedMozcentral(line) { function hasPrefixedMozcentral(line) {
return /(^|\W)-(ms|o|webkit)-\w/.test(line); return /(^|\W)-(ms|o|webkit)-\w/.test(line);
} }
@ -262,16 +262,16 @@ function preprocessCSS(mode, source, destination) {
return lines.join("\n"); return lines.join("\n");
} }
if (!mode) { if (!defines) {
throw new Error("Invalid CSS preprocessor mode"); throw new Error("Missing CSS preprocessor defines.");
} }
let content = fs.readFileSync(source, "utf8").toString(); let content = fs.readFileSync(inFilename, "utf8").toString();
content = expandImports(content, source); content = expandImports(content, inFilename);
if (mode === "mozcentral") { if (defines.MOZCENTRAL) {
content = removePrefixed(content, hasPrefixedMozcentral); content = removePrefixed(content, hasPrefixedMozcentral);
} }
fs.writeFileSync(destination, content); fs.writeFileSync(outFilename, content);
} }
exports.preprocessCSS = preprocessCSS; exports.preprocessCSS = preprocessCSS;

16
gulpfile.js
View File

@ -801,9 +801,9 @@ gulp.task("cmaps", function (done) {
done(); done();
}); });
function preprocessCSS(source, mode, defines) { function preprocessCSS(source, defines) {
const outName = getTempFile("~preprocess", ".css"); const outName = getTempFile("~preprocess", ".css");
builder.preprocessCSS(mode, source, outName); builder.preprocessCSS(source, outName, defines);
let out = fs.readFileSync(outName).toString(); let out = fs.readFileSync(outName).toString();
fs.unlinkSync(outName); fs.unlinkSync(outName);
@ -848,7 +848,7 @@ function buildGeneric(defines, dir) {
createStandardFontBundle().pipe(gulp.dest(dir + "web/standard_fonts")), createStandardFontBundle().pipe(gulp.dest(dir + "web/standard_fonts")),
preprocessHTML("web/viewer.html", defines).pipe(gulp.dest(dir + "web")), preprocessHTML("web/viewer.html", defines).pipe(gulp.dest(dir + "web")),
preprocessCSS("web/viewer.css", "generic", defines) preprocessCSS("web/viewer.css", defines)
.pipe(postcss([calc(), autoprefixer(AUTOPREFIXER_CONFIG)])) .pipe(postcss([calc(), autoprefixer(AUTOPREFIXER_CONFIG)]))
.pipe(gulp.dest(dir + "web")), .pipe(gulp.dest(dir + "web")),
@ -924,7 +924,7 @@ function buildComponents(defines, dir) {
return merge([ return merge([
createComponentsBundle(defines).pipe(gulp.dest(dir)), createComponentsBundle(defines).pipe(gulp.dest(dir)),
gulp.src(COMPONENTS_IMAGES).pipe(gulp.dest(dir + "images")), gulp.src(COMPONENTS_IMAGES).pipe(gulp.dest(dir + "images")),
preprocessCSS("web/pdf_viewer.css", "components", defines) preprocessCSS("web/pdf_viewer.css", defines)
.pipe(postcss([calc(), autoprefixer(AUTOPREFIXER_CONFIG)])) .pipe(postcss([calc(), autoprefixer(AUTOPREFIXER_CONFIG)]))
.pipe(gulp.dest(dir)), .pipe(gulp.dest(dir)),
]); ]);
@ -1014,7 +1014,7 @@ function buildMinified(defines, dir) {
createStandardFontBundle().pipe(gulp.dest(dir + "web/standard_fonts")), createStandardFontBundle().pipe(gulp.dest(dir + "web/standard_fonts")),
preprocessHTML("web/viewer.html", defines).pipe(gulp.dest(dir + "web")), preprocessHTML("web/viewer.html", defines).pipe(gulp.dest(dir + "web")),
preprocessCSS("web/viewer.css", "minified", defines) preprocessCSS("web/viewer.css", defines)
.pipe(postcss([calc(), autoprefixer(AUTOPREFIXER_CONFIG)])) .pipe(postcss([calc(), autoprefixer(AUTOPREFIXER_CONFIG)]))
.pipe(gulp.dest(dir + "web")), .pipe(gulp.dest(dir + "web")),
@ -1244,7 +1244,7 @@ gulp.task(
preprocessHTML("web/viewer.html", defines).pipe( preprocessHTML("web/viewer.html", defines).pipe(
gulp.dest(MOZCENTRAL_CONTENT_DIR + "web") gulp.dest(MOZCENTRAL_CONTENT_DIR + "web")
), ),
preprocessCSS("web/viewer.css", "mozcentral", defines) preprocessCSS("web/viewer.css", defines)
.pipe( .pipe(
postcss([ postcss([
autoprefixer({ autoprefixer({
@ -1336,7 +1336,7 @@ gulp.task(
preprocessHTML("web/viewer.html", defines).pipe( preprocessHTML("web/viewer.html", defines).pipe(
gulp.dest(CHROME_BUILD_CONTENT_DIR + "web") gulp.dest(CHROME_BUILD_CONTENT_DIR + "web")
), ),
preprocessCSS("web/viewer.css", "chrome", defines) preprocessCSS("web/viewer.css", defines)
.pipe( .pipe(
postcss([autoprefixer({ overrideBrowserslist: ["Chrome >= 73"] })]) postcss([autoprefixer({ overrideBrowserslist: ["Chrome >= 73"] })])
) )
@ -1871,7 +1871,7 @@ gulp.task("dev-css", function createDevCSS() {
return merge([ return merge([
gulp.src("web/images/*", { base: "web/" }).pipe(gulp.dest(cssDir)), gulp.src("web/images/*", { base: "web/" }).pipe(gulp.dest(cssDir)),
preprocessCSS("web/viewer.css", "generic", defines) preprocessCSS("web/viewer.css", defines)
.pipe( .pipe(
postcss([autoprefixer({ overrideBrowserslist: ["last 2 versions"] })]) postcss([autoprefixer({ overrideBrowserslist: ["last 2 versions"] })])
) )