diff --git a/package-lock.json b/package-lock.json index 0c36f9cfee97..5c134ae70dd8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "pokemon-rogue-battle", - "version": "1.1.2", + "version": "1.1.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "pokemon-rogue-battle", - "version": "1.1.2", + "version": "1.1.3", "hasInstallScript": true, "dependencies": { "@material/material-color-utilities": "^0.2.7", diff --git a/package.json b/package.json index aef6e7b2ba03..a8e54f06f5d0 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { "name": "pokemon-rogue-battle", "private": true, - "version": "1.1.2", + "version": "1.1.3", "type": "module", "scripts": { "start": "vite", - "start:dev": "vite --mode development", + "start:dev": "git submodule update --init --recursive && vite --mode development", "build": "vite build", "build:beta": "vite build --mode beta", "preview": "vite preview", diff --git a/src/main.ts b/src/main.ts index d25ff08222d7..0c7aae226d0c 100644 --- a/src/main.ts +++ b/src/main.ts @@ -43,6 +43,7 @@ Phaser.GameObjects.Rectangle.prototype.setPositionRelative = setPositionRelative document.fonts.load("16px emerald").then(() => document.fonts.load("10px pkmnems")); let game; +let manifest; const startGame = async () => { await initI18n(); @@ -94,16 +95,18 @@ const startGame = async () => { version: version }); game.sound.pauseOnBlur = false; + game["manifest"] = manifest; }; fetch("/manifest.json") .then(res => res.json()) .then(jsonResponse => { + manifest = jsonResponse.manifest; + }).catch(err => { + // Manifest not found (likely local build or error path on live) + console.log(`Manifest not found. ${err}`); + }).finally(() => { startGame(); - game["manifest"] = jsonResponse.manifest; - }).catch(() => { - // Manifest not found (likely local build) - // startGame(); }); export default game; diff --git a/src/plugins/i18n.ts b/src/plugins/i18n.ts index d24484bbf9d3..91a67b9414ca 100644 --- a/src/plugins/i18n.ts +++ b/src/plugins/i18n.ts @@ -164,7 +164,7 @@ export async function initI18n(): Promise { } else { fileName = camelCaseToKebabCase(ns); } - return `/locales/${lng}/${fileName}.json?v=${pkg.version}`; + return `./locales/${lng}/${fileName}.json?v=${pkg.version}`; }, }, defaultNS: "menu",