feat(11ty): Eleventy v3対応

yamadashy · Oct 5, 2024 · edf59ed · edf59ed
1 parent 59c1666
commit edf59ed
Show file tree

Hide file tree

Showing 11 changed files with 930 additions and 775 deletions.
diff --git a/package.json b/package.json
@@ -5,10 +5,10 @@
   "main": "",
   "scripts": {
     "build": "yarn feed-generate && yarn site-build",
-    "feed-generate": "node --require esbuild-register src/feed/generate-feed-command.ts",
-    "register-index": "node --require esbuild-register src/feed/register-index-command.ts",
-    "site-build": "node --require esbuild-register ./node_modules/.bin/eleventy --config=eleventy.config.ts",
-    "site-serve": "node --require esbuild-register ./node_modules/.bin/eleventy --config=eleventy.config.ts --serve",
+    "feed-generate": "tsx src/feed/generate-feed-command.ts",
+    "register-index": "tsx src/feed/register-index-command.ts",
+    "site-build": "tsx ./node_modules/.bin/eleventy --config=eleventy.config.ts",
+    "site-serve": "tsx ./node_modules/.bin/eleventy --config=eleventy.config.ts --serve",
     "lint": "biome check --write && tsc --noEmit && secretlint '**/*'",
     "test": "vitest run",
     "test-coverage": "vitest run --coverage",
@@ -21,13 +21,14 @@
   "bugs": {
     "url": "https://github.com/yamadashy/tech-blog-rss-feed/issues"
   },
+  "type": "module",
   "author": "yamadashy",
   "license": "MIT",
   "keywords": ["blog", "tech blog", "engineer blog", "engineering blog", "feed", "rss", "atom"],
   "devDependencies": {
-    "@11ty/eleventy": "^2.0.1",
-    "@11ty/eleventy-fetch": "^4.0.0",
-    "@11ty/eleventy-img": "^4.0.2",
+    "@11ty/eleventy": "^3.0.0",
+    "@11ty/eleventy-fetch": "^4.0.1",
+    "@11ty/eleventy-img": "^5.0.0",
     "@biomejs/biome": "^1.9.3",
     "@secretlint/core": "^8.3.0",
     "@secretlint/secretlint-rule-preset-recommend": "^8.3.0",
@@ -46,7 +47,6 @@
     "axios": "^1.6.0",
     "clean-css": "^5.3.3",
     "dayjs": "^1.11.10",
-    "esbuild-register": "^3.5.0",
     "fast-xml-parser": "^4.3.2",
     "feed": "^4.2.2",
     "googleapis": "^144.0.0",
@@ -60,6 +60,7 @@
     "rss-parser": "^3.12.0",
     "secretlint": "^8.3.0",
     "sharp-ico": "^0.1.5",
+    "tsx": "^4.19.1",
     "typescript": "^5.2.2",
     "vitest": "^2.0.0"
   },

diff --git a/src/common/constants.js → src/common/constants.ts b/src/common/constants.js → src/common/constants.ts
@@ -1,8 +1,7 @@
-// @ts-check
 const siteUrlStem = 'https://yamadashy.github.io/tech-blog-rss-feed';
 const siteUrl = `${siteUrlStem}/`;
 
-module.exports = {
+export default {
   // サイト設定
   siteUrl: `${siteUrl}`,
   siteUrlStem: siteUrlStem,

diff --git a/src/common/eleventy-cache-option.ts b/src/common/eleventy-cache-option.ts
@@ -1,5 +1,5 @@
 import type EleventyImage from '@11ty/eleventy-img';
-import constants from './constants';
+import constants from './constants.js';
 
 export const imageCacheOptions: EleventyImage.CacheOptions = {
   duration: '3d',

diff --git a/src/site/_data/blogFeeds.js b/src/site/_data/blogFeeds.js
@@ -1,16 +1,18 @@
-const path = require('node:path');
-const fs = require('node:fs/promises');
-const dayjs = require('dayjs');
-require('dayjs/locale/ja');
-
-dayjs.extend(require('dayjs/plugin/relativeTime'));
-dayjs.extend(require('dayjs/plugin/timezone'));
-dayjs.extend(require('dayjs/plugin/utc'));
+import dayjs from 'dayjs';
+import relativeTime from 'dayjs/plugin/relativeTime';
+import timezone from 'dayjs/plugin/timezone';
+import utc from 'dayjs/plugin/utc';
+import 'dayjs/locale/ja';
+
+dayjs.extend(relativeTime);
+dayjs.extend(timezone);
+dayjs.extend(utc);
 dayjs.locale('ja');
 dayjs.tz.setDefault('Asia/Tokyo');
 
-module.exports = async () => {
-  let blogFeeds = JSON.parse(await fs.readFile(path.join(__dirname, '../blog-feeds/blog-feeds.json')));
+export default async () => {
+  const blogFeedsModule = await import('../blog-feeds/blog-feeds.json');
+  let blogFeeds = blogFeedsModule.default;
 
   // データ調整
   for (const blogFeed of blogFeeds) {

diff --git a/src/site/_data/constants.js b/src/site/_data/constants.js
@@ -1,3 +1,3 @@
-const constants = require('../../common/constants');
+import constants from '../../common/constants.js';
 
-module.exports = constants;
+export default constants;
diff --git a/src/site/_data/currentDate.js b/src/site/_data/currentDate.js
@@ -1,3 +1,3 @@
-module.exports = () => {
+export default () => {
   return new Date().toISOString();
 };
diff --git a/src/site/_data/feedItemsChunks.js b/src/site/_data/feedItemsChunks.js
@@ -1,16 +1,18 @@
-const path = require('node:path');
-const fs = require('node:fs/promises');
-const dayjs = require('dayjs');
-require('dayjs/locale/ja');
-
-dayjs.extend(require('dayjs/plugin/relativeTime'));
-dayjs.extend(require('dayjs/plugin/timezone'));
-dayjs.extend(require('dayjs/plugin/utc'));
+import dayjs from 'dayjs';
+import 'dayjs/locale/ja';
+import relativeTime from 'dayjs/plugin/relativeTime';
+import timezone from 'dayjs/plugin/timezone';
+import utc from 'dayjs/plugin/utc';
+
+dayjs.extend(relativeTime);
+dayjs.extend(timezone);
+dayjs.extend(utc);
 dayjs.locale('ja');
 dayjs.tz.setDefault('Asia/Tokyo');
 
-module.exports = async () => {
-  const feedData = JSON.parse(await fs.readFile(path.join(__dirname, '../feeds/feed.json')));
+export default async () => {
+  const feedDataModule = await import('../feeds/feed.json');
+  const feedData = feedDataModule.default;
 
   let feedItems = feedData.items;
 

diff --git a/src/site/_data/feedItemsHot.js b/src/site/_data/feedItemsHot.js
@@ -1,19 +1,21 @@
-const path = require('node:path');
-const fs = require('node:fs/promises');
-const dayjs = require('dayjs');
-require('dayjs/locale/ja');
-
-dayjs.extend(require('dayjs/plugin/relativeTime'));
-dayjs.extend(require('dayjs/plugin/timezone'));
-dayjs.extend(require('dayjs/plugin/utc'));
+import dayjs from 'dayjs';
+import 'dayjs/locale/ja';
+import relativeTime from 'dayjs/plugin/relativeTime';
+import timezone from 'dayjs/plugin/timezone';
+import utc from 'dayjs/plugin/utc';
+
+dayjs.extend(relativeTime);
+dayjs.extend(timezone);
+dayjs.extend(utc);
 dayjs.locale('ja');
 dayjs.tz.setDefault('Asia/Tokyo');
 
 const FEED_ITEM_FILTER_DAY = 7;
 const MIN_HATENA_BOOKMARK_AMOUNT = 3;
 
-module.exports = async () => {
-  const feedData = JSON.parse(await fs.readFile(path.join(__dirname, '../feeds/feed.json')));
+export default async () => {
+  const feedDataModule = await import('../feeds/feed.json');
+  const feedData = feedDataModule.default;
 
   let feedItems = feedData.items;
 

diff --git a/src/site/_data/lastModifiedBlogsDate.js b/src/site/_data/lastModifiedBlogsDate.js
@@ -1,8 +1,6 @@
-const fs = require('node:fs/promises');
-const path = require('node:path');
-
-module.exports = async () => {
-  const feedData = JSON.parse(await fs.readFile(path.join(__dirname, '../feeds/feed.json')));
+export default async () => {
+  const feedDataModule = await import('../feeds/feed.json');
+  const feedData = feedDataModule.default;
 
   return new Date(feedData.items[0].date_published).toISOString();
 };
diff --git a/tsconfig.json b/tsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "strict": true,
     "target": "es2021",
-    "module": "commonjs",
+    "module": "esnext",
     "moduleResolution": "node",
     "esModuleInterop": true,
     "lib": ["dom", "esnext"],