Merge remote-tracking branch 'upstream/main' into dev

# Conflicts:
#	app/store/config.ts
#	app/utils.ts
#	yarn.lock
This commit is contained in:
sijinhui
2024-05-17 09:59:38 +08:00
11 changed files with 158 additions and 78 deletions

View File

@@ -1,4 +1,5 @@
import tauriConfig from "../../src-tauri/tauri.conf.json";
import { DEFAULT_INPUT_TEMPLATE } from "../constant";
export const getBuildConfig = () => {
if (typeof process === "undefined") {
@@ -42,6 +43,7 @@ export const getBuildConfig = () => {
...commitInfo,
buildMode,
isApp,
template: process.env.DEFAULT_INPUT_TEMPLATE ?? DEFAULT_INPUT_TEMPLATE,
};
};

View File

@@ -36,6 +36,9 @@ declare global {
// google tag manager
GTM_ID?: string;
// custom template for preprocessing user input
DEFAULT_INPUT_TEMPLATE?: string;
}
}
}