From 9dcb621fc293f53b9aa1e4582d07a0387b3c431f Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Mon, 6 Apr 2026 16:41:34 +0200 Subject: [PATCH 1/4] Unbreak www 2 (#757) * revert: "fix(web): Unbreak web site deploy (#756)" This reverts commit 1f216e3140ace6a1e813dfcf1722f6fa39e5ea89. * revert: "chore(deps): update dependency typescript to v6 (#744)" This reverts commit ab5f41980ec99e91c9d1d32f027c046dde23a91b. --- fontspector-web/www/package-lock.json | 8 ++++---- fontspector-web/www/package.json | 2 +- fontspector-web/www/tsconfig.json | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/fontspector-web/www/package-lock.json b/fontspector-web/www/package-lock.json index f62f6c7d..083c77f2 100644 --- a/fontspector-web/www/package-lock.json +++ b/fontspector-web/www/package-lock.json @@ -26,7 +26,7 @@ "harfbuzzjs": "^0.10.0", "jquery": "^4.0.0", "sass-embedded": "^1.97.3", - "typescript": "^6.0.0", + "typescript": "^5.9.3", "vite": "^8.0.0", "vite-plugin-static-copy": "^4.0.0", "vite-plugin-top-level-await": "^1.6.0", @@ -2774,9 +2774,9 @@ "license": "0BSD" }, "node_modules/typescript": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.2.tgz", - "integrity": "sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ==", + "version": "5.9.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", + "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", "devOptional": true, "license": "Apache-2.0", "bin": { diff --git a/fontspector-web/www/package.json b/fontspector-web/www/package.json index 30afc68f..ecab3514 100644 --- a/fontspector-web/www/package.json +++ b/fontspector-web/www/package.json @@ -25,7 +25,7 @@ "harfbuzzjs": "^0.10.0", "jquery": "^4.0.0", "sass-embedded": "^1.97.3", - "typescript": "^6.0.0", + "typescript": "^5.9.3", "vite": "^8.0.0", "vite-plugin-static-copy": "^4.0.0", "vite-plugin-top-level-await": "^1.6.0", diff --git a/fontspector-web/www/tsconfig.json b/fontspector-web/www/tsconfig.json index 5e2e9cbe..3038fcbd 100644 --- a/fontspector-web/www/tsconfig.json +++ b/fontspector-web/www/tsconfig.json @@ -5,11 +5,12 @@ "lib": ["DOM", "DOM.Iterable", "ESNext"], "allowJs": false, "skipLibCheck": true, + "esModuleInterop": false, "allowSyntheticDefaultImports": true, "strict": true, "forceConsistentCasingInFileNames": true, "module": "ESNext", - "moduleResolution": "nodenext", + "moduleResolution": "Node", "resolveJsonModule": true, "isolatedModules": true, "noEmit": true, From 8576a67d412851dd9143731e514645f92c6945ed Mon Sep 17 00:00:00 2001 From: Dave Crossland Date: Tue, 7 Apr 2026 13:58:43 -0600 Subject: [PATCH 2/4] chore(web): Add link to report issues on GitHub in StartModal (#762) * Add link to report issues on GitHub in StartModal * Enhance Navbar with version info and issue link Updated Navbar component to * include issue reporting link * adjusted version display string * remove link to reset from navbar, so only the back arrow icon links --- fontspector-web/www/src/components/Navbar.vue | 7 ++++--- fontspector-web/www/src/components/StartModal.vue | 5 ++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/fontspector-web/www/src/components/Navbar.vue b/fontspector-web/www/src/components/Navbar.vue index ed86c964..1db304aa 100644 --- a/fontspector-web/www/src/components/Navbar.vue +++ b/fontspector-web/www/src/components/Navbar.vue @@ -29,14 +29,15 @@ function downloadReport() {