From 6c3cc7566bb6e79191d6e078545350882693e88a Mon Sep 17 00:00:00 2001 From: Alexandru Mariuti Date: Mon, 4 Nov 2024 10:31:38 +0100 Subject: [PATCH 01/10] refactor/wasm-compatibility --- packages/vector_graphics/lib/src/debug.dart | 2 +- .../lib/vector_graphics_compiler.dart | 4 ++-- third_party/packages/flutter_svg/lib/src/utilities/file.dart | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/vector_graphics/lib/src/debug.dart b/packages/vector_graphics/lib/src/debug.dart index fee0ef052535..7238ea5226a0 100644 --- a/packages/vector_graphics/lib/src/debug.dart +++ b/packages/vector_graphics/lib/src/debug.dart @@ -2,4 +2,4 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -export '_debug_web.dart' if (dart.library.io) '_debug_io.dart'; +export '_debug_io.dart' if (dart.library.js_interop) '_debug_web.dart'; diff --git a/packages/vector_graphics_compiler/lib/vector_graphics_compiler.dart b/packages/vector_graphics_compiler/lib/vector_graphics_compiler.dart index c4a8efe3b27a..206041b7d264 100644 --- a/packages/vector_graphics_compiler/lib/vector_graphics_compiler.dart +++ b/packages/vector_graphics_compiler/lib/vector_graphics_compiler.dart @@ -18,9 +18,9 @@ import 'src/svg/theme.dart'; import 'src/vector_instructions.dart'; export 'src/_initialize_path_ops_io.dart' - if (dart.library.html) 'src/_initialize_path_ops_web.dart'; + if (dart.library.js_interop) 'src/_initialize_path_ops_web.dart'; export 'src/_initialize_tessellator_io.dart' - if (dart.library.html) 'src/_initialize_tessellator_web.dart'; + if (dart.library.js_interop) 'src/_initialize_tessellator_web.dart'; export 'src/geometry/basic_types.dart'; export 'src/geometry/matrix.dart'; export 'src/geometry/path.dart'; diff --git a/third_party/packages/flutter_svg/lib/src/utilities/file.dart b/third_party/packages/flutter_svg/lib/src/utilities/file.dart index e469e274b0e9..16555b6fabb3 100644 --- a/third_party/packages/flutter_svg/lib/src/utilities/file.dart +++ b/third_party/packages/flutter_svg/lib/src/utilities/file.dart @@ -1 +1 @@ -export '_file_io.dart' if (dart.library.html) '_file_none.dart'; +export '_file_io.dart' if (dart.library.js_interop) '_file_none.dart'; From 7b397a43a76e09b02c16c40033d5fd2b45bea6ac Mon Sep 17 00:00:00 2001 From: Alexandru Mariuti Date: Mon, 4 Nov 2024 10:39:10 +0100 Subject: [PATCH 02/10] chore/bump versions --- packages/vector_graphics/CHANGELOG.md | 4 ++++ packages/vector_graphics/pubspec.yaml | 4 ++-- packages/vector_graphics_compiler/CHANGELOG.md | 4 ++++ packages/vector_graphics_compiler/pubspec.yaml | 4 ++-- third_party/packages/flutter_svg/CHANGELOG.md | 4 ++++ third_party/packages/flutter_svg/pubspec.yaml | 6 +++--- 6 files changed, 19 insertions(+), 7 deletions(-) diff --git a/packages/vector_graphics/CHANGELOG.md b/packages/vector_graphics/CHANGELOG.md index de88a770fce1..fb0b4ad2b226 100644 --- a/packages/vector_graphics/CHANGELOG.md +++ b/packages/vector_graphics/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.1.14 + +* Make the package WASM compatible + ## 1.1.13 * Fix execution on the web with WebAssembly. diff --git a/packages/vector_graphics/pubspec.yaml b/packages/vector_graphics/pubspec.yaml index 03e6c562bbb1..ef1f3738ca06 100644 --- a/packages/vector_graphics/pubspec.yaml +++ b/packages/vector_graphics/pubspec.yaml @@ -5,7 +5,7 @@ issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+ # See https://github.com/flutter/flutter/issues/157626 before publishing a new # version. publish_to: none -version: 1.1.13 +version: 1.1.14 environment: sdk: ^3.4.0 @@ -22,7 +22,7 @@ dev_dependencies: flutter_test: sdk: flutter # See https://github.com/flutter/flutter/issues/157626 - vector_graphics_compiler: ">=1.1.11+1 <= 1.1.12" + vector_graphics_compiler: ">=1.1.11+1 <= 1.1.13" platforms: android: diff --git a/packages/vector_graphics_compiler/CHANGELOG.md b/packages/vector_graphics_compiler/CHANGELOG.md index 51e080adfa83..d2da3bdc2b89 100644 --- a/packages/vector_graphics_compiler/CHANGELOG.md +++ b/packages/vector_graphics_compiler/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.1.13 + +* Make the package WASM compatible + ## 1.1.12 * Transfers the package source from https://github.com/dnfield/vector_graphics diff --git a/packages/vector_graphics_compiler/pubspec.yaml b/packages/vector_graphics_compiler/pubspec.yaml index ae92d689012e..ee31350e61ce 100644 --- a/packages/vector_graphics_compiler/pubspec.yaml +++ b/packages/vector_graphics_compiler/pubspec.yaml @@ -5,7 +5,7 @@ issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+ # See https://github.com/flutter/flutter/issues/157626 before publishing a new # version. publish_to: none -version: 1.1.12 +version: 1.1.13 executables: vector_graphics_compiler: @@ -36,7 +36,7 @@ dev_dependencies: sdk: flutter test: ^1.20.1 # See https://github.com/flutter/flutter/issues/157626 - vector_graphics: ">=1.1.11+1 <= 1.1.12" + vector_graphics: ">=1.1.11+1 <= 1.1.14" vector_math: ^2.1.2 platforms: diff --git a/third_party/packages/flutter_svg/CHANGELOG.md b/third_party/packages/flutter_svg/CHANGELOG.md index 1f64d4639a56..f5b24e100ef5 100644 --- a/third_party/packages/flutter_svg/CHANGELOG.md +++ b/third_party/packages/flutter_svg/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.0.12 + +* Make the package WASM compatible + ## 2.0.11 * Transfers the package source from https://github.com/dnfield/flutter_svg diff --git a/third_party/packages/flutter_svg/pubspec.yaml b/third_party/packages/flutter_svg/pubspec.yaml index 5ac508491f6d..ea6faf14d4c1 100644 --- a/third_party/packages/flutter_svg/pubspec.yaml +++ b/third_party/packages/flutter_svg/pubspec.yaml @@ -2,7 +2,7 @@ name: flutter_svg description: An SVG rendering and widget library for Flutter, which allows painting and displaying Scalable Vector Graphics 1.1 files. repository: https://github.com/flutter/packages/tree/main/third_party/packages/flutter_svg issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+flutter_svg%22 -version: 2.0.11 +version: 2.0.12 environment: sdk: ^3.4.0 @@ -13,9 +13,9 @@ dependencies: sdk: flutter http: ^1.0.0 # See https://github.com/flutter/flutter/issues/157626 - vector_graphics: ">=1.1.11+1 <= 1.1.12" + vector_graphics: ">=1.1.11+1 <= 1.1.14" vector_graphics_codec: ">=1.1.11+1 <= 1.1.12" - vector_graphics_compiler: ">=1.1.11+1 <= 1.1.12" + vector_graphics_compiler: ">=1.1.11+1 <= 1.1.13" dev_dependencies: flutter_test: From 6a62471e1363b74d262fdf56c005d40c136aaab3 Mon Sep 17 00:00:00 2001 From: Alexandru Mariuti Date: Mon, 4 Nov 2024 15:06:16 +0100 Subject: [PATCH 03/10] chore/update changelog message --- packages/vector_graphics/CHANGELOG.md | 2 +- packages/vector_graphics_compiler/CHANGELOG.md | 2 +- third_party/packages/flutter_svg/CHANGELOG.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/vector_graphics/CHANGELOG.md b/packages/vector_graphics/CHANGELOG.md index fb0b4ad2b226..530eea086e45 100644 --- a/packages/vector_graphics/CHANGELOG.md +++ b/packages/vector_graphics/CHANGELOG.md @@ -1,6 +1,6 @@ ## 1.1.14 -* Make the package WASM compatible +* Makes the package WASM compatible. ## 1.1.13 diff --git a/packages/vector_graphics_compiler/CHANGELOG.md b/packages/vector_graphics_compiler/CHANGELOG.md index d2da3bdc2b89..feb96a3706a8 100644 --- a/packages/vector_graphics_compiler/CHANGELOG.md +++ b/packages/vector_graphics_compiler/CHANGELOG.md @@ -1,6 +1,6 @@ ## 1.1.13 -* Make the package WASM compatible +* Makes the package WASM compatible. ## 1.1.12 diff --git a/third_party/packages/flutter_svg/CHANGELOG.md b/third_party/packages/flutter_svg/CHANGELOG.md index f5b24e100ef5..171b667d7574 100644 --- a/third_party/packages/flutter_svg/CHANGELOG.md +++ b/third_party/packages/flutter_svg/CHANGELOG.md @@ -1,6 +1,6 @@ ## 2.0.12 -* Make the package WASM compatible +* Makes the package WASM compatible. ## 2.0.11 From 5784d4437dc62d27cb3e2201033cd9f6a5c023fb Mon Sep 17 00:00:00 2001 From: Alexandru Mariuti Date: Mon, 4 Nov 2024 17:01:54 +0100 Subject: [PATCH 04/10] refactor/revert changes in vector_graphics --- packages/vector_graphics/CHANGELOG.md | 4 ---- packages/vector_graphics/lib/src/debug.dart | 2 +- packages/vector_graphics/pubspec.yaml | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/vector_graphics/CHANGELOG.md b/packages/vector_graphics/CHANGELOG.md index 530eea086e45..de88a770fce1 100644 --- a/packages/vector_graphics/CHANGELOG.md +++ b/packages/vector_graphics/CHANGELOG.md @@ -1,7 +1,3 @@ -## 1.1.14 - -* Makes the package WASM compatible. - ## 1.1.13 * Fix execution on the web with WebAssembly. diff --git a/packages/vector_graphics/lib/src/debug.dart b/packages/vector_graphics/lib/src/debug.dart index 7238ea5226a0..fee0ef052535 100644 --- a/packages/vector_graphics/lib/src/debug.dart +++ b/packages/vector_graphics/lib/src/debug.dart @@ -2,4 +2,4 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -export '_debug_io.dart' if (dart.library.js_interop) '_debug_web.dart'; +export '_debug_web.dart' if (dart.library.io) '_debug_io.dart'; diff --git a/packages/vector_graphics/pubspec.yaml b/packages/vector_graphics/pubspec.yaml index ef1f3738ca06..6f58e40ad0e6 100644 --- a/packages/vector_graphics/pubspec.yaml +++ b/packages/vector_graphics/pubspec.yaml @@ -5,7 +5,7 @@ issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+ # See https://github.com/flutter/flutter/issues/157626 before publishing a new # version. publish_to: none -version: 1.1.14 +version: 1.1.13 environment: sdk: ^3.4.0 From 4c522e119eec729f726510a9349f813df9792b20 Mon Sep 17 00:00:00 2001 From: Alexandru Mariuti Date: Mon, 4 Nov 2024 17:10:26 +0100 Subject: [PATCH 05/10] chore: update constraints of dev dependencies --- packages/vector_graphics/pubspec.yaml | 2 +- packages/vector_graphics_compiler/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/vector_graphics/pubspec.yaml b/packages/vector_graphics/pubspec.yaml index 6f58e40ad0e6..4c86eb5cdf99 100644 --- a/packages/vector_graphics/pubspec.yaml +++ b/packages/vector_graphics/pubspec.yaml @@ -22,7 +22,7 @@ dev_dependencies: flutter_test: sdk: flutter # See https://github.com/flutter/flutter/issues/157626 - vector_graphics_compiler: ">=1.1.11+1 <= 1.1.13" + vector_graphics_compiler: ^1.1.13 platforms: android: diff --git a/packages/vector_graphics_compiler/pubspec.yaml b/packages/vector_graphics_compiler/pubspec.yaml index ee31350e61ce..e2c7e5e98970 100644 --- a/packages/vector_graphics_compiler/pubspec.yaml +++ b/packages/vector_graphics_compiler/pubspec.yaml @@ -36,7 +36,7 @@ dev_dependencies: sdk: flutter test: ^1.20.1 # See https://github.com/flutter/flutter/issues/157626 - vector_graphics: ">=1.1.11+1 <= 1.1.14" + vector_graphics: ^1.1.13 vector_math: ^2.1.2 platforms: From d2cfe338a34192d3517d2ecc53546e9d18b365d5 Mon Sep 17 00:00:00 2001 From: Alexandru Mariuti Date: Tue, 5 Nov 2024 10:31:40 +0100 Subject: [PATCH 06/10] refactor: revert changes in vector graphics compiler --- packages/vector_graphics_compiler/CHANGELOG.md | 4 ---- .../lib/vector_graphics_compiler.dart | 4 ++-- packages/vector_graphics_compiler/pubspec.yaml | 4 ++-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/packages/vector_graphics_compiler/CHANGELOG.md b/packages/vector_graphics_compiler/CHANGELOG.md index feb96a3706a8..51e080adfa83 100644 --- a/packages/vector_graphics_compiler/CHANGELOG.md +++ b/packages/vector_graphics_compiler/CHANGELOG.md @@ -1,7 +1,3 @@ -## 1.1.13 - -* Makes the package WASM compatible. - ## 1.1.12 * Transfers the package source from https://github.com/dnfield/vector_graphics diff --git a/packages/vector_graphics_compiler/lib/vector_graphics_compiler.dart b/packages/vector_graphics_compiler/lib/vector_graphics_compiler.dart index 206041b7d264..c4a8efe3b27a 100644 --- a/packages/vector_graphics_compiler/lib/vector_graphics_compiler.dart +++ b/packages/vector_graphics_compiler/lib/vector_graphics_compiler.dart @@ -18,9 +18,9 @@ import 'src/svg/theme.dart'; import 'src/vector_instructions.dart'; export 'src/_initialize_path_ops_io.dart' - if (dart.library.js_interop) 'src/_initialize_path_ops_web.dart'; + if (dart.library.html) 'src/_initialize_path_ops_web.dart'; export 'src/_initialize_tessellator_io.dart' - if (dart.library.js_interop) 'src/_initialize_tessellator_web.dart'; + if (dart.library.html) 'src/_initialize_tessellator_web.dart'; export 'src/geometry/basic_types.dart'; export 'src/geometry/matrix.dart'; export 'src/geometry/path.dart'; diff --git a/packages/vector_graphics_compiler/pubspec.yaml b/packages/vector_graphics_compiler/pubspec.yaml index e2c7e5e98970..ae92d689012e 100644 --- a/packages/vector_graphics_compiler/pubspec.yaml +++ b/packages/vector_graphics_compiler/pubspec.yaml @@ -5,7 +5,7 @@ issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+ # See https://github.com/flutter/flutter/issues/157626 before publishing a new # version. publish_to: none -version: 1.1.13 +version: 1.1.12 executables: vector_graphics_compiler: @@ -36,7 +36,7 @@ dev_dependencies: sdk: flutter test: ^1.20.1 # See https://github.com/flutter/flutter/issues/157626 - vector_graphics: ^1.1.13 + vector_graphics: ">=1.1.11+1 <= 1.1.12" vector_math: ^2.1.2 platforms: From 2f2e45019cd6c5d75921a96da3d12c8d5e16fa8c Mon Sep 17 00:00:00 2001 From: Alexandru Mariuti Date: Tue, 5 Nov 2024 10:33:02 +0100 Subject: [PATCH 07/10] fix: min vector graphics version --- third_party/packages/flutter_svg/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/packages/flutter_svg/pubspec.yaml b/third_party/packages/flutter_svg/pubspec.yaml index ea6faf14d4c1..01241d70fb3c 100644 --- a/third_party/packages/flutter_svg/pubspec.yaml +++ b/third_party/packages/flutter_svg/pubspec.yaml @@ -13,7 +13,7 @@ dependencies: sdk: flutter http: ^1.0.0 # See https://github.com/flutter/flutter/issues/157626 - vector_graphics: ">=1.1.11+1 <= 1.1.14" + vector_graphics: ^1.1.13 vector_graphics_codec: ">=1.1.11+1 <= 1.1.12" vector_graphics_compiler: ">=1.1.11+1 <= 1.1.13" From bcfe1ea26586be9dc30b351bdb76d77679007212 Mon Sep 17 00:00:00 2001 From: Alexandru Mariuti Date: Tue, 5 Nov 2024 10:33:58 +0100 Subject: [PATCH 08/10] fix compiler min version --- third_party/packages/flutter_svg/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/packages/flutter_svg/pubspec.yaml b/third_party/packages/flutter_svg/pubspec.yaml index 01241d70fb3c..8da0afad8913 100644 --- a/third_party/packages/flutter_svg/pubspec.yaml +++ b/third_party/packages/flutter_svg/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: # See https://github.com/flutter/flutter/issues/157626 vector_graphics: ^1.1.13 vector_graphics_codec: ">=1.1.11+1 <= 1.1.12" - vector_graphics_compiler: ">=1.1.11+1 <= 1.1.13" + vector_graphics_compiler: ^1.1.13 dev_dependencies: flutter_test: From 6029722c8a7627d7ae0aaeee0fb27feda27047d2 Mon Sep 17 00:00:00 2001 From: Alexandru Mariuti Date: Tue, 5 Nov 2024 10:44:04 +0100 Subject: [PATCH 09/10] bump version --- third_party/packages/flutter_svg/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/packages/flutter_svg/pubspec.yaml b/third_party/packages/flutter_svg/pubspec.yaml index 8da0afad8913..8ff19eb6c5ec 100644 --- a/third_party/packages/flutter_svg/pubspec.yaml +++ b/third_party/packages/flutter_svg/pubspec.yaml @@ -2,7 +2,7 @@ name: flutter_svg description: An SVG rendering and widget library for Flutter, which allows painting and displaying Scalable Vector Graphics 1.1 files. repository: https://github.com/flutter/packages/tree/main/third_party/packages/flutter_svg issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+flutter_svg%22 -version: 2.0.12 +version: 2.0.13 environment: sdk: ^3.4.0 From 0ca88ceb5f5df5a490698c661362dab22f013d94 Mon Sep 17 00:00:00 2001 From: Alexandru Mariuti Date: Wed, 6 Nov 2024 13:15:24 +0000 Subject: [PATCH 10/10] Update pubspec.yaml --- third_party/packages/flutter_svg/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/packages/flutter_svg/pubspec.yaml b/third_party/packages/flutter_svg/pubspec.yaml index b493599dc0f3..e18e014e9596 100644 --- a/third_party/packages/flutter_svg/pubspec.yaml +++ b/third_party/packages/flutter_svg/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: http: ^1.0.0 vector_graphics: ^1.1.13 vector_graphics_codec: ^1.1.11+1 - vector_graphics_compiler: ^1.1.13 + vector_graphics_compiler: ^1.1.14 dev_dependencies: flutter_test: