@file-viewer/pptx 2.2.2 → 2.2.4

package/dist/worker.js

@@ -1,11 +1,23 @@
-const viteOptimizedWorkerPath = '/node_modules/.vite/deps/worker/pptx.worker.js';
+const viteOptimizedWorkerPathPattern = /\/\.?vite\/deps\/worker\/pptx\.worker\.js$/;
+const angularCachePath = '/.angular/cache/';
 const viteOptimizedPptxSourcePattern = /\/\/\s+(node_modules\/(?:\.pnpm\/[^\n]+?\/node_modules\/)?@file-viewer\/pptx\/dist\/worker\.js)\b/;
 const resolveBundledPptxWorkerUrl = () => new URL('./worker/pptx.worker.js', import.meta.url);
 const canResolveAbsolutePathFrom = (url) => url.protocol !== 'data:' && url.protocol !== 'blob:';
 const resolveViteDevPptxWorkerUrl = (baseUrl) => new URL('/node_modules/@file-viewer/pptx/dist/worker/pptx.worker.js', canResolveAbsolutePathFrom(baseUrl)
     ? baseUrl
     : new URL(typeof location !== 'undefined' ? location.href : 'file:///'));
-const resolveViteOptimizedPptxWorkerUrl = () => {
+const resolveAngularVitePptxWorkerUrl = (baseUrl, workerPath) => {
+    const cacheIndex = baseUrl.pathname.indexOf(angularCachePath);
+    if (cacheIndex < 0) {
+        return null;
+    }
+    const workerUrl = new URL(baseUrl.href);
+    workerUrl.pathname = `${workerUrl.pathname.slice(0, cacheIndex)}/${workerPath}`;
+    workerUrl.search = '';
+    workerUrl.hash = '';
+    return workerUrl;
+};
+const resolveViteOptimizedPptxWorkerUrl = (defaultPptxWorkerUrl) => {
     if (typeof XMLHttpRequest === 'undefined') {
         return null;
     }
@@ -23,7 +35,10 @@ const resolveViteOptimizedPptxWorkerUrl = () => {
             return null;
         }
         const workerPath = match[1].replace(/dist\/worker\.js$/, 'dist/worker/pptx.worker.js');
-        const defaultPptxWorkerUrl = resolveBundledPptxWorkerUrl();
+        const angularWorkerUrl = resolveAngularVitePptxWorkerUrl(defaultPptxWorkerUrl, workerPath);
+        if (angularWorkerUrl) {
+            return angularWorkerUrl;
+        }
         const origin = typeof location !== 'undefined' && location.origin
             ? location.origin
             : defaultPptxWorkerUrl.origin;
@@ -38,9 +53,12 @@ const resolveDefaultPptxWorkerUrl = () => {
     if (!canResolveAbsolutePathFrom(defaultPptxWorkerUrl)) {
         return defaultPptxWorkerUrl;
     }
-    // Vite dep optimization rewrites import.meta.url into .vite/deps, away from this package's worker file.
-    if (defaultPptxWorkerUrl.pathname.includes(viteOptimizedWorkerPath)) {
-        return resolveViteOptimizedPptxWorkerUrl() || resolveViteDevPptxWorkerUrl(defaultPptxWorkerUrl);
+    // Vite dep optimization rewrites import.meta.url into vite/deps, away from
+    // this package's worker file. Angular's application builder uses the same
+    // optimizer under .angular/cache and prefixes its @fs URL with baseHref.
+    if (viteOptimizedWorkerPathPattern.test(defaultPptxWorkerUrl.pathname)) {
+        return resolveViteOptimizedPptxWorkerUrl(defaultPptxWorkerUrl)
+            || resolveViteDevPptxWorkerUrl(defaultPptxWorkerUrl);
     }
     return defaultPptxWorkerUrl;
 };

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@file-viewer/pptx",
-  "version": "2.2.2",
+  "version": "2.2.4",
   "private": false,
   "type": "module",
-  "description": "Native PPTX renderer extracted from Flyfish File Viewer",
+  "description": "Native PPTX renderer extracted from File Viewer",
   "keywords": [
     "pptx",
     "powerpoint",
@@ -19,8 +19,8 @@
     "registry": "https://registry.npmjs.org/"
   },
   "author": {
-    "name": "Wangyu",
-    "email": "wybaby168@gmail.com"
+    "name": "Yu Wang",
+    "email": "admin@flyfish.dev"
   },
   "repository": {
     "type": "git",