@file-viewer/vite-plugin 2.1.28 → 2.1.29

package/dist/index.js

@@ -1,7 +1,7 @@
 import { existsSync, readdirSync, readFileSync, statSync } from 'node:fs';
-import { copyFile, cp, mkdir, rm, stat, writeFile } from 'node:fs/promises';
+import { copyFile, cp, mkdir, readFile, rm, stat, writeFile } from 'node:fs/promises';
 import { createRequire } from 'node:module';
-import { dirname, extname, isAbsolute, join, resolve } from 'node:path';
+import { dirname, extname, isAbsolute, join, resolve, sep } from 'node:path';
 const virtualModuleId = 'virtual:file-viewer-renderers';
 const resolvedVirtualModuleId = `\0${virtualModuleId}`;
 const pluginRequire = createRequire(import.meta.url);
@@ -853,7 +853,8 @@ function resolveWorkspacePackageJson(packageName) {
     return workspacePackageJsonCache.packages.get(packageName) || null;
 }
 function resolvePackageJson(packageName, anchorPackages = []) {
-    const requireFns = [projectRequire(), pluginRequire];
+    const rootRequireFns = [projectRequire(), pluginRequire];
+    const requireFns = [...rootRequireFns];
     const effectiveAnchorPackages = unique([
         ...Object.values(presetModules).map((preset) => preset.packageName),
         ...anchorPackages
@@ -874,7 +875,16 @@ function resolvePackageJson(packageName, anchorPackages = []) {
             }
         }
     }
-    for (const requireFn of requireFns) {
+    const preferredAnchorPackageJsons = unique(anchorPackages
+        .map((anchorPackage) => requireFns
+        .map((requireFn) => tryResolvePackageJson(anchorPackage, requireFn))
+        .find(Boolean) || resolveWorkspacePackageJson(anchorPackage))
+        .filter((packageJson) => Boolean(packageJson)));
+    const targetRequireFns = [
+        ...preferredAnchorPackageJsons.map((packageJson) => createRequire(packageJson)),
+        ...requireFns
+    ];
+    for (const requireFn of targetRequireFns) {
         const packageJson = tryResolvePackageJson(packageName, requireFn);
         if (packageJson) {
             return packageJson;
@@ -932,6 +942,37 @@ function resolvePackageRoot(packageName, anchorPackages = []) {
     const packageJson = resolvePackageJson(packageName, anchorPackages);
     return packageJson ? dirname(packageJson) : null;
 }
+function readPackageVersion(packageRoot) {
+    if (!packageRoot) {
+        return null;
+    }
+    try {
+        const packageJson = JSON.parse(readFileSync(join(packageRoot, 'package.json'), 'utf8'));
+        return packageJson.version || null;
+    }
+    catch {
+        return null;
+    }
+}
+function assertOwnedPackageVersion(packageName, packageRoot, ownerPackageName) {
+    if (!packageRoot) {
+        return null;
+    }
+    const ownerPackageJsonPath = resolvePackageJson(ownerPackageName);
+    if (!ownerPackageJsonPath) {
+        return readPackageVersion(packageRoot);
+    }
+    const ownerPackageJson = JSON.parse(readFileSync(ownerPackageJsonPath, 'utf8'));
+    const expectedVersion = ownerPackageJson.dependencies?.[packageName];
+    const actualVersion = readPackageVersion(packageRoot);
+    if (expectedVersion &&
+        /^\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?$/.test(expectedVersion) &&
+        actualVersion !== expectedVersion) {
+        throw new Error(`[file-viewer:vite-plugin] ${ownerPackageName} requires ${packageName}@${expectedVersion}, ` +
+            `but renderer assets resolved from ${packageName}@${actualVersion || 'unknown'} (${packageRoot}).`);
+    }
+    return actualVersion;
+}
 function resolvePackageEntry(packageName, anchorPackages = []) {
     const packageJsonPath = resolvePackageJson(packageName, anchorPackages);
     if (!packageJsonPath) {
@@ -1097,7 +1138,7 @@ async function copyPdfCjkFontAssets(from, to) {
 async function copyKnownRendererAssets(targetRoot, rendererIds) {
     const selected = new Set(rendererIds);
     const results = [];
-    const push = async (rendererId, id, to, copyAction, reason) => {
+    const push = async (rendererId, id, to, copyAction, reason, source) => {
         if (!selected.has(rendererId)) {
             return;
         }
@@ -1107,14 +1148,19 @@ async function copyKnownRendererAssets(targetRoot, rendererIds) {
             id,
             to,
             copied,
-            reason: copied ? undefined : reason || 'source asset not found'
+            reason: copied ? undefined : reason || 'source asset not found',
+            ...source,
         });
     };
     const pdfRoot = resolvePackageRoot('pdfjs-dist', ['@file-viewer/renderer-pdf']);
-    await push('pdf', 'pdf-worker', join(targetRoot, 'vendor/pdf/pdf.worker.mjs'), () => copyFileIfPresent(pdfRoot ? join(pdfRoot, 'legacy/build/pdf.worker.mjs') : null, join(targetRoot, 'vendor/pdf/pdf.worker.mjs')));
-    await push('pdf', 'pdf-cmaps', join(targetRoot, 'vendor/pdf/cmaps'), () => copyDirectoryIfPresent(pdfRoot ? join(pdfRoot, 'cmaps') : null, join(targetRoot, 'vendor/pdf/cmaps')));
-    await push('pdf', 'pdf-wasm', join(targetRoot, 'vendor/pdf/wasm'), () => copyDirectoryIfPresent(pdfRoot ? join(pdfRoot, 'wasm') : null, join(targetRoot, 'vendor/pdf/wasm')));
-    await push('pdf', 'pdf-standard-fonts', join(targetRoot, 'vendor/pdf/standard_fonts'), () => copyDirectoryIfPresent(pdfRoot ? join(pdfRoot, 'standard_fonts') : null, join(targetRoot, 'vendor/pdf/standard_fonts')));
+    const pdfVersion = assertOwnedPackageVersion('pdfjs-dist', pdfRoot, '@file-viewer/renderer-pdf');
+    const pdfSource = pdfRoot
+        ? { sourcePackage: 'pdfjs-dist', sourceVersion: pdfVersion || undefined }
+        : undefined;
+    await push('pdf', 'pdf-worker', join(targetRoot, 'vendor/pdf/pdf.worker.mjs'), () => copyFileIfPresent(pdfRoot ? join(pdfRoot, 'legacy/build/pdf.worker.mjs') : null, join(targetRoot, 'vendor/pdf/pdf.worker.mjs')), undefined, pdfSource);
+    await push('pdf', 'pdf-cmaps', join(targetRoot, 'vendor/pdf/cmaps'), () => copyDirectoryIfPresent(pdfRoot ? join(pdfRoot, 'cmaps') : null, join(targetRoot, 'vendor/pdf/cmaps')), undefined, pdfSource);
+    await push('pdf', 'pdf-wasm', join(targetRoot, 'vendor/pdf/wasm'), () => copyDirectoryIfPresent(pdfRoot ? join(pdfRoot, 'wasm') : null, join(targetRoot, 'vendor/pdf/wasm')), undefined, pdfSource);
+    await push('pdf', 'pdf-standard-fonts', join(targetRoot, 'vendor/pdf/standard_fonts'), () => copyDirectoryIfPresent(pdfRoot ? join(pdfRoot, 'standard_fonts') : null, join(targetRoot, 'vendor/pdf/standard_fonts')), undefined, pdfSource);
     const pdfCjkFontRoot = resolvePackageRoot('@fontsource-variable/noto-sans-sc', [
         '@file-viewer/renderer-pdf'
     ]);
@@ -1153,9 +1199,9 @@ async function copyKnownRendererAssets(targetRoot, rendererIds) {
     }, null, 2)}\n`);
     return results;
 }
-function resolveTargetDir(value, fallback) {
+function resolveTargetDir(value, fallback, projectRoot) {
     const target = value || fallback;
-    return isAbsolute(target) ? target : resolve(process.cwd(), target);
+    return isAbsolute(target) ? target : resolve(projectRoot || process.cwd(), target);
 }
 function copyOptions(value) {
     return typeof value === 'object' ? value : {};
@@ -1290,13 +1336,66 @@ export function fileViewerRenderers(options = {}) {
                 }
             }
         },
-        async configureServer() {
+        async configureServer(server) {
             if (!options.copyAssets || copyOptions(options.copyAssets).mode === 'build') {
                 return;
             }
-            const targetRoot = resolveTargetDir(copyOptions(options.copyAssets).publicDir, resolvedConfig?.publicDir || 'public');
+            const targetRoot = resolveTargetDir(copyOptions(options.copyAssets).publicDir, resolvedConfig?.publicDir || 'public', resolvedConfig?.root);
             const results = await copyKnownRendererAssets(targetRoot, collectAssetRendererIds(selection, autoPresetIds));
             reportAssetCopy(results, targetRoot, missingMode);
+            const base = resolvedConfig?.base || '/';
+            if (base.startsWith('/') && base !== '/') {
+                const normalizedBase = base.endsWith('/') ? base : `${base}/`;
+                server.middlewares.use(async (request, response, next) => {
+                    const requestUrl = request.url || '';
+                    const queryIndex = requestUrl.indexOf('?');
+                    const pathname = queryIndex >= 0 ? requestUrl.slice(0, queryIndex) : requestUrl;
+                    if (pathname.startsWith(normalizedBase)) {
+                        let relativePath = pathname.slice(normalizedBase.length);
+                        try {
+                            relativePath = decodeURIComponent(relativePath);
+                        }
+                        catch {
+                            next();
+                            return;
+                        }
+                        if (relativePath.startsWith('vendor/') || relativePath.startsWith('wasm/')) {
+                            const assetPath = resolve(targetRoot, relativePath);
+                            if (assetPath.startsWith(`${targetRoot}${sep}`)) {
+                                try {
+                                    const info = await stat(assetPath);
+                                    if (info.isFile()) {
+                                        const contentTypes = {
+                                            '.bcmap': 'application/octet-stream',
+                                            '.css': 'text/css; charset=utf-8',
+                                            '.js': 'text/javascript; charset=utf-8',
+                                            '.json': 'application/json; charset=utf-8',
+                                            '.mjs': 'text/javascript; charset=utf-8',
+                                            '.ttf': 'font/ttf',
+                                            '.wasm': 'application/wasm',
+                                            '.woff': 'font/woff',
+                                            '.woff2': 'font/woff2'
+                                        };
+                                        response.statusCode = 200;
+                                        response.setHeader('Content-Type', contentTypes[extname(assetPath).toLowerCase()] || 'application/octet-stream');
+                                        if (request.method === 'HEAD') {
+                                            response.end();
+                                        }
+                                        else {
+                                            response.end(await readFile(assetPath));
+                                        }
+                                        return;
+                                    }
+                                }
+                                catch {
+                                    // Let Vite return its normal 404/fallback response.
+                                }
+                            }
+                        }
+                    }
+                    next();
+                });
+            }
         },
         transformIndexHtml: {
             order: 'pre',
@@ -1341,7 +1440,7 @@ export function fileViewerRenderers(options = {}) {
                 return;
             }
             const outDir = resolvedConfig?.build.outDir || 'dist';
-            const targetRoot = resolveTargetDir(copyOptions(options.copyAssets).outDir, outDir);
+            const targetRoot = resolveTargetDir(copyOptions(options.copyAssets).outDir, outDir, resolvedConfig?.root);
             const results = await copyKnownRendererAssets(targetRoot, collectAssetRendererIds(selection, autoPresetIds));
             reportAssetCopy(results, targetRoot, missingMode);
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@file-viewer/vite-plugin",
-  "version": "2.1.28",
+  "version": "2.1.29",
   "private": false,
   "type": "module",
   "description": "Vite plugin for Flyfish File Viewer on-demand renderer assembly, chunk planning, and offline asset deployment.",