Merge branch 'main' into color-config

.eslintrc.cjs → .eslintrc.js

@@ -2,7 +2,7 @@ module.exports = {
   root: true,
   parser: '@typescript-eslint/parser',
   parserOptions: {
-    sourceType: 'module',
+    sourceType: 'script',
     ecmaVersion: 2021,
     tsconfigRootDir: __dirname,
     warnOnUnsupportedTypeScriptVersion: false,
@@ -12,7 +12,7 @@ module.exports = {
     es2021: true,
     node: true,
   },
-  plugins: ['simple-import-sort', 'import', '@typescript-eslint'],
+  plugins: ['import', 'simple-import-sort', '@typescript-eslint'],
   extends: [
     'eslint:recommended',
     'plugin:import/recommended',
@@ -25,37 +25,29 @@ module.exports = {
       typescript: {
         project: ['tsconfig.json'],
       },
-      node: {
-        extensions: ['.cjs'],
-      },
     },
   },
   overrides: [
-    {
-      files: ['*.cjs'],
-      parserOptions: {
-        sourceType: 'script',
-      },
-      rules: {
-        'import/order': 1,
-        'simple-import-sort/imports': 0,
-        '@typescript-eslint/no-var-requires': 0,
-      },
-    },
     {
       files: ['*.ts'],
       parserOptions: {
+        sourceType: 'module',
         project: ['tsconfig.json'],
       },
       extends: [
         'plugin:@typescript-eslint/recommended-requiring-type-checking',
       ],
+      rules: {
+        'import/order': 0,
+        'sort-imports': 0,
+        'simple-import-sort/imports': 1,
+      },
     },
   ],
   rules: {
-    'import/order': 0,
-    'sort-imports': 0,
-    'simple-import-sort/imports': 1,
+    'import/order': 1,
+    'simple-import-sort/imports': 0,
+    '@typescript-eslint/no-var-requires': 0,
     'no-console': 1,
     'no-warning-comments': [1, { terms: ['todo', 'fixme', '@@@'] }],
   },

.prettierignore

@@ -7,6 +7,7 @@
 /_site/
 /old_source/
 /source/_data/versionCache.json
+/source/blog/*.md
 coverage/
 node_modules/
 source/assets/dist/

babel.config.js

@@ -1,3 +1,3 @@
-export default {
+module.exports = {
   presets: ['@babel/preset-typescript'],
 };

eleventy.config.js

@@ -0,0 +1,49 @@
+'use strict';
+
+const { EleventyRenderPlugin } = require('@11ty/eleventy');
+const syntaxHighlight = require('@11ty/eleventy-plugin-syntaxhighlight');
+const yaml = require('js-yaml');
+
+const componentsPlugin =
+  require('./source/helpers/components/index.ts').default;
+const datesPlugin = require('./source/helpers/dates.ts').default;
+const { liquidEngine, markdownEngine } = require('./source/helpers/engines.ts');
+const pagesPlugin = require('./source/helpers/pages.ts').default;
+const typePlugin = require('./source/helpers/type.ts').default;
+
+/** @param {import('@11ty/eleventy').UserConfig} eleventyConfig */
+module.exports = (eleventyConfig) => {
+  eleventyConfig.addPassthroughCopy('source/assets/dist');
+  eleventyConfig.addPassthroughCopy('source/assets/img');
+  eleventyConfig.addPassthroughCopy('source/favicon.ico');
+
+  eleventyConfig.setUseGitIgnore(false);
+  eleventyConfig.watchIgnores.add('source/_data/versionCache.json');
+
+  eleventyConfig.setLibrary('liquid', liquidEngine);
+  eleventyConfig.setLibrary('md', markdownEngine);
+  eleventyConfig.addDataExtension('yml, yaml', (contents) =>
+    yaml.load(contents),
+  );
+
+  // register filters and shortcodes
+  eleventyConfig.addPlugin(componentsPlugin);
+  eleventyConfig.addPlugin(datesPlugin);
+  eleventyConfig.addPlugin(pagesPlugin);
+  eleventyConfig.addPlugin(typePlugin);
+
+  // other plugins
+  eleventyConfig.addPlugin(EleventyRenderPlugin);
+  eleventyConfig.addPlugin(syntaxHighlight);
+
+  eleventyConfig.setQuietMode(true);
+
+  // settings
+  return {
+    dir: {
+      input: 'source',
+      includes: '_includes',
+      layouts: '_layouts',
+    },
+  };
+};

package.json

@@ -14,7 +14,6 @@
     "node": "^16",
     "yarn": "^3"
   },
-  "type": "module",
   "packageManager": "yarn@3.3.1",
   "scripts": {
     "serve": "run-p 'watch:**'",
@@ -25,8 +24,8 @@
     "build-dev:scripts": "rollup -c",
     "build-prod:scripts": "BABEL_ENV=production rollup -c",
     "watch:scripts": "npm run build-dev:scripts -- -w",
-    "build:11ty": "eleventy",
-    "watch:11ty": "eleventy --serve --incremental",
+    "build:11ty": "NODE_OPTIONS='-r ts-node/register' eleventy",
+    "watch:11ty": "yarn build:11ty --serve --incremental",
     "tsc": "tsc",
     "prettier": "prettier --write .",
     "prettier:ci": "prettier --check .",
@@ -41,27 +40,30 @@
   "devDependencies": {
     "@11ty/eleventy": "^2.0.0",
     "@11ty/eleventy-plugin-syntaxhighlight": "^4.2.0",
-    "@babel/core": "^7.20.12",
+    "@babel/core": "^7.21.0",
     "@babel/preset-env": "^7.20.2",
-    "@babel/preset-typescript": "^7.18.6",
+    "@babel/preset-typescript": "^7.21.0",
     "@rollup/plugin-babel": "^6.0.3",
     "@rollup/plugin-commonjs": "^24.0.1",
     "@rollup/plugin-inject": "^5.0.3",
     "@rollup/plugin-node-resolve": "^15.0.1",
     "@rollup/plugin-terser": "^0.4.0",
     "@types/jquery": "^3.5.16",
     "@types/jqueryui": "^1.12.16",
+    "@types/markdown-it": "^12.2.3",
+    "@types/markdown-it-attrs": "^4.1.0",
     "@types/node": "^16",
-    "@typescript-eslint/eslint-plugin": "^5.52.0",
-    "@typescript-eslint/parser": "^5.52.0",
+    "@types/prismjs": "^1.26.0",
+    "@typescript-eslint/eslint-plugin": "^5.54.1",
+    "@typescript-eslint/parser": "^5.54.1",
     "date-fns": "^2.29.3",
     "deep-equal": "^2.2.0",
-    "eslint": "^8.34.0",
-    "eslint-config-prettier": "^8.6.0",
+    "eslint": "^8.36.0",
+    "eslint-config-prettier": "^8.7.0",
     "eslint-import-resolver-typescript": "^3.5.3",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-simple-import-sort": "^10.0.0",
-    "jquery": "^3.6.3",
+    "jquery": "^3.6.4",
     "jquery-ui": "^1.13.2",
     "js-yaml": "^4.1.0",
     "kleur": "^4.1.5",
@@ -72,12 +74,15 @@
     "netlify-plugin-11ty": "^1.3.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.8.4",
-    "rollup": "^3.17.2",
-    "sass": "^1.58.3",
-    "semver-parser": "^4.1.2",
+    "prismjs": "^1.29.0",
+    "rollup": "^3.19.1",
+    "sass": "^1.59.2",
+    "semver-parser": "^4.1.3",
     "stylelint": "^15.2.0",
     "stylelint-config-standard-scss": "^7.0.1",
-    "typedoc": "^0.23.25",
+    "truncate-html": "^1.0.4",
+    "ts-node": "^10.9.1",
+    "typedoc": "^0.23.26",
     "typescript": "^4.9.5",
     "typogr": "^0.6.8"
   },

rollup.config.js

@@ -1,9 +1,9 @@
-import { babel } from '@rollup/plugin-babel';
-import commonjs from '@rollup/plugin-commonjs';
-import inject from '@rollup/plugin-inject';
-import { nodeResolve } from '@rollup/plugin-node-resolve';
-import terser from '@rollup/plugin-terser';
-import { defineConfig } from 'rollup';
+const { babel } = require('@rollup/plugin-babel');
+const commonjs = require('@rollup/plugin-commonjs');
+const inject = require('@rollup/plugin-inject');
+const { nodeResolve } = require('@rollup/plugin-node-resolve');
+const terser = require('@rollup/plugin-terser');
+const { defineConfig } = require('rollup');
 
 const prod = process.env.BABEL_ENV === 'production';
 
@@ -24,7 +24,7 @@ if (prod) {
   plugins.push(terser());
 }
 
-export default defineConfig({
+module.exports = defineConfig({
   input: 'source/assets/js/sass.ts',
   output: {
     file: 'source/assets/dist/js/sass.js',

source/@types/markdown-it-deflist.d.ts

@@ -0,0 +1,5 @@
+declare module 'markdown-it-deflist' {
+  import MarkdownIt from 'markdown-it';
+
+  export default function deflist(md: MarkdownIt): void;
+}

source/@types/typogr.d.ts

@@ -0,0 +1,3 @@
+declare module 'typogr' {
+  export function typogrify(src: string): string;
+}