chore: rebuild native-code for iOS

Author: m-abs

.gitignore

@@ -24,3 +24,4 @@ demo/report/stats.json
 package-lock.json
 typings
 tests/test-runner/index.d.ts
+tests/tsconfig.tns.json

README.md

@@ -56,7 +56,7 @@ The custom `NSURLProtocol` used with UIWebView is shared with all instances of t
 | loadUrl(src: string): Promise<LoadFinishedEventData> | Open a URL and returns a promise once it has finished loading. |
 | registerLocalResource(resourceName: string, path: string): void; | Map the "x-local://{resourceName}" => "{path}". |
 | unregisterLocalResource(resourceName: string): void; | Removes the mapping from "x-local://{resourceName}" => "{path}" |
-| getRegistretLocalResource(resourceName: string): void; | Get the mapping from "x-local://{resourceName}" => "{path}" |
+| getRegisteredLocalResource(resourceName: string): void; | Get the mapping from "x-local://{resourceName}" => "{path}" |
 | loadJavaScriptFile(scriptName: string, filepath: string) | Inject a javascript-file into the webview. Should be called after the `loadFinishedEvent` |
 | loadStyleSheetFile(stylesheetName: string, filepath: string, insertBefore: boolean) | Loads a CSS-file into document.head. If before is true, it will be added to the top of document.head otherwise as the last element |
 | loadJavaScriptFiles(files: {resourceName: string, filepath: string}[]) | Inject multiple javascript-files into the webview. Should be called after the `loadFinishedEvent` |

src/package.json

@@ -29,8 +29,8 @@
         "run.http-server": "cd ../demo/www && npx hs -p 8080",
         "run.demo.android": "cd ../demo && tns run android --syncAllFiles",
         "run.demo.ios": "cd ../demo && tns run ios --syncAllFiles",
-        "run.test.android": "cd ../tests && tns run android --syncAllFiles",
-        "run.test.ios": "cd ../tests && tns run ios --syncAllFiles",
+        "run.test.android": "cd ../tests && tns run android --syncAllFiles --bundle",
+        "run.test.ios": "cd ../tests && tns run ios --syncAllFiles --bundle",
         "demo.ios": "npm run build && npm-run-all --parallel build:webview-bridge:watch plugin.tscwatch run.demo.ios run.http-server",
         "demo.android": "npm run build && npm-run-all --parallel build:webview-bridge:watch plugin.tscwatch run.demo.android run.http-server",
         "demo.reset": "git clean -d -x -f ../demo && npm install",

src/platforms/ios/NotaWebViewExt.framework/Headers/NotaWebViewExt-Swift.h

@@ -1,4 +1,4 @@
-// Generated by Apple Swift version 4.1.2 (swiftlang-902.0.54 clang-902.0.39.2)
+// Generated by Apple Swift version 4.2 effective-4.1.50 (swiftlang-1000.11.37.1 clang-1000.11.45.1)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wgcc-compat"
 
@@ -129,17 +129,17 @@ typedef unsigned int swift_uint4  __attribute__((__ext_vector_type__(4)));
 #endif
 #if !defined(SWIFT_ENUM_ATTR)
 # if defined(__has_attribute) && __has_attribute(enum_extensibility)
-#  define SWIFT_ENUM_ATTR __attribute__((enum_extensibility(open)))
+#  define SWIFT_ENUM_ATTR(_extensibility) __attribute__((enum_extensibility(_extensibility)))
 # else
-#  define SWIFT_ENUM_ATTR
+#  define SWIFT_ENUM_ATTR(_extensibility)
 # endif
 #endif
 #if !defined(SWIFT_ENUM)
-# define SWIFT_ENUM(_type, _name) enum _name : _type _name; enum SWIFT_ENUM_ATTR SWIFT_ENUM_EXTRA _name : _type
+# define SWIFT_ENUM(_type, _name, _extensibility) enum _name : _type _name; enum SWIFT_ENUM_ATTR(_extensibility) SWIFT_ENUM_EXTRA _name : _type
 # if __has_feature(generalized_swift_name)
