From c3783c3666def6e71ac068343b5ffceed6f92d26 Mon Sep 17 00:00:00 2001 From: jld3103 Date: Sun, 15 Oct 2023 19:02:40 +0200 Subject: [PATCH 1/3] refactor: Unify package .gitignores Signed-off-by: jld3103 --- .gitignore | 13 ++++- packages/app/.gitignore | 48 ------------------- packages/dynamite/dynamite/.gitignore | 12 ----- packages/dynamite/dynamite_runtime/.gitignore | 8 ---- packages/file_icons/.gitignore | 10 ---- packages/neon/neon/.gitignore | 48 ------------------- packages/neon/neon_files/.gitignore | 48 ------------------- packages/neon/neon_news/.gitignore | 48 ------------------- packages/neon/neon_notes/.gitignore | 48 ------------------- packages/neon/neon_notifications/.gitignore | 48 ------------------- packages/neon_lints/.gitignore | 12 ----- packages/nextcloud/.gitignore | 12 ----- packages/sort_box/.gitignore | 32 ------------- 13 files changed, 11 insertions(+), 376 deletions(-) delete mode 100644 packages/app/.gitignore delete mode 100644 packages/dynamite/dynamite/.gitignore delete mode 100644 packages/dynamite/dynamite_runtime/.gitignore delete mode 100644 packages/file_icons/.gitignore delete mode 100644 packages/neon/neon/.gitignore delete mode 100644 packages/neon/neon_files/.gitignore delete mode 100644 packages/neon/neon_news/.gitignore delete mode 100644 packages/neon/neon_notes/.gitignore delete mode 100644 packages/neon/neon_notifications/.gitignore delete mode 100644 packages/neon_lints/.gitignore delete mode 100644 packages/nextcloud/.gitignore delete mode 100644 packages/sort_box/.gitignore diff --git a/.gitignore b/.gitignore index cb14981b..54cde9a7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,15 @@ -/.dart_tool/ -/pubspec.lock +.dart_tool +pubspec.lock + +packages/**/.idea +packages/**/*.iml +packages/**/.flutter-plugins +packages/**/.flutter-plugins-dependencies packages/**/coverage +packages/**/build +packages/**/doc/api + +!packages/app/pubspec.lock # Melos reccomends not adding them to vcs but we need them as we don't use melos in CI # **/pubspec_overrides.yaml diff --git a/packages/app/.gitignore b/packages/app/.gitignore deleted file mode 100644 index 8b7bed4a..00000000 --- a/packages/app/.gitignore +++ /dev/null @@ -1,48 +0,0 @@ -# Miscellaneous -*.class -*.log -*.pyc -*.swp -.DS_Store -.atom/ -.buildlog/ -.history -.svn/ - -# IntelliJ related -*.iml -*.ipr -*.iws -.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. -#.vscode/ - -# Flutter/Dart/Pub related -**/doc/api/ -**/ios/Flutter/.last_build_id -.dart_tool/ -.flutter-plugins -.flutter-plugins-dependencies -.packages -.pub-cache/ -.pub/ -/build/ - -# Web related -lib/generated_plugin_registrant.dart - -# Symbolication related -app.*.symbols - -# Obfuscation related -app.*.map.json - -# Android Studio will place build artifacts here -/android/app/debug -/android/app/profile -/android/app/release - -.flatpak-builder/ \ No newline at end of file diff --git a/packages/dynamite/dynamite/.gitignore b/packages/dynamite/dynamite/.gitignore deleted file mode 100644 index 840b0cc8..00000000 --- a/packages/dynamite/dynamite/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -# Files and directories created by pub. -.dart_tool/ -.packages - -# Conventional directory for build outputs. -build/ - -# Omit committing pubspec.lock for library packages; see -# https://dart.dev/guides/libraries/private-files#pubspeclock. -pubspec.lock - -coverage/ diff --git a/packages/dynamite/dynamite_runtime/.gitignore b/packages/dynamite/dynamite_runtime/.gitignore deleted file mode 100644 index e3ce1c0a..00000000 --- a/packages/dynamite/dynamite_runtime/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# https://dart.dev/guides/libraries/private-files -# Created by `dart pub` -.dart_tool/ -build/ - -# Avoid committing pubspec.lock for library packages; see -# https://dart.dev/guides/libraries/private-files#pubspeclock. -pubspec.lock diff --git a/packages/file_icons/.gitignore b/packages/file_icons/.gitignore deleted file mode 100644 index 65c34dc8..00000000 --- a/packages/file_icons/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -# Files and directories created by pub. -.dart_tool/ -.packages - -# Conventional directory for build outputs. -build/ - -# Omit committing pubspec.lock for library packages; see -# https://dart.dev/guides/libraries/private-files#pubspeclock. -pubspec.lock diff --git a/packages/neon/neon/.gitignore b/packages/neon/neon/.gitignore deleted file mode 100644 index 7944852f..00000000 --- a/packages/neon/neon/.gitignore +++ /dev/null @@ -1,48 +0,0 @@ -# Miscellaneous -*.class -*.log -*.pyc -*.swp -.DS_Store -.atom/ -.buildlog/ -.history -.svn/ - -# IntelliJ related -*.iml -*.ipr -*.iws -.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. -#.vscode/ - -# Flutter/Dart/Pub related -# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. -/pubspec.lock -**/doc/api/ -**/ios/Flutter/.last_build_id -.dart_tool/ -.flutter-plugins -.flutter-plugins-dependencies -.packages -.pub-cache/ -.pub/ -/build/ - -# Web related -lib/generated_plugin_registrant.dart - -# Symbolication related -app.*.symbols - -# Obfuscation related -app.*.map.json - -# Android Studio will place build artifacts here -/android/app/debug -/android/app/profile -/android/app/release diff --git a/packages/neon/neon_files/.gitignore b/packages/neon/neon_files/.gitignore deleted file mode 100644 index 7944852f..00000000 --- a/packages/neon/neon_files/.gitignore +++ /dev/null @@ -1,48 +0,0 @@ -# Miscellaneous -*.class -*.log -*.pyc -*.swp -.DS_Store -.atom/ -.buildlog/ -.history -.svn/ - -# IntelliJ related -*.iml -*.ipr -*.iws -.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. -#.vscode/ - -# Flutter/Dart/Pub related -# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. -/pubspec.lock -**/doc/api/ -**/ios/Flutter/.last_build_id -.dart_tool/ -.flutter-plugins -.flutter-plugins-dependencies -.packages -.pub-cache/ -.pub/ -/build/ - -# Web related -lib/generated_plugin_registrant.dart - -# Symbolication related -app.*.symbols - -# Obfuscation related -app.*.map.json - -# Android Studio will place build artifacts here -/android/app/debug -/android/app/profile -/android/app/release diff --git a/packages/neon/neon_news/.gitignore b/packages/neon/neon_news/.gitignore deleted file mode 100644 index 7944852f..00000000 --- a/packages/neon/neon_news/.gitignore +++ /dev/null @@ -1,48 +0,0 @@ -# Miscellaneous -*.class -*.log -*.pyc -*.swp -.DS_Store -.atom/ -.buildlog/ -.history -.svn/ - -# IntelliJ related -*.iml -*.ipr -*.iws -.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. -#.vscode/ - -# Flutter/Dart/Pub related -# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. -/pubspec.lock -**/doc/api/ -**/ios/Flutter/.last_build_id -.dart_tool/ -.flutter-plugins -.flutter-plugins-dependencies -.packages -.pub-cache/ -.pub/ -/build/ - -# Web related -lib/generated_plugin_registrant.dart - -# Symbolication related -app.*.symbols - -# Obfuscation related -app.*.map.json - -# Android Studio will place build artifacts here -/android/app/debug -/android/app/profile -/android/app/release diff --git a/packages/neon/neon_notes/.gitignore b/packages/neon/neon_notes/.gitignore deleted file mode 100644 index 7944852f..00000000 --- a/packages/neon/neon_notes/.gitignore +++ /dev/null @@ -1,48 +0,0 @@ -# Miscellaneous -*.class -*.log -*.pyc -*.swp -.DS_Store -.atom/ -.buildlog/ -.history -.svn/ - -# IntelliJ related -*.iml -*.ipr -*.iws -.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. -#.vscode/ - -# Flutter/Dart/Pub related -# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. -/pubspec.lock -**/doc/api/ -**/ios/Flutter/.last_build_id -.dart_tool/ -.flutter-plugins -.flutter-plugins-dependencies -.packages -.pub-cache/ -.pub/ -/build/ - -# Web related -lib/generated_plugin_registrant.dart - -# Symbolication related -app.*.symbols - -# Obfuscation related -app.*.map.json - -# Android Studio will place build artifacts here -/android/app/debug -/android/app/profile -/android/app/release diff --git a/packages/neon/neon_notifications/.gitignore b/packages/neon/neon_notifications/.gitignore deleted file mode 100644 index 7944852f..00000000 --- a/packages/neon/neon_notifications/.gitignore +++ /dev/null @@ -1,48 +0,0 @@ -# Miscellaneous -*.class -*.log -*.pyc -*.swp -.DS_Store -.atom/ -.buildlog/ -.history -.svn/ - -# IntelliJ related -*.iml -*.ipr -*.iws -.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. -#.vscode/ - -# Flutter/Dart/Pub related -# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. -/pubspec.lock -**/doc/api/ -**/ios/Flutter/.last_build_id -.dart_tool/ -.flutter-plugins -.flutter-plugins-dependencies -.packages -.pub-cache/ -.pub/ -/build/ - -# Web related -lib/generated_plugin_registrant.dart - -# Symbolication related -app.*.symbols - -# Obfuscation related -app.*.map.json - -# Android Studio will place build artifacts here -/android/app/debug -/android/app/profile -/android/app/release diff --git a/packages/neon_lints/.gitignore b/packages/neon_lints/.gitignore deleted file mode 100644 index 840b0cc8..00000000 --- a/packages/neon_lints/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -# Files and directories created by pub. -.dart_tool/ -.packages - -# Conventional directory for build outputs. -build/ - -# Omit committing pubspec.lock for library packages; see -# https://dart.dev/guides/libraries/private-files#pubspeclock. -pubspec.lock - -coverage/ diff --git a/packages/nextcloud/.gitignore b/packages/nextcloud/.gitignore deleted file mode 100644 index 840b0cc8..00000000 --- a/packages/nextcloud/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -# Files and directories created by pub. -.dart_tool/ -.packages - -# Conventional directory for build outputs. -build/ - -# Omit committing pubspec.lock for library packages; see -# https://dart.dev/guides/libraries/private-files#pubspeclock. -pubspec.lock - -coverage/ diff --git a/packages/sort_box/.gitignore b/packages/sort_box/.gitignore deleted file mode 100644 index 82dbb1d4..00000000 --- a/packages/sort_box/.gitignore +++ /dev/null @@ -1,32 +0,0 @@ -# Miscellaneous -*.class -*.log -*.pyc -*.swp -.DS_Store -.atom/ -.buildlog/ -.history -.svn/ -migrate_working_dir/ - -# IntelliJ related -*.iml -*.ipr -*.iws -.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. -#.vscode/ - -# Flutter/Dart/Pub related -# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. -/pubspec.lock -**/doc/api/ -.dart_tool/ -.packages -build/ - -coverage/ From cb52c137c810247e71766bd0a4b0352f369c37ca Mon Sep 17 00:00:00 2001 From: jld3103 Date: Sun, 15 Oct 2023 19:15:34 +0200 Subject: [PATCH 2/3] refactor: Generate correct .metadata for packages Signed-off-by: jld3103 --- packages/app/.metadata | 33 +++++++++++++++++++++ packages/{sort_box => file_icons}/.metadata | 4 +-- packages/neon/neon/.metadata | 28 +++-------------- packages/neon/neon_files/.metadata | 4 +-- packages/neon/neon_news/.metadata | 4 +-- packages/neon/neon_notes/.metadata | 4 +-- packages/neon/neon_notifications/.metadata | 4 +-- 7 files changed, 47 insertions(+), 34 deletions(-) create mode 100644 packages/app/.metadata rename packages/{sort_box => file_icons}/.metadata (76%) diff --git a/packages/app/.metadata b/packages/app/.metadata new file mode 100644 index 00000000..72033a21 --- /dev/null +++ b/packages/app/.metadata @@ -0,0 +1,33 @@ +# This file tracks properties of this Flutter project. +# Used by Flutter tool to assess capabilities and perform upgrades etc. +# +# This file should be version controlled and should not be manually edited. + +version: + revision: "ead455963c12b453cdb2358cad34969c76daf180" + channel: "stable" + +project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: ead455963c12b453cdb2358cad34969c76daf180 + base_revision: ead455963c12b453cdb2358cad34969c76daf180 + - platform: android + create_revision: ead455963c12b453cdb2358cad34969c76daf180 + base_revision: ead455963c12b453cdb2358cad34969c76daf180 + - platform: linux + create_revision: ead455963c12b453cdb2358cad34969c76daf180 + base_revision: ead455963c12b453cdb2358cad34969c76daf180 + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/packages/sort_box/.metadata b/packages/file_icons/.metadata similarity index 76% rename from packages/sort_box/.metadata rename to packages/file_icons/.metadata index e093d99e..9d75c7ec 100644 --- a/packages/sort_box/.metadata +++ b/packages/file_icons/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled and should not be manually edited. version: - revision: 2aa348b9407e96ffe4eca8e8f213c7984afad3f7 - channel: master + revision: "ead455963c12b453cdb2358cad34969c76daf180" + channel: "stable" project_type: package diff --git a/packages/neon/neon/.metadata b/packages/neon/neon/.metadata index 2544bab1..9d75c7ec 100644 --- a/packages/neon/neon/.metadata +++ b/packages/neon/neon/.metadata @@ -1,30 +1,10 @@ # This file tracks properties of this Flutter project. # Used by Flutter tool to assess capabilities and perform upgrades etc. # -# This file should be version controlled. +# This file should be version controlled and should not be manually edited. version: - revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - channel: stable + revision: "ead455963c12b453cdb2358cad34969c76daf180" + channel: "stable" -project_type: app - -# Tracks metadata for the flutter migrate command -migration: - platforms: - - platform: root - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - - platform: android - create_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - base_revision: f1875d570e39de09040c8f79aa13cc56baab8db1 - - # User provided section - - # List of Local paths (relative to this file) that should be - # ignored by the migrate tool. - # - # Files that are not part of the templates will be ignored by default. - unmanaged_files: - - 'lib/main.dart' - - 'ios/Runner.xcodeproj/project.pbxproj' +project_type: package diff --git a/packages/neon/neon_files/.metadata b/packages/neon/neon_files/.metadata index 8cef0ead..9d75c7ec 100644 --- a/packages/neon/neon_files/.metadata +++ b/packages/neon/neon_files/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled and should not be manually edited. version: - revision: 62bd79521d8d007524e351747471ba66696fc2d4 - channel: stable + revision: "ead455963c12b453cdb2358cad34969c76daf180" + channel: "stable" project_type: package diff --git a/packages/neon/neon_news/.metadata b/packages/neon/neon_news/.metadata index 8cef0ead..9d75c7ec 100644 --- a/packages/neon/neon_news/.metadata +++ b/packages/neon/neon_news/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled and should not be manually edited. version: - revision: 62bd79521d8d007524e351747471ba66696fc2d4 - channel: stable + revision: "ead455963c12b453cdb2358cad34969c76daf180" + channel: "stable" project_type: package diff --git a/packages/neon/neon_notes/.metadata b/packages/neon/neon_notes/.metadata index 8cef0ead..9d75c7ec 100644 --- a/packages/neon/neon_notes/.metadata +++ b/packages/neon/neon_notes/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled and should not be manually edited. version: - revision: 62bd79521d8d007524e351747471ba66696fc2d4 - channel: stable + revision: "ead455963c12b453cdb2358cad34969c76daf180" + channel: "stable" project_type: package diff --git a/packages/neon/neon_notifications/.metadata b/packages/neon/neon_notifications/.metadata index 8cef0ead..9d75c7ec 100644 --- a/packages/neon/neon_notifications/.metadata +++ b/packages/neon/neon_notifications/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled and should not be manually edited. version: - revision: 62bd79521d8d007524e351747471ba66696fc2d4 - channel: stable + revision: "ead455963c12b453cdb2358cad34969c76daf180" + channel: "stable" project_type: package From 143de08735eaa60f429b67522935dc857da64717 Mon Sep 17 00:00:00 2001 From: jld3103 Date: Mon, 16 Oct 2023 06:55:16 +0200 Subject: [PATCH 3/3] chore(docs): Add removing .gitignore step for creating a new package Signed-off-by: jld3103 --- docs/workflows.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/workflows.md b/docs/workflows.md index ee89f7fe..b91dfa02 100644 --- a/docs/workflows.md +++ b/docs/workflows.md @@ -8,3 +8,4 @@ If you need to add a new package to the Neon project please make sure to execute 3. Regenerate the dependency overrides by executing `melos bootstrap`. 4. Add a Symlink to our main [license](../LICENSE). 5. Update [commitlint.yaml](../commitlint.yaml) by adding the new package name. +6. Remove the package `.gitignore` (a global `.gitignore` for all packages is used instead).