Fixing for loading and tests

tuzig · Aug 28, 2024 · d9059f1 · d9059f1
1 parent b56bba7
commit d9059f1
Show file tree

Hide file tree

Showing 5 changed files with 715 additions and 900 deletions.
diff --git a/ios/App/Podfile.lock b/ios/App/Podfile.lock
@@ -1,35 +1,35 @@
 PODS:
-  - Capacitor (6.1.1):
+  - Capacitor (6.1.2):
     - CapacitorCordova
-  - CapacitorApp (6.0.0):
+  - CapacitorApp (6.0.1):
     - Capacitor
-  - CapacitorBrowser (6.0.1):
+  - CapacitorBrowser (6.0.2):
     - Capacitor
-  - CapacitorCamera (6.0.1):
+  - CapacitorCamera (6.0.2):
     - Capacitor
-  - CapacitorClipboard (6.0.0):
+  - CapacitorClipboard (6.0.1):
     - Capacitor
   - CapacitorCommunityNativeAudio (5.0.1):
     - Capacitor
-  - CapacitorCordova (6.1.1)
-  - CapacitorDevice (6.0.0):
+  - CapacitorCordova (6.1.2)
+  - CapacitorDevice (6.0.1):
     - Capacitor
-  - CapacitorFilesystem (6.0.0):
+  - CapacitorFilesystem (6.0.1):
     - Capacitor
-  - CapacitorKeyboard (6.0.1):
+  - CapacitorKeyboard (6.0.2):
     - Capacitor
   - CapacitorNativeBiometric (0.0.1):
     - Capacitor
-  - CapacitorNetwork (6.0.1):
+  - CapacitorNetwork (6.0.2):
     - Capacitor
-  - CapacitorPreferences (6.0.1):
+  - CapacitorPreferences (6.0.2):
     - Capacitor
   - CapacitorRateApp (4.0.3):
     - Capacitor
   - CapacitorSshPlugin (0.5.4):
     - Capacitor
     - NMSSHT7 (~> 2.9)
-  - CapacitorStatusBar (6.0.0):
+  - CapacitorStatusBar (6.0.1):
     - Capacitor
   - NMSSHT7 (2.9.1)
   - PurchasesHybridCommon (11.1.1):
@@ -101,22 +101,22 @@ EXTERNAL SOURCES:
     :path: "../../node_modules/@revenuecat/purchases-capacitor"
 
 SPEC CHECKSUMS:
-  Capacitor: 8941aba4364ba9d1b22188569001f2ce45cc2b00
-  CapacitorApp: 9d53aec7101f7b030a950c5bdc4df8612576b279
-  CapacitorBrowser: 473c7fd70ddbe541608ff09ec1be14da0078279e
-  CapacitorCamera: 3b77b3e8311b98220de65e63445c0e4d0b30ce3a
-  CapacitorClipboard: 80282f684154124b9019ebf401235b70b0cf4994
+  Capacitor: 679f9673fdf30597493a6362a5d5bf233d46abc2
+  CapacitorApp: 0bc633b4eae40a1f32cd2834788fad3bc42da6a1
+  CapacitorBrowser: 83ec661a9ccd56c28a6851e4dd1ac33b181227ec
+  CapacitorCamera: ed022171dbf3853e68eec877b4d78995378af6b7
+  CapacitorClipboard: 756cd7e83e8d5d19b0c74f40b57517c287bd5fe2
   CapacitorCommunityNativeAudio: 1a4d5490acb59f155602c0b6bcf1b42ee4efe91b
-  CapacitorCordova: 8f2cc8d8d3619c566e9418fe8772064a94266106
-  CapacitorDevice: f8fd88f9edd1261c55a109f32015b09bbbfdc4a0
-  CapacitorFilesystem: 60e59ba274c234a979e7a3be2552feaadcee4263
-  CapacitorKeyboard: 5f32a712adf41e07a61caafb82cf29fb6d8ba123
+  CapacitorCordova: f48c89f96c319101cd2f0ce8a2b7449b5fb8b3dd
+  CapacitorDevice: 7097a1deb4224b77fd13a6e60a355d0062a5d772
+  CapacitorFilesystem: 37fb3aa5c945b4539ab11c74a5c57925a302bf24
+  CapacitorKeyboard: 2700f9b18687be021e28b5a09b59eb151a46d5e0
   CapacitorNativeBiometric: b47637a8cd349bdac014424bb4ddcae9ee5d4919
-  CapacitorNetwork: 5c94acfdddc22043f2ffaff224ce9b4aa5a179f0
-  CapacitorPreferences: 72909b165bc7807103778ddbb86d5d8ce06abf71
+  CapacitorNetwork: 8796cf1f1104a00b289957b6150b7c60e1c2a8d3
+  CapacitorPreferences: e8284bf740cf8c6d3f25409af3c01df87dfeb5a1
   CapacitorRateApp: 896df7ec6a237fea72d1955e0cb26394654b00db
   CapacitorSshPlugin: 79f67cb26d40bd0c07cec6dda93d93d5faf7b614
-  CapacitorStatusBar: 2e4369f99166125435641b1908d05f561eaba6f6
+  CapacitorStatusBar: b81d4fb5d4e0064c712018071b3ab4b810b39a63
   NMSSHT7: 67f9d8f43b40b997728761b4cf2aa7ea660ba7c2
   PurchasesHybridCommon: 73f4f2c6e4ec3487b4219bf60e1661100fb85da3
   RevenueCat: 3d934653b7e8b09af88fd47e9e84cfaf5d0a89ba

diff --git a/package.json b/package.json
@@ -67,9 +67,9 @@
     "native-run": "^1.7.4",
     "typescript": "<5",
     "vi-canvas-mock": "^1.0.0",
-    "vite": "^4.5.3",
-    "vite-plugin-pwa": "^0.16.4",
-    "vitest": "<1.0.0",
+    "vite": "^5.4.2",
+    "vite-plugin-pwa": "^0.20.1",
+    "vitest": "^2.0.5",
     "workbox-build": "^7.0.0",
     "workbox-window": "^7.0.0",
     "yarn": "^1.22.17"

diff --git a/src/map.ts b/src/map.ts
@@ -29,17 +29,17 @@ export async function openEmulator(e: HTMLElement, t: Terminal) {
         fontFamily = "FiraCode"
     }
     t.options.fontFamily = fontFamily
-    if (fontFamily === "FiraCode") {
+    // @ts-ignore
+    if (!import.meta.env.TEST) {
         try {
             await new FontFaceObserver(fontFamily).load(null, 200)
             await new FontFaceObserver(fontFamily, { weight: "bold" }).load(null, 200)
-            t.open(e)
         } catch (e) {
-            t.options.fontFamily = "monospace"
-            t.open(e)
+            this.notify(`Font ${fontFamily} not found, using FiraCode`)
+            t.options.fontFamily = "FiraCode"
         }   
-    } else
-        t.open(e)
+    }
+    t.open(e)
 }
 
 type GatePadHTMLElement = HTMLDivElement & {gate: Gate}

diff --git a/tsconfig.json b/tsconfig.json
@@ -6,10 +6,11 @@
         "src/__mocks__/**/*.ts"
     ],
    "compilerOptions": {
-       "target": "es6",
+       "target": "ES2022", 
+       "module": "ES2022", 
        "allowSyntheticDefaultImports": true,
-       "module": "es6",
-       "lib": ["es6", "dom"],
-       "moduleResolution": "node"
+       "lib": ["es2022", "dom"],
+       "moduleResolution": "node",
+       "skipLibCheck": true
    }
 }