@file-viewer/vite-plugin 2.1.30 → 2.2.1

package/README.en.md

@@ -98,7 +98,7 @@ const options = {
 
 When host apps split `node_modules` by package name, circular dependencies between `@codemirror/*`, `@lezer/*`, and Sandpack can show up in production as `codemirror-view.* Cannot access ... before initialization`. The plugin wraps existing `manualChunks` functions by default, stabilizes only those known interop chunks, and preserves the rest of the app's custom grouping. Set `stabilizeInteropChunks:false` only when the host build needs total control.
 
-`copyAssets.baseDir` overrides automatic placement. It must be relative and cannot contain `..`; an empty string explicitly selects the root. The plugin also updates the full package runtime asset base. A manual `setDefaultFullAssetBaseUrl()` call is only needed when a custom `baseDir` is combined with `inject:false`. With Vite `base:'/app/'`, full-package dev URLs start with `/app/file-viewer/...`, while production files remain under `outDir/file-viewer/`.
+`copyAssets.baseDir` overrides automatic placement. It must be relative and cannot contain `..`; an empty string explicitly selects the root. The plugin now aligns the shared runtime asset base for standard packages, presets, and full packages; full packages also keep `setDefaultFullAssetBaseUrl()` synchronized. Only integrations that set `inject:false` and do not import the virtual module must call `setDefaultFileViewerAssetBaseUrl()` themselves (plus `setDefaultFullAssetBaseUrl()` for a full package). With Vite `base:'/app/'`, full-package dev URLs start with `/app/file-viewer/...`, while production files remain under `outDir/file-viewer/`.
 
 For strict registry control, disable injection and pass the virtual module explicitly:
 

package/README.md

@@ -98,7 +98,7 @@ const options = {
 
 如果宿主项目按包名拆分 `node_modules`，`@codemirror/*`、`@lezer/*` 和 Sandpack 之间的循环依赖可能在生产构建中表现为 `codemirror-view.* Cannot access ... before initialization`。插件默认会包裹已有的 `manualChunks` 函数，只稳定这些已知互操作 chunk，保留其它自定义分组；确实需要完全接管时可设置 `stabilizeInteropChunks:false`。
 
-`copyAssets.baseDir` 可以覆盖自动目录：必须是相对路径，不能包含 `..`；传空字符串表示显式复制到根目录。插件会同步 full 包的运行时资源根，无需再手动调用 `setDefaultFullAssetBaseUrl()`；同时自定义 `baseDir` 并设置 `inject:false` 时，才需由业务自行设置。Vite 配置了 `base:'/app/'` 时，full 包开发 URL 为 `/app/file-viewer/...`，构建文件仍位于 `outDir/file-viewer/`。
+`copyAssets.baseDir` 可以覆盖自动目录：必须是相对路径，不能包含 `..`；传空字符串表示显式复制到根目录。插件会为标准包、preset 和 full 包同步统一运行时资源根；full 包仍同时同步 `setDefaultFullAssetBaseUrl()`。只有设置 `inject:false` 且不手动导入虚拟模块时，业务才需要调用 `setDefaultFileViewerAssetBaseUrl()`（full 包同时调用 `setDefaultFullAssetBaseUrl()`）。Vite 配置了 `base:'/app/'` 时，full 包开发 URL 为 `/app/file-viewer/...`，构建文件仍位于 `outDir/file-viewer/`。
 
 如果你需要严格控制 registry，可以关闭注入并手动传入：
 

package/dist/index.d.ts

@@ -35,8 +35,8 @@ export interface FileViewerCopyAssetsOptions {
      * Directory below publicDir/outDir where assets are published. When omitted,
      * projects with an installed @file-viewer/*-full package use `file-viewer`;
      * other projects keep the existing output-root layout. Use an empty string
-     * to explicitly publish at the output root. For full packages, the injected
-     * runtime module keeps the default asset base aligned with this directory.
+     * to explicitly publish at the output root. The injected runtime module
+     * keeps every renderer's default asset base aligned with this directory.
      */
     baseDir?: string;
     /**

package/dist/index.js

@@ -4,6 +4,16 @@ import { createRequire } from 'node:module';
 import { dirname, extname, isAbsolute, join, relative, resolve, sep } from 'node:path';
 const virtualModuleId = 'virtual:file-viewer-renderers';
 const resolvedVirtualModuleId = `\0${virtualModuleId}`;
+const packagedPptFallbackModuleId = 'virtual:file-viewer-packaged-ppt-fallback';
+const resolvedPackagedPptFallbackModuleId = `\0${packagedPptFallbackModuleId}`;
+const isPresentationRendererImporter = (importer) => {
+    if (!importer)
+        return false;
+    const normalized = importer.replace(/\\/g, '/');
+    return (normalized.includes('/@file-viewer/renderer-presentation/') ||
+        normalized.includes('/@file-viewer+renderer-presentation@') ||
+        normalized.includes('/packages/renderers/presentation/'));
+};
 const pluginRequire = createRequire(import.meta.url);
 let workspacePackageJsonCache = null;
 const rendererModules = [
@@ -43,8 +53,17 @@ const rendererModules = [
         id: 'presentation',
         packageName: '@file-viewer/renderer-presentation',
         exportName: 'presentationRenderer',
-        formats: ['presentation', 'pptx', 'pptm', 'potx', 'potm', 'ppsx', 'ppsm'],
-        rendererIds: ['office-presentation'],
+        formats: [
+            'presentation',
+            'ppt',
+            'pptx',
+            'pptm',
+            'potx',
+            'potm',
+            'ppsx',
+            'ppsm'
+        ],
+        rendererIds: ['office-presentation-binary', 'office-presentation'],
         chunkName: 'file-viewer-presentation'
     },
     {
@@ -400,6 +419,7 @@ const fileViewerFullPackages = [
 // CommonJS/UMD helper dependencies below.
 const fileViewerOptimizationExcludedPackages = [
     '@file-viewer/core',
+    '@file-viewer/ppt',
     '@file-viewer/pptx',
     ...rendererModules.map((descriptor) => descriptor.packageName),
     ...Object.values(presetModules).map((preset) => preset.packageName),
@@ -408,6 +428,7 @@ const fileViewerOptimizationExcludedPackages = [
 const cjsInteropPackages = [
     '@file-viewer/docx',
     '@xmldom/xmldom',
+    'occt-import-js',
     'jszip'
 ];
 const defaultScanRoots = ['src', 'app', 'pages', 'components'];
@@ -456,6 +477,7 @@ const mimeFormatHints = {
     'application/vnd.rar': ['rar'],
     'text/markdown': ['md'],
     'text/csv': ['csv'],
+    'text/tab-separated-values': ['tsv'],
     'text/html': ['html'],
     'text/css': ['css'],
     'text/plain': ['txt'],
@@ -635,7 +657,7 @@ function expandDescriptorRendererIds(ids) {
         return descriptor ? [...descriptor.rendererIds] : [id];
     }));
 }
-function renderVirtualModule(selection, formats, autoPresetIds = [], fullAssetBase = null) {
+function renderVirtualModule(selection, formats, autoPresetIds = [], runtimeAssetBase = null, configureFullAssetBase = false) {
     const presetModule = selection.preset ? presetModules[selection.preset] : null;
     const autoPresetModules = autoPresetIds
         .filter((id) => id !== selection.preset)
@@ -675,33 +697,47 @@ function renderVirtualModule(selection, formats, autoPresetIds = [], fullAssetBa
             : !selection.preset && autoPresetModules.length === 1
                 ? autoPresetModules[0].id
                 : '@file-viewer/vite-plugin:configured';
-    const fullAssetBaseImport = fullAssetBase
-        ? fullAssetBase.kind === 'deployment'
-            ? `import { DEFAULT_FULL_ASSET_BASE_PATH, resolveDefaultFullAssetBaseUrl, setDefaultFullAssetBaseUrl } from '@file-viewer/preset-all';`
-            : `import { setDefaultFullAssetBaseUrl } from '@file-viewer/preset-all';`
+    const runtimeAssetBaseImport = runtimeAssetBase
+        ? runtimeAssetBase.kind === 'deployment'
+            ? `import { resolveFileViewerRuntimeAssetBaseUrl, setDefaultFileViewerAssetBaseUrl } from '@file-viewer/core/assets';`
+            : `import { setDefaultFileViewerAssetBaseUrl } from '@file-viewer/core/assets';`
+        : null;
+    const fullAssetBaseImport = runtimeAssetBase && configureFullAssetBase
+        ? `import { setDefaultFullAssetBaseUrl } from '@file-viewer/preset-all';`
         : null;
     const autoRegistrationImport = rendererNames.length
         ? `import { registerFileViewerAutoRendererPreset } from '@file-viewer/core';`
         : null;
-    const fullAssetBaseSetup = !fullAssetBase
+    const runtimeAssetBaseSetup = !runtimeAssetBase
         ? []
-        : fullAssetBase.kind === 'literal'
-            ? [`setDefaultFullAssetBaseUrl(${JSON.stringify(fullAssetBase.url)});`, '']
+        : runtimeAssetBase.kind === 'literal'
+            ? [
+                `setDefaultFileViewerAssetBaseUrl(${JSON.stringify(runtimeAssetBase.url)});`,
+                ...(configureFullAssetBase
+                    ? [`setDefaultFullAssetBaseUrl(${JSON.stringify(runtimeAssetBase.url)});`]
+                    : []),
+                ''
+            ]
             : [
-                'const fileViewerDefaultFullAssetBaseUrl = resolveDefaultFullAssetBaseUrl();',
-                'const fileViewerDeploymentBaseUrl = fileViewerDefaultFullAssetBaseUrl.endsWith(DEFAULT_FULL_ASSET_BASE_PATH)',
-                '  ? fileViewerDefaultFullAssetBaseUrl.slice(0, -DEFAULT_FULL_ASSET_BASE_PATH.length)',
-                '  : fileViewerDefaultFullAssetBaseUrl;',
-                `setDefaultFullAssetBaseUrl(fileViewerDeploymentBaseUrl + ${JSON.stringify(fullAssetBase.encodedBaseDir)});`,
+                "const fileViewerDeploymentBaseUrl = typeof document === 'undefined'",
+                "  ? '/'",
+                '  : resolveFileViewerRuntimeAssetBaseUrl(document);',
+                "const fileViewerRuntimeAssetBaseUrl = typeof document === 'undefined'",
+                `  ? '/' + ${JSON.stringify(runtimeAssetBase.encodedBaseDir)}`,
+                `  : new URL(${JSON.stringify(runtimeAssetBase.encodedBaseDir)}, fileViewerDeploymentBaseUrl.endsWith('/') ? fileViewerDeploymentBaseUrl : fileViewerDeploymentBaseUrl + '/').href;`,
+                'setDefaultFileViewerAssetBaseUrl(fileViewerRuntimeAssetBaseUrl);',
+                ...(configureFullAssetBase
+                    ? ['setDefaultFullAssetBaseUrl(fileViewerRuntimeAssetBaseUrl);']
+                    : []),
                 ''
             ];
     return [
-        ...[autoRegistrationImport, fullAssetBaseImport].filter(Boolean),
+        ...[autoRegistrationImport, runtimeAssetBaseImport, fullAssetBaseImport].filter(Boolean),
         ...[presetImport].filter(Boolean),
         ...autoPresetImports,
         ...rendererImports,
         '',
-        ...fullAssetBaseSetup,
+        ...runtimeAssetBaseSetup,
         `export const configuredFileViewerRenderers = [${rendererNames.join(', ')}];`,
         `export const fileViewerRendererPlan = ${JSON.stringify(plan, null, 2)};`,
         ...(rendererNames.length
@@ -980,11 +1016,11 @@ function readPackageVersion(packageRoot) {
         return null;
     }
 }
-function assertOwnedPackageVersion(packageName, packageRoot, ownerPackageName) {
+function assertOwnedPackageVersion(packageName, packageRoot, ownerPackageName, anchorPackages = []) {
     if (!packageRoot) {
         return null;
     }
-    const ownerPackageJsonPath = resolvePackageJson(ownerPackageName);
+    const ownerPackageJsonPath = resolvePackageJson(ownerPackageName, anchorPackages);
     if (!ownerPackageJsonPath) {
         return readPackageVersion(packageRoot);
     }
@@ -1196,11 +1232,65 @@ async function copyKnownRendererAssets(targetRoot, rendererIds) {
     await push('pdf', 'pdf-cjk-font-fallback', join(targetRoot, 'vendor/pdf/fonts'), () => copyPdfCjkFontAssets(pdfCjkFontRoot, join(targetRoot, 'vendor/pdf/fonts')));
     const pptxRoot = resolvePackageRoot('@file-viewer/pptx', ['@file-viewer/renderer-presentation']);
     await push('office-presentation', 'pptx-worker', join(targetRoot, 'vendor/pptx/pptx.worker.js'), () => copyFileIfPresent(pptxRoot ? join(pptxRoot, 'dist/worker/pptx.worker.js') : null, join(targetRoot, 'vendor/pptx/pptx.worker.js')));
+    const pptRoot = resolvePackageRoot('@file-viewer/ppt', ['@file-viewer/renderer-presentation']);
+    const pptVersion = readPackageVersion(pptRoot);
+    const pptSource = pptRoot
+        ? { sourcePackage: '@file-viewer/ppt', sourceVersion: pptVersion || undefined }
+        : undefined;
+    for (const [id, filename] of [
+        ['ppt-module', 'index.mjs'],
+        ['ppt-worker', 'worker.mjs'],
+        ['ppt-frame-cache', 'frame-cache.mjs'],
+        ['ppt-wasm', 'ppt-native.wasm'],
+        ['ppt-cjk-font', 'ppt-font-cjk.otf'],
+        ['ppt-manifest', 'manifest.json'],
+        ['ppt-package', 'package.json'],
+        ['ppt-license', 'LICENSE'],
+        ['ppt-notice', 'NOTICE']
+    ]) {
+        await push('office-presentation-binary', id, join(targetRoot, `vendor/ppt/${filename}`), () => copyFileIfPresent(pptRoot ? join(pptRoot, filename) : null, join(targetRoot, `vendor/ppt/${filename}`)), undefined, pptSource);
+    }
     const docxRoot = resolvePackageRoot('@file-viewer/docx', ['@file-viewer/renderer-word']);
     await push('office-word-openxml', 'docx-worker', join(targetRoot, 'vendor/docx/docx.worker.js'), () => copyFileIfPresent(docxRoot ? join(docxRoot, 'dist/docx-preview.worker.js') : null, join(targetRoot, 'vendor/docx/docx.worker.js')));
     await push('office-word-openxml', 'docx-worker-jszip', join(targetRoot, 'vendor/docx/jszip.min.js'), () => copyFileIfPresent(docxRoot ? join(docxRoot, 'dist/jszip.min.js') : null, join(targetRoot, 'vendor/docx/jszip.min.js')));
+    const spreadsheetRoot = resolvePackageRoot('@file-viewer/renderer-spreadsheet', [
+        '@file-viewer/renderer-spreadsheet',
+        '@file-viewer/preset-office',
+        '@file-viewer/preset-all'
+    ]);
+    const spreadsheetVersion = readPackageVersion(spreadsheetRoot);
+    await push('spreadsheet-openxml', 'spreadsheet-worker', join(targetRoot, 'vendor/xlsx/sheet.worker.js'), () => copyFileIfPresent(spreadsheetRoot ? join(spreadsheetRoot, 'dist/worker/sheet.worker.js') : null, join(targetRoot, 'vendor/xlsx/sheet.worker.js')), undefined, spreadsheetRoot
+        ? {
+            sourcePackage: '@file-viewer/renderer-spreadsheet',
+            sourceVersion: spreadsheetVersion || undefined
+        }
+        : undefined);
     const cadRoot = resolvePackageRoot('@flyfish-dev/cad-viewer', ['@file-viewer/renderer-cad']);
     await push('cad', 'cad-wasm-directory', join(targetRoot, 'wasm/cad'), () => copyDirectoryIfPresent(cadRoot ? join(cadRoot, 'dist/wasm') : null, join(targetRoot, 'wasm/cad')));
+    const modelDependencyAnchors = [
+        '@file-viewer/renderer-3d',
+        '@file-viewer/geometry-engine'
+    ];
+    const occtRoot = resolvePackageRoot('occt-import-js', modelDependencyAnchors);
+    const geometryEngineRoot = resolvePackageRoot('@file-viewer/geometry-engine', [
+        '@file-viewer/renderer-3d'
+    ]);
+    const occtVersion = assertOwnedPackageVersion('occt-import-js', occtRoot, '@file-viewer/geometry-engine', modelDependencyAnchors);
+    const occtSource = occtRoot
+        ? { sourcePackage: 'occt-import-js', sourceVersion: occtVersion || undefined }
+        : undefined;
+    await push('model', 'model-occt-worker', join(targetRoot, 'wasm/model/occt-worker.js'), () => copyFileIfPresent(geometryEngineRoot ? join(geometryEngineRoot, 'assets/occt-worker.js') : null, join(targetRoot, 'wasm/model/occt-worker.js')));
+    for (const [id, filename] of [
+        ['model-occt-runtime', 'occt-import-js.js'],
+        ['model-occt-wasm', 'occt-import-js.wasm'],
+        ['model-occt-license', 'license.occt.txt'],
+        ['model-occt-import-license', 'license.occt-import-js.txt']
+    ]) {
+        const targetFilename = filename.startsWith('license.')
+            ? filename.replace(/^license\./, 'LICENSE.')
+            : filename;
+        await push('model', id, join(targetRoot, `wasm/model/${targetFilename}`), () => copyFileIfPresent(occtRoot ? join(occtRoot, `dist/${filename}`) : null, join(targetRoot, `wasm/model/${targetFilename}`)), undefined, occtSource);
+    }
     const typstCompilerRoot = resolvePackageRoot('@myriaddreamin/typst-ts-web-compiler', [
         '@file-viewer/renderer-typst'
     ]);
@@ -1528,12 +1618,16 @@ function resolveViteFullAssetBase(base, baseDir) {
     return { kind: 'literal', url: `${normalizedBase}${encodedBaseDirWithSlash}` };
 }
 function resolveDevAssetRequestPath(targetRoot, baseDir, requestPathname, viteBasePath) {
-    if (!requestPathname.startsWith(viteBasePath)) {
-        return null;
-    }
     let requestRelativePath;
     try {
-        requestRelativePath = decodeURIComponent(requestPathname.slice(viteBasePath.length));
+        // Depending on the Vite major and middleware ordering, configureServer can
+        // observe either the original base-prefixed URL or the pathname after
+        // Vite's base middleware has stripped it. Accept both shapes, then keep the
+        // strict viewer-asset allowlist and target-root boundary checks below.
+        const encodedRelativePath = viteBasePath === '/' || requestPathname.startsWith(viteBasePath)
+            ? requestPathname.slice(viteBasePath === '/' ? 1 : viteBasePath.length)
+            : requestPathname.replace(/^\/+/, '');
+        requestRelativePath = decodeURIComponent(encodedRelativePath);
     }
     catch {
         return null;
@@ -1574,6 +1668,7 @@ function reportAssetCopy(results, targetRoot, mode) {
     const failedRequired = results.filter((result) => !result.copied && (result.required ?? [
         'pdf',
         'office-word-openxml',
+        'office-presentation-binary',
         'office-presentation',
         'archive',
         'cad',
@@ -1613,7 +1708,7 @@ export function fileViewerRenderers(options = {}) {
     let autoPresetIds = resolveAutoPresetIds(options);
     let resolvedConfig = null;
     let installedFullPackages = [];
-    let fullAssetBase = null;
+    let runtimeAssetBase = null;
     const refreshSelection = (projectRoot) => {
         if (projectRoot) {
             scanFormats = collectFileViewerRendererScanTokens(projectRoot, options.scan);
@@ -1628,16 +1723,14 @@ export function fileViewerRenderers(options = {}) {
     const refreshFullAssetRuntime = (projectRoot, viteBase) => {
         if (!options.copyAssets) {
             installedFullPackages = [];
-            fullAssetBase = null;
+            runtimeAssetBase = null;
             return;
         }
         const target = resolveFileViewerCopyAssetsTarget('dev', options.copyAssets, {
             projectRoot
         });
         installedFullPackages = target.installedFullPackages;
-        fullAssetBase = installedFullPackages.length
-            ? resolveViteFullAssetBase(viteBase, target.baseDir)
-            : null;
+        runtimeAssetBase = resolveViteFullAssetBase(viteBase, target.baseDir);
     };
     const hasConfiguredRenderers = () => Boolean(selection.preset || selection.descriptors.length || autoPresetIds.length);
     return {
@@ -1647,13 +1740,13 @@ export function fileViewerRenderers(options = {}) {
             const projectRoot = resolve(process.cwd(), userConfig.root || '.');
             refreshSelection(projectRoot);
             refreshFullAssetRuntime(projectRoot, userConfig.base);
-            const selectedPackages = collectSelectedPackages(selection, autoPresetIds);
             const dependencyAnchorPackages = collectDependencyAnchorPackages(selection, autoPresetIds);
-            const resolvedDependencyAnchorPackages = fullAssetBase
+            const resolvedDependencyAnchorPackages = runtimeAssetBase
                 ? unique([
                     ...dependencyAnchorPackages,
+                    '@file-viewer/core',
                     ...installedFullPackages,
-                    '@file-viewer/preset-all'
+                    ...(installedFullPackages.length ? ['@file-viewer/preset-all'] : [])
                 ])
                 : dependencyAnchorPackages;
             const optimizeDepsExclude = createOptimizeDepsExclude(userConfig);
@@ -1730,7 +1823,7 @@ export function fileViewerRenderers(options = {}) {
             const viteBasePath = normalizeViteDevBasePath(resolvedConfig?.base || '/');
             if (server?.middlewares?.use) {
                 const realTargetRoot = await realpath(targetRoot).catch(() => targetRoot);
-                server.middlewares.use(async (request, response, next) => {
+                server.middlewares.use(async function fileViewerAssetMiddleware(request, response, next) {
                     const requestUrl = request.url || '';
                     const queryIndex = requestUrl.indexOf('?');
                     const pathname = queryIndex >= 0 ? requestUrl.slice(0, queryIndex) : requestUrl;
@@ -1789,7 +1882,7 @@ export function fileViewerRenderers(options = {}) {
         transformIndexHtml: {
             order: 'pre',
             handler() {
-                if (options.inject === false || (!hasConfiguredRenderers() && !fullAssetBase)) {
+                if (options.inject === false || (!hasConfiguredRenderers() && !runtimeAssetBase)) {
                     return undefined;
                 }
                 return [
@@ -1837,15 +1930,28 @@ export function fileViewerRenderers(options = {}) {
             const results = await copyRendererAssets(copyTarget, collectAssetRendererIds(selection, autoPresetIds, copyTarget.installedFullPackages.length > 0));
             reportAssetCopy(results, targetRoot, missingMode);
         },
-        resolveId(id) {
+        resolveId(id, importer) {
+            if (id === '@file-viewer/ppt' &&
+                options.copyAssets &&
+                installedFullPackages.length > 0 &&
+                isPresentationRendererImporter(importer)) {
+                return resolvedPackagedPptFallbackModuleId;
+            }
             if (id === moduleId || id === virtualModuleId || id === injectedModulePath) {
                 return id === virtualModuleId ? resolvedVirtualModuleId : resolvedModuleId;
             }
             return undefined;
         },
         load(id) {
+            if (id === resolvedPackagedPptFallbackModuleId) {
+                return `
+export async function createPptViewer() {
+  throw new Error('Packaged PPT runtime URL was not initialized.')
+}
+`;
+            }
             if (id === resolvedModuleId || id === resolvedVirtualModuleId) {
-                return renderVirtualModule(selection, requestedFormats, autoPresetIds, fullAssetBase);
+                return renderVirtualModule(selection, requestedFormats, autoPresetIds, runtimeAssetBase, installedFullPackages.length > 0);
             }
             return undefined;
         }

package/package.json

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