feat: ESM + markdown-it-shikiji

uncenter · Jan 14, 2024 · 4bc55c5 · 4bc55c5
1 parent 5e9b15b
commit 4bc55c5
Show file tree

Hide file tree

Showing 24 changed files with 244 additions and 539 deletions.
diff --git a/cspell.config.js b/cspell.config.js
@@ -1,4 +1,4 @@
-module.exports = {
+export default {
 	version: '0.2',
 	language: 'en',
 	words: ['uncenter', 'eleventy', '11ty', 'umami', 'shortcodes', 'keycaps'],

diff --git a/eleventy.config.js b/eleventy.config.js
@@ -1,28 +1,35 @@
-const shortcodes = require('./utils/11ty/shortcodes.js');
-const collections = require('./utils/11ty/collections.js');
-const filters = require('./utils/11ty/filters.js');
-const transforms = require('./utils/11ty/transforms.js');
-
-const pluginTOC = require('@uncenter/eleventy-plugin-toc');
-const pluginExternalLinks = require('@aloskutov/eleventy-plugin-external-links');
-const pluginRSS = require('@ryanccn/eleventy-plugin-rss');
-const pluginShiki = require('./utils/plugins/shikiji.js');
-const pluginIcons = require('eleventy-plugin-icons');
-const { plugin: pluginValidate, zod } = require('eleventy-plugin-validate');
-
-const path = require('node:path');
-const sass = require('sass');
-const postcss = require('postcss');
-
-const markdownLibrary = require('./utils/plugins/md-library.js');
+import {
+	collections,
+	filters,
+	shortcodes,
+	transforms,
+} from './utils/11ty/index.js';
+
+import pluginTOC from '@uncenter/eleventy-plugin-toc';
+import pluginExternalLinks from '@aloskutov/eleventy-plugin-external-links';
+import pluginRSS from '@ryanccn/eleventy-plugin-rss';
+import pluginIcons from 'eleventy-plugin-icons';
+import pluginValidate from 'eleventy-plugin-validate';
+
+import markdownLibrary from './utils/plugins/md-library.js';
+
+import { z } from 'zod';
+
+import path from 'node:path';
+import * as sass from 'sass';
+import postcss from 'postcss';
+
 const isDevelopment = process.env.NODE_ENV !== 'production';
-const site = require('./site.config.js');
-require('dotenv').config();
+import { createRequire } from 'node:module';
+const require = createRequire(import.meta.url);
+
+import site from './site.config.js';
+import 'dotenv/config';
 
-const { blue } = require('kleur/colors');
+import { blue } from 'kleur/colors';
 
 /** @param {import("@11ty/eleventy").UserConfig} eleventyConfig */
-module.exports = function (eleventyConfig) {
+export default function (eleventyConfig) {
 	eleventyConfig.addGlobalData('site', site);
 	eleventyConfig.addPlugin(shortcodes);
 	eleventyConfig.addPlugin(collections);
@@ -41,9 +48,6 @@ module.exports = function (eleventyConfig) {
 		overwrite: false,
 		enableTarget: false,
 	});
-	eleventyConfig.addPlugin(pluginShiki, {
-		themes: { light: 'github-light', dark: 'github-dark' },
-	});
 	eleventyConfig.addPlugin(pluginRSS);
 	eleventyConfig.addPlugin(pluginIcons, {
 		mode: 'inline',
@@ -59,17 +63,18 @@ module.exports = function (eleventyConfig) {
 		},
 	});
 	eleventyConfig.addPlugin(pluginValidate, {
+		validator: 'zod',
 		schemas: [
 			{
 				collections: ['posts'],
-				schema: zod
+				schema: z
 					.object({
-						tags: zod.array(zod.string()),
-						title: zod.string(),
-						description: zod.string(),
-						date: zod.date(),
-						edited: zod.date(),
-						comments: zod.boolean(),
+						tags: z.array(z.string()),
+						title: z.string(),
+						description: z.string(),
+						date: z.date(),
+						edited: z.date(),
+						comments: z.boolean(),
 					})
 					.strict(),
 			},
@@ -145,4 +150,4 @@ module.exports = function (eleventyConfig) {
 		templateFormats: ['md', 'njk', '11ty.js'],
 		markdownTemplateEngine: 'njk',
 	};
-};
+}
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
 	"name": "uncenter.dev",
 	"private": true,
 	"license": "MIT",
-	"type": "commonjs",
+	"type": "module",
 	"scripts": {
 		"dev": "eleventy --serve",
 		"build": "eleventy",
@@ -11,7 +11,7 @@
 		"format": "prettier --write ."
 	},
 	"dependencies": {
-		"@11ty/eleventy": "^2.0.1",
+		"@11ty/eleventy": "3.0.0-alpha.4",
 		"@11ty/eleventy-fetch": "^4.0.0",
 		"@11ty/eleventy-img": "^3.1.8",
 		"@aloskutov/eleventy-plugin-external-links": "^2.1.0",
@@ -21,7 +21,7 @@
 		"cssnano": "^6.0.2",
 		"dotenv": "^16.3.1",
 		"eleventy-plugin-icons": "^4.4.1",
-		"eleventy-plugin-validate": "^0.0.3",
+		"eleventy-plugin-validate": "^0.1.1",
 		"execa": "^8.0.1",
 		"html-minifier": "^4.0.0",
 		"image-size": "^1.1.0",
@@ -37,17 +37,18 @@
 		"markdown-it-emoji": "^3.0.0",
 		"markdown-it-footnote": "^4.0.0",
 		"markdown-it-kbd-better": "^1.2.5",
+		"markdown-it-shikiji": "^0.9.18",
 		"markdown-it-sub": "^2.0.0",
 		"markdown-it-sup": "^2.0.0",
 		"nanohtml": "^1.10.0",
 		"postcss": "^8.4.32",
 		"sass": "^1.69.6",
-		"shikiji": "^0.9.16",
 		"simple-icons": "^10.4.0",
 		"tailwindcss": "^3.4.0",
 		"terser": "^5.26.0",
 		"turndown": "^7.1.2",
-		"yaml": "^2.3.4"
+		"yaml": "^2.3.4",
+		"zod": "^3.22.4"
 	},
 	"devDependencies": {
 		"eslint": "^8.56.0",