diff --git a/melos.yaml b/melos.yaml index 8f0bdbf23c0..a3bcacb5f1f 100644 --- a/melos.yaml +++ b/melos.yaml @@ -11,8 +11,8 @@ bootstrap: packages: - packages/* + - packages/*/packages/* - packages/dynamite/* - - packages/neon/* - packages/**/example ide: diff --git a/packages/file_icons/.metadata b/packages/app/packages/neon_dashboard/.metadata similarity index 100% rename from packages/file_icons/.metadata rename to packages/app/packages/neon_dashboard/.metadata diff --git a/packages/app/packages/neon_dashboard/LICENSE b/packages/app/packages/neon_dashboard/LICENSE new file mode 120000 index 00000000000..f0b83dad961 --- /dev/null +++ b/packages/app/packages/neon_dashboard/LICENSE @@ -0,0 +1 @@ +../../../../assets/AGPL-3.0.txt \ No newline at end of file diff --git a/packages/neon/neon_dashboard/analysis_options.yaml b/packages/app/packages/neon_dashboard/analysis_options.yaml similarity index 100% rename from packages/neon/neon_dashboard/analysis_options.yaml rename to packages/app/packages/neon_dashboard/analysis_options.yaml diff --git a/packages/neon/neon_dashboard/assets/app.svg.vec b/packages/app/packages/neon_dashboard/assets/app.svg.vec similarity index 100% rename from packages/neon/neon_dashboard/assets/app.svg.vec rename to packages/app/packages/neon_dashboard/assets/app.svg.vec diff --git a/packages/neon/neon_dashboard/build.yaml b/packages/app/packages/neon_dashboard/build.yaml similarity index 100% rename from packages/neon/neon_dashboard/build.yaml rename to packages/app/packages/neon_dashboard/build.yaml diff --git a/packages/neon/neon_dashboard/l10n.yaml b/packages/app/packages/neon_dashboard/l10n.yaml similarity index 100% rename from packages/neon/neon_dashboard/l10n.yaml rename to packages/app/packages/neon_dashboard/l10n.yaml diff --git a/packages/neon/neon_dashboard/lib/l10n/en.arb b/packages/app/packages/neon_dashboard/lib/l10n/en.arb similarity index 100% rename from packages/neon/neon_dashboard/lib/l10n/en.arb rename to packages/app/packages/neon_dashboard/lib/l10n/en.arb diff --git a/packages/neon/neon_dashboard/lib/l10n/localizations.dart b/packages/app/packages/neon_dashboard/lib/l10n/localizations.dart similarity index 100% rename from packages/neon/neon_dashboard/lib/l10n/localizations.dart rename to packages/app/packages/neon_dashboard/lib/l10n/localizations.dart diff --git a/packages/neon/neon_dashboard/lib/l10n/localizations_en.dart b/packages/app/packages/neon_dashboard/lib/l10n/localizations_en.dart similarity index 100% rename from packages/neon/neon_dashboard/lib/l10n/localizations_en.dart rename to packages/app/packages/neon_dashboard/lib/l10n/localizations_en.dart diff --git a/packages/neon/neon_dashboard/lib/neon_dashboard.dart b/packages/app/packages/neon_dashboard/lib/neon_dashboard.dart similarity index 100% rename from packages/neon/neon_dashboard/lib/neon_dashboard.dart rename to packages/app/packages/neon_dashboard/lib/neon_dashboard.dart diff --git a/packages/neon/neon_dashboard/lib/src/blocs/dashboard.dart b/packages/app/packages/neon_dashboard/lib/src/blocs/dashboard.dart similarity index 100% rename from packages/neon/neon_dashboard/lib/src/blocs/dashboard.dart rename to packages/app/packages/neon_dashboard/lib/src/blocs/dashboard.dart diff --git a/packages/neon/neon_dashboard/lib/src/options.dart b/packages/app/packages/neon_dashboard/lib/src/options.dart similarity index 100% rename from packages/neon/neon_dashboard/lib/src/options.dart rename to packages/app/packages/neon_dashboard/lib/src/options.dart diff --git a/packages/neon/neon_dashboard/lib/src/pages/main.dart b/packages/app/packages/neon_dashboard/lib/src/pages/main.dart similarity index 100% rename from packages/neon/neon_dashboard/lib/src/pages/main.dart rename to packages/app/packages/neon_dashboard/lib/src/pages/main.dart diff --git a/packages/neon/neon_dashboard/lib/src/routes.dart b/packages/app/packages/neon_dashboard/lib/src/routes.dart similarity index 100% rename from packages/neon/neon_dashboard/lib/src/routes.dart rename to packages/app/packages/neon_dashboard/lib/src/routes.dart diff --git a/packages/neon/neon_dashboard/lib/src/routes.g.dart b/packages/app/packages/neon_dashboard/lib/src/routes.g.dart similarity index 100% rename from packages/neon/neon_dashboard/lib/src/routes.g.dart rename to packages/app/packages/neon_dashboard/lib/src/routes.g.dart diff --git a/packages/neon/neon_dashboard/lib/src/widgets/dry_intrinsic_height.dart b/packages/app/packages/neon_dashboard/lib/src/widgets/dry_intrinsic_height.dart similarity index 100% rename from packages/neon/neon_dashboard/lib/src/widgets/dry_intrinsic_height.dart rename to packages/app/packages/neon_dashboard/lib/src/widgets/dry_intrinsic_height.dart diff --git a/packages/neon/neon_dashboard/lib/src/widgets/set_weather_location_dialog.dart b/packages/app/packages/neon_dashboard/lib/src/widgets/set_weather_location_dialog.dart similarity index 100% rename from packages/neon/neon_dashboard/lib/src/widgets/set_weather_location_dialog.dart rename to packages/app/packages/neon_dashboard/lib/src/widgets/set_weather_location_dialog.dart diff --git a/packages/neon/neon_dashboard/lib/src/widgets/widget.dart b/packages/app/packages/neon_dashboard/lib/src/widgets/widget.dart similarity index 100% rename from packages/neon/neon_dashboard/lib/src/widgets/widget.dart rename to packages/app/packages/neon_dashboard/lib/src/widgets/widget.dart diff --git a/packages/neon/neon_dashboard/lib/src/widgets/widget_button.dart b/packages/app/packages/neon_dashboard/lib/src/widgets/widget_button.dart similarity index 100% rename from packages/neon/neon_dashboard/lib/src/widgets/widget_button.dart rename to packages/app/packages/neon_dashboard/lib/src/widgets/widget_button.dart diff --git a/packages/neon/neon_dashboard/lib/src/widgets/widget_item.dart b/packages/app/packages/neon_dashboard/lib/src/widgets/widget_item.dart similarity index 100% rename from packages/neon/neon_dashboard/lib/src/widgets/widget_item.dart rename to packages/app/packages/neon_dashboard/lib/src/widgets/widget_item.dart diff --git a/packages/neon/neon_dashboard/pubspec.yaml b/packages/app/packages/neon_dashboard/pubspec.yaml similarity index 100% rename from packages/neon/neon_dashboard/pubspec.yaml rename to packages/app/packages/neon_dashboard/pubspec.yaml diff --git a/packages/app/packages/neon_dashboard/pubspec_overrides.yaml b/packages/app/packages/neon_dashboard/pubspec_overrides.yaml new file mode 100644 index 00000000000..bb15117d6d7 --- /dev/null +++ b/packages/app/packages/neon_dashboard/pubspec_overrides.yaml @@ -0,0 +1,16 @@ +# melos_managed_dependency_overrides: cookie_store,dynamite_runtime,neon_framework,neon_http_client,neon_lints,nextcloud,sort_box +dependency_overrides: + cookie_store: + path: ../../../cookie_store + dynamite_runtime: + path: ../../../dynamite/dynamite_runtime + neon_framework: + path: ../../../neon_framework + neon_http_client: + path: ../../../neon_framework/packages/neon_http_client + neon_lints: + path: ../../../neon_lints + nextcloud: + path: ../../../nextcloud + sort_box: + path: ../../../neon_framework/packages/sort_box diff --git a/packages/neon/neon_dashboard/test/bloc_test.dart b/packages/app/packages/neon_dashboard/test/bloc_test.dart similarity index 100% rename from packages/neon/neon_dashboard/test/bloc_test.dart rename to packages/app/packages/neon_dashboard/test/bloc_test.dart diff --git a/packages/neon/neon_dashboard/test/goldens/widget.png b/packages/app/packages/neon_dashboard/test/goldens/widget.png similarity index 100% rename from packages/neon/neon_dashboard/test/goldens/widget.png rename to packages/app/packages/neon_dashboard/test/goldens/widget.png diff --git a/packages/neon/neon_dashboard/test/goldens/widget_button_invalid.png b/packages/app/packages/neon_dashboard/test/goldens/widget_button_invalid.png similarity index 100% rename from packages/neon/neon_dashboard/test/goldens/widget_button_invalid.png rename to packages/app/packages/neon_dashboard/test/goldens/widget_button_invalid.png diff --git a/packages/neon/neon_dashboard/test/goldens/widget_button_more.png b/packages/app/packages/neon_dashboard/test/goldens/widget_button_more.png similarity index 100% rename from packages/neon/neon_dashboard/test/goldens/widget_button_more.png rename to packages/app/packages/neon_dashboard/test/goldens/widget_button_more.png diff --git a/packages/neon/neon_dashboard/test/goldens/widget_button_new.png b/packages/app/packages/neon_dashboard/test/goldens/widget_button_new.png similarity index 100% rename from packages/neon/neon_dashboard/test/goldens/widget_button_new.png rename to packages/app/packages/neon_dashboard/test/goldens/widget_button_new.png diff --git a/packages/neon/neon_dashboard/test/goldens/widget_button_setup.png b/packages/app/packages/neon_dashboard/test/goldens/widget_button_setup.png similarity index 100% rename from packages/neon/neon_dashboard/test/goldens/widget_button_setup.png rename to packages/app/packages/neon_dashboard/test/goldens/widget_button_setup.png diff --git a/packages/neon/neon_dashboard/test/goldens/widget_item.png b/packages/app/packages/neon_dashboard/test/goldens/widget_item.png similarity index 100% rename from packages/neon/neon_dashboard/test/goldens/widget_item.png rename to packages/app/packages/neon_dashboard/test/goldens/widget_item.png diff --git a/packages/neon/neon_dashboard/test/goldens/widget_item_not_round.png b/packages/app/packages/neon_dashboard/test/goldens/widget_item_not_round.png similarity index 100% rename from packages/neon/neon_dashboard/test/goldens/widget_item_not_round.png rename to packages/app/packages/neon_dashboard/test/goldens/widget_item_not_round.png diff --git a/packages/neon/neon_dashboard/test/goldens/widget_not_round.png b/packages/app/packages/neon_dashboard/test/goldens/widget_not_round.png similarity index 100% rename from packages/neon/neon_dashboard/test/goldens/widget_not_round.png rename to packages/app/packages/neon_dashboard/test/goldens/widget_not_round.png diff --git a/packages/neon/neon_dashboard/test/goldens/widget_with_empty.png b/packages/app/packages/neon_dashboard/test/goldens/widget_with_empty.png similarity index 100% rename from packages/neon/neon_dashboard/test/goldens/widget_with_empty.png rename to packages/app/packages/neon_dashboard/test/goldens/widget_with_empty.png diff --git a/packages/neon/neon_dashboard/test/goldens/widget_with_empty_and_half_empty.png b/packages/app/packages/neon_dashboard/test/goldens/widget_with_empty_and_half_empty.png similarity index 100% rename from packages/neon/neon_dashboard/test/goldens/widget_with_empty_and_half_empty.png rename to packages/app/packages/neon_dashboard/test/goldens/widget_with_empty_and_half_empty.png diff --git a/packages/neon/neon_dashboard/test/goldens/widget_with_half_empty.png b/packages/app/packages/neon_dashboard/test/goldens/widget_with_half_empty.png similarity index 100% rename from packages/neon/neon_dashboard/test/goldens/widget_with_half_empty.png rename to packages/app/packages/neon_dashboard/test/goldens/widget_with_half_empty.png diff --git a/packages/neon/neon_dashboard/test/goldens/widget_with_multiple_buttons.png b/packages/app/packages/neon_dashboard/test/goldens/widget_with_multiple_buttons.png similarity index 100% rename from packages/neon/neon_dashboard/test/goldens/widget_with_multiple_buttons.png rename to packages/app/packages/neon_dashboard/test/goldens/widget_with_multiple_buttons.png diff --git a/packages/neon/neon_dashboard/test/goldens/widget_without_buttons.png b/packages/app/packages/neon_dashboard/test/goldens/widget_without_buttons.png similarity index 100% rename from packages/neon/neon_dashboard/test/goldens/widget_without_buttons.png rename to packages/app/packages/neon_dashboard/test/goldens/widget_without_buttons.png diff --git a/packages/neon/neon_dashboard/test/goldens/widget_without_items.png b/packages/app/packages/neon_dashboard/test/goldens/widget_without_items.png similarity index 100% rename from packages/neon/neon_dashboard/test/goldens/widget_without_items.png rename to packages/app/packages/neon_dashboard/test/goldens/widget_without_items.png diff --git a/packages/neon/neon_dashboard/test/set_weather_location_dialog_test.dart b/packages/app/packages/neon_dashboard/test/set_weather_location_dialog_test.dart similarity index 100% rename from packages/neon/neon_dashboard/test/set_weather_location_dialog_test.dart rename to packages/app/packages/neon_dashboard/test/set_weather_location_dialog_test.dart diff --git a/packages/neon/neon_dashboard/test/widget_test.dart b/packages/app/packages/neon_dashboard/test/widget_test.dart similarity index 100% rename from packages/neon/neon_dashboard/test/widget_test.dart rename to packages/app/packages/neon_dashboard/test/widget_test.dart diff --git a/packages/neon/neon_dashboard/.metadata b/packages/app/packages/neon_files/.metadata similarity index 100% rename from packages/neon/neon_dashboard/.metadata rename to packages/app/packages/neon_files/.metadata diff --git a/packages/app/packages/neon_files/LICENSE b/packages/app/packages/neon_files/LICENSE new file mode 120000 index 00000000000..f0b83dad961 --- /dev/null +++ b/packages/app/packages/neon_files/LICENSE @@ -0,0 +1 @@ +../../../../assets/AGPL-3.0.txt \ No newline at end of file diff --git a/packages/neon/neon_files/analysis_options.yaml b/packages/app/packages/neon_files/analysis_options.yaml similarity index 100% rename from packages/neon/neon_files/analysis_options.yaml rename to packages/app/packages/neon_files/analysis_options.yaml diff --git a/packages/neon/neon_files/assets/app.svg.vec b/packages/app/packages/neon_files/assets/app.svg.vec similarity index 100% rename from packages/neon/neon_files/assets/app.svg.vec rename to packages/app/packages/neon_files/assets/app.svg.vec diff --git a/packages/neon/neon_files/build.yaml b/packages/app/packages/neon_files/build.yaml similarity index 100% rename from packages/neon/neon_files/build.yaml rename to packages/app/packages/neon_files/build.yaml diff --git a/packages/neon/neon_files/l10n.yaml b/packages/app/packages/neon_files/l10n.yaml similarity index 100% rename from packages/neon/neon_files/l10n.yaml rename to packages/app/packages/neon_files/l10n.yaml diff --git a/packages/neon/neon_files/lib/l10n/en.arb b/packages/app/packages/neon_files/lib/l10n/en.arb similarity index 100% rename from packages/neon/neon_files/lib/l10n/en.arb rename to packages/app/packages/neon_files/lib/l10n/en.arb diff --git a/packages/neon/neon_files/lib/l10n/localizations.dart b/packages/app/packages/neon_files/lib/l10n/localizations.dart similarity index 100% rename from packages/neon/neon_files/lib/l10n/localizations.dart rename to packages/app/packages/neon_files/lib/l10n/localizations.dart diff --git a/packages/neon/neon_files/lib/l10n/localizations_en.dart b/packages/app/packages/neon_files/lib/l10n/localizations_en.dart similarity index 100% rename from packages/neon/neon_files/lib/l10n/localizations_en.dart rename to packages/app/packages/neon_files/lib/l10n/localizations_en.dart diff --git a/packages/neon/neon_files/lib/neon_files.dart b/packages/app/packages/neon_files/lib/neon_files.dart similarity index 100% rename from packages/neon/neon_files/lib/neon_files.dart rename to packages/app/packages/neon_files/lib/neon_files.dart diff --git a/packages/neon/neon_files/lib/src/blocs/browser.dart b/packages/app/packages/neon_files/lib/src/blocs/browser.dart similarity index 100% rename from packages/neon/neon_files/lib/src/blocs/browser.dart rename to packages/app/packages/neon_files/lib/src/blocs/browser.dart diff --git a/packages/neon/neon_files/lib/src/blocs/files.dart b/packages/app/packages/neon_files/lib/src/blocs/files.dart similarity index 100% rename from packages/neon/neon_files/lib/src/blocs/files.dart rename to packages/app/packages/neon_files/lib/src/blocs/files.dart diff --git a/packages/neon/neon_files/lib/src/models/file_details.dart b/packages/app/packages/neon_files/lib/src/models/file_details.dart similarity index 100% rename from packages/neon/neon_files/lib/src/models/file_details.dart rename to packages/app/packages/neon_files/lib/src/models/file_details.dart diff --git a/packages/neon/neon_files/lib/src/options.dart b/packages/app/packages/neon_files/lib/src/options.dart similarity index 100% rename from packages/neon/neon_files/lib/src/options.dart rename to packages/app/packages/neon_files/lib/src/options.dart diff --git a/packages/neon/neon_files/lib/src/pages/details.dart b/packages/app/packages/neon_files/lib/src/pages/details.dart similarity index 100% rename from packages/neon/neon_files/lib/src/pages/details.dart rename to packages/app/packages/neon_files/lib/src/pages/details.dart diff --git a/packages/neon/neon_files/lib/src/pages/main.dart b/packages/app/packages/neon_files/lib/src/pages/main.dart similarity index 100% rename from packages/neon/neon_files/lib/src/pages/main.dart rename to packages/app/packages/neon_files/lib/src/pages/main.dart diff --git a/packages/neon/neon_files/lib/src/routes.dart b/packages/app/packages/neon_files/lib/src/routes.dart similarity index 100% rename from packages/neon/neon_files/lib/src/routes.dart rename to packages/app/packages/neon_files/lib/src/routes.dart diff --git a/packages/neon/neon_files/lib/src/routes.g.dart b/packages/app/packages/neon_files/lib/src/routes.g.dart similarity index 100% rename from packages/neon/neon_files/lib/src/routes.g.dart rename to packages/app/packages/neon_files/lib/src/routes.g.dart diff --git a/packages/neon/neon_files/lib/src/sort/files.dart b/packages/app/packages/neon_files/lib/src/sort/files.dart similarity index 100% rename from packages/neon/neon_files/lib/src/sort/files.dart rename to packages/app/packages/neon_files/lib/src/sort/files.dart diff --git a/packages/neon/neon_files/lib/src/utils/dialog.dart b/packages/app/packages/neon_files/lib/src/utils/dialog.dart similarity index 100% rename from packages/neon/neon_files/lib/src/utils/dialog.dart rename to packages/app/packages/neon_files/lib/src/utils/dialog.dart diff --git a/packages/neon/neon_files/lib/src/utils/task.dart b/packages/app/packages/neon_files/lib/src/utils/task.dart similarity index 100% rename from packages/neon/neon_files/lib/src/utils/task.dart rename to packages/app/packages/neon_files/lib/src/utils/task.dart diff --git a/packages/neon/neon_files/lib/src/widgets/actions.dart b/packages/app/packages/neon_files/lib/src/widgets/actions.dart similarity index 100% rename from packages/neon/neon_files/lib/src/widgets/actions.dart rename to packages/app/packages/neon_files/lib/src/widgets/actions.dart diff --git a/packages/neon/neon_files/lib/src/widgets/browser_view.dart b/packages/app/packages/neon_files/lib/src/widgets/browser_view.dart similarity index 100% rename from packages/neon/neon_files/lib/src/widgets/browser_view.dart rename to packages/app/packages/neon_files/lib/src/widgets/browser_view.dart diff --git a/packages/neon/neon_files/lib/src/widgets/dialog.dart b/packages/app/packages/neon_files/lib/src/widgets/dialog.dart similarity index 100% rename from packages/neon/neon_files/lib/src/widgets/dialog.dart rename to packages/app/packages/neon_files/lib/src/widgets/dialog.dart diff --git a/packages/neon/neon_files/lib/src/widgets/file_list_tile.dart b/packages/app/packages/neon_files/lib/src/widgets/file_list_tile.dart similarity index 100% rename from packages/neon/neon_files/lib/src/widgets/file_list_tile.dart rename to packages/app/packages/neon_files/lib/src/widgets/file_list_tile.dart diff --git a/packages/neon/neon_files/lib/src/widgets/file_preview.dart b/packages/app/packages/neon_files/lib/src/widgets/file_preview.dart similarity index 100% rename from packages/neon/neon_files/lib/src/widgets/file_preview.dart rename to packages/app/packages/neon_files/lib/src/widgets/file_preview.dart diff --git a/packages/neon/neon_files/lib/src/widgets/navigator.dart b/packages/app/packages/neon_files/lib/src/widgets/navigator.dart similarity index 100% rename from packages/neon/neon_files/lib/src/widgets/navigator.dart rename to packages/app/packages/neon_files/lib/src/widgets/navigator.dart diff --git a/packages/neon/neon_files/pubspec.yaml b/packages/app/packages/neon_files/pubspec.yaml similarity index 95% rename from packages/neon/neon_files/pubspec.yaml rename to packages/app/packages/neon_files/pubspec.yaml index 90ff1a6aee7..0bb96652e36 100644 --- a/packages/neon/neon_files/pubspec.yaml +++ b/packages/app/packages/neon_files/pubspec.yaml @@ -13,7 +13,7 @@ dependencies: file_icons: git: url: https://github.com/nextcloud/neon - path: packages/file_icons + path: packages/neon_framework/packages/file_icons file_picker: ^8.0.0+1 filesize: ^2.0.0 flutter: diff --git a/packages/app/packages/neon_files/pubspec_overrides.yaml b/packages/app/packages/neon_files/pubspec_overrides.yaml new file mode 100644 index 00000000000..12a43589c7d --- /dev/null +++ b/packages/app/packages/neon_files/pubspec_overrides.yaml @@ -0,0 +1,18 @@ +# melos_managed_dependency_overrides: cookie_store,dynamite_runtime,file_icons,neon_framework,neon_http_client,neon_lints,nextcloud,sort_box +dependency_overrides: + cookie_store: + path: ../../../cookie_store + dynamite_runtime: + path: ../../../dynamite/dynamite_runtime + file_icons: + path: ../../../neon_framework/packages/file_icons + neon_framework: + path: ../../../neon_framework + neon_http_client: + path: ../../../neon_framework/packages/neon_http_client + neon_lints: + path: ../../../neon_lints + nextcloud: + path: ../../../nextcloud + sort_box: + path: ../../../neon_framework/packages/sort_box diff --git a/packages/neon/neon_files/.metadata b/packages/app/packages/neon_news/.metadata similarity index 100% rename from packages/neon/neon_files/.metadata rename to packages/app/packages/neon_news/.metadata diff --git a/packages/app/packages/neon_news/LICENSE b/packages/app/packages/neon_news/LICENSE new file mode 120000 index 00000000000..f0b83dad961 --- /dev/null +++ b/packages/app/packages/neon_news/LICENSE @@ -0,0 +1 @@ +../../../../assets/AGPL-3.0.txt \ No newline at end of file diff --git a/packages/neon/neon_news/analysis_options.yaml b/packages/app/packages/neon_news/analysis_options.yaml similarity index 100% rename from packages/neon/neon_news/analysis_options.yaml rename to packages/app/packages/neon_news/analysis_options.yaml diff --git a/packages/neon/neon_news/assets/app.svg.vec b/packages/app/packages/neon_news/assets/app.svg.vec similarity index 100% rename from packages/neon/neon_news/assets/app.svg.vec rename to packages/app/packages/neon_news/assets/app.svg.vec diff --git a/packages/neon/neon_news/build.yaml b/packages/app/packages/neon_news/build.yaml similarity index 100% rename from packages/neon/neon_news/build.yaml rename to packages/app/packages/neon_news/build.yaml diff --git a/packages/neon/neon_news/l10n.yaml b/packages/app/packages/neon_news/l10n.yaml similarity index 100% rename from packages/neon/neon_news/l10n.yaml rename to packages/app/packages/neon_news/l10n.yaml diff --git a/packages/neon/neon_news/lib/l10n/en.arb b/packages/app/packages/neon_news/lib/l10n/en.arb similarity index 100% rename from packages/neon/neon_news/lib/l10n/en.arb rename to packages/app/packages/neon_news/lib/l10n/en.arb diff --git a/packages/neon/neon_news/lib/l10n/localizations.dart b/packages/app/packages/neon_news/lib/l10n/localizations.dart similarity index 100% rename from packages/neon/neon_news/lib/l10n/localizations.dart rename to packages/app/packages/neon_news/lib/l10n/localizations.dart diff --git a/packages/neon/neon_news/lib/l10n/localizations_en.dart b/packages/app/packages/neon_news/lib/l10n/localizations_en.dart similarity index 100% rename from packages/neon/neon_news/lib/l10n/localizations_en.dart rename to packages/app/packages/neon_news/lib/l10n/localizations_en.dart diff --git a/packages/neon/neon_news/lib/neon_news.dart b/packages/app/packages/neon_news/lib/neon_news.dart similarity index 100% rename from packages/neon/neon_news/lib/neon_news.dart rename to packages/app/packages/neon_news/lib/neon_news.dart diff --git a/packages/neon/neon_news/lib/src/blocs/article.dart b/packages/app/packages/neon_news/lib/src/blocs/article.dart similarity index 100% rename from packages/neon/neon_news/lib/src/blocs/article.dart rename to packages/app/packages/neon_news/lib/src/blocs/article.dart diff --git a/packages/neon/neon_news/lib/src/blocs/articles.dart b/packages/app/packages/neon_news/lib/src/blocs/articles.dart similarity index 100% rename from packages/neon/neon_news/lib/src/blocs/articles.dart rename to packages/app/packages/neon_news/lib/src/blocs/articles.dart diff --git a/packages/neon/neon_news/lib/src/blocs/news.dart b/packages/app/packages/neon_news/lib/src/blocs/news.dart similarity index 100% rename from packages/neon/neon_news/lib/src/blocs/news.dart rename to packages/app/packages/neon_news/lib/src/blocs/news.dart diff --git a/packages/neon/neon_news/lib/src/options.dart b/packages/app/packages/neon_news/lib/src/options.dart similarity index 100% rename from packages/neon/neon_news/lib/src/options.dart rename to packages/app/packages/neon_news/lib/src/options.dart diff --git a/packages/neon/neon_news/lib/src/pages/article.dart b/packages/app/packages/neon_news/lib/src/pages/article.dart similarity index 100% rename from packages/neon/neon_news/lib/src/pages/article.dart rename to packages/app/packages/neon_news/lib/src/pages/article.dart diff --git a/packages/neon/neon_news/lib/src/pages/feed.dart b/packages/app/packages/neon_news/lib/src/pages/feed.dart similarity index 100% rename from packages/neon/neon_news/lib/src/pages/feed.dart rename to packages/app/packages/neon_news/lib/src/pages/feed.dart diff --git a/packages/neon/neon_news/lib/src/pages/folder.dart b/packages/app/packages/neon_news/lib/src/pages/folder.dart similarity index 100% rename from packages/neon/neon_news/lib/src/pages/folder.dart rename to packages/app/packages/neon_news/lib/src/pages/folder.dart diff --git a/packages/neon/neon_news/lib/src/pages/main.dart b/packages/app/packages/neon_news/lib/src/pages/main.dart similarity index 100% rename from packages/neon/neon_news/lib/src/pages/main.dart rename to packages/app/packages/neon_news/lib/src/pages/main.dart diff --git a/packages/neon/neon_news/lib/src/routes.dart b/packages/app/packages/neon_news/lib/src/routes.dart similarity index 100% rename from packages/neon/neon_news/lib/src/routes.dart rename to packages/app/packages/neon_news/lib/src/routes.dart diff --git a/packages/neon/neon_news/lib/src/routes.g.dart b/packages/app/packages/neon_news/lib/src/routes.g.dart similarity index 100% rename from packages/neon/neon_news/lib/src/routes.g.dart rename to packages/app/packages/neon_news/lib/src/routes.g.dart diff --git a/packages/neon/neon_news/lib/src/sort/articles.dart b/packages/app/packages/neon_news/lib/src/sort/articles.dart similarity index 100% rename from packages/neon/neon_news/lib/src/sort/articles.dart rename to packages/app/packages/neon_news/lib/src/sort/articles.dart diff --git a/packages/neon/neon_news/lib/src/sort/feeds.dart b/packages/app/packages/neon_news/lib/src/sort/feeds.dart similarity index 100% rename from packages/neon/neon_news/lib/src/sort/feeds.dart rename to packages/app/packages/neon_news/lib/src/sort/feeds.dart diff --git a/packages/neon/neon_news/lib/src/sort/folders.dart b/packages/app/packages/neon_news/lib/src/sort/folders.dart similarity index 100% rename from packages/neon/neon_news/lib/src/sort/folders.dart rename to packages/app/packages/neon_news/lib/src/sort/folders.dart diff --git a/packages/neon/neon_news/lib/src/utils/dialog.dart b/packages/app/packages/neon_news/lib/src/utils/dialog.dart similarity index 100% rename from packages/neon/neon_news/lib/src/utils/dialog.dart rename to packages/app/packages/neon_news/lib/src/utils/dialog.dart diff --git a/packages/neon/neon_news/lib/src/widgets/articles_view.dart b/packages/app/packages/neon_news/lib/src/widgets/articles_view.dart similarity index 100% rename from packages/neon/neon_news/lib/src/widgets/articles_view.dart rename to packages/app/packages/neon_news/lib/src/widgets/articles_view.dart diff --git a/packages/neon/neon_news/lib/src/widgets/dialog.dart b/packages/app/packages/neon_news/lib/src/widgets/dialog.dart similarity index 100% rename from packages/neon/neon_news/lib/src/widgets/dialog.dart rename to packages/app/packages/neon_news/lib/src/widgets/dialog.dart diff --git a/packages/neon/neon_news/lib/src/widgets/feed_floating_action_button.dart b/packages/app/packages/neon_news/lib/src/widgets/feed_floating_action_button.dart similarity index 100% rename from packages/neon/neon_news/lib/src/widgets/feed_floating_action_button.dart rename to packages/app/packages/neon_news/lib/src/widgets/feed_floating_action_button.dart diff --git a/packages/neon/neon_news/lib/src/widgets/feed_icon.dart b/packages/app/packages/neon_news/lib/src/widgets/feed_icon.dart similarity index 100% rename from packages/neon/neon_news/lib/src/widgets/feed_icon.dart rename to packages/app/packages/neon_news/lib/src/widgets/feed_icon.dart diff --git a/packages/neon/neon_news/lib/src/widgets/feeds_view.dart b/packages/app/packages/neon_news/lib/src/widgets/feeds_view.dart similarity index 100% rename from packages/neon/neon_news/lib/src/widgets/feeds_view.dart rename to packages/app/packages/neon_news/lib/src/widgets/feeds_view.dart diff --git a/packages/neon/neon_news/lib/src/widgets/folder_floating_action_button.dart b/packages/app/packages/neon_news/lib/src/widgets/folder_floating_action_button.dart similarity index 100% rename from packages/neon/neon_news/lib/src/widgets/folder_floating_action_button.dart rename to packages/app/packages/neon_news/lib/src/widgets/folder_floating_action_button.dart diff --git a/packages/neon/neon_news/lib/src/widgets/folder_select.dart b/packages/app/packages/neon_news/lib/src/widgets/folder_select.dart similarity index 100% rename from packages/neon/neon_news/lib/src/widgets/folder_select.dart rename to packages/app/packages/neon_news/lib/src/widgets/folder_select.dart diff --git a/packages/neon/neon_news/lib/src/widgets/folder_view.dart b/packages/app/packages/neon_news/lib/src/widgets/folder_view.dart similarity index 100% rename from packages/neon/neon_news/lib/src/widgets/folder_view.dart rename to packages/app/packages/neon_news/lib/src/widgets/folder_view.dart diff --git a/packages/neon/neon_news/lib/src/widgets/folders_view.dart b/packages/app/packages/neon_news/lib/src/widgets/folders_view.dart similarity index 100% rename from packages/neon/neon_news/lib/src/widgets/folders_view.dart rename to packages/app/packages/neon_news/lib/src/widgets/folders_view.dart diff --git a/packages/neon/neon_news/pubspec.yaml b/packages/app/packages/neon_news/pubspec.yaml similarity index 100% rename from packages/neon/neon_news/pubspec.yaml rename to packages/app/packages/neon_news/pubspec.yaml diff --git a/packages/app/packages/neon_news/pubspec_overrides.yaml b/packages/app/packages/neon_news/pubspec_overrides.yaml new file mode 100644 index 00000000000..bb15117d6d7 --- /dev/null +++ b/packages/app/packages/neon_news/pubspec_overrides.yaml @@ -0,0 +1,16 @@ +# melos_managed_dependency_overrides: cookie_store,dynamite_runtime,neon_framework,neon_http_client,neon_lints,nextcloud,sort_box +dependency_overrides: + cookie_store: + path: ../../../cookie_store + dynamite_runtime: + path: ../../../dynamite/dynamite_runtime + neon_framework: + path: ../../../neon_framework + neon_http_client: + path: ../../../neon_framework/packages/neon_http_client + neon_lints: + path: ../../../neon_lints + nextcloud: + path: ../../../nextcloud + sort_box: + path: ../../../neon_framework/packages/sort_box diff --git a/packages/neon/neon_news/.metadata b/packages/app/packages/neon_notes/.metadata similarity index 100% rename from packages/neon/neon_news/.metadata rename to packages/app/packages/neon_notes/.metadata diff --git a/packages/app/packages/neon_notes/LICENSE b/packages/app/packages/neon_notes/LICENSE new file mode 120000 index 00000000000..f0b83dad961 --- /dev/null +++ b/packages/app/packages/neon_notes/LICENSE @@ -0,0 +1 @@ +../../../../assets/AGPL-3.0.txt \ No newline at end of file diff --git a/packages/neon/neon_notes/analysis_options.yaml b/packages/app/packages/neon_notes/analysis_options.yaml similarity index 100% rename from packages/neon/neon_notes/analysis_options.yaml rename to packages/app/packages/neon_notes/analysis_options.yaml diff --git a/packages/neon/neon_notes/assets/app.svg.vec b/packages/app/packages/neon_notes/assets/app.svg.vec similarity index 100% rename from packages/neon/neon_notes/assets/app.svg.vec rename to packages/app/packages/neon_notes/assets/app.svg.vec diff --git a/packages/neon/neon_notes/build.yaml b/packages/app/packages/neon_notes/build.yaml similarity index 100% rename from packages/neon/neon_notes/build.yaml rename to packages/app/packages/neon_notes/build.yaml diff --git a/packages/neon/neon_notes/l10n.yaml b/packages/app/packages/neon_notes/l10n.yaml similarity index 100% rename from packages/neon/neon_notes/l10n.yaml rename to packages/app/packages/neon_notes/l10n.yaml diff --git a/packages/neon/neon_notes/lib/l10n/en.arb b/packages/app/packages/neon_notes/lib/l10n/en.arb similarity index 100% rename from packages/neon/neon_notes/lib/l10n/en.arb rename to packages/app/packages/neon_notes/lib/l10n/en.arb diff --git a/packages/neon/neon_notes/lib/l10n/localizations.dart b/packages/app/packages/neon_notes/lib/l10n/localizations.dart similarity index 100% rename from packages/neon/neon_notes/lib/l10n/localizations.dart rename to packages/app/packages/neon_notes/lib/l10n/localizations.dart diff --git a/packages/neon/neon_notes/lib/l10n/localizations_en.dart b/packages/app/packages/neon_notes/lib/l10n/localizations_en.dart similarity index 100% rename from packages/neon/neon_notes/lib/l10n/localizations_en.dart rename to packages/app/packages/neon_notes/lib/l10n/localizations_en.dart diff --git a/packages/neon/neon_notes/lib/neon_notes.dart b/packages/app/packages/neon_notes/lib/neon_notes.dart similarity index 100% rename from packages/neon/neon_notes/lib/neon_notes.dart rename to packages/app/packages/neon_notes/lib/neon_notes.dart diff --git a/packages/neon/neon_notes/lib/src/blocs/note.dart b/packages/app/packages/neon_notes/lib/src/blocs/note.dart similarity index 100% rename from packages/neon/neon_notes/lib/src/blocs/note.dart rename to packages/app/packages/neon_notes/lib/src/blocs/note.dart diff --git a/packages/neon/neon_notes/lib/src/blocs/notes.dart b/packages/app/packages/neon_notes/lib/src/blocs/notes.dart similarity index 100% rename from packages/neon/neon_notes/lib/src/blocs/notes.dart rename to packages/app/packages/neon_notes/lib/src/blocs/notes.dart diff --git a/packages/neon/neon_notes/lib/src/options.dart b/packages/app/packages/neon_notes/lib/src/options.dart similarity index 100% rename from packages/neon/neon_notes/lib/src/options.dart rename to packages/app/packages/neon_notes/lib/src/options.dart diff --git a/packages/neon/neon_notes/lib/src/pages/category.dart b/packages/app/packages/neon_notes/lib/src/pages/category.dart similarity index 100% rename from packages/neon/neon_notes/lib/src/pages/category.dart rename to packages/app/packages/neon_notes/lib/src/pages/category.dart diff --git a/packages/neon/neon_notes/lib/src/pages/main.dart b/packages/app/packages/neon_notes/lib/src/pages/main.dart similarity index 100% rename from packages/neon/neon_notes/lib/src/pages/main.dart rename to packages/app/packages/neon_notes/lib/src/pages/main.dart diff --git a/packages/neon/neon_notes/lib/src/pages/note.dart b/packages/app/packages/neon_notes/lib/src/pages/note.dart similarity index 100% rename from packages/neon/neon_notes/lib/src/pages/note.dart rename to packages/app/packages/neon_notes/lib/src/pages/note.dart diff --git a/packages/neon/neon_notes/lib/src/routes.dart b/packages/app/packages/neon_notes/lib/src/routes.dart similarity index 100% rename from packages/neon/neon_notes/lib/src/routes.dart rename to packages/app/packages/neon_notes/lib/src/routes.dart diff --git a/packages/neon/neon_notes/lib/src/routes.g.dart b/packages/app/packages/neon_notes/lib/src/routes.g.dart similarity index 100% rename from packages/neon/neon_notes/lib/src/routes.g.dart rename to packages/app/packages/neon_notes/lib/src/routes.g.dart diff --git a/packages/neon/neon_notes/lib/src/sort/categories.dart b/packages/app/packages/neon_notes/lib/src/sort/categories.dart similarity index 100% rename from packages/neon/neon_notes/lib/src/sort/categories.dart rename to packages/app/packages/neon_notes/lib/src/sort/categories.dart diff --git a/packages/neon/neon_notes/lib/src/sort/notes.dart b/packages/app/packages/neon_notes/lib/src/sort/notes.dart similarity index 100% rename from packages/neon/neon_notes/lib/src/sort/notes.dart rename to packages/app/packages/neon_notes/lib/src/sort/notes.dart diff --git a/packages/neon/neon_notes/lib/src/utils/category_color.dart b/packages/app/packages/neon_notes/lib/src/utils/category_color.dart similarity index 100% rename from packages/neon/neon_notes/lib/src/utils/category_color.dart rename to packages/app/packages/neon_notes/lib/src/utils/category_color.dart diff --git a/packages/neon/neon_notes/lib/src/utils/exception_handler.dart b/packages/app/packages/neon_notes/lib/src/utils/exception_handler.dart similarity index 100% rename from packages/neon/neon_notes/lib/src/utils/exception_handler.dart rename to packages/app/packages/neon_notes/lib/src/utils/exception_handler.dart diff --git a/packages/neon/neon_notes/lib/src/widgets/categories_view.dart b/packages/app/packages/neon_notes/lib/src/widgets/categories_view.dart similarity index 100% rename from packages/neon/neon_notes/lib/src/widgets/categories_view.dart rename to packages/app/packages/neon_notes/lib/src/widgets/categories_view.dart diff --git a/packages/neon/neon_notes/lib/src/widgets/category_select.dart b/packages/app/packages/neon_notes/lib/src/widgets/category_select.dart similarity index 100% rename from packages/neon/neon_notes/lib/src/widgets/category_select.dart rename to packages/app/packages/neon_notes/lib/src/widgets/category_select.dart diff --git a/packages/neon/neon_notes/lib/src/widgets/dialog.dart b/packages/app/packages/neon_notes/lib/src/widgets/dialog.dart similarity index 100% rename from packages/neon/neon_notes/lib/src/widgets/dialog.dart rename to packages/app/packages/neon_notes/lib/src/widgets/dialog.dart diff --git a/packages/neon/neon_notes/lib/src/widgets/notes_floating_action_button.dart b/packages/app/packages/neon_notes/lib/src/widgets/notes_floating_action_button.dart similarity index 100% rename from packages/neon/neon_notes/lib/src/widgets/notes_floating_action_button.dart rename to packages/app/packages/neon_notes/lib/src/widgets/notes_floating_action_button.dart diff --git a/packages/neon/neon_notes/lib/src/widgets/notes_view.dart b/packages/app/packages/neon_notes/lib/src/widgets/notes_view.dart similarity index 100% rename from packages/neon/neon_notes/lib/src/widgets/notes_view.dart rename to packages/app/packages/neon_notes/lib/src/widgets/notes_view.dart diff --git a/packages/neon/neon_notes/pubspec.yaml b/packages/app/packages/neon_notes/pubspec.yaml similarity index 100% rename from packages/neon/neon_notes/pubspec.yaml rename to packages/app/packages/neon_notes/pubspec.yaml diff --git a/packages/app/packages/neon_notes/pubspec_overrides.yaml b/packages/app/packages/neon_notes/pubspec_overrides.yaml new file mode 100644 index 00000000000..bb15117d6d7 --- /dev/null +++ b/packages/app/packages/neon_notes/pubspec_overrides.yaml @@ -0,0 +1,16 @@ +# melos_managed_dependency_overrides: cookie_store,dynamite_runtime,neon_framework,neon_http_client,neon_lints,nextcloud,sort_box +dependency_overrides: + cookie_store: + path: ../../../cookie_store + dynamite_runtime: + path: ../../../dynamite/dynamite_runtime + neon_framework: + path: ../../../neon_framework + neon_http_client: + path: ../../../neon_framework/packages/neon_http_client + neon_lints: + path: ../../../neon_lints + nextcloud: + path: ../../../nextcloud + sort_box: + path: ../../../neon_framework/packages/sort_box diff --git a/packages/neon/neon_notes/.metadata b/packages/app/packages/neon_notifications/.metadata similarity index 100% rename from packages/neon/neon_notes/.metadata rename to packages/app/packages/neon_notifications/.metadata diff --git a/packages/app/packages/neon_notifications/LICENSE b/packages/app/packages/neon_notifications/LICENSE new file mode 120000 index 00000000000..f0b83dad961 --- /dev/null +++ b/packages/app/packages/neon_notifications/LICENSE @@ -0,0 +1 @@ +../../../../assets/AGPL-3.0.txt \ No newline at end of file diff --git a/packages/neon/neon_notifications/analysis_options.yaml b/packages/app/packages/neon_notifications/analysis_options.yaml similarity index 100% rename from packages/neon/neon_notifications/analysis_options.yaml rename to packages/app/packages/neon_notifications/analysis_options.yaml diff --git a/packages/neon/neon_notifications/assets/app.svg.vec b/packages/app/packages/neon_notifications/assets/app.svg.vec similarity index 100% rename from packages/neon/neon_notifications/assets/app.svg.vec rename to packages/app/packages/neon_notifications/assets/app.svg.vec diff --git a/packages/neon/neon_notifications/build.yaml b/packages/app/packages/neon_notifications/build.yaml similarity index 100% rename from packages/neon/neon_notifications/build.yaml rename to packages/app/packages/neon_notifications/build.yaml diff --git a/packages/neon/neon_notifications/l10n.yaml b/packages/app/packages/neon_notifications/l10n.yaml similarity index 100% rename from packages/neon/neon_notifications/l10n.yaml rename to packages/app/packages/neon_notifications/l10n.yaml diff --git a/packages/neon/neon_notifications/lib/l10n/en.arb b/packages/app/packages/neon_notifications/lib/l10n/en.arb similarity index 100% rename from packages/neon/neon_notifications/lib/l10n/en.arb rename to packages/app/packages/neon_notifications/lib/l10n/en.arb diff --git a/packages/neon/neon_notifications/lib/l10n/localizations.dart b/packages/app/packages/neon_notifications/lib/l10n/localizations.dart similarity index 100% rename from packages/neon/neon_notifications/lib/l10n/localizations.dart rename to packages/app/packages/neon_notifications/lib/l10n/localizations.dart diff --git a/packages/neon/neon_notifications/lib/l10n/localizations_en.dart b/packages/app/packages/neon_notifications/lib/l10n/localizations_en.dart similarity index 100% rename from packages/neon/neon_notifications/lib/l10n/localizations_en.dart rename to packages/app/packages/neon_notifications/lib/l10n/localizations_en.dart diff --git a/packages/neon/neon_notifications/lib/neon_notifications.dart b/packages/app/packages/neon_notifications/lib/neon_notifications.dart similarity index 100% rename from packages/neon/neon_notifications/lib/neon_notifications.dart rename to packages/app/packages/neon_notifications/lib/neon_notifications.dart diff --git a/packages/neon/neon_notifications/lib/src/blocs/notifications.dart b/packages/app/packages/neon_notifications/lib/src/blocs/notifications.dart similarity index 100% rename from packages/neon/neon_notifications/lib/src/blocs/notifications.dart rename to packages/app/packages/neon_notifications/lib/src/blocs/notifications.dart diff --git a/packages/neon/neon_notifications/lib/src/options.dart b/packages/app/packages/neon_notifications/lib/src/options.dart similarity index 100% rename from packages/neon/neon_notifications/lib/src/options.dart rename to packages/app/packages/neon_notifications/lib/src/options.dart diff --git a/packages/neon/neon_notifications/lib/src/pages/main.dart b/packages/app/packages/neon_notifications/lib/src/pages/main.dart similarity index 100% rename from packages/neon/neon_notifications/lib/src/pages/main.dart rename to packages/app/packages/neon_notifications/lib/src/pages/main.dart diff --git a/packages/neon/neon_notifications/lib/src/routes.dart b/packages/app/packages/neon_notifications/lib/src/routes.dart similarity index 100% rename from packages/neon/neon_notifications/lib/src/routes.dart rename to packages/app/packages/neon_notifications/lib/src/routes.dart diff --git a/packages/neon/neon_notifications/lib/src/routes.g.dart b/packages/app/packages/neon_notifications/lib/src/routes.g.dart similarity index 100% rename from packages/neon/neon_notifications/lib/src/routes.g.dart rename to packages/app/packages/neon_notifications/lib/src/routes.g.dart diff --git a/packages/neon/neon_notifications/lib/src/widgets/action.dart b/packages/app/packages/neon_notifications/lib/src/widgets/action.dart similarity index 100% rename from packages/neon/neon_notifications/lib/src/widgets/action.dart rename to packages/app/packages/neon_notifications/lib/src/widgets/action.dart diff --git a/packages/neon/neon_notifications/lib/src/widgets/notification.dart b/packages/app/packages/neon_notifications/lib/src/widgets/notification.dart similarity index 100% rename from packages/neon/neon_notifications/lib/src/widgets/notification.dart rename to packages/app/packages/neon_notifications/lib/src/widgets/notification.dart diff --git a/packages/neon/neon_notifications/pubspec.yaml b/packages/app/packages/neon_notifications/pubspec.yaml similarity index 100% rename from packages/neon/neon_notifications/pubspec.yaml rename to packages/app/packages/neon_notifications/pubspec.yaml diff --git a/packages/app/packages/neon_notifications/pubspec_overrides.yaml b/packages/app/packages/neon_notifications/pubspec_overrides.yaml new file mode 100644 index 00000000000..bb15117d6d7 --- /dev/null +++ b/packages/app/packages/neon_notifications/pubspec_overrides.yaml @@ -0,0 +1,16 @@ +# melos_managed_dependency_overrides: cookie_store,dynamite_runtime,neon_framework,neon_http_client,neon_lints,nextcloud,sort_box +dependency_overrides: + cookie_store: + path: ../../../cookie_store + dynamite_runtime: + path: ../../../dynamite/dynamite_runtime + neon_framework: + path: ../../../neon_framework + neon_http_client: + path: ../../../neon_framework/packages/neon_http_client + neon_lints: + path: ../../../neon_lints + nextcloud: + path: ../../../nextcloud + sort_box: + path: ../../../neon_framework/packages/sort_box diff --git a/packages/neon/neon_notifications/test/action_test.dart b/packages/app/packages/neon_notifications/test/action_test.dart similarity index 100% rename from packages/neon/neon_notifications/test/action_test.dart rename to packages/app/packages/neon_notifications/test/action_test.dart diff --git a/packages/neon/neon_notifications/test/bloc_test.dart b/packages/app/packages/neon_notifications/test/bloc_test.dart similarity index 100% rename from packages/neon/neon_notifications/test/bloc_test.dart rename to packages/app/packages/neon_notifications/test/bloc_test.dart diff --git a/packages/neon/neon_notifications/test/goldens/action_primary.png b/packages/app/packages/neon_notifications/test/goldens/action_primary.png similarity index 100% rename from packages/neon/neon_notifications/test/goldens/action_primary.png rename to packages/app/packages/neon_notifications/test/goldens/action_primary.png diff --git a/packages/neon/neon_notifications/test/goldens/action_secondary.png b/packages/app/packages/neon_notifications/test/goldens/action_secondary.png similarity index 100% rename from packages/neon/neon_notifications/test/goldens/action_secondary.png rename to packages/app/packages/neon_notifications/test/goldens/action_secondary.png diff --git a/packages/neon/neon_notifications/test/goldens/main_page_error.png b/packages/app/packages/neon_notifications/test/goldens/main_page_error.png similarity index 100% rename from packages/neon/neon_notifications/test/goldens/main_page_error.png rename to packages/app/packages/neon_notifications/test/goldens/main_page_error.png diff --git a/packages/neon/neon_notifications/test/goldens/main_page_with_notifications.png b/packages/app/packages/neon_notifications/test/goldens/main_page_with_notifications.png similarity index 100% rename from packages/neon/neon_notifications/test/goldens/main_page_with_notifications.png rename to packages/app/packages/neon_notifications/test/goldens/main_page_with_notifications.png diff --git a/packages/neon/neon_notifications/test/goldens/main_page_without_notifications.png b/packages/app/packages/neon_notifications/test/goldens/main_page_without_notifications.png similarity index 100% rename from packages/neon/neon_notifications/test/goldens/main_page_without_notifications.png rename to packages/app/packages/neon_notifications/test/goldens/main_page_without_notifications.png diff --git a/packages/neon/neon_notifications/test/goldens/notification.png b/packages/app/packages/neon_notifications/test/goldens/notification.png similarity index 100% rename from packages/neon/neon_notifications/test/goldens/notification.png rename to packages/app/packages/neon_notifications/test/goldens/notification.png diff --git a/packages/neon/neon_notifications/test/main_page_test.dart b/packages/app/packages/neon_notifications/test/main_page_test.dart similarity index 100% rename from packages/neon/neon_notifications/test/main_page_test.dart rename to packages/app/packages/neon_notifications/test/main_page_test.dart diff --git a/packages/neon/neon_notifications/test/notification_test.dart b/packages/app/packages/neon_notifications/test/notification_test.dart similarity index 100% rename from packages/neon/neon_notifications/test/notification_test.dart rename to packages/app/packages/neon_notifications/test/notification_test.dart diff --git a/packages/neon/neon_notifications/test/testing.dart b/packages/app/packages/neon_notifications/test/testing.dart similarity index 100% rename from packages/neon/neon_notifications/test/testing.dart rename to packages/app/packages/neon_notifications/test/testing.dart diff --git a/packages/neon/neon_notifications/.metadata b/packages/app/packages/neon_talk/.metadata similarity index 100% rename from packages/neon/neon_notifications/.metadata rename to packages/app/packages/neon_talk/.metadata diff --git a/packages/app/packages/neon_talk/LICENSE b/packages/app/packages/neon_talk/LICENSE new file mode 120000 index 00000000000..f0b83dad961 --- /dev/null +++ b/packages/app/packages/neon_talk/LICENSE @@ -0,0 +1 @@ +../../../../assets/AGPL-3.0.txt \ No newline at end of file diff --git a/packages/neon/neon_talk/analysis_options.yaml b/packages/app/packages/neon_talk/analysis_options.yaml similarity index 100% rename from packages/neon/neon_talk/analysis_options.yaml rename to packages/app/packages/neon_talk/analysis_options.yaml diff --git a/packages/neon/neon_talk/assets/app.svg.vec b/packages/app/packages/neon_talk/assets/app.svg.vec similarity index 100% rename from packages/neon/neon_talk/assets/app.svg.vec rename to packages/app/packages/neon_talk/assets/app.svg.vec diff --git a/packages/neon/neon_talk/build.yaml b/packages/app/packages/neon_talk/build.yaml similarity index 100% rename from packages/neon/neon_talk/build.yaml rename to packages/app/packages/neon_talk/build.yaml diff --git a/packages/neon/neon_talk/l10n.yaml b/packages/app/packages/neon_talk/l10n.yaml similarity index 100% rename from packages/neon/neon_talk/l10n.yaml rename to packages/app/packages/neon_talk/l10n.yaml diff --git a/packages/neon/neon_talk/lib/l10n/en.arb b/packages/app/packages/neon_talk/lib/l10n/en.arb similarity index 100% rename from packages/neon/neon_talk/lib/l10n/en.arb rename to packages/app/packages/neon_talk/lib/l10n/en.arb diff --git a/packages/neon/neon_talk/lib/l10n/localizations.dart b/packages/app/packages/neon_talk/lib/l10n/localizations.dart similarity index 100% rename from packages/neon/neon_talk/lib/l10n/localizations.dart rename to packages/app/packages/neon_talk/lib/l10n/localizations.dart diff --git a/packages/neon/neon_talk/lib/l10n/localizations_en.dart b/packages/app/packages/neon_talk/lib/l10n/localizations_en.dart similarity index 100% rename from packages/neon/neon_talk/lib/l10n/localizations_en.dart rename to packages/app/packages/neon_talk/lib/l10n/localizations_en.dart diff --git a/packages/neon/neon_talk/lib/neon_talk.dart b/packages/app/packages/neon_talk/lib/neon_talk.dart similarity index 100% rename from packages/neon/neon_talk/lib/neon_talk.dart rename to packages/app/packages/neon_talk/lib/neon_talk.dart diff --git a/packages/neon/neon_talk/lib/src/blocs/message_bloc.dart b/packages/app/packages/neon_talk/lib/src/blocs/message_bloc.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/blocs/message_bloc.dart rename to packages/app/packages/neon_talk/lib/src/blocs/message_bloc.dart diff --git a/packages/neon/neon_talk/lib/src/blocs/room.dart b/packages/app/packages/neon_talk/lib/src/blocs/room.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/blocs/room.dart rename to packages/app/packages/neon_talk/lib/src/blocs/room.dart diff --git a/packages/neon/neon_talk/lib/src/blocs/talk.dart b/packages/app/packages/neon_talk/lib/src/blocs/talk.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/blocs/talk.dart rename to packages/app/packages/neon_talk/lib/src/blocs/talk.dart diff --git a/packages/neon/neon_talk/lib/src/dialogs/create_room.dart b/packages/app/packages/neon_talk/lib/src/dialogs/create_room.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/dialogs/create_room.dart rename to packages/app/packages/neon_talk/lib/src/dialogs/create_room.dart diff --git a/packages/neon/neon_talk/lib/src/options.dart b/packages/app/packages/neon_talk/lib/src/options.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/options.dart rename to packages/app/packages/neon_talk/lib/src/options.dart diff --git a/packages/neon/neon_talk/lib/src/pages/main.dart b/packages/app/packages/neon_talk/lib/src/pages/main.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/pages/main.dart rename to packages/app/packages/neon_talk/lib/src/pages/main.dart diff --git a/packages/neon/neon_talk/lib/src/pages/room.dart b/packages/app/packages/neon_talk/lib/src/pages/room.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/pages/room.dart rename to packages/app/packages/neon_talk/lib/src/pages/room.dart diff --git a/packages/neon/neon_talk/lib/src/routes.dart b/packages/app/packages/neon_talk/lib/src/routes.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/routes.dart rename to packages/app/packages/neon_talk/lib/src/routes.dart diff --git a/packages/neon/neon_talk/lib/src/routes.g.dart b/packages/app/packages/neon_talk/lib/src/routes.g.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/routes.g.dart rename to packages/app/packages/neon_talk/lib/src/routes.g.dart diff --git a/packages/neon/neon_talk/lib/src/theme.dart b/packages/app/packages/neon_talk/lib/src/theme.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/theme.dart rename to packages/app/packages/neon_talk/lib/src/theme.dart diff --git a/packages/neon/neon_talk/lib/src/utils/helpers.dart b/packages/app/packages/neon_talk/lib/src/utils/helpers.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/utils/helpers.dart rename to packages/app/packages/neon_talk/lib/src/utils/helpers.dart diff --git a/packages/neon/neon_talk/lib/src/widgets/actor_avatar.dart b/packages/app/packages/neon_talk/lib/src/widgets/actor_avatar.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/widgets/actor_avatar.dart rename to packages/app/packages/neon_talk/lib/src/widgets/actor_avatar.dart diff --git a/packages/neon/neon_talk/lib/src/widgets/message.dart b/packages/app/packages/neon_talk/lib/src/widgets/message.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/widgets/message.dart rename to packages/app/packages/neon_talk/lib/src/widgets/message.dart diff --git a/packages/neon/neon_talk/lib/src/widgets/message_input.dart b/packages/app/packages/neon_talk/lib/src/widgets/message_input.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/widgets/message_input.dart rename to packages/app/packages/neon_talk/lib/src/widgets/message_input.dart diff --git a/packages/neon/neon_talk/lib/src/widgets/reactions.dart b/packages/app/packages/neon_talk/lib/src/widgets/reactions.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/widgets/reactions.dart rename to packages/app/packages/neon_talk/lib/src/widgets/reactions.dart diff --git a/packages/neon/neon_talk/lib/src/widgets/read_indicator.dart b/packages/app/packages/neon_talk/lib/src/widgets/read_indicator.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/widgets/read_indicator.dart rename to packages/app/packages/neon_talk/lib/src/widgets/read_indicator.dart diff --git a/packages/neon/neon_talk/lib/src/widgets/reference_preview.dart b/packages/app/packages/neon_talk/lib/src/widgets/reference_preview.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/widgets/reference_preview.dart rename to packages/app/packages/neon_talk/lib/src/widgets/reference_preview.dart diff --git a/packages/neon/neon_talk/lib/src/widgets/rich_object/deck_card.dart b/packages/app/packages/neon_talk/lib/src/widgets/rich_object/deck_card.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/widgets/rich_object/deck_card.dart rename to packages/app/packages/neon_talk/lib/src/widgets/rich_object/deck_card.dart diff --git a/packages/neon/neon_talk/lib/src/widgets/rich_object/fallback.dart b/packages/app/packages/neon_talk/lib/src/widgets/rich_object/fallback.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/widgets/rich_object/fallback.dart rename to packages/app/packages/neon_talk/lib/src/widgets/rich_object/fallback.dart diff --git a/packages/neon/neon_talk/lib/src/widgets/rich_object/file.dart b/packages/app/packages/neon_talk/lib/src/widgets/rich_object/file.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/widgets/rich_object/file.dart rename to packages/app/packages/neon_talk/lib/src/widgets/rich_object/file.dart diff --git a/packages/neon/neon_talk/lib/src/widgets/rich_object/file_preview.dart b/packages/app/packages/neon_talk/lib/src/widgets/rich_object/file_preview.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/widgets/rich_object/file_preview.dart rename to packages/app/packages/neon_talk/lib/src/widgets/rich_object/file_preview.dart diff --git a/packages/neon/neon_talk/lib/src/widgets/rich_object/mention.dart b/packages/app/packages/neon_talk/lib/src/widgets/rich_object/mention.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/widgets/rich_object/mention.dart rename to packages/app/packages/neon_talk/lib/src/widgets/rich_object/mention.dart diff --git a/packages/neon/neon_talk/lib/src/widgets/room_avatar.dart b/packages/app/packages/neon_talk/lib/src/widgets/room_avatar.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/widgets/room_avatar.dart rename to packages/app/packages/neon_talk/lib/src/widgets/room_avatar.dart diff --git a/packages/neon/neon_talk/lib/src/widgets/unread_indicator.dart b/packages/app/packages/neon_talk/lib/src/widgets/unread_indicator.dart similarity index 100% rename from packages/neon/neon_talk/lib/src/widgets/unread_indicator.dart rename to packages/app/packages/neon_talk/lib/src/widgets/unread_indicator.dart diff --git a/packages/neon/neon_talk/pubspec.yaml b/packages/app/packages/neon_talk/pubspec.yaml similarity index 95% rename from packages/neon/neon_talk/pubspec.yaml rename to packages/app/packages/neon_talk/pubspec.yaml index 7670b97db6a..a45eca34036 100644 --- a/packages/neon/neon_talk/pubspec.yaml +++ b/packages/app/packages/neon_talk/pubspec.yaml @@ -13,7 +13,7 @@ dependencies: file_icons: git: url: https://github.com/nextcloud/neon - path: packages/file_icons + path: packages/neon_framework/packages/file_icons flutter: sdk: flutter flutter_localizations: diff --git a/packages/app/packages/neon_talk/pubspec_overrides.yaml b/packages/app/packages/neon_talk/pubspec_overrides.yaml new file mode 100644 index 00000000000..12a43589c7d --- /dev/null +++ b/packages/app/packages/neon_talk/pubspec_overrides.yaml @@ -0,0 +1,18 @@ +# melos_managed_dependency_overrides: cookie_store,dynamite_runtime,file_icons,neon_framework,neon_http_client,neon_lints,nextcloud,sort_box +dependency_overrides: + cookie_store: + path: ../../../cookie_store + dynamite_runtime: + path: ../../../dynamite/dynamite_runtime + file_icons: + path: ../../../neon_framework/packages/file_icons + neon_framework: + path: ../../../neon_framework + neon_http_client: + path: ../../../neon_framework/packages/neon_http_client + neon_lints: + path: ../../../neon_lints + nextcloud: + path: ../../../nextcloud + sort_box: + path: ../../../neon_framework/packages/sort_box diff --git a/packages/neon/neon_talk/test/actor_avatar_test.dart b/packages/app/packages/neon_talk/test/actor_avatar_test.dart similarity index 100% rename from packages/neon/neon_talk/test/actor_avatar_test.dart rename to packages/app/packages/neon_talk/test/actor_avatar_test.dart diff --git a/packages/neon/neon_talk/test/bloc_test.dart b/packages/app/packages/neon_talk/test/bloc_test.dart similarity index 100% rename from packages/neon/neon_talk/test/bloc_test.dart rename to packages/app/packages/neon_talk/test/bloc_test.dart diff --git a/packages/neon/neon_talk/test/create_room_dialog_test.dart b/packages/app/packages/neon_talk/test/create_room_dialog_test.dart similarity index 100% rename from packages/neon/neon_talk/test/create_room_dialog_test.dart rename to packages/app/packages/neon_talk/test/create_room_dialog_test.dart diff --git a/packages/neon/neon_talk/test/goldens/main_page_error.png b/packages/app/packages/neon_talk/test/goldens/main_page_error.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/main_page_error.png rename to packages/app/packages/neon_talk/test/goldens/main_page_error.png diff --git a/packages/neon/neon_talk/test/goldens/main_page_with_message_preview_with_unread_messages.png b/packages/app/packages/neon_talk/test/goldens/main_page_with_message_preview_with_unread_messages.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/main_page_with_message_preview_with_unread_messages.png rename to packages/app/packages/neon_talk/test/goldens/main_page_with_message_preview_with_unread_messages.png diff --git a/packages/neon/neon_talk/test/goldens/main_page_with_message_preview_without_unread_messages_other.png b/packages/app/packages/neon_talk/test/goldens/main_page_with_message_preview_without_unread_messages_other.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/main_page_with_message_preview_without_unread_messages_other.png rename to packages/app/packages/neon_talk/test/goldens/main_page_with_message_preview_without_unread_messages_other.png diff --git a/packages/neon/neon_talk/test/goldens/main_page_with_message_preview_without_unread_messages_self.png b/packages/app/packages/neon_talk/test/goldens/main_page_with_message_preview_without_unread_messages_self.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/main_page_with_message_preview_without_unread_messages_self.png rename to packages/app/packages/neon_talk/test/goldens/main_page_with_message_preview_without_unread_messages_self.png diff --git a/packages/neon/neon_talk/test/goldens/main_page_without_message_preview.png b/packages/app/packages/neon_talk/test/goldens/main_page_without_message_preview.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/main_page_without_message_preview.png rename to packages/app/packages/neon_talk/test/goldens/main_page_without_message_preview.png diff --git a/packages/neon/neon_talk/test/goldens/message_comment_message_as_parent.png b/packages/app/packages/neon_talk/test/goldens/message_comment_message_as_parent.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_comment_message_as_parent.png rename to packages/app/packages/neon_talk/test/goldens/message_comment_message_as_parent.png diff --git a/packages/neon/neon_talk/test/goldens/message_comment_message_deleted.png b/packages/app/packages/neon_talk/test/goldens/message_comment_message_deleted.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_comment_message_deleted.png rename to packages/app/packages/neon_talk/test/goldens/message_comment_message_deleted.png diff --git a/packages/neon/neon_talk/test/goldens/message_comment_message_other.png b/packages/app/packages/neon_talk/test/goldens/message_comment_message_other.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_comment_message_other.png rename to packages/app/packages/neon_talk/test/goldens/message_comment_message_other.png diff --git a/packages/neon/neon_talk/test/goldens/message_comment_message_self.png b/packages/app/packages/neon_talk/test/goldens/message_comment_message_self.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_comment_message_self.png rename to packages/app/packages/neon_talk/test/goldens/message_comment_message_self.png diff --git a/packages/neon/neon_talk/test/goldens/message_comment_message_separate_actor.png b/packages/app/packages/neon_talk/test/goldens/message_comment_message_separate_actor.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_comment_message_separate_actor.png rename to packages/app/packages/neon_talk/test/goldens/message_comment_message_separate_actor.png diff --git a/packages/neon/neon_talk/test/goldens/message_comment_message_separate_edited.png b/packages/app/packages/neon_talk/test/goldens/message_comment_message_separate_edited.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_comment_message_separate_edited.png rename to packages/app/packages/neon_talk/test/goldens/message_comment_message_separate_edited.png diff --git a/packages/neon/neon_talk/test/goldens/message_comment_message_separate_system_message.png b/packages/app/packages/neon_talk/test/goldens/message_comment_message_separate_system_message.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_comment_message_separate_system_message.png rename to packages/app/packages/neon_talk/test/goldens/message_comment_message_separate_system_message.png diff --git a/packages/neon/neon_talk/test/goldens/message_comment_message_separate_time.png b/packages/app/packages/neon_talk/test/goldens/message_comment_message_separate_time.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_comment_message_separate_time.png rename to packages/app/packages/neon_talk/test/goldens/message_comment_message_separate_time.png diff --git a/packages/neon/neon_talk/test/goldens/message_comment_message_with_parent.png b/packages/app/packages/neon_talk/test/goldens/message_comment_message_with_parent.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_comment_message_with_parent.png rename to packages/app/packages/neon_talk/test/goldens/message_comment_message_with_parent.png diff --git a/packages/neon/neon_talk/test/goldens/message_comment_message_with_references.png b/packages/app/packages/neon_talk/test/goldens/message_comment_message_with_references.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_comment_message_with_references.png rename to packages/app/packages/neon_talk/test/goldens/message_comment_message_with_references.png diff --git a/packages/neon/neon_talk/test/goldens/message_input_edit.png b/packages/app/packages/neon_talk/test/goldens/message_input_edit.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_input_edit.png rename to packages/app/packages/neon_talk/test/goldens/message_input_edit.png diff --git a/packages/neon/neon_talk/test/goldens/message_input_emoji.png b/packages/app/packages/neon_talk/test/goldens/message_input_emoji.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_input_emoji.png rename to packages/app/packages/neon_talk/test/goldens/message_input_emoji.png diff --git a/packages/neon/neon_talk/test/goldens/message_input_mention_suggestions.png b/packages/app/packages/neon_talk/test/goldens/message_input_mention_suggestions.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_input_mention_suggestions.png rename to packages/app/packages/neon_talk/test/goldens/message_input_mention_suggestions.png diff --git a/packages/neon/neon_talk/test/goldens/message_input_multiline.png b/packages/app/packages/neon_talk/test/goldens/message_input_multiline.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_input_multiline.png rename to packages/app/packages/neon_talk/test/goldens/message_input_multiline.png diff --git a/packages/neon/neon_talk/test/goldens/message_input_no_emoji_button.png b/packages/app/packages/neon_talk/test/goldens/message_input_no_emoji_button.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_input_no_emoji_button.png rename to packages/app/packages/neon_talk/test/goldens/message_input_no_emoji_button.png diff --git a/packages/neon/neon_talk/test/goldens/message_input_reply.png b/packages/app/packages/neon_talk/test/goldens/message_input_reply.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_input_reply.png rename to packages/app/packages/neon_talk/test/goldens/message_input_reply.png diff --git a/packages/neon/neon_talk/test/goldens/message_parent_message.png b/packages/app/packages/neon_talk/test/goldens/message_parent_message.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_parent_message.png rename to packages/app/packages/neon_talk/test/goldens/message_parent_message.png diff --git a/packages/neon/neon_talk/test/goldens/message_system_message_grouping.png b/packages/app/packages/neon_talk/test/goldens/message_system_message_grouping.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_system_message_grouping.png rename to packages/app/packages/neon_talk/test/goldens/message_system_message_grouping.png diff --git a/packages/neon/neon_talk/test/goldens/message_system_message_show.png b/packages/app/packages/neon_talk/test/goldens/message_system_message_show.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/message_system_message_show.png rename to packages/app/packages/neon_talk/test/goldens/message_system_message_show.png diff --git a/packages/neon/neon_talk/test/goldens/reactions.png b/packages/app/packages/neon_talk/test/goldens/reactions.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/reactions.png rename to packages/app/packages/neon_talk/test/goldens/reactions.png diff --git a/packages/neon/neon_talk/test/goldens/reference_preview.png b/packages/app/packages/neon_talk/test/goldens/reference_preview.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/reference_preview.png rename to packages/app/packages/neon_talk/test/goldens/reference_preview.png diff --git a/packages/neon/neon_talk/test/goldens/reference_preview_with_description.png b/packages/app/packages/neon_talk/test/goldens/reference_preview_with_description.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/reference_preview_with_description.png rename to packages/app/packages/neon_talk/test/goldens/reference_preview_with_description.png diff --git a/packages/neon/neon_talk/test/goldens/reference_preview_with_thumb.png b/packages/app/packages/neon_talk/test/goldens/reference_preview_with_thumb.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/reference_preview_with_thumb.png rename to packages/app/packages/neon_talk/test/goldens/reference_preview_with_thumb.png diff --git a/packages/neon/neon_talk/test/goldens/rich_object_deck_card.png b/packages/app/packages/neon_talk/test/goldens/rich_object_deck_card.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/rich_object_deck_card.png rename to packages/app/packages/neon_talk/test/goldens/rich_object_deck_card.png diff --git a/packages/neon/neon_talk/test/goldens/rich_object_fallback_with_icon.png b/packages/app/packages/neon_talk/test/goldens/rich_object_fallback_with_icon.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/rich_object_fallback_with_icon.png rename to packages/app/packages/neon_talk/test/goldens/rich_object_fallback_with_icon.png diff --git a/packages/neon/neon_talk/test/goldens/rich_object_fallback_without_icon.png b/packages/app/packages/neon_talk/test/goldens/rich_object_fallback_without_icon.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/rich_object_fallback_without_icon.png rename to packages/app/packages/neon_talk/test/goldens/rich_object_fallback_without_icon.png diff --git a/packages/neon/neon_talk/test/goldens/rich_object_file_without_preview.png b/packages/app/packages/neon_talk/test/goldens/rich_object_file_without_preview.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/rich_object_file_without_preview.png rename to packages/app/packages/neon_talk/test/goldens/rich_object_file_without_preview.png diff --git a/packages/neon/neon_talk/test/goldens/rich_object_mention_call.png b/packages/app/packages/neon_talk/test/goldens/rich_object_mention_call.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/rich_object_mention_call.png rename to packages/app/packages/neon_talk/test/goldens/rich_object_mention_call.png diff --git a/packages/neon/neon_talk/test/goldens/rich_object_mention_group_highlight.png b/packages/app/packages/neon_talk/test/goldens/rich_object_mention_group_highlight.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/rich_object_mention_group_highlight.png rename to packages/app/packages/neon_talk/test/goldens/rich_object_mention_group_highlight.png diff --git a/packages/neon/neon_talk/test/goldens/rich_object_mention_group_other.png b/packages/app/packages/neon_talk/test/goldens/rich_object_mention_group_other.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/rich_object_mention_group_other.png rename to packages/app/packages/neon_talk/test/goldens/rich_object_mention_group_other.png diff --git a/packages/neon/neon_talk/test/goldens/rich_object_mention_guest.png b/packages/app/packages/neon_talk/test/goldens/rich_object_mention_guest.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/rich_object_mention_guest.png rename to packages/app/packages/neon_talk/test/goldens/rich_object_mention_guest.png diff --git a/packages/neon/neon_talk/test/goldens/rich_object_mention_user-group_highlight.png b/packages/app/packages/neon_talk/test/goldens/rich_object_mention_user-group_highlight.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/rich_object_mention_user-group_highlight.png rename to packages/app/packages/neon_talk/test/goldens/rich_object_mention_user-group_highlight.png diff --git a/packages/neon/neon_talk/test/goldens/rich_object_mention_user-group_other.png b/packages/app/packages/neon_talk/test/goldens/rich_object_mention_user-group_other.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/rich_object_mention_user-group_other.png rename to packages/app/packages/neon_talk/test/goldens/rich_object_mention_user-group_other.png diff --git a/packages/neon/neon_talk/test/goldens/rich_object_mention_user_highlight.png b/packages/app/packages/neon_talk/test/goldens/rich_object_mention_user_highlight.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/rich_object_mention_user_highlight.png rename to packages/app/packages/neon_talk/test/goldens/rich_object_mention_user_highlight.png diff --git a/packages/neon/neon_talk/test/goldens/rich_object_mention_user_other.png b/packages/app/packages/neon_talk/test/goldens/rich_object_mention_user_other.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/rich_object_mention_user_other.png rename to packages/app/packages/neon_talk/test/goldens/rich_object_mention_user_other.png diff --git a/packages/neon/neon_talk/test/goldens/room_page_error.png b/packages/app/packages/neon_talk/test/goldens/room_page_error.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/room_page_error.png rename to packages/app/packages/neon_talk/test/goldens/room_page_error.png diff --git a/packages/neon/neon_talk/test/goldens/room_page_messages.png b/packages/app/packages/neon_talk/test/goldens/room_page_messages.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/room_page_messages.png rename to packages/app/packages/neon_talk/test/goldens/room_page_messages.png diff --git a/packages/neon/neon_talk/test/goldens/room_page_read_only.png b/packages/app/packages/neon_talk/test/goldens/room_page_read_only.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/room_page_read_only.png rename to packages/app/packages/neon_talk/test/goldens/room_page_read_only.png diff --git a/packages/neon/neon_talk/test/goldens/unread_indicator_unread_mention.png b/packages/app/packages/neon_talk/test/goldens/unread_indicator_unread_mention.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/unread_indicator_unread_mention.png rename to packages/app/packages/neon_talk/test/goldens/unread_indicator_unread_mention.png diff --git a/packages/neon/neon_talk/test/goldens/unread_indicator_unread_mention_direct.png b/packages/app/packages/neon_talk/test/goldens/unread_indicator_unread_mention_direct.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/unread_indicator_unread_mention_direct.png rename to packages/app/packages/neon_talk/test/goldens/unread_indicator_unread_mention_direct.png diff --git a/packages/neon/neon_talk/test/goldens/unread_indicator_unread_messages.png b/packages/app/packages/neon_talk/test/goldens/unread_indicator_unread_messages.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/unread_indicator_unread_messages.png rename to packages/app/packages/neon_talk/test/goldens/unread_indicator_unread_messages.png diff --git a/packages/neon/neon_talk/test/goldens/unread_indicator_unread_single_user_messages.png b/packages/app/packages/neon_talk/test/goldens/unread_indicator_unread_single_user_messages.png similarity index 100% rename from packages/neon/neon_talk/test/goldens/unread_indicator_unread_single_user_messages.png rename to packages/app/packages/neon_talk/test/goldens/unread_indicator_unread_single_user_messages.png diff --git a/packages/neon/neon_talk/test/main_page_test.dart b/packages/app/packages/neon_talk/test/main_page_test.dart similarity index 100% rename from packages/neon/neon_talk/test/main_page_test.dart rename to packages/app/packages/neon_talk/test/main_page_test.dart diff --git a/packages/neon/neon_talk/test/message_bloc_test.dart b/packages/app/packages/neon_talk/test/message_bloc_test.dart similarity index 100% rename from packages/neon/neon_talk/test/message_bloc_test.dart rename to packages/app/packages/neon_talk/test/message_bloc_test.dart diff --git a/packages/neon/neon_talk/test/message_input_test.dart b/packages/app/packages/neon_talk/test/message_input_test.dart similarity index 100% rename from packages/neon/neon_talk/test/message_input_test.dart rename to packages/app/packages/neon_talk/test/message_input_test.dart diff --git a/packages/neon/neon_talk/test/message_test.dart b/packages/app/packages/neon_talk/test/message_test.dart similarity index 100% rename from packages/neon/neon_talk/test/message_test.dart rename to packages/app/packages/neon_talk/test/message_test.dart diff --git a/packages/neon/neon_talk/test/reactions_test.dart b/packages/app/packages/neon_talk/test/reactions_test.dart similarity index 100% rename from packages/neon/neon_talk/test/reactions_test.dart rename to packages/app/packages/neon_talk/test/reactions_test.dart diff --git a/packages/neon/neon_talk/test/read_indicator_test.dart b/packages/app/packages/neon_talk/test/read_indicator_test.dart similarity index 100% rename from packages/neon/neon_talk/test/read_indicator_test.dart rename to packages/app/packages/neon_talk/test/read_indicator_test.dart diff --git a/packages/neon/neon_talk/test/reference_preview_test.dart b/packages/app/packages/neon_talk/test/reference_preview_test.dart similarity index 100% rename from packages/neon/neon_talk/test/reference_preview_test.dart rename to packages/app/packages/neon_talk/test/reference_preview_test.dart diff --git a/packages/neon/neon_talk/test/rich_object_test.dart b/packages/app/packages/neon_talk/test/rich_object_test.dart similarity index 100% rename from packages/neon/neon_talk/test/rich_object_test.dart rename to packages/app/packages/neon_talk/test/rich_object_test.dart diff --git a/packages/neon/neon_talk/test/room_avatar_test.dart b/packages/app/packages/neon_talk/test/room_avatar_test.dart similarity index 100% rename from packages/neon/neon_talk/test/room_avatar_test.dart rename to packages/app/packages/neon_talk/test/room_avatar_test.dart diff --git a/packages/neon/neon_talk/test/room_bloc_test.dart b/packages/app/packages/neon_talk/test/room_bloc_test.dart similarity index 100% rename from packages/neon/neon_talk/test/room_bloc_test.dart rename to packages/app/packages/neon_talk/test/room_bloc_test.dart diff --git a/packages/neon/neon_talk/test/room_page_test.dart b/packages/app/packages/neon_talk/test/room_page_test.dart similarity index 100% rename from packages/neon/neon_talk/test/room_page_test.dart rename to packages/app/packages/neon_talk/test/room_page_test.dart diff --git a/packages/neon/neon_talk/test/testing.dart b/packages/app/packages/neon_talk/test/testing.dart similarity index 100% rename from packages/neon/neon_talk/test/testing.dart rename to packages/app/packages/neon_talk/test/testing.dart diff --git a/packages/neon/neon_talk/test/unread_indicator_test.dart b/packages/app/packages/neon_talk/test/unread_indicator_test.dart similarity index 100% rename from packages/neon/neon_talk/test/unread_indicator_test.dart rename to packages/app/packages/neon_talk/test/unread_indicator_test.dart diff --git a/packages/app/pubspec.lock b/packages/app/pubspec.lock index b71e14e8de2..07e1e82511f 100644 --- a/packages/app/pubspec.lock +++ b/packages/app/pubspec.lock @@ -354,7 +354,7 @@ packages: file_icons: dependency: "direct overridden" description: - path: "../file_icons" + path: "../neon_framework/packages/file_icons" relative: true source: path version: "1.0.0" @@ -829,14 +829,14 @@ packages: neon_dashboard: dependency: "direct main" description: - path: "../neon/neon_dashboard" + path: "packages/neon_dashboard" relative: true source: path version: "1.0.0" neon_files: dependency: "direct main" description: - path: "../neon/neon_files" + path: "packages/neon_files" relative: true source: path version: "1.0.0" @@ -850,7 +850,7 @@ packages: neon_http_client: dependency: "direct overridden" description: - path: "../neon_http_client" + path: "../neon_framework/packages/neon_http_client" relative: true source: path version: "0.1.0" @@ -864,28 +864,28 @@ packages: neon_news: dependency: "direct main" description: - path: "../neon/neon_news" + path: "packages/neon_news" relative: true source: path version: "1.0.0" neon_notes: dependency: "direct main" description: - path: "../neon/neon_notes" + path: "packages/neon_notes" relative: true source: path version: "1.0.0" neon_notifications: dependency: "direct main" description: - path: "../neon/neon_notifications" + path: "packages/neon_notifications" relative: true source: path version: "1.0.0" neon_talk: dependency: "direct main" description: - path: "../neon/neon_talk" + path: "packages/neon_talk" relative: true source: path version: "1.0.0" @@ -1304,7 +1304,7 @@ packages: sort_box: dependency: "direct overridden" description: - path: "../sort_box" + path: "../neon_framework/packages/sort_box" relative: true source: path version: "1.0.0" diff --git a/packages/app/pubspec.yaml b/packages/app/pubspec.yaml index b1daf40473d..8d483dcf804 100644 --- a/packages/app/pubspec.yaml +++ b/packages/app/pubspec.yaml @@ -13,11 +13,11 @@ dependencies: neon_dashboard: git: url: https://github.com/nextcloud/neon - path: packages/neon/neon_dashboard + path: packages/apps/packages/neon_dashboard neon_files: git: url: https://github.com/nextcloud/neon - path: packages/neon/neon_files + path: packages/apps/packages/neon_files neon_framework: git: url: https://github.com/nextcloud/neon @@ -25,19 +25,19 @@ dependencies: neon_news: git: url: https://github.com/nextcloud/neon - path: packages/neon/neon_news + path: packages/apps/packages/neon_news neon_notes: git: url: https://github.com/nextcloud/neon - path: packages/neon/neon_notes + path: packages/apps/packages/neon_notes neon_notifications: git: url: https://github.com/nextcloud/neon - path: packages/neon/neon_notifications + path: packages/apps/packages/neon_notifications neon_talk: git: url: https://github.com/nextcloud/neon - path: packages/neon/neon_talk + path: packages/apps/packages/neon_talk vector_graphics: any dev_dependencies: diff --git a/packages/app/pubspec_overrides.yaml b/packages/app/pubspec_overrides.yaml index 9347f3aa30b..b34e227c0b8 100644 --- a/packages/app/pubspec_overrides.yaml +++ b/packages/app/pubspec_overrides.yaml @@ -5,26 +5,26 @@ dependency_overrides: dynamite_runtime: path: ../dynamite/dynamite_runtime file_icons: - path: ../file_icons + path: ../neon_framework/packages/file_icons neon_dashboard: - path: ../neon/neon_dashboard + path: packages/neon_dashboard neon_files: - path: ../neon/neon_files + path: packages/neon_files neon_framework: path: ../neon_framework neon_http_client: - path: ../neon_http_client + path: ../neon_framework/packages/neon_http_client neon_lints: path: ../neon_lints neon_news: - path: ../neon/neon_news + path: packages/neon_news neon_notes: - path: ../neon/neon_notes + path: packages/neon_notes neon_notifications: - path: ../neon/neon_notifications + path: packages/neon_notifications neon_talk: - path: ../neon/neon_talk + path: packages/neon_talk nextcloud: path: ../nextcloud sort_box: - path: ../sort_box + path: ../neon_framework/packages/sort_box diff --git a/packages/file_icons/LICENSE b/packages/file_icons/LICENSE deleted file mode 120000 index af8c58b151a..00000000000 --- a/packages/file_icons/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../assets/AGPL-3.0.txt \ No newline at end of file diff --git a/packages/neon/neon_dashboard/LICENSE b/packages/neon/neon_dashboard/LICENSE deleted file mode 120000 index c50ad9ade80..00000000000 --- a/packages/neon/neon_dashboard/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../../assets/AGPL-3.0.txt \ No newline at end of file diff --git a/packages/neon/neon_dashboard/pubspec_overrides.yaml b/packages/neon/neon_dashboard/pubspec_overrides.yaml deleted file mode 100644 index b02d61254c9..00000000000 --- a/packages/neon/neon_dashboard/pubspec_overrides.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# melos_managed_dependency_overrides: cookie_store,dynamite_runtime,neon_framework,neon_http_client,neon_lints,nextcloud,sort_box -dependency_overrides: - cookie_store: - path: ../../cookie_store - dynamite_runtime: - path: ../../dynamite/dynamite_runtime - neon_framework: - path: ../../neon_framework - neon_http_client: - path: ../../neon_http_client - neon_lints: - path: ../../neon_lints - nextcloud: - path: ../../nextcloud - sort_box: - path: ../../sort_box diff --git a/packages/neon/neon_files/LICENSE b/packages/neon/neon_files/LICENSE deleted file mode 120000 index c50ad9ade80..00000000000 --- a/packages/neon/neon_files/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../../assets/AGPL-3.0.txt \ No newline at end of file diff --git a/packages/neon/neon_files/pubspec_overrides.yaml b/packages/neon/neon_files/pubspec_overrides.yaml deleted file mode 100644 index 445ed2d3271..00000000000 --- a/packages/neon/neon_files/pubspec_overrides.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# melos_managed_dependency_overrides: cookie_store,dynamite_runtime,file_icons,neon_framework,neon_http_client,neon_lints,nextcloud,sort_box -dependency_overrides: - cookie_store: - path: ../../cookie_store - dynamite_runtime: - path: ../../dynamite/dynamite_runtime - file_icons: - path: ../../file_icons - neon_framework: - path: ../../neon_framework - neon_http_client: - path: ../../neon_http_client - neon_lints: - path: ../../neon_lints - nextcloud: - path: ../../nextcloud - sort_box: - path: ../../sort_box diff --git a/packages/neon/neon_news/LICENSE b/packages/neon/neon_news/LICENSE deleted file mode 120000 index c50ad9ade80..00000000000 --- a/packages/neon/neon_news/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../../assets/AGPL-3.0.txt \ No newline at end of file diff --git a/packages/neon/neon_news/pubspec_overrides.yaml b/packages/neon/neon_news/pubspec_overrides.yaml deleted file mode 100644 index b02d61254c9..00000000000 --- a/packages/neon/neon_news/pubspec_overrides.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# melos_managed_dependency_overrides: cookie_store,dynamite_runtime,neon_framework,neon_http_client,neon_lints,nextcloud,sort_box -dependency_overrides: - cookie_store: - path: ../../cookie_store - dynamite_runtime: - path: ../../dynamite/dynamite_runtime - neon_framework: - path: ../../neon_framework - neon_http_client: - path: ../../neon_http_client - neon_lints: - path: ../../neon_lints - nextcloud: - path: ../../nextcloud - sort_box: - path: ../../sort_box diff --git a/packages/neon/neon_notes/LICENSE b/packages/neon/neon_notes/LICENSE deleted file mode 120000 index c50ad9ade80..00000000000 --- a/packages/neon/neon_notes/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../../assets/AGPL-3.0.txt \ No newline at end of file diff --git a/packages/neon/neon_notes/pubspec_overrides.yaml b/packages/neon/neon_notes/pubspec_overrides.yaml deleted file mode 100644 index b02d61254c9..00000000000 --- a/packages/neon/neon_notes/pubspec_overrides.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# melos_managed_dependency_overrides: cookie_store,dynamite_runtime,neon_framework,neon_http_client,neon_lints,nextcloud,sort_box -dependency_overrides: - cookie_store: - path: ../../cookie_store - dynamite_runtime: - path: ../../dynamite/dynamite_runtime - neon_framework: - path: ../../neon_framework - neon_http_client: - path: ../../neon_http_client - neon_lints: - path: ../../neon_lints - nextcloud: - path: ../../nextcloud - sort_box: - path: ../../sort_box diff --git a/packages/neon/neon_notifications/LICENSE b/packages/neon/neon_notifications/LICENSE deleted file mode 120000 index c50ad9ade80..00000000000 --- a/packages/neon/neon_notifications/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../../assets/AGPL-3.0.txt \ No newline at end of file diff --git a/packages/neon/neon_notifications/pubspec_overrides.yaml b/packages/neon/neon_notifications/pubspec_overrides.yaml deleted file mode 100644 index b02d61254c9..00000000000 --- a/packages/neon/neon_notifications/pubspec_overrides.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# melos_managed_dependency_overrides: cookie_store,dynamite_runtime,neon_framework,neon_http_client,neon_lints,nextcloud,sort_box -dependency_overrides: - cookie_store: - path: ../../cookie_store - dynamite_runtime: - path: ../../dynamite/dynamite_runtime - neon_framework: - path: ../../neon_framework - neon_http_client: - path: ../../neon_http_client - neon_lints: - path: ../../neon_lints - nextcloud: - path: ../../nextcloud - sort_box: - path: ../../sort_box diff --git a/packages/neon/neon_talk/LICENSE b/packages/neon/neon_talk/LICENSE deleted file mode 120000 index c50ad9ade80..00000000000 --- a/packages/neon/neon_talk/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../../assets/AGPL-3.0.txt \ No newline at end of file diff --git a/packages/neon/neon_talk/pubspec_overrides.yaml b/packages/neon/neon_talk/pubspec_overrides.yaml deleted file mode 100644 index 31ba5fa6de8..00000000000 --- a/packages/neon/neon_talk/pubspec_overrides.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# melos_managed_dependency_overrides: neon_http_client -dependency_overrides: - cookie_store: - path: ../../cookie_store - dynamite_runtime: - path: ../../dynamite/dynamite_runtime - file_icons: - path: ../../file_icons - neon_framework: - path: ../../neon_framework - neon_http_client: - path: ../../neon_http_client - neon_lints: - path: ../../neon_lints - nextcloud: - path: ../../nextcloud - sort_box: - path: ../../sort_box diff --git a/packages/neon/neon_talk/.metadata b/packages/neon_framework/packages/file_icons/.metadata similarity index 100% rename from packages/neon/neon_talk/.metadata rename to packages/neon_framework/packages/file_icons/.metadata diff --git a/packages/neon_framework/packages/file_icons/LICENSE b/packages/neon_framework/packages/file_icons/LICENSE new file mode 120000 index 00000000000..f0b83dad961 --- /dev/null +++ b/packages/neon_framework/packages/file_icons/LICENSE @@ -0,0 +1 @@ +../../../../assets/AGPL-3.0.txt \ No newline at end of file diff --git a/packages/file_icons/README.md b/packages/neon_framework/packages/file_icons/README.md similarity index 100% rename from packages/file_icons/README.md rename to packages/neon_framework/packages/file_icons/README.md diff --git a/packages/file_icons/analysis_options.yaml b/packages/neon_framework/packages/file_icons/analysis_options.yaml similarity index 61% rename from packages/file_icons/analysis_options.yaml rename to packages/neon_framework/packages/file_icons/analysis_options.yaml index f2cddfc2d75..64c023b8daf 100644 --- a/packages/file_icons/analysis_options.yaml +++ b/packages/neon_framework/packages/file_icons/analysis_options.yaml @@ -3,3 +3,7 @@ include: package:neon_lints/dart.yaml linter: rules: avoid_print: false + +custom_lint: + rules: + - avoid_dart_io: false diff --git a/packages/file_icons/assets/seti.ttf b/packages/neon_framework/packages/file_icons/assets/seti.ttf similarity index 100% rename from packages/file_icons/assets/seti.ttf rename to packages/neon_framework/packages/file_icons/assets/seti.ttf diff --git a/packages/file_icons/bin/file_icons.dart b/packages/neon_framework/packages/file_icons/bin/file_icons.dart similarity index 100% rename from packages/file_icons/bin/file_icons.dart rename to packages/neon_framework/packages/file_icons/bin/file_icons.dart diff --git a/packages/file_icons/lib/file_icons.dart b/packages/neon_framework/packages/file_icons/lib/file_icons.dart similarity index 100% rename from packages/file_icons/lib/file_icons.dart rename to packages/neon_framework/packages/file_icons/lib/file_icons.dart diff --git a/packages/file_icons/lib/src/data.dart b/packages/neon_framework/packages/file_icons/lib/src/data.dart similarity index 100% rename from packages/file_icons/lib/src/data.dart rename to packages/neon_framework/packages/file_icons/lib/src/data.dart diff --git a/packages/file_icons/lib/src/meta.dart b/packages/neon_framework/packages/file_icons/lib/src/meta.dart similarity index 100% rename from packages/file_icons/lib/src/meta.dart rename to packages/neon_framework/packages/file_icons/lib/src/meta.dart diff --git a/packages/file_icons/pubspec.yaml b/packages/neon_framework/packages/file_icons/pubspec.yaml similarity index 100% rename from packages/file_icons/pubspec.yaml rename to packages/neon_framework/packages/file_icons/pubspec.yaml diff --git a/packages/sort_box/pubspec_overrides.yaml b/packages/neon_framework/packages/file_icons/pubspec_overrides.yaml similarity index 73% rename from packages/sort_box/pubspec_overrides.yaml rename to packages/neon_framework/packages/file_icons/pubspec_overrides.yaml index 4abc9fdcbad..0e5d8123538 100644 --- a/packages/sort_box/pubspec_overrides.yaml +++ b/packages/neon_framework/packages/file_icons/pubspec_overrides.yaml @@ -1,4 +1,4 @@ # melos_managed_dependency_overrides: neon_lints dependency_overrides: neon_lints: - path: ../neon_lints + path: ../../../neon_lints diff --git a/packages/neon_framework/packages/neon_http_client/LICENSE b/packages/neon_framework/packages/neon_http_client/LICENSE new file mode 120000 index 00000000000..f0b83dad961 --- /dev/null +++ b/packages/neon_framework/packages/neon_http_client/LICENSE @@ -0,0 +1 @@ +../../../../assets/AGPL-3.0.txt \ No newline at end of file diff --git a/packages/neon_framework/packages/neon_http_client/analysis_options.yaml b/packages/neon_framework/packages/neon_http_client/analysis_options.yaml new file mode 100644 index 00000000000..f0a42286945 --- /dev/null +++ b/packages/neon_framework/packages/neon_http_client/analysis_options.yaml @@ -0,0 +1,6 @@ +include: package:neon_lints/dart.yaml + +custom_lint: + rules: + - avoid_exports: false + - avoid_dart_io: false diff --git a/packages/neon_http_client/dart_test.yaml b/packages/neon_framework/packages/neon_http_client/dart_test.yaml similarity index 100% rename from packages/neon_http_client/dart_test.yaml rename to packages/neon_framework/packages/neon_http_client/dart_test.yaml diff --git a/packages/neon_http_client/lib/neon_http_client.dart b/packages/neon_framework/packages/neon_http_client/lib/neon_http_client.dart similarity index 100% rename from packages/neon_http_client/lib/neon_http_client.dart rename to packages/neon_framework/packages/neon_http_client/lib/neon_http_client.dart diff --git a/packages/neon_http_client/lib/src/interceptors/base_header_interceptor.dart b/packages/neon_framework/packages/neon_http_client/lib/src/interceptors/base_header_interceptor.dart similarity index 100% rename from packages/neon_http_client/lib/src/interceptors/base_header_interceptor.dart rename to packages/neon_framework/packages/neon_http_client/lib/src/interceptors/base_header_interceptor.dart diff --git a/packages/neon_http_client/lib/src/interceptors/cookie_interceptor.dart b/packages/neon_framework/packages/neon_http_client/lib/src/interceptors/cookie_interceptor.dart similarity index 100% rename from packages/neon_http_client/lib/src/interceptors/cookie_interceptor.dart rename to packages/neon_framework/packages/neon_http_client/lib/src/interceptors/cookie_interceptor.dart diff --git a/packages/neon_http_client/lib/src/interceptors/csrf_interceptor.dart b/packages/neon_framework/packages/neon_http_client/lib/src/interceptors/csrf_interceptor.dart similarity index 100% rename from packages/neon_http_client/lib/src/interceptors/csrf_interceptor.dart rename to packages/neon_framework/packages/neon_http_client/lib/src/interceptors/csrf_interceptor.dart diff --git a/packages/neon_http_client/lib/src/interceptors/http_interceptor.dart b/packages/neon_framework/packages/neon_http_client/lib/src/interceptors/http_interceptor.dart similarity index 100% rename from packages/neon_http_client/lib/src/interceptors/http_interceptor.dart rename to packages/neon_framework/packages/neon_http_client/lib/src/interceptors/http_interceptor.dart diff --git a/packages/neon_http_client/lib/src/interceptors/interceptors.dart b/packages/neon_framework/packages/neon_http_client/lib/src/interceptors/interceptors.dart similarity index 100% rename from packages/neon_http_client/lib/src/interceptors/interceptors.dart rename to packages/neon_framework/packages/neon_http_client/lib/src/interceptors/interceptors.dart diff --git a/packages/neon_http_client/lib/src/neon_http_client.dart b/packages/neon_framework/packages/neon_http_client/lib/src/neon_http_client.dart similarity index 100% rename from packages/neon_http_client/lib/src/neon_http_client.dart rename to packages/neon_framework/packages/neon_http_client/lib/src/neon_http_client.dart diff --git a/packages/neon_http_client/lib/src/utils/defaults.dart b/packages/neon_framework/packages/neon_http_client/lib/src/utils/defaults.dart similarity index 100% rename from packages/neon_http_client/lib/src/utils/defaults.dart rename to packages/neon_framework/packages/neon_http_client/lib/src/utils/defaults.dart diff --git a/packages/neon_http_client/lib/src/utils/future_timeout.dart b/packages/neon_framework/packages/neon_http_client/lib/src/utils/future_timeout.dart similarity index 100% rename from packages/neon_http_client/lib/src/utils/future_timeout.dart rename to packages/neon_framework/packages/neon_http_client/lib/src/utils/future_timeout.dart diff --git a/packages/neon_http_client/lib/src/utils/utils.dart b/packages/neon_framework/packages/neon_http_client/lib/src/utils/utils.dart similarity index 100% rename from packages/neon_http_client/lib/src/utils/utils.dart rename to packages/neon_framework/packages/neon_http_client/lib/src/utils/utils.dart diff --git a/packages/neon_http_client/pubspec.yaml b/packages/neon_framework/packages/neon_http_client/pubspec.yaml similarity index 100% rename from packages/neon_http_client/pubspec.yaml rename to packages/neon_framework/packages/neon_http_client/pubspec.yaml diff --git a/packages/neon_http_client/pubspec_overrides.yaml b/packages/neon_framework/packages/neon_http_client/pubspec_overrides.yaml similarity index 56% rename from packages/neon_http_client/pubspec_overrides.yaml rename to packages/neon_framework/packages/neon_http_client/pubspec_overrides.yaml index e81861f7072..e6459a32bf1 100644 --- a/packages/neon_http_client/pubspec_overrides.yaml +++ b/packages/neon_framework/packages/neon_http_client/pubspec_overrides.yaml @@ -1,10 +1,10 @@ # melos_managed_dependency_overrides: cookie_store,dynamite_runtime,neon_lints,nextcloud dependency_overrides: cookie_store: - path: ../cookie_store + path: ../../../cookie_store dynamite_runtime: - path: ../dynamite/dynamite_runtime + path: ../../../dynamite/dynamite_runtime neon_lints: - path: ../neon_lints + path: ../../../neon_lints nextcloud: - path: ../nextcloud + path: ../../../nextcloud diff --git a/packages/neon_http_client/test/client_conformance_test.dart b/packages/neon_framework/packages/neon_http_client/test/client_conformance_test.dart similarity index 100% rename from packages/neon_http_client/test/client_conformance_test.dart rename to packages/neon_framework/packages/neon_http_client/test/client_conformance_test.dart diff --git a/packages/neon_http_client/test/interceptors/base_header_interceptor_test.dart b/packages/neon_framework/packages/neon_http_client/test/interceptors/base_header_interceptor_test.dart similarity index 100% rename from packages/neon_http_client/test/interceptors/base_header_interceptor_test.dart rename to packages/neon_framework/packages/neon_http_client/test/interceptors/base_header_interceptor_test.dart diff --git a/packages/neon_http_client/test/interceptors/cookie_interceptor_test.dart b/packages/neon_framework/packages/neon_http_client/test/interceptors/cookie_interceptor_test.dart similarity index 100% rename from packages/neon_http_client/test/interceptors/cookie_interceptor_test.dart rename to packages/neon_framework/packages/neon_http_client/test/interceptors/cookie_interceptor_test.dart diff --git a/packages/neon_http_client/test/interceptors/csrf_interceptor_test.dart b/packages/neon_framework/packages/neon_http_client/test/interceptors/csrf_interceptor_test.dart similarity index 100% rename from packages/neon_http_client/test/interceptors/csrf_interceptor_test.dart rename to packages/neon_framework/packages/neon_http_client/test/interceptors/csrf_interceptor_test.dart diff --git a/packages/neon_http_client/test/interceptors/http_interceptor_test.dart b/packages/neon_framework/packages/neon_http_client/test/interceptors/http_interceptor_test.dart similarity index 100% rename from packages/neon_http_client/test/interceptors/http_interceptor_test.dart rename to packages/neon_framework/packages/neon_http_client/test/interceptors/http_interceptor_test.dart diff --git a/packages/neon_http_client/test/neon_http_client_test.dart b/packages/neon_framework/packages/neon_http_client/test/neon_http_client_test.dart similarity index 100% rename from packages/neon_http_client/test/neon_http_client_test.dart rename to packages/neon_framework/packages/neon_http_client/test/neon_http_client_test.dart diff --git a/packages/neon_http_client/test/utils/future_timeout_test.dart b/packages/neon_framework/packages/neon_http_client/test/utils/future_timeout_test.dart similarity index 100% rename from packages/neon_http_client/test/utils/future_timeout_test.dart rename to packages/neon_framework/packages/neon_http_client/test/utils/future_timeout_test.dart diff --git a/packages/neon_framework/packages/sort_box/LICENSE b/packages/neon_framework/packages/sort_box/LICENSE new file mode 120000 index 00000000000..0fef81c998a --- /dev/null +++ b/packages/neon_framework/packages/sort_box/LICENSE @@ -0,0 +1 @@ +../../../../assets/BSD-3-Clause.txt \ No newline at end of file diff --git a/packages/sort_box/README.md b/packages/neon_framework/packages/sort_box/README.md similarity index 100% rename from packages/sort_box/README.md rename to packages/neon_framework/packages/sort_box/README.md diff --git a/packages/neon_framework/packages/sort_box/analysis_options.yaml b/packages/neon_framework/packages/sort_box/analysis_options.yaml new file mode 100644 index 00000000000..bff1b129f3c --- /dev/null +++ b/packages/neon_framework/packages/sort_box/analysis_options.yaml @@ -0,0 +1,5 @@ +include: package:neon_lints/dart.yaml + +custom_lint: + rules: + - avoid_exports: false diff --git a/packages/sort_box/lib/sort_box.dart b/packages/neon_framework/packages/sort_box/lib/sort_box.dart similarity index 100% rename from packages/sort_box/lib/sort_box.dart rename to packages/neon_framework/packages/sort_box/lib/sort_box.dart diff --git a/packages/sort_box/lib/src/sort_box.dart b/packages/neon_framework/packages/sort_box/lib/src/sort_box.dart similarity index 100% rename from packages/sort_box/lib/src/sort_box.dart rename to packages/neon_framework/packages/sort_box/lib/src/sort_box.dart diff --git a/packages/sort_box/pubspec.yaml b/packages/neon_framework/packages/sort_box/pubspec.yaml similarity index 100% rename from packages/sort_box/pubspec.yaml rename to packages/neon_framework/packages/sort_box/pubspec.yaml diff --git a/packages/file_icons/pubspec_overrides.yaml b/packages/neon_framework/packages/sort_box/pubspec_overrides.yaml similarity index 73% rename from packages/file_icons/pubspec_overrides.yaml rename to packages/neon_framework/packages/sort_box/pubspec_overrides.yaml index 4abc9fdcbad..0e5d8123538 100644 --- a/packages/file_icons/pubspec_overrides.yaml +++ b/packages/neon_framework/packages/sort_box/pubspec_overrides.yaml @@ -1,4 +1,4 @@ # melos_managed_dependency_overrides: neon_lints dependency_overrides: neon_lints: - path: ../neon_lints + path: ../../../neon_lints diff --git a/packages/sort_box/test/sort_box_test.dart b/packages/neon_framework/packages/sort_box/test/sort_box_test.dart similarity index 100% rename from packages/sort_box/test/sort_box_test.dart rename to packages/neon_framework/packages/sort_box/test/sort_box_test.dart diff --git a/packages/neon_framework/pubspec.yaml b/packages/neon_framework/pubspec.yaml index 6e90449f13f..f49a73e907b 100644 --- a/packages/neon_framework/pubspec.yaml +++ b/packages/neon_framework/pubspec.yaml @@ -42,7 +42,7 @@ dependencies: neon_http_client: git: url: https://github.com/nextcloud/neon - path: packages/neon_http_client + path: packages/neon_framework/packages/neon_http_client nextcloud: ^6.1.0 package_info_plus: ^8.0.0 path: ^1.0.0 @@ -56,7 +56,7 @@ dependencies: sort_box: git: url: https://github.com/nextcloud/neon - path: packages/sort_box + path: packages/neon_framework/packages/sort_box sqflite: ^2.3.0 sqflite_common_ffi: ^2.3.2 sqflite_common_ffi_web: ^0.4.2+3 diff --git a/packages/neon_framework/pubspec_overrides.yaml b/packages/neon_framework/pubspec_overrides.yaml index e6bedf91e5d..a3c7901d70f 100644 --- a/packages/neon_framework/pubspec_overrides.yaml +++ b/packages/neon_framework/pubspec_overrides.yaml @@ -7,10 +7,10 @@ dependency_overrides: dynamite_runtime: path: ../dynamite/dynamite_runtime neon_http_client: - path: ../neon_http_client + path: packages/neon_http_client neon_lints: path: ../neon_lints nextcloud: path: ../nextcloud sort_box: - path: ../sort_box + path: packages/sort_box diff --git a/packages/neon_http_client/LICENSE b/packages/neon_http_client/LICENSE deleted file mode 120000 index af8c58b151a..00000000000 --- a/packages/neon_http_client/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../assets/AGPL-3.0.txt \ No newline at end of file diff --git a/packages/nextcloud/packages/nextcloud_test/LICENSE b/packages/nextcloud/packages/nextcloud_test/LICENSE new file mode 120000 index 00000000000..f0b83dad961 --- /dev/null +++ b/packages/nextcloud/packages/nextcloud_test/LICENSE @@ -0,0 +1 @@ +../../../../assets/AGPL-3.0.txt \ No newline at end of file diff --git a/packages/nextcloud_test/README.md b/packages/nextcloud/packages/nextcloud_test/README.md similarity index 100% rename from packages/nextcloud_test/README.md rename to packages/nextcloud/packages/nextcloud_test/README.md diff --git a/packages/neon_http_client/analysis_options.yaml b/packages/nextcloud/packages/nextcloud_test/analysis_options.yaml similarity index 100% rename from packages/neon_http_client/analysis_options.yaml rename to packages/nextcloud/packages/nextcloud_test/analysis_options.yaml diff --git a/packages/nextcloud_test/bin/generate_presets.dart b/packages/nextcloud/packages/nextcloud_test/bin/generate_presets.dart similarity index 100% rename from packages/nextcloud_test/bin/generate_presets.dart rename to packages/nextcloud/packages/nextcloud_test/bin/generate_presets.dart diff --git a/packages/nextcloud_test/docker/Dockerfile b/packages/nextcloud/packages/nextcloud_test/docker/Dockerfile similarity index 100% rename from packages/nextcloud_test/docker/Dockerfile rename to packages/nextcloud/packages/nextcloud_test/docker/Dockerfile diff --git a/packages/nextcloud_test/docker/assets/Recipes/Bauernbrot mit Sauerteig/recipe.json b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Bauernbrot mit Sauerteig/recipe.json similarity index 100% rename from packages/nextcloud_test/docker/assets/Recipes/Bauernbrot mit Sauerteig/recipe.json rename to packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Bauernbrot mit Sauerteig/recipe.json diff --git a/packages/nextcloud_test/docker/assets/Recipes/Blaubeer Cluster/recipe.json b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Blaubeer Cluster/recipe.json similarity index 100% rename from packages/nextcloud_test/docker/assets/Recipes/Blaubeer Cluster/recipe.json rename to packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Blaubeer Cluster/recipe.json diff --git a/packages/nextcloud_test/docker/assets/Recipes/Chantal's New York Cheesecake/recipe.json b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Chantal's New York Cheesecake/recipe.json similarity index 100% rename from packages/nextcloud_test/docker/assets/Recipes/Chantal's New York Cheesecake/recipe.json rename to packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Chantal's New York Cheesecake/recipe.json diff --git a/packages/nextcloud_test/docker/assets/Recipes/Chef John's Gazpacho/recipe.json b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Chef John's Gazpacho/recipe.json similarity index 100% rename from packages/nextcloud_test/docker/assets/Recipes/Chef John's Gazpacho/recipe.json rename to packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Chef John's Gazpacho/recipe.json diff --git a/packages/nextcloud_test/docker/assets/Recipes/Chili sin Carne mit Jackfruit/recipe.json b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Chili sin Carne mit Jackfruit/recipe.json similarity index 100% rename from packages/nextcloud_test/docker/assets/Recipes/Chili sin Carne mit Jackfruit/recipe.json rename to packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Chili sin Carne mit Jackfruit/recipe.json diff --git a/packages/nextcloud_test/docker/assets/Recipes/Easy Heart-Shaped Cake/recipe.json b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Easy Heart-Shaped Cake/recipe.json similarity index 100% rename from packages/nextcloud_test/docker/assets/Recipes/Easy Heart-Shaped Cake/recipe.json rename to packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Easy Heart-Shaped Cake/recipe.json diff --git "a/packages/nextcloud_test/docker/assets/Recipes/Fr\303\203\302\274hlingsfladen mit Rindfleisch/recipe.json" "b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Fr\303\203\302\274hlingsfladen mit Rindfleisch/recipe.json" similarity index 100% rename from "packages/nextcloud_test/docker/assets/Recipes/Fr\303\203\302\274hlingsfladen mit Rindfleisch/recipe.json" rename to "packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Fr\303\203\302\274hlingsfladen mit Rindfleisch/recipe.json" diff --git a/packages/nextcloud_test/docker/assets/Recipes/Gelber Smoothie/recipe.json b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Gelber Smoothie/recipe.json similarity index 100% rename from packages/nextcloud_test/docker/assets/Recipes/Gelber Smoothie/recipe.json rename to packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Gelber Smoothie/recipe.json diff --git a/packages/nextcloud_test/docker/assets/Recipes/Grandma's Sour Cream Pound Cake/recipe.json b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Grandma's Sour Cream Pound Cake/recipe.json similarity index 100% rename from packages/nextcloud_test/docker/assets/Recipes/Grandma's Sour Cream Pound Cake/recipe.json rename to packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Grandma's Sour Cream Pound Cake/recipe.json diff --git "a/packages/nextcloud_test/docker/assets/Recipes/Lachs auf Fr\303\203\302\274hlingssalat/recipe.json" "b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Lachs auf Fr\303\203\302\274hlingssalat/recipe.json" similarity index 100% rename from "packages/nextcloud_test/docker/assets/Recipes/Lachs auf Fr\303\203\302\274hlingssalat/recipe.json" rename to "packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Lachs auf Fr\303\203\302\274hlingssalat/recipe.json" diff --git a/packages/nextcloud_test/docker/assets/Recipes/Readme.md b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Readme.md similarity index 100% rename from packages/nextcloud_test/docker/assets/Recipes/Readme.md rename to packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Readme.md diff --git a/packages/nextcloud_test/docker/assets/Recipes/Recipe Without an image/recipe.json b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Recipe Without an image/recipe.json similarity index 100% rename from packages/nextcloud_test/docker/assets/Recipes/Recipe Without an image/recipe.json rename to packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Recipe Without an image/recipe.json diff --git a/packages/nextcloud_test/docker/assets/Recipes/Reines Roggenbrot aus Sauerteig/recipe.json b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Reines Roggenbrot aus Sauerteig/recipe.json similarity index 100% rename from packages/nextcloud_test/docker/assets/Recipes/Reines Roggenbrot aus Sauerteig/recipe.json rename to packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Reines Roggenbrot aus Sauerteig/recipe.json diff --git a/packages/nextcloud_test/docker/assets/Recipes/Restaurant-Style Zuppa Toscana/recipe.json b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Restaurant-Style Zuppa Toscana/recipe.json similarity index 100% rename from packages/nextcloud_test/docker/assets/Recipes/Restaurant-Style Zuppa Toscana/recipe.json rename to packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Restaurant-Style Zuppa Toscana/recipe.json diff --git "a/packages/nextcloud_test/docker/assets/Recipes/Sellerie-Rucola-Suppe mit Zitronen\303\203\302\266l/recipe.json" "b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Sellerie-Rucola-Suppe mit Zitronen\303\203\302\266l/recipe.json" similarity index 100% rename from "packages/nextcloud_test/docker/assets/Recipes/Sellerie-Rucola-Suppe mit Zitronen\303\203\302\266l/recipe.json" rename to "packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Sellerie-Rucola-Suppe mit Zitronen\303\203\302\266l/recipe.json" diff --git a/packages/nextcloud_test/docker/assets/Recipes/Sommerlicher Himbeerkuchen/recipe.json b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Sommerlicher Himbeerkuchen/recipe.json similarity index 100% rename from packages/nextcloud_test/docker/assets/Recipes/Sommerlicher Himbeerkuchen/recipe.json rename to packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Sommerlicher Himbeerkuchen/recipe.json diff --git a/packages/nextcloud_test/docker/assets/Recipes/Sweet and Spicy Baked Keto Chicken WingsNEW/recipe.json b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Sweet and Spicy Baked Keto Chicken WingsNEW/recipe.json similarity index 100% rename from packages/nextcloud_test/docker/assets/Recipes/Sweet and Spicy Baked Keto Chicken WingsNEW/recipe.json rename to packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Sweet and Spicy Baked Keto Chicken WingsNEW/recipe.json diff --git a/packages/nextcloud_test/docker/assets/Recipes/The Best Baked Ziti/recipe.json b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/The Best Baked Ziti/recipe.json similarity index 100% rename from packages/nextcloud_test/docker/assets/Recipes/The Best Baked Ziti/recipe.json rename to packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/The Best Baked Ziti/recipe.json diff --git a/packages/nextcloud_test/docker/assets/Recipes/Vegi-Tortillas/recipe.json b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Vegi-Tortillas/recipe.json similarity index 100% rename from packages/nextcloud_test/docker/assets/Recipes/Vegi-Tortillas/recipe.json rename to packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/Vegi-Tortillas/recipe.json diff --git a/packages/nextcloud_test/docker/assets/Recipes/problem/recipe.json b/packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/problem/recipe.json similarity index 100% rename from packages/nextcloud_test/docker/assets/Recipes/problem/recipe.json rename to packages/nextcloud/packages/nextcloud_test/docker/assets/Recipes/problem/recipe.json diff --git a/packages/nextcloud_test/docker/local.sh b/packages/nextcloud/packages/nextcloud_test/docker/local.sh similarity index 100% rename from packages/nextcloud_test/docker/local.sh rename to packages/nextcloud/packages/nextcloud_test/docker/local.sh diff --git a/packages/nextcloud_test/docker/post.sh b/packages/nextcloud/packages/nextcloud_test/docker/post.sh similarity index 100% rename from packages/nextcloud_test/docker/post.sh rename to packages/nextcloud/packages/nextcloud_test/docker/post.sh diff --git a/packages/nextcloud_test/docker/pre.sh b/packages/nextcloud/packages/nextcloud_test/docker/pre.sh similarity index 100% rename from packages/nextcloud_test/docker/pre.sh rename to packages/nextcloud/packages/nextcloud_test/docker/pre.sh diff --git a/packages/nextcloud_test/docker/presets/cookbook/0.11 b/packages/nextcloud/packages/nextcloud_test/docker/presets/cookbook/0.11 similarity index 100% rename from packages/nextcloud_test/docker/presets/cookbook/0.11 rename to packages/nextcloud/packages/nextcloud_test/docker/presets/cookbook/0.11 diff --git a/packages/nextcloud_test/docker/presets/drop_account/2.4 b/packages/nextcloud/packages/nextcloud_test/docker/presets/drop_account/2.4 similarity index 100% rename from packages/nextcloud_test/docker/presets/drop_account/2.4 rename to packages/nextcloud/packages/nextcloud_test/docker/presets/drop_account/2.4 diff --git a/packages/nextcloud_test/docker/presets/drop_account/2.5 b/packages/nextcloud/packages/nextcloud_test/docker/presets/drop_account/2.5 similarity index 100% rename from packages/nextcloud_test/docker/presets/drop_account/2.5 rename to packages/nextcloud/packages/nextcloud_test/docker/presets/drop_account/2.5 diff --git a/packages/nextcloud_test/docker/presets/latest b/packages/nextcloud/packages/nextcloud_test/docker/presets/latest similarity index 100% rename from packages/nextcloud_test/docker/presets/latest rename to packages/nextcloud/packages/nextcloud_test/docker/presets/latest diff --git a/packages/nextcloud_test/docker/presets/news/25.0 b/packages/nextcloud/packages/nextcloud_test/docker/presets/news/25.0 similarity index 100% rename from packages/nextcloud_test/docker/presets/news/25.0 rename to packages/nextcloud/packages/nextcloud_test/docker/presets/news/25.0 diff --git a/packages/nextcloud_test/docker/presets/notes/4.10 b/packages/nextcloud/packages/nextcloud_test/docker/presets/notes/4.10 similarity index 100% rename from packages/nextcloud_test/docker/presets/notes/4.10 rename to packages/nextcloud/packages/nextcloud_test/docker/presets/notes/4.10 diff --git a/packages/nextcloud_test/docker/presets/notes/4.8 b/packages/nextcloud/packages/nextcloud_test/docker/presets/notes/4.8 similarity index 100% rename from packages/nextcloud_test/docker/presets/notes/4.8 rename to packages/nextcloud/packages/nextcloud_test/docker/presets/notes/4.8 diff --git a/packages/nextcloud_test/docker/presets/notes/4.9 b/packages/nextcloud/packages/nextcloud_test/docker/presets/notes/4.9 similarity index 100% rename from packages/nextcloud_test/docker/presets/notes/4.9 rename to packages/nextcloud/packages/nextcloud_test/docker/presets/notes/4.9 diff --git a/packages/nextcloud_test/docker/presets/server/28.0 b/packages/nextcloud/packages/nextcloud_test/docker/presets/server/28.0 similarity index 100% rename from packages/nextcloud_test/docker/presets/server/28.0 rename to packages/nextcloud/packages/nextcloud_test/docker/presets/server/28.0 diff --git a/packages/nextcloud_test/docker/presets/server/29.0 b/packages/nextcloud/packages/nextcloud_test/docker/presets/server/29.0 similarity index 100% rename from packages/nextcloud_test/docker/presets/server/29.0 rename to packages/nextcloud/packages/nextcloud_test/docker/presets/server/29.0 diff --git a/packages/nextcloud_test/docker/presets/spreed/18.0 b/packages/nextcloud/packages/nextcloud_test/docker/presets/spreed/18.0 similarity index 100% rename from packages/nextcloud_test/docker/presets/spreed/18.0 rename to packages/nextcloud/packages/nextcloud_test/docker/presets/spreed/18.0 diff --git a/packages/nextcloud_test/docker/presets/spreed/19.0 b/packages/nextcloud/packages/nextcloud_test/docker/presets/spreed/19.0 similarity index 100% rename from packages/nextcloud_test/docker/presets/spreed/19.0 rename to packages/nextcloud/packages/nextcloud_test/docker/presets/spreed/19.0 diff --git a/packages/nextcloud_test/docker/presets/tables/0.6 b/packages/nextcloud/packages/nextcloud_test/docker/presets/tables/0.6 similarity index 100% rename from packages/nextcloud_test/docker/presets/tables/0.6 rename to packages/nextcloud/packages/nextcloud_test/docker/presets/tables/0.6 diff --git a/packages/nextcloud_test/docker/presets/tables/0.7 b/packages/nextcloud/packages/nextcloud_test/docker/presets/tables/0.7 similarity index 100% rename from packages/nextcloud_test/docker/presets/tables/0.7 rename to packages/nextcloud/packages/nextcloud_test/docker/presets/tables/0.7 diff --git a/packages/nextcloud_test/docker/presets/tables/0.8 b/packages/nextcloud/packages/nextcloud_test/docker/presets/tables/0.8 similarity index 100% rename from packages/nextcloud_test/docker/presets/tables/0.8 rename to packages/nextcloud/packages/nextcloud_test/docker/presets/tables/0.8 diff --git a/packages/nextcloud_test/docker/presets/uppush/1.4 b/packages/nextcloud/packages/nextcloud_test/docker/presets/uppush/1.4 similarity index 100% rename from packages/nextcloud_test/docker/presets/uppush/1.4 rename to packages/nextcloud/packages/nextcloud_test/docker/presets/uppush/1.4 diff --git a/packages/nextcloud_test/docker/static/nasa.xml b/packages/nextcloud/packages/nextcloud_test/docker/static/nasa.xml similarity index 100% rename from packages/nextcloud_test/docker/static/nasa.xml rename to packages/nextcloud/packages/nextcloud_test/docker/static/nasa.xml diff --git a/packages/nextcloud_test/docker/static/recipe.html b/packages/nextcloud/packages/nextcloud_test/docker/static/recipe.html similarity index 100% rename from packages/nextcloud_test/docker/static/recipe.html rename to packages/nextcloud/packages/nextcloud_test/docker/static/recipe.html diff --git a/packages/nextcloud_test/docker/static/wikipedia.xml b/packages/nextcloud/packages/nextcloud_test/docker/static/wikipedia.xml similarity index 100% rename from packages/nextcloud_test/docker/static/wikipedia.xml rename to packages/nextcloud/packages/nextcloud_test/docker/static/wikipedia.xml diff --git a/packages/nextcloud_test/lib/nextcloud_test.dart b/packages/nextcloud/packages/nextcloud_test/lib/nextcloud_test.dart similarity index 100% rename from packages/nextcloud_test/lib/nextcloud_test.dart rename to packages/nextcloud/packages/nextcloud_test/lib/nextcloud_test.dart diff --git a/packages/nextcloud_test/lib/src/app.dart b/packages/nextcloud/packages/nextcloud_test/lib/src/app.dart similarity index 100% rename from packages/nextcloud_test/lib/src/app.dart rename to packages/nextcloud/packages/nextcloud_test/lib/src/app.dart diff --git a/packages/nextcloud_test/lib/src/fixtures.dart b/packages/nextcloud/packages/nextcloud_test/lib/src/fixtures.dart similarity index 100% rename from packages/nextcloud_test/lib/src/fixtures.dart rename to packages/nextcloud/packages/nextcloud_test/lib/src/fixtures.dart diff --git a/packages/nextcloud_test/lib/src/models/models.dart b/packages/nextcloud/packages/nextcloud_test/lib/src/models/models.dart similarity index 100% rename from packages/nextcloud_test/lib/src/models/models.dart rename to packages/nextcloud/packages/nextcloud_test/lib/src/models/models.dart diff --git a/packages/nextcloud_test/lib/src/models/nextcloud_tester.dart b/packages/nextcloud/packages/nextcloud_test/lib/src/models/nextcloud_tester.dart similarity index 100% rename from packages/nextcloud_test/lib/src/models/nextcloud_tester.dart rename to packages/nextcloud/packages/nextcloud_test/lib/src/models/nextcloud_tester.dart diff --git a/packages/nextcloud_test/lib/src/models/preset.dart b/packages/nextcloud/packages/nextcloud_test/lib/src/models/preset.dart similarity index 100% rename from packages/nextcloud_test/lib/src/models/preset.dart rename to packages/nextcloud/packages/nextcloud_test/lib/src/models/preset.dart diff --git a/packages/nextcloud_test/lib/src/presets.dart b/packages/nextcloud/packages/nextcloud_test/lib/src/presets.dart similarity index 100% rename from packages/nextcloud_test/lib/src/presets.dart rename to packages/nextcloud/packages/nextcloud_test/lib/src/presets.dart diff --git a/packages/nextcloud_test/lib/src/proxy_http_client.dart b/packages/nextcloud/packages/nextcloud_test/lib/src/proxy_http_client.dart similarity index 100% rename from packages/nextcloud_test/lib/src/proxy_http_client.dart rename to packages/nextcloud/packages/nextcloud_test/lib/src/proxy_http_client.dart diff --git a/packages/nextcloud_test/lib/src/test_target/docker_container.dart b/packages/nextcloud/packages/nextcloud_test/lib/src/test_target/docker_container.dart similarity index 100% rename from packages/nextcloud_test/lib/src/test_target/docker_container.dart rename to packages/nextcloud/packages/nextcloud_test/lib/src/test_target/docker_container.dart diff --git a/packages/nextcloud_test/lib/src/test_target/local.dart b/packages/nextcloud/packages/nextcloud_test/lib/src/test_target/local.dart similarity index 100% rename from packages/nextcloud_test/lib/src/test_target/local.dart rename to packages/nextcloud/packages/nextcloud_test/lib/src/test_target/local.dart diff --git a/packages/nextcloud_test/lib/src/test_target/test_target.dart b/packages/nextcloud/packages/nextcloud_test/lib/src/test_target/test_target.dart similarity index 100% rename from packages/nextcloud_test/lib/src/test_target/test_target.dart rename to packages/nextcloud/packages/nextcloud_test/lib/src/test_target/test_target.dart diff --git a/packages/nextcloud_test/pubspec.yaml b/packages/nextcloud/packages/nextcloud_test/pubspec.yaml similarity index 90% rename from packages/nextcloud_test/pubspec.yaml rename to packages/nextcloud/packages/nextcloud_test/pubspec.yaml index 4f85fd63344..d799ef9d216 100644 --- a/packages/nextcloud_test/pubspec.yaml +++ b/packages/nextcloud/packages/nextcloud_test/pubspec.yaml @@ -17,7 +17,7 @@ dependencies: neon_http_client: git: url: https://github.com/nextcloud/neon - path: packages/neon_http_client + path: packages/neon_framework/packages/neon_http_client nextcloud: ^6.1.0 path: ^1.9.0 process_run: ^1.0.0+1 diff --git a/packages/nextcloud_test/pubspec_overrides.yaml b/packages/nextcloud/packages/nextcloud_test/pubspec_overrides.yaml similarity index 53% rename from packages/nextcloud_test/pubspec_overrides.yaml rename to packages/nextcloud/packages/nextcloud_test/pubspec_overrides.yaml index 68b6706a349..0b528b168f6 100644 --- a/packages/nextcloud_test/pubspec_overrides.yaml +++ b/packages/nextcloud/packages/nextcloud_test/pubspec_overrides.yaml @@ -1,12 +1,12 @@ # melos_managed_dependency_overrides: cookie_store,dynamite_runtime,neon_http_client,neon_lints,nextcloud dependency_overrides: cookie_store: - path: ../cookie_store + path: ../../../cookie_store dynamite_runtime: - path: ../dynamite/dynamite_runtime + path: ../../../dynamite/dynamite_runtime neon_http_client: - path: ../neon_http_client + path: ../../../neon_framework/packages/neon_http_client neon_lints: - path: ../neon_lints + path: ../../../neon_lints nextcloud: - path: ../nextcloud + path: ../.. diff --git a/packages/nextcloud/pubspec.yaml b/packages/nextcloud/pubspec.yaml index 57add334581..4804bc140f9 100644 --- a/packages/nextcloud/pubspec.yaml +++ b/packages/nextcloud/pubspec.yaml @@ -51,7 +51,7 @@ dev_dependencies: nextcloud_test: git: url: https://github.com/nextcloud/neon - path: packages/nextcloud_test + path: packages/nextcloud/packages/nextcloud_test path: ^1.9.0 process_run: ^1.1.0 test: ^1.25.8 diff --git a/packages/nextcloud/pubspec_overrides.yaml b/packages/nextcloud/pubspec_overrides.yaml index 51ae5ce9766..1e7ee435930 100644 --- a/packages/nextcloud/pubspec_overrides.yaml +++ b/packages/nextcloud/pubspec_overrides.yaml @@ -7,8 +7,8 @@ dependency_overrides: dynamite_runtime: path: ../dynamite/dynamite_runtime neon_http_client: - path: ../neon_http_client + path: ../neon_framework/packages/neon_http_client neon_lints: path: ../neon_lints nextcloud_test: - path: ../nextcloud_test + path: packages/nextcloud_test diff --git a/packages/nextcloud_test/LICENSE b/packages/nextcloud_test/LICENSE deleted file mode 120000 index af8c58b151a..00000000000 --- a/packages/nextcloud_test/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../assets/AGPL-3.0.txt \ No newline at end of file diff --git a/packages/nextcloud_test/analysis_options.yaml b/packages/nextcloud_test/analysis_options.yaml deleted file mode 100644 index 4db3c296b81..00000000000 --- a/packages/nextcloud_test/analysis_options.yaml +++ /dev/null @@ -1 +0,0 @@ -include: package:neon_lints/dart.yaml diff --git a/packages/sort_box/LICENSE b/packages/sort_box/LICENSE deleted file mode 120000 index dc0786b028f..00000000000 --- a/packages/sort_box/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../../assets/BSD-3-Clause.txt \ No newline at end of file diff --git a/packages/sort_box/analysis_options.yaml b/packages/sort_box/analysis_options.yaml deleted file mode 100644 index 4db3c296b81..00000000000 --- a/packages/sort_box/analysis_options.yaml +++ /dev/null @@ -1 +0,0 @@ -include: package:neon_lints/dart.yaml