From 22fac813f0caab7cfdcb190c59a03ab5ceb89bc7 Mon Sep 17 00:00:00 2001 From: Thomas Allmer Date: Thu, 12 Nov 2020 17:06:22 +0100 Subject: [PATCH] chore: hash all assets --- .../icons/android-chrome-192x192.png | Bin .../icons/android-chrome-512x512.png | Bin .../{ => _static}/icons/apple-touch-icon.png | Bin .../{ => _static}/icons/favicon-16x16.png | Bin .../{ => _static}/icons/favicon-32x32.png | Bin .../{ => _static}/icons/maskable-icon.png | Bin .../{ => _static}/icons/mstile-150x150.png | Bin .../{ => _static}/icons/safari-pinned-tab.svg | 0 docs/{ => _assets}/webmanifest.json | 6 +- package.json | 5 +- rocket.config.mjs | 2 + yarn.lock | 54 +++++++++++------- 12 files changed, 41 insertions(+), 26 deletions(-) rename docs/_assets/{ => _static}/icons/android-chrome-192x192.png (100%) rename docs/_assets/{ => _static}/icons/android-chrome-512x512.png (100%) rename docs/_assets/{ => _static}/icons/apple-touch-icon.png (100%) rename docs/_assets/{ => _static}/icons/favicon-16x16.png (100%) rename docs/_assets/{ => _static}/icons/favicon-32x32.png (100%) rename docs/_assets/{ => _static}/icons/maskable-icon.png (100%) rename docs/_assets/{ => _static}/icons/mstile-150x150.png (100%) rename docs/_assets/{ => _static}/icons/safari-pinned-tab.svg (100%) rename docs/{ => _assets}/webmanifest.json (70%) diff --git a/docs/_assets/icons/android-chrome-192x192.png b/docs/_assets/_static/icons/android-chrome-192x192.png similarity index 100% rename from docs/_assets/icons/android-chrome-192x192.png rename to docs/_assets/_static/icons/android-chrome-192x192.png diff --git a/docs/_assets/icons/android-chrome-512x512.png b/docs/_assets/_static/icons/android-chrome-512x512.png similarity index 100% rename from docs/_assets/icons/android-chrome-512x512.png rename to docs/_assets/_static/icons/android-chrome-512x512.png diff --git a/docs/_assets/icons/apple-touch-icon.png b/docs/_assets/_static/icons/apple-touch-icon.png similarity index 100% rename from docs/_assets/icons/apple-touch-icon.png rename to docs/_assets/_static/icons/apple-touch-icon.png diff --git a/docs/_assets/icons/favicon-16x16.png b/docs/_assets/_static/icons/favicon-16x16.png similarity index 100% rename from docs/_assets/icons/favicon-16x16.png rename to docs/_assets/_static/icons/favicon-16x16.png diff --git a/docs/_assets/icons/favicon-32x32.png b/docs/_assets/_static/icons/favicon-32x32.png similarity index 100% rename from docs/_assets/icons/favicon-32x32.png rename to docs/_assets/_static/icons/favicon-32x32.png diff --git a/docs/_assets/icons/maskable-icon.png b/docs/_assets/_static/icons/maskable-icon.png similarity index 100% rename from docs/_assets/icons/maskable-icon.png rename to docs/_assets/_static/icons/maskable-icon.png diff --git a/docs/_assets/icons/mstile-150x150.png b/docs/_assets/_static/icons/mstile-150x150.png similarity index 100% rename from docs/_assets/icons/mstile-150x150.png rename to docs/_assets/_static/icons/mstile-150x150.png diff --git a/docs/_assets/icons/safari-pinned-tab.svg b/docs/_assets/_static/icons/safari-pinned-tab.svg similarity index 100% rename from docs/_assets/icons/safari-pinned-tab.svg rename to docs/_assets/_static/icons/safari-pinned-tab.svg diff --git a/docs/webmanifest.json b/docs/_assets/webmanifest.json similarity index 70% rename from docs/webmanifest.json rename to docs/_assets/webmanifest.json index f65241e2..53a9cbfd 100644 --- a/docs/webmanifest.json +++ b/docs/_assets/webmanifest.json @@ -9,17 +9,17 @@ "start_url": "/", "icons": [ { - "src": "./_merged_assets/icons/android-chrome-192x192.png", + "src": "../_merged_assets/_static/icons/android-chrome-192x192.png", "sizes": "128x128", "type": "image/png" }, { - "src": "./_merged_assets/icons/android-chrome-512x512.png", + "src": "../_merged_assets/_static/icons/android-chrome-512x512.png", "sizes": "512x512", "type": "image/png" }, { - "src": "./_merged_assets/icons/maskable-icon.jpg", + "src": "../_merged_assets/_static/icons/maskable-icon.jpg", "sizes": "1024x1024", "type": "image/jpg", "purpose": "any maskable" diff --git a/package.json b/package.json index e9f805ae..3e62e384 100644 --- a/package.json +++ b/package.json @@ -28,8 +28,9 @@ "update-dependency": "node scripts/update-dependency.js" }, "dependencies": { - "@d4kmor/cli": "^0.5.8", - "@d4kmor/launch": "^0.4.11", + "@d4kmor/cli": "^0.7.0", + "@d4kmor/core": "^0.1.3", + "@d4kmor/launch": "^0.6.0", "@d4kmor/search": "^0.1.2" }, "devDependencies": { diff --git a/rocket.config.mjs b/rocket.config.mjs index b2dc7089..1edab342 100644 --- a/rocket.config.mjs +++ b/rocket.config.mjs @@ -1,9 +1,11 @@ import { rocketLaunch } from '@d4kmor/launch'; import { rocketSearch } from '@d4kmor/search'; +import { absoluteBaseUrlNetlify } from '@d4kmor/core/helpers'; export default { themes: [rocketLaunch(), rocketSearch()], build: { emptyOutputDir: false, + absoluteBaseUrl: absoluteBaseUrlNetlify('http://localhost:8080'), }, }; diff --git a/yarn.lock b/yarn.lock index d30f2664..d24b9a0d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1321,29 +1321,37 @@ exec-sh "^0.3.2" minimist "^1.2.0" -"@d4kmor/cli@^0.5.8": - version "0.5.8" - resolved "https://registry.yarnpkg.com/@d4kmor/cli/-/cli-0.5.8.tgz#e867aa64fda1e18d53fdacbe03a111f048502d32" - integrity sha512-G7E4syjJDdJ23OAm46rXw873bVWMsegDksFpId38Ryb0ZV9C5HMjsVbTJjUEICZkTVHZSbi+5Nw62JtSYe5zPg== +"@d4kmor/cli@^0.7.0": + version "0.7.0" + resolved "https://registry.yarnpkg.com/@d4kmor/cli/-/cli-0.7.0.tgz#7a2bef2730291eae4a87232254c8b44917feb51b" + integrity sha512-+GdVmP75GjwrDP4F5g1ybKX65vFw2Qcf2VQik4CkukskZOzPBQVI+efu1SpCQQx2XHJoC5R8+EI55cH3U15Qng== dependencies: "@11ty/eleventy" "^0.11.1" - "@d4kmor/core" "^0.1.2" + "@babel/core" "^7.12.3" + "@babel/helpers" "^7.12.1" + "@babel/plugin-syntax-import-meta" "^7.10.4" + "@d4kmor/core" "^0.1.3" "@d4kmor/eleventy-plugin-mdjs-unified" "^0.3.1" "@d4kmor/eleventy-rocket-nav" "^0.2.1" - "@open-wc/building-rollup" "^1.9.2" + "@open-wc/building-utils" "^2.18.3" + "@rollup/plugin-babel" "^5.2.1" "@web/config-loader" "^0.1.2" "@web/dev-server" "^0.0.11" "@web/rollup-plugin-copy" "^0.1.2" + "@web/rollup-plugin-html" "^1.3.0" + "@web/rollup-plugin-polyfills-loader" "^1.0.2" + babel-plugin-bundled-import-meta "^0.3.2" + babel-plugin-template-html-minifier "^4.1.0" command-line-args "^5.1.1" command-line-usage "^6.1.0" fs-extra "^9.0.1" rollup "^2.16.0" rollup-plugin-workbox "^5.0.1" -"@d4kmor/core@^0.1.2": - version "0.1.2" - resolved "https://registry.yarnpkg.com/@d4kmor/core/-/core-0.1.2.tgz#b19ba5d248f50d55e742d1817b8ca91f9638779c" - integrity sha512-EVOy3IYxNrWPjorMp3VkJJJyV4dT1F8iotGwSHP2uLsys6+ufJCq5bmV7vmg+KNxnSno//rQtgQYQRfDOpf2pg== +"@d4kmor/core@^0.1.3": + version "0.1.3" + resolved "https://registry.yarnpkg.com/@d4kmor/core/-/core-0.1.3.tgz#5493fc495608257dade8778acade49d14eda6b05" + integrity sha512-v+Np3i6toU3pLqI4pOMLKb/Fj/DYw85W5aagAFWSyhLjrLJlsN65NKkwP6QDS0YwUtLLWDa5eaDpLElpj4XwUQ== "@d4kmor/drawer@^0.2.1": version "0.2.1" @@ -1370,10 +1378,10 @@ dependency-graph "^0.8.1" sax-wasm "^1.4.5" -"@d4kmor/launch@^0.4.11": - version "0.4.11" - resolved "https://registry.yarnpkg.com/@d4kmor/launch/-/launch-0.4.11.tgz#439adf2ff8b5c98b26e48c1b5a876159a585e723" - integrity sha512-+GGyL5f0pVIH2GpLr7XI60/wWpfZVvi6Fduu/TfWkfrjGGi3P9bactBtZNTGLJ5unh8VW1uBxZlEp5j9tRBa/g== +"@d4kmor/launch@^0.6.0": + version "0.6.0" + resolved "https://registry.yarnpkg.com/@d4kmor/launch/-/launch-0.6.0.tgz#6e12263ccdd15e299329b9cb046b61430ab8faa1" + integrity sha512-fuK7RSf9ekeFvadwMVqPbZVjTUC1ZD7Jy8YjK1QyNvDMvJ852XJhIswlGfA7IzVCYkytGKPJGCil2SuKnwSS8w== dependencies: "@d4kmor/drawer" "^0.2.1" "@d4kmor/navigation" "^0.2.0" @@ -3301,16 +3309,11 @@ "@types/estree" "*" "@types/json-schema" "*" -"@types/estree@*", "@types/estree@^0.0.45": +"@types/estree@*", "@types/estree@0.0.39", "@types/estree@0.0.45", "@types/estree@^0.0.45": version "0.0.45" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.45.tgz#e9387572998e5ecdac221950dab3e8c3b16af884" integrity sha512-jnqIUKDUqJbDIUxm0Uj7bnlMnRm1T/eZ9N+AVMqhPgzrba2GhGG5o/jCTwmdPK709nEZsGoMzXEDUjcXHa3W0g== -"@types/estree@0.0.39": - version "0.0.39" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" - integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw== - "@types/etag@*": version "1.8.0" resolved "https://registry.yarnpkg.com/@types/etag/-/etag-1.8.0.tgz#37f0b1f3ea46da7ae319bbedb607e375b4c99f7e" @@ -4166,7 +4169,16 @@ glob "^7.1.6" parse5 "^6.0.1" -"@web/rollup-plugin-polyfills-loader@^1.0.3": +"@web/rollup-plugin-html@^1.3.0": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@web/rollup-plugin-html/-/rollup-plugin-html-1.3.1.tgz#de3c5e3cf8ac046432749203ea5af612c7839603" + integrity sha512-AAst+fPDO4yb08uAOSjbfRtiKzXH3AqFgKTgr9gXq+OQyEnyaJQy+M2oe7DNi2eYLmBuPG4FHXb/CaMBGOzWNQ== + dependencies: + "@web/parse5-utils" "^1.1.2" + glob "^7.1.6" + parse5 "^6.0.1" + +"@web/rollup-plugin-polyfills-loader@^1.0.2", "@web/rollup-plugin-polyfills-loader@^1.0.3": version "1.0.3" resolved "https://registry.yarnpkg.com/@web/rollup-plugin-polyfills-loader/-/rollup-plugin-polyfills-loader-1.0.3.tgz#26b162c20cf22100117c154793d6be232cbb979b" integrity sha512-9DkZy0x5F+axj3gDx36x5mxvqg9ugVIS85hCZT2uDEBJ1VBVdSG0pzI5R5zHaLAq/Xk88D999S0zLVRE7DKuHw==