From 85e7463afc39d39ab1ccdd488de8fdb382471a4e Mon Sep 17 00:00:00 2001 From: "thomashii@dukefirehawk.com" Date: Sat, 27 May 2023 06:58:32 +0800 Subject: [PATCH] Upgraded to Dart 3 --- packages/auth/CHANGELOG.md | 1 + packages/auth/pubspec.yaml | 4 +- packages/client/CHANGELOG.md | 1 + packages/client/pubspec.yaml | 2 +- packages/configuration/pubspec.yaml | 2 +- packages/jael/jael/CHANGELOG.md | 4 ++ packages/jael/jael/README.md | 2 +- packages/jael/jael/pubspec.yaml | 20 +++--- .../jael/jael/test/render/render_test.dart | 6 +- .../lib/src/analyzer.dart | 6 +- .../jael/jael_language_server/pubspec.yaml | 24 ++++--- packages/jael/jael_preprocessor/CHANGELOG.md | 5 ++ packages/jael/jael_preprocessor/pubspec.yaml | 22 +++--- packages/test/CHANGELOG.md | 5 ++ packages/test/pubspec.yaml | 68 +++++++++---------- packages/websocket/pubspec.yaml | 4 +- 16 files changed, 97 insertions(+), 79 deletions(-) diff --git a/packages/auth/CHANGELOG.md b/packages/auth/CHANGELOG.md index 182fe658..45549833 100644 --- a/packages/auth/CHANGELOG.md +++ b/packages/auth/CHANGELOG.md @@ -3,6 +3,7 @@ ## 8.0.0 * Require Dart >= 3.0 +* Upgraded `http` to 1.0.0 ## 7.0.1 diff --git a/packages/auth/pubspec.yaml b/packages/auth/pubspec.yaml index a4dff73d..63678c29 100644 --- a/packages/auth/pubspec.yaml +++ b/packages/auth/pubspec.yaml @@ -13,10 +13,10 @@ dependencies: http_parser: ^4.0.0 meta: ^1.9.0 quiver: ^3.2.0 - logging: ^1.1.0 + logging: ^1.2.0 dev_dependencies: angel3_container: ^8.0.0 - http: ^0.13.0 + http: ^1.0.0 io: ^1.0.0 test: ^1.24.0 lints: ^2.1.0 diff --git a/packages/client/CHANGELOG.md b/packages/client/CHANGELOG.md index c944400e..42f2641f 100644 --- a/packages/client/CHANGELOG.md +++ b/packages/client/CHANGELOG.md @@ -3,6 +3,7 @@ ## 8.0.0 * Require Dart >= 3.0 +* Updated `http` to 1.0.0 ## 7.0.0 diff --git a/packages/client/pubspec.yaml b/packages/client/pubspec.yaml index c9aa434b..5420f1c0 100644 --- a/packages/client/pubspec.yaml +++ b/packages/client/pubspec.yaml @@ -9,7 +9,7 @@ dependencies: angel3_http_exception: ^8.0.0 belatuk_json_serializer: ^7.0.0 collection: ^1.17.0 - http: ^0.13.0 + http: ^1.0.0 meta: ^1.9.0 path: ^1.8.0 logging: ^1.1.0 diff --git a/packages/configuration/pubspec.yaml b/packages/configuration/pubspec.yaml index dc81fdad..c50dfcf9 100644 --- a/packages/configuration/pubspec.yaml +++ b/packages/configuration/pubspec.yaml @@ -13,7 +13,7 @@ dependencies: yaml: ^3.1.0 dev_dependencies: io: ^1.0.0 - logging: ^1.1.0 + logging: ^1.2.0 lints: ^2.1.0 belatuk_pretty_logging: ^6.0.0 test: ^1.24.0 diff --git a/packages/jael/jael/CHANGELOG.md b/packages/jael/jael/CHANGELOG.md index be6f5620..5617672b 100644 --- a/packages/jael/jael/CHANGELOG.md +++ b/packages/jael/jael/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## 8.0.0 + +* Require Dart >= 3.0 + ## 7.0.0 * Require Dart >= 2.17 diff --git a/packages/jael/jael/README.md b/packages/jael/jael/README.md index 57a98f1c..5e31cfbe 100644 --- a/packages/jael/jael/README.md +++ b/packages/jael/jael/README.md @@ -15,7 +15,7 @@ In your `pubspec.yaml`: ```yaml dependencies: - jael3: ^6.0.0 + jael3: ^8.0.0 ``` ## API diff --git a/packages/jael/jael/pubspec.yaml b/packages/jael/jael/pubspec.yaml index 86dd50bd..2e0376eb 100644 --- a/packages/jael/jael/pubspec.yaml +++ b/packages/jael/jael/pubspec.yaml @@ -1,21 +1,21 @@ name: jael3 -version: 7.0.0 +version: 8.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 environment: sdk: '>=3.0.0 <4.0.0' dependencies: - args: ^2.0.0 - charcode: ^1.0.0 - belatuk_code_buffer: ^4.0.0 - belatuk_symbol_table: ^4.0.0 - source_span: ^1.0.0 - string_scanner: ^1.0.0 - collection: ^1.15.0 + args: ^2.4.0 + charcode: ^1.3.0 + belatuk_code_buffer: ^5.0.0 + belatuk_symbol_table: ^5.0.0 + source_span: ^1.10.0 + string_scanner: ^1.2.0 + collection: ^1.17.0 matcher: ^0.12.10 dev_dependencies: - lints: ^2.0.0 - test: ^1.21.0 + lints: ^2.1.0 + test: ^1.24.0 executables: jaelfmt: jaelfmt \ No newline at end of file diff --git a/packages/jael/jael/test/render/render_test.dart b/packages/jael/jael/test/render/render_test.dart index 404e2a2f..dc52c4ce 100644 --- a/packages/jael/jael/test/render/render_test.dart +++ b/packages/jael/jael/test/render/render_test.dart @@ -108,7 +108,7 @@ void main() { var buf = CodeBuffer(); var document = jael.parseDocument(template, sourceUrl: 'test.jael')!; var scope = SymbolTable(values: { - 'starters': starters, + 'starters': _starters, }); const jael.Renderer().render(document, buf, scope); @@ -153,7 +153,7 @@ void main() { var buf = CodeBuffer(); var document = jael.parseDocument(template, sourceUrl: 'test.jael')!; var scope = SymbolTable(values: { - 'starters': starters, + 'starters': _starters, }); const jael.Renderer().render(document, buf, scope); @@ -338,7 +338,7 @@ void main() { }); } -const List<_Pokemon> starters = [ +const List<_Pokemon> _starters = [ _Pokemon('Bulbasaur', 'Grass'), _Pokemon('Charmander', 'Fire'), _Pokemon('Squirtle', 'Water'), diff --git a/packages/jael/jael_language_server/lib/src/analyzer.dart b/packages/jael/jael_language_server/lib/src/analyzer.dart index 5ca4084a..a00e845c 100644 --- a/packages/jael/jael_language_server/lib/src/analyzer.dart +++ b/packages/jael/jael_language_server/lib/src/analyzer.dart @@ -7,8 +7,9 @@ class Analyzer extends Parser { final Logger logger; Analyzer(Scanner scanner, this.logger) : super(scanner); - @override - final errors = []; + //@override + //final errors = []; + SymbolTable? _scope = SymbolTable(); var allDefinitions = >[]; @@ -135,7 +136,6 @@ class Analyzer extends Parser { return element; } finally { _scope = _scope!.parent; - return null; } } diff --git a/packages/jael/jael_language_server/pubspec.yaml b/packages/jael/jael_language_server/pubspec.yaml index b4b27986..3dedb2b5 100644 --- a/packages/jael/jael_language_server/pubspec.yaml +++ b/packages/jael/jael_language_server/pubspec.yaml @@ -1,24 +1,26 @@ name: jael3_language_server -version: 7.0.0 +version: 8.0.0 description: Language Server Protocol implementation for the Jael templating engine. homepage: https://github.com/angel-dart/vscode publish_to: none environment: sdk: '>=3.0.0 <4.0.0' dependencies: - args: ^2.1.1 + args: ^2.4.0 # dart_language_server: ^0.1.16 - file: ^6.1.2 + file: ^7.0.0 io: ^1.0.0 - jael3: ^7.0.0 - jael3_preprocessor: ^7.0.0 - json_rpc_2: ^3.0.1 - logging: ^1.0.1 + jael3: ^8.0.0 + jael3_preprocessor: ^8.0.0 + belatuk_symbol_table: ^5.0.0 + json_rpc_2: ^3.0.0 + logging: ^1.2.0 path: ^1.8.0 - source_span: ^1.8.1 - string_scanner: ^1.1.0 - belatuk_symbol_table: ^4.0.0 - lints: ^2.0.0 + source_span: ^1.10.0 + string_scanner: ^1.2.0 + lints: ^2.1.0 + stream_channel: ^2.1.0 + async: ^2.11.0 executables: jael3_language_server: jael3_language_server dependency_overrides: diff --git a/packages/jael/jael_preprocessor/CHANGELOG.md b/packages/jael/jael_preprocessor/CHANGELOG.md index 20e2ca02..62288b60 100644 --- a/packages/jael/jael_preprocessor/CHANGELOG.md +++ b/packages/jael/jael_preprocessor/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.0.0 + +* Require Dart >= 3.0 +* Updated `file` to 7.0.0 + ## 7.0.0 * Require Dart >= 2.17 diff --git a/packages/jael/jael_preprocessor/pubspec.yaml b/packages/jael/jael_preprocessor/pubspec.yaml index 26c7d5ac..144ec605 100644 --- a/packages/jael/jael_preprocessor/pubspec.yaml +++ b/packages/jael/jael_preprocessor/pubspec.yaml @@ -1,19 +1,19 @@ name: jael3_preprocessor -version: 7.0.0 +version: 8.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 environment: sdk: '>=3.0.0 <4.0.0' dependencies: - file: ^6.1.0 - jael3: ^7.0.0 - belatuk_symbol_table: ^4.0.0 - collection: ^1.15.0 + file: ^7.0.0 + jael3: ^8.0.0 + belatuk_symbol_table: ^5.0.0 + collection: ^1.17.0 dev_dependencies: - belatuk_code_buffer: ^4.0.0 - test: ^1.21.0 - lints: ^2.0.0 -# dependency_overrides: -# jael3: -# path: ../jael + belatuk_code_buffer: ^5.0.0 + test: ^1.24.0 + lints: ^2.1.0 +dependency_overrides: + jael3: + path: ../jael diff --git a/packages/test/CHANGELOG.md b/packages/test/CHANGELOG.md index 54c834a8..462cbed6 100644 --- a/packages/test/CHANGELOG.md +++ b/packages/test/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## 8.0.0 + +* Require Dart >= 3.0 +* Upgraded `http` to 1.0.0 + ## 7.0.0 * Require Dart >= 2.17 diff --git a/packages/test/pubspec.yaml b/packages/test/pubspec.yaml index 1c6d7d73..8c019c41 100644 --- a/packages/test/pubspec.yaml +++ b/packages/test/pubspec.yaml @@ -1,42 +1,42 @@ name: angel3_test -version: 7.0.0 +version: 8.0.0 description: Testing utility library for the Angel3 framework. Use with package:test. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/test environment: sdk: '>=3.0.0 <4.0.0' dependencies: - angel3_client: ^7.0.0 - angel3_framework: ^7.0.0 - angel3_http_exception: ^7.0.0 - angel3_validate: ^7.0.0 - angel3_websocket: ^7.0.0 - angel3_mock_request: ^7.0.0 - angel3_container: ^7.0.0 - http: ^0.13.1 - matcher: ^0.12.10 - web_socket_channel: ^2.0.0 + angel3_client: ^8.0.0 + angel3_framework: ^8.0.0 + angel3_http_exception: ^8.0.0 + angel3_validate: ^8.0.0 + angel3_websocket: ^8.0.0 + angel3_mock_request: ^8.0.0 + angel3_container: ^8.0.0 + http: ^1.0.0 + matcher: ^0.12.16 + web_socket_channel: ^2.4.0 dev_dependencies: - test: ^1.21.0 - lints: ^2.0.0 -# dependency_overrides: -# angel3_container: -# path: ../container/angel_container -# angel3_framework: -# path: ../framework -# angel3_http_exception: -# path: ../http_exception -# angel3_model: -# path: ../model -# angel3_route: -# path: ../route -# angel3_mock_request: -# path: ../mock_request -# angel3_auth: -# path: ../auth -# angel3_client: -# path: ../client -# angel3_websocket: -# path: ../websocket -# angel3_validate: -# path: ../validate \ No newline at end of file + test: ^1.24.0 + lints: ^2.1.0 +dependency_overrides: + angel3_container: + path: ../container/angel_container + angel3_framework: + path: ../framework + angel3_http_exception: + path: ../http_exception + angel3_model: + path: ../model + angel3_route: + path: ../route + angel3_mock_request: + path: ../mock_request + angel3_auth: + path: ../auth + angel3_client: + path: ../client + angel3_websocket: + path: ../websocket + angel3_validate: + path: ../validate \ No newline at end of file diff --git a/packages/websocket/pubspec.yaml b/packages/websocket/pubspec.yaml index 7295fd71..2b857911 100644 --- a/packages/websocket/pubspec.yaml +++ b/packages/websocket/pubspec.yaml @@ -11,7 +11,7 @@ dependencies: angel3_framework: ^8.0.0 angel3_http_exception: ^8.0.0 belatuk_merge_map: ^5.0.0 - http: ^0.13.1 + http: ^1.0.0 meta: ^1.8.0 stream_channel: ^2.1.0 web_socket_channel: ^2.1.0 @@ -20,7 +20,7 @@ dependencies: dev_dependencies: angel3_container: ^8.0.0 angel3_model: ^8.0.0 - test: ^1.241.0 + test: ^1.24.0 lints: ^2.1.0 dependency_overrides: angel3_container: