chore: improve way native server url provided

e-picsa · Feb 23, 2024 · b74c403 · b74c403
1 parent 705d3f9
commit b74c403
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/apps/picsa-apps/extension-app-native/.env.serve b/apps/picsa-apps/extension-app-native/.env.serve
@@ -0,0 +1 @@
+SERVER_URL=http://0.0.0.0:4200
diff --git a/apps/picsa-apps/extension-app-native/.gitignore b/apps/picsa-apps/extension-app-native/.gitignore
@@ -1,2 +1,3 @@
 resources/android
-.idea
+.idea
+*.local
diff --git a/apps/picsa-apps/extension-app-native/capacitor.config.ts b/apps/picsa-apps/extension-app-native/capacitor.config.ts
@@ -40,12 +40,6 @@ const config: CapacitorConfig = {
   //   },
   // },
   server: {
-    /**
-     * Uncomment and replace with local ip to serve live-reload
-     * See notes at https://docs.picsa.app/advanced/testing
-     **/
-
-    // url: 'http://192.168.50.67:4200',
     androidScheme: 'http',
 
     /**
@@ -56,4 +50,12 @@ const config: CapacitorConfig = {
   },
 };
 
+/**
+ * Additional configuration used to support live-reloading the app from a dev server
+ * See notes at https://docs.picsa.app/advanced/testing
+ **/
+if (process.env.SERVER_URL) {
+  config.server = { ...config.server, url: process.env.SERVER_URL };
+}
+
 export default config;
diff --git a/apps/picsa-apps/extension-app-native/project.json b/apps/picsa-apps/extension-app-native/project.json
@@ -16,12 +16,15 @@
     },
     "serve": {
       "executor": "nx:run-commands",
-      "description": "Serve extension app in external mode to connect. NOTE - need to update capacitor.config.ts before build",
+      "description": "Serve extension app in external mode to support live-reload",
       "dependsOn": ["build"],
       "options": {
-        "commands": ["nx run picsa-apps-extension-app:serve --configuration=external"]
+        "commands": ["npx cap sync", "nx run picsa-apps-extension-app:serve --configuration=external"],
+        "cwd": "apps/picsa-apps/extension-app-native",
+        "parallel": false
       }
     },
+
     "resources": {
       "executor": "nx:run-commands",
       "description": "Populate splash and icon from resources files. NOTE - may have to run manually from directory",