From 368dc7656ec3f45cca4bf5f09bdc8274b5af0b2a Mon Sep 17 00:00:00 2001 From: camsim99 Date: Thu, 11 Jan 2024 15:18:37 -0800 Subject: [PATCH 1/6] try --- packages/cross_file/lib/src/types/html.dart | 2 +- packages/cross_file/lib/src/web_helpers/web_helpers.dart | 2 +- packages/cross_file/test/x_file_html_test.dart | 2 +- .../example/integration_test/dom_helper_test.dart | 2 +- .../example/integration_test/file_selector_web_test.dart | 2 +- .../file_selector/file_selector_web/lib/src/dom_helper.dart | 2 +- .../example/integration_test/shared_preferences_web_test.dart | 2 +- .../example/integration_test/link_widget_test.dart | 2 +- .../example/integration_test/url_launcher_web_test.dart | 2 +- packages/url_launcher/url_launcher_web/lib/src/link.dart | 2 +- packages/web_benchmarks/lib/client.dart | 4 +++- packages/web_benchmarks/lib/src/recorder.dart | 2 +- 12 files changed, 14 insertions(+), 12 deletions(-) diff --git a/packages/cross_file/lib/src/types/html.dart b/packages/cross_file/lib/src/types/html.dart index 9eb95b448d8..1eae2fae9bb 100644 --- a/packages/cross_file/lib/src/types/html.dart +++ b/packages/cross_file/lib/src/types/html.dart @@ -8,7 +8,7 @@ import 'dart:js_interop'; import 'dart:typed_data'; import 'package:meta/meta.dart'; -import 'package:web/helpers.dart'; +import 'package:web/web.dart'; import '../web_helpers/web_helpers.dart'; import 'base.dart'; diff --git a/packages/cross_file/lib/src/web_helpers/web_helpers.dart b/packages/cross_file/lib/src/web_helpers/web_helpers.dart index ec9a2e86e7d..946cf4802dc 100644 --- a/packages/cross_file/lib/src/web_helpers/web_helpers.dart +++ b/packages/cross_file/lib/src/web_helpers/web_helpers.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:web/helpers.dart'; +import 'package:web/web.dart'; /// Create anchor element with download attribute HTMLAnchorElement createAnchorElement(String href, String? suggestedName) => diff --git a/packages/cross_file/test/x_file_html_test.dart b/packages/cross_file/test/x_file_html_test.dart index 4b002cac158..9ae6d9d92db 100644 --- a/packages/cross_file/test/x_file_html_test.dart +++ b/packages/cross_file/test/x_file_html_test.dart @@ -11,7 +11,7 @@ import 'dart:typed_data'; import 'package:cross_file/cross_file.dart'; import 'package:test/test.dart'; -import 'package:web/helpers.dart' as html; +import 'package:web/web.dart' as html; const String expectedStringContents = 'Hello, world! I ❤ ñ! 空手'; final Uint8List bytes = Uint8List.fromList(utf8.encode(expectedStringContents)); diff --git a/packages/file_selector/file_selector_web/example/integration_test/dom_helper_test.dart b/packages/file_selector/file_selector_web/example/integration_test/dom_helper_test.dart index 1cec6fc7ad1..742e9e3f961 100644 --- a/packages/file_selector/file_selector_web/example/integration_test/dom_helper_test.dart +++ b/packages/file_selector/file_selector_web/example/integration_test/dom_helper_test.dart @@ -8,7 +8,7 @@ import 'package:file_selector_platform_interface/file_selector_platform_interfac import 'package:file_selector_web/src/dom_helper.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_test.dart'; -import 'package:web/helpers.dart'; +import 'package:web/web.dart'; void main() { group('dom_helper', () { diff --git a/packages/file_selector/file_selector_web/example/integration_test/file_selector_web_test.dart b/packages/file_selector/file_selector_web/example/integration_test/file_selector_web_test.dart index f3d4c1ebf3e..80376c5449f 100644 --- a/packages/file_selector/file_selector_web/example/integration_test/file_selector_web_test.dart +++ b/packages/file_selector/file_selector_web/example/integration_test/file_selector_web_test.dart @@ -9,7 +9,7 @@ import 'package:file_selector_web/file_selector_web.dart'; import 'package:file_selector_web/src/dom_helper.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_test.dart'; -import 'package:web/helpers.dart'; +import 'package:web/web.dart'; void main() { group('FileSelectorWeb', () { diff --git a/packages/file_selector/file_selector_web/lib/src/dom_helper.dart b/packages/file_selector/file_selector_web/lib/src/dom_helper.dart index 7684a12286d..ed3671416fe 100644 --- a/packages/file_selector/file_selector_web/lib/src/dom_helper.dart +++ b/packages/file_selector/file_selector_web/lib/src/dom_helper.dart @@ -8,7 +8,7 @@ import 'dart:js_interop'; import 'package:file_selector_platform_interface/file_selector_platform_interface.dart'; import 'package:flutter/foundation.dart' show visibleForTesting; import 'package:flutter/services.dart'; -import 'package:web/helpers.dart'; +import 'package:web/web.dart'; /// Class to manipulate the DOM with the intention of reading files from it. class DomHelper { diff --git a/packages/shared_preferences/shared_preferences_web/example/integration_test/shared_preferences_web_test.dart b/packages/shared_preferences/shared_preferences_web/example/integration_test/shared_preferences_web_test.dart index 9f0faae4136..c87bcc4975f 100644 --- a/packages/shared_preferences/shared_preferences_web/example/integration_test/shared_preferences_web_test.dart +++ b/packages/shared_preferences/shared_preferences_web/example/integration_test/shared_preferences_web_test.dart @@ -10,7 +10,7 @@ import 'package:shared_preferences_platform_interface/types.dart'; import 'package:shared_preferences_web/shared_preferences_web.dart'; import 'package:shared_preferences_web/src/keys_extension.dart'; -import 'package:web/helpers.dart' as html; +import 'package:web/web.dart' as html; void main() { IntegrationTestWidgetsFlutterBinding.ensureInitialized(); diff --git a/packages/url_launcher/url_launcher_web/example/integration_test/link_widget_test.dart b/packages/url_launcher/url_launcher_web/example/integration_test/link_widget_test.dart index 528cff32c0e..854e3685ad8 100644 --- a/packages/url_launcher/url_launcher_web/example/integration_test/link_widget_test.dart +++ b/packages/url_launcher/url_launcher_web/example/integration_test/link_widget_test.dart @@ -10,7 +10,7 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_test.dart'; import 'package:url_launcher_platform_interface/link.dart'; import 'package:url_launcher_web/src/link.dart'; -import 'package:web/helpers.dart' as html; +import 'package:web/web.dart' as html; void main() { IntegrationTestWidgetsFlutterBinding.ensureInitialized(); diff --git a/packages/url_launcher/url_launcher_web/example/integration_test/url_launcher_web_test.dart b/packages/url_launcher/url_launcher_web/example/integration_test/url_launcher_web_test.dart index ec01d28163a..2dcdd2dd567 100644 --- a/packages/url_launcher/url_launcher_web/example/integration_test/url_launcher_web_test.dart +++ b/packages/url_launcher/url_launcher_web/example/integration_test/url_launcher_web_test.dart @@ -10,7 +10,7 @@ import 'package:integration_test/integration_test.dart'; import 'package:mockito/mockito.dart' show Mock, any, verify, when; import 'package:url_launcher_platform_interface/url_launcher_platform_interface.dart'; import 'package:url_launcher_web/url_launcher_web.dart'; -import 'package:web/helpers.dart' as html; +import 'package:web/web.dart' as html; abstract class MyWindow { html.Window? open(Object? a, Object? b, Object? c); diff --git a/packages/url_launcher/url_launcher_web/lib/src/link.dart b/packages/url_launcher/url_launcher_web/lib/src/link.dart index b2217fafb80..821a954b5da 100644 --- a/packages/url_launcher/url_launcher_web/lib/src/link.dart +++ b/packages/url_launcher/url_launcher_web/lib/src/link.dart @@ -12,7 +12,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter/services.dart'; import 'package:url_launcher_platform_interface/link.dart'; -import 'package:web/helpers.dart' as html; +import 'package:web/web.dart' as html; /// The unique identifier for the view type to be used for link platform views. const String linkViewType = '__url_launcher::link'; diff --git a/packages/web_benchmarks/lib/client.dart b/packages/web_benchmarks/lib/client.dart index baaab84fe50..521c2322d25 100644 --- a/packages/web_benchmarks/lib/client.dart +++ b/packages/web_benchmarks/lib/client.dart @@ -7,7 +7,7 @@ import 'dart:convert' show json; import 'dart:js_interop'; import 'dart:math' as math; -import 'package:web/helpers.dart'; +import 'package:web/web.dart'; import 'src/common.dart'; import 'src/recorder.dart'; @@ -159,6 +159,8 @@ void _printResultsToScreen(Profile profile) { body.appendHtml('
${timeseries.computeStats()}
'); // TODO(kevmoo): remove `NodeGlue` cast when we no longer need to support // pkg:web 0.3.0 + // TODO(camsim99): Remove deprecated append usage. + // ignore: deprecated_member_use NodeGlue(body).append(TimeseriesVisualization(timeseries).render()); }); } diff --git a/packages/web_benchmarks/lib/src/recorder.dart b/packages/web_benchmarks/lib/src/recorder.dart index c4b5ca8e3b5..407ae62cb16 100644 --- a/packages/web_benchmarks/lib/src/recorder.dart +++ b/packages/web_benchmarks/lib/src/recorder.dart @@ -15,7 +15,7 @@ import 'package:flutter/scheduler.dart'; import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; import 'package:meta/meta.dart'; -import 'package:web/helpers.dart' as html; +import 'package:web/web.dart' as html; import 'common.dart'; From 28f0de00ec9121620dbc256b310d959868e65cde Mon Sep 17 00:00:00 2001 From: David Iglesias Teixeira Date: Thu, 11 Jan 2024 16:40:18 -0800 Subject: [PATCH 2/6] Update package web lower bound. --- packages/cross_file/CHANGELOG.md | 4 ++++ packages/cross_file/pubspec.yaml | 4 ++-- packages/url_launcher/url_launcher_web/CHANGELOG.md | 4 ++++ packages/url_launcher/url_launcher_web/pubspec.yaml | 4 ++-- packages/web_benchmarks/CHANGELOG.md | 4 ++++ packages/web_benchmarks/lib/client.dart | 6 +----- packages/web_benchmarks/pubspec.yaml | 2 +- 7 files changed, 18 insertions(+), 10 deletions(-) diff --git a/packages/cross_file/CHANGELOG.md b/packages/cross_file/CHANGELOG.md index 2591d2ea9d2..7ac6ccd2aad 100644 --- a/packages/cross_file/CHANGELOG.md +++ b/packages/cross_file/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.3.3+9 + +* Updates `package:web` to `^0.4.1`. + ## 0.3.3+8 * Now supports `dart2wasm` compilation. diff --git a/packages/cross_file/pubspec.yaml b/packages/cross_file/pubspec.yaml index c2b8f2f5342..4c278c83117 100644 --- a/packages/cross_file/pubspec.yaml +++ b/packages/cross_file/pubspec.yaml @@ -2,14 +2,14 @@ name: cross_file description: An abstraction to allow working with files across multiple platforms. repository: https://github.com/flutter/packages/tree/main/packages/cross_file issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+cross_file%22 -version: 0.3.3+8 +version: 0.3.3+9 environment: sdk: ^3.2.0 dependencies: meta: ^1.3.0 - web: '>=0.3.0 <0.5.0' + web: ^0.4.1 dev_dependencies: path: ^1.8.1 diff --git a/packages/url_launcher/url_launcher_web/CHANGELOG.md b/packages/url_launcher/url_launcher_web/CHANGELOG.md index 641b48d27cf..d56faa3b28c 100644 --- a/packages/url_launcher/url_launcher_web/CHANGELOG.md +++ b/packages/url_launcher/url_launcher_web/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.2.4 + +* Updates `package:web` to `^0.4.1`. + ## 2.2.3 * Fixes new lint warnings. diff --git a/packages/url_launcher/url_launcher_web/pubspec.yaml b/packages/url_launcher/url_launcher_web/pubspec.yaml index 6c89bba5809..205ef626a34 100644 --- a/packages/url_launcher/url_launcher_web/pubspec.yaml +++ b/packages/url_launcher/url_launcher_web/pubspec.yaml @@ -2,7 +2,7 @@ name: url_launcher_web description: Web platform implementation of url_launcher repository: https://github.com/flutter/packages/tree/main/packages/url_launcher/url_launcher_web issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+url_launcher%22 -version: 2.2.3 +version: 2.2.4 environment: sdk: ^3.2.0 @@ -22,7 +22,7 @@ dependencies: flutter_web_plugins: sdk: flutter url_launcher_platform_interface: ^2.2.0 - web: '>=0.3.0 <0.5.0' + web: ^0.4.1 dev_dependencies: flutter_test: diff --git a/packages/web_benchmarks/CHANGELOG.md b/packages/web_benchmarks/CHANGELOG.md index f401c3885b2..ff8418d2dd4 100644 --- a/packages/web_benchmarks/CHANGELOG.md +++ b/packages/web_benchmarks/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.1.2 + +* Updates `package:web` to `^0.4.1`. + ## 1.1.1 * Fixes new lint warnings. diff --git a/packages/web_benchmarks/lib/client.dart b/packages/web_benchmarks/lib/client.dart index 521c2322d25..adc029f237a 100644 --- a/packages/web_benchmarks/lib/client.dart +++ b/packages/web_benchmarks/lib/client.dart @@ -157,11 +157,7 @@ void _printResultsToScreen(Profile profile) { profile.scoreData.forEach((String scoreKey, Timeseries timeseries) { body.appendHtml('

$scoreKey

'); body.appendHtml('
${timeseries.computeStats()}
'); - // TODO(kevmoo): remove `NodeGlue` cast when we no longer need to support - // pkg:web 0.3.0 - // TODO(camsim99): Remove deprecated append usage. - // ignore: deprecated_member_use - NodeGlue(body).append(TimeseriesVisualization(timeseries).render()); + body.appendChild(TimeseriesVisualization(timeseries).render()); }); } diff --git a/packages/web_benchmarks/pubspec.yaml b/packages/web_benchmarks/pubspec.yaml index aa89736869c..eaf7d26cfb1 100644 --- a/packages/web_benchmarks/pubspec.yaml +++ b/packages/web_benchmarks/pubspec.yaml @@ -21,7 +21,7 @@ dependencies: shelf: ^1.2.0 shelf_static: ^1.1.0 test: ^1.19.5 - web: '>=0.3.0 <0.5.0' + web: ^0.4.1 webkit_inspection_protocol: ^1.0.0 topics: From 4d817d4789c5abde89fd044ba366a57bdf1dcd5a Mon Sep 17 00:00:00 2001 From: David Iglesias Teixeira Date: Thu, 11 Jan 2024 16:56:54 -0800 Subject: [PATCH 3/6] Revert "Update package web lower bound." This reverts commit 28f0de00ec9121620dbc256b310d959868e65cde. --- packages/cross_file/CHANGELOG.md | 4 ---- packages/cross_file/pubspec.yaml | 4 ++-- packages/url_launcher/url_launcher_web/CHANGELOG.md | 4 ---- packages/url_launcher/url_launcher_web/pubspec.yaml | 4 ++-- packages/web_benchmarks/CHANGELOG.md | 4 ---- packages/web_benchmarks/lib/client.dart | 6 +++++- packages/web_benchmarks/pubspec.yaml | 2 +- 7 files changed, 10 insertions(+), 18 deletions(-) diff --git a/packages/cross_file/CHANGELOG.md b/packages/cross_file/CHANGELOG.md index 7ac6ccd2aad..2591d2ea9d2 100644 --- a/packages/cross_file/CHANGELOG.md +++ b/packages/cross_file/CHANGELOG.md @@ -1,7 +1,3 @@ -## 0.3.3+9 - -* Updates `package:web` to `^0.4.1`. - ## 0.3.3+8 * Now supports `dart2wasm` compilation. diff --git a/packages/cross_file/pubspec.yaml b/packages/cross_file/pubspec.yaml index 4c278c83117..c2b8f2f5342 100644 --- a/packages/cross_file/pubspec.yaml +++ b/packages/cross_file/pubspec.yaml @@ -2,14 +2,14 @@ name: cross_file description: An abstraction to allow working with files across multiple platforms. repository: https://github.com/flutter/packages/tree/main/packages/cross_file issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+cross_file%22 -version: 0.3.3+9 +version: 0.3.3+8 environment: sdk: ^3.2.0 dependencies: meta: ^1.3.0 - web: ^0.4.1 + web: '>=0.3.0 <0.5.0' dev_dependencies: path: ^1.8.1 diff --git a/packages/url_launcher/url_launcher_web/CHANGELOG.md b/packages/url_launcher/url_launcher_web/CHANGELOG.md index d56faa3b28c..641b48d27cf 100644 --- a/packages/url_launcher/url_launcher_web/CHANGELOG.md +++ b/packages/url_launcher/url_launcher_web/CHANGELOG.md @@ -1,7 +1,3 @@ -## 2.2.4 - -* Updates `package:web` to `^0.4.1`. - ## 2.2.3 * Fixes new lint warnings. diff --git a/packages/url_launcher/url_launcher_web/pubspec.yaml b/packages/url_launcher/url_launcher_web/pubspec.yaml index 205ef626a34..6c89bba5809 100644 --- a/packages/url_launcher/url_launcher_web/pubspec.yaml +++ b/packages/url_launcher/url_launcher_web/pubspec.yaml @@ -2,7 +2,7 @@ name: url_launcher_web description: Web platform implementation of url_launcher repository: https://github.com/flutter/packages/tree/main/packages/url_launcher/url_launcher_web issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+url_launcher%22 -version: 2.2.4 +version: 2.2.3 environment: sdk: ^3.2.0 @@ -22,7 +22,7 @@ dependencies: flutter_web_plugins: sdk: flutter url_launcher_platform_interface: ^2.2.0 - web: ^0.4.1 + web: '>=0.3.0 <0.5.0' dev_dependencies: flutter_test: diff --git a/packages/web_benchmarks/CHANGELOG.md b/packages/web_benchmarks/CHANGELOG.md index ff8418d2dd4..f401c3885b2 100644 --- a/packages/web_benchmarks/CHANGELOG.md +++ b/packages/web_benchmarks/CHANGELOG.md @@ -1,7 +1,3 @@ -## 1.1.2 - -* Updates `package:web` to `^0.4.1`. - ## 1.1.1 * Fixes new lint warnings. diff --git a/packages/web_benchmarks/lib/client.dart b/packages/web_benchmarks/lib/client.dart index adc029f237a..521c2322d25 100644 --- a/packages/web_benchmarks/lib/client.dart +++ b/packages/web_benchmarks/lib/client.dart @@ -157,7 +157,11 @@ void _printResultsToScreen(Profile profile) { profile.scoreData.forEach((String scoreKey, Timeseries timeseries) { body.appendHtml('

$scoreKey

'); body.appendHtml('
${timeseries.computeStats()}
'); - body.appendChild(TimeseriesVisualization(timeseries).render()); + // TODO(kevmoo): remove `NodeGlue` cast when we no longer need to support + // pkg:web 0.3.0 + // TODO(camsim99): Remove deprecated append usage. + // ignore: deprecated_member_use + NodeGlue(body).append(TimeseriesVisualization(timeseries).render()); }); } diff --git a/packages/web_benchmarks/pubspec.yaml b/packages/web_benchmarks/pubspec.yaml index eaf7d26cfb1..aa89736869c 100644 --- a/packages/web_benchmarks/pubspec.yaml +++ b/packages/web_benchmarks/pubspec.yaml @@ -21,7 +21,7 @@ dependencies: shelf: ^1.2.0 shelf_static: ^1.1.0 test: ^1.19.5 - web: ^0.4.1 + web: '>=0.3.0 <0.5.0' webkit_inspection_protocol: ^1.0.0 topics: From b3d1815a0606c7e29f223b4fa48229a7af7a2b75 Mon Sep 17 00:00:00 2001 From: David Iglesias Teixeira Date: Thu, 11 Jan 2024 16:57:17 -0800 Subject: [PATCH 4/6] Revert "try" This reverts commit 368dc7656ec3f45cca4bf5f09bdc8274b5af0b2a. --- packages/cross_file/lib/src/types/html.dart | 2 +- packages/cross_file/lib/src/web_helpers/web_helpers.dart | 2 +- packages/cross_file/test/x_file_html_test.dart | 2 +- .../example/integration_test/dom_helper_test.dart | 2 +- .../example/integration_test/file_selector_web_test.dart | 2 +- .../file_selector/file_selector_web/lib/src/dom_helper.dart | 2 +- .../example/integration_test/shared_preferences_web_test.dart | 2 +- .../example/integration_test/link_widget_test.dart | 2 +- .../example/integration_test/url_launcher_web_test.dart | 2 +- packages/url_launcher/url_launcher_web/lib/src/link.dart | 2 +- packages/web_benchmarks/lib/client.dart | 4 +--- packages/web_benchmarks/lib/src/recorder.dart | 2 +- 12 files changed, 12 insertions(+), 14 deletions(-) diff --git a/packages/cross_file/lib/src/types/html.dart b/packages/cross_file/lib/src/types/html.dart index 1eae2fae9bb..9eb95b448d8 100644 --- a/packages/cross_file/lib/src/types/html.dart +++ b/packages/cross_file/lib/src/types/html.dart @@ -8,7 +8,7 @@ import 'dart:js_interop'; import 'dart:typed_data'; import 'package:meta/meta.dart'; -import 'package:web/web.dart'; +import 'package:web/helpers.dart'; import '../web_helpers/web_helpers.dart'; import 'base.dart'; diff --git a/packages/cross_file/lib/src/web_helpers/web_helpers.dart b/packages/cross_file/lib/src/web_helpers/web_helpers.dart index 946cf4802dc..ec9a2e86e7d 100644 --- a/packages/cross_file/lib/src/web_helpers/web_helpers.dart +++ b/packages/cross_file/lib/src/web_helpers/web_helpers.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'package:web/web.dart'; +import 'package:web/helpers.dart'; /// Create anchor element with download attribute HTMLAnchorElement createAnchorElement(String href, String? suggestedName) => diff --git a/packages/cross_file/test/x_file_html_test.dart b/packages/cross_file/test/x_file_html_test.dart index 9ae6d9d92db..4b002cac158 100644 --- a/packages/cross_file/test/x_file_html_test.dart +++ b/packages/cross_file/test/x_file_html_test.dart @@ -11,7 +11,7 @@ import 'dart:typed_data'; import 'package:cross_file/cross_file.dart'; import 'package:test/test.dart'; -import 'package:web/web.dart' as html; +import 'package:web/helpers.dart' as html; const String expectedStringContents = 'Hello, world! I ❤ ñ! 空手'; final Uint8List bytes = Uint8List.fromList(utf8.encode(expectedStringContents)); diff --git a/packages/file_selector/file_selector_web/example/integration_test/dom_helper_test.dart b/packages/file_selector/file_selector_web/example/integration_test/dom_helper_test.dart index 742e9e3f961..1cec6fc7ad1 100644 --- a/packages/file_selector/file_selector_web/example/integration_test/dom_helper_test.dart +++ b/packages/file_selector/file_selector_web/example/integration_test/dom_helper_test.dart @@ -8,7 +8,7 @@ import 'package:file_selector_platform_interface/file_selector_platform_interfac import 'package:file_selector_web/src/dom_helper.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_test.dart'; -import 'package:web/web.dart'; +import 'package:web/helpers.dart'; void main() { group('dom_helper', () { diff --git a/packages/file_selector/file_selector_web/example/integration_test/file_selector_web_test.dart b/packages/file_selector/file_selector_web/example/integration_test/file_selector_web_test.dart index 80376c5449f..f3d4c1ebf3e 100644 --- a/packages/file_selector/file_selector_web/example/integration_test/file_selector_web_test.dart +++ b/packages/file_selector/file_selector_web/example/integration_test/file_selector_web_test.dart @@ -9,7 +9,7 @@ import 'package:file_selector_web/file_selector_web.dart'; import 'package:file_selector_web/src/dom_helper.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_test.dart'; -import 'package:web/web.dart'; +import 'package:web/helpers.dart'; void main() { group('FileSelectorWeb', () { diff --git a/packages/file_selector/file_selector_web/lib/src/dom_helper.dart b/packages/file_selector/file_selector_web/lib/src/dom_helper.dart index ed3671416fe..7684a12286d 100644 --- a/packages/file_selector/file_selector_web/lib/src/dom_helper.dart +++ b/packages/file_selector/file_selector_web/lib/src/dom_helper.dart @@ -8,7 +8,7 @@ import 'dart:js_interop'; import 'package:file_selector_platform_interface/file_selector_platform_interface.dart'; import 'package:flutter/foundation.dart' show visibleForTesting; import 'package:flutter/services.dart'; -import 'package:web/web.dart'; +import 'package:web/helpers.dart'; /// Class to manipulate the DOM with the intention of reading files from it. class DomHelper { diff --git a/packages/shared_preferences/shared_preferences_web/example/integration_test/shared_preferences_web_test.dart b/packages/shared_preferences/shared_preferences_web/example/integration_test/shared_preferences_web_test.dart index c87bcc4975f..9f0faae4136 100644 --- a/packages/shared_preferences/shared_preferences_web/example/integration_test/shared_preferences_web_test.dart +++ b/packages/shared_preferences/shared_preferences_web/example/integration_test/shared_preferences_web_test.dart @@ -10,7 +10,7 @@ import 'package:shared_preferences_platform_interface/types.dart'; import 'package:shared_preferences_web/shared_preferences_web.dart'; import 'package:shared_preferences_web/src/keys_extension.dart'; -import 'package:web/web.dart' as html; +import 'package:web/helpers.dart' as html; void main() { IntegrationTestWidgetsFlutterBinding.ensureInitialized(); diff --git a/packages/url_launcher/url_launcher_web/example/integration_test/link_widget_test.dart b/packages/url_launcher/url_launcher_web/example/integration_test/link_widget_test.dart index 854e3685ad8..528cff32c0e 100644 --- a/packages/url_launcher/url_launcher_web/example/integration_test/link_widget_test.dart +++ b/packages/url_launcher/url_launcher_web/example/integration_test/link_widget_test.dart @@ -10,7 +10,7 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_test.dart'; import 'package:url_launcher_platform_interface/link.dart'; import 'package:url_launcher_web/src/link.dart'; -import 'package:web/web.dart' as html; +import 'package:web/helpers.dart' as html; void main() { IntegrationTestWidgetsFlutterBinding.ensureInitialized(); diff --git a/packages/url_launcher/url_launcher_web/example/integration_test/url_launcher_web_test.dart b/packages/url_launcher/url_launcher_web/example/integration_test/url_launcher_web_test.dart index 2dcdd2dd567..ec01d28163a 100644 --- a/packages/url_launcher/url_launcher_web/example/integration_test/url_launcher_web_test.dart +++ b/packages/url_launcher/url_launcher_web/example/integration_test/url_launcher_web_test.dart @@ -10,7 +10,7 @@ import 'package:integration_test/integration_test.dart'; import 'package:mockito/mockito.dart' show Mock, any, verify, when; import 'package:url_launcher_platform_interface/url_launcher_platform_interface.dart'; import 'package:url_launcher_web/url_launcher_web.dart'; -import 'package:web/web.dart' as html; +import 'package:web/helpers.dart' as html; abstract class MyWindow { html.Window? open(Object? a, Object? b, Object? c); diff --git a/packages/url_launcher/url_launcher_web/lib/src/link.dart b/packages/url_launcher/url_launcher_web/lib/src/link.dart index 821a954b5da..b2217fafb80 100644 --- a/packages/url_launcher/url_launcher_web/lib/src/link.dart +++ b/packages/url_launcher/url_launcher_web/lib/src/link.dart @@ -12,7 +12,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter/services.dart'; import 'package:url_launcher_platform_interface/link.dart'; -import 'package:web/web.dart' as html; +import 'package:web/helpers.dart' as html; /// The unique identifier for the view type to be used for link platform views. const String linkViewType = '__url_launcher::link'; diff --git a/packages/web_benchmarks/lib/client.dart b/packages/web_benchmarks/lib/client.dart index 521c2322d25..baaab84fe50 100644 --- a/packages/web_benchmarks/lib/client.dart +++ b/packages/web_benchmarks/lib/client.dart @@ -7,7 +7,7 @@ import 'dart:convert' show json; import 'dart:js_interop'; import 'dart:math' as math; -import 'package:web/web.dart'; +import 'package:web/helpers.dart'; import 'src/common.dart'; import 'src/recorder.dart'; @@ -159,8 +159,6 @@ void _printResultsToScreen(Profile profile) { body.appendHtml('
${timeseries.computeStats()}
'); // TODO(kevmoo): remove `NodeGlue` cast when we no longer need to support // pkg:web 0.3.0 - // TODO(camsim99): Remove deprecated append usage. - // ignore: deprecated_member_use NodeGlue(body).append(TimeseriesVisualization(timeseries).render()); }); } diff --git a/packages/web_benchmarks/lib/src/recorder.dart b/packages/web_benchmarks/lib/src/recorder.dart index 407ae62cb16..c4b5ca8e3b5 100644 --- a/packages/web_benchmarks/lib/src/recorder.dart +++ b/packages/web_benchmarks/lib/src/recorder.dart @@ -15,7 +15,7 @@ import 'package:flutter/scheduler.dart'; import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; import 'package:meta/meta.dart'; -import 'package:web/web.dart' as html; +import 'package:web/helpers.dart' as html; import 'common.dart'; From 256a206ad424447107e8d26f611e47336279ef00 Mon Sep 17 00:00:00 2001 From: David Iglesias Teixeira Date: Thu, 11 Jan 2024 17:05:08 -0800 Subject: [PATCH 5/6] [ci] Pin package web version to < 0.4.1. Some packages use an import that was deprecated in package:web 0.4.1. This is considered an analysis failure. This PR pins the version of package:web on those packages to the latest compatible version of the package. --- packages/cross_file/CHANGELOG.md | 4 ++++ packages/cross_file/pubspec.yaml | 4 ++-- packages/file_selector/file_selector_web/CHANGELOG.md | 3 ++- packages/file_selector/file_selector_web/pubspec.yaml | 4 ++-- .../shared_preferences/shared_preferences_web/CHANGELOG.md | 4 ++++ .../shared_preferences/shared_preferences_web/pubspec.yaml | 6 +++--- packages/url_launcher/url_launcher_web/CHANGELOG.md | 4 ++++ packages/url_launcher/url_launcher_web/pubspec.yaml | 4 ++-- packages/web_benchmarks/CHANGELOG.md | 4 ++++ packages/web_benchmarks/pubspec.yaml | 6 +++--- 10 files changed, 30 insertions(+), 13 deletions(-) diff --git a/packages/cross_file/CHANGELOG.md b/packages/cross_file/CHANGELOG.md index 2591d2ea9d2..1625b7b58ec 100644 --- a/packages/cross_file/CHANGELOG.md +++ b/packages/cross_file/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.3.3+9 + +* Pins `package:web` to `>=0.3.0 <0.4.0`. + ## 0.3.3+8 * Now supports `dart2wasm` compilation. diff --git a/packages/cross_file/pubspec.yaml b/packages/cross_file/pubspec.yaml index c2b8f2f5342..ef3b4b56fee 100644 --- a/packages/cross_file/pubspec.yaml +++ b/packages/cross_file/pubspec.yaml @@ -2,14 +2,14 @@ name: cross_file description: An abstraction to allow working with files across multiple platforms. repository: https://github.com/flutter/packages/tree/main/packages/cross_file issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+cross_file%22 -version: 0.3.3+8 +version: 0.3.3+9 environment: sdk: ^3.2.0 dependencies: meta: ^1.3.0 - web: '>=0.3.0 <0.5.0' + web: '>=0.3.0 <0.4.1' # 0.4.1 is not compatible with stable dev_dependencies: path: ^1.8.1 diff --git a/packages/file_selector/file_selector_web/CHANGELOG.md b/packages/file_selector/file_selector_web/CHANGELOG.md index 3f1428514c8..70b1c2015dd 100644 --- a/packages/file_selector/file_selector_web/CHANGELOG.md +++ b/packages/file_selector/file_selector_web/CHANGELOG.md @@ -1,6 +1,7 @@ -## NEXT +## 0.9.3+1 * Updates minimum supported SDK version to Flutter 3.10/Dart 3.0. +* Pins `package:web` to `>=0.3.0 <0.4.0`. ## 0.9.3 diff --git a/packages/file_selector/file_selector_web/pubspec.yaml b/packages/file_selector/file_selector_web/pubspec.yaml index 3c3ca15c3aa..94d1711643c 100644 --- a/packages/file_selector/file_selector_web/pubspec.yaml +++ b/packages/file_selector/file_selector_web/pubspec.yaml @@ -2,7 +2,7 @@ name: file_selector_web description: Web platform implementation of file_selector repository: https://github.com/flutter/packages/tree/main/packages/file_selector/file_selector_web issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+file_selector%22 -version: 0.9.3 +version: 0.9.3+1 environment: sdk: ^3.2.0 @@ -22,7 +22,7 @@ dependencies: sdk: flutter flutter_web_plugins: sdk: flutter - web: '>=0.3.0 <0.5.0' + web: '>=0.3.0 <0.4.1' # 0.4.1 is not compatible with stable dev_dependencies: flutter_test: diff --git a/packages/shared_preferences/shared_preferences_web/CHANGELOG.md b/packages/shared_preferences/shared_preferences_web/CHANGELOG.md index 5f5d8c246cd..3db88a8884d 100644 --- a/packages/shared_preferences/shared_preferences_web/CHANGELOG.md +++ b/packages/shared_preferences/shared_preferences_web/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.2.3 + +* Pins `package:web` to `>=0.3.0 <0.4.0`. + ## 2.2.2 * Updates minimum supported SDK version to Dart 3.2. diff --git a/packages/shared_preferences/shared_preferences_web/pubspec.yaml b/packages/shared_preferences/shared_preferences_web/pubspec.yaml index ceb1dfebcf7..1eed99147cf 100644 --- a/packages/shared_preferences/shared_preferences_web/pubspec.yaml +++ b/packages/shared_preferences/shared_preferences_web/pubspec.yaml @@ -2,10 +2,10 @@ name: shared_preferences_web description: Web platform implementation of shared_preferences repository: https://github.com/flutter/packages/tree/main/packages/shared_preferences/shared_preferences_web issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+shared_preferences%22 -version: 2.2.2 +version: 2.2.3 environment: - sdk: ">=3.2.0 <4.0.0" + sdk: ^3.2.0 flutter: ">=3.16.0" flutter: @@ -22,7 +22,7 @@ dependencies: flutter_web_plugins: sdk: flutter shared_preferences_platform_interface: ^2.3.0 - web: '>=0.3.0 <0.5.0' + web: '>=0.3.0 <0.4.1' # 0.4.1 is not compatible with stable dev_dependencies: flutter_test: diff --git a/packages/url_launcher/url_launcher_web/CHANGELOG.md b/packages/url_launcher/url_launcher_web/CHANGELOG.md index 641b48d27cf..44eb1e1daf4 100644 --- a/packages/url_launcher/url_launcher_web/CHANGELOG.md +++ b/packages/url_launcher/url_launcher_web/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.2.4 + +* Pins `package:web` to `>=0.3.0 <0.4.0`. + ## 2.2.3 * Fixes new lint warnings. diff --git a/packages/url_launcher/url_launcher_web/pubspec.yaml b/packages/url_launcher/url_launcher_web/pubspec.yaml index 6c89bba5809..48ac8951742 100644 --- a/packages/url_launcher/url_launcher_web/pubspec.yaml +++ b/packages/url_launcher/url_launcher_web/pubspec.yaml @@ -2,7 +2,7 @@ name: url_launcher_web description: Web platform implementation of url_launcher repository: https://github.com/flutter/packages/tree/main/packages/url_launcher/url_launcher_web issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+url_launcher%22 -version: 2.2.3 +version: 2.2.4 environment: sdk: ^3.2.0 @@ -22,7 +22,7 @@ dependencies: flutter_web_plugins: sdk: flutter url_launcher_platform_interface: ^2.2.0 - web: '>=0.3.0 <0.5.0' + web: '>=0.3.0 <0.4.1' # 0.4.1 is not compatible with stable dev_dependencies: flutter_test: diff --git a/packages/web_benchmarks/CHANGELOG.md b/packages/web_benchmarks/CHANGELOG.md index f401c3885b2..68be3a4401e 100644 --- a/packages/web_benchmarks/CHANGELOG.md +++ b/packages/web_benchmarks/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.1.2 + +* Pins `package:web` to `>=0.3.0 <0.4.0`. + ## 1.1.1 * Fixes new lint warnings. diff --git a/packages/web_benchmarks/pubspec.yaml b/packages/web_benchmarks/pubspec.yaml index aa89736869c..91d195b9345 100644 --- a/packages/web_benchmarks/pubspec.yaml +++ b/packages/web_benchmarks/pubspec.yaml @@ -2,10 +2,10 @@ name: web_benchmarks description: A benchmark harness for performance-testing Flutter apps in Chrome. repository: https://github.com/flutter/packages/tree/main/packages/web_benchmarks issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+web_benchmarks%22 -version: 1.1.1 +version: 1.1.2 environment: - sdk: ">=3.2.0 <4.0.0" + sdk: ^3.2.0 flutter: ">=3.16.0" dependencies: @@ -21,7 +21,7 @@ dependencies: shelf: ^1.2.0 shelf_static: ^1.1.0 test: ^1.19.5 - web: '>=0.3.0 <0.5.0' + web: '>=0.3.0 <0.4.1' # 0.4.1 is not compatible with stable webkit_inspection_protocol: ^1.0.0 topics: From 23f1d1325d0ddae3aff9e19c59b2fb77d7ff65ea Mon Sep 17 00:00:00 2001 From: David Iglesias Teixeira Date: Thu, 11 Jan 2024 17:10:31 -0800 Subject: [PATCH 6/6] The right version now. --- packages/cross_file/CHANGELOG.md | 2 +- packages/file_selector/file_selector_web/CHANGELOG.md | 2 +- packages/shared_preferences/shared_preferences_web/CHANGELOG.md | 2 +- packages/url_launcher/url_launcher_web/CHANGELOG.md | 2 +- packages/web_benchmarks/CHANGELOG.md | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/cross_file/CHANGELOG.md b/packages/cross_file/CHANGELOG.md index 1625b7b58ec..50ae5f6cde1 100644 --- a/packages/cross_file/CHANGELOG.md +++ b/packages/cross_file/CHANGELOG.md @@ -1,6 +1,6 @@ ## 0.3.3+9 -* Pins `package:web` to `>=0.3.0 <0.4.0`. +* Pins `package:web` to `>=0.3.0 <0.4.1`. ## 0.3.3+8 diff --git a/packages/file_selector/file_selector_web/CHANGELOG.md b/packages/file_selector/file_selector_web/CHANGELOG.md index 70b1c2015dd..2268ba87693 100644 --- a/packages/file_selector/file_selector_web/CHANGELOG.md +++ b/packages/file_selector/file_selector_web/CHANGELOG.md @@ -1,7 +1,7 @@ ## 0.9.3+1 * Updates minimum supported SDK version to Flutter 3.10/Dart 3.0. -* Pins `package:web` to `>=0.3.0 <0.4.0`. +* Pins `package:web` to `>=0.3.0 <0.4.1`. ## 0.9.3 diff --git a/packages/shared_preferences/shared_preferences_web/CHANGELOG.md b/packages/shared_preferences/shared_preferences_web/CHANGELOG.md index 3db88a8884d..dc416cee71d 100644 --- a/packages/shared_preferences/shared_preferences_web/CHANGELOG.md +++ b/packages/shared_preferences/shared_preferences_web/CHANGELOG.md @@ -1,6 +1,6 @@ ## 2.2.3 -* Pins `package:web` to `>=0.3.0 <0.4.0`. +* Pins `package:web` to `>=0.3.0 <0.4.1`. ## 2.2.2 diff --git a/packages/url_launcher/url_launcher_web/CHANGELOG.md b/packages/url_launcher/url_launcher_web/CHANGELOG.md index 44eb1e1daf4..29dafec6401 100644 --- a/packages/url_launcher/url_launcher_web/CHANGELOG.md +++ b/packages/url_launcher/url_launcher_web/CHANGELOG.md @@ -1,6 +1,6 @@ ## 2.2.4 -* Pins `package:web` to `>=0.3.0 <0.4.0`. +* Pins `package:web` to `>=0.3.0 <0.4.1`. ## 2.2.3 diff --git a/packages/web_benchmarks/CHANGELOG.md b/packages/web_benchmarks/CHANGELOG.md index 68be3a4401e..ecf4e2ace7c 100644 --- a/packages/web_benchmarks/CHANGELOG.md +++ b/packages/web_benchmarks/CHANGELOG.md @@ -1,6 +1,6 @@ ## 1.1.2 -* Pins `package:web` to `>=0.3.0 <0.4.0`. +* Pins `package:web` to `>=0.3.0 <0.4.1`. ## 1.1.1