Skip to content

Commit 4f8f930

Browse files
committed
Remove traces of legacy dart:html library
This removes any traces of the legacy `dart:html` library, including conditional import conditions using `if (dart.library.html)`. This raises the SDK to 3.3.0 where `dart:js_interop` was introduced (i.e. min SDK is from Feb 2024). Raising the min SDK also leads to a number of other cleanups in the code base: * removing unnecessary breaks in switch statements * simplifying `kIsWeb` conditions
1 parent 4684e29 commit 4f8f930

27 files changed

Lines changed: 30 additions & 76 deletions

File tree

‎.github/workflows/tests.yml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- uses: subosito/flutter-action@1a449444c387b1966244ae4d4f8c696479add0b2 #v2.23.0
4545
with:
4646
cache: true
47-
flutter-version: ${{ case(matrix.sdk == 'min', '3.3.0', '') }}
47+
flutter-version: ${{ case(matrix.sdk == 'min', '3.19.0', '') }}
4848
channel: ${{ case(matrix.sdk == 'min', '', matrix.channel) }}
4949
- run: |
5050
echo "TARGET_DART_SDK=$TARGET_DART_SDK" >> $GITHUB_ENV
@@ -55,10 +55,7 @@ jobs:
5555
- uses: bluefireteam/melos-action@2982f8e4fc92440a219490009d6d05195cb1a6a5 #v3.8.0
5656
with:
5757
run-bootstrap: false
58-
melos-version: ${{ case(matrix.sdk == 'min', '3.4.0', '^6.0.0') }}
59-
- name: Remove dio_web_adapter overrides
60-
if: ${{ matrix.sdk == 'min' }}
61-
run: rm -rf plugins/web_adapter
58+
melos-version: ^6.0.0
6259
- name: Check satisfied packages
6360
run: |
6461
dart ./scripts/melos_packages.dart

‎dio/CHANGELOG.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ See the [Migration Guide][] for the complete breaking changes list.**
55

66
## Unreleased
77

8-
*None.*
8+
- Raise minimum Dart SDK version to 3.3.0 and `dio_web_adapter` constraint to `^2.0.0`.
9+
- Remove legacy `dart.library.html` conditional imports and simplify `kIsWeb` check to `dart.library.js_interop`.
910

1011
## 5.11.1
1112

‎dio/lib/src/adapter.dart‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ import 'dart:typed_data';
44
import 'package:meta/meta.dart';
55

