firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[tool] Update .gitignore templates to include .flutter-plugins files (#152950)

Browse Source 
Fixes https://github.com/flutter/flutter/issues/152793
This commit is contained in:
Rexios 2024-09-04 16:54:24 -04:00 committed by GitHub
parent b9ae1f1bd3
commit 6abef22251
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 61 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/flutter_tools/templates/package/.gitignore.tmpl
View File

@ -26,4 +26,6 @@ migrate_working_dir/
/pubspec.lock
**/doc/api/
.dart_tool/
.flutter-plugins
.flutter-plugins-dependencies
build/

2
packages/flutter_tools/templates/package_ffi/.gitignore.tmpl
View File

@ -26,5 +26,7 @@ migrate_working_dir/
/pubspec.lock
**/doc/api/
.dart_tool/
.flutter-plugins
.flutter-plugins-dependencies
.packages
build/

2
packages/flutter_tools/templates/plugin_shared/.gitignore.tmpl
View File

@ -28,4 +28,6 @@ migrate_working_dir/
/pubspec.lock
**/doc/api/
.dart_tool/
.flutter-plugins
.flutter-plugins-dependencies
build/

74
packages/flutter_tools/test/commands.shard/permeable/create_test.dart
View File

@ -66,6 +66,12 @@ const String samplesIndexJson = '''
{ "id": "sample2" }
]''';
/// These files are generated for all project types.
const List<String> flutterPluginsIgnores = <String>[
'.flutter-plugins',
'.flutter-plugins-dependencies',
];
void main() {
late Directory tempDir;
late Directory projectDir;
@ -177,6 +183,7 @@ void main() {
'ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png',
'lib/main.dart',
],
expectedGitignoreLines: flutterPluginsIgnores,
);
expect(logger.statusText, contains('In order to run your application, type:'));
// Check that we're telling them about documentation
@ -246,6 +253,7 @@ void main() {
'pubspec.yaml',
'README.md',
],
expectedGitignoreLines: flutterPluginsIgnores,
);
return _runFlutterTest(projectDir);
}, overrides: <Type, Generator>{
@ -288,22 +296,28 @@ void main() {
});
testUsingContext('creates a module project correctly', () async {
await _createAndAnalyzeProject(projectDir, <String>[
'--template=module',
], <String>[
'.android/app/',
'.gitignore',
'.ios/Flutter',
'.metadata',
'analysis_options.yaml',
'lib/main.dart',
'pubspec.yaml',
'README.md',
'test/widget_test.dart',
], unexpectedPaths: <String>[
'android/',
'ios/',
]);
await _createAndAnalyzeProject(
projectDir,
<String>[
'--template=module',
],
<String>[
'.android/app/',
'.gitignore',
'.ios/Flutter',
'.metadata',
'analysis_options.yaml',
'lib/main.dart',
'pubspec.yaml',
'README.md',
'test/widget_test.dart',
],
unexpectedPaths: <String>[
'android/',
'ios/',
],
expectedGitignoreLines: flutterPluginsIgnores,
);
return _runFlutterTest(projectDir);
}, overrides: <Type, Generator>{
Pub: () => Pub.test(
@ -568,6 +582,7 @@ void main() {
'linux/flutter/generated_plugins.cmake',
'macos/Flutter/GeneratedPluginRegistrant.swift',
],
expectedGitignoreLines: flutterPluginsIgnores,
);
return _runFlutterTest(projectDir);
}, overrides: <Type, Generator>{
@ -599,6 +614,7 @@ void main() {
'example/android/app/src/main/java/com/example/flutter_project_example/MainActivity.java',
'lib/flutter_project_web.dart',
],
expectedGitignoreLines: flutterPluginsIgnores,
);
return _runFlutterTest(projectDir.childDirectory('example'));
}, overrides: <Type, Generator>{
@ -2148,6 +2164,7 @@ void main() {
'ios/Flutter/AppFrameworkInfo.plist',
],
unexpectedPaths: <String>['test'],
expectedGitignoreLines: flutterPluginsIgnores,
);
expect(projectDir.childDirectory('lib').childFile('main.dart').readAsStringSync(),
contains("Text('Hello World!')"));
@ -2236,6 +2253,7 @@ void main() {
'ios/Flutter/AppFrameworkInfo.plist',
],
unexpectedPaths: <String>['test'],
expectedGitignoreLines: flutterPluginsIgnores,
);
expect(projectDir.childDirectory('lib').childFile('main.dart').readAsStringSync(),
contains('void main() {}'));
@ -3915,6 +3933,7 @@ Future<void> _createProject(
List<String> createArgs,
List<String> expectedPaths, {
List<String> unexpectedPaths = const <String>[],
List<String> expectedGitignoreLines = const <String>[],
}) async {
Cache.flutterRoot = '../..';
final CreateCommand command = CreateCommand();
@ -3930,7 +3949,7 @@ Future<void> _createProject(
return globals.fs.typeSync(fullPath) != FileSystemEntityType.notFound;
}
final List<String> failures = <String>[
final List<String> pathFailures = <String>[
for (final String path in expectedPaths)
if (!pathExists(path))
'Path "$path" does not exist.',
@ -3938,7 +3957,17 @@ Future<void> _createProject(
if (pathExists(path))
'Path "$path" exists when it shouldn\'t.',
];
expect(failures, isEmpty, reason: failures.join('\n'));
expect(pathFailures, isEmpty, reason: pathFailures.join('\n'));
final String gitignorePath = globals.fs.path.join(dir.path, '.gitignore');
final List<String> gitignore = globals.fs.file(gitignorePath).readAsLinesSync();
final List<String> gitignoreFailures = <String>[
for (final String line in expectedGitignoreLines)
if (!gitignore.contains(line))
'Expected .gitignore to contain "$line".',
];
expect(gitignoreFailures, isEmpty, reason: gitignoreFailures.join('\n'));
}
Future<void> _createAndAnalyzeProject(
@ -3946,8 +3975,15 @@ Future<void> _createAndAnalyzeProject(
List<String> createArgs,
List<String> expectedPaths, {
List<String> unexpectedPaths = const <String>[],
List<String> expectedGitignoreLines = const <String>[],
}) async {
await _createProject(dir, createArgs, expectedPaths, unexpectedPaths: unexpectedPaths);
await _createProject(
dir,
createArgs,
expectedPaths,
unexpectedPaths: unexpectedPaths,
expectedGitignoreLines: expectedGitignoreLines,
);
await _analyzeProject(dir.path);
}