Merge branch 'main' into dependabot/npm_and_yarn/marked-9.1.2

package.json

@@ -3,31 +3,28 @@
   "version": "0.0.0",
   "type": "module",
   "scripts": {
-    "dev": "bun run prebuild && wmr",
-    "build": "tsc && NODE_ENV=production && bun run prebuild && wmr build --prerender && bun run make-feed",
+    "dev": "wmr",
+    "build": "NODE_ENV=production wmr build --prerender",
     "serve": "wmr serve",
-    "lint": "eslint './**/*.{js,jsx,ts,tsx}'",
-    "gen": "bun run ./scripts/gen-template.js",
-    "prebuild": "bun run ./scripts/pre-build.js",
-    "make-feed": "bun run ./scripts/make-feed.js"
+    "lint": "eslint './{public,src}/**/*.{js,jsx,ts,tsx}'",
+    "gen": "bun run ./scripts/gen-template.js"
   },
   "alias": {
     "react": "preact/compat"
   },
   "devDependencies": {
-    "@types/node": "18.11.9",
-    "@typescript-eslint/eslint-plugin": "5.62.0",
-    "@typescript-eslint/parser": "5.59.2",
-    "eslint": "8.49.0",
+    "@typescript-eslint/eslint-plugin": "6.8.0",
+    "@typescript-eslint/parser": "6.8.0",
+    "eslint": "8.52.0",
     "eslint-config-preact": "1.3.0",
-    "typescript": "5.1.3",
+    "typescript": "5.2.2",
     "wmr": "3.8.0"
   },
   "dependencies": {
     "hoofd": "1.7.0",
     "marked": "9.1.2",
-    "preact": "10.17.1",
-    "preact-iso": "2.3.1"
+    "preact": "10.18.1",
+    "preact-iso": "2.5.0"
   },
   "author": "takurinton",
   "eslintConfig": {

scripts/make-feed.js → plugins/feed/index.js

@@ -1,6 +1,19 @@
-import { writeFileSync, readFileSync, readdirSync } from "fs";
+import { writeFileSync, readFileSync } from "fs";
 
-(() => {
+export default function feedPlugin({ plugins, cwd, prod }, opts) {
+  plugins.push(feed({ cwd, prod, ...opts }));
+}
+
+function feed() {
+  return {
+    name: "feed",
+    async load() {
+      makeFeed();
+    },
+  };
+}
+
+function makeFeed() {
   const posts = JSON.parse(
     readFileSync(`${process.cwd()}/public/contents/posts.json`)
   );
@@ -29,7 +42,7 @@ import { writeFileSync, readFileSync, readdirSync } from "fs";
       <title>${content.title} | たくりんとんのブログ</title>
       <link>https://blog.takurinton.dev/post/${content.id}</link>
       <pubDate>${new Date(content.created_at).toUTCString()}</pubDate>
-      <description>${content.content}</description>
+      <description>${content.description}</description>
       <guid>https://blog.takurinton.dev/post/${content.id}</guid>
       </item>`
     )
@@ -41,4 +54,4 @@ import { writeFileSync, readFileSync, readdirSync } from "fs";
     if (err) throw err;
     console.log(`posts.json updated.`);
   });
-})();
+}

scripts/pre-build.js → plugins/sentence/index.js

@@ -1,20 +1,34 @@
 import { writeFileSync, readFileSync, readdirSync } from "fs";
 import { marked } from "marked";
 
-const markdownToString = (markdown) => {
+export default function sentensePlugin({ plugins, cwd, prod }, opts) {
+  plugins.push(sentense({ cwd, prod, ...opts }));
+}
+
+function sentense() {
+  return {
+    name: "feed",
+    enforce: "pre",
+    configResolved() {
+      makeListObject();
+    },
+  };
+}
+
+function markdownToString(markdown) {
   const html = marked(markdown);
   const notTag = html.replace(/<("[^"]*"|'[^']*'|[^'">])*>/g, "");
   const breakToSpace = notTag.replace(/(\r\n|\n|\r)/gm, " ");
   const removeTwitter = breakToSpace.replace(/@twitter\[.*\]/g, "");
   const removeOg = removeTwitter.replace(/@og\[.*\]/g, "");
   return removeOg;
-};
+}
 
 const FRONTMATTER = /---\n([\s\S]*?)\n---\n\n([\s\S]*)/;
 const FRONTMATTER_LIST =
   /id:([\s\S]*)\ntitle:([\s\S]*)\ndescription:([\s\S]*)\ncreated_at:([\s\S]*)/;
 
-(() => {
+function makeListObject() {
   const files = readdirSync(`${process.cwd()}/public/contents`);
   const posts = files.filter((file) => file.match(/\.md$/));
   const contents = posts.map((post) => {
@@ -50,4 +64,4 @@ const FRONTMATTER_LIST =
       console.log(`posts.json updated.`);
     }
   );
-})();
+}