From 28877fbb8dc5f5613539c089a3b7f50730d47007 Mon Sep 17 00:00:00 2001 From: Alex Li Date: Tue, 1 Oct 2024 19:02:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Allows=20`mime:=20'>?= =?UTF-8?q?=3D1.0.0=20<3.0.0'`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/core/lib/settings/asset_type.dart | 2 +- packages/core/lib/settings/color_path.dart | 2 +- packages/core/pubspec.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/core/lib/settings/asset_type.dart b/packages/core/lib/settings/asset_type.dart index 3c2fee972..9455bca08 100644 --- a/packages/core/lib/settings/asset_type.dart +++ b/packages/core/lib/settings/asset_type.dart @@ -1,7 +1,7 @@ import 'package:dartx/dartx.dart'; import 'package:flutter_gen_core/utils/identifer.dart'; import 'package:flutter_gen_core/utils/string.dart'; -import 'package:mime/mime.dart'; +import 'package:mime/mime.dart' show lookupMimeType; import 'package:path/path.dart' as p; import 'package:path/path.dart'; diff --git a/packages/core/lib/settings/color_path.dart b/packages/core/lib/settings/color_path.dart index d90461636..bed7b5645 100644 --- a/packages/core/lib/settings/color_path.dart +++ b/packages/core/lib/settings/color_path.dart @@ -1,6 +1,6 @@ import 'dart:io'; -import 'package:mime/mime.dart'; +import 'package:mime/mime.dart' show lookupMimeType; /// https://github.com/dart-lang/mime/blob/master/lib/src/default_extension_map.dart class ColorPath { diff --git a/packages/core/pubspec.yaml b/packages/core/pubspec.yaml index d78a24b67..f88b5124b 100644 --- a/packages/core/pubspec.yaml +++ b/packages/core/pubspec.yaml @@ -16,7 +16,7 @@ dependencies: meta: ^1.7.0 path: ^1.8.0 yaml: ^3.0.0 - mime: ^1.0.0 + mime: '>=1.0.0 <3.0.0' xml: ^6.0.0 dartx: ^1.0.0 color: ^3.0.0 From ee702543d537f5d24db945c89778e89be310c366 Mon Sep 17 00:00:00 2001 From: Alex Li Date: Tue, 1 Oct 2024 19:02:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=99=88=20Update=20ignored=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 13 --------- .idea/.gitignore | 9 ++++++ examples/example/example.iml | 26 +++++++++++++++++ .../example_resources/example_resources.iml | 29 +++++++++++++++++++ fluttergen.iml | 15 ++++++++++ packages/command/flutter_gen.iml | 19 ++++++++++++ packages/core/flutter_gen_core.iml | 16 ++++++++++ packages/runner/flutter_gen_runner.iml | 16 ++++++++++ 8 files changed, 130 insertions(+), 13 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 examples/example/example.iml create mode 100644 examples/example_resources/example_resources.iml create mode 100644 fluttergen.iml create mode 100644 packages/command/flutter_gen.iml create mode 100644 packages/core/flutter_gen_core.iml create mode 100644 packages/runner/flutter_gen_runner.iml diff --git a/.gitignore b/.gitignore index 4721c2f4f..4d3a75b9d 100644 --- a/.gitignore +++ b/.gitignore @@ -12,19 +12,9 @@ .svn/ # IntelliJ related -*.iml *.ipr *.iws -.idea/.gitignore -.idea/dictionaries/ -.idea/libraries/ -.idea/misc.xml -.idea/vcs.xml -.idea/workspace.xml -.idea/saveactions_settings.xml -android/.idea/ - # The .vscode folder contains launch configuration and tasks you configure in # VS Code which you may wish to be included in version control, so this line # is commented out by default. @@ -122,6 +112,3 @@ coverage.lcov ## Test resources **/test_resources/lib - -## Melos -.idea/runConfigurations/melos_* diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 000000000..5007a1d97 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,9 @@ +!/codeStyles/ +!/.name +!/modules.xml +!/runConfigurations/ + +/dictionaries/ +/libraries/ +/runConfigurations/melos_* +/*.xml diff --git a/examples/example/example.iml b/examples/example/example.iml new file mode 100644 index 000000000..26a45e792 --- /dev/null +++ b/examples/example/example.iml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/example_resources/example_resources.iml b/examples/example_resources/example_resources.iml new file mode 100644 index 000000000..9fc8ce79a --- /dev/null +++ b/examples/example_resources/example_resources.iml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fluttergen.iml b/fluttergen.iml new file mode 100644 index 000000000..01e7ecf63 --- /dev/null +++ b/fluttergen.iml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/command/flutter_gen.iml b/packages/command/flutter_gen.iml new file mode 100644 index 000000000..bd8b0461d --- /dev/null +++ b/packages/command/flutter_gen.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/core/flutter_gen_core.iml b/packages/core/flutter_gen_core.iml new file mode 100644 index 000000000..389d07a14 --- /dev/null +++ b/packages/core/flutter_gen_core.iml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/runner/flutter_gen_runner.iml b/packages/runner/flutter_gen_runner.iml new file mode 100644 index 000000000..389d07a14 --- /dev/null +++ b/packages/runner/flutter_gen_runner.iml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file