diff --git a/README.adoc b/README.adoc index c37e2df..8e213e2 100644 --- a/README.adoc +++ b/README.adoc @@ -1,6 +1,6 @@ == Antmarky -Antmarky is a static-site generator for https://docs.asciidoctor.org/asciidoc/latest[`Asciidoctor`^] based on Node.js and EJS. +Antmarky is a static-site generator for https://docs.asciidoctor.org/asciidoc/latest[`Asciidoctor`^] based on Node.js and Handlebars. https://github.com/bandantonio/antmarky/actions/workflows/antmarky.yml[image:https://github.com/bandantonio/antmarky/actions/workflows/antmarky.yml/badge.svg?branch=main[antmarky]^] https://coveralls.io/github/bandantonio/antmarky?branch=main[image:https://coveralls.io/repos/github/bandantonio/antmarky/badge.svg?branch=main[Coverage diff --git a/esbuild.config.mjs b/esbuild.config.mjs index 7e72f87..1580497 100644 --- a/esbuild.config.mjs +++ b/esbuild.config.mjs @@ -4,7 +4,7 @@ import * as esbuild from 'esbuild'; const bundleProject = async () => { const esbuildContext = { entryPoints: ['src/index.ts'], - external: ['esbuild', 'asciidoctor'], + external: ['esbuild', 'asciidoctor', 'handlebars'], outfile: 'bin/index.cjs', platform: 'node', logLevel: 'info', diff --git a/package-lock.json b/package-lock.json index 798b388..59ad754 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,18 +15,16 @@ "antmarky": "bin/index.cjs" }, "devDependencies": { - "@asciidoctor/cli": "^4.0.0", - "@types/ejs": "^3.1.1", "@types/fs-extra": "^11.0.1", "@types/mock-fs": "^4.13.1", "@types/node": "^18.11.17", "@vitest/coverage-istanbul": "^0.34.6", - "asciidoctor": "3.0.2", + "asciidoctor": "3.0.0", "auto-changelog": "^2.4.0", - "ejs": "^3.1.6", "esbuild": "^0.19.5", "fs-extra": "^11.1.1", "glob": "^10.3.10", + "handlebars": "^4.7.8", "mock-fs": "^5.1.2", "semistandard": "^16.0.1", "tsx": "^3.14.0", @@ -58,41 +56,46 @@ } }, "node_modules/@asciidoctor/cli": { - "version": "4.0.0", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@asciidoctor/cli/-/cli-3.5.0.tgz", + "integrity": "sha512-/VMHXcZBnZ9vgWfmqk9Hu0x0gMjPLup0YGq/xA8qCQuk11kUIZNMVQwgSsIUzOEwJqIUD7CgncJdtfwv1Ndxuw==", "dev": true, - "license": "MIT", "dependencies": { - "yargs": "17.3.1" + "yargs": "16.2.0" }, "bin": { "asciidoctor": "bin/asciidoctor", "asciidoctorjs": "bin/asciidoctor" }, "engines": { - "node": ">=16", - "npm": ">=8.0.0" + "node": ">=8.11", + "npm": ">=5.0.0" }, "peerDependencies": { - "@asciidoctor/core": ">=2 <4" + "@asciidoctor/core": "^2.0.0-rc.1" } }, "node_modules/@asciidoctor/core": { - "version": "3.0.2", + "version": "2.2.6", + "resolved": "https://registry.npmjs.org/@asciidoctor/core/-/core-2.2.6.tgz", + "integrity": "sha512-TmB2K5UfpDpSbCNBBntXzKHcAk2EA3/P68jmWvmJvglVUdkO9V6kTAuXVe12+h6C4GK0ndwuCrHHtEVcL5t6pQ==", "dev": true, - "license": "MIT", + "peer": true, "dependencies": { - "@asciidoctor/opal-runtime": "3.0.1", - "unxhr": "1.2.0" + "asciidoctor-opal-runtime": "0.3.3", + "unxhr": "1.0.1" }, "engines": { - "node": ">=16", - "npm": ">=8" + "node": ">=8.11", + "npm": ">=5.0.0", + "yarn": ">=1.1.0" } }, "node_modules/@asciidoctor/opal-runtime": { "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@asciidoctor/opal-runtime/-/opal-runtime-3.0.1.tgz", + "integrity": "sha512-iW7ACahOG0zZft4A/4CqDcc7JX+fWRNjV5tFAVkNCzwZD+EnFolPaUOPYt8jzadc0+Bgd80cQTtRMQnaaV1kkg==", "dev": true, - "license": "MIT", "dependencies": { "glob": "8.1.0", "unxhr": "1.2.0" @@ -103,8 +106,9 @@ }, "node_modules/@asciidoctor/opal-runtime/node_modules/glob": { "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", "dev": true, - "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -121,8 +125,9 @@ }, "node_modules/@asciidoctor/opal-runtime/node_modules/minimatch": { "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", "dev": true, - "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -130,6 +135,15 @@ "node": ">=10" } }, + "node_modules/@asciidoctor/opal-runtime/node_modules/unxhr": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/unxhr/-/unxhr-1.2.0.tgz", + "integrity": "sha512-6cGpm8NFXPD9QbSNx0cD2giy7teZ6xOkCUH3U89WKVkL9N9rBrWjlCwhR94Re18ZlAop4MOc3WU1M3Hv/bgpIw==", + "dev": true, + "engines": { + "node": ">=8.11" + } + }, "node_modules/@babel/code-frame": { "version": "7.22.13", "dev": true, @@ -667,19 +681,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@types/babel-types": { - "version": "7.0.14", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/babylon": { - "version": "6.16.9", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/babel-types": "*" - } - }, "node_modules/@types/chai": { "version": "4.3.10", "dev": true, @@ -693,11 +694,6 @@ "@types/chai": "*" } }, - "node_modules/@types/ejs": { - "version": "3.1.5", - "dev": true, - "license": "MIT" - }, "node_modules/@types/fs-extra": { "version": "11.0.4", "dev": true, @@ -855,30 +851,6 @@ "url": "https://opencollective.com/vitest" } }, - "node_modules/a-sync-waterfall": { - "version": "1.0.1", - "dev": true, - "license": "MIT" - }, - "node_modules/acorn": { - "version": "4.0.13", - "dev": true, - "license": "MIT", - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/acorn-globals": { - "version": "3.1.0", - "dev": true, - "license": "MIT", - "dependencies": { - "acorn": "^4.0.4" - } - }, "node_modules/acorn-walk": { "version": "8.3.0", "dev": true, @@ -902,19 +874,6 @@ "url": "https://github.com/sponsors/epoberezkin" } }, - "node_modules/align-text": { - "version": "0.1.4", - "dev": true, - "license": "MIT", - "dependencies": { - "kind-of": "^3.0.2", - "longest": "^1.0.1", - "repeat-string": "^1.5.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/ansi-colors": { "version": "4.1.3", "dev": true, @@ -1055,22 +1014,14 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/asap": { - "version": "2.0.6", - "dev": true, - "license": "MIT" - }, "node_modules/asciidoctor": { - "version": "3.0.2", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/asciidoctor/-/asciidoctor-3.0.0.tgz", + "integrity": "sha512-ppOgmac+UnMYO2T5n884+5dcCkqth6aJhIlOUENGTMri9+xa6XV+AoB4BiQCOzI9sDz/42NZ+ki+NPV3jhpbNQ==", "dev": true, - "license": "MIT", "dependencies": { - "@asciidoctor/cli": "4.0.0", - "@asciidoctor/core": "3.0.2", - "ejs": "^3.1.2", - "handlebars": "^4.7.6", - "nunjucks": "^3.2.1", - "pug": "^2.0.4" + "@asciidoctor/cli": "3.5.0", + "@asciidoctor/core": "3.0.0" }, "bin": { "asciidoctor": "bin/asciidoctor", @@ -1081,6 +1032,85 @@ "npm": ">=8" } }, + "node_modules/asciidoctor-opal-runtime": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/asciidoctor-opal-runtime/-/asciidoctor-opal-runtime-0.3.3.tgz", + "integrity": "sha512-/CEVNiOia8E5BMO9FLooo+Kv18K4+4JBFRJp8vUy/N5dMRAg+fRNV4HA+o6aoSC79jVU/aT5XvUpxSxSsTS8FQ==", + "dev": true, + "peer": true, + "dependencies": { + "glob": "7.1.3", + "unxhr": "1.0.1" + }, + "engines": { + "node": ">=8.11" + } + }, + "node_modules/asciidoctor-opal-runtime/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "peer": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/asciidoctor-opal-runtime/node_modules/glob": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", + "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", + "dev": true, + "peer": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + } + }, + "node_modules/asciidoctor-opal-runtime/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "peer": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/asciidoctor/node_modules/@asciidoctor/core": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@asciidoctor/core/-/core-3.0.0.tgz", + "integrity": "sha512-XcFpti2RSEhEgacvnd6gr+bnNGb5cyFCDRvl01opCyspQJdynCiKxreIKrVBkyYGaBOJ7BFSQY1pZkoFGOj8Lg==", + "dev": true, + "dependencies": { + "@asciidoctor/opal-runtime": "3.0.1", + "unxhr": "1.2.0" + }, + "engines": { + "node": ">=16", + "npm": ">=8" + } + }, + "node_modules/asciidoctor/node_modules/unxhr": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/unxhr/-/unxhr-1.2.0.tgz", + "integrity": "sha512-6cGpm8NFXPD9QbSNx0cD2giy7teZ6xOkCUH3U89WKVkL9N9rBrWjlCwhR94Re18ZlAop4MOc3WU1M3Hv/bgpIw==", + "dev": true, + "engines": { + "node": ">=8.11" + } + }, "node_modules/assertion-error": { "version": "1.1.0", "dev": true, @@ -1097,11 +1127,6 @@ "node": ">=8" } }, - "node_modules/async": { - "version": "3.2.5", - "dev": true, - "license": "MIT" - }, "node_modules/auto-changelog": { "version": "2.4.0", "dev": true, @@ -1139,42 +1164,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/babel-runtime": { - "version": "6.26.0", - "dev": true, - "license": "MIT", - "dependencies": { - "core-js": "^2.4.0", - "regenerator-runtime": "^0.11.0" - } - }, - "node_modules/babel-types": { - "version": "6.26.0", - "dev": true, - "license": "MIT", - "dependencies": { - "babel-runtime": "^6.26.0", - "esutils": "^2.0.2", - "lodash": "^4.17.4", - "to-fast-properties": "^1.0.3" - } - }, - "node_modules/babel-types/node_modules/to-fast-properties": { - "version": "1.0.3", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/babylon": { - "version": "6.18.0", - "dev": true, - "license": "MIT", - "bin": { - "babylon": "bin/babylon.js" - } - }, "node_modules/balanced-match": { "version": "1.0.2", "dev": true, @@ -1266,14 +1255,6 @@ "node": ">=6" } }, - "node_modules/camelcase": { - "version": "1.2.1", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/caniuse-lite": { "version": "1.0.30001561", "dev": true, @@ -1293,18 +1274,6 @@ ], "license": "CC-BY-4.0" }, - "node_modules/center-align": { - "version": "0.1.3", - "dev": true, - "license": "MIT", - "dependencies": { - "align-text": "^0.1.3", - "lazy-cache": "^1.0.3" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/chai": { "version": "4.3.10", "dev": true, @@ -1335,14 +1304,6 @@ "node": ">=4" } }, - "node_modules/character-parser": { - "version": "2.2.0", - "dev": true, - "license": "MIT", - "dependencies": { - "is-regex": "^1.0.3" - } - }, "node_modules/check-error": { "version": "1.0.3", "dev": true, @@ -1354,21 +1315,11 @@ "node": "*" } }, - "node_modules/clean-css": { - "version": "4.2.4", - "dev": true, - "license": "MIT", - "dependencies": { - "source-map": "~0.6.0" - }, - "engines": { - "node": ">= 4.0" - } - }, "node_modules/cliui": { "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", "dev": true, - "license": "ISC", "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.0", @@ -1377,16 +1328,18 @@ }, "node_modules/cliui/node_modules/ansi-regex": { "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/cliui/node_modules/ansi-styles": { "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, - "license": "MIT", "dependencies": { "color-convert": "^2.0.1" }, @@ -1399,8 +1352,9 @@ }, "node_modules/cliui/node_modules/color-convert": { "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, - "license": "MIT", "dependencies": { "color-name": "~1.1.4" }, @@ -1410,18 +1364,21 @@ }, "node_modules/cliui/node_modules/color-name": { "version": "1.1.4", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true }, "node_modules/cliui/node_modules/emoji-regex": { "version": "8.0.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true }, "node_modules/cliui/node_modules/string-width": { "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, - "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -1433,8 +1390,9 @@ }, "node_modules/cliui/node_modules/strip-ansi": { "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, - "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" }, @@ -1444,8 +1402,9 @@ }, "node_modules/cliui/node_modules/wrap-ansi": { "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, - "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -1483,28 +1442,11 @@ "dev": true, "license": "MIT" }, - "node_modules/constantinople": { - "version": "3.1.2", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/babel-types": "^7.0.0", - "@types/babylon": "^6.16.2", - "babel-types": "^6.26.0", - "babylon": "^6.18.0" - } - }, "node_modules/convert-source-map": { "version": "2.0.0", "dev": true, "license": "MIT" }, - "node_modules/core-js": { - "version": "2.6.12", - "dev": true, - "hasInstallScript": true, - "license": "MIT" - }, "node_modules/cross-spawn": { "version": "7.0.3", "dev": true, @@ -1534,14 +1476,6 @@ } } }, - "node_modules/decamelize": { - "version": "1.2.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/deep-eql": { "version": "4.1.3", "dev": true, @@ -1606,30 +1540,11 @@ "node": ">=6.0.0" } }, - "node_modules/doctypes": { - "version": "1.1.0", - "dev": true, - "license": "MIT" - }, "node_modules/eastasianwidth": { "version": "0.2.0", "dev": true, "license": "MIT" }, - "node_modules/ejs": { - "version": "3.1.9", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "jake": "^10.8.5" - }, - "bin": { - "ejs": "bin/cli.js" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/electron-to-chromium": { "version": "1.4.581", "dev": true, @@ -2529,25 +2444,6 @@ "node": "^10.12.0 || >=12.0.0" } }, - "node_modules/filelist": { - "version": "1.0.4", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "minimatch": "^5.0.1" - } - }, - "node_modules/filelist/node_modules/minimatch": { - "version": "5.1.6", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/fill-range": { "version": "7.0.1", "dev": true, @@ -2691,8 +2587,9 @@ }, "node_modules/get-caller-file": { "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true, - "license": "ISC", "engines": { "node": "6.* || 8.* || >= 10.*" } @@ -3035,11 +2932,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-buffer": { - "version": "1.1.6", - "dev": true, - "license": "MIT" - }, "node_modules/is-callable": { "version": "1.2.7", "dev": true, @@ -3076,15 +2968,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-expression": { - "version": "3.0.0", - "dev": true, - "license": "MIT", - "dependencies": { - "acorn": "~4.0.2", - "object-assign": "^4.0.1" - } - }, "node_modules/is-extglob": { "version": "2.1.1", "dev": true, @@ -3147,11 +3030,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-promise": { - "version": "2.2.2", - "dev": true, - "license": "MIT" - }, "node_modules/is-regex": { "version": "1.1.4", "dev": true, @@ -3338,114 +3216,8 @@ "@pkgjs/parseargs": "^0.11.0" } }, - "node_modules/jake": { - "version": "10.8.7", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "async": "^3.2.3", - "chalk": "^4.0.2", - "filelist": "^1.0.4", - "minimatch": "^3.1.2" - }, - "bin": { - "jake": "bin/cli.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/jake/node_modules/ansi-styles": { - "version": "4.3.0", - "dev": true, - "license": "MIT", - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/jake/node_modules/brace-expansion": { - "version": "1.1.11", - "dev": true, - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/jake/node_modules/chalk": { - "version": "4.1.2", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/jake/node_modules/color-convert": { - "version": "2.0.1", - "dev": true, - "license": "MIT", - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/jake/node_modules/color-name": { - "version": "1.1.4", - "dev": true, - "license": "MIT" - }, - "node_modules/jake/node_modules/has-flag": { - "version": "4.0.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/jake/node_modules/minimatch": { - "version": "3.1.2", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/jake/node_modules/supports-color": { - "version": "7.2.0", - "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/js-stringify": { - "version": "1.0.2", - "dev": true, - "license": "MIT" - }, - "node_modules/js-tokens": { - "version": "4.0.0", + "node_modules/js-tokens": { + "version": "4.0.0", "dev": true, "license": "MIT" }, @@ -3519,15 +3291,6 @@ "graceful-fs": "^4.1.6" } }, - "node_modules/jstransformer": { - "version": "1.0.0", - "dev": true, - "license": "MIT", - "dependencies": { - "is-promise": "^2.0.0", - "promise": "^7.0.1" - } - }, "node_modules/jsx-ast-utils": { "version": "3.3.5", "dev": true, @@ -3550,25 +3313,6 @@ "json-buffer": "3.0.1" } }, - "node_modules/kind-of": { - "version": "3.2.2", - "dev": true, - "license": "MIT", - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/lazy-cache": { - "version": "1.0.4", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/levn": { "version": "0.4.1", "dev": true, @@ -3619,11 +3363,6 @@ "node": ">=6" } }, - "node_modules/lodash": { - "version": "4.17.21", - "dev": true, - "license": "MIT" - }, "node_modules/lodash.merge": { "version": "4.6.2", "dev": true, @@ -3634,14 +3373,6 @@ "dev": true, "license": "MIT" }, - "node_modules/longest": { - "version": "1.0.1", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/loose-envify": { "version": "1.4.0", "dev": true, @@ -3844,38 +3575,6 @@ "dev": true, "license": "MIT" }, - "node_modules/nunjucks": { - "version": "3.2.4", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "a-sync-waterfall": "^1.0.0", - "asap": "^2.0.3", - "commander": "^5.1.0" - }, - "bin": { - "nunjucks-precompile": "bin/precompile" - }, - "engines": { - "node": ">= 6.9.0" - }, - "peerDependencies": { - "chokidar": "^3.3.0" - }, - "peerDependenciesMeta": { - "chokidar": { - "optional": true - } - } - }, - "node_modules/nunjucks/node_modules/commander": { - "version": "5.1.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 6" - } - }, "node_modules/object-assign": { "version": "4.1.1", "dev": true, @@ -4247,14 +3946,6 @@ "node": ">=0.4.0" } }, - "node_modules/promise": { - "version": "7.3.1", - "dev": true, - "license": "MIT", - "dependencies": { - "asap": "~2.0.3" - } - }, "node_modules/prop-types": { "version": "15.8.1", "dev": true, @@ -4270,175 +3961,6 @@ "dev": true, "license": "MIT" }, - "node_modules/pug": { - "version": "2.0.4", - "dev": true, - "license": "MIT", - "dependencies": { - "pug-code-gen": "^2.0.2", - "pug-filters": "^3.1.1", - "pug-lexer": "^4.1.0", - "pug-linker": "^3.0.6", - "pug-load": "^2.0.12", - "pug-parser": "^5.0.1", - "pug-runtime": "^2.0.5", - "pug-strip-comments": "^1.0.4" - } - }, - "node_modules/pug-attrs": { - "version": "2.0.4", - "dev": true, - "license": "MIT", - "dependencies": { - "constantinople": "^3.0.1", - "js-stringify": "^1.0.1", - "pug-runtime": "^2.0.5" - } - }, - "node_modules/pug-code-gen": { - "version": "2.0.3", - "dev": true, - "license": "MIT", - "dependencies": { - "constantinople": "^3.1.2", - "doctypes": "^1.1.0", - "js-stringify": "^1.0.1", - "pug-attrs": "^2.0.4", - "pug-error": "^1.3.3", - "pug-runtime": "^2.0.5", - "void-elements": "^2.0.1", - "with": "^5.0.0" - } - }, - "node_modules/pug-error": { - "version": "1.3.3", - "dev": true, - "license": "MIT" - }, - "node_modules/pug-filters": { - "version": "3.1.1", - "dev": true, - "license": "MIT", - "dependencies": { - "clean-css": "^4.1.11", - "constantinople": "^3.0.1", - "jstransformer": "1.0.0", - "pug-error": "^1.3.3", - "pug-walk": "^1.1.8", - "resolve": "^1.1.6", - "uglify-js": "^2.6.1" - } - }, - "node_modules/pug-filters/node_modules/cliui": { - "version": "2.1.0", - "dev": true, - "license": "ISC", - "dependencies": { - "center-align": "^0.1.1", - "right-align": "^0.1.1", - "wordwrap": "0.0.2" - } - }, - "node_modules/pug-filters/node_modules/source-map": { - "version": "0.5.7", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/pug-filters/node_modules/uglify-js": { - "version": "2.8.29", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "source-map": "~0.5.1", - "yargs": "~3.10.0" - }, - "bin": { - "uglifyjs": "bin/uglifyjs" - }, - "engines": { - "node": ">=0.8.0" - }, - "optionalDependencies": { - "uglify-to-browserify": "~1.0.0" - } - }, - "node_modules/pug-filters/node_modules/wordwrap": { - "version": "0.0.2", - "dev": true, - "license": "MIT/X11", - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/pug-filters/node_modules/yargs": { - "version": "3.10.0", - "dev": true, - "license": "MIT", - "dependencies": { - "camelcase": "^1.0.2", - "cliui": "^2.1.0", - "decamelize": "^1.0.0", - "window-size": "0.1.0" - } - }, - "node_modules/pug-lexer": { - "version": "4.1.0", - "dev": true, - "license": "MIT", - "dependencies": { - "character-parser": "^2.1.1", - "is-expression": "^3.0.0", - "pug-error": "^1.3.3" - } - }, - "node_modules/pug-linker": { - "version": "3.0.6", - "dev": true, - "license": "MIT", - "dependencies": { - "pug-error": "^1.3.3", - "pug-walk": "^1.1.8" - } - }, - "node_modules/pug-load": { - "version": "2.0.12", - "dev": true, - "license": "MIT", - "dependencies": { - "object-assign": "^4.1.0", - "pug-walk": "^1.1.8" - } - }, - "node_modules/pug-parser": { - "version": "5.0.1", - "dev": true, - "license": "MIT", - "dependencies": { - "pug-error": "^1.3.3", - "token-stream": "0.0.1" - } - }, - "node_modules/pug-runtime": { - "version": "2.0.5", - "dev": true, - "license": "MIT" - }, - "node_modules/pug-strip-comments": { - "version": "1.0.4", - "dev": true, - "license": "MIT", - "dependencies": { - "pug-error": "^1.3.3" - } - }, - "node_modules/pug-walk": { - "version": "1.1.8", - "dev": true, - "license": "MIT" - }, "node_modules/punycode": { "version": "2.3.1", "dev": true, @@ -4473,11 +3995,6 @@ "dev": true, "license": "MIT" }, - "node_modules/regenerator-runtime": { - "version": "0.11.1", - "dev": true, - "license": "MIT" - }, "node_modules/regexp.prototype.flags": { "version": "1.5.1", "dev": true, @@ -4505,18 +4022,11 @@ "url": "https://github.com/sponsors/mysticatea" } }, - "node_modules/repeat-string": { - "version": "1.6.1", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10" - } - }, "node_modules/require-directory": { "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -4572,17 +4082,6 @@ "node": ">=0.10.0" } }, - "node_modules/right-align": { - "version": "0.1.3", - "dev": true, - "license": "MIT", - "dependencies": { - "align-text": "^0.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/rimraf": { "version": "3.0.2", "dev": true, @@ -5358,11 +4857,6 @@ "node": ">=8.0" } }, - "node_modules/token-stream": { - "version": "0.0.1", - "dev": true, - "license": "MIT" - }, "node_modules/totalist": { "version": "3.0.1", "dev": true, @@ -5572,12 +5066,6 @@ "node": ">=0.8.0" } }, - "node_modules/uglify-to-browserify": { - "version": "1.0.2", - "dev": true, - "license": "MIT", - "optional": true - }, "node_modules/unbox-primitive": { "version": "1.0.2", "dev": true, @@ -5606,9 +5094,11 @@ } }, "node_modules/unxhr": { - "version": "1.2.0", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/unxhr/-/unxhr-1.0.1.tgz", + "integrity": "sha512-MAhukhVHyaLGDjyDYhy8gVjWJyhTECCdNsLwlMoGFoNJ3o79fpQhtQuzmAE4IxCMDwraF4cW8ZjpAV0m9CRQbg==", "dev": true, - "license": "MIT", + "peer": true, "engines": { "node": ">=8.11" } @@ -5869,14 +5359,6 @@ "node": ">=0.4.0" } }, - "node_modules/void-elements": { - "version": "2.0.1", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/webidl-conversions": { "version": "3.0.1", "dev": true, @@ -5953,33 +5435,6 @@ "node": ">=8" } }, - "node_modules/window-size": { - "version": "0.1.0", - "dev": true, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/with": { - "version": "5.1.1", - "dev": true, - "license": "MIT", - "dependencies": { - "acorn": "^3.1.0", - "acorn-globals": "^3.0.0" - } - }, - "node_modules/with/node_modules/acorn": { - "version": "3.3.0", - "dev": true, - "license": "MIT", - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, "node_modules/wordwrap": { "version": "1.0.0", "dev": true, @@ -6111,8 +5566,9 @@ }, "node_modules/y18n": { "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", "dev": true, - "license": "ISC", "engines": { "node": ">=10" } @@ -6123,47 +5579,52 @@ "license": "ISC" }, "node_modules/yargs": { - "version": "17.3.1", + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", "dev": true, - "license": "MIT", "dependencies": { "cliui": "^7.0.2", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", - "string-width": "^4.2.3", + "string-width": "^4.2.0", "y18n": "^5.0.5", - "yargs-parser": "^21.0.0" + "yargs-parser": "^20.2.2" }, "engines": { - "node": ">=12" + "node": ">=10" } }, "node_modules/yargs-parser": { - "version": "21.1.1", + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", "dev": true, - "license": "ISC", "engines": { - "node": ">=12" + "node": ">=10" } }, "node_modules/yargs/node_modules/ansi-regex": { "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/yargs/node_modules/emoji-regex": { "version": "8.0.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true }, "node_modules/yargs/node_modules/string-width": { "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, - "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -6175,8 +5636,9 @@ }, "node_modules/yargs/node_modules/strip-ansi": { "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, - "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" }, @@ -6218,22 +5680,29 @@ } }, "@asciidoctor/cli": { - "version": "4.0.0", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/@asciidoctor/cli/-/cli-3.5.0.tgz", + "integrity": "sha512-/VMHXcZBnZ9vgWfmqk9Hu0x0gMjPLup0YGq/xA8qCQuk11kUIZNMVQwgSsIUzOEwJqIUD7CgncJdtfwv1Ndxuw==", "dev": true, "requires": { - "yargs": "17.3.1" + "yargs": "16.2.0" } }, "@asciidoctor/core": { - "version": "3.0.2", + "version": "2.2.6", + "resolved": "https://registry.npmjs.org/@asciidoctor/core/-/core-2.2.6.tgz", + "integrity": "sha512-TmB2K5UfpDpSbCNBBntXzKHcAk2EA3/P68jmWvmJvglVUdkO9V6kTAuXVe12+h6C4GK0ndwuCrHHtEVcL5t6pQ==", "dev": true, + "peer": true, "requires": { - "@asciidoctor/opal-runtime": "3.0.1", - "unxhr": "1.2.0" + "asciidoctor-opal-runtime": "0.3.3", + "unxhr": "1.0.1" } }, "@asciidoctor/opal-runtime": { "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@asciidoctor/opal-runtime/-/opal-runtime-3.0.1.tgz", + "integrity": "sha512-iW7ACahOG0zZft4A/4CqDcc7JX+fWRNjV5tFAVkNCzwZD+EnFolPaUOPYt8jzadc0+Bgd80cQTtRMQnaaV1kkg==", "dev": true, "requires": { "glob": "8.1.0", @@ -6242,6 +5711,8 @@ "dependencies": { "glob": { "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", "dev": true, "requires": { "fs.realpath": "^1.0.0", @@ -6253,10 +5724,18 @@ }, "minimatch": { "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", "dev": true, "requires": { "brace-expansion": "^2.0.1" } + }, + "unxhr": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/unxhr/-/unxhr-1.2.0.tgz", + "integrity": "sha512-6cGpm8NFXPD9QbSNx0cD2giy7teZ6xOkCUH3U89WKVkL9N9rBrWjlCwhR94Re18ZlAop4MOc3WU1M3Hv/bgpIw==", + "dev": true } } }, @@ -6616,17 +6095,6 @@ "version": "0.27.8", "dev": true }, - "@types/babel-types": { - "version": "7.0.14", - "dev": true - }, - "@types/babylon": { - "version": "6.16.9", - "dev": true, - "requires": { - "@types/babel-types": "*" - } - }, "@types/chai": { "version": "4.3.10", "dev": true @@ -6638,10 +6106,6 @@ "@types/chai": "*" } }, - "@types/ejs": { - "version": "3.1.5", - "dev": true - }, "@types/fs-extra": { "version": "11.0.4", "dev": true, @@ -6755,21 +6219,6 @@ "pretty-format": "^29.5.0" } }, - "a-sync-waterfall": { - "version": "1.0.1", - "dev": true - }, - "acorn": { - "version": "4.0.13", - "dev": true - }, - "acorn-globals": { - "version": "3.1.0", - "dev": true, - "requires": { - "acorn": "^4.0.4" - } - }, "acorn-walk": { "version": "8.3.0", "dev": true @@ -6784,15 +6233,6 @@ "uri-js": "^4.2.2" } }, - "align-text": { - "version": "0.1.4", - "dev": true, - "requires": { - "kind-of": "^3.0.2", - "longest": "^1.0.1", - "repeat-string": "^1.5.2" - } - }, "ansi-colors": { "version": "4.1.3", "dev": true @@ -6878,20 +6318,81 @@ "is-shared-array-buffer": "^1.0.2" } }, - "asap": { - "version": "2.0.6", - "dev": true - }, "asciidoctor": { - "version": "3.0.2", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/asciidoctor/-/asciidoctor-3.0.0.tgz", + "integrity": "sha512-ppOgmac+UnMYO2T5n884+5dcCkqth6aJhIlOUENGTMri9+xa6XV+AoB4BiQCOzI9sDz/42NZ+ki+NPV3jhpbNQ==", "dev": true, "requires": { - "@asciidoctor/cli": "4.0.0", - "@asciidoctor/core": "3.0.2", - "ejs": "^3.1.2", - "handlebars": "^4.7.6", - "nunjucks": "^3.2.1", - "pug": "^2.0.4" + "@asciidoctor/cli": "3.5.0", + "@asciidoctor/core": "3.0.0" + }, + "dependencies": { + "@asciidoctor/core": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@asciidoctor/core/-/core-3.0.0.tgz", + "integrity": "sha512-XcFpti2RSEhEgacvnd6gr+bnNGb5cyFCDRvl01opCyspQJdynCiKxreIKrVBkyYGaBOJ7BFSQY1pZkoFGOj8Lg==", + "dev": true, + "requires": { + "@asciidoctor/opal-runtime": "3.0.1", + "unxhr": "1.2.0" + } + }, + "unxhr": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/unxhr/-/unxhr-1.2.0.tgz", + "integrity": "sha512-6cGpm8NFXPD9QbSNx0cD2giy7teZ6xOkCUH3U89WKVkL9N9rBrWjlCwhR94Re18ZlAop4MOc3WU1M3Hv/bgpIw==", + "dev": true + } + } + }, + "asciidoctor-opal-runtime": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/asciidoctor-opal-runtime/-/asciidoctor-opal-runtime-0.3.3.tgz", + "integrity": "sha512-/CEVNiOia8E5BMO9FLooo+Kv18K4+4JBFRJp8vUy/N5dMRAg+fRNV4HA+o6aoSC79jVU/aT5XvUpxSxSsTS8FQ==", + "dev": true, + "peer": true, + "requires": { + "glob": "7.1.3", + "unxhr": "1.0.1" + }, + "dependencies": { + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "peer": true, + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "glob": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", + "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", + "dev": true, + "peer": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "peer": true, + "requires": { + "brace-expansion": "^1.1.7" + } + } } }, "assertion-error": { @@ -6902,10 +6403,6 @@ "version": "2.0.0", "dev": true }, - "async": { - "version": "3.2.5", - "dev": true - }, "auto-changelog": { "version": "2.4.0", "dev": true, @@ -6927,34 +6424,6 @@ "version": "1.0.5", "dev": true }, - "babel-runtime": { - "version": "6.26.0", - "dev": true, - "requires": { - "core-js": "^2.4.0", - "regenerator-runtime": "^0.11.0" - } - }, - "babel-types": { - "version": "6.26.0", - "dev": true, - "requires": { - "babel-runtime": "^6.26.0", - "esutils": "^2.0.2", - "lodash": "^4.17.4", - "to-fast-properties": "^1.0.3" - }, - "dependencies": { - "to-fast-properties": { - "version": "1.0.3", - "dev": true - } - } - }, - "babylon": { - "version": "6.18.0", - "dev": true - }, "balanced-match": { "version": "1.0.2", "dev": true @@ -7006,22 +6475,10 @@ "version": "3.1.0", "dev": true }, - "camelcase": { - "version": "1.2.1", - "dev": true - }, "caniuse-lite": { "version": "1.0.30001561", "dev": true }, - "center-align": { - "version": "0.1.3", - "dev": true, - "requires": { - "align-text": "^0.1.3", - "lazy-cache": "^1.0.3" - } - }, "chai": { "version": "4.3.10", "dev": true, @@ -7044,13 +6501,6 @@ "supports-color": "^5.3.0" } }, - "character-parser": { - "version": "2.2.0", - "dev": true, - "requires": { - "is-regex": "^1.0.3" - } - }, "check-error": { "version": "1.0.3", "dev": true, @@ -7058,15 +6508,10 @@ "get-func-name": "^2.0.2" } }, - "clean-css": { - "version": "4.2.4", - "dev": true, - "requires": { - "source-map": "~0.6.0" - } - }, "cliui": { "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", "dev": true, "requires": { "string-width": "^4.2.0", @@ -7076,10 +6521,14 @@ "dependencies": { "ansi-regex": { "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true }, "ansi-styles": { "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "requires": { "color-convert": "^2.0.1" @@ -7087,6 +6536,8 @@ }, "color-convert": { "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "requires": { "color-name": "~1.1.4" @@ -7094,14 +6545,20 @@ }, "color-name": { "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, "emoji-regex": { "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true }, "string-width": { "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, "requires": { "emoji-regex": "^8.0.0", @@ -7111,6 +6568,8 @@ }, "strip-ansi": { "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, "requires": { "ansi-regex": "^5.0.1" @@ -7118,6 +6577,8 @@ }, "wrap-ansi": { "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, "requires": { "ansi-styles": "^4.0.0", @@ -7145,24 +6606,10 @@ "version": "0.0.1", "dev": true }, - "constantinople": { - "version": "3.1.2", - "dev": true, - "requires": { - "@types/babel-types": "^7.0.0", - "@types/babylon": "^6.16.2", - "babel-types": "^6.26.0", - "babylon": "^6.18.0" - } - }, "convert-source-map": { "version": "2.0.0", "dev": true }, - "core-js": { - "version": "2.6.12", - "dev": true - }, "cross-spawn": { "version": "7.0.3", "dev": true, @@ -7179,10 +6626,6 @@ "ms": "2.1.2" } }, - "decamelize": { - "version": "1.2.0", - "dev": true - }, "deep-eql": { "version": "4.1.3", "dev": true, @@ -7223,21 +6666,10 @@ "esutils": "^2.0.2" } }, - "doctypes": { - "version": "1.1.0", - "dev": true - }, "eastasianwidth": { "version": "0.2.0", "dev": true }, - "ejs": { - "version": "3.1.9", - "dev": true, - "requires": { - "jake": "^10.8.5" - } - }, "electron-to-chromium": { "version": "1.4.581", "dev": true @@ -7830,22 +7262,6 @@ "flat-cache": "^3.0.4" } }, - "filelist": { - "version": "1.0.4", - "dev": true, - "requires": { - "minimatch": "^5.0.1" - }, - "dependencies": { - "minimatch": { - "version": "5.1.6", - "dev": true, - "requires": { - "brace-expansion": "^2.0.1" - } - } - } - }, "fill-range": { "version": "7.0.1", "dev": true, @@ -7936,6 +7352,8 @@ }, "get-caller-file": { "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true }, "get-func-name": { @@ -8132,10 +7550,6 @@ "has-tostringtag": "^1.0.0" } }, - "is-buffer": { - "version": "1.1.6", - "dev": true - }, "is-callable": { "version": "1.2.7", "dev": true @@ -8154,14 +7568,6 @@ "has-tostringtag": "^1.0.0" } }, - "is-expression": { - "version": "3.0.0", - "dev": true, - "requires": { - "acorn": "~4.0.2", - "object-assign": "^4.0.1" - } - }, "is-extglob": { "version": "2.1.1", "dev": true @@ -8194,10 +7600,6 @@ "has-tostringtag": "^1.0.0" } }, - "is-promise": { - "version": "2.2.2", - "dev": true - }, "is-regex": { "version": "1.1.4", "dev": true, @@ -8311,74 +7713,6 @@ "@pkgjs/parseargs": "^0.11.0" } }, - "jake": { - "version": "10.8.7", - "dev": true, - "requires": { - "async": "^3.2.3", - "chalk": "^4.0.2", - "filelist": "^1.0.4", - "minimatch": "^3.1.2" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "brace-expansion": { - "version": "1.1.11", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "dev": true - }, - "minimatch": { - "version": "3.1.2", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "supports-color": { - "version": "7.2.0", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "js-stringify": { - "version": "1.0.2", - "dev": true - }, "js-tokens": { "version": "4.0.0", "dev": true @@ -8427,14 +7761,6 @@ "universalify": "^2.0.0" } }, - "jstransformer": { - "version": "1.0.0", - "dev": true, - "requires": { - "is-promise": "^2.0.0", - "promise": "^7.0.1" - } - }, "jsx-ast-utils": { "version": "3.3.5", "dev": true, @@ -8452,17 +7778,6 @@ "json-buffer": "3.0.1" } }, - "kind-of": { - "version": "3.2.2", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - }, - "lazy-cache": { - "version": "1.0.4", - "dev": true - }, "levn": { "version": "0.4.1", "dev": true, @@ -8494,10 +7809,6 @@ "path-exists": "^3.0.0" } }, - "lodash": { - "version": "4.17.21", - "dev": true - }, "lodash.merge": { "version": "4.6.2", "dev": true @@ -8506,10 +7817,6 @@ "version": "4.4.2", "dev": true }, - "longest": { - "version": "1.0.1", - "dev": true - }, "loose-envify": { "version": "1.4.0", "dev": true, @@ -8629,21 +7936,6 @@ "version": "2.0.13", "dev": true }, - "nunjucks": { - "version": "3.2.4", - "dev": true, - "requires": { - "a-sync-waterfall": "^1.0.0", - "asap": "^2.0.3", - "commander": "^5.1.0" - }, - "dependencies": { - "commander": { - "version": "5.1.0", - "dev": true - } - } - }, "object-assign": { "version": "4.1.1", "dev": true @@ -8863,13 +8155,6 @@ "version": "2.0.3", "dev": true }, - "promise": { - "version": "7.3.1", - "dev": true, - "requires": { - "asap": "~2.0.3" - } - }, "prop-types": { "version": "15.8.1", "dev": true, @@ -8885,146 +8170,6 @@ } } }, - "pug": { - "version": "2.0.4", - "dev": true, - "requires": { - "pug-code-gen": "^2.0.2", - "pug-filters": "^3.1.1", - "pug-lexer": "^4.1.0", - "pug-linker": "^3.0.6", - "pug-load": "^2.0.12", - "pug-parser": "^5.0.1", - "pug-runtime": "^2.0.5", - "pug-strip-comments": "^1.0.4" - } - }, - "pug-attrs": { - "version": "2.0.4", - "dev": true, - "requires": { - "constantinople": "^3.0.1", - "js-stringify": "^1.0.1", - "pug-runtime": "^2.0.5" - } - }, - "pug-code-gen": { - "version": "2.0.3", - "dev": true, - "requires": { - "constantinople": "^3.1.2", - "doctypes": "^1.1.0", - "js-stringify": "^1.0.1", - "pug-attrs": "^2.0.4", - "pug-error": "^1.3.3", - "pug-runtime": "^2.0.5", - "void-elements": "^2.0.1", - "with": "^5.0.0" - } - }, - "pug-error": { - "version": "1.3.3", - "dev": true - }, - "pug-filters": { - "version": "3.1.1", - "dev": true, - "requires": { - "clean-css": "^4.1.11", - "constantinople": "^3.0.1", - "jstransformer": "1.0.0", - "pug-error": "^1.3.3", - "pug-walk": "^1.1.8", - "resolve": "^1.1.6", - "uglify-js": "^2.6.1" - }, - "dependencies": { - "cliui": { - "version": "2.1.0", - "dev": true, - "requires": { - "center-align": "^0.1.1", - "right-align": "^0.1.1", - "wordwrap": "0.0.2" - } - }, - "source-map": { - "version": "0.5.7", - "dev": true - }, - "uglify-js": { - "version": "2.8.29", - "dev": true, - "requires": { - "source-map": "~0.5.1", - "uglify-to-browserify": "~1.0.0", - "yargs": "~3.10.0" - } - }, - "wordwrap": { - "version": "0.0.2", - "dev": true - }, - "yargs": { - "version": "3.10.0", - "dev": true, - "requires": { - "camelcase": "^1.0.2", - "cliui": "^2.1.0", - "decamelize": "^1.0.0", - "window-size": "0.1.0" - } - } - } - }, - "pug-lexer": { - "version": "4.1.0", - "dev": true, - "requires": { - "character-parser": "^2.1.1", - "is-expression": "^3.0.0", - "pug-error": "^1.3.3" - } - }, - "pug-linker": { - "version": "3.0.6", - "dev": true, - "requires": { - "pug-error": "^1.3.3", - "pug-walk": "^1.1.8" - } - }, - "pug-load": { - "version": "2.0.12", - "dev": true, - "requires": { - "object-assign": "^4.1.0", - "pug-walk": "^1.1.8" - } - }, - "pug-parser": { - "version": "5.0.1", - "dev": true, - "requires": { - "pug-error": "^1.3.3", - "token-stream": "0.0.1" - } - }, - "pug-runtime": { - "version": "2.0.5", - "dev": true - }, - "pug-strip-comments": { - "version": "1.0.4", - "dev": true, - "requires": { - "pug-error": "^1.3.3" - } - }, - "pug-walk": { - "version": "1.1.8", - "dev": true - }, "punycode": { "version": "2.3.1", "dev": true @@ -9039,10 +8184,6 @@ "version": "18.2.0", "dev": true }, - "regenerator-runtime": { - "version": "0.11.1", - "dev": true - }, "regexp.prototype.flags": { "version": "1.5.1", "dev": true, @@ -9056,12 +8197,10 @@ "version": "3.2.0", "dev": true }, - "repeat-string": { - "version": "1.6.1", - "dev": true - }, "require-directory": { "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", "dev": true }, "require-from-string": { @@ -9091,13 +8230,6 @@ "optional": true, "peer": true }, - "right-align": { - "version": "0.1.3", - "dev": true, - "requires": { - "align-text": "^0.1.1" - } - }, "rimraf": { "version": "3.0.2", "dev": true, @@ -9576,10 +8708,6 @@ "is-number": "^7.0.0" } }, - "token-stream": { - "version": "0.0.1", - "dev": true - }, "totalist": { "version": "3.0.1", "dev": true, @@ -9717,11 +8845,6 @@ "dev": true, "optional": true }, - "uglify-to-browserify": { - "version": "1.0.2", - "dev": true, - "optional": true - }, "unbox-primitive": { "version": "1.0.2", "dev": true, @@ -9741,8 +8864,11 @@ "dev": true }, "unxhr": { - "version": "1.2.0", - "dev": true + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/unxhr/-/unxhr-1.0.1.tgz", + "integrity": "sha512-MAhukhVHyaLGDjyDYhy8gVjWJyhTECCdNsLwlMoGFoNJ3o79fpQhtQuzmAE4IxCMDwraF4cW8ZjpAV0m9CRQbg==", + "dev": true, + "peer": true }, "update-browserslist-db": { "version": "1.0.13", @@ -9856,10 +8982,6 @@ } } }, - "void-elements": { - "version": "2.0.1", - "dev": true - }, "webidl-conversions": { "version": "3.0.1", "dev": true @@ -9909,24 +9031,6 @@ "stackback": "0.0.2" } }, - "window-size": { - "version": "0.1.0", - "dev": true - }, - "with": { - "version": "5.1.1", - "dev": true, - "requires": { - "acorn": "^3.1.0", - "acorn-globals": "^3.0.0" - }, - "dependencies": { - "acorn": { - "version": "3.3.0", - "dev": true - } - } - }, "wordwrap": { "version": "1.0.0", "dev": true @@ -10009,6 +9113,8 @@ }, "y18n": { "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", "dev": true }, "yallist": { @@ -10016,28 +9122,36 @@ "dev": true }, "yargs": { - "version": "17.3.1", + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", "dev": true, "requires": { "cliui": "^7.0.2", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", - "string-width": "^4.2.3", + "string-width": "^4.2.0", "y18n": "^5.0.5", - "yargs-parser": "^21.0.0" + "yargs-parser": "^20.2.2" }, "dependencies": { "ansi-regex": { "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true }, "emoji-regex": { "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true }, "string-width": { "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, "requires": { "emoji-regex": "^8.0.0", @@ -10047,6 +9161,8 @@ }, "strip-ansi": { "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, "requires": { "ansi-regex": "^5.0.1" @@ -10055,7 +9171,9 @@ } }, "yargs-parser": { - "version": "21.1.1", + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", "dev": true }, "yocto-queue": { diff --git a/package.json b/package.json index c1156e4..8669a3b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "antmarky", "version": "1.0.0-beta.2", - "description": "Antmarky is a static-site generator for Asciidoctor based on Node.js and EJS", + "description": "Antmarky is a static-site generator for Asciidoctor based on Node.js and Handlebars", "type": "module", "main": "./bin/index.cjs", "bin": { @@ -11,6 +11,7 @@ "start": "rm -rf bin/ && tsx ./esbuild.config.mjs -- development", "bundle": "tsx ./esbuild.config.mjs -- production", "build": "npm run bundle && node ./bin/index.cjs build", + "build:dev": "npm run bundle && node ./bin/index.cjs serve", "lint": "semistandard", "test": "vitest", "bump": "node bump-version.js", @@ -23,18 +24,16 @@ "keywords": [], "license": "ISC", "devDependencies": { - "@asciidoctor/cli": "^4.0.0", - "@types/ejs": "^3.1.1", "@types/fs-extra": "^11.0.1", "@types/mock-fs": "^4.13.1", "@types/node": "^18.11.17", "@vitest/coverage-istanbul": "^0.34.6", - "asciidoctor": "3.0.2", + "asciidoctor": "3.0.0", "auto-changelog": "^2.4.0", - "ejs": "^3.1.6", "esbuild": "^0.19.5", "fs-extra": "^11.1.1", "glob": "^10.3.10", + "handlebars": "^4.7.8", "mock-fs": "^5.1.2", "semistandard": "^16.0.1", "tsx": "^3.14.0", diff --git a/src/compileTemplates.ts b/src/compileTemplates.ts index ed8418a..1da0593 100644 --- a/src/compileTemplates.ts +++ b/src/compileTemplates.ts @@ -1,26 +1,25 @@ -import ejs from 'ejs'; import fs from 'fs'; +import { glob } from 'glob'; +import handlebars from 'handlebars'; import path from 'path'; import config from './config/defaultConfiguration'; const compileTemplates = async () => { const templatesDirectoryPath = path.resolve(config.templatesDirectory); - const compilerOptions: ejs.Options = { - async: true, - views: [path.resolve(templatesDirectoryPath)] - } - - // TODO: define the proper type for the object instead of any - let compiledTemplates: any = {}; - - const listOfTemplates = ['page', '404']; - + let compiledTemplates: { [key: string]: any } = {}; + + const listOfTemplates = await glob(path.join(templatesDirectoryPath, '/**/*.hbs')); + for await (let template of listOfTemplates) { - let templatePath = path.resolve(templatesDirectoryPath, `${template}.ejs`); - let templateContent = await fs.promises.readFile(templatePath, 'utf-8'); - - compiledTemplates[template] = ejs.compile(templateContent, compilerOptions); + let templateName = template.match(/\/(\w+?).hbs/)![1]; + let templateContent = await fs.promises.readFile(template, 'utf-8'); + + if (template.includes('partials')) { + handlebars.registerPartial(templateName, templateContent); + } else { + compiledTemplates[templateName] = handlebars.compile(templateContent); + } } return compiledTemplates; diff --git a/src/templates/404.ejs b/src/templates/404.hbs similarity index 100% rename from src/templates/404.ejs rename to src/templates/404.hbs diff --git a/src/templates/page.ejs b/src/templates/page.ejs deleted file mode 100644 index 16e05f9..0000000 --- a/src/templates/page.ejs +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - <%- await - include('./partials/head'); - %> - - - -
- <%- await - include('./partials/navbar'); - %> -
- -
-
- -
- <%- await - html - %> -
-
- - <%- await - include('./partials/toc'); - %> -
-
-
- <%- await - include('./partials/scripts'); - %> - - - \ No newline at end of file diff --git a/src/templates/page.hbs b/src/templates/page.hbs new file mode 100644 index 0000000..e814907 --- /dev/null +++ b/src/templates/page.hbs @@ -0,0 +1,25 @@ + + + + {{> head}} + + +
+ {{> navbar}} +
+
+
+ +
+ {{{html}}} +
+
+ {{> toc}} +
+
+
+ {{> scripts}} + + \ No newline at end of file diff --git a/src/templates/partials/footer.ejs b/src/templates/partials/footer.hbs similarity index 100% rename from src/templates/partials/footer.ejs rename to src/templates/partials/footer.hbs diff --git a/src/templates/partials/head.ejs b/src/templates/partials/head.hbs similarity index 91% rename from src/templates/partials/head.ejs rename to src/templates/partials/head.hbs index 09d6680..1a5746c 100644 --- a/src/templates/partials/head.ejs +++ b/src/templates/partials/head.hbs @@ -1,8 +1,8 @@ -<%= title %> | Antmarky +{{title}} | Antmarky -<%- await include('./styles') %> \ No newline at end of file +{{> styles}} \ No newline at end of file diff --git a/src/templates/partials/navbar.ejs b/src/templates/partials/navbar.hbs similarity index 100% rename from src/templates/partials/navbar.ejs rename to src/templates/partials/navbar.hbs diff --git a/src/templates/partials/scripts.ejs b/src/templates/partials/scripts.hbs similarity index 80% rename from src/templates/partials/scripts.ejs rename to src/templates/partials/scripts.hbs index b5344d7..760309a 100644 --- a/src/templates/partials/scripts.ejs +++ b/src/templates/partials/scripts.hbs @@ -1,9 +1,8 @@ - - + + + src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/languages/asciidoc.min.js">