From 9fd803bc11dcd6534218263339aa870e09c5b20e Mon Sep 17 00:00:00 2001 From: sawka Date: Tue, 17 Jan 2023 09:59:31 -0800 Subject: [PATCH] centralize version info for building. change 'SH' vars to 'PROMPT' --- src/sh2.ts | 6 ++++-- version.js | 2 ++ webpack.common.js | 2 +- webpack.dev.js | 8 ++++---- webpack.electron.prod.js | 8 ++++---- webpack.prod.js | 8 ++++---- 6 files changed, 19 insertions(+), 15 deletions(-) create mode 100644 version.js diff --git a/src/sh2.ts b/src/sh2.ts index e6cef1471..91663d619 100644 --- a/src/sh2.ts +++ b/src/sh2.ts @@ -8,7 +8,9 @@ import {GlobalModel} from "./model"; import {v4 as uuidv4} from "uuid"; // @ts-ignore -let VERSION = __SHVERSION__; +let VERSION = __PROMPT_VERSION__; +// @ts-ignore +let BUILD = __PROMPT_BUILD__; let jbmFontNormal = new FontFace("JetBrains Mono", "url('static/fonts/jetbrains-mono-v13-latin-regular.woff2')", {style: "normal", weight: "400"}); let jbmFont200 = new FontFace("JetBrains Mono", "url('static/fonts/jetbrains-mono-v13-latin-200.woff2')", {style: "normal", weight: "200"}); @@ -42,4 +44,4 @@ document.addEventListener("DOMContentLoaded", () => { (window as any).mobx = mobx; (window as any).sprintf = sprintf; -console.log("PROMPT", VERSION) +console.log("PROMPT", VERSION, BUILD) diff --git a/version.js b/version.js new file mode 100644 index 000000000..db57ea4ac --- /dev/null +++ b/version.js @@ -0,0 +1,2 @@ +const VERSION = "v0.1.1"; +module.exports = VERSION; diff --git a/webpack.common.js b/webpack.common.js index e104e0512..fa89df193 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -64,4 +64,4 @@ module.exports = { resolve: { extensions: ['.ts', '.tsx', '.js', '.mjs', '.cjs', '.wasm', '.json', '.less', '.css'] }, -} +}; diff --git a/webpack.dev.js b/webpack.dev.js index e9426d184..93a395de7 100644 --- a/webpack.dev.js +++ b/webpack.dev.js @@ -3,7 +3,7 @@ const merge = require('webpack-merge'); const common = require('./webpack.common.js'); const path = require('path'); const CopyPlugin = require("copy-webpack-plugin"); -const VERSION = "v0.1.1"; +const VERSION = require("./version.js"); var merged = merge.merge(common, { mode: "development", @@ -27,9 +27,9 @@ var merged = merge.merge(common, { }); var definePlugin = new webpack.DefinePlugin({ - __SHDEV__: "true", - __SHVERSION__: JSON.stringify(VERSION), - __SHBUILD__: JSON.stringify("devbuild"), + __PROMPT_DEV__: "true", + __PROMPT_VERSION__: JSON.stringify(VERSION), + __PROMPT_BUILD__: JSON.stringify("devbuild"), }); merged.plugins.push(definePlugin); diff --git a/webpack.electron.prod.js b/webpack.electron.prod.js index 078a25965..7e85b1968 100644 --- a/webpack.electron.prod.js +++ b/webpack.electron.prod.js @@ -2,7 +2,7 @@ const webpack = require('webpack'); const merge = require('webpack-merge'); const common = require('./webpack.electron.js'); const moment = require("dayjs"); -const VERSION = "v0.1.1"; +const VERSION = require('./version.js'); const path = require("path"); function makeBuildStr() { @@ -26,9 +26,9 @@ let merged = merge.merge(common, { }); merged.plugins.push(new webpack.DefinePlugin({ - __SHDEV__: "false", - __SHVERSION__: JSON.stringify(VERSION), - __SHBUILD__: JSON.stringify(BUILD), + __PROMPT_DEV__: "false", + __PROMPT_VERSION__: JSON.stringify(VERSION), + __PROMPT_BUILD__: JSON.stringify(BUILD), })); module.exports = merged; diff --git a/webpack.prod.js b/webpack.prod.js index ea4d180eb..b46fb4bcb 100644 --- a/webpack.prod.js +++ b/webpack.prod.js @@ -2,8 +2,8 @@ const webpack = require('webpack'); const merge = require('webpack-merge'); const common = require('./webpack.common.js'); const moment = require("dayjs"); -const VERSION = "v0.1.1"; const path = require("path"); +const VERSION = require("./version.js"); function makeBuildStr() { let buildStr = moment().format("YYYYMMDD-HHmmss"); @@ -34,9 +34,9 @@ if (BundleAnalyzerPlugin != null) { merged.plugins.push(new BundleAnalyzerPlugin()); } merged.plugins.push(new webpack.DefinePlugin({ - __SHDEV__: "false", - __SHVERSION__: JSON.stringify(VERSION), - __SHBUILD__: JSON.stringify(BUILD), + __PROMPT_DEV__: "false", + __PROMPT_VERSION__: JSON.stringify(VERSION), + __PROMPT_BUILD__: JSON.stringify(BUILD), })); module.exports = merged;