66
import 'adapters/io_adapter.dart'
7-
if (dart.library.js_interop) 'adapters/browser_adapter.dart'
8-
if (dart.library.html) 'adapters/browser_adapter.dart' as adapter;
7+
if (dart.library.js_interop) 'adapters/browser_adapter.dart' as adapter;
98
import 'headers.dart';
109
import 'options.dart';
1110
import 'redirect_record.dart';
@@ -22,7 +21,7 @@ import 'redirect_record.dart';
2221
///
2322
/// If you want to customize the [HttpClientAdapter] you should instead use
2423
/// either [IOHttpClientAdapter] on `dart:io` platforms
25-
/// or [BrowserHttpClientAdapter] on `dart:html` platforms.
24+
/// or [BrowserHttpClientAdapter] on web platforms.
2625
/// {@endtemplate}
2726
abstract class HttpClientAdapter {
2827
/// Create a [HttpClientAdapter] based on the current platform (IO/Web).

‎dio/lib/src/compute/compute.dart‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@
2525

2626
import 'dart:async';
2727

28-
import 'compute_io.dart'
29-
if (dart.library.js_interop) 'compute_web.dart'
30-
if (dart.library.html) 'compute_web.dart' as _c;
28+
import 'compute_io.dart' if (dart.library.js_interop) 'compute_web.dart' as _c;
3129

3230
/// Signature for the callback passed to [compute].
3331
///

‎dio/lib/src/dio.dart‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ import 'dart:async';
33
import 'adapter.dart';
44
import 'cancel_token.dart';
55
import 'dio/dio_for_native.dart'
6-
if (dart.library.js_interop) 'dio/dio_for_browser.dart'
7-
if (dart.library.html) 'dio/dio_for_browser.dart';
6+
if (dart.library.js_interop) 'dio/dio_for_browser.dart';
87
import 'dio_mixin.dart';
98
import 'headers.dart';
109
import 'options.dart';

‎dio/lib/src/dio_mixin.dart‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,14 @@ import 'headers.dart';
1616
import 'interceptors/imply_content_type.dart';
1717
import 'options.dart';
1818
import 'progress_stream/io_progress_stream.dart'
19-
if (dart.library.js_interop) 'progress_stream/browser_progress_stream.dart'
20-
if (dart.library.html) 'progress_stream/browser_progress_stream.dart';
19+
if (dart.library.js_interop) 'progress_stream/browser_progress_stream.dart';
2120
import 'response.dart';
2221
import 'response/response_stream_handler.dart';
2322
import 'transformer.dart';
2423

2524
part 'interceptor.dart';
2625

27-
// TODO(EVERYONE): Use `mixin class` when the lower bound of SDK is raised to 3.0.0.
28-
abstract class DioMixin implements Dio {
26+
abstract mixin class DioMixin implements Dio {
2927
/// The base request config for the instance.
3028
@override
3129
late BaseOptions options;

‎dio/lib/src/multipart_file.dart‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ import 'package:http_parser/http_parser.dart' show MediaType;
55
import 'package:mime/mime.dart' show lookupMimeType;
66

77
import 'multipart_file/io_multipart_file.dart'
8-
if (dart.library.js_interop) 'multipart_file/browser_multipart_file.dart'
9-
if (dart.library.html) 'multipart_file/browser_multipart_file.dart';
8+
if (dart.library.js_interop) 'multipart_file/browser_multipart_file.dart';
109
import 'utils.dart';
1110

1211
/// The type (alias) for specifying the content-type of the `MultipartFile`.

‎dio/lib/src/utils.dart‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ import 'options.dart';
77
import 'parameter.dart';
88

99
// See https://github.com/flutter/flutter/blob/master/packages/flutter/lib/src/foundation/constants.dart.
10-
const _kIsWebInterop = bool.fromEnvironment('dart.library.js_interop');
11-
const _kIsWebUtil = bool.fromEnvironment('dart.library.js_util');
12-
const kIsWeb = _kIsWebInterop || _kIsWebUtil || identical(0, 0.0);
10+
const kIsWeb = bool.fromEnvironment('dart.library.js_interop');
1311

1412
// For the web platform, an inline `bool.fromEnvironment` translates to
1513
// `core.bool.fromEnvironment` instead of correctly being replaced by the

‎dio/pubspec.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ repository: https://github.com/cfug/dio/blob/main/dio
1717
issue_tracker: https://github.com/cfug/dio/issues
1818

1919
environment:
20-
sdk: '>=2.18.0 <4.0.0'
20+
sdk: ^3.3.0
2121

2222
dependencies:
2323
async: ^2.8.2
@@ -27,7 +27,7 @@ dependencies:
2727
mime: '>=1.0.0 <3.0.0'
2828
path: ^1.8.0
2929

30-
dio_web_adapter: '>=1.1.0 <3.0.0'
30+
dio_web_adapter: ^2.0.0
3131

3232
dev_dependencies:
3333
lints: any

‎dio/test/interceptor_test.dart‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -113,53 +113,44 @@ void main() {
113113
switch (reqOpt.path) {
114114
case '/resolve':
115115
handler.resolve(Response(requestOptions: reqOpt, data: 1));
116-
break;
117116
case '/resolve-next':
118117
handler.resolve(
119118
Response(requestOptions: reqOpt, data: 2),
120119
true,
121120
);
122-
break;
123121
case '/resolve-next/always':
124122
handler.resolve(
125123
Response(requestOptions: reqOpt, data: 2),
126124
true,
127125
);
128-
break;
129126
case '/resolve-next/reject':
130127
handler.resolve(
131128
Response(requestOptions: reqOpt, data: 2),
132129
true,
133130
);
134-
break;
135131
case '/resolve-next/reject-next':
136132
handler.resolve(
137133
Response(requestOptions: reqOpt, data: 2),
138134
true,
139135
);
140-
break;
141136
case '/reject':
142137
handler
143138
.reject(DioException(requestOptions: reqOpt, error: 3));
144-
break;
145139
case '/reject-next':
146140
handler.reject(
147141
DioException(requestOptions: reqOpt, error: 4),
148142
true,
149143
);
150-
break;
151144
case '/reject-next/reject':
152145
handler.reject(
153146
DioException(requestOptions: reqOpt, error: 5),
154147
true,
155148
);
156-
break;
157149
case '/reject-next-response':
158150
handler.reject(
159151
DioException(requestOptions: reqOpt, error: 5),
160152
true,
161153
);
162-
break;
163154
default:
164155
handler.next(reqOpt); //continue
165156
}
@@ -172,25 +163,21 @@ void main() {
172163
case '/resolve-next':
173164
response.data++;
174165
handler.resolve(response); //3
175-
break;
176166
case '/resolve-next/always':
177167
response.data++;
178168
handler.next(response); //3
179-
break;
180169
case '/resolve-next/reject':
181170
handler.reject(
182171
DioException(
183172
requestOptions: options,
184173
error: '/resolve-next/reject',
185174
),
186175
);
187-
break;
188176
case '/resolve-next/reject-next':
189177
handler.reject(
190178
DioException(requestOptions: options, error: ''),
191179
true,
192180
);
193-
break;
194181
default:
195182
handler.next(response); //continue
196183
}
@@ -227,7 +214,6 @@ void main() {
227214
case '/resolve-next/always':
228215
response.data++;
229216
handler.next(response); //4
230-
break;
231217
default:
232218
handler.next(response); //continue
233219
}
@@ -337,35 +323,30 @@ void main() {
337323
data: 'fake data',
338324
),
339325
);
340-
break;
341326
case '/fakepath2':
342327
dio
343328
.get('/test')
344329
.then(handler.resolve)
345330
.catchError((e) => handler.reject(e as DioException));
346-
break;
347331
case '/fakepath3':
348332
handler.reject(
349333
DioException(
350334
requestOptions: options,
351335
error: 'test error',
352336
),
353337
);
354-
break;
355338
case '/fakepath4':
356339
handler.reject(
357340
DioException(
358341
requestOptions: options,
359342
error: 'test error',
360343
),
361344
);
362-
break;
363345
case '/test?tag=1':
364346
dio.get('/token').then((response) {
365347
options.headers['token'] = response.data['data']['token'];
366348
handler.next(options);
367349
});
368-
break;
369350
default:
370351
handler.next(options); //continue
371352
}

0 commit comments

Comments
 (0)