AstrolabeCAE/SiteWebAstrolabe
AstrolabeCAE/SiteWebAstrolabe
2
2
Fork 5
Code Issues 2 Pull Requests Packages Projects Releases 3 Activity

fix(esm): only use esm + temp fix for importing json files

Browse Source
This commit is contained in:
Florian Michaut 2024-11-22 16:58:33 +01:00
parent a0983633e2
commit 54ab6b7e73
9 changed files with 106 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
.eleventy.js
View File

@ -1,27 +1,31 @@
const rssPlugin = require('@11ty/eleventy-plugin-rss');
const syntaxHighlight = require('@11ty/eleventy-plugin-syntaxhighlight');
const fs = require('fs');
const util = require('util')
import rssPlugin from '@11ty/eleventy-plugin-rss';
import syntaxHighlight from '@11ty/eleventy-plugin-syntaxhighlight';
import fs from 'fs';
import util from 'util';
// Import filters
const dateFilter = require('./src/filters/date-filter.js');
const markdownFilter = require('./src/filters/markdown-filter.js');
const w3DateFilter = require('./src/filters/w3-date-filter.js');
import dateFilter from './src/filters/date-filter.js';
import markdownFilter from './src/filters/markdown-filter.js';
import w3DateFilter from './src/filters/w3-date-filter.js';
// Import transforms
const htmlMinTransform = require('./src/transforms/html-min-transform.js');
const parseTransform = require('./src/transforms/parse-transform.js');
import htmlMinTransform from './src/transforms/html-min-transform.js';
import parseTransform from './src/transforms/parse-transform.js';
// Import data files
import {createRequire} from 'node:module';
const require = createRequire(import.meta.url);
// need this because of issue when using ESM : https://github.com/11ty/eleventy-dependency-tree-esm/issues/2
// This will get soon resolved
const site = require('./src/_data/site.json');
module.exports = function(config) {
export default function(config) {
// Filters
config.addFilter('dateFilter', dateFilter);
config.addFilter('markdownFilter', markdownFilter);
config.addFilter('w3DateFilter', w3DateFilter);
config.addFilter('dump', obj => {
return util.inspect(obj)
return util.inspect(obj);
});
// Layout aliases
@ -50,9 +54,7 @@ module.exports = function(config) {
const eventPosts = post => post.data.type === 'event';
config.addCollection('posts', collection => {
return [
...collection.getFilteredByGlob('./src/posts/*.md')
].reverse();
return [...collection.getFilteredByGlob('./src/posts/*.md')].reverse();
});
config.addCollection('news', collection => {
return [
@ -70,54 +72,57 @@ module.exports = function(config) {
.slice(0, site.maxNewsPerPage);
});
config.addCollection('members', collection => {
return [...collection.getFilteredByGlob("./src/members/*.md")];
return [...collection.getFilteredByGlob('./src/members/*.md')];
});
config.addCollection('profiles', collection => {
return [...collection.getFilteredByGlob("./src/members/*.md")]
return [...collection.getFilteredByGlob('./src/members/*.md')]
.reverse()
.slice(0, site.maxProfilePreview)
;
.slice(0, site.maxProfilePreview);
});
config.addCollection("tagsList", function(collectionApi) {
config.addCollection('tagsList', function(collectionApi) {
const tagsList = new Set();
collectionApi.getAll().map( item => {
if (item.data.tags) { // handle pages that don't have tags
item.data.tags.map( tag => tagsList.add(tag))
collectionApi.getAll().map(item => {
if (item.data.tags) {
// handle pages that don't have tags
item.data.tags.map(tag => tagsList.add(tag));
}
});
return tagsList;
});
config.addCollection("skillsList", function(collectionApi) {
config.addCollection('skillsList', function(collectionApi) {
const skillsList = new Set();
collectionApi.getFilteredByGlob("./src/members/*.md").map( item => {
if (item.data.tags) { // handle pages that don't have skills
item.data.tags.map( skill => { // exclude non related tags
collectionApi.getFilteredByGlob('./src/members/*.md').map(item => {
if (item.data.tags) {
// handle pages that don't have skills
item.data.tags.map(skill => {
// exclude non related tags
if (['post', 'news', 'event'].indexOf(skill) == -1) {
skillsList.add(skill)
skillsList.add(skill);
}
})
});
}
});
return skillsList;
});
config.addCollection("membersLocations", function(collectionApi) {
return collectionApi.getFilteredByGlob("./src/members/*.md")
config.addCollection('membersLocations', function(collectionApi) {
return collectionApi
.getFilteredByGlob('./src/members/*.md')
.filter(item => typeof item.data.location !== 'undefined')
.map( member => {
.map(member => {
return {
name: member.data.name,
url: member.data.url,
location: member.data.location,
location: member.data.location
};
});
});
config.addCollection('customers', collection => {
return [...collection.getFilteredByGlob("./src/customers/*.md")]
return [...collection.getFilteredByGlob('./src/customers/*.md')]
.reverse()
.slice(0, site.maxCustomerPerPage);
});
config.addCollection('partners', collection => {
return [...collection.getFilteredByGlob("./src/partners/*.md")]
return [...collection.getFilteredByGlob('./src/partners/*.md')]
.reverse()
.slice(0, site.maxPartnerPerPage);
});
@ -146,6 +151,6 @@ module.exports = function(config) {
input: 'src',
output: 'dist'
},
passthroughFileCopy: true,
passthroughFileCopy: true
};
};
}

1
package.json
View File

@ -3,6 +3,7 @@
"version": "0.1.0",
"description": "Site web de la coopérative Astrolabe CAE",
"main": "index.js",
"type": "module",
"dependencies": {
"@11ty/eleventy": "^3.0.0",
"@11ty/eleventy-plugin-rss": "^2.0.2",

7
src/_data/styleguide.js
View File

@ -1,4 +1,9 @@
import tokens from './tokens.json' with { type: "json" };
import {createRequire} from 'node:module';
const require = createRequire(import.meta.url);
// need this because of issue when using ESM : https://github.com/11ty/eleventy-dependency-tree-esm/issues/2
// This will get soon resolved
const tokens = require('./tokens.json');
export default {
colors() {

23
src/filters/date-filter.js
View File

@ -5,13 +5,28 @@ const appendSuffix = n => {
return n + (s[(v - 20) % 10] || s[v] || s[0]);
};
module.exports = function dateFilter(value) {
export default function dateFilter(value) {
const dateObject = new Date(value);
// const months = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
const months = ['janv.', 'févr.', 'mars', 'avr.', 'mai', 'juin', 'juill.', 'août', 'sept.', 'oct.', 'nov.', 'déc.'];
const months = [
'janv.',
'févr.',
'mars',
'avr.',
'mai',
'juin',
'juill.',
'août',
'sept.',
'oct.',
'nov.',
'déc.'
];
const dayWithSuffix = appendSuffix(dateObject.getDate());
// return `${dayWithSuffix} ${months[dateObject.getMonth()]} ${dateObject.getFullYear()}`;
return `${dateObject.getDate()} ${months[dateObject.getMonth()]} ${dateObject.getFullYear()}`;
};
return `${dateObject.getDate()} ${
months[dateObject.getMonth()]
} ${dateObject.getFullYear()}`;
}

10
src/filters/markdown-filter.js
View File

@ -1,9 +1,11 @@
const markdownIt = require('markdown-it')({
import markdownIt from 'markdown-it';
const m = markdownIt({
html: true,
breaks: true,
linkify: true
});
module.exports = function markdown(value) {
return markdownIt.render(value);
};
export default function markdown(value) {
return m.render(value);
}

4
src/filters/w3-date-filter.js
View File

@ -1,5 +1,5 @@
module.exports = function w3cDate(value) {
export default function w3cDate(value) {
const dateObject = new Date(value);
return dateObject.toISOString();
};
}

6
src/transforms/html-min-transform.js
View File

@ -1,6 +1,6 @@
const htmlmin = require('html-minifier');
import htmlmin from 'html-minifier';
module.exports = function htmlMinTransform(value, outputPath) {
export default function htmlMinTransform(value, outputPath) {
if (outputPath.indexOf('.html') > -1) {
let minified = htmlmin.minify(value, {
useShortDoctype: true,
@ -11,4 +11,4 @@ module.exports = function htmlMinTransform(value, outputPath) {
return minified;
}
return value;
};
}

21
src/transforms/parse-transform.js
View File

@ -1,17 +1,20 @@
const jsdom = require('@tbranyen/jsdom');
const {JSDOM} = jsdom;
const minify = require('../utils/minify.js');
const slugify = require('slugify');
const getSize = require('image-size');
import {JSDOM} from '@tbranyen/jsdom';
import minify from '../utils/minify.js';
import slugify from 'slugify';
import getSize from 'image-size';
module.exports = function(value, outputPath) {
export default function(value, outputPath) {
if (outputPath.endsWith('.html')) {
const DOM = new JSDOM(value, {
resources: 'usable'
});
const document = DOM.window.document;
const articleImages = [...document.querySelectorAll('main section:not(.process-cae, .presentation, .member) article img, .intro img')];
const articleImages = [
...document.querySelectorAll(
'main section:not(.process-cae, .presentation, .member) article img, .intro img'
)
];
const articleHeadings = [
...document.querySelectorAll('main article h2, main article h3')
];
@ -27,7 +30,7 @@ module.exports = function(value, outputPath) {
const dimensions = getSize('src' + file);
image.setAttribute('width', dimensions.width);
image.setAttribute('height', dimensions.height);;
image.setAttribute('height', dimensions.height);
}
// Replace p tags by figure tag for img
@ -86,4 +89,4 @@ module.exports = function(value, outputPath) {
return '<!DOCTYPE html>\r\n' + document.documentElement.outerHTML;
}
return value;
};
}

4
src/utils/minify.js
View File

@ -1,3 +1,3 @@
module.exports = function minify(input) {
export default function minify(input) {
return input.replace(/\s{2,}/g, '').replace(/\'/g, '"');
};
}