diff --git a/package.json b/package.json index 105f86fc..00070d1b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "js-dos", - "version": "8.1.3", + "version": "8.1.4", "description": "Full-featured DOS player with multiple emulator backends", "type": "module", "keywords": [ @@ -35,7 +35,7 @@ "@typescript-eslint/parser": "^6.20.0", "autoprefixer": "^10.4.17", "daisyui": "^3.9.3", - "emulators": "8.1.2", + "emulators": "8.1.3", "eslint": "^8.56.0", "eslint-config-google": "^0.14.0", "postcss": "^8.4.33", diff --git a/src/sockdrive b/src/sockdrive index 2d92bbee..d44807c7 160000 --- a/src/sockdrive +++ b/src/sockdrive @@ -1 +1 @@ -Subproject commit 2d92bbeecca86411bde37db92586a5644b46fc80 +Subproject commit d44807c7b1157eef7727633fd88b6cab36c0cd17 diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts index 34c09459..d82f9c21 100644 --- a/src/vite-env.d.ts +++ b/src/vite-env.d.ts @@ -1,2 +1,5 @@ // eslint-disable-next-line /// + +// eslint-disable-next-line no-unused-vars +declare const JSDOS_VERSION: string; diff --git a/src/window/dos/dos-runtime.tsx b/src/window/dos/dos-runtime.tsx index 0a395c2c..231d8960 100644 --- a/src/window/dos/dos-runtime.tsx +++ b/src/window/dos/dos-runtime.tsx @@ -39,8 +39,10 @@ function useLog(ci: CommandInterface): void { } else if (msgType === "log" && args[0]?.indexOf("sockdrive:") !== -1) { const drive = args[0].substring(args[0].indexOf(" ") + 1, args[0].indexOf(",")); dispatch(uiSlice.actions.cloudSaves(false)); - if (args[0]?.indexOf("write=false") !== -1) { + if (args[0]?.indexOf("write=") !== -1) { console.log("drive", drive, "config:", args[0]); + } + if (args[0]?.indexOf("write=false") !== -1) { dispatch(uiSlice.actions.readOnlyWarning(true)); } if (args[0]?.indexOf("preload=") !== -1) { diff --git a/src/window/prerun-window.tsx b/src/window/prerun-window.tsx index fab5e525..77443572 100644 --- a/src/window/prerun-window.tsx +++ b/src/window/prerun-window.tsx @@ -13,7 +13,6 @@ declare const emulators: Emulators; export function PreRunWindow() { const account = useSelector((state: State) => state.auth.account); const emuVersion = useSelector((state: State) => state.dos.emuVersion); - const lang = useSelector((state: State) => state.i18n.lang); const dispatch = useDispatch(); const t = useT(); @@ -22,9 +21,7 @@ export function PreRunWindow() { } function openPremiumPage() { - window.open(lang === "ru" ? - "https://dos.zone/ru/blog/premium-subscription/" : - "https://dos.zone/blog/premium-subscription/", "_blank"); + window.open("https://js-dos.com/cloud-overview.html", "_blank"); } return
@@ -82,7 +79,8 @@ export function PreRunWindow() { -
emu-version: {emuVersion}
+
jsdos/emu version:  + {JSDOS_VERSION}/{emuVersion}
; } diff --git a/vite.config.ts b/vite.config.ts index 3bdc9c1b..856ee85b 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -19,4 +19,7 @@ export default defineConfig({ }, }, }, + define: { + JSDOS_VERSION: JSON.stringify(process.env.npm_package_version), + }, }); diff --git a/yarn.lock b/yarn.lock index d0e72704..bea03603 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1154,10 +1154,10 @@ electron-to-chromium@^1.4.648: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.653.tgz#832ab25e80ad698ac09c1ca547bd9ee6cce7df10" integrity sha512-wA2A2LQCqnEwQAvwADQq3KpMpNwgAUBnRmrFgRzHnPhbQUFArTR32Ab46f4p0MovDLcg4uqd4nCsN2hTltslpA== -emulators@8.1.2: - version "8.1.2" - resolved "https://registry.yarnpkg.com/emulators/-/emulators-8.1.2.tgz#15dfc1045f0b05ccda70a49be59ae435db5f15ea" - integrity sha512-1cagI2XUN8b3TixCyERjr+wRWfcnM5a00i8ZM20kRhZp4zfvNo/CNgAyyJS9xxW5DGpNct9iTAVYCND7oZK9ZQ== +emulators@8.1.3: + version "8.1.3" + resolved "https://registry.yarnpkg.com/emulators/-/emulators-8.1.3.tgz#6267371bc85eeafe66f709ceba830cbfba7780bd" + integrity sha512-9Qkad/SJEejfks2dGAL10Jn488uIIYEtFbAc2E1BNjosO3HoWBVII2FmZBCpvhjua5jounypIC5jwtfNj9wyVw== entities@^4.2.0: version "4.5.0"