pdf.js/gulpfile.mjs

2476 lines
70 KiB
JavaScript
Raw Normal View History

2016-03-05 00:36:46 +09:00
/* Copyright 2016 Mozilla Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
Switch to using ESLint, instead of JSHint, for linting *Please note that most of the necessary code adjustments were made in PR 7890.* ESLint has a number of advantageous properties, compared to JSHint. Among those are: - The ability to find subtle bugs, thanks to more rules (e.g. PR 7881). - Much more customizable in general, and many rules allow fine-tuned behaviour rather than the just the on/off rules in JSHint. - Many more rules that can help developers avoid bugs, and a lot of rules that can be used to enforce a consistent coding style. The latter should be particularily useful for new contributors (and reduce the amount of stylistic review comments necessary). - The ability to easily specify exactly what rules to use/not to use, as opposed to JSHint which has a default set. *Note:* in future JSHint version some of the rules we depend on will be removed, according to warnings in http://jshint.com/docs/options/, so we wouldn't be able to update without losing lint coverage. - More easily disable one, or more, rules temporarily. In JSHint this requires using a numeric code, which isn't very user friendly, whereas in ESLint the rule name is simply used instead. By default there's no rules enabled in ESLint, but there are some default rule sets available. However, to prevent linting failures if we update ESLint in the future, it seemed easier to just explicitly specify what rules we want. Obviously this makes the ESLint config file somewhat bigger than the old JSHint config file, but given how rarely that one has been updated over the years I don't think that matters too much. I've tried, to the best of my ability, to ensure that we enable the same rules for ESLint that we had for JSHint. Furthermore, I've also enabled a number of rules that seemed to make sense, both to catch possible errors *and* various style guide violations. Despite the ESLint README claiming that it's slower that JSHint, https://github.com/eslint/eslint#how-does-eslint-performance-compare-to-jshint, locally this patch actually reduces the runtime for `gulp` lint (by approximately 20-25%). A couple of stylistic rules that would have been nice to enable, but where our code currently differs to much to make it feasible: - `comma-dangle`, controls trailing commas in Objects and Arrays (among others). - `object-curly-spacing`, controls spacing inside of Objects. - `spaced-comment`, used to enforce spaces after `//` and `/*. (This is made difficult by the fact that there's still some usage of the old preprocessor left.) Rules that I indend to look into possibly enabling in follow-ups, if it seems to make sense: `no-else-return`, `no-lonely-if`, `brace-style` with the `allowSingleLine` parameter removed. Useful links: - http://eslint.org/docs/user-guide/configuring - http://eslint.org/docs/rules/
2016-12-15 23:52:29 +09:00
/* eslint-env node */
2016-03-05 00:36:46 +09:00
import * as builder from "./external/builder/builder.mjs";
import { exec, spawn, spawnSync } from "child_process";
import autoprefixer from "autoprefixer";
import babel from "@babel/core";
import crypto from "crypto";
import { fileURLToPath } from "url";
import fs from "fs";
import gulp from "gulp";
import merge from "merge-stream";
import { mkdirp } from "mkdirp";
import path from "path";
import postcss from "gulp-postcss";
import postcssDirPseudoClass from "postcss-dir-pseudo-class";
import postcssNesting from "postcss-nesting";
import { preprocessPDFJSCode } from "./external/builder/preprocessor2.mjs";
import rename from "gulp-rename";
import replace from "gulp-replace";
import rimraf from "rimraf";
import stream from "stream";
import streamqueue from "streamqueue";
import through from "through2";
import Vinyl from "vinyl";
import webpack2 from "webpack";
import webpackStream from "webpack-stream";
import zip from "gulp-zip";
const __dirname = path.dirname(fileURLToPath(import.meta.url));
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const BUILD_DIR = "build/";
const L10N_DIR = "l10n/";
const TEST_DIR = "test/";
const EXTENSION_SRC_DIR = "extensions/";
const BASELINE_DIR = BUILD_DIR + "baseline/";
const MOZCENTRAL_BASELINE_DIR = BUILD_DIR + "mozcentral.baseline/";
const GENERIC_DIR = BUILD_DIR + "generic/";
const GENERIC_LEGACY_DIR = BUILD_DIR + "generic-legacy/";
const COMPONENTS_DIR = BUILD_DIR + "components/";
const COMPONENTS_LEGACY_DIR = BUILD_DIR + "components-legacy/";
const IMAGE_DECODERS_DIR = BUILD_DIR + "image_decoders/";
const IMAGE_DECODERS_LEGACY_DIR = BUILD_DIR + "image_decoders-legacy/";
const DEFAULT_PREFERENCES_DIR = BUILD_DIR + "default_preferences/";
const MINIFIED_DIR = BUILD_DIR + "minified/";
const MINIFIED_LEGACY_DIR = BUILD_DIR + "minified-legacy/";
const JSDOC_BUILD_DIR = BUILD_DIR + "jsdoc/";
const GH_PAGES_DIR = BUILD_DIR + "gh-pages/";
const SRC_DIR = "src/";
const DIST_DIR = BUILD_DIR + "dist/";
const TYPES_DIR = BUILD_DIR + "types/";
Re-factor how the `pdf.sandbox.js` file is built (PR 12604 follow-up) The way that the `pdf.sandbox.js` building was implemented feels all kinds of inconsistent/wrong, and it "sticks out" quite a bit when compared to the rest of the `gulpfile.js`. This patch thus attempts to improve the current situation slightly, to hopefully make future maintenance easier. One thing that strikes you, pretty immediately, when looking at PR 12604 is that the two new `gulp`-tasks added (i.e. `sandbox` and `watch-sandbox`) don't even work!? The reason for this is that they implicitly dependent upon the result of the `buildnumber`-task, which isn't listed as a dependency. (Try running `gulp clean` *first*, and invoking any of the new `gulp`-tasks will inevitably fail.) Furthermore, there's another (potentially big) problem with the implementation of e.g. the `gulp sandbox` task, since it doesn't actually wait for all building to complete before the task is considered as "done". This has the potential to cause all sorts of subtle bugs elsewhere, and the fact that things even "work" as-is can probably be attributed mostly to luck. Unfortunately there's no *perfect* way to improve things here, since the `pdf.sandbox.js` file depends on including the `pdf.scripting.js` file as a string, however I firmly believe that improvements are still possible here. To that end, this patch updates all relevant build-targets to create a *temporary* `pdf.scripting.js` file as part of the setup in the `gulp`-tasks, and then reads that file during the `pdf.sandbox.js` building. This at least allows us to bring all of this "sandbox"-build code much more in-line with the existing build-system.
2020-12-05 21:59:46 +09:00
const TMP_DIR = BUILD_DIR + "tmp/";
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const TYPESTEST_DIR = BUILD_DIR + "typestest/";
const COMMON_WEB_FILES = [
"web/images/*.{png,svg,gif}",
"web/debugger.{css,js}",
];
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const MOZCENTRAL_DIFF_FILE = "mozcentral.diff";
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const DIST_REPO_URL = "https://github.com/mozilla/pdfjs-dist";
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const CONFIG_FILE = "pdfjs.config";
const config = JSON.parse(fs.readFileSync(CONFIG_FILE).toString());
const ENV_TARGETS = [
"last 2 versions",
"Chrome >= 92",
"Firefox ESR",
[api-minor] Update the minimum supported Safari version to 15.4 This patch updates the minimum supported browsers as follows: - Safari 15.4, which was released on 2022-03-15; see https://en.wikipedia.org/wiki/Safari_version_history#Safari_15 Nowadays we usually we try, where feasible and possible, to support browsers that are about two years old. The reasons for limiting support to a *somewhat* more recent Safari version include: - Throughout the history of the PDF.js project, Safari has always been the worst browser to attempt to support. Compared to other browsers there's a disproportionate number of bugs affecting Safari, especially on iOS, and in most cases those are browser-specific issues that we simply cannot address.[1] - Safari has often been a lot slower, compared to other browsers, at implementing new web-platform features. Historically this has sometimes blocked usage of new features, for the benefit of the Firefox PDF Viewer, and it's very often meant having to include and maintain polyfills *only* for Safari. - The current (minimum) supported Safari version lack enough functionality that polyfills placed in the `src/shared/compatibility.js` file are unfortunately not sufficient, but it also requires a bunch of special-cases in both the `gulpfile` and in the `web/`-code. - Given that the *built-in* Firefox PDF Viewer is the primary development target for the PDF.js library, and the general development pace these days, we need to limit the maintenance "overhead" caused by other browsers. --- [1] In a few cases a work-around might be possible, however it'd negatively affect e.g. performance, readability, and/or maintainability of the code.
2023-04-29 15:58:44 +09:00
"Safari >= 15.4",
"Node >= 18",
"> 1%",
"not IE > 0",
"not dead",
];
// Default Autoprefixer config used for generic, components, minified-pre
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const AUTOPREFIXER_CONFIG = {
overrideBrowserslist: ENV_TARGETS,
2018-04-04 21:51:29 +09:00
};
// Default Babel targets used for generic, components, minified-pre
const BABEL_TARGETS = ENV_TARGETS.join(", ");
2018-04-04 21:51:29 +09:00
const DEFINES = Object.freeze({
SKIP_BABEL: true,
TESTING: undefined,
// The main build targets:
GENERIC: false,
MOZCENTRAL: false,
2022-12-15 00:40:25 +09:00
GECKOVIEW: false,
CHROME: false,
MINIFIED: false,
COMPONENTS: false,
LIB: false,
IMAGE_DECODERS: false,
});
2016-03-05 00:36:46 +09:00
function transform(charEncoding, transformFunction) {
return through.obj(function (vinylFile, enc, done) {
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const transformedFile = vinylFile.clone();
transformedFile.contents = Buffer.from(
transformFunction(transformedFile.contents),
charEncoding
);
done(null, transformedFile);
});
}
function safeSpawnSync(command, parameters, options) {
// Execute all commands in a shell.
options = options || {};
options.shell = true;
// `options.shell = true` requires parameters to be quoted.
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
parameters = parameters.map(param => {
if (!/[\s`~!#$*(){[|\\;'"<>?]/.test(param)) {
return param;
}
return '"' + param.replaceAll(/([$\\"`])/g, "\\$1") + '"';
});
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const result = spawnSync(command, parameters, options);
if (result.status !== 0) {
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
console.log(
'Error: command "' +
command +
'" with parameters "' +
parameters +
'" exited with code ' +
result.status
);
process.exit(result.status);
}
return result;
}
function startNode(args, options) {
// Node.js decreased the maximum header size from 80 KB to 8 KB in newer
// releases, which is not sufficient for some of our reference test files
// (such as `issue6360.pdf`), so we need to restore this value. Note that
// this argument needs to be before all other arguments as it needs to be
// passed to the Node.js process itself and not to the script that it runs.
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
args.unshift("--max-http-header-size=80000");
return spawn("node", args, options);
}
2016-03-05 00:36:46 +09:00
function createStringSource(filename, content) {
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const source = stream.Readable({ objectMode: true });
source._read = function () {
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
this.push(
new Vinyl({
path: filename,
contents: Buffer.from(content),
})
);
2016-03-05 00:36:46 +09:00
this.push(null);
};
return source;
}
function createWebpackConfig(
defines,
output,
{
disableVersionInfo = false,
disableSourceMaps = false,
disableLicenseHeader = false,
defaultPreferencesDir = null,
} = {}
) {
const versionInfo = !disableVersionInfo
? getVersionJSON()
: { version: 0, commit: 0 };
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const bundleDefines = builder.merge(defines, {
BUNDLE_VERSION: versionInfo.version,
BUNDLE_BUILD: versionInfo.commit,
TESTING: defines.TESTING ?? process.env.TESTING === "true",
DEFAULT_PREFERENCES: defaultPreferencesDir
? getDefaultPreferences(defaultPreferencesDir)
: {},
});
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const licenseHeaderLibre = fs
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
.readFileSync("./src/license_header_libre.js")
.toString();
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const enableSourceMaps =
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
!bundleDefines.MOZCENTRAL &&
!bundleDefines.CHROME &&
Re-factor how the `pdf.sandbox.js` file is built (PR 12604 follow-up) The way that the `pdf.sandbox.js` building was implemented feels all kinds of inconsistent/wrong, and it "sticks out" quite a bit when compared to the rest of the `gulpfile.js`. This patch thus attempts to improve the current situation slightly, to hopefully make future maintenance easier. One thing that strikes you, pretty immediately, when looking at PR 12604 is that the two new `gulp`-tasks added (i.e. `sandbox` and `watch-sandbox`) don't even work!? The reason for this is that they implicitly dependent upon the result of the `buildnumber`-task, which isn't listed as a dependency. (Try running `gulp clean` *first*, and invoking any of the new `gulp`-tasks will inevitably fail.) Furthermore, there's another (potentially big) problem with the implementation of e.g. the `gulp sandbox` task, since it doesn't actually wait for all building to complete before the task is considered as "done". This has the potential to cause all sorts of subtle bugs elsewhere, and the fact that things even "work" as-is can probably be attributed mostly to luck. Unfortunately there's no *perfect* way to improve things here, since the `pdf.sandbox.js` file depends on including the `pdf.scripting.js` file as a string, however I firmly believe that improvements are still possible here. To that end, this patch updates all relevant build-targets to create a *temporary* `pdf.scripting.js` file as part of the setup in the `gulp`-tasks, and then reads that file during the `pdf.sandbox.js` building. This at least allows us to bring all of this "sandbox"-build code much more in-line with the existing build-system.
2020-12-05 21:59:46 +09:00
!bundleDefines.LIB &&
!bundleDefines.TESTING &&
!disableSourceMaps;
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const skipBabel = bundleDefines.SKIP_BABEL;
// `core-js`, see https://github.com/zloirock/core-js/issues/514,
// should be excluded from processing.
const babelExcludes = ["node_modules[\\\\\\/]core-js"];
const babelExcludeRegExp = new RegExp(`(${babelExcludes.join("|")})`);
const babelPresets = skipBabel
? undefined
: [
[
"@babel/preset-env",
2023-09-09 22:28:17 +09:00
{ corejs: "3.32.2", shippedProposals: true, useBuiltIns: "usage" },
],
];
const babelPlugins = ["@babel/plugin-transform-modules-commonjs"];
const plugins = [];
if (!disableLicenseHeader) {
plugins.push(
new webpack2.BannerPlugin({ banner: licenseHeaderLibre, raw: true })
);
}
const experiments =
output.library?.type === "module" ? { outputModule: true } : undefined;
2018-05-20 22:18:43 +09:00
// Required to expose e.g., the `window` object.
output.globalObject = "globalThis";
2018-05-20 22:18:43 +09:00
const basicAlias = {
pdfjs: "src",
"pdfjs-web": "web",
"pdfjs-lib": "web/pdfjs",
};
const libraryAlias = {
"display-fetch_stream": "src/display/stubs.js",
"display-l10n_utils": "src/display/stubs.js",
"display-network": "src/display/stubs.js",
"display-node_stream": "src/display/stubs.js",
"display-node_utils": "src/display/stubs.js",
"display-svg": "src/display/stubs.js",
};
const viewerAlias = {
"web-annotation_editor_params": "web/annotation_editor_params.js",
"web-com": "",
"web-pdf_attachment_viewer": "web/pdf_attachment_viewer.js",
"web-pdf_cursor_tools": "web/pdf_cursor_tools.js",
"web-pdf_document_properties": "web/pdf_document_properties.js",
"web-pdf_find_bar": "web/pdf_find_bar.js",
"web-pdf_layer_viewer": "web/pdf_layer_viewer.js",
"web-pdf_outline_viewer": "web/pdf_outline_viewer.js",
"web-pdf_presentation_mode": "web/pdf_presentation_mode.js",
"web-pdf_sidebar": "web/pdf_sidebar.js",
"web-pdf_thumbnail_viewer": "web/pdf_thumbnail_viewer.js",
"web-print_service": "",
"web-secondary_toolbar": "web/secondary_toolbar.js",
"web-toolbar": "web/toolbar.js",
};
if (bundleDefines.CHROME) {
libraryAlias["display-fetch_stream"] = "src/display/fetch_stream.js";
libraryAlias["display-network"] = "src/display/network.js";
viewerAlias["web-com"] = "web/chromecom.js";
viewerAlias["web-print_service"] = "web/pdf_print_service.js";
} else if (bundleDefines.GENERIC) {
// Aliases defined here must also be replicated in the paths section of
// the tsconfig.json file for the type generation to work.
// In the tsconfig.json files, the .js extension must be omitted.
libraryAlias["display-fetch_stream"] = "src/display/fetch_stream.js";
libraryAlias["display-l10n_utils"] = "web/l10n_utils.js";
libraryAlias["display-network"] = "src/display/network.js";
libraryAlias["display-node_stream"] = "src/display/node_stream.js";
libraryAlias["display-node_utils"] = "src/display/node_utils.js";
libraryAlias["display-svg"] = "src/display/svg.js";
viewerAlias["web-com"] = "web/genericcom.js";
viewerAlias["web-print_service"] = "web/pdf_print_service.js";
} else if (bundleDefines.MOZCENTRAL) {
if (bundleDefines.GECKOVIEW) {
const gvAlias = {
"web-toolbar": "web/toolbar-geckoview.js",
};
for (const key in viewerAlias) {
viewerAlias[key] = gvAlias[key] || "web/stubs-geckoview.js";
}
}
viewerAlias["web-com"] = "web/firefoxcom.js";
viewerAlias["web-print_service"] = "web/firefox_print_service.js";
}
const alias = { ...basicAlias, ...libraryAlias, ...viewerAlias };
for (const key in alias) {
alias[key] = path.join(__dirname, alias[key]);
}
return {
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
mode: "none",
experiments,
output,
2018-05-20 22:18:43 +09:00
performance: {
hints: false, // Disable messages about larger file sizes.
},
plugins,
resolve: {
alias,
},
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
devtool: enableSourceMaps ? "source-map" : undefined,
module: {
2018-05-20 22:18:43 +09:00
rules: [
{
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
loader: "babel-loader",
exclude: babelExcludeRegExp,
options: {
presets: babelPresets,
plugins: babelPlugins,
targets: BABEL_TARGETS,
},
},
{
loader: path.join(__dirname, "external/webpack/pdfjsdev-loader.mjs"),
options: {
rootPath: __dirname,
saveComments: false,
defines: bundleDefines,
},
},
],
},
// Avoid shadowing actual Node.js variables with polyfills, by disabling
// polyfills/mocks - https://webpack.js.org/configuration/node/
node: false,
};
}
function webpack2Stream(webpackConfig) {
// Replacing webpack1 to webpack2 in the webpack-stream.
return webpackStream(webpackConfig, webpack2);
}
function getVersionJSON() {
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
return JSON.parse(fs.readFileSync(BUILD_DIR + "version.json").toString());
}
function checkChromePreferencesFile(chromePrefsPath, webPrefs) {
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const chromePrefs = JSON.parse(fs.readFileSync(chromePrefsPath).toString());
const chromePrefsKeys = Object.keys(chromePrefs.properties).filter(key => {
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const description = chromePrefs.properties[key].description;
// Deprecated keys are allowed in the managed preferences file.
// The code maintainer is responsible for adding migration logic to
// extensions/chromium/options/migration.js and web/chromecom.js .
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
return !description || !description.startsWith("DEPRECATED.");
});
let ret = true;
// Verify that every entry in webPrefs is also in preferences_schema.json.
for (const [key, value] of Object.entries(webPrefs)) {
if (!chromePrefsKeys.includes(key)) {
// Note: this would also reject keys that are present but marked as
// DEPRECATED. A key should not be marked as DEPRECATED if it is still
// listed in webPrefs.
ret = false;
console.log(
`Warning: ${chromePrefsPath} does not contain an entry for pref: ${key}`
);
} else if (chromePrefs.properties[key].default !== value) {
ret = false;
console.log(
`Warning: not the same values (for "${key}"): ` +
`${chromePrefs.properties[key].default} !== ${value}`
);
}
}
// Verify that preferences_schema.json does not contain entries that are not
// in webPrefs (app_options.js).
for (const key of chromePrefsKeys) {
if (!(key in webPrefs)) {
ret = false;
console.log(
`Warning: ${chromePrefsPath} contains an unrecognized pref: ${key}. ` +
`Remove it, or prepend "DEPRECATED. " and add migration logic to ` +
`extensions/chromium/options/migration.js and web/chromecom.js.`
);
}
}
return ret;
}
function replaceWebpackRequire() {
// Produced bundles can be rebundled again, avoid collisions (e.g. in api.js)
// by renaming __webpack_require__ to something else.
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
return replace("__webpack_require__", "__w_pdfjs_require__");
}
function replaceNonWebpackImport() {
return replace("__non_webpack_import__", "import");
}
function addGlobalExports(amdName, jsName) {
const replacer = [
`module\\.exports = factory\\(\\);`,
`define\\("${amdName}", \\[\\], factory\\);`,
`exports\\["${amdName}"\\] = factory\\(\\);`,
`root\\["${amdName}"\\] = factory\\(\\);`,
];
const regex = new RegExp(`(${replacer.join("|")})`, "gm");
return replace(regex, match => {
switch (match) {
case `module.exports = factory();`:
return `module.exports = root.${jsName} = factory();`;
case `define("${amdName}", [], factory);`:
return `define("${amdName}", [], () => { return (root.${jsName} = factory()); });`;
case `exports["${amdName}"] = factory();`:
return `exports["${amdName}"] = root.${jsName} = factory();`;
case `root["${amdName}"] = factory();`:
return `root["${amdName}"] = root.${jsName} = factory();`;
}
return match;
});
}
function createMainBundle(defines) {
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const mainAMDName = "pdfjs-dist/build/pdf";
const mainOutputName = "pdf.js";
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const mainFileConfig = createWebpackConfig(defines, {
filename: mainOutputName,
library: mainAMDName,
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
libraryTarget: "umd",
umdNamedDefine: true,
});
return gulp
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
.src("./src/pdf.js")
.pipe(webpack2Stream(mainFileConfig))
.pipe(replaceWebpackRequire())
.pipe(replaceNonWebpackImport())
.pipe(addGlobalExports(mainAMDName, "pdfjsLib"));
}
function createScriptingBundle(defines, extraOptions = undefined) {
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const scriptingAMDName = "pdfjs-dist/build/pdf.scripting";
const scriptingOutputName = "pdf.scripting.js";
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const scriptingFileConfig = createWebpackConfig(
defines,
{
filename: scriptingOutputName,
library: scriptingAMDName,
libraryTarget: "umd",
umdNamedDefine: true,
},
extraOptions
);
return gulp
.src("./src/pdf.scripting.js")
.pipe(webpack2Stream(scriptingFileConfig))
.pipe(replaceWebpackRequire())
.pipe(replaceNonWebpackImport())
.pipe(addGlobalExports(scriptingAMDName, "pdfjsScripting"));
}
function createSandboxExternal(defines) {
const licenseHeader = fs.readFileSync("./src/license_header.js").toString();
const ctx = {
saveComments: false,
defines,
};
return gulp
.src("./src/pdf.sandbox.external.js")
.pipe(rename("pdf.sandbox.external.sys.mjs"))
.pipe(
transform("utf8", content => {
content = preprocessPDFJSCode(ctx, content);
return `${licenseHeader}\n${content}`;
})
);
}
function createTemporaryScriptingBundle(defines, extraOptions = undefined) {
Re-factor how the `pdf.sandbox.js` file is built (PR 12604 follow-up) The way that the `pdf.sandbox.js` building was implemented feels all kinds of inconsistent/wrong, and it "sticks out" quite a bit when compared to the rest of the `gulpfile.js`. This patch thus attempts to improve the current situation slightly, to hopefully make future maintenance easier. One thing that strikes you, pretty immediately, when looking at PR 12604 is that the two new `gulp`-tasks added (i.e. `sandbox` and `watch-sandbox`) don't even work!? The reason for this is that they implicitly dependent upon the result of the `buildnumber`-task, which isn't listed as a dependency. (Try running `gulp clean` *first*, and invoking any of the new `gulp`-tasks will inevitably fail.) Furthermore, there's another (potentially big) problem with the implementation of e.g. the `gulp sandbox` task, since it doesn't actually wait for all building to complete before the task is considered as "done". This has the potential to cause all sorts of subtle bugs elsewhere, and the fact that things even "work" as-is can probably be attributed mostly to luck. Unfortunately there's no *perfect* way to improve things here, since the `pdf.sandbox.js` file depends on including the `pdf.scripting.js` file as a string, however I firmly believe that improvements are still possible here. To that end, this patch updates all relevant build-targets to create a *temporary* `pdf.scripting.js` file as part of the setup in the `gulp`-tasks, and then reads that file during the `pdf.sandbox.js` building. This at least allows us to bring all of this "sandbox"-build code much more in-line with the existing build-system.
2020-12-05 21:59:46 +09:00
return createScriptingBundle(defines, {
disableVersionInfo: !!(extraOptions && extraOptions.disableVersionInfo),
Re-factor how the `pdf.sandbox.js` file is built (PR 12604 follow-up) The way that the `pdf.sandbox.js` building was implemented feels all kinds of inconsistent/wrong, and it "sticks out" quite a bit when compared to the rest of the `gulpfile.js`. This patch thus attempts to improve the current situation slightly, to hopefully make future maintenance easier. One thing that strikes you, pretty immediately, when looking at PR 12604 is that the two new `gulp`-tasks added (i.e. `sandbox` and `watch-sandbox`) don't even work!? The reason for this is that they implicitly dependent upon the result of the `buildnumber`-task, which isn't listed as a dependency. (Try running `gulp clean` *first*, and invoking any of the new `gulp`-tasks will inevitably fail.) Furthermore, there's another (potentially big) problem with the implementation of e.g. the `gulp sandbox` task, since it doesn't actually wait for all building to complete before the task is considered as "done". This has the potential to cause all sorts of subtle bugs elsewhere, and the fact that things even "work" as-is can probably be attributed mostly to luck. Unfortunately there's no *perfect* way to improve things here, since the `pdf.sandbox.js` file depends on including the `pdf.scripting.js` file as a string, however I firmly believe that improvements are still possible here. To that end, this patch updates all relevant build-targets to create a *temporary* `pdf.scripting.js` file as part of the setup in the `gulp`-tasks, and then reads that file during the `pdf.sandbox.js` building. This at least allows us to bring all of this "sandbox"-build code much more in-line with the existing build-system.
2020-12-05 21:59:46 +09:00
disableSourceMaps: true,
disableLicenseHeader: true,
}).pipe(gulp.dest(TMP_DIR));
}
function createSandboxBundle(defines, extraOptions = undefined) {
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const sandboxAMDName = "pdfjs-dist/build/pdf.sandbox";
const sandboxOutputName = "pdf.sandbox.js";
Re-factor how the `pdf.sandbox.js` file is built (PR 12604 follow-up) The way that the `pdf.sandbox.js` building was implemented feels all kinds of inconsistent/wrong, and it "sticks out" quite a bit when compared to the rest of the `gulpfile.js`. This patch thus attempts to improve the current situation slightly, to hopefully make future maintenance easier. One thing that strikes you, pretty immediately, when looking at PR 12604 is that the two new `gulp`-tasks added (i.e. `sandbox` and `watch-sandbox`) don't even work!? The reason for this is that they implicitly dependent upon the result of the `buildnumber`-task, which isn't listed as a dependency. (Try running `gulp clean` *first*, and invoking any of the new `gulp`-tasks will inevitably fail.) Furthermore, there's another (potentially big) problem with the implementation of e.g. the `gulp sandbox` task, since it doesn't actually wait for all building to complete before the task is considered as "done". This has the potential to cause all sorts of subtle bugs elsewhere, and the fact that things even "work" as-is can probably be attributed mostly to luck. Unfortunately there's no *perfect* way to improve things here, since the `pdf.sandbox.js` file depends on including the `pdf.scripting.js` file as a string, however I firmly believe that improvements are still possible here. To that end, this patch updates all relevant build-targets to create a *temporary* `pdf.scripting.js` file as part of the setup in the `gulp`-tasks, and then reads that file during the `pdf.sandbox.js` building. This at least allows us to bring all of this "sandbox"-build code much more in-line with the existing build-system.
2020-12-05 21:59:46 +09:00
const scriptingPath = TMP_DIR + "pdf.scripting.js";
// Insert the source as a string to be `eval`-ed in the sandbox.
const sandboxDefines = builder.merge(defines, {
Re-factor how the `pdf.sandbox.js` file is built (PR 12604 follow-up) The way that the `pdf.sandbox.js` building was implemented feels all kinds of inconsistent/wrong, and it "sticks out" quite a bit when compared to the rest of the `gulpfile.js`. This patch thus attempts to improve the current situation slightly, to hopefully make future maintenance easier. One thing that strikes you, pretty immediately, when looking at PR 12604 is that the two new `gulp`-tasks added (i.e. `sandbox` and `watch-sandbox`) don't even work!? The reason for this is that they implicitly dependent upon the result of the `buildnumber`-task, which isn't listed as a dependency. (Try running `gulp clean` *first*, and invoking any of the new `gulp`-tasks will inevitably fail.) Furthermore, there's another (potentially big) problem with the implementation of e.g. the `gulp sandbox` task, since it doesn't actually wait for all building to complete before the task is considered as "done". This has the potential to cause all sorts of subtle bugs elsewhere, and the fact that things even "work" as-is can probably be attributed mostly to luck. Unfortunately there's no *perfect* way to improve things here, since the `pdf.sandbox.js` file depends on including the `pdf.scripting.js` file as a string, however I firmly believe that improvements are still possible here. To that end, this patch updates all relevant build-targets to create a *temporary* `pdf.scripting.js` file as part of the setup in the `gulp`-tasks, and then reads that file during the `pdf.sandbox.js` building. This at least allows us to bring all of this "sandbox"-build code much more in-line with the existing build-system.
2020-12-05 21:59:46 +09:00
PDF_SCRIPTING_JS_SOURCE: fs.readFileSync(scriptingPath).toString(),
});
Re-factor how the `pdf.sandbox.js` file is built (PR 12604 follow-up) The way that the `pdf.sandbox.js` building was implemented feels all kinds of inconsistent/wrong, and it "sticks out" quite a bit when compared to the rest of the `gulpfile.js`. This patch thus attempts to improve the current situation slightly, to hopefully make future maintenance easier. One thing that strikes you, pretty immediately, when looking at PR 12604 is that the two new `gulp`-tasks added (i.e. `sandbox` and `watch-sandbox`) don't even work!? The reason for this is that they implicitly dependent upon the result of the `buildnumber`-task, which isn't listed as a dependency. (Try running `gulp clean` *first*, and invoking any of the new `gulp`-tasks will inevitably fail.) Furthermore, there's another (potentially big) problem with the implementation of e.g. the `gulp sandbox` task, since it doesn't actually wait for all building to complete before the task is considered as "done". This has the potential to cause all sorts of subtle bugs elsewhere, and the fact that things even "work" as-is can probably be attributed mostly to luck. Unfortunately there's no *perfect* way to improve things here, since the `pdf.sandbox.js` file depends on including the `pdf.scripting.js` file as a string, however I firmly believe that improvements are still possible here. To that end, this patch updates all relevant build-targets to create a *temporary* `pdf.scripting.js` file as part of the setup in the `gulp`-tasks, and then reads that file during the `pdf.sandbox.js` building. This at least allows us to bring all of this "sandbox"-build code much more in-line with the existing build-system.
2020-12-05 21:59:46 +09:00
fs.unlinkSync(scriptingPath);
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const sandboxFileConfig = createWebpackConfig(
Re-factor how the `pdf.sandbox.js` file is built (PR 12604 follow-up) The way that the `pdf.sandbox.js` building was implemented feels all kinds of inconsistent/wrong, and it "sticks out" quite a bit when compared to the rest of the `gulpfile.js`. This patch thus attempts to improve the current situation slightly, to hopefully make future maintenance easier. One thing that strikes you, pretty immediately, when looking at PR 12604 is that the two new `gulp`-tasks added (i.e. `sandbox` and `watch-sandbox`) don't even work!? The reason for this is that they implicitly dependent upon the result of the `buildnumber`-task, which isn't listed as a dependency. (Try running `gulp clean` *first*, and invoking any of the new `gulp`-tasks will inevitably fail.) Furthermore, there's another (potentially big) problem with the implementation of e.g. the `gulp sandbox` task, since it doesn't actually wait for all building to complete before the task is considered as "done". This has the potential to cause all sorts of subtle bugs elsewhere, and the fact that things even "work" as-is can probably be attributed mostly to luck. Unfortunately there's no *perfect* way to improve things here, since the `pdf.sandbox.js` file depends on including the `pdf.scripting.js` file as a string, however I firmly believe that improvements are still possible here. To that end, this patch updates all relevant build-targets to create a *temporary* `pdf.scripting.js` file as part of the setup in the `gulp`-tasks, and then reads that file during the `pdf.sandbox.js` building. This at least allows us to bring all of this "sandbox"-build code much more in-line with the existing build-system.
2020-12-05 21:59:46 +09:00
sandboxDefines,
{
filename: sandboxOutputName,
library: sandboxAMDName,
libraryTarget: "umd",
umdNamedDefine: true,
},
extraOptions
);
return gulp
.src("./src/pdf.sandbox.js")
.pipe(webpack2Stream(sandboxFileConfig))
.pipe(replaceWebpackRequire())
.pipe(replaceNonWebpackImport())
.pipe(addGlobalExports(sandboxAMDName, "pdfjsSandbox"));
}
function createWorkerBundle(defines) {
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const workerAMDName = "pdfjs-dist/build/pdf.worker";
const workerOutputName = "pdf.worker.js";
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const workerFileConfig = createWebpackConfig(defines, {
filename: workerOutputName,
library: workerAMDName,
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
libraryTarget: "umd",
umdNamedDefine: true,
});
return gulp
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
.src("./src/pdf.worker.js")
.pipe(webpack2Stream(workerFileConfig))
.pipe(replaceWebpackRequire())
.pipe(replaceNonWebpackImport())
.pipe(addGlobalExports(workerAMDName, "pdfjsWorker"));
}
function createWebBundle(defines, options) {
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const viewerOutputName = "viewer.js";
const viewerFileConfig = createWebpackConfig(
defines,
{
filename: viewerOutputName,
},
{
defaultPreferencesDir: options.defaultPreferencesDir,
}
);
return gulp
.src("./web/viewer.js")
.pipe(webpack2Stream(viewerFileConfig))
.pipe(replaceNonWebpackImport());
}
2022-12-15 00:40:25 +09:00
function createGVWebBundle(defines, options) {
const viewerOutputName = "viewer-geckoview.js";
defines = builder.merge(defines, { GECKOVIEW: true });
const viewerFileConfig = createWebpackConfig(
defines,
{
filename: viewerOutputName,
},
{
defaultPreferencesDir: options.defaultPreferencesDir,
}
);
return gulp
.src("./web/viewer-geckoview.js")
.pipe(webpack2Stream(viewerFileConfig))
.pipe(replaceNonWebpackImport());
}
function createComponentsBundle(defines) {
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const componentsAMDName = "pdfjs-dist/web/pdf_viewer";
const componentsOutputName = "pdf_viewer.js";
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const componentsFileConfig = createWebpackConfig(defines, {
filename: componentsOutputName,
library: componentsAMDName,
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
libraryTarget: "umd",
umdNamedDefine: true,
});
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
return gulp
.src("./web/pdf_viewer.component.js")
.pipe(webpack2Stream(componentsFileConfig))
.pipe(replaceWebpackRequire())
.pipe(replaceNonWebpackImport())
.pipe(addGlobalExports(componentsAMDName, "pdfjsViewer"));
}
function createImageDecodersBundle(defines) {
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const imageDecodersAMDName = "pdfjs-dist/image_decoders/pdf.image_decoders";
const imageDecodersOutputName = "pdf.image_decoders.js";
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const componentsFileConfig = createWebpackConfig(defines, {
filename: imageDecodersOutputName,
library: imageDecodersAMDName,
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
libraryTarget: "umd",
umdNamedDefine: true,
});
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
return gulp
.src("./src/pdf.image_decoders.js")
.pipe(webpack2Stream(componentsFileConfig))
.pipe(replaceWebpackRequire())
.pipe(replaceNonWebpackImport())
.pipe(addGlobalExports(imageDecodersAMDName, "pdfjsImageDecoders"));
}
function createCMapBundle() {
return gulp.src(["external/bcmaps/*.bcmap", "external/bcmaps/LICENSE"], {
base: "external/bcmaps",
});
}
function createStandardFontBundle() {
return gulp.src(
[
"external/standard_fonts/*.pfb",
"external/standard_fonts/*.ttf",
"external/standard_fonts/LICENSE_FOXIT",
"external/standard_fonts/LICENSE_LIBERATION",
],
{
base: "external/standard_fonts",
}
);
}
function checkFile(filePath) {
2016-05-02 23:58:29 +09:00
try {
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const stat = fs.lstatSync(filePath);
2016-05-02 23:58:29 +09:00
return stat.isFile();
} catch {
2016-05-02 23:58:29 +09:00
return false;
}
}
function checkDir(dirPath) {
try {
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const stat = fs.lstatSync(dirPath);
return stat.isDirectory();
} catch {
return false;
}
}
function replaceInFile(filePath, find, replacement) {
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
let content = fs.readFileSync(filePath).toString();
2017-04-15 04:28:46 +09:00
content = content.replace(find, replacement);
fs.writeFileSync(filePath, content);
2017-04-15 04:28:46 +09:00
}
function getTempFile(prefix, suffix) {
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
mkdirp.sync(BUILD_DIR + "tmp/");
const bytes = crypto.randomBytes(6).toString("hex");
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const filePath = BUILD_DIR + "tmp/" + prefix + bytes + suffix;
fs.writeFileSync(filePath, "");
return filePath;
}
function createTestSource(testsName, { bot = false, xfaOnly = false } = {}) {
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const source = stream.Readable({ objectMode: true });
source._read = function () {
2016-05-02 23:58:29 +09:00
console.log();
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
console.log("### Running " + testsName + " tests");
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const PDF_TEST = process.env.PDF_TEST || "test_manifest.json";
let forceNoChrome = false;
const args = ["test.mjs"];
2016-05-02 23:58:29 +09:00
switch (testsName) {
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
case "browser":
if (!bot) {
args.push("--reftest");
} else {
const os = process.env.OS;
if (/windows/i.test(os)) {
// The browser-tests are too slow in Google Chrome on the Windows
// bot, causing a timeout, hence disabling them for now.
forceNoChrome = true;
}
}
if (xfaOnly) {
args.push("--xfaOnly");
}
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
args.push("--manifestFile=" + PDF_TEST);
2016-05-02 23:58:29 +09:00
break;
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
case "unit":
args.push("--unitTest");
2016-05-02 23:58:29 +09:00
break;
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
case "font":
args.push("--fontTest");
2016-05-02 23:58:29 +09:00
break;
case "integration":
args.push("--integration");
break;
2016-05-02 23:58:29 +09:00
default:
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
this.emit("error", new Error("Unknown name: " + testsName));
2016-05-02 23:58:29 +09:00
return null;
}
if (bot) {
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
args.push("--strictVerify");
}
if (process.argv.includes("--noChrome") || forceNoChrome) {
args.push("--noChrome");
}
2016-05-02 23:58:29 +09:00
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const testProcess = startNode(args, { cwd: TEST_DIR, stdio: "inherit" });
testProcess.on("close", function (code) {
2016-05-02 23:58:29 +09:00
source.push(null);
});
return undefined;
2016-05-02 23:58:29 +09:00
};
return source;
}
function makeRef(done, bot) {
2017-02-25 08:12:02 +09:00
console.log();
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
console.log("### Creating reference images");
2017-02-25 08:12:02 +09:00
let forceNoChrome = false;
const args = ["test.mjs", "--masterMode"];
if (bot) {
const os = process.env.OS;
if (/windows/i.test(os)) {
// The browser-tests are too slow in Google Chrome on the Windows
// bot, causing a timeout, hence disabling them for now.
forceNoChrome = true;
}
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
args.push("--noPrompts", "--strictVerify");
2017-02-25 08:12:02 +09:00
}
if (process.argv.includes("--noChrome") || forceNoChrome) {
args.push("--noChrome");
}
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const testProcess = startNode(args, { cwd: TEST_DIR, stdio: "inherit" });
testProcess.on("close", function (code) {
2017-02-25 08:12:02 +09:00
done();
});
}
gulp.task("default", function (done) {
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
console.log("Available tasks:");
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const tasks = Object.keys(gulp.registry().tasks());
for (const taskName of tasks.sort()) {
if (taskName.endsWith("-pre")) {
continue;
}
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
console.log(" " + taskName);
}
done();
2016-03-05 00:36:46 +09:00
});
function createBuildNumber(done) {
console.log();
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
console.log("### Getting extension build number");
exec(
"git log --format=oneline " + config.baseVersion + "..",
function (err, stdout, stderr) {
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
let buildNumber = 0;
if (!err) {
// Build number is the number of commits since base version
buildNumber = stdout ? stdout.match(/\n/g).length : 0;
} else {
console.log(
"This is not a Git repository; using default build number."
);
}
console.log("Extension build number: " + buildNumber);
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const version = config.versionPrefix + buildNumber;
exec('git log --format="%h" -n 1', function (err2, stdout2, stderr2) {
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
let buildCommit = "";
if (!err2) {
buildCommit = stdout2.replace("\n", "");
}
createStringSource(
"version.json",
JSON.stringify(
{
version,
build: buildNumber,
commit: buildCommit,
},
null,
2
)
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
)
.pipe(gulp.dest(BUILD_DIR))
.on("end", done);
});
}
);
}
function buildDefaultPreferences(defines, dir) {
console.log();
console.log("### Building default preferences");
const bundleDefines = builder.merge(defines, {
LIB: true,
TESTING: defines.TESTING ?? process.env.TESTING === "true",
});
const defaultPreferencesConfig = createWebpackConfig(
bundleDefines,
{
filename: "app_options.mjs",
library: {
type: "module",
},
},
{
disableVersionInfo: true,
}
);
return gulp
.src("web/app_options.js")
.pipe(webpack2Stream(defaultPreferencesConfig))
.pipe(gulp.dest(DEFAULT_PREFERENCES_DIR + dir));
}
async function parseDefaultPreferences(dir) {
console.log();
console.log("### Parsing default preferences");
// eslint-disable-next-line no-unsanitized/method
const { AppOptions, OptionKind } = await import(
"./" + DEFAULT_PREFERENCES_DIR + dir + "app_options.mjs"
);
const prefs = AppOptions.getAll(OptionKind.PREFERENCE);
if (Object.keys(prefs).length === 0) {
throw new Error("No default preferences found.");
}
fs.writeFileSync(
DEFAULT_PREFERENCES_DIR + dir + "default_preferences.json",
JSON.stringify(prefs)
);
}
function getDefaultPreferences(dir) {
const str = fs
.readFileSync(DEFAULT_PREFERENCES_DIR + dir + "default_preferences.json")
.toString();
return JSON.parse(str);
}
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
gulp.task("locale", function () {
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const VIEWER_LOCALE_OUTPUT = "web/locale/";
console.log();
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
console.log("### Building localization files");
rimraf.sync(VIEWER_LOCALE_OUTPUT);
mkdirp.sync(VIEWER_LOCALE_OUTPUT);
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const subfolders = fs.readdirSync(L10N_DIR);
subfolders.sort();
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
let viewerOutput = "";
const locales = [];
for (const locale of subfolders) {
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const dirPath = L10N_DIR + locale;
if (!checkDir(dirPath)) {
continue;
}
if (!/^[a-z][a-z]([a-z])?(-[A-Z][A-Z])?$/.test(locale)) {
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
console.log("Skipping invalid locale: " + locale);
continue;
}
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
mkdirp.sync(VIEWER_LOCALE_OUTPUT + "/" + locale);
locales.push(locale);
if (checkFile(dirPath + "/viewer.properties")) {
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
viewerOutput +=
"[" +
locale +
"]\n" +
"@import url(" +
locale +
"/viewer.properties)\n\n";
}
}
return merge([
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
createStringSource("locale.properties", viewerOutput).pipe(
gulp.dest(VIEWER_LOCALE_OUTPUT)
),
gulp
.src(L10N_DIR + "/{" + locales.join(",") + "}/viewer.properties", {
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
base: L10N_DIR,
})
.pipe(gulp.dest(VIEWER_LOCALE_OUTPUT)),
]);
});
gulp.task("cmaps", async function () {
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const CMAP_INPUT = "external/cmaps";
const VIEWER_CMAP_OUTPUT = "external/bcmaps";
console.log();
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
console.log("### Building cmaps");
// Testing a file that usually present.
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
if (!checkFile(CMAP_INPUT + "/UniJIS-UCS2-H")) {
console.log("./external/cmaps has no cmap files, download them from:");
console.log(" https://github.com/adobe-type-tools/cmap-resources");
throw new Error("cmap files were not found");
}
// Remove old bcmap files.
fs.readdirSync(VIEWER_CMAP_OUTPUT).forEach(function (file) {
if (/\.bcmap$/i.test(file)) {
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
fs.unlinkSync(VIEWER_CMAP_OUTPUT + "/" + file);
}
});
const { compressCmaps } = await import(
"./external/cmapscompress/compress.mjs"
);
compressCmaps(CMAP_INPUT, VIEWER_CMAP_OUTPUT, true);
});
function preprocessCSS(source, defines) {
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const outName = getTempFile("~preprocess", ".css");
builder.preprocess(source, outName, defines);
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
let out = fs.readFileSync(outName).toString();
fs.unlinkSync(outName);
// Strip out all license headers in the middle.
const reg = /\n\/\* Copyright(.|\n)*?Mozilla Foundation(.|\n)*?\*\//g;
out = out.replaceAll(reg, "");
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const i = source.lastIndexOf("/");
return createStringSource(source.substr(i + 1), out);
}
function preprocessHTML(source, defines) {
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const outName = getTempFile("~preprocess", ".html");
2017-04-29 02:47:20 +09:00
builder.preprocess(source, outName, defines);
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const out = fs.readFileSync(outName).toString();
fs.unlinkSync(outName);
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const i = source.lastIndexOf("/");
return createStringSource(source.substr(i + 1), `${out.trimEnd()}\n`);
}
function buildGeneric(defines, dir) {
rimraf.sync(dir);
return merge([
createMainBundle(defines).pipe(gulp.dest(dir + "build")),
createWorkerBundle(defines).pipe(gulp.dest(dir + "build")),
Re-factor how the `pdf.sandbox.js` file is built (PR 12604 follow-up) The way that the `pdf.sandbox.js` building was implemented feels all kinds of inconsistent/wrong, and it "sticks out" quite a bit when compared to the rest of the `gulpfile.js`. This patch thus attempts to improve the current situation slightly, to hopefully make future maintenance easier. One thing that strikes you, pretty immediately, when looking at PR 12604 is that the two new `gulp`-tasks added (i.e. `sandbox` and `watch-sandbox`) don't even work!? The reason for this is that they implicitly dependent upon the result of the `buildnumber`-task, which isn't listed as a dependency. (Try running `gulp clean` *first*, and invoking any of the new `gulp`-tasks will inevitably fail.) Furthermore, there's another (potentially big) problem with the implementation of e.g. the `gulp sandbox` task, since it doesn't actually wait for all building to complete before the task is considered as "done". This has the potential to cause all sorts of subtle bugs elsewhere, and the fact that things even "work" as-is can probably be attributed mostly to luck. Unfortunately there's no *perfect* way to improve things here, since the `pdf.sandbox.js` file depends on including the `pdf.scripting.js` file as a string, however I firmly believe that improvements are still possible here. To that end, this patch updates all relevant build-targets to create a *temporary* `pdf.scripting.js` file as part of the setup in the `gulp`-tasks, and then reads that file during the `pdf.sandbox.js` building. This at least allows us to bring all of this "sandbox"-build code much more in-line with the existing build-system.
2020-12-05 21:59:46 +09:00
createSandboxBundle(defines).pipe(gulp.dest(dir + "build")),
createWebBundle(defines, {
defaultPreferencesDir: defines.SKIP_BABEL
? "generic/"
: "generic-legacy/",
}).pipe(gulp.dest(dir + "web")),
gulp.src(COMMON_WEB_FILES, { base: "web/" }).pipe(gulp.dest(dir + "web")),
gulp.src("LICENSE").pipe(gulp.dest(dir)),
gulp
.src(["web/locale/*/viewer.properties", "web/locale/locale.properties"], {
base: "web/",
})
.pipe(gulp.dest(dir + "web")),
createCMapBundle().pipe(gulp.dest(dir + "web/cmaps")),
createStandardFontBundle().pipe(gulp.dest(dir + "web/standard_fonts")),
preprocessHTML("web/viewer.html", defines).pipe(gulp.dest(dir + "web")),
preprocessCSS("web/viewer.css", defines)
.pipe(
postcss([
postcssDirPseudoClass(),
postcssNesting(),
autoprefixer(AUTOPREFIXER_CONFIG),
])
)
.pipe(gulp.dest(dir + "web")),
gulp
.src("web/compressed.tracemonkey-pldi-09.pdf")
.pipe(gulp.dest(dir + "web")),
]);
}
// Builds the generic production viewer that is only compatible with up-to-date
// HTML5 browsers, which implement modern ECMAScript features.
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
gulp.task(
"generic",
gulp.series(
createBuildNumber,
"locale",
function scriptingGeneric() {
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const defines = builder.merge(DEFINES, { GENERIC: true });
return merge([
buildDefaultPreferences(defines, "generic/"),
createTemporaryScriptingBundle(defines),
]);
Re-factor how the `pdf.sandbox.js` file is built (PR 12604 follow-up) The way that the `pdf.sandbox.js` building was implemented feels all kinds of inconsistent/wrong, and it "sticks out" quite a bit when compared to the rest of the `gulpfile.js`. This patch thus attempts to improve the current situation slightly, to hopefully make future maintenance easier. One thing that strikes you, pretty immediately, when looking at PR 12604 is that the two new `gulp`-tasks added (i.e. `sandbox` and `watch-sandbox`) don't even work!? The reason for this is that they implicitly dependent upon the result of the `buildnumber`-task, which isn't listed as a dependency. (Try running `gulp clean` *first*, and invoking any of the new `gulp`-tasks will inevitably fail.) Furthermore, there's another (potentially big) problem with the implementation of e.g. the `gulp sandbox` task, since it doesn't actually wait for all building to complete before the task is considered as "done". This has the potential to cause all sorts of subtle bugs elsewhere, and the fact that things even "work" as-is can probably be attributed mostly to luck. Unfortunately there's no *perfect* way to improve things here, since the `pdf.sandbox.js` file depends on including the `pdf.scripting.js` file as a string, however I firmly believe that improvements are still possible here. To that end, this patch updates all relevant build-targets to create a *temporary* `pdf.scripting.js` file as part of the setup in the `gulp`-tasks, and then reads that file during the `pdf.sandbox.js` building. This at least allows us to bring all of this "sandbox"-build code much more in-line with the existing build-system.
2020-12-05 21:59:46 +09:00
},
async function prefsGeneric() {
await parseDefaultPreferences("generic/");
},
function createGeneric() {
console.log();
console.log("### Creating generic viewer");
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const defines = builder.merge(DEFINES, { GENERIC: true });
return buildGeneric(defines, GENERIC_DIR);
Re-factor how the `pdf.sandbox.js` file is built (PR 12604 follow-up) The way that the `pdf.sandbox.js` building was implemented feels all kinds of inconsistent/wrong, and it "sticks out" quite a bit when compared to the rest of the `gulpfile.js`. This patch thus attempts to improve the current situation slightly, to hopefully make future maintenance easier. One thing that strikes you, pretty immediately, when looking at PR 12604 is that the two new `gulp`-tasks added (i.e. `sandbox` and `watch-sandbox`) don't even work!? The reason for this is that they implicitly dependent upon the result of the `buildnumber`-task, which isn't listed as a dependency. (Try running `gulp clean` *first*, and invoking any of the new `gulp`-tasks will inevitably fail.) Furthermore, there's another (potentially big) problem with the implementation of e.g. the `gulp sandbox` task, since it doesn't actually wait for all building to complete before the task is considered as "done". This has the potential to cause all sorts of subtle bugs elsewhere, and the fact that things even "work" as-is can probably be attributed mostly to luck. Unfortunately there's no *perfect* way to improve things here, since the `pdf.sandbox.js` file depends on including the `pdf.scripting.js` file as a string, however I firmly believe that improvements are still possible here. To that end, this patch updates all relevant build-targets to create a *temporary* `pdf.scripting.js` file as part of the setup in the `gulp`-tasks, and then reads that file during the `pdf.sandbox.js` building. This at least allows us to bring all of this "sandbox"-build code much more in-line with the existing build-system.
2020-12-05 21:59:46 +09:00
}
)
);
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
// Builds the generic production viewer that should be compatible with most
// older HTML5 browsers.
gulp.task(
"generic-legacy",
gulp.series(
createBuildNumber,
"locale",
function scriptingGenericLegacy() {
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const defines = builder.merge(DEFINES, {
GENERIC: true,
SKIP_BABEL: false,
});
return merge([
buildDefaultPreferences(defines, "generic-legacy/"),
createTemporaryScriptingBundle(defines),
]);
},
async function prefsGenericLegacy() {
await parseDefaultPreferences("generic-legacy/");
},
function createGenericLegacy() {
Re-factor how the `pdf.sandbox.js` file is built (PR 12604 follow-up) The way that the `pdf.sandbox.js` building was implemented feels all kinds of inconsistent/wrong, and it "sticks out" quite a bit when compared to the rest of the `gulpfile.js`. This patch thus attempts to improve the current situation slightly, to hopefully make future maintenance easier. One thing that strikes you, pretty immediately, when looking at PR 12604 is that the two new `gulp`-tasks added (i.e. `sandbox` and `watch-sandbox`) don't even work!? The reason for this is that they implicitly dependent upon the result of the `buildnumber`-task, which isn't listed as a dependency. (Try running `gulp clean` *first*, and invoking any of the new `gulp`-tasks will inevitably fail.) Furthermore, there's another (potentially big) problem with the implementation of e.g. the `gulp sandbox` task, since it doesn't actually wait for all building to complete before the task is considered as "done". This has the potential to cause all sorts of subtle bugs elsewhere, and the fact that things even "work" as-is can probably be attributed mostly to luck. Unfortunately there's no *perfect* way to improve things here, since the `pdf.sandbox.js` file depends on including the `pdf.scripting.js` file as a string, however I firmly believe that improvements are still possible here. To that end, this patch updates all relevant build-targets to create a *temporary* `pdf.scripting.js` file as part of the setup in the `gulp`-tasks, and then reads that file during the `pdf.sandbox.js` building. This at least allows us to bring all of this "sandbox"-build code much more in-line with the existing build-system.
2020-12-05 21:59:46 +09:00
console.log();
console.log("### Creating generic (legacy) viewer");
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const defines = builder.merge(DEFINES, {
GENERIC: true,
SKIP_BABEL: false,
});
Re-factor how the `pdf.sandbox.js` file is built (PR 12604 follow-up) The way that the `pdf.sandbox.js` building was implemented feels all kinds of inconsistent/wrong, and it "sticks out" quite a bit when compared to the rest of the `gulpfile.js`. This patch thus attempts to improve the current situation slightly, to hopefully make future maintenance easier. One thing that strikes you, pretty immediately, when looking at PR 12604 is that the two new `gulp`-tasks added (i.e. `sandbox` and `watch-sandbox`) don't even work!? The reason for this is that they implicitly dependent upon the result of the `buildnumber`-task, which isn't listed as a dependency. (Try running `gulp clean` *first*, and invoking any of the new `gulp`-tasks will inevitably fail.) Furthermore, there's another (potentially big) problem with the implementation of e.g. the `gulp sandbox` task, since it doesn't actually wait for all building to complete before the task is considered as "done". This has the potential to cause all sorts of subtle bugs elsewhere, and the fact that things even "work" as-is can probably be attributed mostly to luck. Unfortunately there's no *perfect* way to improve things here, since the `pdf.sandbox.js` file depends on including the `pdf.scripting.js` file as a string, however I firmly believe that improvements are still possible here. To that end, this patch updates all relevant build-targets to create a *temporary* `pdf.scripting.js` file as part of the setup in the `gulp`-tasks, and then reads that file during the `pdf.sandbox.js` building. This at least allows us to bring all of this "sandbox"-build code much more in-line with the existing build-system.
2020-12-05 21:59:46 +09:00
return buildGeneric(defines, GENERIC_LEGACY_DIR);
}
)
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
);
function buildComponents(defines, dir) {
rimraf.sync(dir);
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const COMPONENTS_IMAGES = [
"web/images/annotation-*.svg",
"web/images/loading-icon.gif",
];
return merge([
createComponentsBundle(defines).pipe(gulp.dest(dir)),
gulp.src(COMPONENTS_IMAGES).pipe(gulp.dest(dir + "images")),
preprocessCSS("web/pdf_viewer.css", defines)
.pipe(
postcss([
postcssDirPseudoClass(),
postcssNesting(),
autoprefixer(AUTOPREFIXER_CONFIG),
])
)
.pipe(gulp.dest(dir)),
]);
}
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
gulp.task(
"components",
gulp.series(createBuildNumber, function createComponents() {
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
console.log();
console.log("### Creating generic components");
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const defines = builder.merge(DEFINES, { COMPONENTS: true, GENERIC: true });
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
return buildComponents(defines, COMPONENTS_DIR);
})
);
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
gulp.task(
"components-legacy",
gulp.series(createBuildNumber, function createComponentsLegacy() {
console.log();
console.log("### Creating generic (legacy) components");
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const defines = builder.merge(DEFINES, {
COMPONENTS: true,
GENERIC: true,
SKIP_BABEL: false,
});
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
return buildComponents(defines, COMPONENTS_LEGACY_DIR);
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
})
);
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
gulp.task(
"image_decoders",
gulp.series(createBuildNumber, function createImageDecoders() {
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
console.log();
console.log("### Creating image decoders");
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const defines = builder.merge(DEFINES, {
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
GENERIC: true,
IMAGE_DECODERS: true,
});
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
return createImageDecodersBundle(defines).pipe(
gulp.dest(IMAGE_DECODERS_DIR)
);
})
);
gulp.task(
"image_decoders-legacy",
gulp.series(createBuildNumber, function createImageDecodersLegacy() {
console.log();
console.log("### Creating (legacy) image decoders");
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const defines = builder.merge(DEFINES, {
GENERIC: true,
IMAGE_DECODERS: true,
SKIP_BABEL: false,
});
return createImageDecodersBundle(defines).pipe(
gulp.dest(IMAGE_DECODERS_LEGACY_DIR)
);
})
);
function buildMinified(defines, dir) {
rimraf.sync(dir);
return merge([
createMainBundle(defines).pipe(gulp.dest(dir + "build")),
createWorkerBundle(defines).pipe(gulp.dest(dir + "build")),
Re-factor how the `pdf.sandbox.js` file is built (PR 12604 follow-up) The way that the `pdf.sandbox.js` building was implemented feels all kinds of inconsistent/wrong, and it "sticks out" quite a bit when compared to the rest of the `gulpfile.js`. This patch thus attempts to improve the current situation slightly, to hopefully make future maintenance easier. One thing that strikes you, pretty immediately, when looking at PR 12604 is that the two new `gulp`-tasks added (i.e. `sandbox` and `watch-sandbox`) don't even work!? The reason for this is that they implicitly dependent upon the result of the `buildnumber`-task, which isn't listed as a dependency. (Try running `gulp clean` *first*, and invoking any of the new `gulp`-tasks will inevitably fail.) Furthermore, there's another (potentially big) problem with the implementation of e.g. the `gulp sandbox` task, since it doesn't actually wait for all building to complete before the task is considered as "done". This has the potential to cause all sorts of subtle bugs elsewhere, and the fact that things even "work" as-is can probably be attributed mostly to luck. Unfortunately there's no *perfect* way to improve things here, since the `pdf.sandbox.js` file depends on including the `pdf.scripting.js` file as a string, however I firmly believe that improvements are still possible here. To that end, this patch updates all relevant build-targets to create a *temporary* `pdf.scripting.js` file as part of the setup in the `gulp`-tasks, and then reads that file during the `pdf.sandbox.js` building. This at least allows us to bring all of this "sandbox"-build code much more in-line with the existing build-system.
2020-12-05 21:59:46 +09:00
createSandboxBundle(defines).pipe(gulp.dest(dir + "build")),
createWebBundle(defines, {
defaultPreferencesDir: defines.SKIP_BABEL
? "minified/"
: "minified-legacy/",
}).pipe(gulp.dest(dir + "web")),
createImageDecodersBundle(
builder.merge(defines, { IMAGE_DECODERS: true })
).pipe(gulp.dest(dir + "image_decoders")),
gulp.src(COMMON_WEB_FILES, { base: "web/" }).pipe(gulp.dest(dir + "web")),
gulp
.src(["web/locale/*/viewer.properties", "web/locale/locale.properties"], {
base: "web/",
})
.pipe(gulp.dest(dir + "web")),
createCMapBundle().pipe(gulp.dest(dir + "web/cmaps")),
createStandardFontBundle().pipe(gulp.dest(dir + "web/standard_fonts")),
preprocessHTML("web/viewer.html", defines).pipe(gulp.dest(dir + "web")),
preprocessCSS("web/viewer.css", defines)
.pipe(
postcss([
postcssDirPseudoClass(),
postcssNesting(),
autoprefixer(AUTOPREFIXER_CONFIG),
])
)
.pipe(gulp.dest(dir + "web")),
gulp
.src("web/compressed.tracemonkey-pldi-09.pdf")
.pipe(gulp.dest(dir + "web")),
]);
}
async function parseMinified(dir) {
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const pdfFile = fs.readFileSync(dir + "/build/pdf.js").toString();
const pdfWorkerFile = fs
.readFileSync(dir + "/build/pdf.worker.js")
.toString();
const pdfSandboxFile = fs
.readFileSync(dir + "/build/pdf.sandbox.js")
.toString();
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const pdfImageDecodersFile = fs
.readFileSync(dir + "/image_decoders/pdf.image_decoders.js")
.toString();
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const viewerFiles = {
"pdf.js": pdfFile,
"viewer.js": fs.readFileSync(dir + "/web/viewer.js").toString(),
};
console.log();
console.log("### Minifying js files");
const { minify } = await import("terser");
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const options = {
compress: {
// V8 chokes on very long sequences, work around that.
sequences: false,
},
keep_classnames: true,
keep_fnames: true,
};
fs.writeFileSync(
dir + "/web/pdf.viewer.js",
(await minify(viewerFiles, options)).code
);
fs.writeFileSync(
dir + "/build/pdf.min.js",
(await minify(pdfFile, options)).code
);
fs.writeFileSync(
dir + "/build/pdf.worker.min.js",
(await minify(pdfWorkerFile, options)).code
);
fs.writeFileSync(
dir + "/build/pdf.sandbox.min.js",
(await minify(pdfSandboxFile, options)).code
);
fs.writeFileSync(
dir + "image_decoders/pdf.image_decoders.min.js",
(await minify(pdfImageDecodersFile, options)).code
);
console.log();
console.log("### Cleaning js files");
fs.unlinkSync(dir + "/web/viewer.js");
fs.unlinkSync(dir + "/web/debugger.js");
fs.unlinkSync(dir + "/build/pdf.js");
fs.unlinkSync(dir + "/build/pdf.worker.js");
fs.unlinkSync(dir + "/build/pdf.sandbox.js");
fs.renameSync(dir + "/build/pdf.min.js", dir + "/build/pdf.js");
fs.renameSync(dir + "/build/pdf.worker.min.js", dir + "/build/pdf.worker.js");
fs.renameSync(
dir + "/build/pdf.sandbox.min.js",
dir + "/build/pdf.sandbox.js"
);
fs.renameSync(
dir + "/image_decoders/pdf.image_decoders.min.js",
dir + "/image_decoders/pdf.image_decoders.js"
);
}
gulp.task(
"minified",
gulp.series(
createBuildNumber,
"locale",
function scriptingMinified() {
const defines = builder.merge(DEFINES, { MINIFIED: true, GENERIC: true });
return merge([
buildDefaultPreferences(defines, "minified/"),
createTemporaryScriptingBundle(defines),
]);
},
async function prefsMinified() {
await parseDefaultPreferences("minified/");
},
function createMinified() {
console.log();
console.log("### Creating minified viewer");
const defines = builder.merge(DEFINES, { MINIFIED: true, GENERIC: true });
return buildMinified(defines, MINIFIED_DIR);
},
async function compressMinified(done) {
await parseMinified(MINIFIED_DIR);
done();
}
)
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
);
gulp.task(
"minified-legacy",
gulp.series(
createBuildNumber,
"locale",
function scriptingMinifiedLegacy() {
const defines = builder.merge(DEFINES, {
MINIFIED: true,
GENERIC: true,
SKIP_BABEL: false,
});
return merge([
buildDefaultPreferences(defines, "minified-legacy/"),
createTemporaryScriptingBundle(defines),
]);
},
async function prefsMinifiedLegacy() {
await parseDefaultPreferences("minified-legacy/");
},
function createMinifiedLegacy() {
console.log();
console.log("### Creating minified (legacy) viewer");
const defines = builder.merge(DEFINES, {
MINIFIED: true,
GENERIC: true,
SKIP_BABEL: false,
});
return buildMinified(defines, MINIFIED_LEGACY_DIR);
},
async function compressMinifiedLegacy(done) {
await parseMinified(MINIFIED_LEGACY_DIR);
done();
}
)
);
function preprocessDefaultPreferences(content) {
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const licenseHeader = fs.readFileSync("./src/license_header.js").toString();
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const MODIFICATION_WARNING =
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
"//\n// THIS FILE IS GENERATED AUTOMATICALLY, DO NOT EDIT MANUALLY!\n//\n";
const bundleDefines = builder.merge(DEFINES, {
DEFAULT_PREFERENCES: getDefaultPreferences("mozcentral/"),
});
content = preprocessPDFJSCode(
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
{
rootPath: __dirname,
defines: bundleDefines,
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
},
content
);
return licenseHeader + "\n" + MODIFICATION_WARNING + "\n" + content + "\n";
}
function replaceMozcentralCSS() {
return replace(/var\(--(inline-(?:start|end))\)/g, "$1");
}
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
gulp.task(
"mozcentral",
gulp.series(
createBuildNumber,
function scriptingMozcentral() {
const defines = builder.merge(DEFINES, { MOZCENTRAL: true });
return buildDefaultPreferences(defines, "mozcentral/");
},
async function prefsMozcentral() {
await parseDefaultPreferences("mozcentral/");
},
function createMozcentral() {
console.log();
console.log("### Building mozilla-central extension");
const defines = builder.merge(DEFINES, { MOZCENTRAL: true });
const MOZCENTRAL_DIR = BUILD_DIR + "mozcentral/",
MOZCENTRAL_EXTENSION_DIR = MOZCENTRAL_DIR + "browser/extensions/pdfjs/",
MOZCENTRAL_CONTENT_DIR = MOZCENTRAL_EXTENSION_DIR + "content/",
MOZCENTRAL_L10N_DIR =
MOZCENTRAL_DIR + "browser/locales/en-US/pdfviewer/",
FIREFOX_CONTENT_DIR = EXTENSION_SRC_DIR + "/firefox/content/";
const MOZCENTRAL_WEB_FILES = [
...COMMON_WEB_FILES,
"!web/images/toolbarButton-openFile.svg",
];
const MOZCENTRAL_AUTOPREFIXER_CONFIG = {
overrideBrowserslist: ["last 1 firefox versions"],
};
// Clear out everything in the firefox extension build directory
rimraf.sync(MOZCENTRAL_DIR);
return merge([
createMainBundle(defines).pipe(
gulp.dest(MOZCENTRAL_CONTENT_DIR + "build")
),
createScriptingBundle(defines).pipe(
gulp.dest(MOZCENTRAL_CONTENT_DIR + "build")
),
createSandboxExternal(defines).pipe(
gulp.dest(MOZCENTRAL_CONTENT_DIR + "build")
),
createWorkerBundle(defines).pipe(
gulp.dest(MOZCENTRAL_CONTENT_DIR + "build")
),
createWebBundle(defines, { defaultPreferencesDir: "mozcentral/" }).pipe(
gulp.dest(MOZCENTRAL_CONTENT_DIR + "web")
),
2022-12-15 00:40:25 +09:00
createGVWebBundle(defines, {
defaultPreferencesDir: "mozcentral/",
}).pipe(gulp.dest(MOZCENTRAL_CONTENT_DIR + "web")),
gulp
.src(MOZCENTRAL_WEB_FILES, { base: "web/" })
.pipe(gulp.dest(MOZCENTRAL_CONTENT_DIR + "web")),
createCMapBundle().pipe(
gulp.dest(MOZCENTRAL_CONTENT_DIR + "web/cmaps")
),
createStandardFontBundle().pipe(
gulp.dest(MOZCENTRAL_CONTENT_DIR + "web/standard_fonts")
),
preprocessHTML("web/viewer.html", defines).pipe(
gulp.dest(MOZCENTRAL_CONTENT_DIR + "web")
),
2022-12-15 00:40:25 +09:00
preprocessHTML("web/viewer-geckoview.html", defines).pipe(
gulp.dest(MOZCENTRAL_CONTENT_DIR + "web")
),
preprocessCSS("web/viewer.css", defines)
.pipe(postcss([autoprefixer(MOZCENTRAL_AUTOPREFIXER_CONFIG)]))
.pipe(replaceMozcentralCSS())
.pipe(gulp.dest(MOZCENTRAL_CONTENT_DIR + "web")),
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
2022-12-15 00:40:25 +09:00
preprocessCSS("web/viewer-geckoview.css", defines)
.pipe(postcss([autoprefixer(MOZCENTRAL_AUTOPREFIXER_CONFIG)]))
.pipe(replaceMozcentralCSS())
2022-12-15 00:40:25 +09:00
.pipe(gulp.dest(MOZCENTRAL_CONTENT_DIR + "web")),
gulp
.src("l10n/en-US/*.properties")
.pipe(gulp.dest(MOZCENTRAL_L10N_DIR)),
gulp.src("LICENSE").pipe(gulp.dest(MOZCENTRAL_EXTENSION_DIR)),
gulp
.src(FIREFOX_CONTENT_DIR + "PdfJsDefaultPreferences.sys.mjs")
.pipe(transform("utf8", preprocessDefaultPreferences))
.pipe(gulp.dest(MOZCENTRAL_CONTENT_DIR)),
]);
}
)
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
);
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
gulp.task(
"chromium",
Re-factor how the `pdf.sandbox.js` file is built (PR 12604 follow-up) The way that the `pdf.sandbox.js` building was implemented feels all kinds of inconsistent/wrong, and it "sticks out" quite a bit when compared to the rest of the `gulpfile.js`. This patch thus attempts to improve the current situation slightly, to hopefully make future maintenance easier. One thing that strikes you, pretty immediately, when looking at PR 12604 is that the two new `gulp`-tasks added (i.e. `sandbox` and `watch-sandbox`) don't even work!? The reason for this is that they implicitly dependent upon the result of the `buildnumber`-task, which isn't listed as a dependency. (Try running `gulp clean` *first*, and invoking any of the new `gulp`-tasks will inevitably fail.) Furthermore, there's another (potentially big) problem with the implementation of e.g. the `gulp sandbox` task, since it doesn't actually wait for all building to complete before the task is considered as "done". This has the potential to cause all sorts of subtle bugs elsewhere, and the fact that things even "work" as-is can probably be attributed mostly to luck. Unfortunately there's no *perfect* way to improve things here, since the `pdf.sandbox.js` file depends on including the `pdf.scripting.js` file as a string, however I firmly believe that improvements are still possible here. To that end, this patch updates all relevant build-targets to create a *temporary* `pdf.scripting.js` file as part of the setup in the `gulp`-tasks, and then reads that file during the `pdf.sandbox.js` building. This at least allows us to bring all of this "sandbox"-build code much more in-line with the existing build-system.
2020-12-05 21:59:46 +09:00
gulp.series(
createBuildNumber,
Re-factor how the `pdf.sandbox.js` file is built (PR 12604 follow-up) The way that the `pdf.sandbox.js` building was implemented feels all kinds of inconsistent/wrong, and it "sticks out" quite a bit when compared to the rest of the `gulpfile.js`. This patch thus attempts to improve the current situation slightly, to hopefully make future maintenance easier. One thing that strikes you, pretty immediately, when looking at PR 12604 is that the two new `gulp`-tasks added (i.e. `sandbox` and `watch-sandbox`) don't even work!? The reason for this is that they implicitly dependent upon the result of the `buildnumber`-task, which isn't listed as a dependency. (Try running `gulp clean` *first*, and invoking any of the new `gulp`-tasks will inevitably fail.) Furthermore, there's another (potentially big) problem with the implementation of e.g. the `gulp sandbox` task, since it doesn't actually wait for all building to complete before the task is considered as "done". This has the potential to cause all sorts of subtle bugs elsewhere, and the fact that things even "work" as-is can probably be attributed mostly to luck. Unfortunately there's no *perfect* way to improve things here, since the `pdf.sandbox.js` file depends on including the `pdf.scripting.js` file as a string, however I firmly believe that improvements are still possible here. To that end, this patch updates all relevant build-targets to create a *temporary* `pdf.scripting.js` file as part of the setup in the `gulp`-tasks, and then reads that file during the `pdf.sandbox.js` building. This at least allows us to bring all of this "sandbox"-build code much more in-line with the existing build-system.
2020-12-05 21:59:46 +09:00
"locale",
function scriptingChromium() {
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const defines = builder.merge(DEFINES, {
CHROME: true,
SKIP_BABEL: false,
});
return merge([
buildDefaultPreferences(defines, "chromium/"),
createTemporaryScriptingBundle(defines),
]);
Re-factor how the `pdf.sandbox.js` file is built (PR 12604 follow-up) The way that the `pdf.sandbox.js` building was implemented feels all kinds of inconsistent/wrong, and it "sticks out" quite a bit when compared to the rest of the `gulpfile.js`. This patch thus attempts to improve the current situation slightly, to hopefully make future maintenance easier. One thing that strikes you, pretty immediately, when looking at PR 12604 is that the two new `gulp`-tasks added (i.e. `sandbox` and `watch-sandbox`) don't even work!? The reason for this is that they implicitly dependent upon the result of the `buildnumber`-task, which isn't listed as a dependency. (Try running `gulp clean` *first*, and invoking any of the new `gulp`-tasks will inevitably fail.) Furthermore, there's another (potentially big) problem with the implementation of e.g. the `gulp sandbox` task, since it doesn't actually wait for all building to complete before the task is considered as "done". This has the potential to cause all sorts of subtle bugs elsewhere, and the fact that things even "work" as-is can probably be attributed mostly to luck. Unfortunately there's no *perfect* way to improve things here, since the `pdf.sandbox.js` file depends on including the `pdf.scripting.js` file as a string, however I firmly believe that improvements are still possible here. To that end, this patch updates all relevant build-targets to create a *temporary* `pdf.scripting.js` file as part of the setup in the `gulp`-tasks, and then reads that file during the `pdf.sandbox.js` building. This at least allows us to bring all of this "sandbox"-build code much more in-line with the existing build-system.
2020-12-05 21:59:46 +09:00
},
async function prefsChromium() {
await parseDefaultPreferences("chromium/");
},
function createChromium() {
Re-factor how the `pdf.sandbox.js` file is built (PR 12604 follow-up) The way that the `pdf.sandbox.js` building was implemented feels all kinds of inconsistent/wrong, and it "sticks out" quite a bit when compared to the rest of the `gulpfile.js`. This patch thus attempts to improve the current situation slightly, to hopefully make future maintenance easier. One thing that strikes you, pretty immediately, when looking at PR 12604 is that the two new `gulp`-tasks added (i.e. `sandbox` and `watch-sandbox`) don't even work!? The reason for this is that they implicitly dependent upon the result of the `buildnumber`-task, which isn't listed as a dependency. (Try running `gulp clean` *first*, and invoking any of the new `gulp`-tasks will inevitably fail.) Furthermore, there's another (potentially big) problem with the implementation of e.g. the `gulp sandbox` task, since it doesn't actually wait for all building to complete before the task is considered as "done". This has the potential to cause all sorts of subtle bugs elsewhere, and the fact that things even "work" as-is can probably be attributed mostly to luck. Unfortunately there's no *perfect* way to improve things here, since the `pdf.sandbox.js` file depends on including the `pdf.scripting.js` file as a string, however I firmly believe that improvements are still possible here. To that end, this patch updates all relevant build-targets to create a *temporary* `pdf.scripting.js` file as part of the setup in the `gulp`-tasks, and then reads that file during the `pdf.sandbox.js` building. This at least allows us to bring all of this "sandbox"-build code much more in-line with the existing build-system.
2020-12-05 21:59:46 +09:00
console.log();
console.log("### Building Chromium extension");
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const defines = builder.merge(DEFINES, {
CHROME: true,
SKIP_BABEL: false,
});
Re-factor how the `pdf.sandbox.js` file is built (PR 12604 follow-up) The way that the `pdf.sandbox.js` building was implemented feels all kinds of inconsistent/wrong, and it "sticks out" quite a bit when compared to the rest of the `gulpfile.js`. This patch thus attempts to improve the current situation slightly, to hopefully make future maintenance easier. One thing that strikes you, pretty immediately, when looking at PR 12604 is that the two new `gulp`-tasks added (i.e. `sandbox` and `watch-sandbox`) don't even work!? The reason for this is that they implicitly dependent upon the result of the `buildnumber`-task, which isn't listed as a dependency. (Try running `gulp clean` *first*, and invoking any of the new `gulp`-tasks will inevitably fail.) Furthermore, there's another (potentially big) problem with the implementation of e.g. the `gulp sandbox` task, since it doesn't actually wait for all building to complete before the task is considered as "done". This has the potential to cause all sorts of subtle bugs elsewhere, and the fact that things even "work" as-is can probably be attributed mostly to luck. Unfortunately there's no *perfect* way to improve things here, since the `pdf.sandbox.js` file depends on including the `pdf.scripting.js` file as a string, however I firmly believe that improvements are still possible here. To that end, this patch updates all relevant build-targets to create a *temporary* `pdf.scripting.js` file as part of the setup in the `gulp`-tasks, and then reads that file during the `pdf.sandbox.js` building. This at least allows us to bring all of this "sandbox"-build code much more in-line with the existing build-system.
2020-12-05 21:59:46 +09:00
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const CHROME_BUILD_DIR = BUILD_DIR + "/chromium/",
Re-factor how the `pdf.sandbox.js` file is built (PR 12604 follow-up) The way that the `pdf.sandbox.js` building was implemented feels all kinds of inconsistent/wrong, and it "sticks out" quite a bit when compared to the rest of the `gulpfile.js`. This patch thus attempts to improve the current situation slightly, to hopefully make future maintenance easier. One thing that strikes you, pretty immediately, when looking at PR 12604 is that the two new `gulp`-tasks added (i.e. `sandbox` and `watch-sandbox`) don't even work!? The reason for this is that they implicitly dependent upon the result of the `buildnumber`-task, which isn't listed as a dependency. (Try running `gulp clean` *first*, and invoking any of the new `gulp`-tasks will inevitably fail.) Furthermore, there's another (potentially big) problem with the implementation of e.g. the `gulp sandbox` task, since it doesn't actually wait for all building to complete before the task is considered as "done". This has the potential to cause all sorts of subtle bugs elsewhere, and the fact that things even "work" as-is can probably be attributed mostly to luck. Unfortunately there's no *perfect* way to improve things here, since the `pdf.sandbox.js` file depends on including the `pdf.scripting.js` file as a string, however I firmly believe that improvements are still possible here. To that end, this patch updates all relevant build-targets to create a *temporary* `pdf.scripting.js` file as part of the setup in the `gulp`-tasks, and then reads that file during the `pdf.sandbox.js` building. This at least allows us to bring all of this "sandbox"-build code much more in-line with the existing build-system.
2020-12-05 21:59:46 +09:00
CHROME_BUILD_CONTENT_DIR = CHROME_BUILD_DIR + "/content/";
const CHROME_WEB_FILES = [
...COMMON_WEB_FILES,
"!web/images/toolbarButton-openFile.svg",
];
Re-factor how the `pdf.sandbox.js` file is built (PR 12604 follow-up) The way that the `pdf.sandbox.js` building was implemented feels all kinds of inconsistent/wrong, and it "sticks out" quite a bit when compared to the rest of the `gulpfile.js`. This patch thus attempts to improve the current situation slightly, to hopefully make future maintenance easier. One thing that strikes you, pretty immediately, when looking at PR 12604 is that the two new `gulp`-tasks added (i.e. `sandbox` and `watch-sandbox`) don't even work!? The reason for this is that they implicitly dependent upon the result of the `buildnumber`-task, which isn't listed as a dependency. (Try running `gulp clean` *first*, and invoking any of the new `gulp`-tasks will inevitably fail.) Furthermore, there's another (potentially big) problem with the implementation of e.g. the `gulp sandbox` task, since it doesn't actually wait for all building to complete before the task is considered as "done". This has the potential to cause all sorts of subtle bugs elsewhere, and the fact that things even "work" as-is can probably be attributed mostly to luck. Unfortunately there's no *perfect* way to improve things here, since the `pdf.sandbox.js` file depends on including the `pdf.scripting.js` file as a string, however I firmly believe that improvements are still possible here. To that end, this patch updates all relevant build-targets to create a *temporary* `pdf.scripting.js` file as part of the setup in the `gulp`-tasks, and then reads that file during the `pdf.sandbox.js` building. This at least allows us to bring all of this "sandbox"-build code much more in-line with the existing build-system.
2020-12-05 21:59:46 +09:00
// Clear out everything in the chrome extension build directory
rimraf.sync(CHROME_BUILD_DIR);
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const version = getVersionJSON().version;
Re-factor how the `pdf.sandbox.js` file is built (PR 12604 follow-up) The way that the `pdf.sandbox.js` building was implemented feels all kinds of inconsistent/wrong, and it "sticks out" quite a bit when compared to the rest of the `gulpfile.js`. This patch thus attempts to improve the current situation slightly, to hopefully make future maintenance easier. One thing that strikes you, pretty immediately, when looking at PR 12604 is that the two new `gulp`-tasks added (i.e. `sandbox` and `watch-sandbox`) don't even work!? The reason for this is that they implicitly dependent upon the result of the `buildnumber`-task, which isn't listed as a dependency. (Try running `gulp clean` *first*, and invoking any of the new `gulp`-tasks will inevitably fail.) Furthermore, there's another (potentially big) problem with the implementation of e.g. the `gulp sandbox` task, since it doesn't actually wait for all building to complete before the task is considered as "done". This has the potential to cause all sorts of subtle bugs elsewhere, and the fact that things even "work" as-is can probably be attributed mostly to luck. Unfortunately there's no *perfect* way to improve things here, since the `pdf.sandbox.js` file depends on including the `pdf.scripting.js` file as a string, however I firmly believe that improvements are still possible here. To that end, this patch updates all relevant build-targets to create a *temporary* `pdf.scripting.js` file as part of the setup in the `gulp`-tasks, and then reads that file during the `pdf.sandbox.js` building. This at least allows us to bring all of this "sandbox"-build code much more in-line with the existing build-system.
2020-12-05 21:59:46 +09:00
return merge([
createMainBundle(defines).pipe(
gulp.dest(CHROME_BUILD_CONTENT_DIR + "build")
),
createWorkerBundle(defines).pipe(
gulp.dest(CHROME_BUILD_CONTENT_DIR + "build")
),
createSandboxBundle(defines).pipe(
gulp.dest(CHROME_BUILD_CONTENT_DIR + "build")
),
createWebBundle(defines, { defaultPreferencesDir: "chromium/" }).pipe(
Re-factor how the `pdf.sandbox.js` file is built (PR 12604 follow-up) The way that the `pdf.sandbox.js` building was implemented feels all kinds of inconsistent/wrong, and it "sticks out" quite a bit when compared to the rest of the `gulpfile.js`. This patch thus attempts to improve the current situation slightly, to hopefully make future maintenance easier. One thing that strikes you, pretty immediately, when looking at PR 12604 is that the two new `gulp`-tasks added (i.e. `sandbox` and `watch-sandbox`) don't even work!? The reason for this is that they implicitly dependent upon the result of the `buildnumber`-task, which isn't listed as a dependency. (Try running `gulp clean` *first*, and invoking any of the new `gulp`-tasks will inevitably fail.) Furthermore, there's another (potentially big) problem with the implementation of e.g. the `gulp sandbox` task, since it doesn't actually wait for all building to complete before the task is considered as "done". This has the potential to cause all sorts of subtle bugs elsewhere, and the fact that things even "work" as-is can probably be attributed mostly to luck. Unfortunately there's no *perfect* way to improve things here, since the `pdf.sandbox.js` file depends on including the `pdf.scripting.js` file as a string, however I firmly believe that improvements are still possible here. To that end, this patch updates all relevant build-targets to create a *temporary* `pdf.scripting.js` file as part of the setup in the `gulp`-tasks, and then reads that file during the `pdf.sandbox.js` building. This at least allows us to bring all of this "sandbox"-build code much more in-line with the existing build-system.
2020-12-05 21:59:46 +09:00
gulp.dest(CHROME_BUILD_CONTENT_DIR + "web")
),
gulp
.src(CHROME_WEB_FILES, { base: "web/" })
Re-factor how the `pdf.sandbox.js` file is built (PR 12604 follow-up) The way that the `pdf.sandbox.js` building was implemented feels all kinds of inconsistent/wrong, and it "sticks out" quite a bit when compared to the rest of the `gulpfile.js`. This patch thus attempts to improve the current situation slightly, to hopefully make future maintenance easier. One thing that strikes you, pretty immediately, when looking at PR 12604 is that the two new `gulp`-tasks added (i.e. `sandbox` and `watch-sandbox`) don't even work!? The reason for this is that they implicitly dependent upon the result of the `buildnumber`-task, which isn't listed as a dependency. (Try running `gulp clean` *first*, and invoking any of the new `gulp`-tasks will inevitably fail.) Furthermore, there's another (potentially big) problem with the implementation of e.g. the `gulp sandbox` task, since it doesn't actually wait for all building to complete before the task is considered as "done". This has the potential to cause all sorts of subtle bugs elsewhere, and the fact that things even "work" as-is can probably be attributed mostly to luck. Unfortunately there's no *perfect* way to improve things here, since the `pdf.sandbox.js` file depends on including the `pdf.scripting.js` file as a string, however I firmly believe that improvements are still possible here. To that end, this patch updates all relevant build-targets to create a *temporary* `pdf.scripting.js` file as part of the setup in the `gulp`-tasks, and then reads that file during the `pdf.sandbox.js` building. This at least allows us to bring all of this "sandbox"-build code much more in-line with the existing build-system.
2020-12-05 21:59:46 +09:00
.pipe(gulp.dest(CHROME_BUILD_CONTENT_DIR + "web")),
gulp
.src(
["web/locale/*/viewer.properties", "web/locale/locale.properties"],
{ base: "web/" }
)
.pipe(gulp.dest(CHROME_BUILD_CONTENT_DIR + "web")),
createCMapBundle().pipe(
gulp.dest(CHROME_BUILD_CONTENT_DIR + "web/cmaps")
),
createStandardFontBundle().pipe(
gulp.dest(CHROME_BUILD_CONTENT_DIR + "web/standard_fonts")
),
Re-factor how the `pdf.sandbox.js` file is built (PR 12604 follow-up) The way that the `pdf.sandbox.js` building was implemented feels all kinds of inconsistent/wrong, and it "sticks out" quite a bit when compared to the rest of the `gulpfile.js`. This patch thus attempts to improve the current situation slightly, to hopefully make future maintenance easier. One thing that strikes you, pretty immediately, when looking at PR 12604 is that the two new `gulp`-tasks added (i.e. `sandbox` and `watch-sandbox`) don't even work!? The reason for this is that they implicitly dependent upon the result of the `buildnumber`-task, which isn't listed as a dependency. (Try running `gulp clean` *first*, and invoking any of the new `gulp`-tasks will inevitably fail.) Furthermore, there's another (potentially big) problem with the implementation of e.g. the `gulp sandbox` task, since it doesn't actually wait for all building to complete before the task is considered as "done". This has the potential to cause all sorts of subtle bugs elsewhere, and the fact that things even "work" as-is can probably be attributed mostly to luck. Unfortunately there's no *perfect* way to improve things here, since the `pdf.sandbox.js` file depends on including the `pdf.scripting.js` file as a string, however I firmly believe that improvements are still possible here. To that end, this patch updates all relevant build-targets to create a *temporary* `pdf.scripting.js` file as part of the setup in the `gulp`-tasks, and then reads that file during the `pdf.sandbox.js` building. This at least allows us to bring all of this "sandbox"-build code much more in-line with the existing build-system.
2020-12-05 21:59:46 +09:00
preprocessHTML("web/viewer.html", defines).pipe(
gulp.dest(CHROME_BUILD_CONTENT_DIR + "web")
),
preprocessCSS("web/viewer.css", defines)
Re-factor how the `pdf.sandbox.js` file is built (PR 12604 follow-up) The way that the `pdf.sandbox.js` building was implemented feels all kinds of inconsistent/wrong, and it "sticks out" quite a bit when compared to the rest of the `gulpfile.js`. This patch thus attempts to improve the current situation slightly, to hopefully make future maintenance easier. One thing that strikes you, pretty immediately, when looking at PR 12604 is that the two new `gulp`-tasks added (i.e. `sandbox` and `watch-sandbox`) don't even work!? The reason for this is that they implicitly dependent upon the result of the `buildnumber`-task, which isn't listed as a dependency. (Try running `gulp clean` *first*, and invoking any of the new `gulp`-tasks will inevitably fail.) Furthermore, there's another (potentially big) problem with the implementation of e.g. the `gulp sandbox` task, since it doesn't actually wait for all building to complete before the task is considered as "done". This has the potential to cause all sorts of subtle bugs elsewhere, and the fact that things even "work" as-is can probably be attributed mostly to luck. Unfortunately there's no *perfect* way to improve things here, since the `pdf.sandbox.js` file depends on including the `pdf.scripting.js` file as a string, however I firmly believe that improvements are still possible here. To that end, this patch updates all relevant build-targets to create a *temporary* `pdf.scripting.js` file as part of the setup in the `gulp`-tasks, and then reads that file during the `pdf.sandbox.js` building. This at least allows us to bring all of this "sandbox"-build code much more in-line with the existing build-system.
2020-12-05 21:59:46 +09:00
.pipe(
postcss([
postcssDirPseudoClass(),
postcssNesting(),
autoprefixer(AUTOPREFIXER_CONFIG),
])
Re-factor how the `pdf.sandbox.js` file is built (PR 12604 follow-up) The way that the `pdf.sandbox.js` building was implemented feels all kinds of inconsistent/wrong, and it "sticks out" quite a bit when compared to the rest of the `gulpfile.js`. This patch thus attempts to improve the current situation slightly, to hopefully make future maintenance easier. One thing that strikes you, pretty immediately, when looking at PR 12604 is that the two new `gulp`-tasks added (i.e. `sandbox` and `watch-sandbox`) don't even work!? The reason for this is that they implicitly dependent upon the result of the `buildnumber`-task, which isn't listed as a dependency. (Try running `gulp clean` *first*, and invoking any of the new `gulp`-tasks will inevitably fail.) Furthermore, there's another (potentially big) problem with the implementation of e.g. the `gulp sandbox` task, since it doesn't actually wait for all building to complete before the task is considered as "done". This has the potential to cause all sorts of subtle bugs elsewhere, and the fact that things even "work" as-is can probably be attributed mostly to luck. Unfortunately there's no *perfect* way to improve things here, since the `pdf.sandbox.js` file depends on including the `pdf.scripting.js` file as a string, however I firmly believe that improvements are still possible here. To that end, this patch updates all relevant build-targets to create a *temporary* `pdf.scripting.js` file as part of the setup in the `gulp`-tasks, and then reads that file during the `pdf.sandbox.js` building. This at least allows us to bring all of this "sandbox"-build code much more in-line with the existing build-system.
2020-12-05 21:59:46 +09:00
)
.pipe(gulp.dest(CHROME_BUILD_CONTENT_DIR + "web")),
gulp.src("LICENSE").pipe(gulp.dest(CHROME_BUILD_DIR)),
gulp
.src("extensions/chromium/manifest.json")
.pipe(replace(/\bPDFJSSCRIPT_VERSION\b/g, version))
.pipe(gulp.dest(CHROME_BUILD_DIR)),
gulp
.src(
[
"extensions/chromium/**/*.{html,js,css,png}",
"extensions/chromium/preferences_schema.json",
],
{ base: "extensions/chromium/" }
)
.pipe(gulp.dest(CHROME_BUILD_DIR)),
]);
}
)
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
);
gulp.task("jsdoc", function (done) {
console.log();
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
console.log("### Generating documentation (JSDoc)");
const JSDOC_FILES = ["src/display/api.js"];
rimraf(JSDOC_BUILD_DIR, function () {
mkdirp(JSDOC_BUILD_DIR).then(function () {
const command =
'"node_modules/.bin/jsdoc" -d ' +
JSDOC_BUILD_DIR +
" " +
JSDOC_FILES.join(" ");
exec(command, done);
});
});
});
gulp.task("types", function (done) {
console.log("### Generating TypeScript definitions using `tsc`");
exec(
`"node_modules/.bin/tsc" --outDir ${TYPES_DIR} --project .`,
function () {
exec(`"node_modules/.bin/tsc-alias" --outDir ${TYPES_DIR}`, done);
}
);
});
function buildLibHelper(bundleDefines, inputStream, outputDir) {
Fail early, in modern `GENERIC` builds, if certain required browser functionality is missing (issue 11762) With two kind of builds now being produced, with/without translation/polyfills, it's unfortunately somewhat easy for users to accidentally pick the wrong one. In the case where a user would attempt to use a modern build of PDF.js in an older browser, such as e.g. IE11, the failure would be immediate when the code is loaded (given the use of unsupported ECMAScript features). However in some browsers/environments, in particular Node.js, a modern PDF.js build may load correctly and thus *appear* to function, only to fail for e.g. certain API calls. To hopefully lessen the support burden, and to try and improve things overall, this patch adds checks to ensure that a modern build of PDF.js cannot be used in browsers/environments which lack native support for critical functionality (such as e.g. `ReadableStream`). Hence we'll fail early, with an error message telling users to pick an ES5-compatible build instead. To ensure that we actually test things better especially w.r.t. usage of the PDF.js library in Node.js environments, the `gulp npm-test` task as used by Node.js/Travis was changed (back) to test an ES5-compatible build. (Since the bots still test the code as-is, without transpilation/polyfills, this shouldn't really be a problem as far as I can tell.) As part of these changes there's now both `gulp lib` and `gulp lib-es5` build targets, similar to e.g. the generic builds, which thanks to some re-factoring only required adding a small amount of code. *Please note:* While it's probably too early to tell if this will be a widespread issue, it's possible that this is the sort of patch that *may* warrant being `git cherry-pick`ed onto the current beta version (v2.4.456).
2020-04-01 20:31:33 +09:00
// When we create a bundle, webpack is run on the source and it will replace
// require with __webpack_require__. When we want to use the real require,
// __non_webpack_require__ has to be used.
// In this target, we don't create a bundle, so we have to replace the
// occurrences of __non_webpack_require__ ourselves.
function babelPluginReplaceNonWebpackImports(b) {
Fail early, in modern `GENERIC` builds, if certain required browser functionality is missing (issue 11762) With two kind of builds now being produced, with/without translation/polyfills, it's unfortunately somewhat easy for users to accidentally pick the wrong one. In the case where a user would attempt to use a modern build of PDF.js in an older browser, such as e.g. IE11, the failure would be immediate when the code is loaded (given the use of unsupported ECMAScript features). However in some browsers/environments, in particular Node.js, a modern PDF.js build may load correctly and thus *appear* to function, only to fail for e.g. certain API calls. To hopefully lessen the support burden, and to try and improve things overall, this patch adds checks to ensure that a modern build of PDF.js cannot be used in browsers/environments which lack native support for critical functionality (such as e.g. `ReadableStream`). Hence we'll fail early, with an error message telling users to pick an ES5-compatible build instead. To ensure that we actually test things better especially w.r.t. usage of the PDF.js library in Node.js environments, the `gulp npm-test` task as used by Node.js/Travis was changed (back) to test an ES5-compatible build. (Since the bots still test the code as-is, without transpilation/polyfills, this shouldn't really be a problem as far as I can tell.) As part of these changes there's now both `gulp lib` and `gulp lib-es5` build targets, similar to e.g. the generic builds, which thanks to some re-factoring only required adding a small amount of code. *Please note:* While it's probably too early to tell if this will be a widespread issue, it's possible that this is the sort of patch that *may* warrant being `git cherry-pick`ed onto the current beta version (v2.4.456).
2020-04-01 20:31:33 +09:00
return {
visitor: {
Identifier(curPath, state) {
if (curPath.node.name === "__non_webpack_require__") {
curPath.replaceWith(b.types.identifier("require"));
} else if (curPath.node.name === "__non_webpack_import__") {
curPath.replaceWith(b.types.identifier("import"));
Fail early, in modern `GENERIC` builds, if certain required browser functionality is missing (issue 11762) With two kind of builds now being produced, with/without translation/polyfills, it's unfortunately somewhat easy for users to accidentally pick the wrong one. In the case where a user would attempt to use a modern build of PDF.js in an older browser, such as e.g. IE11, the failure would be immediate when the code is loaded (given the use of unsupported ECMAScript features). However in some browsers/environments, in particular Node.js, a modern PDF.js build may load correctly and thus *appear* to function, only to fail for e.g. certain API calls. To hopefully lessen the support burden, and to try and improve things overall, this patch adds checks to ensure that a modern build of PDF.js cannot be used in browsers/environments which lack native support for critical functionality (such as e.g. `ReadableStream`). Hence we'll fail early, with an error message telling users to pick an ES5-compatible build instead. To ensure that we actually test things better especially w.r.t. usage of the PDF.js library in Node.js environments, the `gulp npm-test` task as used by Node.js/Travis was changed (back) to test an ES5-compatible build. (Since the bots still test the code as-is, without transpilation/polyfills, this shouldn't really be a problem as far as I can tell.) As part of these changes there's now both `gulp lib` and `gulp lib-es5` build targets, similar to e.g. the generic builds, which thanks to some re-factoring only required adding a small amount of code. *Please note:* While it's probably too early to tell if this will be a widespread issue, it's possible that this is the sort of patch that *may* warrant being `git cherry-pick`ed onto the current beta version (v2.4.456).
2020-04-01 20:31:33 +09:00
}
},
},
};
}
function preprocess(content) {
const skipBabel = bundleDefines.SKIP_BABEL;
content = preprocessPDFJSCode(ctx, content);
Fail early, in modern `GENERIC` builds, if certain required browser functionality is missing (issue 11762) With two kind of builds now being produced, with/without translation/polyfills, it's unfortunately somewhat easy for users to accidentally pick the wrong one. In the case where a user would attempt to use a modern build of PDF.js in an older browser, such as e.g. IE11, the failure would be immediate when the code is loaded (given the use of unsupported ECMAScript features). However in some browsers/environments, in particular Node.js, a modern PDF.js build may load correctly and thus *appear* to function, only to fail for e.g. certain API calls. To hopefully lessen the support burden, and to try and improve things overall, this patch adds checks to ensure that a modern build of PDF.js cannot be used in browsers/environments which lack native support for critical functionality (such as e.g. `ReadableStream`). Hence we'll fail early, with an error message telling users to pick an ES5-compatible build instead. To ensure that we actually test things better especially w.r.t. usage of the PDF.js library in Node.js environments, the `gulp npm-test` task as used by Node.js/Travis was changed (back) to test an ES5-compatible build. (Since the bots still test the code as-is, without transpilation/polyfills, this shouldn't really be a problem as far as I can tell.) As part of these changes there's now both `gulp lib` and `gulp lib-es5` build targets, similar to e.g. the generic builds, which thanks to some re-factoring only required adding a small amount of code. *Please note:* While it's probably too early to tell if this will be a widespread issue, it's possible that this is the sort of patch that *may* warrant being `git cherry-pick`ed onto the current beta version (v2.4.456).
2020-04-01 20:31:33 +09:00
content = babel.transform(content, {
sourceType: "module",
presets: skipBabel ? undefined : ["@babel/preset-env"],
plugins: [
"@babel/plugin-transform-modules-commonjs",
babelPluginReplaceNonWebpackImports,
Fail early, in modern `GENERIC` builds, if certain required browser functionality is missing (issue 11762) With two kind of builds now being produced, with/without translation/polyfills, it's unfortunately somewhat easy for users to accidentally pick the wrong one. In the case where a user would attempt to use a modern build of PDF.js in an older browser, such as e.g. IE11, the failure would be immediate when the code is loaded (given the use of unsupported ECMAScript features). However in some browsers/environments, in particular Node.js, a modern PDF.js build may load correctly and thus *appear* to function, only to fail for e.g. certain API calls. To hopefully lessen the support burden, and to try and improve things overall, this patch adds checks to ensure that a modern build of PDF.js cannot be used in browsers/environments which lack native support for critical functionality (such as e.g. `ReadableStream`). Hence we'll fail early, with an error message telling users to pick an ES5-compatible build instead. To ensure that we actually test things better especially w.r.t. usage of the PDF.js library in Node.js environments, the `gulp npm-test` task as used by Node.js/Travis was changed (back) to test an ES5-compatible build. (Since the bots still test the code as-is, without transpilation/polyfills, this shouldn't really be a problem as far as I can tell.) As part of these changes there's now both `gulp lib` and `gulp lib-es5` build targets, similar to e.g. the generic builds, which thanks to some re-factoring only required adding a small amount of code. *Please note:* While it's probably too early to tell if this will be a widespread issue, it's possible that this is the sort of patch that *may* warrant being `git cherry-pick`ed onto the current beta version (v2.4.456).
2020-04-01 20:31:33 +09:00
],
targets: BABEL_TARGETS,
Fail early, in modern `GENERIC` builds, if certain required browser functionality is missing (issue 11762) With two kind of builds now being produced, with/without translation/polyfills, it's unfortunately somewhat easy for users to accidentally pick the wrong one. In the case where a user would attempt to use a modern build of PDF.js in an older browser, such as e.g. IE11, the failure would be immediate when the code is loaded (given the use of unsupported ECMAScript features). However in some browsers/environments, in particular Node.js, a modern PDF.js build may load correctly and thus *appear* to function, only to fail for e.g. certain API calls. To hopefully lessen the support burden, and to try and improve things overall, this patch adds checks to ensure that a modern build of PDF.js cannot be used in browsers/environments which lack native support for critical functionality (such as e.g. `ReadableStream`). Hence we'll fail early, with an error message telling users to pick an ES5-compatible build instead. To ensure that we actually test things better especially w.r.t. usage of the PDF.js library in Node.js environments, the `gulp npm-test` task as used by Node.js/Travis was changed (back) to test an ES5-compatible build. (Since the bots still test the code as-is, without transpilation/polyfills, this shouldn't really be a problem as far as I can tell.) As part of these changes there's now both `gulp lib` and `gulp lib-es5` build targets, similar to e.g. the generic builds, which thanks to some re-factoring only required adding a small amount of code. *Please note:* While it's probably too early to tell if this will be a widespread issue, it's possible that this is the sort of patch that *may* warrant being `git cherry-pick`ed onto the current beta version (v2.4.456).
2020-04-01 20:31:33 +09:00
}).code;
const removeCjsSrc =
/^(var\s+\w+\s*=\s*(_interopRequireDefault\()?require\(".*?)(?:\/src)(\/[^"]*"\)\)?;)$/gm;
content = content.replaceAll(
removeCjsSrc,
(all, prefix, interop, suffix) => prefix + suffix
);
Fail early, in modern `GENERIC` builds, if certain required browser functionality is missing (issue 11762) With two kind of builds now being produced, with/without translation/polyfills, it's unfortunately somewhat easy for users to accidentally pick the wrong one. In the case where a user would attempt to use a modern build of PDF.js in an older browser, such as e.g. IE11, the failure would be immediate when the code is loaded (given the use of unsupported ECMAScript features). However in some browsers/environments, in particular Node.js, a modern PDF.js build may load correctly and thus *appear* to function, only to fail for e.g. certain API calls. To hopefully lessen the support burden, and to try and improve things overall, this patch adds checks to ensure that a modern build of PDF.js cannot be used in browsers/environments which lack native support for critical functionality (such as e.g. `ReadableStream`). Hence we'll fail early, with an error message telling users to pick an ES5-compatible build instead. To ensure that we actually test things better especially w.r.t. usage of the PDF.js library in Node.js environments, the `gulp npm-test` task as used by Node.js/Travis was changed (back) to test an ES5-compatible build. (Since the bots still test the code as-is, without transpilation/polyfills, this shouldn't really be a problem as far as I can tell.) As part of these changes there's now both `gulp lib` and `gulp lib-es5` build targets, similar to e.g. the generic builds, which thanks to some re-factoring only required adding a small amount of code. *Please note:* While it's probably too early to tell if this will be a widespread issue, it's possible that this is the sort of patch that *may* warrant being `git cherry-pick`ed onto the current beta version (v2.4.456).
2020-04-01 20:31:33 +09:00
return licenseHeaderLibre + content;
}
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const ctx = {
Fail early, in modern `GENERIC` builds, if certain required browser functionality is missing (issue 11762) With two kind of builds now being produced, with/without translation/polyfills, it's unfortunately somewhat easy for users to accidentally pick the wrong one. In the case where a user would attempt to use a modern build of PDF.js in an older browser, such as e.g. IE11, the failure would be immediate when the code is loaded (given the use of unsupported ECMAScript features). However in some browsers/environments, in particular Node.js, a modern PDF.js build may load correctly and thus *appear* to function, only to fail for e.g. certain API calls. To hopefully lessen the support burden, and to try and improve things overall, this patch adds checks to ensure that a modern build of PDF.js cannot be used in browsers/environments which lack native support for critical functionality (such as e.g. `ReadableStream`). Hence we'll fail early, with an error message telling users to pick an ES5-compatible build instead. To ensure that we actually test things better especially w.r.t. usage of the PDF.js library in Node.js environments, the `gulp npm-test` task as used by Node.js/Travis was changed (back) to test an ES5-compatible build. (Since the bots still test the code as-is, without transpilation/polyfills, this shouldn't really be a problem as far as I can tell.) As part of these changes there's now both `gulp lib` and `gulp lib-es5` build targets, similar to e.g. the generic builds, which thanks to some re-factoring only required adding a small amount of code. *Please note:* While it's probably too early to tell if this will be a widespread issue, it's possible that this is the sort of patch that *may* warrant being `git cherry-pick`ed onto the current beta version (v2.4.456).
2020-04-01 20:31:33 +09:00
rootPath: __dirname,
saveComments: false,
defines: bundleDefines,
map: {
"pdfjs-lib": "../pdf",
"display-fetch_stream": "./fetch_stream",
"display-l10n_utils": "../web/l10n_utils",
"display-network": "./network",
"display-node_stream": "./node_stream",
"display-node_utils": "./node_utils",
"display-svg": "./svg",
Fail early, in modern `GENERIC` builds, if certain required browser functionality is missing (issue 11762) With two kind of builds now being produced, with/without translation/polyfills, it's unfortunately somewhat easy for users to accidentally pick the wrong one. In the case where a user would attempt to use a modern build of PDF.js in an older browser, such as e.g. IE11, the failure would be immediate when the code is loaded (given the use of unsupported ECMAScript features). However in some browsers/environments, in particular Node.js, a modern PDF.js build may load correctly and thus *appear* to function, only to fail for e.g. certain API calls. To hopefully lessen the support burden, and to try and improve things overall, this patch adds checks to ensure that a modern build of PDF.js cannot be used in browsers/environments which lack native support for critical functionality (such as e.g. `ReadableStream`). Hence we'll fail early, with an error message telling users to pick an ES5-compatible build instead. To ensure that we actually test things better especially w.r.t. usage of the PDF.js library in Node.js environments, the `gulp npm-test` task as used by Node.js/Travis was changed (back) to test an ES5-compatible build. (Since the bots still test the code as-is, without transpilation/polyfills, this shouldn't really be a problem as far as I can tell.) As part of these changes there's now both `gulp lib` and `gulp lib-es5` build targets, similar to e.g. the generic builds, which thanks to some re-factoring only required adding a small amount of code. *Please note:* While it's probably too early to tell if this will be a widespread issue, it's possible that this is the sort of patch that *may* warrant being `git cherry-pick`ed onto the current beta version (v2.4.456).
2020-04-01 20:31:33 +09:00
},
};
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const licenseHeaderLibre = fs
Fail early, in modern `GENERIC` builds, if certain required browser functionality is missing (issue 11762) With two kind of builds now being produced, with/without translation/polyfills, it's unfortunately somewhat easy for users to accidentally pick the wrong one. In the case where a user would attempt to use a modern build of PDF.js in an older browser, such as e.g. IE11, the failure would be immediate when the code is loaded (given the use of unsupported ECMAScript features). However in some browsers/environments, in particular Node.js, a modern PDF.js build may load correctly and thus *appear* to function, only to fail for e.g. certain API calls. To hopefully lessen the support burden, and to try and improve things overall, this patch adds checks to ensure that a modern build of PDF.js cannot be used in browsers/environments which lack native support for critical functionality (such as e.g. `ReadableStream`). Hence we'll fail early, with an error message telling users to pick an ES5-compatible build instead. To ensure that we actually test things better especially w.r.t. usage of the PDF.js library in Node.js environments, the `gulp npm-test` task as used by Node.js/Travis was changed (back) to test an ES5-compatible build. (Since the bots still test the code as-is, without transpilation/polyfills, this shouldn't really be a problem as far as I can tell.) As part of these changes there's now both `gulp lib` and `gulp lib-es5` build targets, similar to e.g. the generic builds, which thanks to some re-factoring only required adding a small amount of code. *Please note:* While it's probably too early to tell if this will be a widespread issue, it's possible that this is the sort of patch that *may* warrant being `git cherry-pick`ed onto the current beta version (v2.4.456).
2020-04-01 20:31:33 +09:00
.readFileSync("./src/license_header_libre.js")
.toString();
return inputStream
.pipe(transform("utf8", preprocess))
.pipe(gulp.dest(outputDir));
}
function buildLib(defines, dir) {
const versionInfo = getVersionJSON();
const bundleDefines = builder.merge(defines, {
BUNDLE_VERSION: versionInfo.version,
BUNDLE_BUILD: versionInfo.commit,
TESTING: defines.TESTING ?? process.env.TESTING === "true",
DEFAULT_PREFERENCES: getDefaultPreferences(
defines.SKIP_BABEL ? "lib/" : "lib-legacy/"
),
});
const inputStream = merge([
Fail early, in modern `GENERIC` builds, if certain required browser functionality is missing (issue 11762) With two kind of builds now being produced, with/without translation/polyfills, it's unfortunately somewhat easy for users to accidentally pick the wrong one. In the case where a user would attempt to use a modern build of PDF.js in an older browser, such as e.g. IE11, the failure would be immediate when the code is loaded (given the use of unsupported ECMAScript features). However in some browsers/environments, in particular Node.js, a modern PDF.js build may load correctly and thus *appear* to function, only to fail for e.g. certain API calls. To hopefully lessen the support burden, and to try and improve things overall, this patch adds checks to ensure that a modern build of PDF.js cannot be used in browsers/environments which lack native support for critical functionality (such as e.g. `ReadableStream`). Hence we'll fail early, with an error message telling users to pick an ES5-compatible build instead. To ensure that we actually test things better especially w.r.t. usage of the PDF.js library in Node.js environments, the `gulp npm-test` task as used by Node.js/Travis was changed (back) to test an ES5-compatible build. (Since the bots still test the code as-is, without transpilation/polyfills, this shouldn't really be a problem as far as I can tell.) As part of these changes there's now both `gulp lib` and `gulp lib-es5` build targets, similar to e.g. the generic builds, which thanks to some re-factoring only required adding a small amount of code. *Please note:* While it's probably too early to tell if this will be a widespread issue, it's possible that this is the sort of patch that *may* warrant being `git cherry-pick`ed onto the current beta version (v2.4.456).
2020-04-01 20:31:33 +09:00
gulp.src(
[
"src/{core,display,shared}/**/*.js",
Fail early, in modern `GENERIC` builds, if certain required browser functionality is missing (issue 11762) With two kind of builds now being produced, with/without translation/polyfills, it's unfortunately somewhat easy for users to accidentally pick the wrong one. In the case where a user would attempt to use a modern build of PDF.js in an older browser, such as e.g. IE11, the failure would be immediate when the code is loaded (given the use of unsupported ECMAScript features). However in some browsers/environments, in particular Node.js, a modern PDF.js build may load correctly and thus *appear* to function, only to fail for e.g. certain API calls. To hopefully lessen the support burden, and to try and improve things overall, this patch adds checks to ensure that a modern build of PDF.js cannot be used in browsers/environments which lack native support for critical functionality (such as e.g. `ReadableStream`). Hence we'll fail early, with an error message telling users to pick an ES5-compatible build instead. To ensure that we actually test things better especially w.r.t. usage of the PDF.js library in Node.js environments, the `gulp npm-test` task as used by Node.js/Travis was changed (back) to test an ES5-compatible build. (Since the bots still test the code as-is, without transpilation/polyfills, this shouldn't really be a problem as far as I can tell.) As part of these changes there's now both `gulp lib` and `gulp lib-es5` build targets, similar to e.g. the generic builds, which thanks to some re-factoring only required adding a small amount of code. *Please note:* While it's probably too early to tell if this will be a widespread issue, it's possible that this is the sort of patch that *may* warrant being `git cherry-pick`ed onto the current beta version (v2.4.456).
2020-04-01 20:31:33 +09:00
"!src/shared/{cffStandardStrings,fonts_utils}.js",
"src/{pdf,pdf.image_decoders,pdf.worker}.js",
Fail early, in modern `GENERIC` builds, if certain required browser functionality is missing (issue 11762) With two kind of builds now being produced, with/without translation/polyfills, it's unfortunately somewhat easy for users to accidentally pick the wrong one. In the case where a user would attempt to use a modern build of PDF.js in an older browser, such as e.g. IE11, the failure would be immediate when the code is loaded (given the use of unsupported ECMAScript features). However in some browsers/environments, in particular Node.js, a modern PDF.js build may load correctly and thus *appear* to function, only to fail for e.g. certain API calls. To hopefully lessen the support burden, and to try and improve things overall, this patch adds checks to ensure that a modern build of PDF.js cannot be used in browsers/environments which lack native support for critical functionality (such as e.g. `ReadableStream`). Hence we'll fail early, with an error message telling users to pick an ES5-compatible build instead. To ensure that we actually test things better especially w.r.t. usage of the PDF.js library in Node.js environments, the `gulp npm-test` task as used by Node.js/Travis was changed (back) to test an ES5-compatible build. (Since the bots still test the code as-is, without transpilation/polyfills, this shouldn't really be a problem as far as I can tell.) As part of these changes there's now both `gulp lib` and `gulp lib-es5` build targets, similar to e.g. the generic builds, which thanks to some re-factoring only required adding a small amount of code. *Please note:* While it's probably too early to tell if this will be a widespread issue, it's possible that this is the sort of patch that *may* warrant being `git cherry-pick`ed onto the current beta version (v2.4.456).
2020-04-01 20:31:33 +09:00
],
{ base: "src/" }
),
gulp.src(
[
"examples/node/domstubs.js",
"external/webL10n/l10n.js",
"web/*.js",
"!web/{pdfjs,viewer}.js",
],
Fail early, in modern `GENERIC` builds, if certain required browser functionality is missing (issue 11762) With two kind of builds now being produced, with/without translation/polyfills, it's unfortunately somewhat easy for users to accidentally pick the wrong one. In the case where a user would attempt to use a modern build of PDF.js in an older browser, such as e.g. IE11, the failure would be immediate when the code is loaded (given the use of unsupported ECMAScript features). However in some browsers/environments, in particular Node.js, a modern PDF.js build may load correctly and thus *appear* to function, only to fail for e.g. certain API calls. To hopefully lessen the support burden, and to try and improve things overall, this patch adds checks to ensure that a modern build of PDF.js cannot be used in browsers/environments which lack native support for critical functionality (such as e.g. `ReadableStream`). Hence we'll fail early, with an error message telling users to pick an ES5-compatible build instead. To ensure that we actually test things better especially w.r.t. usage of the PDF.js library in Node.js environments, the `gulp npm-test` task as used by Node.js/Travis was changed (back) to test an ES5-compatible build. (Since the bots still test the code as-is, without transpilation/polyfills, this shouldn't really be a problem as far as I can tell.) As part of these changes there's now both `gulp lib` and `gulp lib-es5` build targets, similar to e.g. the generic builds, which thanks to some re-factoring only required adding a small amount of code. *Please note:* While it's probably too early to tell if this will be a widespread issue, it's possible that this is the sort of patch that *may* warrant being `git cherry-pick`ed onto the current beta version (v2.4.456).
2020-04-01 20:31:33 +09:00
{ base: "." }
),
gulp.src("test/unit/*.js", { base: "." }),
]);
return buildLibHelper(bundleDefines, inputStream, dir);
Fail early, in modern `GENERIC` builds, if certain required browser functionality is missing (issue 11762) With two kind of builds now being produced, with/without translation/polyfills, it's unfortunately somewhat easy for users to accidentally pick the wrong one. In the case where a user would attempt to use a modern build of PDF.js in an older browser, such as e.g. IE11, the failure would be immediate when the code is loaded (given the use of unsupported ECMAScript features). However in some browsers/environments, in particular Node.js, a modern PDF.js build may load correctly and thus *appear* to function, only to fail for e.g. certain API calls. To hopefully lessen the support burden, and to try and improve things overall, this patch adds checks to ensure that a modern build of PDF.js cannot be used in browsers/environments which lack native support for critical functionality (such as e.g. `ReadableStream`). Hence we'll fail early, with an error message telling users to pick an ES5-compatible build instead. To ensure that we actually test things better especially w.r.t. usage of the PDF.js library in Node.js environments, the `gulp npm-test` task as used by Node.js/Travis was changed (back) to test an ES5-compatible build. (Since the bots still test the code as-is, without transpilation/polyfills, this shouldn't really be a problem as far as I can tell.) As part of these changes there's now both `gulp lib` and `gulp lib-es5` build targets, similar to e.g. the generic builds, which thanks to some re-factoring only required adding a small amount of code. *Please note:* While it's probably too early to tell if this will be a widespread issue, it's possible that this is the sort of patch that *may* warrant being `git cherry-pick`ed onto the current beta version (v2.4.456).
2020-04-01 20:31:33 +09:00
}
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
gulp.task(
"lib",
gulp.series(
createBuildNumber,
function scriptingLib() {
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const defines = builder.merge(DEFINES, { GENERIC: true, LIB: true });
return merge([
buildDefaultPreferences(defines, "lib/"),
createTemporaryScriptingBundle(defines),
]);
},
async function prefsLib() {
await parseDefaultPreferences("lib/");
},
function createLib() {
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const defines = builder.merge(DEFINES, { GENERIC: true, LIB: true });
Re-factor how the `pdf.sandbox.js` file is built (PR 12604 follow-up) The way that the `pdf.sandbox.js` building was implemented feels all kinds of inconsistent/wrong, and it "sticks out" quite a bit when compared to the rest of the `gulpfile.js`. This patch thus attempts to improve the current situation slightly, to hopefully make future maintenance easier. One thing that strikes you, pretty immediately, when looking at PR 12604 is that the two new `gulp`-tasks added (i.e. `sandbox` and `watch-sandbox`) don't even work!? The reason for this is that they implicitly dependent upon the result of the `buildnumber`-task, which isn't listed as a dependency. (Try running `gulp clean` *first*, and invoking any of the new `gulp`-tasks will inevitably fail.) Furthermore, there's another (potentially big) problem with the implementation of e.g. the `gulp sandbox` task, since it doesn't actually wait for all building to complete before the task is considered as "done". This has the potential to cause all sorts of subtle bugs elsewhere, and the fact that things even "work" as-is can probably be attributed mostly to luck. Unfortunately there's no *perfect* way to improve things here, since the `pdf.sandbox.js` file depends on including the `pdf.scripting.js` file as a string, however I firmly believe that improvements are still possible here. To that end, this patch updates all relevant build-targets to create a *temporary* `pdf.scripting.js` file as part of the setup in the `gulp`-tasks, and then reads that file during the `pdf.sandbox.js` building. This at least allows us to bring all of this "sandbox"-build code much more in-line with the existing build-system.
2020-12-05 21:59:46 +09:00
return merge([
buildLib(defines, "build/lib/"),
createSandboxBundle(defines).pipe(gulp.dest("build/lib/")),
]);
}
)
Fail early, in modern `GENERIC` builds, if certain required browser functionality is missing (issue 11762) With two kind of builds now being produced, with/without translation/polyfills, it's unfortunately somewhat easy for users to accidentally pick the wrong one. In the case where a user would attempt to use a modern build of PDF.js in an older browser, such as e.g. IE11, the failure would be immediate when the code is loaded (given the use of unsupported ECMAScript features). However in some browsers/environments, in particular Node.js, a modern PDF.js build may load correctly and thus *appear* to function, only to fail for e.g. certain API calls. To hopefully lessen the support burden, and to try and improve things overall, this patch adds checks to ensure that a modern build of PDF.js cannot be used in browsers/environments which lack native support for critical functionality (such as e.g. `ReadableStream`). Hence we'll fail early, with an error message telling users to pick an ES5-compatible build instead. To ensure that we actually test things better especially w.r.t. usage of the PDF.js library in Node.js environments, the `gulp npm-test` task as used by Node.js/Travis was changed (back) to test an ES5-compatible build. (Since the bots still test the code as-is, without transpilation/polyfills, this shouldn't really be a problem as far as I can tell.) As part of these changes there's now both `gulp lib` and `gulp lib-es5` build targets, similar to e.g. the generic builds, which thanks to some re-factoring only required adding a small amount of code. *Please note:* While it's probably too early to tell if this will be a widespread issue, it's possible that this is the sort of patch that *may* warrant being `git cherry-pick`ed onto the current beta version (v2.4.456).
2020-04-01 20:31:33 +09:00
);
gulp.task(
"lib-legacy",
gulp.series(
createBuildNumber,
function scriptingLibLegacy() {
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const defines = builder.merge(DEFINES, {
GENERIC: true,
LIB: true,
SKIP_BABEL: false,
});
return merge([
buildDefaultPreferences(defines, "lib-legacy/"),
createTemporaryScriptingBundle(defines),
]);
},
async function prefsLibLegacy() {
await parseDefaultPreferences("lib-legacy/");
},
function createLibLegacy() {
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const defines = builder.merge(DEFINES, {
GENERIC: true,
LIB: true,
SKIP_BABEL: false,
});
Re-factor how the `pdf.sandbox.js` file is built (PR 12604 follow-up) The way that the `pdf.sandbox.js` building was implemented feels all kinds of inconsistent/wrong, and it "sticks out" quite a bit when compared to the rest of the `gulpfile.js`. This patch thus attempts to improve the current situation slightly, to hopefully make future maintenance easier. One thing that strikes you, pretty immediately, when looking at PR 12604 is that the two new `gulp`-tasks added (i.e. `sandbox` and `watch-sandbox`) don't even work!? The reason for this is that they implicitly dependent upon the result of the `buildnumber`-task, which isn't listed as a dependency. (Try running `gulp clean` *first*, and invoking any of the new `gulp`-tasks will inevitably fail.) Furthermore, there's another (potentially big) problem with the implementation of e.g. the `gulp sandbox` task, since it doesn't actually wait for all building to complete before the task is considered as "done". This has the potential to cause all sorts of subtle bugs elsewhere, and the fact that things even "work" as-is can probably be attributed mostly to luck. Unfortunately there's no *perfect* way to improve things here, since the `pdf.sandbox.js` file depends on including the `pdf.scripting.js` file as a string, however I firmly believe that improvements are still possible here. To that end, this patch updates all relevant build-targets to create a *temporary* `pdf.scripting.js` file as part of the setup in the `gulp`-tasks, and then reads that file during the `pdf.sandbox.js` building. This at least allows us to bring all of this "sandbox"-build code much more in-line with the existing build-system.
2020-12-05 21:59:46 +09:00
return merge([
buildLib(defines, "build/lib-legacy/"),
createSandboxBundle(defines).pipe(gulp.dest("build/lib-legacy/")),
Re-factor how the `pdf.sandbox.js` file is built (PR 12604 follow-up) The way that the `pdf.sandbox.js` building was implemented feels all kinds of inconsistent/wrong, and it "sticks out" quite a bit when compared to the rest of the `gulpfile.js`. This patch thus attempts to improve the current situation slightly, to hopefully make future maintenance easier. One thing that strikes you, pretty immediately, when looking at PR 12604 is that the two new `gulp`-tasks added (i.e. `sandbox` and `watch-sandbox`) don't even work!? The reason for this is that they implicitly dependent upon the result of the `buildnumber`-task, which isn't listed as a dependency. (Try running `gulp clean` *first*, and invoking any of the new `gulp`-tasks will inevitably fail.) Furthermore, there's another (potentially big) problem with the implementation of e.g. the `gulp sandbox` task, since it doesn't actually wait for all building to complete before the task is considered as "done". This has the potential to cause all sorts of subtle bugs elsewhere, and the fact that things even "work" as-is can probably be attributed mostly to luck. Unfortunately there's no *perfect* way to improve things here, since the `pdf.sandbox.js` file depends on including the `pdf.scripting.js` file as a string, however I firmly believe that improvements are still possible here. To that end, this patch updates all relevant build-targets to create a *temporary* `pdf.scripting.js` file as part of the setup in the `gulp`-tasks, and then reads that file during the `pdf.sandbox.js` building. This at least allows us to bring all of this "sandbox"-build code much more in-line with the existing build-system.
2020-12-05 21:59:46 +09:00
]);
}
)
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
);
function compressPublish(targetName, dir) {
return gulp
.src(dir + "**")
.pipe(zip(targetName))
.pipe(gulp.dest(BUILD_DIR))
.on("end", function () {
console.log("Built distribution file: " + targetName);
});
}
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
gulp.task(
"publish",
gulp.series("generic", "generic-legacy", function createPublish(done) {
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const version = JSON.parse(
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
fs.readFileSync(BUILD_DIR + "version.json").toString()
).version;
config.stableVersion = version;
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
return merge([
createStringSource(CONFIG_FILE, JSON.stringify(config, null, 2)).pipe(
gulp.dest(".")
),
compressPublish("pdfjs-" + version + "-dist.zip", GENERIC_DIR),
compressPublish(
"pdfjs-" + version + "-legacy-dist.zip",
GENERIC_LEGACY_DIR
),
]);
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
})
);
2016-04-27 06:28:36 +09:00
function setTestEnv(done) {
process.env.TESTING = "true";
// TODO: Re-write the relevant unit-tests, which are using `new Date(...)`,
// to not required the following time-zone hack since it doesn't work
// when the unit-tests are run directly in the browser.
process.env.TZ = "UTC";
done();
}
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
gulp.task(
"test",
gulp.series(setTestEnv, "generic", "components", function runTest() {
return streamqueue(
{ objectMode: true },
createTestSource("unit"),
createTestSource("browser"),
createTestSource("integration")
);
})
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
);
gulp.task(
"bottest",
gulp.series(setTestEnv, "generic", "components", function runBotTest() {
return streamqueue(
{ objectMode: true },
createTestSource("unit", { bot: true }),
createTestSource("font", { bot: true }),
createTestSource("browser", { bot: true }),
createTestSource("integration")
);
})
);
gulp.task(
"xfatest",
gulp.series(setTestEnv, "generic", "components", function runXfaTest() {
return streamqueue(
{ objectMode: true },
createTestSource("unit"),
createTestSource("browser", { xfaOnly: true }),
createTestSource("integration")
);
})
);
gulp.task(
"botxfatest",
gulp.series(setTestEnv, "generic", "components", function runBotXfaTest() {
return streamqueue(
{ objectMode: true },
createTestSource("unit", { bot: true }),
createTestSource("font", { bot: true }),
createTestSource("browser", { bot: true, xfaOnly: true }),
createTestSource("integration")
);
})
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
);
gulp.task(
"browsertest",
gulp.series(setTestEnv, "generic", "components", function runBrowserTest() {
return createTestSource("browser");
})
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
);
gulp.task(
"botbrowsertest",
gulp.series(
setTestEnv,
"generic",
"components",
function runBotBrowserTest() {
return streamqueue(
{ objectMode: true },
createTestSource("browser", { bot: true })
);
}
)
);
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
gulp.task(
"unittest",
gulp.series(setTestEnv, "generic", function runUnitTest() {
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
return createTestSource("unit");
})
);
gulp.task(
"integrationtest",
gulp.series(setTestEnv, "generic", function runIntegrationTest() {
return createTestSource("integration");
})
);
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
gulp.task(
"fonttest",
gulp.series(setTestEnv, function runFontTest() {
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
return createTestSource("font");
})
);
gulp.task(
"makeref",
gulp.series(setTestEnv, "generic", "components", function runMakeref(done) {
makeRef(done);
})
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
);
gulp.task(
"botmakeref",
gulp.series(
setTestEnv,
"generic",
"components",
function runBotMakeref(done) {
makeRef(done, true);
}
)
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
);
gulp.task(
"typestest",
gulp.series(
setTestEnv,
"generic",
"types",
function createTypesTest() {
return merge([
packageJson().pipe(gulp.dest(TYPESTEST_DIR)),
gulp
.src([
GENERIC_DIR + "build/pdf.js",
GENERIC_DIR + "build/pdf.worker.js",
SRC_DIR + "pdf.worker.entry.js",
])
.pipe(gulp.dest(TYPESTEST_DIR + "build/")),
gulp
.src(TYPES_DIR + "**/*", { base: TYPES_DIR })
.pipe(gulp.dest(TYPESTEST_DIR + "types/")),
]);
},
function runTypesTest(done) {
exec('"node_modules/.bin/tsc" -p test/types', function (err, stdout) {
if (err) {
console.log(`Couldn't compile TypeScript test: ${stdout}`);
}
done(err);
});
}
)
);
function createBaseline(done) {
console.log();
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
console.log("### Creating baseline environment");
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const baselineCommit = process.env.BASELINE;
if (!baselineCommit) {
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
done(new Error("Missing baseline commit. Specify the BASELINE variable."));
return;
}
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
let initializeCommand = "git fetch origin";
if (!checkDir(BASELINE_DIR)) {
mkdirp.sync(BASELINE_DIR);
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
initializeCommand = "git clone ../../ .";
}
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const workingDirectory = path.resolve(process.cwd(), BASELINE_DIR);
exec(initializeCommand, { cwd: workingDirectory }, function (error) {
if (error) {
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
done(new Error("Baseline clone/fetch failed."));
return;
}
exec(
"git checkout " + baselineCommit,
{ cwd: workingDirectory },
function (error2) {
if (error2) {
done(new Error("Baseline commit checkout failed."));
return;
}
console.log('Baseline commit "' + baselineCommit + '" checked out.');
done();
}
);
});
}
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
gulp.task(
"unittestcli",
gulp.series(setTestEnv, "lib-legacy", function runUnitTestCli(done) {
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const options = [
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
"node_modules/jasmine/bin/jasmine",
"JASMINE_CONFIG_PATH=test/unit/clitests.json",
];
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const jasmineProcess = startNode(options, { stdio: "inherit" });
jasmineProcess.on("close", function (code) {
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
if (code !== 0) {
done(new Error("Unit tests failed."));
return;
}
done();
});
})
);
2016-05-02 23:58:29 +09:00
gulp.task("lint", function (done) {
console.log();
console.log("### Linting JS/CSS files");
// Ensure that we lint the Firefox specific *.jsm files too.
const esLintOptions = [
"node_modules/eslint/bin/eslint",
"--ext",
".js,.jsm,.mjs,.json",
".",
"--report-unused-disable-directives",
];
if (process.argv.includes("--fix")) {
esLintOptions.push("--fix");
}
const styleLintOptions = [
"node_modules/stylelint/bin/stylelint.mjs",
"**/*.css",
"--report-needless-disables",
];
if (process.argv.includes("--fix")) {
styleLintOptions.push("--fix");
}
const esLintProcess = startNode(esLintOptions, { stdio: "inherit" });
esLintProcess.on("close", function (esLintCode) {
if (esLintCode !== 0) {
done(new Error("ESLint failed."));
return;
}
const styleLintProcess = startNode(styleLintOptions, { stdio: "inherit" });
styleLintProcess.on("close", function (styleLintCode) {
if (styleLintCode !== 0) {
done(new Error("Stylelint failed."));
return;
}
console.log("files checked, no errors found");
done();
});
});
});
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
gulp.task(
"lint-chromium",
gulp.series(
function scriptingLintChromium() {
const defines = builder.merge(DEFINES, {
CHROME: true,
SKIP_BABEL: false,
TESTING: false,
});
return buildDefaultPreferences(defines, "lint-chromium/");
},
async function prefsLintChromium() {
await parseDefaultPreferences("lint-chromium/");
},
function runLintChromium(done) {
console.log();
console.log("### Checking supplemental Chromium files");
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
if (
!checkChromePreferencesFile(
"extensions/chromium/preferences_schema.json",
getDefaultPreferences("lint-chromium/")
)
) {
done(new Error("chromium/preferences_schema is not in sync."));
return;
}
done();
}
)
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
);
gulp.task(
"dev-sandbox",
gulp.series(
function scriptingDevSandbox() {
const defines = builder.merge(DEFINES, { GENERIC: true, TESTING: true });
return createTemporaryScriptingBundle(defines, {
disableVersionInfo: true,
});
},
function createDevSandbox() {
console.log();
console.log("### Building development sandbox");
const defines = builder.merge(DEFINES, { GENERIC: true, TESTING: true });
const sandboxDir = BUILD_DIR + "dev-sandbox/";
rimraf.sync(sandboxDir);
2016-03-05 00:36:46 +09:00
return createSandboxBundle(defines, {
disableVersionInfo: true,
}).pipe(gulp.dest(sandboxDir));
}
)
);
gulp.task(
"server",
gulp.parallel(
function watchDevSandbox() {
gulp.watch(
[
"src/pdf.{sandbox,sandbox.external,scripting}.js",
"src/scripting_api/*.js",
"src/shared/scripting_utils.js",
"external/quickjs/*.js",
],
{ ignoreInitial: false },
gulp.series("dev-sandbox")
);
},
async function createServer() {
console.log();
console.log("### Starting local server");
const { WebServer } = await import("./test/webserver.mjs");
const server = new WebServer();
server.port = 8888;
server.start();
}
)
);
gulp.task("clean", function (done) {
console.log();
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
console.log("### Cleaning up project builds");
rimraf(BUILD_DIR, done);
});
gulp.task("importl10n", async function () {
const { downloadL10n } = await import("./external/importL10n/locales.mjs");
console.log();
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
console.log("### Importing translations from mozilla-central");
if (!fs.existsSync(L10N_DIR)) {
fs.mkdirSync(L10N_DIR);
}
await downloadL10n(L10N_DIR);
});
function ghPagesPrepare() {
2017-04-15 04:28:46 +09:00
console.log();
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
console.log("### Creating web site");
2017-04-15 04:28:46 +09:00
rimraf.sync(GH_PAGES_DIR);
return merge([
gulp
.src(GENERIC_DIR + "**/*", { base: GENERIC_DIR, removeBOM: false })
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
.pipe(gulp.dest(GH_PAGES_DIR)),
gulp
.src(GENERIC_LEGACY_DIR + "**/*", {
base: GENERIC_LEGACY_DIR,
removeBOM: false,
})
.pipe(gulp.dest(GH_PAGES_DIR + "legacy/")),
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
gulp
.src(JSDOC_BUILD_DIR + "**/*", { base: JSDOC_BUILD_DIR })
.pipe(gulp.dest(GH_PAGES_DIR + "api/draft/")),
2017-04-15 04:28:46 +09:00
]);
}
2017-04-15 04:28:46 +09:00
gulp.task("wintersmith", async function () {
const { default: wintersmith } = await import("wintersmith");
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const env = wintersmith("docs/config.json");
return new Promise((resolve, reject) => {
env.build(GH_PAGES_DIR, function (error) {
if (error) {
reject(error);
return;
}
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
replaceInFile(
GH_PAGES_DIR + "/getting_started/index.html",
/STABLE_VERSION/g,
config.stableVersion
);
console.log("Done building with wintersmith.");
resolve();
});
2017-04-15 04:28:46 +09:00
});
});
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
gulp.task(
"web",
gulp.series(
"generic",
"generic-legacy",
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
"jsdoc",
ghPagesPrepare,
"wintersmith"
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
)
);
function packageJson() {
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const VERSION = getVersionJSON().version;
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const DIST_NAME = "pdfjs-dist";
const DIST_DESCRIPTION = "Generic build of Mozilla's PDF.js library.";
const DIST_KEYWORDS = ["Mozilla", "pdf", "pdf.js"];
const DIST_HOMEPAGE = "http://mozilla.github.io/pdf.js/";
const DIST_BUGS_URL = "https://github.com/mozilla/pdf.js/issues";
const DIST_LICENSE = "Apache-2.0";
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const npmManifest = {
name: DIST_NAME,
version: VERSION,
main: "build/pdf.js",
types: "types/src/pdf.d.ts",
description: DIST_DESCRIPTION,
keywords: DIST_KEYWORDS,
homepage: DIST_HOMEPAGE,
bugs: DIST_BUGS_URL,
license: DIST_LICENSE,
optionalDependencies: {
2023-04-16 05:08:58 +09:00
canvas: "^2.11.2",
"path2d-polyfill": "^2.0.1",
},
browser: {
canvas: false,
fs: false,
http: false,
https: false,
url: false,
zlib: false,
},
format: "amd", // to not allow system.js to choose 'cjs'
repository: {
type: "git",
url: DIST_REPO_URL,
},
engines: {
node: ">=18",
},
};
return createStringSource(
"package.json",
JSON.stringify(npmManifest, null, 2)
);
}
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
gulp.task(
"dist-pre",
gulp.series(
"generic",
"generic-legacy",
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
"components",
"components-legacy",
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
"image_decoders",
"image_decoders-legacy",
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
"minified",
"minified-legacy",
"types",
function createDist() {
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
console.log();
console.log("### Cloning baseline distribution");
rimraf.sync(DIST_DIR);
mkdirp.sync(DIST_DIR);
safeSpawnSync("git", ["clone", "--depth", "1", DIST_REPO_URL, DIST_DIR]);
console.log();
console.log("### Overwriting all files");
rimraf.sync(path.join(DIST_DIR, "*"));
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
return merge([
packageJson().pipe(gulp.dest(DIST_DIR)),
gulp
.src("external/dist/**/*", {
base: "external/dist",
removeBOM: false,
})
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
.pipe(gulp.dest(DIST_DIR)),
gulp.src(GENERIC_DIR + "LICENSE").pipe(gulp.dest(DIST_DIR)),
gulp
.src(GENERIC_DIR + "web/cmaps/**/*", { base: GENERIC_DIR + "web" })
.pipe(gulp.dest(DIST_DIR)),
gulp
.src(GENERIC_DIR + "web/standard_fonts/**/*", {
base: GENERIC_DIR + "web",
})
.pipe(gulp.dest(DIST_DIR)),
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
gulp
.src([
GENERIC_DIR + "build/{pdf,pdf.worker,pdf.sandbox}.js",
GENERIC_DIR + "build/{pdf,pdf.worker,pdf.sandbox}.js.map",
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
SRC_DIR + "pdf.worker.entry.js",
])
.pipe(gulp.dest(DIST_DIR + "build/")),
gulp
.src([
GENERIC_LEGACY_DIR + "build/{pdf,pdf.worker,pdf.sandbox}.js",
GENERIC_LEGACY_DIR + "build/{pdf,pdf.worker,pdf.sandbox}.js.map",
SRC_DIR + "pdf.worker.entry.js",
])
.pipe(gulp.dest(DIST_DIR + "legacy/build/")),
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
gulp
.src(MINIFIED_DIR + "build/pdf.js")
.pipe(rename("pdf.min.js"))
.pipe(gulp.dest(DIST_DIR + "build/")),
gulp
.src(MINIFIED_DIR + "build/pdf.worker.js")
.pipe(rename("pdf.worker.min.js"))
.pipe(gulp.dest(DIST_DIR + "build/")),
gulp
.src(MINIFIED_DIR + "build/pdf.sandbox.js")
.pipe(rename("pdf.sandbox.min.js"))
.pipe(gulp.dest(DIST_DIR + "build/")),
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
gulp
.src(MINIFIED_DIR + "image_decoders/pdf.image_decoders.js")
.pipe(rename("pdf.image_decoders.min.js"))
.pipe(gulp.dest(DIST_DIR + "image_decoders/")),
gulp
.src(MINIFIED_LEGACY_DIR + "build/pdf.js")
.pipe(rename("pdf.min.js"))
.pipe(gulp.dest(DIST_DIR + "legacy/build/")),
gulp
.src(MINIFIED_LEGACY_DIR + "build/pdf.worker.js")
.pipe(rename("pdf.worker.min.js"))
.pipe(gulp.dest(DIST_DIR + "legacy/build/")),
gulp
.src(MINIFIED_LEGACY_DIR + "build/pdf.sandbox.js")
.pipe(rename("pdf.sandbox.min.js"))
.pipe(gulp.dest(DIST_DIR + "legacy/build/")),
gulp
.src(MINIFIED_LEGACY_DIR + "image_decoders/pdf.image_decoders.js")
.pipe(rename("pdf.image_decoders.min.js"))
.pipe(gulp.dest(DIST_DIR + "legacy/image_decoders/")),
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
gulp
.src(COMPONENTS_DIR + "**/*", { base: COMPONENTS_DIR })
.pipe(gulp.dest(DIST_DIR + "web/")),
gulp
.src(COMPONENTS_LEGACY_DIR + "**/*", { base: COMPONENTS_LEGACY_DIR })
.pipe(gulp.dest(DIST_DIR + "legacy/web/")),
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
gulp
.src(IMAGE_DECODERS_DIR + "**/*", { base: IMAGE_DECODERS_DIR })
.pipe(gulp.dest(DIST_DIR + "image_decoders/")),
gulp
.src(IMAGE_DECODERS_LEGACY_DIR + "**/*", {
base: IMAGE_DECODERS_LEGACY_DIR,
})
.pipe(gulp.dest(DIST_DIR + "legacy/image_decoders/")),
gulp
.src(TYPES_DIR + "**/*", { base: TYPES_DIR })
.pipe(gulp.dest(DIST_DIR + "types/")),
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
]);
}
)
);
gulp.task(
"dist-install",
gulp.series("dist-pre", function createDistInstall(done) {
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
let distPath = DIST_DIR;
const opts = {};
const installPath = process.env.PDFJS_INSTALL_PATH;
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
if (installPath) {
opts.cwd = installPath;
distPath = path.relative(installPath, distPath);
}
safeSpawnSync("npm", ["install", distPath], opts);
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
done();
})
);
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
gulp.task(
"dist",
gulp.series("dist-pre", function createDist(done) {
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const VERSION = getVersionJSON().version;
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
console.log();
console.log("### Committing changes");
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
let reason = process.env.PDFJS_UPDATE_REASON;
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
// Attempt to work-around the broken link, see https://github.com/mozilla/pdf.js/issues/10391
if (typeof reason === "string") {
const reasonParts =
/^(See )(mozilla\/pdf\.js)@tags\/(v\d+\.\d+\.\d+)\s*$/.exec(reason);
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
if (reasonParts) {
reason =
reasonParts[1] +
"https://github.com/" +
reasonParts[2] +
"/releases/tag/" +
reasonParts[3];
}
}
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const message =
"PDF.js version " + VERSION + (reason ? " - " + reason : "");
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
safeSpawnSync("git", ["add", "*"], { cwd: DIST_DIR });
safeSpawnSync("git", ["commit", "-am", message], { cwd: DIST_DIR });
safeSpawnSync("git", ["tag", "-a", "v" + VERSION, "-m", message], {
cwd: DIST_DIR,
});
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
console.log();
console.log("Done. Push with");
console.log(
" cd " + DIST_DIR + "; git push --tags " + DIST_REPO_URL + " master"
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
);
console.log();
done();
})
);
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
gulp.task(
"mozcentralbaseline",
gulp.series(createBaseline, function createMozcentralBaseline(done) {
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
console.log();
console.log("### Creating mozcentral baseline environment");
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
// Create a mozcentral build.
rimraf.sync(BASELINE_DIR + BUILD_DIR);
2016-03-05 00:36:46 +09:00
Enable the ESLint `no-var` rule in `gulpfile.js` Given that `let`/`const` is already used here and there in this file, converting the rest of the `var` occurrences shouldn't be a problem. Note that the majority of these changes were done automatically, by using the `gulp lint --fix` command, and the manual changes were limited to the following diff: ```diff diff --git a/gulpfile.js b/gulpfile.js index e2360c8ec..905420c33 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -676,8 +676,8 @@ gulp.task("default_preferences-pre", function () { ], }).code; } - var babel = require("@babel/core"); - var ctx = { + const babel = require("@babel/core"); + const ctx = { rootPath: __dirname, saveComments: false, defines: builder.merge(DEFINES, { @@ -690,7 +690,7 @@ gulp.task("default_preferences-pre", function () { "pdfjs-lib": "../pdf", }, }; - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src(["web/{app_options,viewer_compatibility}.js"], { base: ".", @@ -1418,14 +1418,14 @@ function buildLib(defines, dir) { }); return licenseHeaderLibre + content; } - var babel = require("@babel/core"); + const babel = require("@babel/core"); const versionInfo = getVersionJSON(); - var bundleDefines = builder.merge(defines, { + const bundleDefines = builder.merge(defines, { BUNDLE_VERSION: versionInfo.version, BUNDLE_BUILD: versionInfo.commit, TESTING: process.env.TESTING === "true", }); - var ctx = { + const ctx = { rootPath: __dirname, saveComments: false, defines: bundleDefines, @@ -1433,10 +1433,10 @@ function buildLib(defines, dir) { "pdfjs-lib": "../pdf", }, }; - var licenseHeaderLibre = fs + const licenseHeaderLibre = fs .readFileSync("./src/license_header_libre.js") .toString(); - var preprocessor2 = require("./external/builder/preprocessor2.js"); + const preprocessor2 = require("./external/builder/preprocessor2.js"); return merge([ gulp.src( [ ```
2021-03-13 19:42:40 +09:00
const workingDirectory = path.resolve(process.cwd(), BASELINE_DIR);
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
safeSpawnSync("gulp", ["mozcentral"], {
env: process.env,
cwd: workingDirectory,
stdio: "inherit",
});
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
// Copy the mozcentral build to the mozcentral baseline directory.
rimraf.sync(MOZCENTRAL_BASELINE_DIR);
mkdirp.sync(MOZCENTRAL_BASELINE_DIR);
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
gulp
.src([BASELINE_DIR + BUILD_DIR + "mozcentral/**/*"])
.pipe(gulp.dest(MOZCENTRAL_BASELINE_DIR))
.on("end", function () {
// Commit the mozcentral baseline.
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
safeSpawnSync("git", ["init"], { cwd: MOZCENTRAL_BASELINE_DIR });
safeSpawnSync("git", ["add", "."], { cwd: MOZCENTRAL_BASELINE_DIR });
safeSpawnSync("git", ["commit", "-m", '"mozcentral baseline"'], {
cwd: MOZCENTRAL_BASELINE_DIR,
});
done();
});
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
})
);
2016-03-05 00:36:46 +09:00
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
gulp.task(
"mozcentraldiff",
gulp.series(
"mozcentral",
"mozcentralbaseline",
function createMozcentralDiff(done) {
console.log();
console.log("### Creating mozcentral diff");
// Create the diff between the current mozcentral build and the
// baseline mozcentral build, which both exist at this point.
// The mozcentral baseline directory is a Git repository, so we
// remove all files and copy the current mozcentral build files
// into it to create the diff.
rimraf.sync(MOZCENTRAL_BASELINE_DIR + "*");
gulp
.src([BUILD_DIR + "mozcentral/**/*"])
.pipe(gulp.dest(MOZCENTRAL_BASELINE_DIR))
.on("end", function () {
safeSpawnSync("git", ["add", "-A"], { cwd: MOZCENTRAL_BASELINE_DIR });
const diff = safeSpawnSync(
"git",
["diff", "--binary", "--cached", "--unified=8"],
{ cwd: MOZCENTRAL_BASELINE_DIR }
).stdout;
createStringSource(MOZCENTRAL_DIFF_FILE, diff)
.pipe(gulp.dest(BUILD_DIR))
.on("end", function () {
console.log(
"Result diff can be found at " +
BUILD_DIR +
MOZCENTRAL_DIFF_FILE
);
done();
});
});
}
)
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
);
gulp.task("externaltest", function (done) {
console.log();
console.log("### Running test-fixtures.js");
safeSpawnSync("node", ["external/builder/test-fixtures.mjs"], {
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
stdio: "inherit",
});
console.log();
console.log("### Running test-fixtures_esprima.js");
safeSpawnSync("node", ["external/builder/test-fixtures_esprima.mjs"], {
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
stdio: "inherit",
});
done();
2017-05-04 02:16:37 +09:00
});
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
gulp.task(
"ci-test",
gulp.series(
gulp.parallel("lint", "externaltest", "unittestcli"),
"lint-chromium",
"typestest"
)
Enable auto-formatting of the entire code-base using Prettier (issue 11444) Note that Prettier, purposely, has only limited [configuration options](https://prettier.io/docs/en/options.html). The configuration file is based on [the one in `mozilla central`](https://searchfox.org/mozilla-central/source/.prettierrc) with just a few additions (to avoid future breakage if the defaults ever changes). Prettier is being used for a couple of reasons: - To be consistent with `mozilla-central`, where Prettier is already in use across the tree. - To ensure a *consistent* coding style everywhere, which is automatically enforced during linting (since Prettier is used as an ESLint plugin). This thus ends "all" formatting disussions once and for all, removing the need for review comments on most stylistic matters. Many ESLint options are now redundant, and I've tried my best to remove all the now unnecessary options (but I may have missed some). Note also that since Prettier considers the `printWidth` option as a guide, rather than a hard rule, this patch resorts to a small hack in the ESLint config to ensure that *comments* won't become too long. *Please note:* This patch is generated automatically, by appending the `--fix` argument to the ESLint call used in the `gulp lint` task. It will thus require some additional clean-up, which will be done in a *separate* commit. (On a more personal note, I'll readily admit that some of the changes Prettier makes are *extremely* ugly. However, in the name of consistency we'll probably have to live with that.)
2019-12-25 23:59:37 +09:00
);