Merge branch 'master' of github.com:squidfunk/mkdocs-material

This commit is contained in:
squidfunk 2020-06-07 11:56:27 +02:00
commit 29009afcab
3 changed files with 21 additions and 13 deletions

28
package-lock.json generated
View File

@ -482,9 +482,9 @@
"dev": true "dev": true
}, },
"@types/node": { "@types/node": {
"version": "14.0.5", "version": "14.0.6",
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.5.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.6.tgz",
"integrity": "sha512-90hiq6/VqtQgX8Sp0EzeIsv3r+ellbGj4URKj5j30tLlZvRUpnAe9YbYnjl3pJM93GyXU0tghHhvXHq+5rnCKA==", "integrity": "sha512-FbNmu4F67d3oZMWBV6Y4MaPER+0EpE9eIYf2yaHhCWovc1dlXCZkqGX4NLHfVVr6umt20TNBdRzrNJIzIKfdbw==",
"dev": true "dev": true
}, },
"@types/normalize-package-data": { "@types/normalize-package-data": {
@ -580,9 +580,9 @@
} }
}, },
"@types/webpack": { "@types/webpack": {
"version": "4.41.13", "version": "4.41.17",
"resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.13.tgz", "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.17.tgz",
"integrity": "sha512-RYmIHOWSxnTTa765N6jJBVE45pd2SYNblEYshVDduLw6RhocazNmRzE5/ytvBD8IkDMH6DI+bcrqxh8NILimBA==", "integrity": "sha512-6FfeCidTSHozwKI67gIVQQ5Mp0g4X96c2IXxX75hYEQJwST/i6NyZexP//zzMOBb+wG9jJ7oO8fk9yObP2HWAw==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/anymatch": "*", "@types/anymatch": "*",
@ -604,14 +604,22 @@
} }
}, },
"@types/webpack-sources": { "@types/webpack-sources": {
"version": "0.1.7", "version": "1.4.0",
"resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.7.tgz", "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-1.4.0.tgz",
"integrity": "sha512-XyaHrJILjK1VHVC4aVlKsdNN5KBTwufMb43cQs+flGxtPAf/1Qwl8+Q0tp5BwEGaI8D6XT1L+9bSWXckgkjTLw==", "integrity": "sha512-c88dKrpSle9BtTqR6ifdaxu1Lvjsl3C5OsfvuUbUwdXymshv1TkufUAXBajCCUM/f/TmnkZC/Esb03MinzSiXQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/node": "*", "@types/node": "*",
"@types/source-list-map": "*", "@types/source-list-map": "*",
"source-map": "^0.6.1" "source-map": "^0.7.3"
},
"dependencies": {
"source-map": {
"version": "0.7.3",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
"integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
"dev": true
}
} }
}, },
"@webassemblyjs/ast": { "@webassemblyjs/ast": {

View File

@ -50,10 +50,10 @@
"@types/html-minifier": "^3.5.3", "@types/html-minifier": "^3.5.3",
"@types/lunr": "^2.3.3", "@types/lunr": "^2.3.3",
"@types/mini-css-extract-plugin": "^0.9.1", "@types/mini-css-extract-plugin": "^0.9.1",
"@types/node": "^14.0.5", "@types/node": "^14.0.6",
"@types/ramda": "^0.27.6", "@types/ramda": "^0.27.6",
"@types/resize-observer-browser": "^0.1.3", "@types/resize-observer-browser": "^0.1.3",
"@types/webpack": "^4.41.13", "@types/webpack": "^4.41.17",
"@types/webpack-assets-manifest": "^3.0.1", "@types/webpack-assets-manifest": "^3.0.1",
"autoprefixer": "^9.8.0", "autoprefixer": "^9.8.0",
"copy-webpack-plugin": "^6.0.1", "copy-webpack-plugin": "^6.0.1",

View File

@ -304,7 +304,7 @@ export default (_env: never, args: Configuration): Configuration[] => {
const manifest = require("./material/assets/manifest.json") const manifest = require("./material/assets/manifest.json")
const template = toPairs<string>(manifest) const template = toPairs<string>(manifest)
.reduce((content, [from, to]) => { .reduce((content, [from, to]) => {
return content.replace(from, to) return content.replace(new RegExp(from, "g"), to)
}, fs.readFileSync("material/base.html", "utf8")) }, fs.readFileSync("material/base.html", "utf8"))
/* Save template with replaced assets */ /* Save template with replaced assets */