diff --git a/.browserslistrc b/.browserslistrc index 62db6ee8..a8bb8783 100644 --- a/.browserslistrc +++ b/.browserslistrc @@ -17,7 +17,7 @@ # Generated data. # -# Last generated Apr 7, 2024 12:20 AM UTC. +# Last generated Apr 8, 2024 12:42 PM UTC. [production] node >= 20.9.0 diff --git a/.dockerignore b/.dockerignore index 66c0e852..1842a854 100644 --- a/.dockerignore +++ b/.dockerignore @@ -17,7 +17,7 @@ # Generated data. # -# Last generated Apr 7, 2024 12:20 AM UTC. +# Last generated Apr 8, 2024 12:42 PM UTC. # Locals diff --git a/.env.vault b/.env.vault index dd6949c4..3be2d08d 100644 --- a/.env.vault +++ b/.env.vault @@ -8,12 +8,12 @@ DOTENV_VAULT_MAIN="7GW98NfL4hM4N6HbfeDXCKreVxKvcVPupFRnZ8XJ+pomaQ==" DOTENV_VAULT_MAIN_VERSION=1 # dev -DOTENV_VAULT_DEV="jzpSrq2zoouzW1SqW81QLdf7JwpadbIrLRYpa7mGAH8/6j4qZjYNq8AP0NRY/Kj+hNZkhRugETA++IJlSp+1/+eNKUW8QCJYzI2pwIbSyeO2rjzbAx+2vf+lXPiu4NjJcabLnEIo2DfZDFmzNgBIoe9AwHTKXaF1RQ9RnXwP1sMMkfffoQamCyitTD/d8LAdklIlpyDxRq/fkWqVyHhyKYBCoNwWjo84HmCeEYASIE1ExkToGGkF/DT6mizVdopTxA==" -DOTENV_VAULT_DEV_VERSION=517 +DOTENV_VAULT_DEV="sWY4hDxZZotrpFBuYWd2le3Wl9K7u99hGj42uo1GpQkRY61euuSvtZMOkJ6N1t84ftzag1DOlUdvnALYbQWVbShUmUmWXXoi+RqGgmU7/mMTW5pv1vQYNiaU+5aU7WGIWi0/vNC1OuyLsVifoZXHdWoiqPQJTLhxI283CoYYj/6y07eZUMsZGJsgjQSazzBfHMuFjsbUR+7ZpbHwzhwOWXYuGQa6imRywR2KLafzhn8VTxCKcH3MLRZSESJ4+jT8RQ==" +DOTENV_VAULT_DEV_VERSION=519 # ci -DOTENV_VAULT_CI="RqjILXBqI3/IlsszyerNcIcca8G6QOY/ctnu+0EmJwzQLtLnHlzugLeZpI0I+KlBnYJmPem5aYgcjlZkYjsl0YNCmT+7Hml3OIfLTw1wCb+/Lo4ZVigQOU+J9ymEI01WR22skN4GFC7vPwIDHXauxua1hTONn2Lh7h4ggYL6wQ==" -DOTENV_VAULT_CI_VERSION=517 +DOTENV_VAULT_CI="I1+jAQYobcSf0RV9PKqVGT3zCGkE8mhYe/RpC+U+H9DWK7hEtujosvUsP9jZGvCnXpTQ18Zi2y3nJLKDjmcdYDetbwCRsFrQlOp043vB8baq/idTfwJgdN2fcPCn2YESIo81gef9ISH1KUe4GMP5tUZsSqzMp9qX95U9IU9mIg==" +DOTENV_VAULT_CI_VERSION=519 # stage DOTENV_VAULT_STAGE="aRP8su2YV4jZu3w1HZ/SLaots0IwJDFw75TCpvXEFeNp7tw=" diff --git a/.gitattributes b/.gitattributes index ecd36212..cd84e431 100644 --- a/.gitattributes +++ b/.gitattributes @@ -17,7 +17,7 @@ # Generated data. # -# Last generated Apr 7, 2024 12:20 AM UTC. +# Last generated Apr 8, 2024 12:42 PM UTC. # Default diff --git a/.gitignore b/.gitignore index 7be49691..863d1239 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,7 @@ # Generated data. # -# Last generated Apr 7, 2024 12:20 AM UTC. +# Last generated Apr 8, 2024 12:42 PM UTC. # Locals diff --git a/.npmignore b/.npmignore index 044256a1..f346950d 100644 --- a/.npmignore +++ b/.npmignore @@ -25,7 +25,7 @@ # Generated data. # -# Last generated Apr 7, 2024 12:20 AM UTC. +# Last generated Apr 8, 2024 12:42 PM UTC. # Locals diff --git a/.prettierignore b/.prettierignore index 81a8739b..493cf21a 100644 --- a/.prettierignore +++ b/.prettierignore @@ -17,7 +17,7 @@ # Generated data. # -# Last generated Apr 7, 2024 12:20 AM UTC. +# Last generated Apr 8, 2024 12:42 PM UTC. # Packages diff --git a/.vscode/settings.json b/.vscode/settings.json index 8c3a7915..b28334e5 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -7,7 +7,7 @@ * @note This entire file will be updated automatically. * @note Instead of editing here, please review `./settings.mjs`. * - * Last generated using `./settings.mjs` Apr 7, 2024 12:20 AM UTC. + * Last generated using `./settings.mjs` Apr 8, 2024 12:42 PM UTC. */ { "editor.formatOnType": false, diff --git a/.vscodeignore b/.vscodeignore index 916060b1..e67e6e58 100644 --- a/.vscodeignore +++ b/.vscodeignore @@ -17,7 +17,7 @@ # Generated data. # -# Last generated Apr 7, 2024 12:20 AM UTC. +# Last generated Apr 8, 2024 12:42 PM UTC. # Locals diff --git a/package-lock.json b/package-lock.json index 42df89d1..0efbd58a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@clevercanyon/utilities", - "version": "1.0.944", + "version": "1.0.945", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@clevercanyon/utilities", - "version": "1.0.944", + "version": "1.0.945", "cpu": [ "x64", "arm64" @@ -17,7 +17,7 @@ "linux" ], "devDependencies": { - "@clevercanyon/dev-deps": "^1.0.376" + "@clevercanyon/dev-deps": "^1.0.377" }, "engines": { "node": "^20.5.0 || ^20.9.0 || ^21.6.2", @@ -777,9 +777,9 @@ "dev": true }, "node_modules/@clevercanyon/dev-deps": { - "version": "1.0.376", - "resolved": "https://registry.npmjs.org/@clevercanyon/dev-deps/-/dev-deps-1.0.376.tgz", - "integrity": "sha512-6lflQ5k9tlFzUMcSvqDn1eoFsNta8CvdRhJF7FyyvSon0ttKn5+z0D6OT66tIfPQC9n1iv0VIn5WBujaBlIWnA==", + "version": "1.0.377", + "resolved": "https://registry.npmjs.org/@clevercanyon/dev-deps/-/dev-deps-1.0.377.tgz", + "integrity": "sha512-6FWoku0BSVO410wq45JtTV1lVo7LDKa+roUHMZmFNBo/L2Q2boSqiM5G46NJfzDAtO3CrzJQdDQvEeZpcLmCDw==", "cpu": [ "x64", "arm64" @@ -790,11 +790,11 @@ "linux" ], "dependencies": { - "@clevercanyon/madrun": "^1.0.194", - "@clevercanyon/utilities": "^1.0.942", - "@clevercanyon/utilities.bash": "^1.0.208", - "@clevercanyon/utilities.cfp": "^1.0.249", - "@clevercanyon/utilities.node": "^1.0.203", + "@clevercanyon/madrun": "^1.0.195", + "@clevercanyon/utilities": "^1.0.945", + "@clevercanyon/utilities.bash": "^1.0.209", + "@clevercanyon/utilities.cfp": "^1.0.251", + "@clevercanyon/utilities.node": "^1.0.204", "@cloudflare/workers-types": "4.20240208.0", "@eslint/js": "8.48.0", "@iarna/toml": "2.2.5", @@ -853,7 +853,7 @@ "postcss-simple-vars": "7.0.1", "postcss-url": "10.1.3", "postcss-variable-compress": "3.0.0", - "preact": "10.19.2", + "preact": "10.20.1", "prettier": "3.1.0", "prettier-plugin-ini": "1.1.0", "prettier-plugin-jsdoc": "1.1.1", @@ -905,10 +905,10 @@ "url": "https://github.com/sponsors/clevercanyon" } }, - "node_modules/@clevercanyon/dev-deps/node_modules/@clevercanyon/utilities": { - "version": "1.0.944", - "resolved": "https://registry.npmjs.org/@clevercanyon/utilities/-/utilities-1.0.944.tgz", - "integrity": "sha512-/mHVFI7VH/Lqo07YhY5qFjJJaxd6bY9BC+msDqzZs9YwEO9ThJoCZL227MLrMTG+/NcCIlGEDw53XbjXlc5P/g==", + "node_modules/@clevercanyon/madrun": { + "version": "1.0.195", + "resolved": "https://registry.npmjs.org/@clevercanyon/madrun/-/madrun-1.0.195.tgz", + "integrity": "sha512-KOQHczWXo5vHhkBxrciOTHCe5fI0su67tV7LuTateLDL/TyT47DOAiGqd+xqWTlfip1eTRlVt6bc1vnj6O/iYw==", "cpu": [ "x64", "arm64" @@ -918,58 +918,25 @@ "darwin", "linux" ], - "engines": { - "node": "^20.5.0 || ^20.9.0 || ^21.6.2", - "npm": "^9.8.0 || ^10.1.0 || ^10.2.4" + "dependencies": { + "@clevercanyon/utilities": "^1.0.942", + "@clevercanyon/utilities.node": "^1.0.203" }, - "funding": { - "url": "https://github.com/sponsors/clevercanyon" + "bin": { + "madrun": "dist/bin/cli.js" }, - "peerDependencies": { - "@medv/finder": "3.1.0", - "@preact/signals": "1.2.2", - "color2k": "2.0.2", - "dayjs": "1.11.10", - "ignore": "5.3.0", - "ip-regex": "5.0.0", - "micro-memoize": "4.1.2", - "micromatch": "npm:@clevercanyon/micromatch.fork@^4.0.142", - "parse-css-color": "0.2.1", - "preact": "10.19.2", - "preact-render-to-string": "6.3.1", - "semver": "7.5.4", - "tailwindcss": "3.4.0" - } - }, - "node_modules/@clevercanyon/dev-deps/node_modules/@clevercanyon/utilities.bash": { - "version": "1.0.209", - "resolved": "https://registry.npmjs.org/@clevercanyon/utilities.bash/-/utilities.bash-1.0.209.tgz", - "integrity": "sha512-XMp4rE8MJ/775EWXRhqW8apELx4PYma9NNZeTr0OrRnrbEsZViPtJL9QjcYXngGFTPlDtrrAftQDh3EcClu6+Q==", - "cpu": [ - "x64", - "arm64" - ], - "dev": true, - "os": [ - "darwin", - "linux" - ], "engines": { "node": "^20.5.0 || ^20.9.0 || ^21.6.2", "npm": "^9.8.0 || ^10.1.0 || ^10.2.4" }, "funding": { "url": "https://github.com/sponsors/clevercanyon" - }, - "peerDependencies": { - "@clevercanyon/utilities": "^1.0.943", - "@clevercanyon/utilities.node": "^1.0.204" } }, - "node_modules/@clevercanyon/dev-deps/node_modules/@clevercanyon/utilities.cfp": { - "version": "1.0.251", - "resolved": "https://registry.npmjs.org/@clevercanyon/utilities.cfp/-/utilities.cfp-1.0.251.tgz", - "integrity": "sha512-VfZ6o/qw0sGdKRQ+BKUd1AWlSE4NPu5dS8jZX3QPXE0SeKQINHJF5uPaNNBlNv6cdeMNbG9PzMCVUTY5hCBFXg==", + "node_modules/@clevercanyon/split-cmd.fork": { + "version": "1.0.140", + "resolved": "https://registry.npmjs.org/@clevercanyon/split-cmd.fork/-/split-cmd.fork-1.0.140.tgz", + "integrity": "sha512-CjOStnsl4edGkZILjBCgVt9nFM9EKaBNSNzoDYmyLSVhZ8Ew9DmWxmOcvAgtoLtLT/0m0ssfTUFaXtDdP2ka9A==", "cpu": [ "x64", "arm64" @@ -979,23 +946,19 @@ "darwin", "linux" ], + "peer": true, "engines": { "node": "^20.5.0 || ^20.9.0 || ^21.6.2", "npm": "^9.8.0 || ^10.1.0 || ^10.2.4" }, "funding": { "url": "https://github.com/sponsors/clevercanyon" - }, - "peerDependencies": { - "@clevercanyon/utilities": "^1.0.944", - "@clevercanyon/utilities.cfw": "^1.0.313", - "@clevercanyon/utilities.web": "^1.0.158" } }, - "node_modules/@clevercanyon/dev-deps/node_modules/@clevercanyon/utilities.cfw": { - "version": "1.0.313", - "resolved": "https://registry.npmjs.org/@clevercanyon/utilities.cfw/-/utilities.cfw-1.0.313.tgz", - "integrity": "sha512-eM0/oorwtKKme5ncTWn5KarjIQKsaO9pG8N2EBy+odiMWB6dIPSueUl3vbulIUaYBaIX3T909cyG0c3KYeYwgQ==", + "node_modules/@clevercanyon/utilities": { + "version": "1.0.945", + "resolved": "https://registry.npmjs.org/@clevercanyon/utilities/-/utilities-1.0.945.tgz", + "integrity": "sha512-MPJ4KYGnqPGovfAxnWZVxfQzy7FFSmoZeHKP9uI/cql/ZqBNlfPwHHbyVXWlnlGYqyhBpud+WiroNtbDh5YJ9Q==", "cpu": [ "x64", "arm64" @@ -1005,7 +968,6 @@ "darwin", "linux" ], - "peer": true, "engines": { "node": "^20.5.0 || ^20.9.0 || ^21.6.2", "npm": "^9.8.0 || ^10.1.0 || ^10.2.4" @@ -1014,16 +976,25 @@ "url": "https://github.com/sponsors/clevercanyon" }, "peerDependencies": { - "@clevercanyon/utilities": "^1.0.943", - "@cloudflare/ai": "1.0.53", - "@upstash/ratelimit": "1.0.0", - "@upstash/redis": "1.28.0" + "@medv/finder": "3.1.0", + "@preact/signals": "1.2.3", + "color2k": "2.0.2", + "dayjs": "1.11.10", + "ignore": "5.3.0", + "ip-regex": "5.0.0", + "micro-memoize": "4.1.2", + "micromatch": "npm:@clevercanyon/micromatch.fork@^4.0.142", + "parse-css-color": "0.2.1", + "preact": "10.20.1", + "preact-render-to-string": "6.4.1", + "semver": "7.5.4", + "tailwindcss": "3.4.0" } }, - "node_modules/@clevercanyon/dev-deps/node_modules/@clevercanyon/utilities.node": { - "version": "1.0.204", - "resolved": "https://registry.npmjs.org/@clevercanyon/utilities.node/-/utilities.node-1.0.204.tgz", - "integrity": "sha512-Ys9QOBdJGEihcRcj2LqbshvNIgqJXbV/7hdSxT6cpAFo4CeYCks66bgM3P1WIilFcp3Dqo9J/e1R388LE4O18w==", + "node_modules/@clevercanyon/utilities.bash": { + "version": "1.0.209", + "resolved": "https://registry.npmjs.org/@clevercanyon/utilities.bash/-/utilities.bash-1.0.209.tgz", + "integrity": "sha512-XMp4rE8MJ/775EWXRhqW8apELx4PYma9NNZeTr0OrRnrbEsZViPtJL9QjcYXngGFTPlDtrrAftQDh3EcClu6+Q==", "cpu": [ "x64", "arm64" @@ -1041,30 +1012,14 @@ "url": "https://github.com/sponsors/clevercanyon" }, "peerDependencies": { - "@clevercanyon/split-cmd.fork": "^1.0.139", "@clevercanyon/utilities": "^1.0.943", - "@upstash/ratelimit": "1.0.0", - "@upstash/redis": "1.28.0", - "archiver": "6.0.1", - "boxen": "7.1.1", - "chalk": "5.3.0", - "dotenv": "16.3.1", - "dotenv-expand": "10.0.0", - "dotenv-vault": "1.25.0", - "find-up": "7.0.0", - "globby": "14.0.0", - "prettier": "3.1.0", - "shescape": "2.0.2", - "spawn-please": "npm:@clevercanyon/spawn-please.fork@^2.0.133", - "term-img": "6.0.0", - "yargs": "17.7.2", - "yargs-parser": "21.1.1" + "@clevercanyon/utilities.node": "^1.0.204" } }, - "node_modules/@clevercanyon/dev-deps/node_modules/@clevercanyon/utilities.web": { - "version": "1.0.158", - "resolved": "https://registry.npmjs.org/@clevercanyon/utilities.web/-/utilities.web-1.0.158.tgz", - "integrity": "sha512-TCIB/oxkqfM6D3tJTxHavExxAAb3hnPUwBhMQ5kha5y73SIlGYznwORRyOceBoZnLni1nJQRxrDFEuwuruyO3g==", + "node_modules/@clevercanyon/utilities.cfp": { + "version": "1.0.251", + "resolved": "https://registry.npmjs.org/@clevercanyon/utilities.cfp/-/utilities.cfp-1.0.251.tgz", + "integrity": "sha512-VfZ6o/qw0sGdKRQ+BKUd1AWlSE4NPu5dS8jZX3QPXE0SeKQINHJF5uPaNNBlNv6cdeMNbG9PzMCVUTY5hCBFXg==", "cpu": [ "x64", "arm64" @@ -1074,7 +1029,6 @@ "darwin", "linux" ], - "peer": true, "engines": { "node": "^20.5.0 || ^20.9.0 || ^21.6.2", "npm": "^9.8.0 || ^10.1.0 || ^10.2.4" @@ -1083,88 +1037,15 @@ "url": "https://github.com/sponsors/clevercanyon" }, "peerDependencies": { - "@clevercanyon/utilities": "^1.0.943" - } - }, - "node_modules/@clevercanyon/dev-deps/node_modules/@preact/signals": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@preact/signals/-/signals-1.2.2.tgz", - "integrity": "sha512-ColCqdo4cRP18bAuIR4Oik5rDpiyFtPIJIygaYPMEAwTnl4buWkBOflGBSzhYyPyJfKpkwlekrvK+1pzQ2ldWw==", - "dev": true, - "peer": true, - "dependencies": { - "@preact/signals-core": "^1.4.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/preact" - }, - "peerDependencies": { - "preact": "10.x" - } - }, - "node_modules/@clevercanyon/dev-deps/node_modules/preact": { - "version": "10.19.2", - "resolved": "https://registry.npmjs.org/preact/-/preact-10.19.2.tgz", - "integrity": "sha512-UA9DX/OJwv6YwP9Vn7Ti/vF80XL+YA5H2l7BpCtUr3ya8LWHFzpiO5R+N7dN16ujpIxhekRFuOOF82bXX7K/lg==", - "dev": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/preact" - } - }, - "node_modules/@clevercanyon/dev-deps/node_modules/preact-render-to-string": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/preact-render-to-string/-/preact-render-to-string-6.3.1.tgz", - "integrity": "sha512-NQ28WrjLtWY6lKDlTxnFpKHZdpjfF+oE6V4tZ0rTrunHrtZp6Dm0oFrcJalt/5PNeqJz4j1DuZDS0Y6rCBoqDA==", - "dev": true, - "peer": true, - "dependencies": { - "pretty-format": "^3.8.0" - }, - "peerDependencies": { - "preact": ">=10" - } - }, - "node_modules/@clevercanyon/dev-deps/node_modules/pretty-format": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-3.8.0.tgz", - "integrity": "sha512-WuxUnVtlWL1OfZFQFuqvnvs6MiAGk9UNsBostyBOB0Is9wb5uRESevA6rnl/rkksXaGX3GzZhPup5d6Vp1nFew==", - "dev": true, - "peer": true - }, - "node_modules/@clevercanyon/madrun": { - "version": "1.0.195", - "resolved": "https://registry.npmjs.org/@clevercanyon/madrun/-/madrun-1.0.195.tgz", - "integrity": "sha512-KOQHczWXo5vHhkBxrciOTHCe5fI0su67tV7LuTateLDL/TyT47DOAiGqd+xqWTlfip1eTRlVt6bc1vnj6O/iYw==", - "cpu": [ - "x64", - "arm64" - ], - "dev": true, - "os": [ - "darwin", - "linux" - ], - "dependencies": { - "@clevercanyon/utilities": "^1.0.942", - "@clevercanyon/utilities.node": "^1.0.203" - }, - "bin": { - "madrun": "dist/bin/cli.js" - }, - "engines": { - "node": "^20.5.0 || ^20.9.0 || ^21.6.2", - "npm": "^9.8.0 || ^10.1.0 || ^10.2.4" - }, - "funding": { - "url": "https://github.com/sponsors/clevercanyon" + "@clevercanyon/utilities": "^1.0.944", + "@clevercanyon/utilities.cfw": "^1.0.313", + "@clevercanyon/utilities.web": "^1.0.158" } }, - "node_modules/@clevercanyon/madrun/node_modules/@clevercanyon/utilities": { - "version": "1.0.944", - "resolved": "https://registry.npmjs.org/@clevercanyon/utilities/-/utilities-1.0.944.tgz", - "integrity": "sha512-/mHVFI7VH/Lqo07YhY5qFjJJaxd6bY9BC+msDqzZs9YwEO9ThJoCZL227MLrMTG+/NcCIlGEDw53XbjXlc5P/g==", + "node_modules/@clevercanyon/utilities.cfw": { + "version": "1.0.313", + "resolved": "https://registry.npmjs.org/@clevercanyon/utilities.cfw/-/utilities.cfw-1.0.313.tgz", + "integrity": "sha512-eM0/oorwtKKme5ncTWn5KarjIQKsaO9pG8N2EBy+odiMWB6dIPSueUl3vbulIUaYBaIX3T909cyG0c3KYeYwgQ==", "cpu": [ "x64", "arm64" @@ -1174,6 +1055,7 @@ "darwin", "linux" ], + "peer": true, "engines": { "node": "^20.5.0 || ^20.9.0 || ^21.6.2", "npm": "^9.8.0 || ^10.1.0 || ^10.2.4" @@ -1182,22 +1064,13 @@ "url": "https://github.com/sponsors/clevercanyon" }, "peerDependencies": { - "@medv/finder": "3.1.0", - "@preact/signals": "1.2.2", - "color2k": "2.0.2", - "dayjs": "1.11.10", - "ignore": "5.3.0", - "ip-regex": "5.0.0", - "micro-memoize": "4.1.2", - "micromatch": "npm:@clevercanyon/micromatch.fork@^4.0.142", - "parse-css-color": "0.2.1", - "preact": "10.19.2", - "preact-render-to-string": "6.3.1", - "semver": "7.5.4", - "tailwindcss": "3.4.0" + "@clevercanyon/utilities": "^1.0.943", + "@cloudflare/ai": "1.0.53", + "@upstash/ratelimit": "1.0.0", + "@upstash/redis": "1.28.0" } }, - "node_modules/@clevercanyon/madrun/node_modules/@clevercanyon/utilities.node": { + "node_modules/@clevercanyon/utilities.node": { "version": "1.0.204", "resolved": "https://registry.npmjs.org/@clevercanyon/utilities.node/-/utilities.node-1.0.204.tgz", "integrity": "sha512-Ys9QOBdJGEihcRcj2LqbshvNIgqJXbV/7hdSxT6cpAFo4CeYCks66bgM3P1WIilFcp3Dqo9J/e1R388LE4O18w==", @@ -1238,58 +1111,10 @@ "yargs-parser": "21.1.1" } }, - "node_modules/@clevercanyon/madrun/node_modules/@preact/signals": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@preact/signals/-/signals-1.2.2.tgz", - "integrity": "sha512-ColCqdo4cRP18bAuIR4Oik5rDpiyFtPIJIygaYPMEAwTnl4buWkBOflGBSzhYyPyJfKpkwlekrvK+1pzQ2ldWw==", - "dev": true, - "peer": true, - "dependencies": { - "@preact/signals-core": "^1.4.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/preact" - }, - "peerDependencies": { - "preact": "10.x" - } - }, - "node_modules/@clevercanyon/madrun/node_modules/preact": { - "version": "10.19.2", - "resolved": "https://registry.npmjs.org/preact/-/preact-10.19.2.tgz", - "integrity": "sha512-UA9DX/OJwv6YwP9Vn7Ti/vF80XL+YA5H2l7BpCtUr3ya8LWHFzpiO5R+N7dN16ujpIxhekRFuOOF82bXX7K/lg==", - "dev": true, - "peer": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/preact" - } - }, - "node_modules/@clevercanyon/madrun/node_modules/preact-render-to-string": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/preact-render-to-string/-/preact-render-to-string-6.3.1.tgz", - "integrity": "sha512-NQ28WrjLtWY6lKDlTxnFpKHZdpjfF+oE6V4tZ0rTrunHrtZp6Dm0oFrcJalt/5PNeqJz4j1DuZDS0Y6rCBoqDA==", - "dev": true, - "peer": true, - "dependencies": { - "pretty-format": "^3.8.0" - }, - "peerDependencies": { - "preact": ">=10" - } - }, - "node_modules/@clevercanyon/madrun/node_modules/pretty-format": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-3.8.0.tgz", - "integrity": "sha512-WuxUnVtlWL1OfZFQFuqvnvs6MiAGk9UNsBostyBOB0Is9wb5uRESevA6rnl/rkksXaGX3GzZhPup5d6Vp1nFew==", - "dev": true, - "peer": true - }, - "node_modules/@clevercanyon/split-cmd.fork": { - "version": "1.0.140", - "resolved": "https://registry.npmjs.org/@clevercanyon/split-cmd.fork/-/split-cmd.fork-1.0.140.tgz", - "integrity": "sha512-CjOStnsl4edGkZILjBCgVt9nFM9EKaBNSNzoDYmyLSVhZ8Ew9DmWxmOcvAgtoLtLT/0m0ssfTUFaXtDdP2ka9A==", + "node_modules/@clevercanyon/utilities.web": { + "version": "1.0.158", + "resolved": "https://registry.npmjs.org/@clevercanyon/utilities.web/-/utilities.web-1.0.158.tgz", + "integrity": "sha512-TCIB/oxkqfM6D3tJTxHavExxAAb3hnPUwBhMQ5kha5y73SIlGYznwORRyOceBoZnLni1nJQRxrDFEuwuruyO3g==", "cpu": [ "x64", "arm64" @@ -1306,6 +1131,9 @@ }, "funding": { "url": "https://github.com/sponsors/clevercanyon" + }, + "peerDependencies": { + "@clevercanyon/utilities": "^1.0.943" } }, "node_modules/@cloudflare/ai": { @@ -5575,9 +5403,9 @@ "dev": true }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.14.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.14.0.tgz", - "integrity": "sha512-jwXtxYbRt1V+CdQSy6Z+uZti7JF5irRKF8hlKfEnF/xJpcNGuuiZMBvuoYM+x9sr9iWGnzrlM0+9hvQ1kgkf1w==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.14.1.tgz", + "integrity": "sha512-fH8/o8nSUek8ceQnT7K4EQbSiV7jgkHq81m9lWZFIXjJ7lJzpWXbQFpT/Zh6OZYnpFykvzC3fbEvEAFZu03dPA==", "cpu": [ "arm" ], @@ -5588,9 +5416,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.14.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.14.0.tgz", - "integrity": "sha512-fI9nduZhCccjzlsA/OuAwtFGWocxA4gqXGTLvOyiF8d+8o0fZUeSztixkYjcGq1fGZY3Tkq4yRvHPFxU+jdZ9Q==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.14.1.tgz", + "integrity": "sha512-Y/9OHLjzkunF+KGEoJr3heiD5X9OLa8sbT1lm0NYeKyaM3oMhhQFvPB0bNZYJwlq93j8Z6wSxh9+cyKQaxS7PQ==", "cpu": [ "arm64" ], @@ -5601,9 +5429,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.14.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.14.0.tgz", - "integrity": "sha512-BcnSPRM76/cD2gQC+rQNGBN6GStBs2pl/FpweW8JYuz5J/IEa0Fr4AtrPv766DB/6b2MZ/AfSIOSGw3nEIP8SA==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.14.1.tgz", + "integrity": "sha512-+kecg3FY84WadgcuSVm6llrABOdQAEbNdnpi5X3UwWiFVhZIZvKgGrF7kmLguvxHNQy+UuRV66cLVl3S+Rkt+Q==", "cpu": [ "arm64" ], @@ -5614,9 +5442,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.14.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.14.0.tgz", - "integrity": "sha512-LDyFB9GRolGN7XI6955aFeI3wCdCUszFWumWU0deHA8VpR3nWRrjG6GtGjBrQxQKFevnUTHKCfPR4IvrW3kCgQ==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.14.1.tgz", + "integrity": "sha512-2pYRzEjVqq2TB/UNv47BV/8vQiXkFGVmPFwJb+1E0IFFZbIX8/jo1olxqqMbo6xCXf8kabANhp5bzCij2tFLUA==", "cpu": [ "x64" ], @@ -5627,9 +5455,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.14.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.14.0.tgz", - "integrity": "sha512-ygrGVhQP47mRh0AAD0zl6QqCbNsf0eTo+vgwkY6LunBcg0f2Jv365GXlDUECIyoXp1kKwL5WW6rsO429DBY/bA==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.14.1.tgz", + "integrity": "sha512-mS6wQ6Do6/wmrF9aTFVpIJ3/IDXhg1EZcQFYHZLHqw6AzMBjTHWnCG35HxSqUNphh0EHqSM6wRTT8HsL1C0x5g==", "cpu": [ "arm" ], @@ -5640,9 +5468,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.14.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.14.0.tgz", - "integrity": "sha512-x+uJ6MAYRlHGe9wi4HQjxpaKHPM3d3JjqqCkeC5gpnnI6OWovLdXTpfa8trjxPLnWKyBsSi5kne+146GAxFt4A==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.14.1.tgz", + "integrity": "sha512-p9rGKYkHdFMzhckOTFubfxgyIO1vw//7IIjBBRVzyZebWlzRLeNhqxuSaZ7kCEKVkm/kuC9fVRW9HkC/zNRG2w==", "cpu": [ "arm64" ], @@ -5653,9 +5481,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.14.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.14.0.tgz", - "integrity": "sha512-nrRw8ZTQKg6+Lttwqo6a2VxR9tOroa2m91XbdQ2sUUzHoedXlsyvY1fN4xWdqz8PKmf4orDwejxXHjh7YBGUCA==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.14.1.tgz", + "integrity": "sha512-nDY6Yz5xS/Y4M2i9JLQd3Rofh5OR8Bn8qe3Mv/qCVpHFlwtZSBYSPaU4mrGazWkXrdQ98GB//H0BirGR/SKFSw==", "cpu": [ "arm64" ], @@ -5666,9 +5494,9 @@ ] }, "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { - "version": "4.14.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.14.0.tgz", - "integrity": "sha512-xV0d5jDb4aFu84XKr+lcUJ9y3qpIWhttO3Qev97z8DKLXR62LC3cXT/bMZXrjLF9X+P5oSmJTzAhqwUbY96PnA==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.14.1.tgz", + "integrity": "sha512-im7HE4VBL+aDswvcmfx88Mp1soqL9OBsdDBU8NqDEYtkri0qV0THhQsvZtZeNNlLeCUQ16PZyv7cqutjDF35qw==", "cpu": [ "ppc64le" ], @@ -5679,9 +5507,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.14.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.14.0.tgz", - "integrity": "sha512-SDDhBQwZX6LPRoPYjAZWyL27LbcBo7WdBFWJi5PI9RPCzU8ijzkQn7tt8NXiXRiFMJCVpkuMkBf4OxSxVMizAw==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.14.1.tgz", + "integrity": "sha512-RWdiHuAxWmzPJgaHJdpvUUlDz8sdQz4P2uv367T2JocdDa98iRw2UjIJ4QxSyt077mXZT2X6pKfT2iYtVEvOFw==", "cpu": [ "riscv64" ], @@ -5692,9 +5520,9 @@ ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.14.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.14.0.tgz", - "integrity": "sha512-RxB/qez8zIDshNJDufYlTT0ZTVut5eCpAZ3bdXDU9yTxBzui3KhbGjROK2OYTTor7alM7XBhssgoO3CZ0XD3qA==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.14.1.tgz", + "integrity": "sha512-VMgaGQ5zRX6ZqV/fas65/sUGc9cPmsntq2FiGmayW9KMNfWVG/j0BAqImvU4KTeOOgYSf1F+k6at1UfNONuNjA==", "cpu": [ "s390x" ], @@ -5705,9 +5533,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.14.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.14.0.tgz", - "integrity": "sha512-C6y6z2eCNCfhZxT9u+jAM2Fup89ZjiG5pIzZIDycs1IwESviLxwkQcFRGLjnDrP+PT+v5i4YFvlcfAs+LnreXg==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.14.1.tgz", + "integrity": "sha512-9Q7DGjZN+hTdJomaQ3Iub4m6VPu1r94bmK2z3UeWP3dGUecRC54tmVu9vKHTm1bOt3ASoYtEz6JSRLFzrysKlA==", "cpu": [ "x64" ], @@ -5718,9 +5546,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.14.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.14.0.tgz", - "integrity": "sha512-i0QwbHYfnOMYsBEyjxcwGu5SMIi9sImDVjDg087hpzXqhBSosxkE7gyIYFHgfFl4mr7RrXksIBZ4DoLoP4FhJg==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.14.1.tgz", + "integrity": "sha512-JNEG/Ti55413SsreTguSx0LOVKX902OfXIKVg+TCXO6Gjans/k9O6ww9q3oLGjNDaTLxM+IHFMeXy/0RXL5R/g==", "cpu": [ "x64" ], @@ -5731,9 +5559,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.14.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.14.0.tgz", - "integrity": "sha512-Fq52EYb0riNHLBTAcL0cun+rRwyZ10S9vKzhGKKgeD+XbwunszSY0rVMco5KbOsTlwovP2rTOkiII/fQ4ih/zQ==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.14.1.tgz", + "integrity": "sha512-ryS22I9y0mumlLNwDFYZRDFLwWh3aKaC72CWjFcFvxK0U6v/mOkM5Up1bTbCRAhv3kEIwW2ajROegCIQViUCeA==", "cpu": [ "arm64" ], @@ -5744,9 +5572,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.14.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.14.0.tgz", - "integrity": "sha512-e/PBHxPdJ00O9p5Ui43+vixSgVf4NlLsmV6QneGERJ3lnjIua/kim6PRFe3iDueT1rQcgSkYP8ZBBXa/h4iPvw==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.14.1.tgz", + "integrity": "sha512-TdloItiGk+T0mTxKx7Hp279xy30LspMso+GzQvV2maYePMAWdmrzqSNZhUpPj3CGw12aGj57I026PgLCTu8CGg==", "cpu": [ "ia32" ], @@ -5757,9 +5585,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.14.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.14.0.tgz", - "integrity": "sha512-aGg7iToJjdklmxlUlJh/PaPNa4PmqHfyRMLunbL3eaMO0gp656+q1zOKkpJ/CVe9CryJv6tAN1HDoR8cNGzkag==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.14.1.tgz", + "integrity": "sha512-wQGI+LY/Py20zdUPq+XCem7JcPOyzIJBm3dli+56DJsQOHbnXZFEwgmnC6el1TPAfC8lBT3m+z69RmLykNUbew==", "cpu": [ "x64" ], @@ -8121,9 +7949,9 @@ "dev": true }, "node_modules/builtins": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz", - "integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.1.0.tgz", + "integrity": "sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==", "dev": true, "dependencies": { "semver": "^7.0.0" @@ -8248,9 +8076,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001606", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001606.tgz", - "integrity": "sha512-LPbwnW4vfpJId225pwjZJOgX1m9sGfbw/RKJvw/t0QhYOOaTXHvkjVGFGPpvwEzufrjvTlsULnVTxdy4/6cqkg==", + "version": "1.0.30001607", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001607.tgz", + "integrity": "sha512-WcvhVRjXLKFB/kmOFVwELtMxyhq3iM/MvmXcyCe2PNf166c39mptscOc/45TTS96n2gpNV2z7+NakArTWZCQ3w==", "dev": true, "funding": [ { @@ -21281,9 +21109,9 @@ } }, "node_modules/path-to-regexp": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.1.tgz", - "integrity": "sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw==", + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.2.tgz", + "integrity": "sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw==", "dev": true }, "node_modules/path-type": { @@ -22629,7 +22457,6 @@ "version": "10.20.1", "resolved": "https://registry.npmjs.org/preact/-/preact-10.20.1.tgz", "integrity": "sha512-JIFjgFg9B2qnOoGiYMVBtrcFxHqn+dNXbq76bVmcaHYJFYR4lW67AOcXgAYQQTDYXDOg/kTZrKPNCdRgJ2UJmw==", - "peer": true, "funding": { "type": "opencollective", "url": "https://opencollective.com/preact" @@ -26860,9 +26687,9 @@ } }, "node_modules/rollup": { - "version": "4.14.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.14.0.tgz", - "integrity": "sha512-Qe7w62TyawbDzB4yt32R0+AbIo6m1/sqO7UPzFS8Z/ksL5mrfhA0v4CavfdmFav3D+ub4QeAgsGEe84DoWe/nQ==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.14.1.tgz", + "integrity": "sha512-4LnHSdd3QK2pa1J6dFbfm1HN0D7vSK/ZuZTsdyUAlA6Rr1yTouUTL13HaDOGJVgby461AhrNGBS7sCGXXtT+SA==", "dev": true, "dependencies": { "@types/estree": "1.0.5" @@ -26875,21 +26702,21 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.14.0", - "@rollup/rollup-android-arm64": "4.14.0", - "@rollup/rollup-darwin-arm64": "4.14.0", - "@rollup/rollup-darwin-x64": "4.14.0", - "@rollup/rollup-linux-arm-gnueabihf": "4.14.0", - "@rollup/rollup-linux-arm64-gnu": "4.14.0", - "@rollup/rollup-linux-arm64-musl": "4.14.0", - "@rollup/rollup-linux-powerpc64le-gnu": "4.14.0", - "@rollup/rollup-linux-riscv64-gnu": "4.14.0", - "@rollup/rollup-linux-s390x-gnu": "4.14.0", - "@rollup/rollup-linux-x64-gnu": "4.14.0", - "@rollup/rollup-linux-x64-musl": "4.14.0", - "@rollup/rollup-win32-arm64-msvc": "4.14.0", - "@rollup/rollup-win32-ia32-msvc": "4.14.0", - "@rollup/rollup-win32-x64-msvc": "4.14.0", + "@rollup/rollup-android-arm-eabi": "4.14.1", + "@rollup/rollup-android-arm64": "4.14.1", + "@rollup/rollup-darwin-arm64": "4.14.1", + "@rollup/rollup-darwin-x64": "4.14.1", + "@rollup/rollup-linux-arm-gnueabihf": "4.14.1", + "@rollup/rollup-linux-arm64-gnu": "4.14.1", + "@rollup/rollup-linux-arm64-musl": "4.14.1", + "@rollup/rollup-linux-powerpc64le-gnu": "4.14.1", + "@rollup/rollup-linux-riscv64-gnu": "4.14.1", + "@rollup/rollup-linux-s390x-gnu": "4.14.1", + "@rollup/rollup-linux-x64-gnu": "4.14.1", + "@rollup/rollup-linux-x64-musl": "4.14.1", + "@rollup/rollup-win32-arm64-msvc": "4.14.1", + "@rollup/rollup-win32-ia32-msvc": "4.14.1", + "@rollup/rollup-win32-x64-msvc": "4.14.1", "fsevents": "~2.3.2" } }, diff --git a/package.json b/package.json index b1e1a9f0..6b688cf1 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "publishConfig": { "access": "public" }, - "version": "1.0.945", + "version": "1.0.946", "license": "GPL-3.0-or-later", "name": "@clevercanyon/utilities", "description": "Utilities for JavaScript apps running in any environment.", @@ -337,7 +337,7 @@ "optionalDependencies": {}, "bundleDependencies": [], "devDependencies": { - "@clevercanyon/dev-deps": "^1.0.376" + "@clevercanyon/dev-deps": "^1.0.377" }, "overrides": {}, "cpu": ["x64", "arm64"], diff --git a/src/preact/components/body.tsx b/src/preact/components/body.tsx index 726db17c..2f906dd4 100644 --- a/src/preact/components/body.tsx +++ b/src/preact/components/body.tsx @@ -61,13 +61,12 @@ export default function Body(props: Props = {}): $preact.VNode { return 'block' + ($preact.classMap(actualState).has(hFull) ? ' ' + hFull : ''); }, [actualState]); - if ($env.isWeb()) { - $preact.useLayoutEffect((): void => { - $dom.newAtts($dom.body(), state); - const xPreactApp = $dom.xPreactApp(); - if (xPreactApp) $dom.setAtts(xPreactApp, { class: xPreactAppClasses }); - }, [state]); - } + $preact.useLayoutEffect((): void => { + $dom.newAtts($dom.body(), state); + const xPreactApp = $dom.xPreactApp(); + if (xPreactApp) $dom.setAtts(xPreactApp, { class: xPreactAppClasses }); + }, [state]); + return ( {$env.isWeb() ? ( diff --git a/src/preact/components/consent-icon.tsx b/src/preact/components/consent-icon.tsx index 16fcaba0..e8344a0a 100644 --- a/src/preact/components/consent-icon.tsx +++ b/src/preact/components/consent-icon.tsx @@ -29,10 +29,11 @@ export type Props = $preact.NoProps; * Also, it sits on top of a site’s header and navigation dialog, which should be at `100`, `101`. */ export default function ConsentIcon(/* props: Props = {} */): $preact.VNode { - const consent = $preact.useConsent(); - const onClick = $preact.useCallback((): void => { - void consent.then(({ openDialog }) => openDialog()); - }, []); + const consent = $preact.useConsent(), + onClick = $preact.useCallback((): void => { + void consent.then(({ openDialog }) => openDialog()); + }, []); + return (
diff --git a/src/preact/components/data.tsx b/src/preact/components/data.tsx index fcc504d2..321c0036 100644 --- a/src/preact/components/data.tsx +++ b/src/preact/components/data.tsx @@ -161,7 +161,7 @@ export default class Data extends Component { this.state = $obj.mergeDeep( { cspNonce: '', head: {} }, // Defaults. $obj.pick(initialGlobalState(globalObp), mergeableGlobalStateKeys as unknown as string[]), - $preact.omitProps($obj.pick(props, passableStateKeys as unknown as string[]), ['globalObp', 'fetcher', 'lazyCPs']), // + $preact.omitProps($obj.pick(props, passableStateKeys as unknown as string[]), ['globalObp', 'fetcher', 'lazyCPs']), { $set: { globalObp, fetcher, lazyCPs } }, // Set explicity. ) as unknown as State; @@ -298,12 +298,25 @@ export const globalToScriptCode = (state: State): string => { let scriptCode = globalScriptCode.init; // Initializes global vars in script code. scriptCode += ' ' + globalScriptCode.set + ' = ' + $json.stringify(globalState) + ';'; - // We also dump the script code from our accompanying fetcher. - scriptCode += state.fetcher ? ' ' + state.fetcher.globalToScriptCode() : ''; + // We also dump a placeholder for the accompanying fetcher script code. + scriptCode += state.fetcher ? ' ' + fetcherGlobalToScriptCodeReplacementCode() : ''; return scriptCode; // To be used in a `