uuupah/11ty_neocities
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fuck it inline css

Browse Source
This commit is contained in:
Jonathan Souter
2023-03-02 15:56:23 +10:30
parent aeb191a7e8
commit 9480620857
6 changed files with 57 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.eleventy.js
View File

@ -1,6 +1,6 @@
const htmlmin = require("html-minifier"); const htmlmin = require("html-minifier");
const rimraf = require("rimraf"); const rimraf = require("rimraf");
const cleancss = require("clean-css");
module.exports = function (eleventyConfig) { module.exports = function (eleventyConfig) {
rimraf.windows.sync("public/") rimraf.windows.sync("public/")
@ -21,7 +21,6 @@ module.exports = function (eleventyConfig) {
}); });
eleventyConfig.addTransform("htmlmin", function (content) { eleventyConfig.addTransform("htmlmin", function (content) {
// Prior to Eleventy 2.0: use this.outputPath instead
if (this.page.outputPath && this.page.outputPath.endsWith(".html")) { if (this.page.outputPath && this.page.outputPath.endsWith(".html")) {
let minified = htmlmin.minify(content, { let minified = htmlmin.minify(content, {
useShortDoctype: true, useShortDoctype: true,
@ -30,10 +29,13 @@ module.exports = function (eleventyConfig) {
}); });
return minified; return minified;
} }
return content; return content;
}); });
eleventyConfig.addFilter("cssmin", function(code) {
return new cleancss({}).minify(code).styles;
});
return { return {
passthroughFileCopy: true, passthroughFileCopy: true,
dir: { dir: {

34
package-lock.json generated
View File

@ -11,6 +11,7 @@
"dependencies": { "dependencies": {
"@11ty/eleventy": "^2.0.0", "@11ty/eleventy": "^2.0.0",
"bootstrap": "^5.2.3", "bootstrap": "^5.2.3",
"clean-css": "^5.3.2",
"html-minifier": "^4.0.0", "html-minifier": "^4.0.0",
"npm-run-all": "^4.1.5", "npm-run-all": "^4.1.5",
"rimraf": "^4.1.3", "rimraf": "^4.1.3",
@ -534,14 +535,14 @@
} }
}, },
"node_modules/clean-css": { "node_modules/clean-css": {
"version": "4.2.4", "version": "5.3.2",
"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz", "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz",
"integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==", "integrity": "sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==",
"dependencies": { "dependencies": {
"source-map": "~0.6.0" "source-map": "~0.6.0"
}, },
"engines": { "engines": {
"node": ">= 4.0" "node": ">= 10.0"
} }
}, },
"node_modules/color-convert": { "node_modules/color-convert": {
@ -1261,6 +1262,17 @@
"node": ">=6" "node": ">=6"
} }
}, },
"node_modules/html-minifier/node_modules/clean-css": {
"version": "4.2.4",
"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz",
"integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==",
"dependencies": {
"source-map": "~0.6.0"
},
"engines": {
"node": ">= 4.0"
}
},
"node_modules/html-minifier/node_modules/commander": { "node_modules/html-minifier/node_modules/commander": {
"version": "2.20.3", "version": "2.20.3",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
@ -3539,9 +3551,9 @@
} }
}, },
"clean-css": { "clean-css": {
"version": "4.2.4", "version": "5.3.2",
"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz", "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz",
"integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==", "integrity": "sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==",
"requires": { "requires": {
"source-map": "~0.6.0" "source-map": "~0.6.0"
} }
@ -4062,6 +4074,14 @@
"uglify-js": "^3.5.1" "uglify-js": "^3.5.1"
}, },
"dependencies": { "dependencies": {
"clean-css": {
"version": "4.2.4",
"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz",
"integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==",
"requires": {
"source-map": "~0.6.0"
}
},
"commander": { "commander": {
"version": "2.20.3", "version": "2.20.3",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",

1
package.json
View File

@ -13,6 +13,7 @@
"dependencies": { "dependencies": {
"@11ty/eleventy": "^2.0.0", "@11ty/eleventy": "^2.0.0",
"bootstrap": "^5.2.3", "bootstrap": "^5.2.3",
"clean-css": "^5.3.2",
"html-minifier": "^4.0.0", "html-minifier": "^4.0.0",
"npm-run-all": "^4.1.5", "npm-run-all": "^4.1.5",
"rimraf": "^4.1.3", "rimraf": "^4.1.3",

24
src/_includes/layout/base.njk
View File

@ -1,12 +1,21 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<meta property="og:image" content="/_assets/img/cropped.png" /> <meta property="og:image" content="/_assets/img/cropped.png"/>
<link rel="icon" type="image/x-icon" href="/_assets/img/fav.png"> <link rel="icon" type="image/x-icon" href="/_assets/img/fav.png">
<link rel="stylesheet" href="/_assets/css/normalize.css" /> {# <link rel="stylesheet" href="/_assets/css/normalize.css" /> #}
<link rel="stylesheet" href="/_assets/css/styles.css" /> <link rel="stylesheet" href="/_assets/css/styles.css"/>
{% set css %}
{% include "styles.css" %}
{% endset %}
<!-- feed it through our cssmin filter to minify -->
<style>
{{css | cssmin | safe}}
</style>
{% if title %} {% if title %}
<title>{{ site.title }} - {{ title }}</title> <title>{{ site.title }} - {{ title }}</title>
{% else %} {% else %}
@ -35,7 +44,6 @@
</main> </main>
<aside>{% include 'partials/sidebar.njk' %}</aside> <aside>{% include 'partials/sidebar.njk' %}</aside>
</div> </div>
</div> </div>
</body> </body>
</html> </html>

0
src/_assets/css/normalize.css → src/_includes/normalize.css vendored
View File

2
src/_assets/css/styles.css → src/_includes/styles.css
View File

@ -4,7 +4,7 @@
// Bootstrap // Bootstrap
// @import './vendor/bootstrap'; */ // @import './vendor/bootstrap'; */
/* @import './reset.css'; */ @import './normalize.css';
/* / */ /* / */