chore: removed api env packages

Gambley1 · Aug 3, 2024 · 22e91a0 · 22e91a0
1 parent 28bb9a7
commit 22e91a0
Show file tree

Hide file tree

Showing 14 changed files with 6 additions and 126 deletions.
diff --git a/api/.gitignore b/api/.gitignore
@@ -10,6 +10,7 @@ build/
 .dart_frog
 *.env
 .vscode
+lib/src/common/config/env.g.dart
 
 # Test related files
 coverage/
diff --git a/api/lib/api.dart b/api/lib/api.dart
@@ -1,7 +1,7 @@
 /// Yandex Food Clone API Server-Side Library
 library api;
 
-export 'src/common/common.dart';
+export 'src/common/common.dart' hide Env;
 export 'src/common/remote/remote.dart';
 export 'src/data/database/database.dart';
 export 'src/data/db_menu_fake_data_view.dart';

diff --git a/api/lib/client.dart b/api/lib/client.dart
@@ -1,9 +1,8 @@
 /// Yandex Food Clone API Client-Side Library
 library client;
 
-export 'package:env/env.dart';
-
 export 'src/client/yandex_food_api_client.dart';
+export 'src/common/config/env.dart';
 export 'src/common/config/uuid_gen.dart';
 export 'src/common/remote/app_dio.dart';
 export 'src/common/utils/extensions/formatter_extension.dart';

diff --git a/api/lib/src/common/config/config.dart b/api/lib/src/common/config/config.dart
@@ -1,4 +1,5 @@
 export 'delivery_estimator.dart';
+export 'env.dart';
 export 'missing_fields.dart';
 export 'url_builder.dart';
 export 'uuid_gen.dart';
diff --git a/api/packages/env/lib/src/env.dart → api/lib/src/common/config/env.dart b/api/packages/env/lib/src/env.dart → api/lib/src/common/config/env.dart
diff --git a/api/lib/src/middleware/database_provider.dart b/api/lib/src/middleware/database_provider.dart
@@ -1,5 +1,4 @@
 import 'package:dart_frog/dart_frog.dart';
-import 'package:env/env.dart';
 import 'package:stormberry/stormberry.dart';
 import 'package:yandex_food_api/src/common/common.dart';
 

diff --git a/api/packages/env/.gitignore b/api/packages/env/.gitignore
diff --git a/api/packages/env/README.md b/api/packages/env/README.md
diff --git a/api/packages/env/analysis_options.yaml b/api/packages/env/analysis_options.yaml
diff --git a/api/packages/env/coverage_badge.svg b/api/packages/env/coverage_badge.svg
diff --git a/api/packages/env/lib/env.dart b/api/packages/env/lib/env.dart
diff --git a/api/packages/env/pubspec.yaml b/api/packages/env/pubspec.yaml
diff --git a/api/packages/env/test/src/env_test.dart b/api/packages/env/test/src/env_test.dart
diff --git a/api/pubspec.yaml b/api/pubspec.yaml
@@ -14,8 +14,7 @@ dependencies:
   dart_jsonwebtoken: ^2.14.0
   dio: ^5.4.3
   dotenv: ^4.2.0
-  env:
-    path: packages/env
+  envied: ^0.5.4+1
   equatable: ^2.0.5
   intl: ^0.19.0
   json_annotation: ^4.9.0
@@ -26,6 +25,7 @@ dependencies:
 
 dev_dependencies:
   build_runner: ^2.4.11
+  envied_generator: ^0.5.4+1
   json_serializable: ^6.8.0
   mocktail: ^1.0.3
   test: ^1.25.5