Merge pull request #263 from nakazawakan/backend

PDF.jsのバージョンミスの修正

backend/package-lock.json

@@ -23,7 +23,7 @@
                 "es7-shim": "^6.0.0",
                 "history": "^5.0.0",
                 "moment": "^2.29.1",
-                "pdfjs-dist": "^2.11.338",
+                "pdfjs-dist": "^2.10.377",
                 "prop-types": "^15.7.2",
                 "react": "^17.0.2",
                 "react-cookie": "^4.1.1",
@@ -14458,16 +14458,11 @@
             }
         },
         "node_modules/pdfjs-dist": {
-            "version": "2.12.313",
-            "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.12.313.tgz",
-            "integrity": "sha512-1x6iXO4Qnv6Eb+YFdN5JdUzt4pAkxSp3aLAYPX93eQCyg/m7QFzXVWJHJVtoW48CI8HCXju4dSkhQZwoheL5mA==",
+            "version": "2.10.377",
+            "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.10.377.tgz",
+            "integrity": "sha512-i0jRShtvgfsVQUNCoFYH4SVhPO3U0yhtiFLfZ0RR0B+68N+Vnwq+8B3cjWjLEwWGh8wg1XQ/sYMYKUlHn/Qpsw==",
             "peerDependencies": {
-                "worker-loader": "^3.0.8"
-            },
-            "peerDependenciesMeta": {
-                "worker-loader": {
-                    "optional": true
-                }
+                "worker-loader": "^3.0.7"
             }
         },
         "node_modules/performance-now": {
@@ -16165,14 +16160,6 @@
                 "react-dom": "^16.3.0 || ^17.0.0-0"
             }
         },
-        "node_modules/react-pdf/node_modules/pdfjs-dist": {
-            "version": "2.10.377",
-            "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.10.377.tgz",
-            "integrity": "sha512-i0jRShtvgfsVQUNCoFYH4SVhPO3U0yhtiFLfZ0RR0B+68N+Vnwq+8B3cjWjLEwWGh8wg1XQ/sYMYKUlHn/Qpsw==",
-            "peerDependencies": {
-                "worker-loader": "^3.0.7"
-            }
-        },
         "node_modules/react-popper": {
             "version": "2.2.5",
             "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-2.2.5.tgz",
@@ -19988,6 +19975,26 @@
                 "workbox-core": "6.4.2"
             }
         },
+        "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==",
+            "peer": true,
+            "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/wrap-ansi": {
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
@@ -30548,9 +30555,9 @@
             }
         },
         "pdfjs-dist": {
-            "version": "2.12.313",
-            "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.12.313.tgz",
-            "integrity": "sha512-1x6iXO4Qnv6Eb+YFdN5JdUzt4pAkxSp3aLAYPX93eQCyg/m7QFzXVWJHJVtoW48CI8HCXju4dSkhQZwoheL5mA==",
+            "version": "2.10.377",
+            "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.10.377.tgz",
+            "integrity": "sha512-i0jRShtvgfsVQUNCoFYH4SVhPO3U0yhtiFLfZ0RR0B+68N+Vnwq+8B3cjWjLEwWGh8wg1XQ/sYMYKUlHn/Qpsw==",
             "requires": {}
         },
         "performance-now": {
@@ -31667,14 +31674,6 @@
                 "merge-refs": "^1.0.0",
                 "pdfjs-dist": "2.10.377",
                 "prop-types": "^15.6.2"
-            },
-            "dependencies": {
-                "pdfjs-dist": {
-                    "version": "2.10.377",
-                    "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.10.377.tgz",
-                    "integrity": "sha512-i0jRShtvgfsVQUNCoFYH4SVhPO3U0yhtiFLfZ0RR0B+68N+Vnwq+8B3cjWjLEwWGh8wg1XQ/sYMYKUlHn/Qpsw==",
-                    "requires": {}
-                }
             }
         },
         "react-popper": {
@@ -34541,6 +34540,16 @@
                 "workbox-core": "6.4.2"
             }
         },
+        "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==",
+            "peer": true,
+            "requires": {
+                "loader-utils": "^2.0.0",
+                "schema-utils": "^3.0.0"
+            }
+        },
         "wrap-ansi": {
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",

backend/package.json

@@ -43,7 +43,7 @@
         "es7-shim": "^6.0.0",
         "history": "^5.0.0",
         "moment": "^2.29.1",
-        "pdfjs-dist": "^2.11.338",
+        "pdfjs-dist": "^2.10.377",
         "prop-types": "^15.7.2",
         "react": "^17.0.2",
         "react-cookie": "^4.1.1",

backend/public/css/app.css

@@ -12897,7 +12897,7 @@ categories: [project]
 @font-face {
   font-family: "iconfont";
   src: url(/fonts/iconfont.eot?9bd2f8e21fb68f3cb69f306c7a5a07d2);
-  src: url(/fonts/iconfont.eot?9bd2f8e21fb68f3cb69f306c7a5a07d2) format("eot"), url(/fonts/iconfont.woff?72290a51f520574be856b3621acc29a1) format("woff"), url(/fonts/iconfont.ttf?e240ce427caf7549e576c77b39a1d3f1) format("truetype"), url(/fonts/iconfont.svg?9e48c54f8bbb472c1c286234fdd6636f) format("svg");
+  src: url(/fonts/iconfont.eot?9bd2f8e21fb68f3cb69f306c7a5a07d2) format("eot"), url(/fonts/iconfont.woff?72290a51f520574be856b3621acc29a1) format("woff"), url(/fonts/iconfont.ttf?e240ce427caf7549e576c77b39a1d3f1) format("truetype"), url(/fonts/iconfont.svg?d812f238f7ec32f5cb5ebd322f320a02) format("svg");
   font-weight: normal;
   font-style: normal;
 }