From d92ae023d5378d2c0aeeb6978809db0bfa2194ec Mon Sep 17 00:00:00 2001 From: Haoyu Xu Date: Sat, 11 Feb 2023 21:41:15 -0500 Subject: [PATCH] feat(showcase): add version number to insights --- Version | 2 +- libs/content_processor.js | 2 +- libs/env_generator.js | 1 + runner.js | 7 +++++-- src/components/settings.js | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Version b/Version index 9c25013..86fb650 100644 --- a/Version +++ b/Version @@ -1 +1 @@ -3.3.6 +3.3.7 diff --git a/libs/content_processor.js b/libs/content_processor.js index 2b5c26c..7d4b711 100644 --- a/libs/content_processor.js +++ b/libs/content_processor.js @@ -52,7 +52,7 @@ class Evalable { } version(prefix, suffix) { - return `${prefix}${readSync(path.join(__dirname, 'Version'))}${suffix}` + return `${prefix}${__config.version}${suffix}` } #step(location, varName) { diff --git a/libs/env_generator.js b/libs/env_generator.js index a0487f1..b8c69e8 100644 --- a/libs/env_generator.js +++ b/libs/env_generator.js @@ -10,6 +10,7 @@ export default class EnvGenerator { generate() { return [ `VITE_LINK="${this.#operatorConfig.link}"`, + `VITE_VERSION=${__config.version}`, `VITE_TITLE="${this.#operatorConfig.title}"`, `VITE_FILENAME=${this.#operatorConfig.filename.replace('#', '%23')}`, `VITE_LOGO_FILENAME=${this.#operatorConfig.logo}`, diff --git a/runner.js b/runner.js index efb3f65..36afb9f 100644 --- a/runner.js +++ b/runner.js @@ -5,7 +5,7 @@ import { fork } from 'child_process'; import getConfig from './libs/config.js' import ProjectJson from './libs/project_json.js' import EnvGenerator from './libs/env_generator.js' -import { write, rmdir, copy, writeSync, copyDir } from './libs/file.js' +import { write, rmdir, copy, writeSync, copyDir, readSync } from './libs/file.js' import AssetsProcessor from './libs/assets_processor.js' import init from './libs/initializer.js' import directory from './libs/directory.js' @@ -15,7 +15,10 @@ import CharwordTable from './libs/charword_table.js'; async function main() { global.__dirname = path.dirname(fileURLToPath(import.meta.url)) - global.__config = getConfig() + global.__config = { + ...getConfig(), + version: readSync(path.join(__dirname, 'Version')) + } const op = process.argv[2] let OPERATOR_NAMES = process.argv.slice(3); diff --git a/src/components/settings.js b/src/components/settings.js index ceea3fc..a3e1404 100644 --- a/src/components/settings.js +++ b/src/components/settings.js @@ -78,7 +78,7 @@ export default class Settings { this.#isInsightsInited = true this.#doNotTrack = doNotTrack if (this.#doNotTrack) return - window.umami?.trackView(`/${import.meta.env.VITE_LINK}${isWallpaperEngine ? "?steam" : ""}`); + window.umami?.trackView(`/${import.meta.env.VITE_LINK}${isWallpaperEngine ? "?steam&" : "?"}version=${import.meta.env.VITE_VERSION}`); } functionInsights(functionName, toSkip = false) {