wait, does master work?

Jigsaw-Code · Mar 5, 2025 · a5e1052 · a5e1052
1 parent fa7aa4a
commit a5e1052
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 12 deletions.
diff --git a/x/examples/web-wrapper/README.md b/x/examples/web-wrapper/README.md
@@ -41,7 +41,7 @@ npm run open:ios
 open "$(mkcert -CAROOT)"
 ```
 
-Start the app in XCode, drag the root CA that mkcert generated into the simulator, the n restart the app.
+Start the app in XCode, drag the `rootCA.pem` that mkcert generated into the simulator, then restart the app.
 
 ## Running the example on the **Android emulator** via MacOS
 

diff --git a/x/examples/web-wrapper/android/app/src/main/java/org/getoutline/pwa/MainActivity.kt b/x/examples/web-wrapper/android/app/src/main/java/org/getoutline/pwa/MainActivity.kt
@@ -20,7 +20,7 @@ class MainActivity : BridgeActivity() {
             this.proxy = Mobileproxy.runProxy(
                 "127.0.0.1:0",
                 Mobileproxy.newSmartStreamDialer(
-                    Mobileproxy.newListFromLines("https://local.dev:3000"),
+                    Mobileproxy.newListFromLines("www.example.com"),
                     "{\"dns\":[{\"https\":{\"name\":\"9.9.9.9\"}}],\"tls\":[\"\",\"split:1\",\"split:2\",\"tlsfrag:1\"]}",
                     Mobileproxy.newStderrLogWriter()
                 )

diff --git a/x/examples/web-wrapper/capacitor.config.json b/x/examples/web-wrapper/capacitor.config.json
@@ -8,9 +8,9 @@
     }
   },
   "server": {
-    "url": "https://local.dev:3000"
+    "url": "local.dev:3000"
   },
   "ios": {
-    "limitsNavigationsToAppBoundDomains": true
+    "limitsNavigationsToAppBoundDomains": false
   }
 }
diff --git a/.../web-wrapper/generated/mobileproxy.xcframework/ios-arm64/Mobileproxy.framework/Info.plist b/.../web-wrapper/generated/mobileproxy.xcframework/ios-arm64/Mobileproxy.framework/Info.plist
@@ -9,9 +9,9 @@
   <key>MinimumOSVersion</key>
   <string>100.0</string>
   <key>CFBundleShortVersionString</key>
-  <string>0.0.1728590684</string>
+  <string>0.0.1741199655</string>
   <key>CFBundleVersion</key>
-  <string>0.0.1728590684</string>
+  <string>0.0.1741199655</string>
   <key>CFBundlePackageType</key>
   <string>FMWK</string>
 </dict>

diff --git a/...web-wrapper/generated/mobileproxy.xcframework/ios-arm64/Mobileproxy.framework/Mobileproxy b/...web-wrapper/generated/mobileproxy.xcframework/ios-arm64/Mobileproxy.framework/Mobileproxy
diff --git a/...rated/mobileproxy.xcframework/ios-arm64_x86_64-simulator/Mobileproxy.framework/Info.plist b/...rated/mobileproxy.xcframework/ios-arm64_x86_64-simulator/Mobileproxy.framework/Info.plist
@@ -9,9 +9,9 @@
   <key>MinimumOSVersion</key>
   <string>100.0</string>
   <key>CFBundleShortVersionString</key>
-  <string>0.0.1728590684</string>
+  <string>0.0.1741199655</string>
   <key>CFBundleVersion</key>
-  <string>0.0.1728590684</string>
+  <string>0.0.1741199655</string>
   <key>CFBundlePackageType</key>
   <string>FMWK</string>
 </dict>

diff --git a/...ated/mobileproxy.xcframework/ios-arm64_x86_64-simulator/Mobileproxy.framework/Mobileproxy b/...ated/mobileproxy.xcframework/ios-arm64_x86_64-simulator/Mobileproxy.framework/Mobileproxy
diff --git a/x/examples/web-wrapper/ios/App/App/AppDelegate.swift b/x/examples/web-wrapper/ios/App/App/AppDelegate.swift
@@ -19,7 +19,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     func applicationDidBecomeActive(_ application: UIApplication) {
         var dialerError: NSError?
         if let dialer = MobileproxyNewSmartStreamDialer(
-            MobileproxyNewListFromLines("https://local.dev:3000"),
+            MobileproxyNewListFromLines("www.example.com"),
             "{\"dns\":[{\"https\":{\"name\":\"9.9.9.9\"}}],\"tls\":[\"\",\"split:1\",\"split:2\",\"tlsfrag:1\"]}",
             MobileproxyNewStderrLogWriter(),
             &dialerError

diff --git a/x/examples/web-wrapper/ios/App/App/Info.plist b/x/examples/web-wrapper/ios/App/App/Info.plist
@@ -47,7 +47,7 @@
 	<true/>
 	<key>WKAppBoundDomains</key>
 	<array>
-		<string>local.dev:3000</string>
+		<string>local.dev</string>
 	</array>
 </dict>
 </plist>
diff --git a/x/examples/web-wrapper/package.json b/x/examples/web-wrapper/package.json
@@ -27,7 +27,7 @@
     "reset": "npm run clean && npm ci && npx cap sync",
     "cert:create": "mkdir -p output/cert && JAVA_HOME=$(/usr/libexec/java_home) mkcert -install && JAVA_HOME=$(/usr/libexec/java_home) mkcert -key-file output/cert/dev-key.pem -cert-file output/cert/dev.pem local.dev",
     "start:www": "npm run cert:create && npx serve --ssl-cert output/cert/dev.pem --ssl-key output/cert/dev-key.pem www",
-    "open:ios": "npx cap open ios",
+    "open:ios": "npx cap sync ios && npx cap open ios",
     "start:android": "npx cap run android"
   }
 }
diff --git a/x/examples/web-wrapper/www/index.html b/x/examples/web-wrapper/www/index.html
@@ -39,7 +39,6 @@
             </ion-button>
           </button>
         </ion-buttons>
-        <ion-title>Back Button</ion-title>
       </ion-toolbar>
 
       <iframe id="my-site" src="my-site.html"></iframe>