From a28863decfbfe70d51d6b5386c79566a3f62789f Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sun, 22 Nov 2020 15:00:45 +0100 Subject: [PATCH] restructure assets --- .gitignore | 5 +- {static => assets}/js/clipboard.min.js | 0 {static => assets}/js/mermaid.min.js | 0 {static => assets}/js/mermaid.min.js.map | 0 gulpfile.js | 21 ++- package-lock.json | 170 +++++++++++++++++++++++ package.json | 2 + src/sass/_base.scss | 2 +- static/assets.json | 8 ++ 9 files changed, 199 insertions(+), 9 deletions(-) rename {static => assets}/js/clipboard.min.js (100%) rename {static => assets}/js/mermaid.min.js (100%) rename {static => assets}/js/mermaid.min.js.map (100%) create mode 100644 static/assets.json diff --git a/.gitignore b/.gitignore index 471d59c..bc59a90 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ .swp .env* dist/ -tmp/ +build/ node_modules/ lhci_reports/ exampleSite/themes/ @@ -10,9 +10,10 @@ exampleSite/public/ # auto-generated files layouts/partials/icons-svg-symbols.html +assets/*.css static/*.css !static/custom.css -static/js/*-*.js +static/js/*.js static/favicon/ static/fonts/GeekblogIcons.* resources/ diff --git a/static/js/clipboard.min.js b/assets/js/clipboard.min.js similarity index 100% rename from static/js/clipboard.min.js rename to assets/js/clipboard.min.js diff --git a/static/js/mermaid.min.js b/assets/js/mermaid.min.js similarity index 100% rename from static/js/mermaid.min.js rename to assets/js/mermaid.min.js diff --git a/static/js/mermaid.min.js.map b/assets/js/mermaid.min.js.map similarity index 100% rename from static/js/mermaid.min.js.map rename to assets/js/mermaid.min.js.map diff --git a/gulpfile.js b/gulpfile.js index 49495dc..59501c0 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -8,12 +8,13 @@ const iconfont = require("gulp-iconfont"); const realFavicon = require("gulp-real-favicon"); const path = require("path"); const fs = require("fs"); +const del = require("del"); const svgSprite = require("gulp-svg-sprite"); const rev = require("gulp-rev"); -var CSSDEST = "static/"; -var FAVICON_DATA_FILE = "tmp/faviconData.json"; +var CSSDEST = "assets/"; +var FAVICON_DATA_FILE = "build/faviconData.json"; var TIMESTAMP = Math.round(Date.now() / 1000); gulp.task("sass", function () { @@ -121,7 +122,7 @@ gulp.task("svg-sprite", function () { padding: 5, box: "content", }, - dest: "tmp/intermediate-svg", + dest: "build/intermediate-svg", }, svg: { xmlDeclaration: false, @@ -184,10 +185,10 @@ gulp.task("iconfont", function () { gulp.task("asset-rev", function () { return gulp - .src(["static/*!(custom).min.css", "static/js/*.min.js"], { + .src(["assets/*.min.css", "assets/js/*.min.js"], { base: "static", }) - .pipe(gulp.dest("tmp/assets")) + .pipe(gulp.dest("build/assets")) .pipe(rev()) .pipe(gulp.dest("static")) .pipe( @@ -200,11 +201,19 @@ gulp.task("asset-rev", function () { .pipe(gulp.dest("data")); }); +gulp.task("asset-rm", function () { + return gulp + .src(["build/assets", "static/js/*-*.js", "static/*-*.js"], { read: false }) + .pipe(clean()); +}); + gulp.task( "default", gulp.series("sass", "svg-sprite", "iconfont", "favicon-generate", "asset-rev") ); +gulp.task("asset", gulp.series("asset-rev", "asset-rm")); + gulp.task("devel", function () { - gulp.watch("src/sass/**/*.*css", gulp.series("sass")); + gulp.watch("src/sass/**/*.*css", gulp.series("sass", "asset")); }); diff --git a/package-lock.json b/package-lock.json index bdcc4b4..8090cd4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -275,6 +275,15 @@ } } }, + "array-union": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", + "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", + "dev": true, + "requires": { + "array-uniq": "^1.0.1" + } + }, "array-uniq": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", @@ -1238,6 +1247,28 @@ } } }, + "del": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz", + "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=", + "dev": true, + "requires": { + "globby": "^6.1.0", + "is-path-cwd": "^1.0.0", + "is-path-in-cwd": "^1.0.0", + "p-map": "^1.1.1", + "pify": "^3.0.0", + "rimraf": "^2.2.8" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true + } + } + }, "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -2698,6 +2729,19 @@ "which": "^1.2.14" } }, + "globby": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", + "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", + "dev": true, + "requires": { + "array-union": "^1.0.1", + "glob": "^7.0.3", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" + } + }, "globule": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.1.tgz", @@ -2795,6 +2839,71 @@ } } }, + "gulp-clean": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/gulp-clean/-/gulp-clean-0.4.0.tgz", + "integrity": "sha512-DARK8rNMo4lHOFLGTiHEJdf19GuoBDHqGUaypz+fOhrvOs3iFO7ntdYtdpNxv+AzSJBx/JfypF0yEj9ks1IStQ==", + "dev": true, + "requires": { + "fancy-log": "^1.3.2", + "plugin-error": "^0.1.2", + "rimraf": "^2.6.2", + "through2": "^2.0.3", + "vinyl": "^2.1.0" + }, + "dependencies": { + "arr-diff": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz", + "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=", + "dev": true, + "requires": { + "arr-flatten": "^1.0.1", + "array-slice": "^0.2.3" + } + }, + "arr-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz", + "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=", + "dev": true + }, + "array-slice": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz", + "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=", + "dev": true + }, + "extend-shallow": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz", + "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=", + "dev": true, + "requires": { + "kind-of": "^1.1.0" + } + }, + "kind-of": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz", + "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=", + "dev": true + }, + "plugin-error": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz", + "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=", + "dev": true, + "requires": { + "ansi-cyan": "^0.1.1", + "ansi-red": "^0.1.1", + "arr-diff": "^1.0.1", + "arr-union": "^2.0.1", + "extend-shallow": "^1.1.2" + } + } + } + }, "gulp-clean-css": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/gulp-clean-css/-/gulp-clean-css-4.3.0.tgz", @@ -3485,6 +3594,30 @@ } } }, + "is-path-cwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz", + "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=", + "dev": true + }, + "is-path-in-cwd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz", + "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==", + "dev": true, + "requires": { + "is-path-inside": "^1.0.0" + } + }, + "is-path-inside": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", + "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", + "dev": true, + "requires": { + "path-is-inside": "^1.0.1" + } + }, "is-plain-obj": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", @@ -5038,6 +5171,12 @@ "p-limit": "^2.0.0" } }, + "p-map": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz", + "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==", + "dev": true + }, "p-try": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", @@ -5109,6 +5248,12 @@ "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true }, + "path-is-inside": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", + "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=", + "dev": true + }, "path-key": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", @@ -5627,6 +5772,31 @@ "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", "dev": true }, + "rev-del": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/rev-del/-/rev-del-2.0.0.tgz", + "integrity": "sha512-2VavvEMPmvciWcFtHLOJ72qg/OigywOvt+2yrhSXW3ZxNeCfVbCy6Ja0npdSlZiSVBMok7R8RriHeSCx6soEUQ==", + "dev": true, + "requires": { + "del": "^3.0.0", + "lodash": "^4.17.11", + "mocha": "^5.2.0", + "should": "^13.2.3", + "through2": "^3.0.0" + }, + "dependencies": { + "through2": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz", + "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==", + "dev": true, + "requires": { + "inherits": "^2.0.4", + "readable-stream": "2 || 3" + } + } + } + }, "rev-hash": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/rev-hash/-/rev-hash-2.0.0.tgz", diff --git a/package.json b/package.json index 9de69e3..a04b69d 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "devDependencies": { "gulp": "4.0.2", "gulp-autoprefixer": "7.0.1", + "gulp-clean": "^0.4.0", "gulp-clean-css": "4.3.0", "gulp-concat": "2.6.1", "gulp-iconfont": "10.0.3", @@ -26,6 +27,7 @@ "gulp-svg-sprite": "1.5.0", "prettier": "2.1.2", "prettier-plugin-go-template": "0.0.10", + "rev-del": "^2.0.0", "run-sequence": "2.2.1" }, "browserslist": [ diff --git a/src/sass/_base.scss b/src/sass/_base.scss index bce324c..b37c231 100644 --- a/src/sass/_base.scss +++ b/src/sass/_base.scss @@ -1,5 +1,5 @@ html { - font-size: $font-size-base; + font-size: 3rem; letter-spacing: 0.33px; scroll-behavior: smooth; } diff --git a/static/assets.json b/static/assets.json new file mode 100644 index 0000000..ccec2ab --- /dev/null +++ b/static/assets.json @@ -0,0 +1,8 @@ +{ + "custom.css": "custom.css", + "js/clipboard.min.js": "js/clipboard-f06c52bfdd.min.js", + "js/mermaid.min.js": "js/mermaid-ffd6bf77ad.min.js", + "main.min.css": "main-85732d8853.min.css", + "mobile.min.css": "mobile-dc4707ee5b.min.css", + "print.min.css": "print-86167e859a.min.css" +} \ No newline at end of file