commit b30acab643f0989601a3f5b3e404748f5823030b · pyrox.dev/nixpkgs

-38

pkgs/development/compilers/flutter/versions/3_32/patches/fix-native-assets.patch

···

       1
       -
       This patch introducing error handling in the invocation of packagesWithNativeAssets within flutter_tools.

     

       2
       -
       

     

       3
       -
       --- a/packages/flutter_tools/lib/src/isolated/native_assets/native_assets.dart

     

       4
       -
       +++ b/packages/flutter_tools/lib/src/isolated/native_assets/native_assets.dart

     

       5
       -
       @@ -357,7 +357,15 @@

     

       6
       -
        }

     

       7
       -
       

     

       8
       -
        Future<bool> _nativeBuildRequired(FlutterNativeAssetsBuildRunner buildRunner) async {

     

       9
       -
       -  final List<String> packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets();

     

       10
       -
       +  late final List<String> packagesWithNativeAssets;

     

       11
       -
       +  try {

     

       12
       -
       +    packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets();

     

       13
       -
       +  } catch (error, stackTrace) {

     

       14
       -
       +    globals.logger.printTrace(

     

       15
       -
       +      'Error while checking for native assets packages: $error\n$stackTrace'

     

       16
       -
       +    );

     

       17
       -
       +    packagesWithNativeAssets = <String>[];

     

       18
       -
       +  }

     

       19
       -
          if (packagesWithNativeAssets.isEmpty) {

     

       20
       -
            globals.logger.printTrace(

     

       21
       -
              'No packages with native assets. Skipping native assets compilation.',

     

       22
       -
       @@ -385,7 +393,15 @@

     

       23
       -
          FileSystem fileSystem,

     

       24
       -
          FlutterNativeAssetsBuildRunner buildRunner,

     

       25
       -
        ) async {

     

       26
       -
       -  final List<String> packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets();

     

       27
       -
       +  late final List<String> packagesWithNativeAssets;

     

       28
       -
       +  try {

     

       29
       -
       +    packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets();

     

       30
       -
       +  } catch (error, stackTrace) {

     

       31
       -
       +    globals.logger.printTrace(

     

       32
       -
       +      'Error while checking for native assets packages: $error\n$stackTrace'

     

       33
       -
       +    );

     

       34
       -
       +    packagesWithNativeAssets = <String>[];

     

       35
       -
       +  }

     

       36
       -
          if (packagesWithNativeAssets.isEmpty) {

     

       37
       -
            globals.logger.printTrace(

     

       38
       -
              'No packages with native assets. Skipping native assets compilation.',

-95

pkgs/development/compilers/flutter/versions/3_35/patches/avoid-crash-on-missing-package-graph-json.patch

···

       1
       -
       Prevent crashes due to missing or incomplete package_graph.json

     

       2
       -
       

     

       3
       -
       Modify package graph parsing to safely handle missing package_graph.json file

     

       4
       -
       and missing dependencies or devDependencies entries by using empty defaults

     

       5
       -
       instead of throwing errors.

     

       6
       -
       

     

       7
       -
       --- a/packages/flutter_tools/lib/src/package_graph.dart

     

       8
       -
       +++ b/packages/flutter_tools/lib/src/package_graph.dart

     

       9
       -
       @@ -36,18 +36,9 @@

     

       10
       -
            isExclusiveDevDependency: true,

     

       11
       -
          );

     

       12
       -
       

     

       13
       -
       -  final List<String>? dependencies = packageGraph.dependencies[project.manifest.appName];

     

       14
       -
       -  if (dependencies == null) {

     

       15
       -
       -    throwToolExit('''

     

       16
       -
       -Failed to parse ${packageGraph.file.path}: dependencies for `${project.manifest.appName}` missing.

     

       17
       -
       -Try running `flutter pub get`''');

     

       18
       -
       -  }

     

       19
       -
       -  final List<String>? devDependencies = packageGraph.devDependencies[project.manifest.appName];

     

       20
       -
       -  if (devDependencies == null) {

     

       21
       -
       -    throwToolExit('''

     

       22
       -
       -Failed to parse ${packageGraph.file.path}: devDependencies for `${project.manifest.appName}` missing.

     

       23
       -
       -Try running `flutter pub get`''');

     

       24
       -
       -  }

     

       25
       -
       +  final List<String> dependencies = packageGraph.dependencies[project.manifest.appName] ?? <String>[];

     

       26
       -
       +  final List<String> devDependencies = packageGraph.devDependencies[project.manifest.appName] ?? <String>[];

     

       27
       -
       +

     

       28
       -
          final packageNamesToVisit = <String>[...dependencies, ...devDependencies];

     

       29
       -
          while (packageNamesToVisit.isNotEmpty) {

     

       30
       -
            final String current = packageNamesToVisit.removeLast();

     

       31
       -
       @@ -55,13 +46,7 @@

     

       32
       -
              continue;

     

       33
       -
            }

     

       34
       -
       

     

       35
       -
       -    final List<String>? dependencies = packageGraph.dependencies[current];

     

       36
       -
       -

     

       37
       -
       -    if (dependencies == null) {

     

       38
       -
       -      throwToolExit('''

     

       39
       -
       -Failed to parse ${packageGraph.file.path}: dependencies for `$current` missing.

     

       40
       -
       -Try running `flutter pub get`''');

     

       41
       -
       -    }

     

       42
       -
       +    final List<String> dependencies = packageGraph.dependencies[current] ?? <String>[];

     

       43
       -
            packageNamesToVisit.addAll(dependencies);

     

       44
       -
       

     

       45
       -
            result[current] = Dependency(

     

       46
       -
       @@ -89,7 +74,7 @@

     

       47
       -
              currentDependency.rootUri,

     

       48
       -
              isExclusiveDevDependency: false,

     

       49
       -
            );

     

       50
       -
       -    packageNamesToVisit.addAll(packageGraph.dependencies[current]!);

     

       51
       -
       +    packageNamesToVisit.addAll(packageGraph.dependencies[current] ?? <String>[]);

     

       52
       -
          }

     

       53
       -
          return result.values.toList();

     

       54
       -
        }

     

       55
       -
       @@ -147,6 +132,9 @@

     

       56
       -
            final File file = project.packageConfig.fileSystem.file(

     

       57
       -
              project.packageConfig.uri.resolve('package_graph.json'),

     

       58
       -
            );

     

       59
       -
       +    if (!file.existsSync()) {

     

       60
       -
       +      return PackageGraph(file, <String>[], <String, List<String>>{}, <String, List<String>>{});

     

       61
       -
       +    }

     

       62
       -
            try {

     

       63
       -
              return PackageGraph.fromJson(file, jsonDecode(file.readAsStringSync()));

     

       64
       -
            } on IOException catch (e) {

     

       65
       -
       

     

       66
       -
       --- a/packages/flutter_tools/lib/src/isolated/native_assets/native_assets.dart

     

       67
       -
       +++ b/packages/flutter_tools/lib/src/isolated/native_assets/native_assets.dart

     

       68
       -
       @@ -384,7 +384,12 @@

     

       69
       -
        }

     

       70
       -
       

     

       71
       -
        Future<bool> _nativeBuildRequired(FlutterNativeAssetsBuildRunner buildRunner) async {

     

       72
       -
       -  final List<String> packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets();

     

       73
       -
       +  late final List<String> packagesWithNativeAssets;

     

       74
       -
       +  try {

     

       75
       -
       +    packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets();

     

       76
       -
       +  } catch (error) {

     

       77
       -
       +    packagesWithNativeAssets = <String>[];

     

       78
       -
       +  }

     

       79
       -
          if (packagesWithNativeAssets.isEmpty) {

     

       80
       -
            globals.logger.printTrace(

     

       81
       -
              'No packages with native assets. Skipping native assets compilation.',

     

       82
       -
       @@ -412,7 +417,12 @@

     

       83
       -
          FileSystem fileSystem,

     

       84
       -
          FlutterNativeAssetsBuildRunner buildRunner,

     

       85
       -
        ) async {

     

       86
       -
       -  final List<String> packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets();

     

       87
       -
       +  late final List<String> packagesWithNativeAssets;

     

       88
       -
       +  try {

     

       89
       -
       +    packagesWithNativeAssets = await buildRunner.packagesWithNativeAssets();

     

       90
       -
       +  } catch (error) {

     

       91
       -
       +    packagesWithNativeAssets = <String>[];

     

       92
       -
       +  }

     

       93
       -
          if (packagesWithNativeAssets.isEmpty) {

     

       94
       -
            globals.logger.printTrace(

     

       95
       -
              'No packages with native assets. Skipping native assets compilation.',