Skip to content

Commit

Permalink
Merge pull request #18432 from timvandermeij/updates
Browse files Browse the repository at this point in the history
Update dependencies to the most recent versions and update the JS/CSS files for the new Prettier/Stylelint versions
  • Loading branch information
timvandermeij authored Jul 13, 2024
2 parents 2d25437 + c77b97d commit 07c58aa
Show file tree
Hide file tree
Showing 7 changed files with 205 additions and 182 deletions.
358 changes: 190 additions & 168 deletions package-lock.json

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
"name": "pdf.js",
"type": "module",
"devDependencies": {
"@babel/core": "^7.24.7",
"@babel/preset-env": "^7.24.7",
"@babel/runtime": "^7.24.7",
"@babel/core": "^7.24.8",
"@babel/preset-env": "^7.24.8",
"@babel/runtime": "^7.24.8",
"@fluent/bundle": "^0.18.0",
"@fluent/dom": "^0.10.0",
"@jazzer.js/core": "^2.1.0",
"@metalsmith/layouts": "^2.7.0",
"@metalsmith/markdown": "^1.10.0",
"autoprefixer": "^10.4.19",
"babel-loader": "^9.1.3",
"caniuse-lite": "^1.0.30001639",
"caniuse-lite": "^1.0.30001641",
"canvas": "^2.11.2",
"core-js": "^3.37.1",
"cross-env": "^7.0.3",
Expand All @@ -35,7 +35,7 @@
"gulp-rename": "^2.0.0",
"gulp-replace": "^1.1.4",
"gulp-zip": "^6.0.0",
"highlight.js": "^11.9.0",
"highlight.js": "^11.10.0",
"jasmine": "^5.1.0",
"jsdoc": "^4.0.3",
"jstransformer-nunjucks": "^1.2.0",
Expand All @@ -49,17 +49,17 @@
"postcss-dir-pseudo-class": "^8.0.1",
"postcss-discard-comments": "^7.0.1",
"postcss-nesting": "^12.1.5",
"prettier": "^3.3.2",
"puppeteer": "^22.12.1",
"prettier": "^3.3.3",
"puppeteer": "^22.13.0",
"streamqueue": "^1.1.2",
"stylelint": "^16.6.1",
"stylelint": "^16.7.0",
"stylelint-prettier": "^5.0.0",
"terser-webpack-plugin": "^5.3.10",
"tsc-alias": "^1.8.10",
"ttest": "^4.0.0",
"typescript": "^5.5.3",
"vinyl": "^3.0.0",
"webpack": "^5.92.1",
"webpack": "^5.93.0",
"webpack-stream": "^7.0.0",
"yargs": "^17.7.2"
},
Expand Down
2 changes: 1 addition & 1 deletion src/core/worker.js
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@ class WorkerMessageHandler {
fileIds: xref.trailer.get("ID") || null,
startXRef: linearization
? startXRef
: xref.lastXRefStreamPos ?? startXRef,
: (xref.lastXRefStreamPos ?? startXRef),
filename,
};
}
Expand Down
2 changes: 1 addition & 1 deletion src/display/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ function getDocument(src = {}) {
const enableHWA = src.enableHWA === true;

// Parameters whose default values depend on other parameters.
const length = rangeTransport ? rangeTransport.length : src.length ?? NaN;
const length = rangeTransport ? rangeTransport.length : (src.length ?? NaN);
const useSystemFonts =
typeof src.useSystemFonts === "boolean"
? src.useSystemFonts
Expand Down
2 changes: 1 addition & 1 deletion web/app_options.js
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ class AppOptions {
}
options[name] = defaultOnly
? defaultOption.value
: userOptions[name] ?? defaultOption.value;
: (userOptions[name] ?? defaultOption.value);
}
return options;
}
Expand Down
2 changes: 1 addition & 1 deletion web/l10n.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class L10n {
constructor({ lang, isRTL }, l10n = null) {
this.#lang = L10n.#fixupLangCode(lang);
this.#l10n = l10n;
this.#dir = isRTL ?? L10n.#isRTL(this.#lang) ? "rtl" : "ltr";
this.#dir = (isRTL ?? L10n.#isRTL(this.#lang)) ? "rtl" : "ltr";
}

_setL10n(l10n) {
Expand Down
3 changes: 2 additions & 1 deletion web/text_layer_builder.css
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,11 @@
}

::selection {
/* stylelint-disable declaration-block-no-duplicate-properties */
/*#if !MOZCENTRAL*/
background: rgba(0 0 255 / 0.25);
/*#endif*/
/* stylelint-disable-next-line declaration-block-no-duplicate-properties */
/* stylelint-enable declaration-block-no-duplicate-properties */
background: color-mix(in srgb, AccentColor, transparent 75%);
}

Expand Down

0 comments on commit 07c58aa

Please sign in to comment.