@file-viewer/renderer-pdf 2.1.27 → 2.1.28

package/dist/pdf.js

@@ -1,7 +1,7 @@
 import { getDocument, GlobalWorkerOptions, PDFWorker as PdfJsWorker, PixelsPerInch, } from 'pdfjs-dist/legacy/build/pdf.mjs';
 import { EventBus, GenericL10n, PDFFindController, PDFLinkService, PDFViewer, } from 'pdfjs-dist/legacy/web/pdf_viewer.mjs';
 import { registerFileViewerSearchProvider, registerFileViewerZoomProvider, unregisterFileViewerSearchProvider, unregisterFileViewerZoomProvider, registerFileViewerViewStateProvider, unregisterFileViewerViewStateProvider, createFileViewerZoomChangeEmitter, createFileViewerViewStateChange, createFileViewerViewStateChangeEmitter, createFileViewerTranslator, buildPrintPageStyle, formatCssPixels, DEFAULT_PDF_RANGE_CHUNK_SIZE, resolveFileViewerLocale, resolveFileViewerFitScale, } from '@file-viewer/core';
-import { DEFAULT_FILE_VIEWER_PDF_WORKER_PATH, resolveFileViewerPdfAssetUrls, } from '@file-viewer/core/assets';
+import { DEFAULT_FILE_VIEWER_PDF_WORKER_PATH, resolveFileViewerPdfAssetUrls, resolveFileViewerRuntimeAssetBaseUrl, } from '@file-viewer/core/assets';
 import { pdfViewerStyle } from './pdfStyles.js';
 import { collectMalformedIdentityFontNames, createPdfCjkFontFallbackManager, detectMalformedIdentityCjkFontFamilies, } from './pdfFontFallback.js';
 export const DEFAULT_FILE_VIEWER_PDF_WORKER_URL = DEFAULT_FILE_VIEWER_PDF_WORKER_PATH;
@@ -254,50 +254,6 @@ const installBundledPdfFakeWorker = async () => {
 const resolvePdfWorkerUrl = (options, documentBaseUrl) => {
     return resolveFileViewerPdfAssetUrls(options, documentBaseUrl).workerUrl;
 };
-const readBundlerPublicBaseUrl = () => {
-    var _a;
-    try {
-        const value = (_a = import.meta.env) === null || _a === void 0 ? void 0 : _a.BASE_URL;
-        return typeof value === 'string' ? value.trim() : '';
-    }
-    catch {
-        return '';
-    }
-};
-const resolvePdfRuntimeAssetBaseUrl = (documentRef) => {
-    const documentBaseUrl = documentRef.baseURI || documentRef.URL || 'file:///';
-    const bundlerBaseUrl = readBundlerPublicBaseUrl();
-    if (bundlerBaseUrl && bundlerBaseUrl !== '.' && bundlerBaseUrl !== './') {
-        try {
-            return new URL(bundlerBaseUrl.endsWith('/') ? bundlerBaseUrl : `${bundlerBaseUrl}/`, documentBaseUrl).href;
-        }
-        catch {
-            // Continue with DOM-based public-path detection.
-        }
-    }
-    // An explicit <base> is authoritative and already reflected by baseURI.
-    if (documentRef.querySelector('base[href]')) {
-        return documentBaseUrl;
-    }
-    // Entry scripts remain under the public deployment base when an SPA route
-    // changes document.baseURI. This covers Vite and common UMI/Webpack layouts.
-    for (const script of Array.from(documentRef.querySelectorAll('script[src]'))) {
-        try {
-            const scriptUrl = new URL(script.src || script.getAttribute('src') || '', documentBaseUrl);
-            const assetDirectory = scriptUrl.pathname.match(/^(.*\/)(?:assets|static)\/[^/]+$/i);
-            if (assetDirectory) {
-                return new URL(assetDirectory[1], scriptUrl.origin).href;
-            }
-            if (/\/(?:umi|main|index)(?:[.-][^/]*)?\.(?:m?js)$/i.test(scriptUrl.pathname)) {
-                return new URL('./', scriptUrl).href;
-            }
-        }
-        catch {
-            // Ignore unrelated or malformed script URLs.
-        }
-    }
-    return documentBaseUrl;
-};
 const buildOutlineItems = (items, prefix = 'outline', getFallbackTitle = index => `Outline ${index + 1}`) => items.map((item, index) => {
     const id = `${prefix}-${index}`;
     const children = Array.isArray(item.items)
@@ -321,7 +277,7 @@ export default async function renderPdf(buffer, target, context) {
         throw new Error(t('pdf.error.browserWindow'));
     }
     const options = (_a = context === null || context === void 0 ? void 0 : context.options) === null || _a === void 0 ? void 0 : _a.pdf;
-    const pdfRuntimeAssetBaseUrl = resolvePdfRuntimeAssetBaseUrl(documentRef);
+    const pdfRuntimeAssetBaseUrl = resolveFileViewerRuntimeAssetBaseUrl(documentRef);
     const cjkFontFallbackEnabled = (options === null || options === void 0 ? void 0 : options.cjkFontFallback) !== false;
     const identityFontRepairEnabled = (options === null || options === void 0 ? void 0 : options.identityFontRepair) !== false;
     const fontInspectionEnabled = cjkFontFallbackEnabled || identityFontRepairEnabled;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@file-viewer/renderer-pdf",
-  "version": "2.1.27",
+  "version": "2.1.28",
   "private": false,
   "type": "module",
   "description": "Standalone PDF renderer plugin for Flyfish File Viewer powered by PDF.js.",
@@ -54,7 +54,7 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@file-viewer/core": "2.1.27",
+    "@file-viewer/core": "2.1.28",
     "@fontsource-variable/noto-sans-sc": "5.2.10",
     "pdf-lib": "1.17.1",
     "pdfjs-dist": "5.4.624"