Merge pull request #47 from kogepanh/main

脆弱性対応・微調整

.devcontainer/devcontainer.json

@@ -0,0 +1,20 @@
+{
+  "name": "mrc",
+  "dockerComposeFile": "docker-compose.yml",
+  "service": "mrc",
+  "workspaceFolder": "/myapp/mrc",
+  "settings": {},
+  "extensions": [
+    "editorconfig.editorconfig",
+    "dbaeumer.vscode-eslint",
+    "oderwat.indent-rainbow",
+    "esbenp.prettier-vscode",
+    "davidanson.vscode-markdownlint",
+    "yzhang.markdown-all-in-one"
+  ]
+  // "forwardPorts": [],
+  // "runServices": [],
+  // "shutdownAction": "none",
+  // "postCreateCommand": "apt-get update && apt-get install -y curl",
+  // "remoteUser": "vscode"
+}

.devcontainer/docker-compose.yml

@@ -0,0 +1,11 @@
+version: '3'
+services:
+  mrc:
+    image: node:latest
+    command: sleep infinity
+    ports:
+      - 3000:3000
+    volumes:
+      - ../:/myapp/mrc:cached
+      - ../src:/myapp/mrc/src
+      - /myapp/mrc/node_modules

package.json

@@ -12,28 +12,28 @@
     "fix": "run-s format lint"
   },
   "dependencies": {
-    "contentful": "^8.4.2",
-    "next": "11.0.1",
+    "contentful": "^9.0.0",
+    "next": "11.1.2",
     "postcss-import": "^14.0.2",
     "react": "17.0.2",
     "react-dom": "17.0.2",
-    "react-scroll": "^1.8.2",
-    "remark": "^13.0.0",
-    "remark-external-links": "^8.0.0",
-    "remark-gfm": "^1.0.0",
-    "remark-highlight.js": "^6.0.0",
-    "remark-html": "^13.0.1",
+    "react-scroll": "^1.8.4",
+    "remark": "^14.0.1",
+    "remark-external-links": "^9.0.1",
+    "remark-gfm": "^2.0.0",
+    "remark-highlight.js": "^7.0.1",
+    "remark-html": "^14.0.1",
     "remark-prism": "^1.3.6",
-    "tailwindcss": "^2.2.4"
+    "tailwindcss": "^2.2.15"
   },
   "devDependencies": {
-    "autoprefixer": "^10.2.6",
-    "eslint": "^7.30.0",
-    "eslint-config-next": "^11.0.1",
+    "autoprefixer": "^10.3.4",
+    "eslint": "^7.32.0",
+    "eslint-config-next": "^11.1.2",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-react": "^7.24.0",
+    "eslint-plugin-react": "^7.25.1",
     "npm-run-all": "^4.1.5",
-    "postcss": "^8.3.5",
-    "prettier": "^2.3.2"
+    "postcss": "^8.3.6",
+    "prettier": "^2.4.0"
   }
 }

src/components/meta.js

@@ -33,6 +33,7 @@ function Meta() {
       <meta property="og:title" content={site_title} />
       <meta property="og:description" content={description} />
       <meta name="twitter:card" content="summary_large_image" />
+      <link href="https://fonts.googleapis.com/css2?family=Noto+Sans+JP:wght@400;700&display=swap" rel="stylesheet" />
     </Head>
   );
 }

src/lib/markdownToHtml.js

@@ -1,4 +1,4 @@
-import remark from "remark";
+import { remark } from "remark";
 import html from "remark-html";
 import gfm from "remark-gfm";
 import prism from "remark-prism";

tailwind.config.js

@@ -14,16 +14,7 @@ module.exports = {
         "900px": "900px",
       },
       fontFamily: {
-        sans: [
-          '"Hiragino Kaku Gothic Pro"',
-          '"ヒラギノ角ゴ Pro"',
-          '"Yu Gothic Medium"',
-          '"游ゴシック Medium"',
-          "YuGothic",
-          '"游ゴシック体"',
-          '"メイリオ"',
-          "sans-serif",
-        ],
+        sans: ["Noto Sans JP", "sans-serif"],
       },
     },
   },