Skip to content

Commit 948b13a

Browse files
committed
[WIP] Upgrade to Eleventy 3.0.0
1 parent e9a6d31 commit 948b13a

25 files changed

+2341
-1573
lines changed

.eslintrc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,12 @@
1313
"sort-imports": ["error", {"ignoreDeclarationSort": true}],
1414
"etc/prefer-interface": ["error"],
1515
},
16+
"overrides": [
17+
{
18+
"files": ["*.js"],
19+
"rules": {
20+
"@typescript-eslint/explicit-function-return-type": "off",
21+
},
22+
},
23+
],
1624
}
File renamed without changes.

babel.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
module.exports = {
1+
export default {
22
presets: ['@babel/preset-typescript'],
33
};

eleventy.config.js

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,27 @@
11
'use strict';
22

3-
const {EleventyRenderPlugin} = require('@11ty/eleventy');
4-
const {
3+
import {EleventyRenderPlugin} from '@11ty/eleventy';
4+
import {
55
absoluteUrl,
66
convertHtmlToAbsoluteUrls,
77
dateToRfc3339,
88
getNewestCollectionItemDate,
9-
} = require('@11ty/eleventy-plugin-rss');
10-
const syntaxHighlight = require('@11ty/eleventy-plugin-syntaxhighlight');
11-
const yaml = require('js-yaml');
9+
} from '@11ty/eleventy-plugin-rss';
10+
import syntaxHighlight from '@11ty/eleventy-plugin-syntaxhighlight';
11+
import * as yaml from 'js-yaml';
1212

13-
const componentsPlugin =
14-
require('./source/helpers/components/index.ts').default;
15-
const datesPlugin = require('./source/helpers/dates.ts').default;
16-
const {liquidEngine, markdownEngine} = require('./source/helpers/engines.ts');
17-
const pagesPlugin = require('./source/helpers/pages.ts').default;
18-
const typePlugin = require('./source/helpers/type.ts').default;
19-
const functionPlugin = require('./source/helpers/function.ts').default;
13+
import componentsPlugin from './source/helpers/components/index.ts';
14+
import datesPlugin from './source/helpers/dates.ts';
15+
import {liquidEngine, markdownEngine} from './source/helpers/engines.ts';
16+
import pagesPlugin from './source/helpers/pages.ts';
17+
import typePlugin from './source/helpers/type.ts';
18+
import functionPlugin from './source/helpers/function.ts';
2019

21-
/** @param {import('@11ty/eleventy').UserConfig} eleventyConfig */
22-
module.exports = eleventyConfig => {
20+
/**
21+
* @param {import('@11ty/eleventy').UserConfig} eleventyConfig
22+
* @returns {void}
23+
*/
24+
export default function (eleventyConfig) {
2325
eleventyConfig.addPassthroughCopy('source/assets/dist');
2426
eleventyConfig.addPassthroughCopy('source/assets/img');
2527
eleventyConfig.addPassthroughCopy('source/favicon.ico');
@@ -35,10 +37,10 @@ module.exports = eleventyConfig => {
3537
eleventyConfig.setLibrary('liquid', liquidEngine);
3638
eleventyConfig.setLibrary('md', markdownEngine);
3739
eleventyConfig.addDataExtension('yml, yaml', contents => yaml.load(contents));
38-
eleventyConfig.addDataExtension('ts', {
39-
parser: filepath => require(filepath),
40-
read: false,
41-
});
40+
// eleventyConfig.addDataExtension('ts', {
41+
// parser: filepath => import(filepath),
42+
// read: false,
43+
// });
4244

4345
// register filters and shortcodes
4446
eleventyConfig.addPlugin(componentsPlugin);
@@ -75,4 +77,4 @@ module.exports = eleventyConfig => {
7577
layouts: '_layouts',
7678
},
7779
};
78-
};
80+
}

0 commit comments

Comments
 (0)