-#  define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) enum _name : _type _name SWIFT_COMPILE_NAME(SWIFT_NAME); enum SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_ENUM_ATTR SWIFT_ENUM_EXTRA _name : _type
+#  define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME, _extensibility) enum _name : _type _name SWIFT_COMPILE_NAME(SWIFT_NAME); enum SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_ENUM_ATTR(_extensibility) SWIFT_ENUM_EXTRA _name : _type
 # else
-#  define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) SWIFT_ENUM(_type, _name)
+#  define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME, _extensibility) SWIFT_ENUM(_type, _name, _extensibility)
 # endif
 #endif
 #if !defined(SWIFT_UNAVAILABLE)
@@ -219,7 +219,7 @@ SWIFT_CLASS("_TtC14NotaWebViewExt22CustomUrlSchemeHandler") SWIFT_AVAILABILITY(i
 - (void)unregisterLocalResourceForKey:(NSString * _Nonnull)forKey;
 - (NSString * _Nullable)getRegisteredLocalResourceForKey:(NSString * _Nonnull)forKey SWIFT_WARN_UNUSED_RESULT;
 - (void)clearRegisteredLocalResource;
-- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER;
+- (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER SWIFT_AVAILABILITY(ios,introduced=11.0);
 @end
 
 #if __has_attribute(external_source_symbol)

src/platforms/ios/NotaWebViewExt.framework/Info.plist

@@ -144,6 +144,9 @@ export class WebViewExtBase extends View {
      */
     public autoInjectJSBridge = true;
 
+    /**
+     * Enable/disable debug-mode on android.
+     */
     public debugMode: boolean;
 
     /**
@@ -156,14 +159,23 @@ export class WebViewExtBase extends View {
      */
     protected autoInjectStyleSheetFiles = [] as LoadStyleSheetResource[];
 
-    /** List of code blocks to be executed after JS-files and CSS-files have been loaded. */
+    /**
+     * List of code blocks to be executed after JS-files and CSS-files have been loaded.
+     */
     protected autoInjectJavaScriptBlocks = [] as InjectExecuteJavaScript[];
 
-    /** Prevent this.src loading changes from the webview's onLoadFinished-event */
+    /**
+     * Prevent this.src loading changes from the webview's onLoadFinished-event
+     */
     protected tempSuspendSrcLoading = false;
 
+    /**
+     * Callback for the loadFinished-event. Called from the native-webview
+     */
     public _onLoadFinished(url: string, error?: string): Promise<LoadFinishedEventData> {
         if (!error) {
+            // When this is called without an error, update with this.src value without loading the url.
+            // This is needed to keep src up-to-date when linked are clicked inside the webview.
             try {
                 this.tempSuspendSrcLoading = true;
                 this.src = url;
@@ -194,7 +206,7 @@ export class WebViewExtBase extends View {
             return this.injectWebViewBridge()
                 .then(() => args)
                 .catch((error) => {
-                    return Object.assign({}, args, {error});
+                    return Object.assign({}, args, { error });
                 })
                 .then((args) => {
                     this.notify(args);
@@ -203,6 +215,12 @@ export class WebViewExtBase extends View {
         }
     }
 
+    /**
+     * Callback for onLoadStarted-event from the native webview
+     *
+     * @param url URL being loaded
+     * @param navigationType Type of navigation (iOS-only)
+     */
     public _onLoadStarted(url: string, navigationType?: NavigationType) {
         const args = {
             eventName: WebViewExtBase.loadStartedEvent,
@@ -214,6 +232,14 @@ export class WebViewExtBase extends View {
         this.notify(args);
     }
 
+    /**
+     * Callback for should override url loading.
+     * Called from the native-webview
+     * 
+     * @param url 
+     * @param httpMethod GET, POST etc
+     * @param navigationType Type of navigation (iOS-only)
+     */
     public _onShouldOverrideUrlLoading(url: string, httpMethod: string, navigationType?: NavigationType) {
         const args = {
             eventName: WebViewExtBase.shouldOverrideUrlLoadingEvent,
@@ -228,10 +254,16 @@ export class WebViewExtBase extends View {
         return args.cancel;
     }
 
+    /**
+     * Platform specific loadURL-implementation.
+     */
     public _loadUrl(src: string): void {
         throw new Error("Method not implemented.");
     }
 
+    /**
+     * Platform specific loadData-implementation.
+     */
     public _loadData(src: string): void {
         throw new Error("Method not implemented.");
     }
@@ -292,7 +324,7 @@ export class WebViewExtBase extends View {
 
         if (src.startsWith(this.interceptScheme)) {
             this.writeTrace(`WebViewExt.src = "${originSrc}" resolve x-local file`);
-            const fileparh = this.getRegistretLocalResource(src);
+            const fileparh = this.getRegisteredLocalResource(src);
             if (fileparh) {
                 src = `file://${fileparh}`;
                 this.writeTrace(`WebViewExt.src = "${originSrc}" x-local resolved to "${src}"`);
@@ -377,7 +409,10 @@ export class WebViewExtBase extends View {
         throw new Error("Method not implemented.");
     }
 
-    public getRegistretLocalResource(name: string) {
+    /**
+     * Resolve a "x-local://{name}" to file-path.
+     */
+    public getRegisteredLocalResource(name: string) {
         throw new Error("Method not implemented.");
     }
 
@@ -391,6 +426,7 @@ export class WebViewExtBase extends View {
         if (!src) {
             return this._onLoadFinished(src, 'empty src');
         }
+
         return new Promise<LoadFinishedEventData>((resolve, reject) => {
             const loadFinishedEvent = (args: LoadFinishedEventData) => {
                 this.off(WebViewExtBase.loadFinishedEvent, loadFinishedEvent);

src/platforms/ios/NotaWebViewExt.framework/Modules/NotaWebViewExt.swiftmodule/arm.swiftdoc

@@ -129,7 +129,7 @@ function initializeWebViewClient(): void {
                 return super.shouldInterceptRequest(view, request);
             }
 
-            const filepath = owner.getRegistretLocalResource(url);
+            const filepath = owner.getRegisteredLocalResource(url);
             if (!filepath) {
                 owner.writeTrace(`WebViewClientClass.shouldInterceptRequest("${url}") - no matching file`);
                 return super.shouldInterceptRequest(view, request);
@@ -395,12 +395,12 @@ export class WebViewExt extends WebViewExtBase {
         this.localResourceMap.delete(resourceName);
     }
 
-    public getRegistretLocalResource(resourceName: string) {
+    public getRegisteredLocalResource(resourceName: string) {
         resourceName = this.fixLocalResourceName(resourceName);
 
         const result = this.localResourceMap.get(resourceName);
 
-        this.writeTrace(`WebViewExt<android>.getRegistretLocalResource("${resourceName}") => "${result}"`);
+        this.writeTrace(`WebViewExt<android>.getRegisteredLocalResource("${resourceName}") => "${result}"`);
 
         return result;
     }

src/platforms/ios/NotaWebViewExt.framework/Modules/NotaWebViewExt.swiftmodule/arm.swiftmodule

@@ -281,7 +281,7 @@ export class WebViewExt extends WebViewExtBase {
         }
     }
 
-    public getRegistretLocalResource(resourceName: string) {
+    public getRegisteredLocalResource(resourceName: string) {
         resourceName = this.fixLocalResourceName(resourceName);
 
         let result: string;
@@ -293,7 +293,7 @@ export class WebViewExt extends WebViewExtBase {
             throw new Error('Not implemented for UIWebView');
         }
 
-        this.writeTrace(`WebViewExt<android>.getRegistretLocalResource("${resourceName}") -> "${result}"`);
+        this.writeTrace(`WebViewExt<android>.getRegisteredLocalResource("${resourceName}") -> "${result}"`);
         return result;
     }
 

src/platforms/ios/NotaWebViewExt.framework/Modules/NotaWebViewExt.swiftmodule/arm64.swiftdoc

@@ -29,8 +29,9 @@
     "byline": "^5.0.0",
     "filewalker": "0.1.2",
     "lazy": "1.0.11",
-    "nativescript-dev-typescript": "^0.7.1",
     "nativescript-app-environment": "^1.0.0",
+    "nativescript-dev-typescript": "^0.7.1",
+    "nativescript-dev-webpack": "^0.16.1",
     "tns-platform-declarations": "~4.0.0",
     "ts-node": "^6.0.3",
     "tslib": "^1.9.1",