Merge branch 'release/1.0.9'

brdgm · Sep 25, 2024 · 180e358 · 180e358
2 parents 0e92bbb + bb3da24
commit 180e358
Show file tree

Hide file tree

Showing 8 changed files with 2,029 additions and 1,477 deletions.
diff --git a/.browserslistrc b/.browserslistrc
@@ -1,9 +1,9 @@
 >= 0.5%
 last 2 major versions
 not dead
-Chrome >= 60
-Firefox >= 60
+Chrome >= 90
+Firefox >= 91
 Firefox ESR
-iOS >= 12
-Safari >= 12
+iOS >= 15
+Safari >= 15
 not Explorer <= 11
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@brdgm/roll-for-the-galaxy-solo-helper",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "private": true,
   "description": "Roll for the Galaxy Solo Helper",
   "appDeployName": "roll-for-the-galaxy",
@@ -16,43 +16,43 @@
     "generate-pwa-assets": "pwa-assets-generator"
   },
   "dependencies": {
-    "@brdgm/brdgm-commons": "^1.6.7",
+    "@brdgm/brdgm-commons": "^1.6.9",
     "@popperjs/core": "^2.11.8",
     "bootstrap": "^5.3.3",
-    "core-js": "^3.37.1",
+    "core-js": "^3.38.1",
     "lodash": "^4.17.21",
-    "pinia": "^2.1.7",
-    "pinia-plugin-persistedstate": "^3.2.1",
-    "vue": "^3.4.30",
-    "vue-i18n": "^9.13.1",
-    "vue-router": "^4.4.0"
+    "pinia": "^2.2.2",
+    "pinia-plugin-persistedstate": "^4.0.2",
+    "vue": "^3.5.8",
+    "vue-i18n": "^10.0.3",
+    "vue-router": "^4.4.5"
   },
   "devDependencies": {
-    "@intlify/unplugin-vue-i18n": "^4.0.0",
+    "@intlify/unplugin-vue-i18n": "^5.2.0",
     "@types/bootstrap": "^5.2.10",
-    "@types/chai": "^4.3.16",
+    "@types/chai": "^4.3.19",
     "@types/jsdom": "^21.1.7",
-    "@types/lodash": "^4.17.5",
-    "@types/mocha": "^10.0.7",
-    "@typescript-eslint/eslint-plugin": "^7.14.1",
-    "@typescript-eslint/parser": "^7.14.1",
-    "@vite-pwa/assets-generator": "^0.2.4",
-    "@vitejs/plugin-legacy": "^5.4.1",
-    "@vitejs/plugin-vue": "^5.0.5",
-    "@vitest/coverage-istanbul": "^1.6.0",
+    "@types/lodash": "^4.17.7",
+    "@types/mocha": "^10.0.8",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@typescript-eslint/parser": "^7.18.0",
+    "@vite-pwa/assets-generator": "^0.2.6",
+    "@vitejs/plugin-legacy": "^5.4.2",
+    "@vitejs/plugin-vue": "^5.1.4",
+    "@vitest/coverage-istanbul": "^2.1.1",
     "@vue/eslint-config-typescript": "^13.0.0",
-    "babel-plugin-istanbul": "^6.1.1",
+    "babel-plugin-istanbul": "^7.0.0",
     "chai": "^5.1.1",
-    "eslint": "^8.57.0",
-    "eslint-plugin-vue": "^9.26.0",
-    "jsdom": "^24.1.0",
-    "nodemon": "^3.1.4",
-    "sass": "^1.77.6",
+    "eslint": "^8.57.1",
+    "eslint-plugin-vue": "^9.28.0",
+    "jsdom": "^25.0.1",
+    "nodemon": "^3.1.7",
+    "sass": "~1.78.0",
     "source-map-support": "^0.5.21",
     "ts-node": "^10.9.2",
-    "typescript": "^5.5.2",
-    "vite": "^5.3.1",
-    "vite-plugin-pwa": "^0.20.0",
-    "vitest": "^1.6.0"
+    "typescript": "~5.5.4",
+    "vite": "^5.4.7",
+    "vite-plugin-pwa": "^0.20.5",
+    "vitest": "^2.1.1"
   }
 }
