Arsharth/hydrogen-web
1
0
Fork 0
forked from mystiq/hydrogen-web
Code Issues Pull requests Projects Releases Packages Wiki Activity

also make changes in index.html and sw.js trigger an update

Browse source
This commit is contained in:
Bruno Windels 2020-10-15 15:58:29 +02:00
parent e290822a32
commit 0f71564d65
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
scripts/build.mjs
View file

@ -80,11 +80,14 @@ async function build({modernOnly}) {
await copyThemeAssets(themes, assets); await copyThemeAssets(themes, assets);
await buildCssBundles(buildCssLegacy, themes, assets); await buildCssBundles(buildCssLegacy, themes, assets);
await buildManifest(assets); await buildManifest(assets);
// all assets have been added, create a hash from all assets name to cache unhashed files like index.html by // all assets have been added, create a hash from all assets name to cache unhashed files like index.html
const globalHashAssets = Array.from(assets).map(([, resolved]) => resolved); assets.addToHashForAll("index.html", devHtml);
globalHashAssets.sort(); let swSource = await fs.readFile(path.join(projectDir, "src/service-worker.template.js"), "utf8");
const globalHash = contentHash(globalHashAssets.join(",")); assets.addToHashForAll("sw.js", swSource);
await buildServiceWorker(globalHash, assets);
const globalHash = assets.hashForAll();
await buildServiceWorker(swSource, globalHash, assets);
await buildHtml(doc, version, globalHash, modernOnly, assets); await buildHtml(doc, version, globalHash, modernOnly, assets);
console.log(`built hydrogen ${version} (${globalHash}) successfully with ${assets.size} files`); console.log(`built hydrogen ${version} (${globalHash}) successfully with ${assets.size} files`);
} }
@ -243,7 +246,7 @@ async function buildManifest(assets) {
await assets.write("manifest.json", JSON.stringify(webManifest)); await assets.write("manifest.json", JSON.stringify(webManifest));
} }
async function buildServiceWorker(globalHash, assets) { async function buildServiceWorker(swSource, globalHash, assets) {
const unhashedPreCachedAssets = ["index.html"]; const unhashedPreCachedAssets = ["index.html"];
const hashedPreCachedAssets = []; const hashedPreCachedAssets = [];
const hashedCachedOnRequestAssets = []; const hashedCachedOnRequestAssets = [];
@ -260,7 +263,6 @@ async function buildServiceWorker(globalHash, assets) {
} }
} }
// write service worker // write service worker
let swSource = await fs.readFile(path.join(projectDir, "src/service-worker.template.js"), "utf8");
swSource = swSource.replace(`"%%GLOBAL_HASH%%"`, `"${globalHash}"`); swSource = swSource.replace(`"%%GLOBAL_HASH%%"`, `"${globalHash}"`);
swSource = swSource.replace(`"%%UNHASHED_PRECACHED_ASSETS%%"`, JSON.stringify(unhashedPreCachedAssets)); swSource = swSource.replace(`"%%UNHASHED_PRECACHED_ASSETS%%"`, JSON.stringify(unhashedPreCachedAssets));
swSource = swSource.replace(`"%%HASHED_PRECACHED_ASSETS%%"`, JSON.stringify(hashedPreCachedAssets)); swSource = swSource.replace(`"%%HASHED_PRECACHED_ASSETS%%"`, JSON.stringify(hashedPreCachedAssets));
@ -355,6 +357,8 @@ class AssetMap {
// remove last / if any, so substr in create works well // remove last / if any, so substr in create works well
this._targetDir = path.resolve(targetDir); this._targetDir = path.resolve(targetDir);
this._assets = new Map(); this._assets = new Map();
// hashes for unhashed resources so changes in these resources also contribute to the hashForAll
this._unhashedHashes = [];
} }
_toRelPath(resourcePath) { _toRelPath(resourcePath) {
@ -444,6 +448,17 @@ class AssetMap {
has(relPath) { has(relPath) {
return this._assets.has(relPath); return this._assets.has(relPath);
} }
hashForAll() {
const globalHashAssets = Array.from(this).map(([, resolved]) => resolved);
globalHashAssets.push(...this._unhashedHashes);
globalHashAssets.sort();
return contentHash(globalHashAssets.join(","));
}
addToHashForAll(resourcePath, content) {
this._unhashedHashes.push(`${resourcePath}-${contentHash(Buffer.from(content))}`);
}
} }
build(program).catch(err => console.error(err)); build(program).catch(err => console.error(err));