Merge branch 'main' into storybook

# Conflicts: # package.json # pnpm-lock.yaml
iva2k · Sep 16, 2024 · c4fa522 · c4fa522
2 parents 46015a2 + 7a1ef4d
commit c4fa522
Show file tree

Hide file tree

Showing 20 changed files with 1,011 additions and 1,615 deletions.
diff --git a/.env.EXAMPLE b/.env.EXAMPLE
@@ -1,10 +1,14 @@
+#!/usr/bin/env bash
+
 PUBLIC_DOMAIN="example.com"
 PUBLIC_SITE_URL="https://example.com"
 
 PUBLIC_SENTRY_ORG_ID="123456"
 PUBLIC_SENTRY_PROJECT_ID="9876543"
 PUBLIC_SENTRY_KEY="01234567891bcdef0123456789abcd"
 
+VITE_PROD_DEBUG=false
+
 GITHUB_REPO='your-repo'
 GITHUB_OWNER='your-username'
 GITHUB_TOKEN='your-github-token'
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -1,7 +1,6 @@
 {
   "recommendations": [
     "svelte.svelte-vscode",
-    "fivethree.vscode-svelte-snippets",
     "formulahendry.auto-close-tag",
     "formulahendry.auto-rename-tag",
     "stylelint.vscode-stylelint",

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -5,72 +5,92 @@
   "version": "0.2.0",
   "compounds": [
     {
-      "name": "Server and Chrome",
-      "configurations": ["Launch server", "Launch Chrome against localhost:3000"]
+      "name": "Prod Server and Chrome",
+      "configurations": ["Prod Server", "Chrome against localhost:4173"]
     },
     {
-      "name": "Server (https) and Chrome",
-      "configurations": [
-        "Launch server (https)",
-        "Launch Chrome against https://total-app.backloop.dev:4443"
-      ]
+      "name": "Dev Server and Chrome",
+      "configurations": ["Dev Server", "Chrome against localhost:3000"]
+    },
+    {
+      "name": "Dev Server (https) and Chrome",
+      "configurations": ["Dev Server (https)", "Chrome against https://total-app.backloop.dev:4173"]
     },
     {
-      "name": "Server (SW) and Chrome",
-      "configurations": ["Launch server (SW)", "Launch Chrome against localhost:3000"]
+      "name": "Dev Server (SW) and Chrome",
+      "configurations": ["Dev Server (SW)", "Chrome against localhost:3000"]
     },
     {
-      "name": "Server (https, SW) and Chrome",
+      "name": "Dev Server (https, SW) and Chrome",
       "configurations": [
-        "Launch server (https, SW)",
-        "Launch Chrome against https://total-app.backloop.dev:4443"
+        "Dev Server (https, SW)",
+        "Chrome against https://total-app.backloop.dev:4173"
       ]
     },
     {
-      "name": "Server and Edge",
-      "configurations": ["Launch server", "Launch Edge"]
+      "name": "Dev Server and Edge",
+      "configurations": ["Dev Server", "Launch Edge"]
     }
   ],
   "configurations": [
     {
-      "name": "Launch server",
+      "name": "Prod Server",
+      "request": "launch",
+      "type": "node",
+      "runtimeExecutable": "pnpm",
+      "runtimeArgs": ["run", "preview:debug", "--", "--preserve-symlinks"],
+      "skipFiles": ["<node_internals>/**"],
+      "console": "internalConsole",
+      "sourceMaps": true,
+      "resolveSourceMapLocations": null
+    },
+    {
+      "name": "Dev Server",
       "request": "launch",
       "type": "node",
       // "runtimeExecutable": "bun",
       "runtimeExecutable": "pnpm",
-      "runtimeArgs": ["run", "dev"],
+      "runtimeArgs": ["run", "dev", "--", "--preserve-symlinks"],
       "skipFiles": ["<node_internals>/**"],
-      "console": "internalConsole"
+      "console": "internalConsole",
+      "sourceMaps": true,
+      "resolveSourceMapLocations": null
     },
     {
-      "name": "Launch server (https)",
+      "name": "Dev Server (https)",
       "request": "launch",
       "type": "node",
       // "runtimeExecutable": "bun",
       "runtimeExecutable": "pnpm",
       "runtimeArgs": ["run", "dev:https"],
       "skipFiles": ["<node_internals>/**"],
-      "console": "internalConsole"
+      "console": "internalConsole",
+      "sourceMaps": true,
+      "resolveSourceMapLocations": null
     },
     {
-      "name": "Launch server (SW)",
+      "name": "Dev Server (SW)",
       "request": "launch",
       "type": "node",
       // "runtimeExecutable": "bun",
       "runtimeExecutable": "pnpm",
       "runtimeArgs": ["run", "dev-sw:http"],
       "skipFiles": ["<node_internals>/**"],
-      "console": "internalConsole"
+      "console": "internalConsole",
+      "sourceMaps": true,
+      "resolveSourceMapLocations": null
     },
     {
-      "name": "Launch server (https, SW)",
+      "name": "Dev Server (https, SW)",
       "request": "launch",
       "type": "node",
       // "runtimeExecutable": "bun",
       "runtimeExecutable": "pnpm",
       "runtimeArgs": ["run", "dev-sw:https"],
       "skipFiles": ["<node_internals>/**"],
-      "console": "internalConsole"
+      "console": "internalConsole",
+      "sourceMaps": true,
+      "resolveSourceMapLocations": null
     },
     {
       "name": "Launch Edge",
@@ -98,7 +118,9 @@
       "type": "node",
       "runtimeExecutable": "pnpm",
       "runtimeArgs": ["run", "test:unit"],
-      "skipFiles": ["<node_internals>/**"]
+      "skipFiles": ["<node_internals>/**"],
+      "sourceMaps": true,
+      "resolveSourceMapLocations": null
     },
     {
       "name": "BROKEN pnpm test:unit (node-terminal)",
@@ -113,108 +135,126 @@
       "type": "node",
       "runtimeExecutable": "pnpm",
       "runtimeArgs": ["run", "test:integration"],
-      "skipFiles": ["<node_internals>/**"]
+      "skipFiles": ["<node_internals>/**"],
+      "sourceMaps": true,
+      "resolveSourceMapLocations": null
     },
     {
       "name": "pnpm test:integration:debug",
       "request": "launch",
       "type": "node",
       "runtimeExecutable": "pnpm",
       "runtimeArgs": ["run", "test:integration:debug"],
-      "skipFiles": ["<node_internals>/**"]
+      "skipFiles": ["<node_internals>/**"],
+      "sourceMaps": true,
+      "resolveSourceMapLocations": null
     },
     {
       "name": "pnpm postinstall",
       "request": "launch",
       "type": "node",
       "runtimeExecutable": "pnpm",
       "runtimeArgs": ["run", "postinstall"],
-      "skipFiles": ["<node_internals>/**"]
+      "skipFiles": ["<node_internals>/**"],
+      "sourceMaps": true,
+      "resolveSourceMapLocations": null
     },
     {
       "name": "pnpm build",
       "request": "launch",
       "type": "node",
       "runtimeExecutable": "pnpm",
       "runtimeArgs": ["run", "build"],
-      "skipFiles": ["<node_internals>/**"]
+      "skipFiles": ["<node_internals>/**"],
+      "sourceMaps": true,
+      "resolveSourceMapLocations": null
     },
     {
       "name": "pnpm build:only",
       "request": "launch",
       "type": "node",
       "runtimeExecutable": "pnpm",
       "runtimeArgs": ["run", "build:only"],
-      "skipFiles": ["<node_internals>/**"]
+      "skipFiles": ["<node_internals>/**"],
+      "sourceMaps": true,
+      "resolveSourceMapLocations": null
     },
     {
       "name": "pnpm build:netlify",
       "request": "launch",
       "type": "node",
       "runtimeExecutable": "pnpm",
       "runtimeArgs": ["run", "build:netlify"],
-      "skipFiles": ["<node_internals>/**"]
+      "skipFiles": ["<node_internals>/**"],
+      "sourceMaps": true,
+      "resolveSourceMapLocations": null
     },
     {
       "name": "pnpm build:vercel",
       "request": "launch",
       "type": "node",
       "runtimeExecutable": "pnpm",
       "runtimeArgs": ["run", "build:vercel"],
-      "skipFiles": ["<node_internals>/**"]
+      "skipFiles": ["<node_internals>/**"],
+      "sourceMaps": true,
+      "resolveSourceMapLocations": null
     },
     {
       "name": "pnpm build:only-sw",
       "request": "launch",
       "type": "node",
       "runtimeExecutable": "pnpm",
       "runtimeArgs": ["run", "build:only-sw"],
-      "skipFiles": ["<node_internals>/**"]
+      "skipFiles": ["<node_internals>/**"],
+      "sourceMaps": true,
+      "resolveSourceMapLocations": null
     },
     {
       "name": "pnpm build:only-destroy",
       "request": "launch",
       "type": "node",
       "runtimeExecutable": "pnpm",
       "runtimeArgs": ["run", "build:only-destroy"],
-      "skipFiles": ["<node_internals>/**"]
+      "skipFiles": ["<node_internals>/**"],
+      "sourceMaps": true,
+      "resolveSourceMapLocations": null
     },
     {
       "type": "chrome",
       "request": "launch",
-      "name": "Launch Chrome against localhost:3000",
+      "name": "Chrome against localhost:3000",
       "url": "http://localhost:3000",
       "webRoot": "${workspaceFolder}",
       "enableContentValidation": false // Important to align .svelte files lines to the browser code
     },
     {
       "type": "chrome",
       "request": "launch",
-      "name": "Launch Chrome against https://localhost:3000",
+      "name": "Chrome against https://localhost:3000",
       "url": "https://localhost:3000",
       "webRoot": "${workspaceFolder}",
       "enableContentValidation": false // Important to align .svelte files lines to the browser code
     },
     {
       "type": "chrome",
       "request": "launch",
-      "name": "Launch Chrome against https://total-app.backloop.dev:4443",
-      "url": "https://total-app.backloop.dev:4443",
+      "name": "Chrome against https://total-app.backloop.dev:4173",
+      "url": "https://total-app.backloop.dev:4173",
       "webRoot": "${workspaceFolder}",
       "enableContentValidation": false // Important to align .svelte files lines to the browser code
     },
     {
       "type": "chrome",
       "request": "launch",
-      "name": "Launch Chrome against localhost:4173",
+      "name": "Chrome against localhost:4173",
       "url": "http://localhost:4173",
-      "webRoot": "${workspaceFolder}",
+      "webRoot": "${workspaceFolder}/.svelte-kit/output/client",
       "enableContentValidation": false // Important to align .svelte files lines to the browser code
     },
     {
       "type": "chrome",
       "request": "launch",
-      "name": "Launch Chrome against https://localhost:4173",
+      "name": "Chrome against https://localhost:4173",
       "url": "https://localhost:4173",
       "webRoot": "${workspaceFolder}",
       "enableContentValidation": false // Important to align .svelte files lines to the browser code

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -32,6 +32,7 @@
   "svelte.plugin.svelte.useNewTransformation": false,
   "playwright.reuseBrowser": true,
   "typescript.disableAutomaticTypeAcquisition": true,
+  "typescript.preferences.importModuleSpecifier": "non-relative",
   "typescript.tsdk": "node_modules/typescript/lib",
   "javascript.format.enable": false,
   "javascript.updateImportsOnFileMove.enabled": "always",
@@ -41,6 +42,9 @@
     "localRoot": "${workspaceFolder}",
     "cwd": "${workspaceFolder}"
   },
+  "debug.javascript.autoAttachFilter": "always",
+  "javascript.validate.enable": false,
+  "js/ts.implicitProjectConfig.checkJs": false,
   "files.insertFinalNewline": true,
   "files.trimFinalNewlines": false,
   "[html]": {

diff --git a/CREATING.md b/CREATING.md
@@ -1283,21 +1283,21 @@ pnpm install @ionic/pwa-elements
 
 A typical installation involves importing the package and registering the elements, or adding a script tag to the \<head\> of the index.html for the app.
 
-There is an issue with TypeScript types, so we use `src/lib/utils/ionicUtils.cjs` that avoids this issue.
+There is an issue with TypeScript types, so we use `src/lib/utils/ionicUtils.ts` that avoids this issue.
 
 ```js
 // src/routes/+layout.svelte
 <script lang="ts">
   ...
 +  import { onMount } from 'svelte';
-+  import { loadIonicPWAElements } from '$lib/utils/ionicUtils.cjs';
++  import { loadIonicPWAElements } from '$lib/utils/ionicUtils.ts';
 +  onMount(async () => {
 +    await loadIonicPWAElements(window);
 +  });
   ...
 ```
 
-Note: `svelte-check` throws error for no type definition in `import loader ...`. See `src/lib/utils/ionicUtils.cjs` that shuts this error up.
+Note: `svelte-check` throws error for no type definition in `import loader ...`. See `src/lib/utils/ionicUtils.ts` that shuts this error up.
 
 #### Interesting Capacitor Community Plugins
 

diff --git a/android/capacitor.settings.gradle b/android/capacitor.settings.gradle
@@ -1,6 +1,6 @@
 // DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
 include ':capacitor-android'
-project(':capacitor-android').projectDir = new File('../node_modules/.pnpm/@[email protected].1_@[email protected].1/node_modules/@capacitor/android/capacitor')
+project(':capacitor-android').projectDir = new File('../node_modules/.pnpm/@[email protected].2_@[email protected].2/node_modules/@capacitor/android/capacitor')
 
 include ':capacitor-geolocation'
-project(':capacitor-geolocation').projectDir = new File('../node_modules/.pnpm/@[email protected].0_@[email protected].1/node_modules/@capacitor/geolocation/android')
+project(':capacitor-geolocation').projectDir = new File('../node_modules/.pnpm/@[email protected].1_@[email protected].2/node_modules/@capacitor/geolocation/android')
diff --git a/ios/App/Podfile b/ios/App/Podfile
@@ -1,4 +1,4 @@
-require_relative '../../node_modules/.pnpm/@[email protected].1_@[email protected].1/node_modules/@capacitor/ios/scripts/pods_helpers'
+require_relative '../../node_modules/.pnpm/@[email protected].2_@[email protected].2/node_modules/@capacitor/ios/scripts/pods_helpers'
 
 platform :ios, '13.0'
 use_frameworks!
@@ -9,9 +9,9 @@ use_frameworks!
 install! 'cocoapods', :disable_input_output_paths => true
 
 def capacitor_pods
-  pod 'Capacitor', :path => '../../node_modules/.pnpm/@[email protected].1_@[email protected].1/node_modules/@capacitor/ios'
-  pod 'CapacitorCordova', :path => '../../node_modules/.pnpm/@[email protected].1_@[email protected].1/node_modules/@capacitor/ios'
-  pod 'CapacitorGeolocation', :path => '../../node_modules/.pnpm/@[email protected].0_@[email protected].1/node_modules/@capacitor/geolocation'
+  pod 'Capacitor', :path => '../../node_modules/.pnpm/@[email protected].2_@[email protected].2/node_modules/@capacitor/ios'
+  pod 'CapacitorCordova', :path => '../../node_modules/.pnpm/@[email protected].2_@[email protected].2/node_modules/@capacitor/ios'
+  pod 'CapacitorGeolocation', :path => '../../node_modules/.pnpm/@[email protected].1_@[email protected].2/node_modules/@capacitor/geolocation'
 end
 
 target 'App' do