Published 6.0.0

README.md

@@ -14,8 +14,7 @@
 
 ## About
 
-Angel3 is a fork of the original Angel framework to support NNBD in Dart SDK 2.12.x and later.
+Angel3 is a fork of archived Angel framework to support Dart SDK 2.12.x or later. It is a full-stack Web framework in Dart that aims to streamline development by providing many common features out-of-the-box in a consistent manner. One of the main goal is to enable developers to build both frontend and backend in the same language, Dart. Angel3 framework is designed as a collection of plugins that enable developers to pick and choose the parts needed for their projects. A series of starter templates are also provided for quick start and trial run with Angel3 framework. Visit our [website](<https://angel3-framework.web.app/>) to learn more.
-It is a full-stack Web framework in Dart that aims to streamline development by providing many common features out-of-the-box in a consistent manner. One of the main goal is to enable developers to build both frontend and backend in the same language, Dart. Angel3 framework is designed as a collection of plugins that enable developers to pick and choose the parts needed for their projects. A series of starter templates are also provided for quick start and trial run with Angel3 framework. Visit our [website](<https://angel3-framework.web.app/>) to learn more.
 
 The availabe features in Angel3 includes:
 
@@ -35,7 +34,7 @@ The status of the code base is as follows:
 
 Branch: `master`
 
-* Dart version : 2.12.x and above.
+* Dart version : 2.16.x or later.
 * Publish      : Yes. Refer to packages with `angel3_` prefix on [pub.dev](https://pub.dev/publishers/dukefirehawk.com/packages).
 * Null Safety  : Yes
 * Status       : Production
@@ -43,6 +42,19 @@ Branch: `master`
 
 For more details, checkout [Project Status](https://github.com/dukefirehawk/angel/wiki/Project-Status)
 
+## Release Notes
+
+### Release 6.0.0
+
+* Updated all `angel3_` packages to 6.0.0
+* Updated all `angel3_` packages to use SDK 2.16.x or later
+* Updated ORM to support MariaDB 10.2.x (stable) and MySQL 8.x (beta)
+* Updated code generator to use `analyzer` 3.x.x
+* Updated exception handling
+* Added default logger to generate standardised logging messages
+* Added `melos` support
+* Removed deprecated API
+
 ## Installation and Setup
 
 ### Create a new project by cloning from boilerplate templates

packages/auth/pubspec.yaml

@@ -18,18 +18,18 @@ dev_dependencies:
   angel3_container: ^6.0.0
   http: ^0.13.1
   io: ^1.0.0
-  test: ^1.17.4  
+  test: ^1.21.0
   lints: ^1.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request

packages/cache/pubspec.yaml

@@ -12,8 +12,8 @@ dependencies:
   pool: ^1.5.0
   logging: ^1.0.0
 dev_dependencies:
-  angel3_test: ^4.0.0
+  angel3_test: ^6.0.0
   glob: ^2.0.1
   http: ^0.13.3
-  test: ^1.17.5
+  test: ^1.21.0
   lints: ^1.0.0

packages/client/pubspec.yaml

@@ -22,20 +22,20 @@ dev_dependencies:
   async: ^2.6.1
   build_runner: ^2.1.2
   build_web_compilers: ^3.2.1
-  test: ^1.20.0
+  test: ^1.21.0
   lints: ^1.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request
-  angel3_auth:
+#   angel3_auth:
-    path: ../auth
+#     path: ../auth

packages/configuration/pubspec.yaml

@@ -16,17 +16,17 @@ dev_dependencies:
   logging: ^1.0.1
   lints: ^1.0.0
   belatuk_pretty_logging: ^4.0.0
-  test: ^1.17.5
+  test: ^1.21.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request

packages/container/angel_container/pubspec.yaml

@@ -9,5 +9,5 @@ dependencies:
   collection: ^1.15.0
   quiver: ^3.0.1
 dev_dependencies:
-  test: ^1.17.5
+  test: ^1.21.0
   lints: ^1.0.0

packages/container/angel_container_generator/pubspec.yaml

@@ -11,8 +11,8 @@ dependencies:
 dev_dependencies:
   build_runner: ^2.1.2
   build_test: ^2.1.3
-  test: ^1.17.5
+  test: ^1.21.0
   lints: ^1.0.1
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../angel_container
+#     path: ../angel_container

packages/cors/pubspec.yaml

@@ -11,27 +11,27 @@ dev_dependencies:
   angel3_test: ^6.0.0
   http: ^0.13.3
   lints: ^1.0.0
-  test: ^1.17.5
+  test: ^1.21.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request
-  angel3_auth:
+#   angel3_auth:
-    path: ../auth
+#     path: ../auth
-  angel3_client:
+#   angel3_client:
-    path: ../client
+#     path: ../client
-  angel3_websocket:
+#   angel3_websocket:
-    path: ../websocket
+#     path: ../websocket
-  angel3_validate:
+#   angel3_validate:
-    path: ../validate
+#     path: ../validate
-  angel3_test:
+#   angel3_test:
-    path: ../test
+#     path: ../test

packages/file_service/pubspec.yaml

@@ -10,18 +10,18 @@ dependencies:
   file: ^6.1.1
   pool: ^1.5.0
 dev_dependencies:
-  test: ^1.20.0
+  test: ^1.21.0
   lints: ^1.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request

packages/framework/pubspec.yaml

@@ -33,16 +33,16 @@ dependencies:
 dev_dependencies:
   http: ^0.13.1
   io: ^1.0.0
-  test: ^1.17.5
+  test: ^1.21.0
   lints: ^1.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request

packages/hot/pubspec.yaml

@@ -19,23 +19,23 @@ dev_dependencies:
   http: ^0.13.2
   logging: ^1.0.1
   lints: ^1.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request
-  angel3_auth:
+#   angel3_auth:
-    path: ../auth
+#     path: ../auth
-  angel3_client:
+#   angel3_client:
-    path: ../client
+#     path: ../client
-  angel3_websocket:
+#   angel3_websocket:
-    path: ../websocket
+#     path: ../websocket
  

packages/html/pubspec.yaml

@@ -12,28 +12,28 @@ dev_dependencies:
   angel3_test: ^6.0.0
   html: ^0.15.0
   logging: ^1.0.1
-  test: ^1.17.0
+  test: ^1.21.0
   lints: ^1.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_test:
+#   angel3_test:
-    path: ../test
+#     path: ../test
-  angel3_websocket:
+#   angel3_websocket:
-    path: ../websocket
+#     path: ../websocket
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_client:
+#   angel3_client:
-    path: ../client
+#     path: ../client
-  angel3_auth:
+#   angel3_auth:
-    path: ../auth 
+#     path: ../auth 
-  angel3_validate:
+#   angel3_validate:
-    path: ../validate
+#     path: ../validate
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route

packages/jael/angel_jael/pubspec.yaml

@@ -7,8 +7,8 @@ environment:
   sdk: '>=2.16.0 <3.0.0'
 dependencies:
   angel3_framework: ^6.0.0
-  jael3: ^5.0.0
+  jael3: ^6.0.0
-  jael3_preprocessor: ^5.0.0
+  jael3_preprocessor: ^6.0.0
   belatuk_code_buffer: ^3.0.0
   belatuk_symbol_table: ^3.0.0
   file: ^6.0.0
@@ -16,32 +16,32 @@ dependencies:
 dev_dependencies:
   angel3_test: ^6.0.0
   html: ^0.15.0
-  test: ^1.17.3
+  test: ^1.21.0
   lints: ^1.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../../container/angel_container
+#     path: ../../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../../framework
+#     path: ../../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../../http_exception
+#     path: ../../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../../model
+#     path: ../../model
-  angel3_route:
+#   angel3_route:
-    path: ../../route
+#     path: ../../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../../mock_request
+#     path: ../../mock_request
-  angel3_auth:
+#   angel3_auth:
-    path: ../../auth 
+#     path: ../../auth 
-  angel3_client:
+#   angel3_client:
-    path: ../../client
+#     path: ../../client
-  angel3_websocket:
+#   angel3_websocket:
-    path: ../../websocket
+#     path: ../../websocket
-  angel3_validate:
+#   angel3_validate:
-    path: ../../validate
+#     path: ../../validate
-  angel3_test:
+#   angel3_test:
-    path: ../../test
+#     path: ../../test
-  jael3:
+#   jael3:
-    path: ../jael
+#     path: ../jael
-  jael3_preprocessor:
+#   jael3_preprocessor:
-    path: ../jael_preprocessor
+#     path: ../jael_preprocessor

packages/jael/jael/pubspec.yaml

@@ -1,5 +1,5 @@
 name: jael3
-version: 5.0.0
+version: 6.0.0
 description:  A simple server-side HTML templating engine for Dart. Comparable to Blade or Liquid.
 homepage: https://angel3-framework.web.app/
 repository: https://github.com/dukefirehawk/angel/tree/master/packages/jael/jael
@@ -16,6 +16,6 @@ dependencies:
   matcher: ^0.12.10 
 dev_dependencies:
   lints: ^1.0.0
-  test: ^1.17.4
+  test: ^1.21.0
 executables:
   jaelfmt: jaelfmt

packages/jael/jael_language_server/pubspec.yaml

@@ -1,5 +1,5 @@
 name: jael3_language_server
-version: 1.0.0
+version: 6.0.0
 description: Language Server Protocol implementation for the Jael templating engine.
 homepage: https://github.com/angel-dart/vscode
 publish_to: none
@@ -10,8 +10,8 @@ dependencies:
 #  dart_language_server: ^0.1.16
   file: ^6.1.2
   io: ^1.0.0
-  jael3: ^4.2.0
+  jael3: ^6.0.0
-  jael3_preprocessor: ^5.0.0
+  jael3_preprocessor: ^6.0.0
   json_rpc_2: ^3.0.1
   logging: ^1.0.1
   path: ^1.8.0

packages/jael/jael_preprocessor/pubspec.yaml

@@ -1,5 +1,5 @@
 name: jael3_preprocessor
-version: 5.0.0
+version: 6.0.0
 description: A pre-processor for resolving blocks and includes within Jael templates.
 homepage: https://angel3-framework.web.app/
 repository: https://github.com/dukefirehawk/angel/tree/master/packages/jael/jael_preprocessor
@@ -7,13 +7,13 @@ environment:
   sdk: '>=2.16.0 <3.0.0'
 dependencies:
   file: ^6.1.0
-  jael3: ^6.0.0
+  jael3: ^5.0.0
   belatuk_symbol_table: ^3.0.0
   collection: ^1.15.0
 dev_dependencies:
   belatuk_code_buffer: ^3.0.0
-  test: ^1.17.4
+  test: ^1.21.0
   lints: ^1.0.0
-dependency_overrides:
+# dependency_overrides:
-  jael3:
+#   jael3:
-    path: ../jael
+#     path: ../jael

packages/jael/jael_web/pubspec.yaml

@@ -1,5 +1,5 @@
 name: jael3_web
-version: 2.0.0
+version: 6.0.0
 description: Experimental virtual DOM/SPA engine built on Jael3. Supports SSR.
 publish_to: none
 environment:
@@ -8,15 +8,15 @@ dependencies:
   build: ^2.0.2
   build_config: ^1.0.0
   code_builder: ^4.0.0
-  jael3: ^5.0.0
+  jael3: ^6.0.0
-  jael3_preprocessor: ^5.0.0
+  jael3_preprocessor: ^6.0.0
   source_gen: ^1.0.2
 dev_dependencies:
   build_runner: ^2.0.4
   build_web_compilers: ^3.0.0
   lints: ^1.0.0
-dependency_overrides:
+# dependency_overrides:
-  jael3:
+#   jael3:
-    path: ../jael
+#     path: ../jael
-  jael3_preprocessor:
+#   jael3_preprocessor:
-    path: ../jael_preprocessor
+#     path: ../jael_preprocessor

packages/jinja/pubspec.yaml

@@ -10,5 +10,5 @@ dependencies:
 dev_dependencies:
   angel3_test: ^6.0.0
   path: ^1.8.0
-  test: ^1.17.5
+  test: ^1.21.0
   lints: ^1.0.0

packages/markdown/pubspec.yaml

@@ -12,4 +12,4 @@ dependencies:
 dev_dependencies:
   angel3_test: ^6.0.0
   lints: ^1.0.0
-  test: ^1.17.0
+  test: ^1.21.0

packages/mock_request/pubspec.yaml

@@ -10,8 +10,8 @@ dependencies:
 dev_dependencies:
   angel3_framework: ^6.0.0
   http: ^0.13.2
-  test: ^1.17.4
+  test: ^1.21.0
   lints: ^1.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework

packages/mongo/pubspec.yaml

@@ -12,18 +12,18 @@ dependencies:
   mongo_dart: ^0.7.0
 dev_dependencies:
   http: ^0.13.0
-  test: ^1.17.5
+  test: ^1.21.0
   lints: ^1.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request

packages/mustache/pubspec.yaml

@@ -12,5 +12,5 @@ dependencies:
   path: ^1.8.0
 dev_dependencies:
   http: ^0.13.3
-  test: ^1.17.8
+  test: ^1.21.0
   lints: ^1.0.0

packages/oauth2/pubspec.yaml

@@ -16,5 +16,5 @@ dev_dependencies:
   logging: ^1.0.1
   oauth2: ^2.0.0
   lints: ^1.0.0
-  test: ^1.17.5
+  test: ^1.21.0
   uuid: ^3.0.4

packages/orm/angel_migration/pubspec.yaml

@@ -9,6 +9,6 @@ dependencies:
   angel3_orm: ^6.0.0
 dev_dependencies:
   lints: ^1.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_orm:
+#   angel3_orm:
-    path: ../angel_orm
+#     path: ../angel_orm

packages/orm/angel_migration_runner/pubspec.yaml

@@ -12,11 +12,12 @@ dependencies:
   charcode: ^1.2.0
   postgres: ^2.4.0
   mysql_client: ^0.0.11
+  mysql1: ^0.19.0
   logging: ^1.0.0
 dev_dependencies:
   lints: ^1.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_orm:
+#   angel3_orm:
-    path: ../angel_orm
+#     path: ../angel_orm
-  angel3_migration:
+#   angel3_migration:
-    path: ../angel_migration
+#     path: ../angel_migration

packages/orm/angel_orm/pubspec.yaml

@@ -19,10 +19,10 @@ dev_dependencies:
   build_runner: ^2.1.1
   test: ^1.17.4
   lints: ^1.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_serialize:
+#   angel3_serialize:
-    path: ../../serialize/angel_serialize
+#     path: ../../serialize/angel_serialize
-  angel3_serialize_generator:
+#   angel3_serialize_generator:
-    path: ../../serialize/angel_serialize_generator
+#     path: ../../serialize/angel_serialize_generator
-  angel3_model:
+#   angel3_model:
-    path: ../../model
+#     path: ../../model

packages/orm/angel_orm_generator/pubspec.yaml

@@ -28,27 +28,27 @@ dev_dependencies:
   angel3_migration: ^6.0.0
   build_runner: ^2.0.1
   postgres: ^2.4.0
-  test: ^1.17.3
+  test: ^1.21.0
   lints: ^1.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../../container/angel_container
+#     path: ../../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../../framework
+#     path: ../../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../../http_exception
+#     path: ../../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../../model
+#     path: ../../model
-  angel3_route:
+#   angel3_route:
-    path: ../../route
+#     path: ../../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../../mock_request
+#     path: ../../mock_request
-  angel3_serialize:
+#   angel3_serialize:
-    path: ../../serialize/angel_serialize
+#     path: ../../serialize/angel_serialize
-  angel3_serialize_generator:
+#   angel3_serialize_generator:
-    path: ../../serialize/angel_serialize_generator
+#     path: ../../serialize/angel_serialize_generator
-  angel3_orm:
+#   angel3_orm:
-    path: ../angel_orm
+#     path: ../angel_orm
-  angel3_migration:
+#   angel3_migration:
-    path: ../angel_migration
+#     path: ../angel_migration
  

packages/orm/angel_orm_mysql/pubspec.yaml

@@ -15,20 +15,20 @@ dev_dependencies:
   angel3_orm_generator: ^6.0.0
   angel3_orm_test: ^6.0.0
   build_runner: ^2.0.1
-  test: ^1.17.0
+  test: ^1.21.0
   lints: ^1.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_serialize:
+#   angel3_serialize:
-    path: ../../serialize/angel_serialize
+#     path: ../../serialize/angel_serialize
-  angel3_serialize_generator:
+#   angel3_serialize_generator:
-    path: ../../serialize/angel_serialize_generator
+#     path: ../../serialize/angel_serialize_generator
-  angel3_model:
+#   angel3_model:
-    path: ../../model
+#     path: ../../model
-  angel3_orm_test:
+#   angel3_orm_test:
-    path: ../angel_orm_test
+#     path: ../angel_orm_test
-  angel3_orm:
+#   angel3_orm:
-    path: ../angel_orm
+#     path: ../angel_orm
-  angel3_migration:
+#   angel3_migration:
-    path: ../angel_migration
+#     path: ../angel_migration
-  angel3_orm_generator:
+#   angel3_orm_generator:
-    path: ../angel_orm_generator
+#     path: ../angel_orm_generator

packages/orm/angel_orm_postgres/pubspec.yaml

@@ -14,16 +14,16 @@ dependencies:
 dev_dependencies:
   belatuk_pretty_logging: ^4.0.0
   angel3_orm_test: ^6.0.0
-  test: ^1.17.5
+  test: ^1.21.0
   lints: ^1.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_serialize:
+#   angel3_serialize:
-    path: ../../serialize/angel_serialize
+#     path: ../../serialize/angel_serialize
-  angel3_model:
+#   angel3_model:
-    path: ../../model
+#     path: ../../model
-  angel3_orm_test:
+#   angel3_orm_test:
-    path: ../angel_orm_test
+#     path: ../angel_orm_test
-  angel3_orm:
+#   angel3_orm:
-    path: ../angel_orm
+#     path: ../angel_orm
-  angel3_migration:
+#   angel3_migration:
-    path: ../angel_migration
+#     path: ../angel_migration

packages/orm/angel_orm_service/pubspec.yaml

@@ -19,34 +19,34 @@ dev_dependencies:
   #angel3_orm_test: ^3.0.0
   build_runner: ^2.0.4
   logging: ^1.0.1
-  test: ^1.17.7
+  test: ^1.21.0
   lints: ^1.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../../container/angel_container
+#     path: ../../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../../framework
+#     path: ../../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../../http_exception
+#     path: ../../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../../model
+#     path: ../../model
-  angel3_route:
+#   angel3_route:
-    path: ../../route
+#     path: ../../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../../mock_request
+#     path: ../../mock_request
-  angel3_serialize:
+#   angel3_serialize:
-    path: ../../serialize/angel_serialize
+#     path: ../../serialize/angel_serialize
-  angel3_serialize_generator:
+#   angel3_serialize_generator:
-    path: ../../serialize/angel_serialize_generator
+#     path: ../../serialize/angel_serialize_generator
-  angel3_orm_test:
+#   angel3_orm_test:
-    path: ../angel_orm_test
+#     path: ../angel_orm_test
-  angel3_orm:
+#   angel3_orm:
-    path: ../angel_orm
+#     path: ../angel_orm
-  angel3_orm_generator:
+#   angel3_orm_generator:
-    path: ../angel_orm_generator
+#     path: ../angel_orm_generator
-  angel3_orm_postgres:
+#   angel3_orm_postgres:
-    path: ../angel_orm_postgres
+#     path: ../angel_orm_postgres
-  angel3_migration:
+#   angel3_migration:
-    path: ../angel_migration
+#     path: ../angel_migration
-  angel3_migration_runner:
+#   angel3_migration_runner:
-    path: ../angel_migration_runner
+#     path: ../angel_migration_runner

packages/orm/angel_orm_test/pubspec.yaml

@@ -11,7 +11,7 @@ dependencies:
   angel3_orm: ^6.0.0
   angel3_serialize: ^6.0.0
   io: ^1.0.0
-  test: ^1.17.4
+  test: ^1.21.0
   collection: ^1.15.0
   optional: ^6.0.0
 dev_dependencies:
@@ -19,26 +19,26 @@ dev_dependencies:
   angel3_framework: ^6.0.0
   build_runner: ^2.0.1
   lints: ^1.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../../container/angel_container
+#     path: ../../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../../framework
+#     path: ../../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../../http_exception
+#     path: ../../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../../model
+#     path: ../../model
-  angel3_route:
+#   angel3_route:
-    path: ../../route
+#     path: ../../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../../mock_request
+#     path: ../../mock_request
-  angel3_serialize:
+#   angel3_serialize:
-    path: ../../serialize/angel_serialize
+#     path: ../../serialize/angel_serialize
-  angel3_serialize_generator:
+#   angel3_serialize_generator:
-    path: ../../serialize/angel_serialize_generator
+#     path: ../../serialize/angel_serialize_generator
-  angel3_orm:
+#   angel3_orm:
-    path: ../angel_orm
+#     path: ../angel_orm
-  angel3_migration:
+#   angel3_migration:
-    path: ../angel_migration
+#     path: ../angel_migration
-  angel3_orm_generator:
+#   angel3_orm_generator:
-    path: ../angel_orm_generator
+#     path: ../angel_orm_generator

packages/paginate/pubspec.yaml

@@ -10,5 +10,5 @@ dependencies:
 dev_dependencies:
   angel3_test: ^6.0.0
   logging: ^1.0.1
-  test: ^1.17.8
+  test: ^1.21.0
   lints: ^1.0.0

packages/production/pubspec.yaml

@@ -15,16 +15,16 @@ dependencies:
   intl: ^0.17.0
 dev_dependencies:
   lints: ^1.0.1
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request

packages/proxy/pubspec.yaml

@@ -15,5 +15,5 @@ dev_dependencies:
   angel3_mock_request: ^6.0.0
   logging: ^1.0.1
   lints: ^1.0.0
-  test: ^1.17.7
+  test: ^1.21.0
   

packages/redis/pubspec.yaml

@@ -10,5 +10,5 @@ dependencies:
   angel3_http_exception: ^6.0.0
   resp_client: ^1.2.0
 dev_dependencies:
-  test: ^1.17.8
+  test: ^1.21.0
   lints: ^1.0.0

packages/route/pubspec.yaml

@@ -13,5 +13,5 @@ dev_dependencies:
   build_runner: ^2.1.2
   build_web_compilers: ^3.2.1
   http: ^0.13.3
-  test: ^1.20.0
+  test: ^1.21.0
   lints: ^1.0.0

packages/security/pubspec.yaml

@@ -13,9 +13,9 @@ dev_dependencies:
   angel3_production: ^6.0.0
   angel3_redis: ^6.0.0
   angel3_test: ^6.0.0
-  angel3_validate: ^4.0.0
+  angel3_validate: ^6.0.0
   belatuk_pretty_logging: ^4.0.0
-  test: ^1.17.5
+  test: ^1.21.0
   lints: ^1.0.0
 #dependency_overrides:
 #  angel3_auth:

packages/sembast/pubspec.yaml

@@ -12,5 +12,5 @@ dev_dependencies:
   angel3_http_exception: ^6.0.0
   logging: ^1.0.1
   lints: ^1.0.0
-  test: ^1.17.8
+  test: ^1.21.0
 

packages/seo/pubspec.yaml

@@ -15,5 +15,5 @@ dependencies:
 dev_dependencies:
   angel3_test: ^6.0.0
   logging: ^1.0.1
-  test: ^1.17.8
+  test: ^1.21.0
   lints: ^1.0.0

packages/serialize/angel_serialize/pubspec.yaml

@@ -12,7 +12,7 @@ dependencies:
   quiver: ^3.0.1
 dev_dependencies:
   lints: ^1.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_model:
+#   angel3_model:
-    path: ../../model
+#     path: ../../model
   

packages/serialize/angel_serialize_generator/pubspec.yaml

@@ -23,9 +23,9 @@ dev_dependencies:
   build_runner: ^2.0.1
   collection: ^1.15.0
   lints: ^1.0.0
-  test: ^1.17.4
+  test: ^1.21.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_model:
+#   angel3_model:
-    path: ../../model
+#     path: ../../model
-  angel3_serialize:
+#   angel3_serialize:
-    path: ../angel_serialize
+#     path: ../angel_serialize

packages/shelf/pubspec.yaml

@@ -10,7 +10,7 @@ dependencies:
   angel3_container: ^6.0.0
   angel3_mock_request: ^6.0.0
   path: ^1.8.0
-  shelf: ^1.1.4
+  shelf: ^1.3.0
   stream_channel: ^2.1.0
   logging: ^1.0.0
   charcode: ^1.3.0
@@ -18,6 +18,6 @@ dependencies:
 dev_dependencies: 
   angel3_test: ^6.0.0
   belatuk_pretty_logging: ^4.0.0
-  shelf_static: ^1.0.0
+  shelf_static: ^1.1.0
-  test: ^1.17.5
+  test: ^1.21.0
   lints: ^1.0.0

packages/static/pubspec.yaml

@@ -19,28 +19,28 @@ dev_dependencies:
   http: ^0.13.2
   matcher: ^0.12.10
   lints: ^1.0.0
-  test: ^1.17.4
+  test: ^1.21.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request
-  angel3_auth:
+#   angel3_auth:
-    path: ../auth 
+#     path: ../auth 
-  angel3_client:
+#   angel3_client:
-    path: ../client
+#     path: ../client
-  angel3_websocket:
+#   angel3_websocket:
-    path: ../websocket
+#     path: ../websocket
-  angel3_validate:
+#   angel3_validate:
-    path: ../validate
+#     path: ../validate
-  angel3_test:
+#   angel3_test:
-    path: ../test
+#     path: ../test
   

packages/sync/pubspec.yaml

@@ -12,7 +12,7 @@ dependencies:
   stream_channel: ^2.1.0
 dev_dependencies:
   angel3_test: ^6.0.0
-  test: ^1.17.5
+  test: ^1.21.0
   lints: ^1.0.0
 #dependency_overrides:
 #  angel3_websocket:

packages/test/pubspec.yaml

@@ -17,26 +17,26 @@ dependencies:
   matcher: ^0.12.10
   web_socket_channel: ^2.0.0
 dev_dependencies: 
-  test: ^1.17.5
+  test: ^1.21.0
   lints: ^1.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request
-  angel3_auth:
+#   angel3_auth:
-    path: ../auth 
+#     path: ../auth 
-  angel3_client:
+#   angel3_client:
-    path: ../client
+#     path: ../client
-  angel3_websocket:
+#   angel3_websocket:
-    path: ../websocket
+#     path: ../websocket
-  angel3_validate:
+#   angel3_validate:
-    path: ../validate
+#     path: ../validate

packages/validate/pubspec.yaml

@@ -15,17 +15,17 @@ dev_dependencies:
   build_web_compilers: ^3.2.0
   logging: ^1.0.1
   lints: ^1.0.0
-  test: ^1.17.4
+  test: ^1.21.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request

packages/websocket/pubspec.yaml

@@ -20,22 +20,22 @@ dependencies:
 dev_dependencies:
   angel3_container: ^6.0.0
   angel3_model: ^6.0.0
-  test: ^1.17.5
+  test: ^1.21.0
   lints: ^1.0.0
-dependency_overrides:
+# dependency_overrides:
-  angel3_container:
+#   angel3_container:
-    path: ../container/angel_container
+#     path: ../container/angel_container
-  angel3_framework:
+#   angel3_framework:
-    path: ../framework
+#     path: ../framework
-  angel3_http_exception:
+#   angel3_http_exception:
-    path: ../http_exception
+#     path: ../http_exception
-  angel3_model:
+#   angel3_model:
-    path: ../model
+#     path: ../model
-  angel3_route:
+#   angel3_route:
-    path: ../route
+#     path: ../route
-  angel3_mock_request:
+#   angel3_mock_request:
-    path: ../mock_request
+#     path: ../mock_request
-  angel3_auth:
+#   angel3_auth:
-    path: ../auth 
+#     path: ../auth 
-  angel3_client:
+#   angel3_client:
-    path: ../client
+#     path: ../client

tool/performance/pubspec.yaml

@@ -3,7 +3,7 @@ version: 1.0.0
 description: Angel3 performance testing tool
 publish_to: none
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=2.16.0 <3.0.0'
 published_to: none
 dependencies:
   http: ^0.13.4