From 923a1a20572b07efcd9e774077e5b42ad0427a82 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Thu, 7 Oct 2021 15:09:16 +0200 Subject: [PATCH] use vite define option to inject version number everywhere --- scripts/build-plugins/service-worker.js | 3 ++- src/platform/web/Platform.js | 2 +- src/platform/web/dom/ServiceWorkerHandler.js | 2 +- src/platform/web/index.html | 4 ---- src/platform/web/ui/login/common.js | 6 +++--- vite.config.js | 9 ++++++++- 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/scripts/build-plugins/service-worker.js b/scripts/build-plugins/service-worker.js index 420618fb..d80f0bbf 100644 --- a/scripts/build-plugins/service-worker.js +++ b/scripts/build-plugins/service-worker.js @@ -10,6 +10,7 @@ function contentHash(str) { module.exports = function injectServiceWorker(swFile) { let root; + let version; let manifestHref; return { name: "injectServiceWorker", @@ -17,11 +18,11 @@ module.exports = function injectServiceWorker(swFile) { enforce: "post", configResolved: config => { root = config.root; + version = JSON.parse(config.define.HYDROGEN_VERSION); // unquote }, generateBundle: async function(_, bundle) { const absoluteSwFile = path.resolve(root, swFile); const packageManifest = path.resolve(path.join(__dirname, "../../package.json")); - const version = JSON.parse(await fs.readFile(packageManifest, "utf8")).version; let swSource = await fs.readFile(absoluteSwFile, {encoding: "utf8"}); const assets = Object.values(bundle).filter(a => a.type === "asset"); const cachedFileNames = assets.map(o => o.fileName).filter(fileName => fileName !== "index.html"); diff --git a/src/platform/web/Platform.js b/src/platform/web/Platform.js index 1530ed12..efb939d9 100644 --- a/src/platform/web/Platform.js +++ b/src/platform/web/Platform.js @@ -265,7 +265,7 @@ export class Platform { } get version() { - return window.HYDROGEN_VERSION; + return HYDROGEN_VERSION; } dispose() { diff --git a/src/platform/web/dom/ServiceWorkerHandler.js b/src/platform/web/dom/ServiceWorkerHandler.js index dd2c755f..08c687c9 100644 --- a/src/platform/web/dom/ServiceWorkerHandler.js +++ b/src/platform/web/dom/ServiceWorkerHandler.js @@ -181,7 +181,7 @@ export class ServiceWorkerHandler { } get version() { - return window.HYDROGEN_VERSION; + return HYDROGEN_VERSION; } get buildHash() { diff --git a/src/platform/web/index.html b/src/platform/web/index.html index 5130cd39..d0718098 100644 --- a/src/platform/web/index.html +++ b/src/platform/web/index.html @@ -16,10 +16,6 @@ -