develop #149

Merged
samuel-p merged 118 commits from develop into main 2023-01-13 19:19:26 +00:00
3 changed files with 13 additions and 13 deletions
Showing only changes of commit 37efcb2075 - Show all commits

View file

@ -1,12 +1,10 @@
const pluginRev = require("eleventy-plugin-rev");
const eleventySass = require("eleventy-sass"); const eleventySass = require("eleventy-sass");
const tinyCSS = require('@sardine/eleventy-plugin-tinycss');
const tinyHTML = require('@sardine/eleventy-plugin-tinyhtml'); const tinyHTML = require('@sardine/eleventy-plugin-tinyhtml');
const site = require('./src/_data/site.js'); const site = require('./src/_data/site.js');
module.exports = function (eleventyConfig) { module.exports = function (eleventyConfig) {
eleventyConfig.addPlugin(tinyCSS, { eleventyConfig.addPlugin(pluginRev);
output: `dist/${site.lang}/`
});
eleventyConfig.addPlugin(tinyHTML); eleventyConfig.addPlugin(tinyHTML);
eleventyConfig.addPlugin(eleventySass, { eleventyConfig.addPlugin(eleventySass, {
sass: { sass: {
@ -20,7 +18,8 @@ module.exports = function (eleventyConfig) {
return data.page.filePathStem.replace(/^\/scss\//, "/css/") + ".css"; return data.page.filePathStem.replace(/^\/scss\//, "/css/") + ".css";
}; };
} }
} },
rev: true
}); });
eleventyConfig.setUseGitIgnore(false); eleventyConfig.setUseGitIgnore(false);

View file

@ -3,10 +3,12 @@
"version": "1.0.0", "version": "1.0.0",
"description": "Website for samuel-philipp.de", "description": "Website for samuel-philipp.de",
"scripts": { "scripts": {
"minify-css": "uncss -n -H dist/en/ -o dist/en/css/main-*.css dist/en/index.html",
"minify-css:de": "uncss -n -H dist/de/ -o dist/de/css/main-*.css dist/de/index.html",
"start": "eleventy --serve --watch", "start": "eleventy --serve --watch",
"start:de": "LANGUAGE=de eleventy --serve --watch", "start:de": "LANGUAGE=de eleventy --serve --watch",
"build": "npm run compile-sass && eleventy && npm run minify-css && node .compress-all.js", "build": "eleventy && npm run minify-css",
"build:de": "npm run compile-sass && eleventy && npm run minify-css && node .compress-all.js --lang de" "build:de": "LANGUAGE=de eleventy && npm run minify-css"
}, },
"author": "samuel-p", "author": "samuel-p",
"repository": { "repository": {
@ -22,18 +24,17 @@
"@node-minify/core": "^7.1.0", "@node-minify/core": "^7.1.0",
"@node-minify/crass": "^7.1.0", "@node-minify/crass": "^7.1.0",
"@node-minify/html-minifier": "^7.1.0", "@node-minify/html-minifier": "^7.1.0",
"@sardine/eleventy-plugin-tinycss": "^2.0.0", "@sardine/eleventy-plugin-tinyhtml": "^0.2.0",
"cpx": "^1.5.0", "cpx": "^1.5.0",
"eleventy-plugin-rev": "^1.0.2",
"eleventy-sass": "^2.1.6", "eleventy-sass": "^2.1.6",
"glob": "^8.0.3", "glob": "^8.0.3",
"minify": "^9.1.0", "minify": "^9.1.0",
"node-sass": "^8.0.0",
"node-sass-tilde-importer": "^1.0.2",
"postcss": "^8.4.21", "postcss": "^8.4.21",
"sass": "^1.57.1" "sass": "^1.57.1",
"uncss": "^0.17.3"
}, },
"dependencies": { "dependencies": {
"@sardine/eleventy-plugin-tinyhtml": "^0.2.0",
"bootstrap": "^5.2.3" "bootstrap": "^5.2.3"
} }
} }

View file

@ -33,7 +33,7 @@ title: {{site.title}}
<meta name="twitter:description" content="{{site.description}}"> <meta name="twitter:description" content="{{site.description}}">
<meta name="twitter:image" content="{{site.language.url}}/img/samuel-philipp.jpg"> <meta name="twitter:image" content="{{site.language.url}}/img/samuel-philipp.jpg">
<link rel="shortcut icon" href="{{site.language.url}}/img/samuel.png"> <link rel="shortcut icon" href="{{site.language.url}}/img/samuel.png">
<link rel="stylesheet" href="css/main.css"> <link rel="stylesheet" href="{{ '/css/main.css' | rev }}" >
<script async defer data-website-id="594e86a6-02bb-407d-98e0-73e31827a785" data-domains="samuel-philipp.de" <script async defer data-website-id="594e86a6-02bb-407d-98e0-73e31827a785" data-domains="samuel-philipp.de"
src="https://umami.sp-codes.de/umami.js"></script> src="https://umami.sp-codes.de/umami.js"></script>
</head> </head>