mrpastewart/platform
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgraded to Dart 3

Browse source
This commit is contained in:
thomashii@dukefirehawk.com 2023-05-27 06:58:32 +08:00
parent f3a1ede6fb
commit 85e7463afc
16 changed files with 97 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
packages/auth/CHANGELOG.md
View file

@ -3,6 +3,7 @@
## 8.0.0
* Require Dart >= 3.0
* Upgraded `http` to 1.0.0
## 7.0.1

4
packages/auth/pubspec.yaml
View file

@ -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

1
packages/client/CHANGELOG.md
View file

@ -3,6 +3,7 @@
## 8.0.0
* Require Dart >= 3.0
* Updated `http` to 1.0.0
## 7.0.0

2
packages/client/pubspec.yaml
View file

@ -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

2
packages/configuration/pubspec.yaml
View file

@ -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

4
packages/jael/jael/CHANGELOG.md
View file

@ -1,5 +1,9 @@
# Change Log
## 8.0.0
* Require Dart >= 3.0
## 7.0.0
* Require Dart >= 2.17

2
packages/jael/jael/README.md
View file

@ -15,7 +15,7 @@ In your `pubspec.yaml`:
```yaml
dependencies:
jael3: ^6.0.0
jael3: ^8.0.0
```
## API

20
packages/jael/jael/pubspec.yaml
View file

@ -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

6
packages/jael/jael/test/render/render_test.dart
View file

@ -108,7 +108,7 @@ void main() {
var buf = CodeBuffer();
var document = jael.parseDocument(template, sourceUrl: 'test.jael')!;
var scope = SymbolTable<dynamic>(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<dynamic>(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'),

6
packages/jael/jael_language_server/lib/src/analyzer.dart
View file

@ -7,8 +7,9 @@ class Analyzer extends Parser {
final Logger logger;
Analyzer(Scanner scanner, this.logger) : super(scanner);
@override
final errors = <JaelError>[];
//@override
//final errors = <JaelError>[];
SymbolTable<JaelObject>? _scope = SymbolTable<JaelObject>();
var allDefinitions = <Variable<JaelObject>>[];
@ -135,7 +136,6 @@ class Analyzer extends Parser {
return element;
} finally {
_scope = _scope!.parent;
return null;
}
}

24
packages/jael/jael_language_server/pubspec.yaml
View file

@ -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:

5
packages/jael/jael_preprocessor/CHANGELOG.md
View file

@ -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

22
packages/jael/jael_preprocessor/pubspec.yaml
View file

@ -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

5
packages/test/CHANGELOG.md
View file

@ -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

68
packages/test/pubspec.yaml
View file

@ -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
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

4
packages/websocket/pubspec.yaml
View file

@ -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: