Add null safety to web implementation

Author: mvanbeusekom

packages/url_launcher/url_launcher_web/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.2.0-nullsafety
+
+- Migrate to null safety.
+
 # 0.1.4+2
 
 - Move `lib/third_party` to `lib/src/third_party`.

packages/url_launcher/url_launcher_web/lib/url_launcher_web.dart

@@ -16,7 +16,7 @@ const _safariTargetTopSchemes = {
   'tel',
   'sms',
 };
-String _getUrlScheme(String url) => Uri.tryParse(url)?.scheme;
+String? _getUrlScheme(String url) => Uri.tryParse(url)?.scheme;
 
 bool _isSafariTargetTopScheme(String url) =>
     _safariTargetTopSchemes.contains(_getUrlScheme(url));
@@ -35,7 +35,7 @@ class UrlLauncherPlugin extends UrlLauncherPlatform {
   }.union(_safariTargetTopSchemes);
 
   /// A constructor that allows tests to override the window object used by the plugin.
-  UrlLauncherPlugin({@visibleForTesting html.Window debugWindow})
+  UrlLauncherPlugin({@visibleForTesting html.Window? debugWindow})
       : _window = debugWindow ?? html.window {
     _isSafari = navigatorIsSafari(_window.navigator);
   }
@@ -49,7 +49,7 @@ class UrlLauncherPlugin extends UrlLauncherPlatform {
   ///
   /// Returns the newly created window.
   @visibleForTesting
-  html.WindowBase openNewWindow(String url, {String webOnlyWindowName}) {
+  html.WindowBase openNewWindow(String url, {String? webOnlyWindowName}) {
     // We need to open mailto, tel and sms urls on the _top window context on safari browsers.
     // See https://github.com/flutter/flutter/issues/51461 for reference.
     final target = webOnlyWindowName ??
@@ -65,13 +65,13 @@ class UrlLauncherPlugin extends UrlLauncherPlatform {
   @override
   Future<bool> launch(
     String url, {
-    @required bool useSafariVC,
-    @required bool useWebView,
-    @required bool enableJavaScript,
-    @required bool enableDomStorage,
-    @required bool universalLinksOnly,
-    @required Map<String, String> headers,
-    String webOnlyWindowName,
+    bool useSafariVC = false,
+    bool useWebView = false,
+    bool enableJavaScript = false,
+    bool enableDomStorage = false,
+    bool universalLinksOnly = false,
+    Map<String, String> headers = const <String, String>{},
+    String? webOnlyWindowName,
   }) {
     return Future<bool>.value(
         openNewWindow(url, webOnlyWindowName: webOnlyWindowName) != null);

packages/url_launcher/url_launcher_web/pubspec.yaml

@@ -4,7 +4,7 @@ homepage: https://github.com/flutter/plugins/tree/master/packages/url_launcher/u
 # 0.1.y+z is compatible with 1.0.0, if you land a breaking change bump
 # the version to 2.0.0.
 # See more details: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0
-version: 0.1.4+2
+version: 0.2.0-nullsafety
 
 flutter:
   plugin:
@@ -21,19 +21,19 @@ dependencies:
     sdk: flutter
   flutter_web_plugins:
     sdk: flutter
-  meta: ^1.1.7
+  meta: ^1.3.0-nullsafety.3
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
   # TODO(mvanbeusekom): Update to use pub.dev once null safety version is published.
   url_launcher:
     path: ../url_launcher
-  pedantic: ^1.8.0
+  pedantic: ^1.10.0-nullsafety.1
   mockito: ^4.1.1
   integration_test:
     path: ../../integration_test
 
 environment:
-  sdk: ">=2.2.0 <3.0.0"
+  sdk: ">=2.10.0-56.0.dev <3.0.0"
   flutter: ">=1.10.0 <2.0.0"

packages/url_launcher/url_launcher_web/test/test_driver/url_launcher_web_integration.dart

@@ -5,6 +5,8 @@
 import 'dart:html' as html;
 import 'package:flutter_test/flutter_test.dart';
 import 'package:url_launcher_web/url_launcher_web.dart';
+// TODO(mvanbeusekom): Remove once Mockito is migrated to null safety.
+// @dart = 2.9
 import 'package:mockito/mockito.dart';
 import 'package:integration_test/integration_test.dart';
 
@@ -16,10 +18,10 @@ void main() {
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();
 
   group('UrlLauncherPlugin', () {
-    _MockWindow mockWindow;
-    _MockNavigator mockNavigator;
+    late _MockWindow mockWindow;
+    late _MockNavigator mockNavigator;
 
-    UrlLauncherPlugin plugin;
+    late UrlLauncherPlugin plugin;
 
     setUp(() {
       mockWindow = _MockWindow();
@@ -70,12 +72,6 @@ void main() {
         expect(
             plugin.launch(
               'https://www.google.com',
-              useSafariVC: null,
-              useWebView: null,
-              universalLinksOnly: null,
-              enableDomStorage: null,
-              enableJavaScript: null,
-              headers: null,
             ),
             completion(isTrue));
       });
@@ -84,12 +80,6 @@ void main() {
         expect(
             plugin.launch(
               'mailto:[email protected]',
-              useSafariVC: null,
-              useWebView: null,
-              universalLinksOnly: null,
-              enableDomStorage: null,
-              enableJavaScript: null,
-              headers: null,
             ),
             completion(isTrue));
       });
@@ -98,12 +88,6 @@ void main() {
         expect(
             plugin.launch(
               'tel:5551234567',
-              useSafariVC: null,
-              useWebView: null,
-              universalLinksOnly: null,
-              enableDomStorage: null,
-              enableJavaScript: null,
-              headers: null,
             ),
             completion(isTrue));
       });
@@ -112,12 +96,6 @@ void main() {
         expect(
             plugin.launch(
               'sms:+19725551212?body=hello%20there',
-              useSafariVC: null,
-              useWebView: null,
-              universalLinksOnly: null,
-              enableDomStorage: null,
-              enableJavaScript: null,
-              headers: null,
             ),
             completion(isTrue));
       });