fix: “smaller” normalize url + normalizeUrls && normalizeUrlsOptions options

Author: farfromrefug

package.json

@@ -41,6 +41,7 @@
         "lerna": "^4.0.0",
         "nativescript-vue": "^2.9.0",
         "ng-packagr": "~12.2.0",
+        "normalize-url": "^7.0.2",
         "prettier": "^2.3.2",
         "promise-polyfill": "^8.2.0",
         "react-nativescript": "^2.2.0",
@@ -55,7 +56,6 @@
         "tslib": "^2.3.0",
         "typedoc": "^0.21.5",
         "typescript": "~4.3.5",
-        "url": "^0.11.0",
         "vue": "^2.6.14",
         "yargs": "^17.1.0"
     },

packages/webview-rtc/.npmignore

@@ -1,4 +1,5 @@
 node_modules/
+pnpm-global/
 src/
 bin/
 hooks/

packages/webview/.npmignore

@@ -1,4 +1,5 @@
 node_modules/
+pnpm-global/
 src/
 bin/
 hooks/

packages/webview/package.json

@@ -70,6 +70,6 @@
     "license": "Apache-2.0",
     "readmeFilename": "README.md",
     "dependencies": {
-        "url": "^0.11.0"
+        "normalize-url": "^7.0.2"
     }
 }

src/webview/index.common.ts

@@ -3,7 +3,7 @@
 import { CSSType, ContainerView, EventData, File, Property, Trace, booleanConverter, knownFolders, path } from '@nativescript/core';
 import { isEnabledProperty } from '@nativescript/core/ui/core/view';
 import { metadataViewPort, promisePolyfill, webViewBridge } from './nativescript-webview-bridge-loader';
-import * as URL from 'url';
+import normalizeUrl from 'normalize-url';
 
 export interface ViewPortProperties {
     width?: number | 'device-width';
@@ -58,6 +58,7 @@ export const webConsoleProperty = new Property<WebViewExtBase, boolean>({
     valueConverter: booleanConverter
 });
 
+
 export const displayZoomControlsProperty = new Property<WebViewExtBase, boolean>({
     name: 'displayZoomControls',
     defaultValue: true,
@@ -101,6 +102,15 @@ export const isScrollEnabledProperty = new Property<WebViewExtBase, boolean>({
     valueConverter: booleanConverter
 });
 
+export const normalizeUrlsProperty = new Property<WebViewExtBase, boolean>({
+    name: 'normalizeUrls',
+    defaultValue: true,
+    valueConverter: booleanConverter
+});
+export const normalizeUrlsOptionsProperty = new Property<WebViewExtBase, any>({
+    name: 'normalizeUrlsOptions'
+});
+
 export type ViewPortValue = boolean | ViewPortProperties;
 export const viewPortProperty = new Property<WebViewExtBase, ViewPortValue>({
     name: 'viewPortSize',
@@ -363,7 +373,9 @@ export class UnsupportedSDKError extends Error {
 
 @CSSType('WebView')
 export abstract class WebViewExtBase extends ContainerView {
-    public webConsole: boolean;
+    public webConsoleEnabled: boolean;
+    public normalizeUrls: boolean;
+    public normalizeUrlsOptions: any;
 
     public static readonly supportXLocalScheme: boolean;
 
@@ -1092,15 +1104,11 @@ export abstract class WebViewExtBase extends ContainerView {
     }
 
     public normalizeURL(url: string): string {
-        if (!url) {
-            return url;
-        }
-
-        if (url.startsWith(this.interceptScheme)) {
+        if (!url || !this.normalizeUrls || url.startsWith(this.interceptScheme)) {
             return url;
         }
 
-        return URL.parse(url).format();
+        return normalizeUrl(url, this.normalizeUrlsOptions);
     }
 
     /**
@@ -1561,6 +1569,8 @@ cacheModeProperty.register(WebViewExtBase);
 databaseStorageProperty.register(WebViewExtBase);
 debugModeProperty.register(WebViewExtBase);
 webConsoleProperty.register(WebViewExtBase);
+normalizeUrlsProperty.register(WebViewExtBase);
+normalizeUrlsOptionsProperty.register(WebViewExtBase);
 displayZoomControlsProperty.register(WebViewExtBase);
 domStorageProperty.register(WebViewExtBase);
 srcProperty.register(WebViewExtBase);