openwebf · devjiangzhou · Jul 13, 2023 · Jul 12, 2023 · Jul 12, 2023
diff --git a/bridge/polyfill/src/connection.ts b/bridge/polyfill/src/connection.ts
diff --git a/bridge/polyfill/src/navigator.ts b/bridge/polyfill/src/navigator.ts
@@ -4,10 +4,8 @@
 */
 
 import { webf } from './webf';
-import connection from './connection';
 
 export const navigator = {
- connection,
  // UA is read-only.
  get userAgent() {
  return webf.invokeModule('Navigator', 'getUserAgent');

diff --git a/bridge/polyfill/src/webf.ts b/bridge/polyfill/src/webf.ts
@@ -5,9 +5,7 @@
 
 import { addWebfModuleListener, webfInvokeModule, clearWebfModuleListener, removeWebfModuleListener } from './bridge';
 import { methodChannel, triggerMethodCallHandler } from './method-channel';
-import { dispatchConnectivityChangeEvent } from "./connection";
 
-addWebfModuleListener('Connection', (event, data) => dispatchConnectivityChangeEvent(event));
 addWebfModuleListener('MethodChannel', (event, data) => triggerMethodCallHandler(data[0], data[1]));
 
 export const webf = {

diff --git a/integration_tests/specs/navigator/navigator.ts b/integration_tests/specs/navigator/navigator.ts
@@ -1,9 +1,4 @@
 describe('Navigator', () => {
- it('connectivity', async () => {
- let connection = await navigator.connection.getConnectivity();
- expect(connection.isConnected).toBeTrue();
- });
-
  it('hardwareConcurrency', () => {
  expect(navigator.hardwareConcurrency > 0).toBeTrue();
  });

diff --git a/webf/example/macos/Flutter/GeneratedPluginRegistrant.swift b/webf/example/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -5,12 +5,10 @@
 import FlutterMacOS
 import Foundation
 
-import connectivity_plus
 import shared_preferences_foundation
 import webf
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
- ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin"))
  SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
  WebFPlugin.register(with: registry.registrar(forPlugin: "WebFPlugin"))
 }
diff --git a/webf/example/macos/Podfile b/webf/example/macos/Podfile
@@ -37,7 +37,7 @@ post_install do |installer|
  installer.pods_project.targets.each do |target|
  flutter_additional_macos_build_settings(target)
  target.build_configurations.each do |config|
- config.build_settings['MACOSX_DEPLOYMENT_TARGET'] = '10.11'
+ config.build_settings['MACOSX_DEPLOYMENT_TARGET'] = '10.14'
  end
  end
 end
diff --git a/webf/example/macos/Runner.xcodeproj/project.pbxproj b/webf/example/macos/Runner.xcodeproj/project.pbxproj
@@ -260,17 +260,13 @@
  );
  inputPaths = (
  "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
- "${BUILT_PRODUCTS_DIR}/ReachabilitySwift/Reachability.framework",
- "${BUILT_PRODUCTS_DIR}/connectivity_plus/connectivity_plus.framework",
  "${BUILT_PRODUCTS_DIR}/shared_preferences_foundation/shared_preferences_foundation.framework",
  "${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/webf/macos/libwebf.dylib",
  "${PODS_ROOT}/../Flutter/ephemeral/.symlinks/plugins/webf/macos/libquickjs.dylib",
  "${BUILT_PRODUCTS_DIR}/webf/webf.framework",
  );
  name = "[CP] Embed Pods Frameworks";
  outputPaths = (
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/connectivity_plus.framework",
  "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences_foundation.framework",
  "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libwebf.dylib",
  "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libquickjs.dylib",

diff --git a/webf/example/windows/flutter/generated_plugin_registrant.cc b/webf/example/windows/flutter/generated_plugin_registrant.cc
@@ -6,12 +6,9 @@
 
 #include "generated_plugin_registrant.h"
 
-#include <connectivity_plus/connectivity_plus_windows_plugin.h>
 #include <webf/webf_plugin.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
- ConnectivityPlusWindowsPluginRegisterWithRegistrar(
- registry->GetRegistrarForPlugin("ConnectivityPlusWindowsPlugin"));
  WebfPluginRegisterWithRegistrar(
  registry->GetRegistrarForPlugin("WebfPlugin"));
 }
diff --git a/webf/example/windows/flutter/generated_plugins.cmake b/webf/example/windows/flutter/generated_plugins.cmake
@@ -3,7 +3,6 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
- connectivity_plus
  webf
 )
 

diff --git a/webf/lib/module.dart b/webf/lib/module.dart
@@ -6,7 +6,6 @@
 export 'src/module/module_manager.dart';
 export 'src/module/async_storage.dart';
 export 'src/module/clipboard.dart';
-export 'src/module/connection.dart';
 export 'src/module/fetch.dart';
 export 'src/module/method_channel.dart';
 export 'src/module/schedule_frame.dart';

diff --git a/webf/lib/src/module/connection.dart b/webf/lib/src/module/connection.dart
diff --git a/webf/lib/src/module/module_manager.dart b/webf/lib/src/module/module_manager.dart
@@ -34,7 +34,6 @@ void _defineModuleCreator() {
  _isDefined = true;
  _defineModule((ModuleManager? moduleManager) => AsyncStorageModule(moduleManager));
  _defineModule((ModuleManager? moduleManager) => ClipBoardModule(moduleManager));
- _defineModule((ModuleManager? moduleManager) => ConnectionModule(moduleManager));
  _defineModule((ModuleManager? moduleManager) => FetchModule(moduleManager));
  _defineModule((ModuleManager? moduleManager) => MethodChannelModule(moduleManager));
  _defineModule((ModuleManager? moduleManager) => NavigationModule(moduleManager));

diff --git a/webf/pubspec.yaml b/webf/pubspec.yaml
@@ -21,7 +21,6 @@ dependencies:
  quiver: ^3.2.1 # Pure dart module.
  vector_math: ^2.1.2 # Pure dart module.
  source_span: ^1.9.0 # Pure dart module.
- connectivity_plus: ^3.0.6 # No AndroidX used.
  shared_preferences: 2.2.0 # No AndroidX used.
  archive: ^3.3.7 # Pure dart module.
  web_socket_channel: ^2.2.0