diff --git a/public/img/icons/app-icon.psd → resources/app-icon.psd b/public/img/icons/app-icon.psd → resources/app-icon.psd
diff --git a/...s/icons/phase-disabled/phase-disabled.psd → resources/phase-disabled.psd b/...s/icons/phase-disabled/phase-disabled.psd → resources/phase-disabled.psd
diff --git a/src/components/round/action/ShipActions.vue b/src/components/round/action/ShipActions.vue
@@ -7,25 +7,27 @@
     <li v-html="t('roundPhaseExecution.shipActions.tradeOnly')"></li>
   </ul>
   <table aria-describedby="priorityCaption">
-    <tr>
-      <th id="priorityCaption">{{t('roundPhaseExecution.shipActions.priority')}}</th>
-      <td v-for="(produceDiceType, index) of produceDiceTypes" :key="produceDiceType">
-        <AppIcon type="produce-dice" :name="produceDiceType" extension="svg" class="diceIcon" />
-        <span v-if="index < produceDiceTypes.length - 1"> &nbsp;>&nbsp;</span>
-      </td>
-    </tr>
-    <tr>
-      <th>{{t('roundPhaseExecution.shipActions.tradeValue')}}</th>
-      <td v-for="produceDiceType of produceDiceTypes" :key="produceDiceType">
-        ${{getTradeValue(produceDiceType)}}
-      </td>
-    </tr>
-    <tr>
-      <th>{{t('roundPhaseExecution.shipActions.botConsumes')}}</th>
-      <td v-for="produceDiceType of produceDiceTypes" :key="produceDiceType">
-        {{getConsumeVPs(produceDiceType)}} {{t('roundPhaseExecution.shipActions.vps')}}
-      </td>
-    </tr>
+    <tbody>
+      <tr>
+        <th id="priorityCaption">{{t('roundPhaseExecution.shipActions.priority')}}</th>
+        <td v-for="(produceDiceType, index) of produceDiceTypes" :key="produceDiceType">
+          <AppIcon type="produce-dice" :name="produceDiceType" extension="svg" class="diceIcon" />
+          <span v-if="index < produceDiceTypes.length - 1"> &nbsp;>&nbsp;</span>
+        </td>
+      </tr>
+      <tr>
+        <th>{{t('roundPhaseExecution.shipActions.tradeValue')}}</th>
+        <td v-for="produceDiceType of produceDiceTypes" :key="produceDiceType">
+          ${{getTradeValue(produceDiceType)}}
+        </td>
+      </tr>
+      <tr>
+        <th>{{t('roundPhaseExecution.shipActions.botConsumes')}}</th>
+        <td v-for="produceDiceType of produceDiceTypes" :key="produceDiceType">
+          {{getConsumeVPs(produceDiceType)}} {{t('roundPhaseExecution.shipActions.vps')}}
+        </td>
+      </tr>
+    </tbody>
   </table>
 </template>
 

diff --git a/src/views/EndGameScoring.vue b/src/views/EndGameScoring.vue
@@ -2,37 +2,39 @@
   <h1 id="endGameScoringTitle">{{t('endGameScoring.title')}}</h1>
 
   <table aria-describedby="endGameScoringTitle">
