Merge branch 'main' into add-package-to-generated-image-asset-provider

.gitignore

@@ -45,6 +45,7 @@ pubspec_overrides.yaml
 **/build/
 generated_plugin_registrant.dart
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+!/pubspec.lock
 
 # Fastlane related
 android/fastlane/report.xml

README.md

@@ -420,4 +420,3 @@ and open a [pull request](https://github.com/FlutterGen/flutter_gen/pulls).
 
 [build_runner]: https://pub.dev/packages/build_runner
 [fluttergen]: https://pub.dev/packages/flutter_gen
-

melos.yaml

@@ -17,7 +17,7 @@ command:
 
 scripts:
   upgrade:
-    run: melos exec -- flutter pub upgrade
+    exec: flutter pub upgrade
     description: flutter pub upgrade
 
   analyze:
@@ -29,51 +29,41 @@ scripts:
     description: dart format --set-exit-if-changed .
 
   build:
-    run: |
-      melos exec -- flutter build apk
-    select-package:
+    exec: flutter build apk
+    packageFilters:
       scope: example
     description: flutter build apk
 
   gen:build_runner:
-    run: |
-      melos exec -- dart pub run build_runner build --delete-conflicting-outputs
-    select-package:
+    exec: dart pub run build_runner build --delete-conflicting-outputs
+    packageFilters:
       ignore:
         - example
         - example_resources
-      depends-on: build_runner
+      dependsOn: build_runner
     description: dart pub run build_runner build --delete-conflicting-outputs
 
   gen:example:command:
-    run: |
-      melos exec \
-      -- dart ../../packages/command/bin/flutter_gen_command.dart --config pubspec.yaml
-    select-package:
+    exec: dart ../../packages/command/bin/flutter_gen_command.dart --config pubspec.yaml
+    packageFilters:
       scope: example
     description: dart ../../packages/command/bin/flutter_gen_command.dart --config pubspec.yaml
 
   gen:example:build_runner:
-    run: |
-      melos exec \
-      -- flutter pub run build_runner build --delete-conflicting-outputs
-    select-package:
+    exec: flutter pub run build_runner build --delete-conflicting-outputs
+    packageFilters:
       scope: example
     description: flutter pub run build_runner build --delete-conflicting-outputs
 
   gen:example:res:command:
-    run: |
-      melos exec \
-      -- dart ../../packages/command/bin/flutter_gen_command.dart --config pubspec.yaml
-    select-package:
+    exec: dart ../../packages/command/bin/flutter_gen_command.dart --config pubspec.yaml
+    packageFilters:
       scope: example_resources
     description: dart ../../packages/command/bin/flutter_gen_command.dart --config pubspec.yaml
 
   gen:example:res:build_runner:
-    run: |
-      melos exec \
-      -- flutter pub run build_runner build --delete-conflicting-outputs
-    select-package:
+    exec: flutter pub run build_runner build --delete-conflicting-outputs
+    packageFilters:
       scope: example_resources
     description: flutter pub run build_runner build --delete-conflicting-outputs
 
@@ -82,10 +72,12 @@ scripts:
     description: dart test
 
   test:dart:
-    run: melos exec --fail-fast dart test
-    select-package:
+    run: dart test
+    exec:
+      failFast: true
+    packageFilters:
       flutter: false
-      depends-on: test
+      dependsOn: test
     description: dart test
 
   coverage:
@@ -94,5 +86,7 @@ scripts:
     description: bash ./scripts/coverage.sh packages/core
 
   postclean:
-    run: melos exec -c 6 -- flutter clean
+    run: flutter clean
+    exec:
+      concurrency: 6
     description: flutter clean

package.json

@@ -21,5 +21,5 @@
     "prettier": "^2.8.3",
     "prettier-plugin-packagejson": "^2.4.0"
   },
-  "packageManager": "pnpm@7.27.1"
+  "packageManager": "pnpm@7.29.1"
 }

packages/core/lib/generators/integrations/svg_integration.dart

@@ -38,9 +38,9 @@ class SvgIntegration extends Integration {
     bool excludeFromSemantics = false,
     SvgTheme theme = const SvgTheme(),
     ColorFilter? colorFilter,
+    Clip clipBehavior = Clip.hardEdge,
     @deprecated Color? color,
     @deprecated BlendMode colorBlendMode = BlendMode.srcIn,
-    @deprecated Clip? clipBehavior,
     @deprecated bool cacheColorFilter = false,
   }) {
     return SvgPicture.asset(