[MNT-24538] Use existing pdfjs-dist version with new param

Alfresco · Jan 15, 2025 · c3fe122 · c3fe122
1 parent ced1025
commit c3fe122
Show file tree

Hide file tree

Showing 8 changed files with 95 additions and 283 deletions.
diff --git a/lib/content-services/karma.conf.js b/lib/content-services/karma.conf.js
@@ -9,9 +9,9 @@ module.exports = function (config) {
         basePath: '../../',
 
         files: [
-            { pattern: 'node_modules/pdfjs-dist/legacy/build/pdf.mjs', included: true, watched: false, type: 'module' },
-            { pattern: 'node_modules/pdfjs-dist/legacy/build/pdf.worker.mjs', included: true, watched: false, type: 'module' },
-            { pattern: 'node_modules/pdfjs-dist/legacy/web/pdf_viewer.mjs', included: true, watched: false, type: 'module' },
+            { pattern: 'node_modules/pdfjs-dist/build/pdf.js', included: true, watched: false },
+            { pattern: 'node_modules/pdfjs-dist/build/pdf.worker.js', included: true, watched: false },
+            { pattern: 'node_modules/pdfjs-dist/web/pdf_viewer.js', included: true, watched: false },
             {
                 pattern: 'node_modules/@angular/material/prebuilt-themes/indigo-pink.css',
                 included: true,

diff --git a/lib/content-services/src/test.ts b/lib/content-services/src/test.ts
@@ -26,4 +26,4 @@ getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDyn
 });
 
 declare const pdfjsLib: any;
-pdfjsLib.GlobalWorkerOptions.workerSrc = 'base/pdfjs-dist/legacy/build/pdf.worker.min.mjs';
+pdfjsLib.GlobalWorkerOptions.workerSrc = 'base/pdfjs-dist/build/pdf.worker.min.js';
diff --git a/lib/core/karma.conf.js b/lib/core/karma.conf.js
@@ -9,10 +9,10 @@ module.exports = function (config) {
         basePath: '../../',
 
         files: [
-            { pattern: 'node_modules/pdfjs-dist/legacy/build/pdf.mjs', included: true, watched: false, type: 'module' },
-            { pattern: 'node_modules/pdfjs-dist/legacy/build/pdf.worker.mjs', included: true, watched: false, served: true, type: 'module' },
-            { pattern: 'node_modules/pdfjs-dist/legacy/build/pdf.worker.min.mjs', included: true, watched: false, served: true, type: 'module' },
-            { pattern: 'node_modules/pdfjs-dist/legacy/web/pdf_viewer.mjs', included: true, watched: false, type: 'module' },
+            { pattern: 'node_modules/pdfjs-dist/build/pdf.js', included: true, watched: false },
+            { pattern: 'node_modules/pdfjs-dist/build/pdf.worker.js', included: true, watched: false, served: true },
+            { pattern: 'node_modules/pdfjs-dist/build/pdf.worker.min.js', included: true, watched: false, served: true },
+            { pattern: 'node_modules/pdfjs-dist/web/pdf_viewer.js', included: true, watched: false },
             {
                 pattern: 'node_modules/@angular/material/prebuilt-themes/indigo-pink.css',
                 included: true,
@@ -37,8 +37,8 @@ module.exports = function (config) {
         frameworks: ['jasmine-ajax', 'jasmine', '@angular-devkit/build-angular'],
 
         proxies: {
-            '/pdf.worker.min.js': '/base/node_modules/pdfjs-dist/legacy/build/pdf.worker.min.mjs',
-            '/pdf.worker.js': '/base/node_modules/pdfjs-dist/legacy/build/pdf.worker.mjs',
+            '/pdf.worker.min.js': '/base/node_modules/pdfjs-dist/build/pdf.worker.min.js',
+            '/pdf.worker.js': '/base/node_modules/pdfjs-dist/build/pdf.worker.js',
             '/fake-url-file.png': '/base/lib/core/src/lib/assets/images/logo.png',
             '/logo.png': '/base/lib/core/src/lib/assets/images/logo.png',
             '/alfresco-logo.svg': '/base/lib/core/src/lib/assets/images/alfresco-logo.svg',

diff --git a/lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer.component.ts b/lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer.component.ts
@@ -37,7 +37,7 @@ import { MatDialog } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
 import { MatProgressBarModule } from '@angular/material/progress-bar';
 import { TranslateModule } from '@ngx-translate/core';
-import { AnnotationMode, OnProgressParameters, PDFDocumentLoadingTask, PDFDocumentProxy } from 'pdfjs-dist/legacy/build/pdf.mjs';
+import { AnnotationMode, OnProgressParameters, PDFDocumentLoadingTask, PDFDocumentProxy } from 'pdfjs-dist';
 import { Subject } from 'rxjs';
 import { catchError, delay } from 'rxjs/operators';
 import { AppConfigService } from '../../../app-config';

diff --git a/lib/process-services-cloud/karma.conf.js b/lib/process-services-cloud/karma.conf.js
@@ -8,9 +8,9 @@ module.exports = function (config) {
     config.set({
         basePath: '../../',
         files: [
-            { pattern: 'node_modules/pdfjs-dist/legacy/build/pdf.mjs', included: true, watched: false, type: 'module' },
-            { pattern: 'node_modules/pdfjs-dist/legacy/build/pdf.worker.mjs', included: true, watched: false, type: 'module' },
-            { pattern: 'node_modules/pdfjs-dist/legacy/web/pdf_viewer.mjs', included: true, watched: false, type: 'module' },
+            { pattern: 'node_modules/pdfjs-dist/legacy/build/pdf.js', included: true, watched: false },
+            { pattern: 'node_modules/pdfjs-dist/legacy/build/pdf.worker.js', included: true, watched: false },
+            { pattern: 'node_modules/pdfjs-dist/legacy/web/pdf_viewer.js', included: true, watched: false },
             {
                 pattern: 'node_modules/@angular/material/prebuilt-themes/indigo-pink.css',
                 included: true,

diff --git a/lib/process-services/karma.conf.js b/lib/process-services/karma.conf.js
@@ -8,9 +8,9 @@ module.exports = function (config) {
     config.set({
         basePath: '../../',
         files: [
-            { pattern: 'node_modules/pdfjs-dist/legacy/build/pdf.mjs', included: true, watched: false, type: 'module' },
-            { pattern: 'node_modules/pdfjs-dist/legacy/build/pdf.worker.mjs', included: true, watched: false, type: 'module' },
-            { pattern: 'node_modules/pdfjs-dist/legacy/web/pdf_viewer.mjs', included: true, watched: false, type: 'module' },
+            { pattern: 'node_modules/pdfjs-dist/legacy/build/pdf.js', included: true, watched: false },
+            { pattern: 'node_modules/pdfjs-dist/legacy/build/pdf.worker.js', included: true, watched: false },
+            { pattern: 'node_modules/pdfjs-dist/legacy/web/pdf_viewer.js', included: true, watched: false },
             {
                 pattern: 'node_modules/@angular/material/prebuilt-themes/indigo-pink.css',
                 included: true,