From 16565c26cd6b217f8aa9ae148e0c3b29c935421e Mon Sep 17 00:00:00 2001 From: thomashii Date: Mon, 14 Jun 2021 09:37:53 +0800 Subject: [PATCH] Updated angel3-graphql --- bin/dev.dart | 8 +-- bin/prod.dart | 4 +- lib/angel.dart | 2 +- lib/src/config/config.dart | 6 +- lib/src/config/plugins/plugins.dart | 2 +- lib/src/models/todo.dart | 4 +- lib/src/routes/controllers/controllers.dart | 2 +- lib/src/routes/graphql/graphql.dart | 6 +- lib/src/routes/graphql/schema.dart | 4 +- lib/src/routes/graphql/todo.dart | 6 +- lib/src/routes/routes.dart | 4 +- lib/src/services/services.dart | 2 +- pubspec.yaml | 78 ++++----------------- test/all_test.dart | 4 +- 14 files changed, 40 insertions(+), 92 deletions(-) diff --git a/bin/dev.dart b/bin/dev.dart index 93b255d..9702c70 100644 --- a/bin/dev.dart +++ b/bin/dev.dart @@ -1,9 +1,9 @@ import 'dart:io'; -import 'package:pretty_logging/pretty_logging.dart'; +import 'package:angel3_pretty_logging/angel3_pretty_logging.dart'; import 'package:angel/angel.dart'; -import 'package:angel_container/mirrors.dart'; -import 'package:angel_framework/angel_framework.dart'; -import 'package:angel_hot/angel_hot.dart'; +import 'package:angel3_container/mirrors.dart'; +import 'package:angel3_framework/angel3_framework.dart'; +import 'package:angel3_hot/angel3_hot.dart'; import 'package:logging/logging.dart'; void main() async { diff --git a/bin/prod.dart b/bin/prod.dart index fb7de39..efd1e5e 100644 --- a/bin/prod.dart +++ b/bin/prod.dart @@ -1,6 +1,6 @@ import 'package:angel/angel.dart'; -import 'package:angel_container/mirrors.dart'; -import 'package:angel_production/angel_production.dart'; +import 'package:angel3_container/mirrors.dart'; +import 'package:angel3_production/angel3_production.dart'; // NOTE: By default, the Runner class does not use the `MirrorsReflector`, or any // reflector, by default. diff --git a/lib/angel.dart b/lib/angel.dart index e4c6f76..59d8bde 100644 --- a/lib/angel.dart +++ b/lib/angel.dart @@ -2,7 +2,7 @@ library angel; import 'dart:async'; -import 'package:angel_framework/angel_framework.dart'; +import 'package:angel3_framework/angel3_framework.dart'; import 'package:file/local.dart'; import 'src/config/config.dart' as configuration; import 'src/routes/routes.dart' as routes; diff --git a/lib/src/config/config.dart b/lib/src/config/config.dart index ba224a7..6aeb9e8 100644 --- a/lib/src/config/config.dart +++ b/lib/src/config/config.dart @@ -1,9 +1,9 @@ /// Configuration for this Angel instance. library angel.src.config; -import 'package:angel_configuration/angel_configuration.dart'; -import 'package:angel_framework/angel_framework.dart'; -import 'package:angel_jael/angel_jael.dart'; +import 'package:angel3_configuration/angel3_configuration.dart'; +import 'package:angel3_framework/angel3_framework.dart'; +import 'package:angel3_jael/angel3_jael.dart'; import 'package:file/file.dart'; import 'plugins/plugins.dart' as plugins; diff --git a/lib/src/config/plugins/plugins.dart b/lib/src/config/plugins/plugins.dart index b025b21..d45466c 100644 --- a/lib/src/config/plugins/plugins.dart +++ b/lib/src/config/plugins/plugins.dart @@ -2,7 +2,7 @@ library angel.src.config.plugins; import 'dart:async'; -import 'package:angel_framework/angel_framework.dart'; +import 'package:angel3_framework/angel3_framework.dart'; Future configureServer(Angel app) async { // Include any plugins you have made here. diff --git a/lib/src/models/todo.dart b/lib/src/models/todo.dart index f3f0242..b481876 100644 --- a/lib/src/models/todo.dart +++ b/lib/src/models/todo.dart @@ -1,5 +1,5 @@ -import 'package:angel_serialize/angel_serialize.dart'; -import 'package:graphql_schema/graphql_schema.dart'; +import 'package:angel3_serialize/angel3_serialize.dart'; +import 'package:graphql_schema2/graphql_schema2.dart'; part 'todo.g.dart'; @graphQLClass diff --git a/lib/src/routes/controllers/controllers.dart b/lib/src/routes/controllers/controllers.dart index e23b375..e55e239 100644 --- a/lib/src/routes/controllers/controllers.dart +++ b/lib/src/routes/controllers/controllers.dart @@ -1,7 +1,7 @@ library angel.src.routes.controllers; import 'dart:async'; -import 'package:angel_framework/angel_framework.dart'; +import 'package:angel3_framework/angel3_framework.dart'; Future configureServer(Angel app) async { /// Controllers will not function unless wired to the application! diff --git a/lib/src/routes/graphql/graphql.dart b/lib/src/routes/graphql/graphql.dart index 2c6a7d1..f115739 100644 --- a/lib/src/routes/graphql/graphql.dart +++ b/lib/src/routes/graphql/graphql.dart @@ -1,6 +1,6 @@ -import 'package:angel_framework/angel_framework.dart'; -import 'package:angel_graphql/angel_graphql.dart'; -import 'package:graphql_server/graphql_server.dart'; +import 'package:angel3_framework/angel3_framework.dart'; +import 'package:angel3_graphql/angel3_graphql.dart'; +import 'package:graphql_server2/graphql_server2.dart'; import 'schema.dart'; /// Configures the [app] to server GraphQL. diff --git a/lib/src/routes/graphql/schema.dart b/lib/src/routes/graphql/schema.dart index 82140d3..cd50b25 100644 --- a/lib/src/routes/graphql/schema.dart +++ b/lib/src/routes/graphql/schema.dart @@ -1,5 +1,5 @@ -import 'package:angel_framework/angel_framework.dart'; -import 'package:graphql_schema/graphql_schema.dart'; +import 'package:angel3_framework/angel3_framework.dart'; +import 'package:graphql_schema2/graphql_schema2.dart'; import 'todo.dart'; /// Creates a GraphQL schema that manages an in-memory store of diff --git a/lib/src/routes/graphql/todo.dart b/lib/src/routes/graphql/todo.dart index 1f8ad00..4d30d9b 100644 --- a/lib/src/routes/graphql/todo.dart +++ b/lib/src/routes/graphql/todo.dart @@ -1,7 +1,7 @@ import 'package:angel/src/models/todo.dart'; -import 'package:angel_framework/angel_framework.dart'; -import 'package:angel_graphql/angel_graphql.dart'; -import 'package:graphql_schema/graphql_schema.dart'; +import 'package:angel3_framework/angel3_framework.dart'; +import 'package:angel3_graphql/angel3_graphql.dart'; +import 'package:graphql_schema2/graphql_schema2.dart'; /// Find or create an in-memory Todo store. MapService? _getTodoService(Angel app) { diff --git a/lib/src/routes/routes.dart b/lib/src/routes/routes.dart index 762b200..9fd7abc 100644 --- a/lib/src/routes/routes.dart +++ b/lib/src/routes/routes.dart @@ -1,8 +1,8 @@ /// This app's route configuration. library angel.src.routes; -import 'package:angel_framework/angel_framework.dart'; -import 'package:angel_static/angel_static.dart'; +import 'package:angel3_framework/angel3_framework.dart'; +import 'package:angel3_static/angel3_static.dart'; import 'package:file/file.dart'; import 'controllers/controllers.dart' as controllers; import 'graphql/graphql.dart' as graphql; diff --git a/lib/src/services/services.dart b/lib/src/services/services.dart index 86c3eb9..1d68f07 100644 --- a/lib/src/services/services.dart +++ b/lib/src/services/services.dart @@ -2,7 +2,7 @@ library angel.services; import 'dart:async'; -import 'package:angel_framework/angel_framework.dart'; +import 'package:angel3_framework/angel3_framework.dart'; /// Configure our application to use *services*. /// Services must be wired to the app via `app.use`. diff --git a/pubspec.yaml b/pubspec.yaml index fa772c2..fc46336 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,72 +5,20 @@ environment: sdk: '>=2.12.0 <3.0.0' homepage: https://github.com/dukefirehawk/boilerplates dependencies: - angel_auth: - git: - url: https://github.com/dukefirehawk/angel.git - ref: sdk-2.12.x_nnbd - path: packages/auth - angel_configuration: - git: - url: https://github.com/dukefirehawk/angel.git - ref: sdk-2.12.x_nnbd - path: packages/configuration - angel_framework: - git: - url: https://github.com/dukefirehawk/angel.git - ref: sdk-2.12.x_nnbd - path: packages/framework - angel_graphql: - git: - url: https://github.com/dukefirehawk/graphql_dart.git - ref: sdk-2.12.x_nnbd - path: angel_graphql - angel_jael: - git: - url: https://github.com/dukefirehawk/angel.git - ref: sdk-2.12.x_nnbd - path: packages/jael/angel_jael - angel_production: - git: - url: https://github.com/dukefirehawk/angel.git - ref: sdk-2.12.x_nnbd - path: packages/production - angel_static: - git: - url: https://github.com/dukefirehawk/angel.git - ref: sdk-2.12.x_nnbd - path: packages/static - angel_validate: - git: - url: https://github.com/dukefirehawk/angel.git - ref: sdk-2.12.x_nnbd - path: packages/validate + angel3_auth: ^4.0.0 + angel3_configuration: ^4.0.0 + angel3_framework: ^4.0.0 + angel3_graphql: ^2.0.0 + angel3_jael: ^4.0.0 + angel3_production: ^3.0.0 + angel3_static: ^4.0.0 + angel3_validate: ^4.0.0 dev_dependencies: - angel_hot: - git: - url: https://github.com/dukefirehawk/angel.git - ref: sdk-2.12.x_nnbd - path: packages/hot - angel_serialize_generator: - git: - url: https://github.com/dukefirehawk/angel.git - ref: sdk-2.12.x_nnbd - path: packages/serialize/angel_serialize_generator - angel_test: - git: - url: https://github.com/dukefirehawk/angel.git - ref: sdk-2.12.x_nnbd - path: packages/test - pretty_logging: - git: - url: https://github.com/dukefirehawk/angel.git - ref: sdk-2.12.x_nnbd - path: packages/pretty_logging - graphql_generator: - git: - url: https://github.com/dukefirehawk/graphql_dart.git - ref: sdk-2.12.x_nnbd - path: graphql_generator + angel3_hot: ^4.0.0 + angel3_serialize_generator: ^4.0.0 + angel3_test: ^4.0.0 + angel3_pretty_logging: ^3.0.0 + graphql_generator2: ^2.0.0 build_runner: ^2.0.4 io: ^1.0.0 pedantic: ^1.11.0 diff --git a/test/all_test.dart b/test/all_test.dart index 17b1ce7..445c2d9 100644 --- a/test/all_test.dart +++ b/test/all_test.dart @@ -1,6 +1,6 @@ import 'package:angel/angel.dart'; -import 'package:angel_framework/angel_framework.dart'; -import 'package:angel_test/angel_test.dart'; +import 'package:angel3_framework/angel3_framework.dart'; +import 'package:angel3_test/angel3_test.dart'; import 'package:test/test.dart'; // Angel also includes facilities to make testing easier.