From fcbfbbda08d2d14bd3cd62c0c43ed50b9a247151 Mon Sep 17 00:00:00 2001 From: Peter Leibiger Date: Thu, 4 Jul 2024 14:47:58 +0200 Subject: [PATCH] Attempt to fix WASM compile errors (#2267) From what understand, we added conditional `js_interop` imports that force `dart:html` imports into WASM builds. Since we don't yet support WASM, I don't completely understand how it actually compiled to WASM before change. For now we can just remove the conditional imports and add them back together with actual WASM support. Hopefully fixes #2266 Signed-off-by: Alex Li Co-authored-by: Alex Li --- dio/CHANGELOG.md | 2 +- dio/lib/src/adapter.dart | 1 - dio/lib/src/compute/compute.dart | 4 +--- dio/lib/src/dio.dart | 1 - dio/lib/src/dio_mixin.dart | 1 - dio/lib/src/multipart_file.dart | 1 - 6 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dio/CHANGELOG.md b/dio/CHANGELOG.md index 2ec1fd902..030011bc9 100644 --- a/dio/CHANGELOG.md +++ b/dio/CHANGELOG.md @@ -5,7 +5,7 @@ See the [Migration Guide][] for the complete breaking changes list.** ## Unreleased -*None.* +- Fix WASM compile errors after moving the web implementation to `dio_web_adapter`. ## 5.5.0 diff --git a/dio/lib/src/adapter.dart b/dio/lib/src/adapter.dart index 1f88a3fc1..96bf2149d 100644 --- a/dio/lib/src/adapter.dart +++ b/dio/lib/src/adapter.dart @@ -4,7 +4,6 @@ import 'dart:typed_data'; import 'package:meta/meta.dart'; import 'adapters/io_adapter.dart' - if (dart.library.js_interop) 'adapters/browser_adapter.dart' if (dart.library.html) 'adapters/browser_adapter.dart' as adapter; import 'headers.dart'; import 'options.dart'; diff --git a/dio/lib/src/compute/compute.dart b/dio/lib/src/compute/compute.dart index 291b46466..a1c1aef4d 100644 --- a/dio/lib/src/compute/compute.dart +++ b/dio/lib/src/compute/compute.dart @@ -25,9 +25,7 @@ import 'dart:async'; -import 'compute_io.dart' - if (dart.library.js_interop) 'compute_web.dart' - if (dart.library.html) 'compute_web.dart' as _c; +import 'compute_io.dart' if (dart.library.html) 'compute_web.dart' as _c; /// Signature for the callback passed to [compute]. /// diff --git a/dio/lib/src/dio.dart b/dio/lib/src/dio.dart index 321398745..0cbd18529 100644 --- a/dio/lib/src/dio.dart +++ b/dio/lib/src/dio.dart @@ -3,7 +3,6 @@ import 'dart:async'; import 'adapter.dart'; import 'cancel_token.dart'; import 'dio/dio_for_native.dart' - if (dart.library.js_interop) 'dio/dio_for_browser.dart' if (dart.library.html) 'dio/dio_for_browser.dart'; import 'dio_mixin.dart'; import 'headers.dart'; diff --git a/dio/lib/src/dio_mixin.dart b/dio/lib/src/dio_mixin.dart index dbc1bd96b..87c04e17c 100644 --- a/dio/lib/src/dio_mixin.dart +++ b/dio/lib/src/dio_mixin.dart @@ -16,7 +16,6 @@ import 'headers.dart'; import 'interceptors/imply_content_type.dart'; import 'options.dart'; import 'progress_stream/io_progress_stream.dart' - if (dart.library.js_interop) 'progress_stream/browser_progress_stream.dart' if (dart.library.html) 'progress_stream/browser_progress_stream.dart'; import 'response.dart'; import 'response/response_stream_handler.dart'; diff --git a/dio/lib/src/multipart_file.dart b/dio/lib/src/multipart_file.dart index 8d451a4d3..f40e050cf 100644 --- a/dio/lib/src/multipart_file.dart +++ b/dio/lib/src/multipart_file.dart @@ -4,7 +4,6 @@ import 'dart:typed_data' show Uint8List; import 'package:http_parser/http_parser.dart' show MediaType; import 'multipart_file/io_multipart_file.dart' - if (dart.library.js_interop) 'multipart_file/browser_multipart_file.dart' if (dart.library.html) 'multipart_file/browser_multipart_file.dart'; import 'utils.dart';