-    <tr>
-      <th scope="col"></th>
-      <th scope="col">{{t('endGameScoring.player')}}</th>
-      <th scope="col">{{t('endGameScoring.bot')}}</th>
-    </tr>
-    <tr>
-      <th scope="row">{{t('endGameScoring.vpChips')}}</th>
-      <td><input type="number" min="0" max="99" step="1" v-model="playerVPChips" @focus="inputSelectAll"/></td>
-      <td><input type="number" min="0" max="99" step="1" v-model="botVPChips" @focus="inputSelectAll"/></td>
-    </tr>
-    <tr>
-      <th scope="row">{{t('endGameScoring.vpDevelopmentWorld')}}</th>
-      <td><input type="number" min="0" max="99" step="1" v-model="playerVPDevelopmentWorlds" @focus="inputSelectAll"/></td>
-      <td><input type="number" min="0" max="99" step="1" v-model="botVPDevelopmentWorlds" @focus="inputSelectAll"/></td>
-    </tr>
-    <tr>
-      <th scope="row">{{t('endGameScoring.vp6PlusBonus')}}</th>
-      <td><input type="number" min="0" max="99" step="1" v-model="playerVP6PlusWorlds" @focus="inputSelectAll"/></td>
-      <td v-if="isProfessionalDifficultyLevel"><input type="number" min="0" max="99" step="1" v-model="botVP6PlusWorlds" @focus="inputSelectAll"/></td>
-      <td v-else></td>
-    </tr>
-    <tr v-if="isObjectivesModule">
-      <th scope="row">{{t('endGameScoring.talentCounters')}}</th>
-      <td><input type="number" min="0" max="99" step="1" v-model="playerTalentCounters" @focus="inputSelectAll"/></td>
-      <td><input type="number" min="0" max="99" step="1" v-model="botTalentCounters" @focus="inputSelectAll"/></td>
-    </tr>
-    <tr>
-      <th scope="row">{{t('endGameScoring.total')}}</th>
-      <td><b>{{totalPlayer}} {{t('endGameScoring.vps')}}</b></td>
-      <td><b>{{totalBot}} {{t('endGameScoring.vps')}}</b></td>
-    </tr>
+    <tbody>
+      <tr>
+        <th scope="col"></th>
+        <th scope="col">{{t('endGameScoring.player')}}</th>
+        <th scope="col">{{t('endGameScoring.bot')}}</th>
+      </tr>
+      <tr>
+        <th scope="row">{{t('endGameScoring.vpChips')}}</th>
+        <td><input type="number" min="0" max="99" step="1" v-model="playerVPChips" @focus="inputSelectAll"/></td>
+        <td><input type="number" min="0" max="99" step="1" v-model="botVPChips" @focus="inputSelectAll"/></td>
+      </tr>
+      <tr>
+        <th scope="row">{{t('endGameScoring.vpDevelopmentWorld')}}</th>
+        <td><input type="number" min="0" max="99" step="1" v-model="playerVPDevelopmentWorlds" @focus="inputSelectAll"/></td>
+        <td><input type="number" min="0" max="99" step="1" v-model="botVPDevelopmentWorlds" @focus="inputSelectAll"/></td>
+      </tr>
+      <tr>
+        <th scope="row">{{t('endGameScoring.vp6PlusBonus')}}</th>
+        <td><input type="number" min="0" max="99" step="1" v-model="playerVP6PlusWorlds" @focus="inputSelectAll"/></td>
+        <td v-if="isProfessionalDifficultyLevel"><input type="number" min="0" max="99" step="1" v-model="botVP6PlusWorlds" @focus="inputSelectAll"/></td>
+        <td v-else></td>
+      </tr>
+      <tr v-if="isObjectivesModule">
+        <th scope="row">{{t('endGameScoring.talentCounters')}}</th>
+        <td><input type="number" min="0" max="99" step="1" v-model="playerTalentCounters" @focus="inputSelectAll"/></td>
+        <td><input type="number" min="0" max="99" step="1" v-model="botTalentCounters" @focus="inputSelectAll"/></td>
+      </tr>
+      <tr>
+        <th scope="row">{{t('endGameScoring.total')}}</th>
+        <td><b>{{totalPlayer}} {{t('endGameScoring.vps')}}</b></td>
+        <td><b>{{totalBot}} {{t('endGameScoring.vps')}}</b></td>
+      </tr>
+    </tbody>
   </table>
 
   <p class="mt-3">

diff --git a/vite.config.ts b/vite.config.ts
@@ -5,10 +5,14 @@ import { VitePWA } from 'vite-plugin-pwa'
 import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite'
 import path from 'path'
 import { description, appDeployName } from './package.json'
+import legacy from '@vitejs/plugin-legacy'
 
 // https://vitejs.dev/config/
 export default defineConfig({
   base: `/${appDeployName}/`,
+  build: {
+    chunkSizeWarningLimit: 5242880
+  },
   plugins: [
     vue(),
     VitePWA({
@@ -56,6 +60,11 @@ export default defineConfig({
     VueI18nPlugin({
       include: [path.resolve(__dirname, './src/locales/**')],
       strictMessage: false
+    }),
+    // support older browsers
+    legacy({
+      modernTargets: 'iOS >= 15, Safari >= 15',
+      modernPolyfills: true
     })
   ],
   resolve: {