From 728b749714eb4ba538157c0b1021d8258a5624ee Mon Sep 17 00:00:00 2001
From: Joachim Bauch <bauch@struktur.de>
Date: Mon, 22 Nov 2021 15:05:09 +0100
Subject: [PATCH] Loading pdf.js manually is not necessary, bundled with
 viewer.

---
 src/pdfdraw.js       | 3 +--
 templates/viewer.php | 1 -
 webpack.js           | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/pdfdraw.js b/src/pdfdraw.js
index 63edb46..dd7312e 100644
--- a/src/pdfdraw.js
+++ b/src/pdfdraw.js
@@ -24,8 +24,7 @@ import $ from 'jquery';
 import io from 'socket.io-client';
 import iro from '@jaames/iro';
 import paper from 'paper';
-import { pdfjsLib } from 'pdfjs-dist';
-import { PDFViewerApplication, PDFViewerApplicationOptions } from 'pdfjs-dist-viewer-min';
+import { pdfjsLib, PDFViewerApplication, PDFViewerApplicationOptions } from 'pdfjs-dist-viewer-min';
 
 (function() {
 "use strict";
diff --git a/templates/viewer.php b/templates/viewer.php
index db92ee0..2a30c6e 100644
--- a/templates/viewer.php
+++ b/templates/viewer.php
@@ -41,7 +41,6 @@ See https://github.com/adobe-type-tools/cmap-resources
     <!-- This snippet is used in production (included from viewer.html) -->
     <link rel="resource" type="application/l10n" href="<?php p($urlGenerator->linkTo('pdfdraw', '3rdparty/pdfjs/web/locale/locale.properties')) ?>?v=<?php p($version) ?>">
 
-    <script nonce="<?php p(\OC::$server->getContentSecurityPolicyNonceManager()->getNonce()) ?>" src="<?php p($urlGenerator->linkTo('pdfdraw', 'js/pdf.js')) ?>?v=<?php p($version) ?>"></script>
     <script nonce="<?php p(\OC::$server->getContentSecurityPolicyNonceManager()->getNonce()) ?>" src="<?php p($urlGenerator->linkTo('pdfdraw', 'js/pdf.viewer.js')) ?>?v=<?php p($version) ?>"></script>
 
     <script nonce="<?php p(\OC::$server->getContentSecurityPolicyNonceManager()->getNonce()) ?>" src="<?php p($urlGenerator->linkTo('pdfdraw', 'js/pdfdraw.js')) ?>?v=<?php p($version) ?>"></script>
diff --git a/webpack.js b/webpack.js
index 21dbbb7..b9ce697 100644
--- a/webpack.js
+++ b/webpack.js
@@ -7,7 +7,6 @@ module.exports = {
     'loader': path.join(__dirname, 'src', 'loader.js'),
     'pdfdraw': path.join(__dirname, 'src', 'pdfdraw.js'),
     'admin/backend': path.join(__dirname, 'src', 'admin', 'backend.js'),
-    'pdf': path.join(__dirname, 'node_modules', 'pdfjs-dist', 'build', 'pdf.js'),
     'pdf.worker': path.join(__dirname, 'node_modules', 'pdfjs-dist', 'build', 'pdf.worker.js'),
   },
   externals: {