From bad4aa4589b1533380ce5ae8bd5882fd9062ae02 Mon Sep 17 00:00:00 2001 From: Jozef Harag <32jojo32@gmail.com> Date: Tue, 2 Mar 2021 18:25:26 +0100 Subject: [PATCH] Upgrade pdfjs --- next.config.js | 27 +- package-lock.json | 340 ++++++------------ package.json | 6 +- reader/components/pdf-loader/pdf-loader.jsx | 4 +- .../components/thumbnails-sidebar/index.jsx | 1 + reader/components/viewer/index.jsx | 2 +- reader/index.jsx | 2 +- reader/lib/pdf-js/webpack.js | 4 +- 8 files changed, 136 insertions(+), 250 deletions(-) diff --git a/next.config.js b/next.config.js index 493382a6..d6ffc44a 100644 --- a/next.config.js +++ b/next.config.js @@ -1,8 +1,5 @@ const path = require('path') -const withWorkers = require('@zeit/next-workers') -const withTM = require('next-transpile-modules')(['pdfjs-dist']) - const csp = require('./csp.config') const helpers = require('./utils/helpers') @@ -32,7 +29,7 @@ const nextConfig = { ] }, - webpack: (config) => { + webpack: (config, { defaultLoaders }) => { const originalEntry = config.entry config.entry = async () => { const entries = await originalEntry() @@ -86,6 +83,22 @@ const nextConfig = { } }) + config.module.rules.push({ + test: /\.+(js|jsx|mjs|ts|tsx)$/, + loader: defaultLoaders.babel, + include: (f) => f.includes('/node_modules/pdfjs-dist/lib/'), + }) + + rules.push({ + test: /\.worker\.(js|ts)$/, + loader: 'worker-loader', + options: { + publicPath: `${nextConfig.assetPrefix}/_next/`, + filename: 'static/[hash].worker.js', + esModule: false, + }, + }) + Object.assign(config.resolve.alias, { '@sentry/node': config.isServer ? '@sentry/node' : '@sentry/browser', @@ -98,9 +111,5 @@ const nextConfig = { return config }, } -nextConfig.workerLoaderOptions = { - publicPath: `${nextConfig.assetPrefix}/_next/`, - name: 'static/[hash].worker.js', -} -module.exports = withTM(withWorkers(nextConfig)) +module.exports = nextConfig diff --git a/package-lock.json b/package-lock.json index e2ab96c9..b4d0471b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,13 +14,11 @@ "@oacore/design": "^4.0.3", "@sentry/browser": "^5.29.2", "@sentry/node": "^5.29.2", - "@zeit/next-workers": "^1.0.0", "core-js": "^3.8.1", "cssnano": "^4.1.10", "file-saver": "^2.0.5", "next": "^10.0.3", - "next-transpile-modules": "^6.0.0", - "pdfjs-dist": "^2.4.456", + "pdfjs-dist": "^2.8.335", "postcss": "^8.2.1", "postcss-extend": "^1.0.5", "postcss-preset-env": "^6.7.0", @@ -30,7 +28,7 @@ "react-to-print": "^2.12.1", "smoothscroll-polyfill": "^0.4.4", "webpack": "^4.44.2", - "worker-loader": "^2.0.0" + "worker-loader": "^3.0.8" }, "devDependencies": { "@babel/core": "^7.12.10", @@ -2998,11 +2996,6 @@ "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==" }, - "node_modules/@zeit/next-workers": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@zeit/next-workers/-/next-workers-1.0.0.tgz", - "integrity": "sha512-klykVhp38AHAKV4oZAIv8ZoMju8Duhy22r82YUMkQzDXsrkhkJiM7KT7/ZlayhZQDpv+q1yLrZ0kotyGS/HZgg==" - }, "node_modules/abab": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz", @@ -7172,6 +7165,7 @@ "bundleDependencies": [ "node-pre-gyp" ], + "hasInstallScript": true, "optional": true, "dependencies": { "nan": "^2.12.1", @@ -10265,111 +10259,6 @@ "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=" }, - "node_modules/next-transpile-modules": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/next-transpile-modules/-/next-transpile-modules-6.0.0.tgz", - "integrity": "sha512-+Xdn4Upb8FeOXorzqVFyqww3kR9ML6S7y6Q3gFnoLdsqC5Jim3fwGNGTHENLOwedoKxcM6bCyRBuMYzyxru/wA==", - "dependencies": { - "enhanced-resolve": "^5.3.2", - "pkg-dir": "^5.0.0" - } - }, - "node_modules/next-transpile-modules/node_modules/enhanced-resolve": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.4.0.tgz", - "integrity": "sha512-ZmqfWURB2lConOBM1JdCVfPyMRv5RdKWktLXO6123p97ovVm2CLBgw9t5MBj3jJWA6eHyOeIws9iJQoGFR4euQ==", - "dependencies": { - "graceful-fs": "^4.2.4", - "tapable": "^2.0.0" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/next-transpile-modules/node_modules/find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dependencies": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/next-transpile-modules/node_modules/locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dependencies": { - "p-locate": "^5.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/next-transpile-modules/node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dependencies": { - "yocto-queue": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/next-transpile-modules/node_modules/p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dependencies": { - "p-limit": "^3.0.2" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/next-transpile-modules/node_modules/path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "engines": { - "node": ">=8" - } - }, - "node_modules/next-transpile-modules/node_modules/pkg-dir": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-5.0.0.tgz", - "integrity": "sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==", - "dependencies": { - "find-up": "^5.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/next-transpile-modules/node_modules/tapable": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz", - "integrity": "sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==", - "engines": { - "node": ">=6" - } - }, "node_modules/next/node_modules/ansi-styles": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", @@ -11458,9 +11347,12 @@ } }, "node_modules/pdfjs-dist": { - "version": "2.4.456", - "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.4.456.tgz", - "integrity": "sha512-yckJEHq3F48hcp6wStEpbN9McOj328Ib09UrBlGAKxvN2k+qYPN5iq6TH6jD1C0pso7zTep+g/CKsYgdrQd5QA==" + "version": "2.8.335", + "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.8.335.tgz", + "integrity": "sha512-2IKw7wP1RnzzWJcpkeZwF+cKROFiQext+/WburB6cgKwt9zc8rOyDH7a3FepdcciSGs8SDs/AuWe8qVx+iI6pw==", + "peerDependencies": { + "worker-loader": "^3.0.7" + } }, "node_modules/picomatch": { "version": "2.2.2", @@ -19016,21 +18908,74 @@ } }, "node_modules/worker-loader": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/worker-loader/-/worker-loader-3.0.8.tgz", + "integrity": "sha512-XQyQkIFeRVC7f7uRhFdNMe/iJOdO6zxAaR3EWbDp45v3mDhrTi+++oswKNxShUNjPC/1xUp5DB29YKLhFo129g==", + "dependencies": { + "loader-utils": "^2.0.0", + "schema-utils": "^3.0.0" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^4.0.0 || ^5.0.0" + } + }, + "node_modules/worker-loader/node_modules/emojis-list": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", + "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", + "engines": { + "node": ">= 4" + } + }, + "node_modules/worker-loader/node_modules/json5": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", + "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", + "dependencies": { + "minimist": "^1.2.5" + }, + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/worker-loader/node_modules/loader-utils": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/worker-loader/-/worker-loader-2.0.0.tgz", - "integrity": "sha512-tnvNp4K3KQOpfRnD20m8xltE3eWh89Ye+5oj7wXEEHKac1P4oZ6p9oTj8/8ExqoSBnk9nu5Pr4nKfQ1hn2APJw==", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", "dependencies": { - "loader-utils": "^1.0.0", - "schema-utils": "^0.4.0" + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + }, + "engines": { + "node": ">=8.9.0" } }, "node_modules/worker-loader/node_modules/schema-utils": { - "version": "0.4.7", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz", - "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz", + "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==", "dependencies": { - "ajv": "^6.1.0", - "ajv-keywords": "^3.1.0" + "@types/json-schema": "^7.0.6", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" } }, "node_modules/wrap-ansi": { @@ -19170,17 +19115,6 @@ "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz", "integrity": "sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==" }, - "node_modules/yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/zwitch": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz", @@ -22109,11 +22043,6 @@ "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==" }, - "@zeit/next-workers": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@zeit/next-workers/-/next-workers-1.0.0.tgz", - "integrity": "sha512-klykVhp38AHAKV4oZAIv8ZoMju8Duhy22r82YUMkQzDXsrkhkJiM7KT7/ZlayhZQDpv+q1yLrZ0kotyGS/HZgg==" - }, "abab": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz", @@ -29531,77 +29460,6 @@ "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=" }, - "next-transpile-modules": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/next-transpile-modules/-/next-transpile-modules-6.0.0.tgz", - "integrity": "sha512-+Xdn4Upb8FeOXorzqVFyqww3kR9ML6S7y6Q3gFnoLdsqC5Jim3fwGNGTHENLOwedoKxcM6bCyRBuMYzyxru/wA==", - "requires": { - "enhanced-resolve": "^5.3.2", - "pkg-dir": "^5.0.0" - }, - "dependencies": { - "enhanced-resolve": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.4.0.tgz", - "integrity": "sha512-ZmqfWURB2lConOBM1JdCVfPyMRv5RdKWktLXO6123p97ovVm2CLBgw9t5MBj3jJWA6eHyOeIws9iJQoGFR4euQ==", - "requires": { - "graceful-fs": "^4.2.4", - "tapable": "^2.0.0" - } - }, - "find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "requires": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - } - }, - "locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "requires": { - "p-locate": "^5.0.0" - } - }, - "p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "requires": { - "yocto-queue": "^0.1.0" - } - }, - "p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "requires": { - "p-limit": "^3.0.2" - } - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" - }, - "pkg-dir": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-5.0.0.tgz", - "integrity": "sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==", - "requires": { - "find-up": "^5.0.0" - } - }, - "tapable": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz", - "integrity": "sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==" - } - } - }, "nice-try": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", @@ -30298,9 +30156,10 @@ } }, "pdfjs-dist": { - "version": "2.4.456", - "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.4.456.tgz", - "integrity": "sha512-yckJEHq3F48hcp6wStEpbN9McOj328Ib09UrBlGAKxvN2k+qYPN5iq6TH6jD1C0pso7zTep+g/CKsYgdrQd5QA==" + "version": "2.8.335", + "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.8.335.tgz", + "integrity": "sha512-2IKw7wP1RnzzWJcpkeZwF+cKROFiQext+/WburB6cgKwt9zc8rOyDH7a3FepdcciSGs8SDs/AuWe8qVx+iI6pw==", + "requires": {} }, "picomatch": { "version": "2.2.2", @@ -37974,21 +37833,45 @@ } }, "worker-loader": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/worker-loader/-/worker-loader-2.0.0.tgz", - "integrity": "sha512-tnvNp4K3KQOpfRnD20m8xltE3eWh89Ye+5oj7wXEEHKac1P4oZ6p9oTj8/8ExqoSBnk9nu5Pr4nKfQ1hn2APJw==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/worker-loader/-/worker-loader-3.0.8.tgz", + "integrity": "sha512-XQyQkIFeRVC7f7uRhFdNMe/iJOdO6zxAaR3EWbDp45v3mDhrTi+++oswKNxShUNjPC/1xUp5DB29YKLhFo129g==", "requires": { - "loader-utils": "^1.0.0", - "schema-utils": "^0.4.0" + "loader-utils": "^2.0.0", + "schema-utils": "^3.0.0" }, "dependencies": { + "emojis-list": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", + "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==" + }, + "json5": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", + "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", + "requires": { + "minimist": "^1.2.5" + } + }, + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, "schema-utils": { - "version": "0.4.7", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz", - "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz", + "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==", "requires": { - "ajv": "^6.1.0", - "ajv-keywords": "^3.1.0" + "@types/json-schema": "^7.0.6", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" } } } @@ -38131,11 +38014,6 @@ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz", "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==" }, - "yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==" - }, "zwitch": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz", diff --git a/package.json b/package.json index f0ed8caa..daf44e20 100644 --- a/package.json +++ b/package.json @@ -44,13 +44,11 @@ "@oacore/design": "^4.0.3", "@sentry/browser": "^5.29.2", "@sentry/node": "^5.29.2", - "@zeit/next-workers": "^1.0.0", "core-js": "^3.8.1", "cssnano": "^4.1.10", "file-saver": "^2.0.5", "next": "^10.0.3", - "next-transpile-modules": "^6.0.0", - "pdfjs-dist": "^2.4.456", + "pdfjs-dist": "^2.8.335", "postcss": "^8.2.1", "postcss-extend": "^1.0.5", "postcss-preset-env": "^6.7.0", @@ -60,7 +58,7 @@ "react-to-print": "^2.12.1", "smoothscroll-polyfill": "^0.4.4", "webpack": "^4.44.2", - "worker-loader": "^2.0.0" + "worker-loader": "^3.0.8" }, "engines": { "node": ">=12" diff --git a/reader/components/pdf-loader/pdf-loader.jsx b/reader/components/pdf-loader/pdf-loader.jsx index 04dfb599..8bf072b9 100644 --- a/reader/components/pdf-loader/pdf-loader.jsx +++ b/reader/components/pdf-loader/pdf-loader.jsx @@ -1,13 +1,13 @@ import React, { useEffect, useState, cloneElement } from 'react' import { LoadingBar } from '@oacore/design' -import pdfjs from '../../lib/pdf-js/webpack' +import * as pdfjs from '../../lib/pdf-js/webpack' import { Sentry } from '../../../utils/sentry' import styles from './styles.module.css' import { logTiming } from '../../../utils/analytics' import DocumentPlaceholder from './document-placeholder' -const CMAP_URL = 'https://cdn.jsdelivr.net/npm/pdfjs-dist@2.4.456/cmaps/' +const CMAP_URL = 'https://cdn.jsdelivr.net/npm/pdfjs-dist@2.7.570/cmaps/' const CMAP_PACKED = true const redirect = (url) => { diff --git a/reader/components/thumbnails-sidebar/index.jsx b/reader/components/thumbnails-sidebar/index.jsx index 28251508..2b90cdae 100644 --- a/reader/components/thumbnails-sidebar/index.jsx +++ b/reader/components/thumbnails-sidebar/index.jsx @@ -22,6 +22,7 @@ class ThumbnailsSidebar extends React.PureComponent { classNameSelected: styles.selected, classNameThumbnailImage: styles.thumbnailImage, classNameThumbnail: styles.thumbnail, + eventBus, }) renderingQueue.setThumbnailViewer(this.thumbnailViewer) diff --git a/reader/components/viewer/index.jsx b/reader/components/viewer/index.jsx index ec5c4b7a..8a7380a4 100644 --- a/reader/components/viewer/index.jsx +++ b/reader/components/viewer/index.jsx @@ -1,5 +1,5 @@ import React from 'react' -import { PDFViewer as _PDFViewer } from 'pdfjs-dist/es5/web/pdf_viewer' +import { PDFViewer as _PDFViewer } from 'pdfjs-dist/legacy/web/pdf_viewer' import stylesMain from '../main-area/styles.module.css' import styles from './styles.module.css' diff --git a/reader/index.jsx b/reader/index.jsx index a3e3cd4b..d77afb50 100644 --- a/reader/index.jsx +++ b/reader/index.jsx @@ -1,6 +1,6 @@ import React from 'react' import { PDFRenderingQueue } from 'pdfjs-dist/lib/web/pdf_rendering_queue' -import { EventBus, PDFLinkService } from 'pdfjs-dist/es5/web/pdf_viewer' +import { EventBus, PDFLinkService } from 'pdfjs-dist/legacy/web/pdf_viewer' import MainArea from './components/main-area' import Layout from './components/layout' diff --git a/reader/lib/pdf-js/webpack.js b/reader/lib/pdf-js/webpack.js index cc981098..0e6cde82 100644 --- a/reader/lib/pdf-js/webpack.js +++ b/reader/lib/pdf-js/webpack.js @@ -13,8 +13,8 @@ * limitations under the License. */ -const pdfjs = require('pdfjs-dist/es5/build/pdf.js') -const PdfjsWorker = require('pdfjs-dist/es5/build/pdf.worker.js') +const pdfjs = require('pdfjs-dist/legacy/build/pdf.js') +const PdfjsWorker = require('pdfjs-dist/legacy/build/pdf.worker.js') if (typeof window !== 'undefined' && 'Worker' in window) pdfjs.GlobalWorkerOptions.workerPort = new PdfjsWorker()