mirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-20 15:18:08 +02:00
Code Activity

Merge pull request #17055 from Snuffleupagus/output-modules

Browse source 
[api-major] Output JavaScript modules in the builds (issue 10317)
This commit is contained in:
Tim van der Meij 2023-10-07 15:02:59 +02:00 • committed by GitHub
commit bab4c7f617
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 231 additions and 308 deletions
Download patch file Download diff file Expand all files Collapse all files

5
web/app.js
View file

@ -44,7 +44,6 @@ import {
InvalidPDFException,
isDataScheme,
isPdfFile,
loadScript,
MissingPDFException,
PDFWorker,
PromiseCapability,
@ -2264,10 +2263,10 @@ async function loadFakeWorker() {
GlobalWorkerOptions.workerSrc ||= AppOptions.get("workerSrc");
if (typeof PDFJSDev === "undefined") {
window.pdfjsWorker = await import("pdfjs/pdf.worker.js");
globalThis.pdfjsWorker = await import("pdfjs/pdf.worker.js");
return;
}
await loadScript(PDFWorker.workerSrc);
await __non_webpack_import__(PDFWorker.workerSrc); // eslint-disable-line no-undef
}
async function loadPDFBug(self) {

8
web/app_options.js
View file

@ -300,8 +300,8 @@ const defaultOptions = {
typeof PDFJSDev === "undefined"
? "../src/pdf.worker.js"
: PDFJSDev.test("MOZCENTRAL")
? "resource://pdf.js/build/pdf.worker.js"
: "../build/pdf.worker.js",
? "resource://pdf.js/build/pdf.worker.mjs"
: "../build/pdf.worker.mjs",
kind: OptionKind.WORKER,
},
};
@ -325,8 +325,8 @@ if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) {
/** @type {string} */
value:
typeof PDFJSDev === "undefined"
? "../build/dev-sandbox/pdf.sandbox.js"
: "../build/pdf.sandbox.js",
? "../build/dev-sandbox/pdf.sandbox.mjs"
: "../build/pdf.sandbox.mjs",
kind: OptionKind.VIEWER,
};
} else if (PDFJSDev.test("CHROME")) {

17
web/generic_scripting.js
View file

@ -13,7 +13,7 @@
* limitations under the License.
*/
import { getPdfFilenameFromUrl, loadScript } from "pdfjs-lib";
import { getPdfFilenameFromUrl } from "pdfjs-lib";
async function docProperties(pdfDocument) {
const url = "",
@ -41,11 +41,16 @@ async function docProperties(pdfDocument) {
class GenericScripting {
constructor(sandboxBundleSrc) {
this._ready = loadScript(
sandboxBundleSrc,
/* removeScriptElement = */ true
).then(() => {
return window.pdfjsSandbox.QuickJSSandbox();
this._ready = new Promise((resolve, reject) => {
const sandbox =
typeof PDFJSDev === "undefined"
? import(sandboxBundleSrc) // eslint-disable-line no-unsanitized/method
: __non_webpack_import__(sandboxBundleSrc); // eslint-disable-line no-undef
sandbox
.then(pdfjsSandbox => {
resolve(pdfjsSandbox.QuickJSSandbox());
})
.catch(reject);
});
}

2
web/pdfjs.js
View file

@ -35,7 +35,6 @@ const {
InvalidPDFException,
isDataScheme,
isPdfFile,
loadScript,
MissingPDFException,
noContextMenu,
normalizeUnicode,
@ -81,7 +80,6 @@ export {
InvalidPDFException,
isDataScheme,
isPdfFile,
loadScript,
MissingPDFException,
noContextMenu,
normalizeUnicode,

2
web/viewer-geckoview.html
View file

@ -76,7 +76,7 @@ See https://github.com/adobe-type-tools/cmap-resources
<script src="viewer-geckoview.js" type="module-shim"></script>
<!--#else-->
<!--<script src="resource://pdf.js/web/viewer.js"></script>-->
<!--<script src="resource://pdf.js/web/viewer.mjs" type="module"></script>-->
<!--#endif-->
</head>

2
web/viewer-snippet-chrome-extension.html
View file

@ -1,4 +1,4 @@
<!-- This snippet is used in the Chromium extension (included from viewer.html) -->
<base href="/content/web/">
<link rel="resource" type="application/l10n" href="locale/locale.properties">
<script src="../build/pdf.js"></script>
<script src="../build/pdf.mjs" type="module"></script>

2
web/viewer-snippet-firefox-extension.html
View file

@ -1,2 +1,2 @@
<!-- This snippet is used in the Firefox extension (included from viewer.html) -->
<script src="resource://pdf.js/build/pdf.js"></script>
<script src="resource://pdf.js/build/pdf.mjs" type="module"></script>

3
web/viewer-snippet-minified.html
View file

@ -1,3 +0,0 @@
<!-- This snippet is used in production (included from viewer.html) -->
<link rel="resource" type="application/l10n" href="locale/locale.properties">
<script src="pdf.viewer.js"></script>

2
web/viewer-snippet.html
View file

@ -1,3 +1,3 @@
<!-- This snippet is used in production (included from viewer.html) -->
<link rel="resource" type="application/l10n" href="locale/locale.properties">
<script src="../build/pdf.js"></script>
<script src="../build/pdf.mjs" type="module"></script>

8
web/viewer.html
View file

@ -33,8 +33,6 @@ See https://github.com/adobe-type-tools/cmap-resources
<!--#include viewer-snippet-firefox-extension.html-->
<!--#elif CHROME-->
<!--#include viewer-snippet-chrome-extension.html-->
<!--#elif MINIFIED-->
<!--#include viewer-snippet-minified.html-->
<!--#else-->
<!--#include viewer-snippet.html-->
<!--#endif-->
@ -46,9 +44,9 @@ See https://github.com/adobe-type-tools/cmap-resources
<!--#endif-->
<!--#if MOZCENTRAL-->
<!--<script src="resource://pdf.js/web/viewer.js"></script>-->
<!--#elif !MINIFIED-->
<!--<script src="viewer.js"></script>-->
<!--<script src="resource://pdf.js/web/viewer.mjs" type="module"></script>-->
<!--#elif !MOZCENTRAL-->
<!--<script src="viewer.mjs" type="module"></script>-->
<!--#elif /* Development mode. */-->
<link rel="resource" type="application/l10n" href="locale/locale.properties">