From 7449ae30bb0abb7981ea64631c7a6f5b9fbb36d6 Mon Sep 17 00:00:00 2001 From: Jonah Kagan Date: Mon, 12 Feb 2024 12:09:54 -0800 Subject: [PATCH] Fix merge conflict in pnpm-lock.yaml (#4593) * Use exact version of react-pdf in apps/admin To match what we use in apps/design * Update pnpm-lock.yaml --- apps/admin/frontend/package.json | 2 +- pnpm-lock.yaml | 161 ++++++++++++++++--------------- 2 files changed, 86 insertions(+), 77 deletions(-) diff --git a/apps/admin/frontend/package.json b/apps/admin/frontend/package.json index f526b4997..6b00ad885 100644 --- a/apps/admin/frontend/package.json +++ b/apps/admin/frontend/package.json @@ -92,7 +92,7 @@ "react-app-polyfill": "3.0.0", "react-dev-utils": "12.0.1", "react-dom": "18.2.0", - "react-pdf": "^7.7.0", + "react-pdf": "7.7.0", "react-router-dom": "^5.3.4", "resolve": "1.18.1", "semver": "7.3.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 08778f5b3..5a6f5e469 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -458,7 +458,7 @@ importers: specifier: 18.2.0 version: 18.2.0(react@18.2.0) react-pdf: - specifier: ^7.7.0 + specifier: 7.7.0 version: 7.7.0(@types/react@18.2.18)(react-dom@18.2.0)(react@18.2.0) react-router-dom: specifier: ^5.3.4 @@ -2410,7 +2410,7 @@ importers: version: 3.3.0 pdfjs-dist: specifier: 2.3.200 - version: 2.3.200(webpack@4.47.0) + version: 2.3.200(webpack@4.46.0) rxjs: specifier: 7.8.1 version: 7.8.1 @@ -2570,7 +2570,7 @@ importers: version: 0.12.7 pdfjs-dist: specifier: 2.3.200 - version: 2.3.200(webpack@4.47.0) + version: 2.3.200(webpack@4.46.0) pluralize: specifier: 8.0.0 version: 8.0.0 @@ -2709,7 +2709,7 @@ importers: version: 3.0.0 react-dev-utils: specifier: 12.0.1 - version: 12.0.1(eslint@8.49.0)(typescript@5.2.2)(webpack@4.47.0) + version: 12.0.1(eslint@8.49.0)(typescript@5.2.2)(webpack@4.46.0) sort-package-json: specifier: ^1.50.0 version: 1.53.1 @@ -4395,7 +4395,7 @@ importers: version: 4.3.4(supports-color@5.5.0) pdfjs-dist: specifier: 2.3.200 - version: 2.3.200(webpack@4.47.0) + version: 2.3.200(webpack@4.46.0) tmp: specifier: ^0.2.1 version: 0.2.1 @@ -12475,11 +12475,11 @@ packages: minimalistic-assert: 1.0.1 safer-buffer: 2.1.2 - /assert@1.5.1: - resolution: {integrity: sha512-zzw1uCAgLbsKwBfFc8CX78DDg+xZeBksSO3vwVIDDN5i94eOrPsSSyiVhmsSABFDM/OcpE2aagCat9dnWQLG1A==} + /assert@1.5.0: + resolution: {integrity: sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==} dependencies: - object.assign: 4.1.4 - util: 0.10.4 + object-assign: 4.1.1 + util: 0.10.3 /assert@2.0.0: resolution: {integrity: sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==} @@ -12973,9 +12973,8 @@ packages: bn.js: 5.2.1 randombytes: 2.1.0 - /browserify-sign@4.2.2: - resolution: {integrity: sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==} - engines: {node: '>= 4'} + /browserify-sign@4.2.1: + resolution: {integrity: sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==} dependencies: bn.js: 5.2.1 browserify-rsa: 4.1.0 @@ -13794,7 +13793,7 @@ packages: resolution: {integrity: sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==} dependencies: browserify-cipher: 1.0.1 - browserify-sign: 4.2.2 + browserify-sign: 4.2.1 create-ecdh: 4.0.4 create-hash: 1.2.0 create-hmac: 1.1.7 @@ -14000,8 +13999,8 @@ packages: /decimal.js@10.4.1: resolution: {integrity: sha512-F29o+vci4DodHYT9UrR5IEbfBw9pE5eSapIJdTqXK5+6hq+t8VRxwQyKlW2i+KDKFkkJQRvFyI/QXD83h8LyQw==} - /decode-uri-component@0.2.2: - resolution: {integrity: sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==} + /decode-uri-component@0.2.0: + resolution: {integrity: sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==} engines: {node: '>=0.10'} /decompress-response@4.2.1: @@ -14121,19 +14120,19 @@ packages: resolution: {integrity: sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==} engines: {node: '>=0.10.0'} dependencies: - is-descriptor: 0.1.7 + is-descriptor: 0.1.6 /define-property@1.0.0: resolution: {integrity: sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==} engines: {node: '>=0.10.0'} dependencies: - is-descriptor: 1.0.3 + is-descriptor: 1.0.2 /define-property@2.0.2: resolution: {integrity: sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==} engines: {node: '>=0.10.0'} dependencies: - is-descriptor: 1.0.3 + is-descriptor: 1.0.2 isobject: 3.0.1 /defu@6.1.2: @@ -15759,7 +15758,7 @@ packages: signal-exit: 4.1.0 dev: true - /fork-ts-checker-webpack-plugin@6.5.2(eslint@8.49.0)(typescript@5.2.2)(webpack@4.47.0): + /fork-ts-checker-webpack-plugin@6.5.2(eslint@8.49.0)(typescript@5.2.2)(webpack@4.46.0): resolution: {integrity: sha512-m5cUmF30xkZ7h4tWUgTAcEaKmUW7tfyUyTqNNOz7OxWJ0v1VWKTcOvH8FWHUwSjlW/356Ijc9vi3XfcPstpQKA==} engines: {node: '>=10', yarn: '>=1.0.0'} peerDependencies: @@ -15788,7 +15787,7 @@ packages: semver: 7.3.2 tapable: 1.1.3 typescript: 5.2.2 - webpack: 4.47.0 + webpack: 4.46.0 dev: true /fork-ts-checker-webpack-plugin@6.5.2(eslint@8.49.0)(typescript@5.2.2)(webpack@5.88.2): @@ -15976,9 +15975,6 @@ packages: /function-bind@1.1.1: resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==} - /function-bind@1.1.2: - resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==} - /function.prototype.name@1.1.5: resolution: {integrity: sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==} engines: {node: '>= 0.4'} @@ -16514,12 +16510,6 @@ packages: inherits: 2.0.4 minimalistic-assert: 1.0.1 - /hasown@2.0.0: - resolution: {integrity: sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==} - engines: {node: '>= 0.4'} - dependencies: - function-bind: 1.1.2 - /he@1.2.0: resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==} hasBin: true @@ -16836,6 +16826,9 @@ packages: once: 1.4.0 wrappy: 1.0.2 + /inherits@2.0.1: + resolution: {integrity: sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA==} + /inherits@2.0.3: resolution: {integrity: sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==} @@ -16880,11 +16873,19 @@ packages: is-windows: 1.0.2 dev: false - /is-accessor-descriptor@1.0.1: - resolution: {integrity: sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==} - engines: {node: '>= 0.10'} + /is-accessor-descriptor@0.1.6: + resolution: {integrity: sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==} + engines: {node: '>=0.10.0'} + deprecated: Please upgrade to v0.1.7 + dependencies: + kind-of: 3.2.2 + + /is-accessor-descriptor@1.0.0: + resolution: {integrity: sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==} + engines: {node: '>=0.10.0'} + deprecated: Please upgrade to v1.0.1 dependencies: - hasown: 2.0.0 + kind-of: 6.0.3 /is-arguments@1.1.1: resolution: {integrity: sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==} @@ -16972,11 +16973,19 @@ packages: dependencies: has: 1.0.3 - /is-data-descriptor@1.0.1: - resolution: {integrity: sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==} - engines: {node: '>= 0.4'} + /is-data-descriptor@0.1.4: + resolution: {integrity: sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==} + engines: {node: '>=0.10.0'} + deprecated: Please upgrade to v0.1.5 + dependencies: + kind-of: 3.2.2 + + /is-data-descriptor@1.0.0: + resolution: {integrity: sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==} + engines: {node: '>=0.10.0'} + deprecated: Please upgrade to v1.0.1 dependencies: - hasown: 2.0.0 + kind-of: 6.0.3 /is-date-object@1.0.5: resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==} @@ -16988,19 +16997,21 @@ packages: resolution: {integrity: sha512-YDoFpuZWu1VRXlsnlYMzKyVRITXj7Ej/V9gXQ2/pAe7X1J7M/RNOqaIYi6qUn+B7nGyB9pDXrv02dsB58d2ZAQ==} dev: true - /is-descriptor@0.1.7: - resolution: {integrity: sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==} - engines: {node: '>= 0.4'} + /is-descriptor@0.1.6: + resolution: {integrity: sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==} + engines: {node: '>=0.10.0'} dependencies: - is-accessor-descriptor: 1.0.1 - is-data-descriptor: 1.0.1 + is-accessor-descriptor: 0.1.6 + is-data-descriptor: 0.1.4 + kind-of: 5.1.0 - /is-descriptor@1.0.3: - resolution: {integrity: sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==} - engines: {node: '>= 0.4'} + /is-descriptor@1.0.2: + resolution: {integrity: sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==} + engines: {node: '>=0.10.0'} dependencies: - is-accessor-descriptor: 1.0.1 - is-data-descriptor: 1.0.1 + is-accessor-descriptor: 1.0.0 + is-data-descriptor: 1.0.0 + kind-of: 6.0.3 /is-docker@2.2.1: resolution: {integrity: sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==} @@ -18072,6 +18083,10 @@ packages: dependencies: is-buffer: 1.1.6 + /kind-of@5.1.0: + resolution: {integrity: sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==} + engines: {node: '>=0.10.0'} + /kind-of@6.0.3: resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==} engines: {node: '>=0.10.0'} @@ -18961,7 +18976,7 @@ packages: /node-libs-browser@2.2.1: resolution: {integrity: sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==} dependencies: - assert: 1.5.1 + assert: 1.5.0 browserify-zlib: 0.2.0 buffer: 4.9.2 console-browserify: 1.2.0 @@ -18981,7 +18996,7 @@ packages: string_decoder: 1.3.0 timers-browserify: 2.0.12 tty-browserify: 0.0.0 - url: 0.11.3 + url: 0.11.1 util: 0.11.1 vm-browserify: 1.1.2 @@ -19536,25 +19551,14 @@ packages: nan: 2.16.0 dev: false - /pdfjs-dist@2.3.200(webpack@4.47.0): + /pdfjs-dist@2.3.200(webpack@4.46.0): resolution: {integrity: sha512-+8wBjU5h8LPZOIvR9X2uCrp/8xWQG1DRDKMLg5lzGN1qyIAZlYUxA0KQyy12Nw5jN7ozulC6v97PMaDcLgAcFg==} peerDependencies: webpack: ^3.0.0 || ^4.0.0-alpha.0 || ^4.0.0 dependencies: node-ensure: 0.0.0 - webpack: 4.47.0 - worker-loader: 2.0.0(webpack@4.47.0) - dev: false - - /pdfjs-dist@3.11.174: - resolution: {integrity: sha512-TdTZPf1trZ8/UFu5Cx/GXB7GZM30LT+wWUNfsi6Bq8ePLnb+woNKtDymI2mxZYBpMbonNFqKmiz684DIfnd8dA==} - engines: {node: '>=18'} - optionalDependencies: - canvas: 2.11.2 - path2d-polyfill: 2.0.1 - transitivePeerDependencies: - - encoding - - supports-color + webpack: 4.46.0 + worker-loader: 2.0.0(webpack@4.46.0) dev: false /pdfjs-dist@3.11.174: @@ -20108,7 +20112,7 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: true - /react-dev-utils@12.0.1(eslint@8.49.0)(typescript@5.2.2)(webpack@4.47.0): + /react-dev-utils@12.0.1(eslint@8.49.0)(typescript@5.2.2)(webpack@4.46.0): resolution: {integrity: sha512-84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ==} engines: {node: '>=14'} peerDependencies: @@ -20127,7 +20131,7 @@ packages: escape-string-regexp: 4.0.0 filesize: 8.0.7 find-up: 5.0.0 - fork-ts-checker-webpack-plugin: 6.5.2(eslint@8.49.0)(typescript@5.2.2)(webpack@4.47.0) + fork-ts-checker-webpack-plugin: 6.5.2(eslint@8.49.0)(typescript@5.2.2)(webpack@4.46.0) global-modules: 2.0.0 globby: 11.1.0 gzip-size: 6.0.0 @@ -20143,7 +20147,7 @@ packages: strip-ansi: 6.0.1 text-table: 0.2.0 typescript: 5.2.2 - webpack: 4.47.0 + webpack: 4.46.0 transitivePeerDependencies: - eslint - supports-color @@ -21382,7 +21386,7 @@ packages: deprecated: See https://github.com/lydell/source-map-resolve#deprecated dependencies: atob: 2.1.2 - decode-uri-component: 0.2.2 + decode-uri-component: 0.2.0 resolve-url: 0.2.1 source-map-url: 0.4.1 urix: 0.1.0 @@ -22003,7 +22007,7 @@ packages: unique-string: 2.0.0 dev: true - /terser-webpack-plugin@1.4.5(webpack@4.47.0): + /terser-webpack-plugin@1.4.5(webpack@4.46.0): resolution: {integrity: sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==} engines: {node: '>= 6.9.0'} peerDependencies: @@ -22016,7 +22020,7 @@ packages: serialize-javascript: 4.0.0 source-map: 0.6.1 terser: 4.8.1 - webpack: 4.47.0 + webpack: 4.46.0 webpack-sources: 1.4.3 worker-farm: 1.7.0 @@ -22650,8 +22654,8 @@ packages: querystringify: 2.2.0 requires-port: 1.0.0 - /url@0.11.3: - resolution: {integrity: sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==} + /url@0.11.1: + resolution: {integrity: sha512-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA==} dependencies: punycode: 1.4.1 qs: 6.11.2 @@ -22751,6 +22755,11 @@ packages: /util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} + /util@0.10.3: + resolution: {integrity: sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ==} + dependencies: + inherits: 2.0.1 + /util@0.10.4: resolution: {integrity: sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==} dependencies: @@ -23012,8 +23021,8 @@ packages: resolution: {integrity: sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==} dev: true - /webpack@4.47.0: - resolution: {integrity: sha512-td7fYwgLSrky3fI1EuU5cneU4+pbH6GgOfuKNS1tNPcfdGinGELAqsb/BP4nnvZyKSG2i/xFGU7+n2PvZA8HJQ==} + /webpack@4.46.0: + resolution: {integrity: sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==} engines: {node: '>=6.11.5'} hasBin: true peerDependencies: @@ -23045,7 +23054,7 @@ packages: node-libs-browser: 2.2.1 schema-utils: 1.0.0 tapable: 1.1.3 - terser-webpack-plugin: 1.4.5(webpack@4.47.0) + terser-webpack-plugin: 1.4.5(webpack@4.46.0) watchpack: 1.7.5 webpack-sources: 1.4.3 transitivePeerDependencies: @@ -23182,7 +23191,7 @@ packages: dependencies: errno: 0.1.8 - /worker-loader@2.0.0(webpack@4.47.0): + /worker-loader@2.0.0(webpack@4.46.0): resolution: {integrity: sha512-tnvNp4K3KQOpfRnD20m8xltE3eWh89Ye+5oj7wXEEHKac1P4oZ6p9oTj8/8ExqoSBnk9nu5Pr4nKfQ1hn2APJw==} engines: {node: '>= 6.9.0 || >= 8.9.0'} peerDependencies: @@ -23190,7 +23199,7 @@ packages: dependencies: loader-utils: 1.4.2 schema-utils: 0.4.7 - webpack: 4.47.0 + webpack: 4.46.0 dev: false /wrap-ansi@6.2.0: