From c9ebce588c8e09e351a609d97cb2bc135940146d Mon Sep 17 00:00:00 2001 From: wasabeef Date: Wed, 28 Aug 2024 16:26:00 +0900 Subject: [PATCH 1/3] fix: flutter process concurenccy --- melos.yaml | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/melos.yaml b/melos.yaml index 5f1421657..4cd4115da 100644 --- a/melos.yaml +++ b/melos.yaml @@ -8,29 +8,31 @@ packages: ide: intellij: enabled: true - moduleNamePrefix: '' - vscode: true command: clean: hooks: post: - run: | - melos exec -c 6 -- flutter clean + run: flutter clean + exec: + concurrency: 1 description: flutter clean scripts: get: - run: | - melos exec -c 6 -- flutter pub get + run: flutter pub get + exec: + concurrency: 1 description: flutter pub get upgrade: - run: melos exec -c 6 -- flutter pub upgrade + run: flutter pub upgrade + exec: + concurrency: 1 description: flutter pub upgrade analyze: - run: melos exec -c 6 -- flutter analyze + exec: flutter analyze description: flutter analyze format: @@ -53,23 +55,27 @@ scripts: description: dart run build_runner build --delete-conflicting-outputs gen:examples:command: - exec: dart ../../packages/command/bin/flutter_gen_command.dart --config pubspec.yaml + exec: dart ../../packages/command/bin/flutter_gen_command.dart packageFilters: - scope: + scope: - example - example_resources - description: dart ../../packages/command/bin/flutter_gen_command.dart --config pubspec.yaml + description: dart ../../packages/command/bin/flutter_gen_command.dart gen:examples:build_runner: - exec: flutter pub run build_runner build --delete-conflicting-outputs + run: flutter pub run build_runner build --delete-conflicting-outputs + exec: + concurrency: 1 packageFilters: - scope: + scope: - example - example_resources description: flutter pub run build_runner build --delete-conflicting-outputs test: - run: melos test:dart --no-select && melos test:flutter --no-select + run: | + melos test:dart --no-select && \ + melos test:flutter --no-select description: dart & flutter test test:dart: From f415c5bf65d2e3bbe696376872eda1d0ec09edc2 Mon Sep 17 00:00:00 2001 From: wasabeef Date: Wed, 28 Aug 2024 16:26:25 +0900 Subject: [PATCH 2/3] fix: remove unneeded annontation --- examples/example/test/svg_integrations_test.dart | 1 - packages/core/test/assets_gen_integrations_test.dart | 1 - packages/core/test/assets_gen_test.dart | 1 - packages/core/test/colors_gen_test.dart | 1 - packages/core/test/flutter_gen_test.dart | 1 - packages/core/test/fonts_gen_test.dart | 1 - packages/core/test/gen_test_helper.dart | 1 - 7 files changed, 7 deletions(-) diff --git a/examples/example/test/svg_integrations_test.dart b/examples/example/test/svg_integrations_test.dart index 5db3078d1..72cfe6909 100644 --- a/examples/example/test/svg_integrations_test.dart +++ b/examples/example/test/svg_integrations_test.dart @@ -1,4 +1,3 @@ -@TestOn('vm') import 'package:example/gen/assets.gen.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; diff --git a/packages/core/test/assets_gen_integrations_test.dart b/packages/core/test/assets_gen_integrations_test.dart index 6483c414c..6027c595b 100644 --- a/packages/core/test/assets_gen_integrations_test.dart +++ b/packages/core/test/assets_gen_integrations_test.dart @@ -1,4 +1,3 @@ -@TestOn('vm') import 'package:flutter_gen_core/generators/integrations/flare_integration.dart'; import 'package:flutter_gen_core/generators/integrations/integration.dart'; import 'package:flutter_gen_core/generators/integrations/lottie_integration.dart'; diff --git a/packages/core/test/assets_gen_test.dart b/packages/core/test/assets_gen_test.dart index ec2d11f41..32519cc4b 100644 --- a/packages/core/test/assets_gen_test.dart +++ b/packages/core/test/assets_gen_test.dart @@ -1,4 +1,3 @@ -@TestOn('vm') import 'dart:io'; import 'package:dart_style/dart_style.dart'; diff --git a/packages/core/test/colors_gen_test.dart b/packages/core/test/colors_gen_test.dart index be66c8008..9828c9f0f 100644 --- a/packages/core/test/colors_gen_test.dart +++ b/packages/core/test/colors_gen_test.dart @@ -1,4 +1,3 @@ -@TestOn('vm') import 'dart:io'; import 'package:dart_style/dart_style.dart'; diff --git a/packages/core/test/flutter_gen_test.dart b/packages/core/test/flutter_gen_test.dart index cdcf03f48..623f25baa 100644 --- a/packages/core/test/flutter_gen_test.dart +++ b/packages/core/test/flutter_gen_test.dart @@ -1,4 +1,3 @@ -@TestOn('vm') import 'dart:io'; import 'package:flutter_gen_core/flutter_generator.dart'; diff --git a/packages/core/test/fonts_gen_test.dart b/packages/core/test/fonts_gen_test.dart index db03b3902..0f8ac0852 100644 --- a/packages/core/test/fonts_gen_test.dart +++ b/packages/core/test/fonts_gen_test.dart @@ -1,4 +1,3 @@ -@TestOn('vm') import 'dart:io'; import 'package:dart_style/dart_style.dart'; diff --git a/packages/core/test/gen_test_helper.dart b/packages/core/test/gen_test_helper.dart index 6543fc595..104dd8afd 100644 --- a/packages/core/test/gen_test_helper.dart +++ b/packages/core/test/gen_test_helper.dart @@ -1,4 +1,3 @@ -@TestOn('vm') import 'dart:io'; import 'package:dart_style/dart_style.dart'; From 5e9f6b09705a8c1dd745480853b2b824ab3b2058 Mon Sep 17 00:00:00 2001 From: wasabeef Date: Tue, 3 Sep 2024 11:52:20 +0900 Subject: [PATCH 3/3] revert: moduleNamePrefix --- melos.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/melos.yaml b/melos.yaml index 4cd4115da..065e86175 100644 --- a/melos.yaml +++ b/melos.yaml @@ -8,6 +8,7 @@ packages: ide: intellij: enabled: true + moduleNamePrefix: '' command: clean: @@ -74,7 +75,7 @@ scripts: test: run: | - melos test:dart --no-select && \ + melos test:dart --no-select melos test:flutter --no-select description: dart & flutter test