From a152527242d3380493760bd55d95603c5c8f14db Mon Sep 17 00:00:00 2001 From: Matthew Whitaker Date: Tue, 11 Mar 2025 11:57:05 -0600 Subject: [PATCH 1/5] Change branch name --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0a1df1def5..964fcf867d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,9 +2,9 @@ name: Test flutter_html on: pull_request: - branches: [ main ] + branches: [ master ] push: - branches: [ main ] + branches: [ master ] jobs: test: From d47a4cc5253e65c51f265365a95ae252537162e5 Mon Sep 17 00:00:00 2001 From: Matthew Whitaker Date: Tue, 11 Mar 2025 12:00:53 -0600 Subject: [PATCH 2/5] Test melos directly --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 964fcf867d..91d27fddcd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,7 @@ jobs: - name: Setup Melos run: flutter pub global activate melos - name: Bootstrap Project - run: flutter pub global run melos bootstrap + run: melos bootstrap - name: Run Test Suite run: flutter pub global run melos run test - name: Compile Test Coverage Report From 634cfdc21e6afe947cdb2f29c10f6f429883224d Mon Sep 17 00:00:00 2001 From: Matthew Whitaker Date: Tue, 11 Mar 2025 12:05:42 -0600 Subject: [PATCH 3/5] Adjust example dependency structure to rely on melos --- example/pubspec.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 308b3a2825..91a6cee4cc 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -7,10 +7,8 @@ environment: sdk: '>=3.2.0 <4.0.0' dependencies: - flutter_html: - path: .. - flutter_html_all: - path: ../packages/flutter_html_all + flutter_html: ^3.0.0-beta.2 + flutter_html_all: ^3.0.0-beta.2 flutter: sdk: flutter From a11a9cde49f3b0daa6eb0aa25125cea42399387a Mon Sep 17 00:00:00 2001 From: Matthew Whitaker Date: Tue, 11 Mar 2025 12:35:23 -0600 Subject: [PATCH 4/5] Upgrade from dart:html to pkg:web --- packages/flutter_html_iframe/lib/iframe_web.dart | 7 +++---- packages/flutter_html_iframe/pubspec.yaml | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/flutter_html_iframe/lib/iframe_web.dart b/packages/flutter_html_iframe/lib/iframe_web.dart index 99ab6d4ad2..f2f4d33805 100644 --- a/packages/flutter_html_iframe/lib/iframe_web.dart +++ b/packages/flutter_html_iframe/lib/iframe_web.dart @@ -4,8 +4,7 @@ import 'dart:math'; import 'package:flutter/material.dart'; import 'package:flutter_html/flutter_html.dart'; import 'package:flutter_html_iframe/shims/dart_ui.dart' as ui; -// ignore: avoid_web_libraries_in_flutter -import 'dart:html' as html; +import 'package:web/web.dart' show HTMLIFrameElement; import 'package:webview_flutter/webview_flutter.dart'; @@ -25,10 +24,10 @@ class IframeWidget extends StatelessWidget { double.tryParse(extensionContext.attributes['width'] ?? ""); final givenHeight = double.tryParse(extensionContext.attributes['height'] ?? ""); - final html.IFrameElement iframe = html.IFrameElement() + final HTMLIFrameElement iframe = HTMLIFrameElement() ..width = (givenWidth ?? (givenHeight ?? 150) * 2).toString() ..height = (givenHeight ?? (givenWidth ?? 300) / 2).toString() - ..src = extensionContext.attributes['src'] + ..src = extensionContext.attributes['src'] ?? "" ..style.border = 'none'; final String createdViewId = _getRandString(10); ui.platformViewRegistry diff --git a/packages/flutter_html_iframe/pubspec.yaml b/packages/flutter_html_iframe/pubspec.yaml index cbb09e5bb7..772b184291 100644 --- a/packages/flutter_html_iframe/pubspec.yaml +++ b/packages/flutter_html_iframe/pubspec.yaml @@ -12,6 +12,7 @@ dependencies: sdk: flutter html: '>=0.15.0 <1.0.0' flutter_html: ^3.0.0-beta.2 + web: '>=1.1.1 < 2.0.0' webview_flutter: '>=4.0.0 <5.0.0' dev_dependencies: From 7c6d460af41fcd49f6dac50f6cdbc1ef92fe6cc2 Mon Sep 17 00:00:00 2001 From: Matthew Whitaker Date: Tue, 11 Mar 2025 12:38:59 -0600 Subject: [PATCH 5/5] Add missing . --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 91d27fddcd..5c85e75d34 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,4 +30,4 @@ jobs: - name: Run Dart Analysis run: flutter pub global run melos analyze --fatal-infos - name: Check that `dart format` has been run on every file - run: dart format -o none --set-exit-if-changed + run: dart format -o none --set-exit-if-changed .