Upgraded to Dart 3
This commit is contained in:
parent
f3a1ede6fb
commit
85e7463afc
16 changed files with 97 additions and 79 deletions
|
@ -3,6 +3,7 @@
|
||||||
## 8.0.0
|
## 8.0.0
|
||||||
|
|
||||||
* Require Dart >= 3.0
|
* Require Dart >= 3.0
|
||||||
|
* Upgraded `http` to 1.0.0
|
||||||
|
|
||||||
## 7.0.1
|
## 7.0.1
|
||||||
|
|
||||||
|
|
|
@ -13,10 +13,10 @@ dependencies:
|
||||||
http_parser: ^4.0.0
|
http_parser: ^4.0.0
|
||||||
meta: ^1.9.0
|
meta: ^1.9.0
|
||||||
quiver: ^3.2.0
|
quiver: ^3.2.0
|
||||||
logging: ^1.1.0
|
logging: ^1.2.0
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
angel3_container: ^8.0.0
|
angel3_container: ^8.0.0
|
||||||
http: ^0.13.0
|
http: ^1.0.0
|
||||||
io: ^1.0.0
|
io: ^1.0.0
|
||||||
test: ^1.24.0
|
test: ^1.24.0
|
||||||
lints: ^2.1.0
|
lints: ^2.1.0
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
## 8.0.0
|
## 8.0.0
|
||||||
|
|
||||||
* Require Dart >= 3.0
|
* Require Dart >= 3.0
|
||||||
|
* Updated `http` to 1.0.0
|
||||||
|
|
||||||
## 7.0.0
|
## 7.0.0
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ dependencies:
|
||||||
angel3_http_exception: ^8.0.0
|
angel3_http_exception: ^8.0.0
|
||||||
belatuk_json_serializer: ^7.0.0
|
belatuk_json_serializer: ^7.0.0
|
||||||
collection: ^1.17.0
|
collection: ^1.17.0
|
||||||
http: ^0.13.0
|
http: ^1.0.0
|
||||||
meta: ^1.9.0
|
meta: ^1.9.0
|
||||||
path: ^1.8.0
|
path: ^1.8.0
|
||||||
logging: ^1.1.0
|
logging: ^1.1.0
|
||||||
|
|
|
@ -13,7 +13,7 @@ dependencies:
|
||||||
yaml: ^3.1.0
|
yaml: ^3.1.0
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
io: ^1.0.0
|
io: ^1.0.0
|
||||||
logging: ^1.1.0
|
logging: ^1.2.0
|
||||||
lints: ^2.1.0
|
lints: ^2.1.0
|
||||||
belatuk_pretty_logging: ^6.0.0
|
belatuk_pretty_logging: ^6.0.0
|
||||||
test: ^1.24.0
|
test: ^1.24.0
|
||||||
|
|
|
@ -1,5 +1,9 @@
|
||||||
# Change Log
|
# Change Log
|
||||||
|
|
||||||
|
## 8.0.0
|
||||||
|
|
||||||
|
* Require Dart >= 3.0
|
||||||
|
|
||||||
## 7.0.0
|
## 7.0.0
|
||||||
|
|
||||||
* Require Dart >= 2.17
|
* Require Dart >= 2.17
|
||||||
|
|
|
@ -15,7 +15,7 @@ In your `pubspec.yaml`:
|
||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
dependencies:
|
dependencies:
|
||||||
jael3: ^6.0.0
|
jael3: ^8.0.0
|
||||||
```
|
```
|
||||||
|
|
||||||
## API
|
## API
|
||||||
|
|
|
@ -1,21 +1,21 @@
|
||||||
name: jael3
|
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.
|
description: A simple server-side HTML templating engine for Dart. Comparable to Blade or Liquid.
|
||||||
homepage: https://angel3-framework.web.app/
|
homepage: https://angel3-framework.web.app/
|
||||||
repository: https://github.com/dukefirehawk/angel/tree/master/packages/jael/jael
|
repository: https://github.com/dukefirehawk/angel/tree/master/packages/jael/jael
|
||||||
environment:
|
environment:
|
||||||
sdk: '>=3.0.0 <4.0.0'
|
sdk: '>=3.0.0 <4.0.0'
|
||||||
dependencies:
|
dependencies:
|
||||||
args: ^2.0.0
|
args: ^2.4.0
|
||||||
charcode: ^1.0.0
|
charcode: ^1.3.0
|
||||||
belatuk_code_buffer: ^4.0.0
|
belatuk_code_buffer: ^5.0.0
|
||||||
belatuk_symbol_table: ^4.0.0
|
belatuk_symbol_table: ^5.0.0
|
||||||
source_span: ^1.0.0
|
source_span: ^1.10.0
|
||||||
string_scanner: ^1.0.0
|
string_scanner: ^1.2.0
|
||||||
collection: ^1.15.0
|
collection: ^1.17.0
|
||||||
matcher: ^0.12.10
|
matcher: ^0.12.10
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
lints: ^2.0.0
|
lints: ^2.1.0
|
||||||
test: ^1.21.0
|
test: ^1.24.0
|
||||||
executables:
|
executables:
|
||||||
jaelfmt: jaelfmt
|
jaelfmt: jaelfmt
|
|
@ -108,7 +108,7 @@ void main() {
|
||||||
var buf = CodeBuffer();
|
var buf = CodeBuffer();
|
||||||
var document = jael.parseDocument(template, sourceUrl: 'test.jael')!;
|
var document = jael.parseDocument(template, sourceUrl: 'test.jael')!;
|
||||||
var scope = SymbolTable<dynamic>(values: {
|
var scope = SymbolTable<dynamic>(values: {
|
||||||
'starters': starters,
|
'starters': _starters,
|
||||||
});
|
});
|
||||||
|
|
||||||
const jael.Renderer().render(document, buf, scope);
|
const jael.Renderer().render(document, buf, scope);
|
||||||
|
@ -153,7 +153,7 @@ void main() {
|
||||||
var buf = CodeBuffer();
|
var buf = CodeBuffer();
|
||||||
var document = jael.parseDocument(template, sourceUrl: 'test.jael')!;
|
var document = jael.parseDocument(template, sourceUrl: 'test.jael')!;
|
||||||
var scope = SymbolTable<dynamic>(values: {
|
var scope = SymbolTable<dynamic>(values: {
|
||||||
'starters': starters,
|
'starters': _starters,
|
||||||
});
|
});
|
||||||
|
|
||||||
const jael.Renderer().render(document, buf, scope);
|
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('Bulbasaur', 'Grass'),
|
||||||
_Pokemon('Charmander', 'Fire'),
|
_Pokemon('Charmander', 'Fire'),
|
||||||
_Pokemon('Squirtle', 'Water'),
|
_Pokemon('Squirtle', 'Water'),
|
||||||
|
|
|
@ -7,8 +7,9 @@ class Analyzer extends Parser {
|
||||||
final Logger logger;
|
final Logger logger;
|
||||||
Analyzer(Scanner scanner, this.logger) : super(scanner);
|
Analyzer(Scanner scanner, this.logger) : super(scanner);
|
||||||
|
|
||||||
@override
|
//@override
|
||||||
final errors = <JaelError>[];
|
//final errors = <JaelError>[];
|
||||||
|
|
||||||
SymbolTable<JaelObject>? _scope = SymbolTable<JaelObject>();
|
SymbolTable<JaelObject>? _scope = SymbolTable<JaelObject>();
|
||||||
var allDefinitions = <Variable<JaelObject>>[];
|
var allDefinitions = <Variable<JaelObject>>[];
|
||||||
|
|
||||||
|
@ -135,7 +136,6 @@ class Analyzer extends Parser {
|
||||||
return element;
|
return element;
|
||||||
} finally {
|
} finally {
|
||||||
_scope = _scope!.parent;
|
_scope = _scope!.parent;
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,24 +1,26 @@
|
||||||
name: jael3_language_server
|
name: jael3_language_server
|
||||||
version: 7.0.0
|
version: 8.0.0
|
||||||
description: Language Server Protocol implementation for the Jael templating engine.
|
description: Language Server Protocol implementation for the Jael templating engine.
|
||||||
homepage: https://github.com/angel-dart/vscode
|
homepage: https://github.com/angel-dart/vscode
|
||||||
publish_to: none
|
publish_to: none
|
||||||
environment:
|
environment:
|
||||||
sdk: '>=3.0.0 <4.0.0'
|
sdk: '>=3.0.0 <4.0.0'
|
||||||
dependencies:
|
dependencies:
|
||||||
args: ^2.1.1
|
args: ^2.4.0
|
||||||
# dart_language_server: ^0.1.16
|
# dart_language_server: ^0.1.16
|
||||||
file: ^6.1.2
|
file: ^7.0.0
|
||||||
io: ^1.0.0
|
io: ^1.0.0
|
||||||
jael3: ^7.0.0
|
jael3: ^8.0.0
|
||||||
jael3_preprocessor: ^7.0.0
|
jael3_preprocessor: ^8.0.0
|
||||||
json_rpc_2: ^3.0.1
|
belatuk_symbol_table: ^5.0.0
|
||||||
logging: ^1.0.1
|
json_rpc_2: ^3.0.0
|
||||||
|
logging: ^1.2.0
|
||||||
path: ^1.8.0
|
path: ^1.8.0
|
||||||
source_span: ^1.8.1
|
source_span: ^1.10.0
|
||||||
string_scanner: ^1.1.0
|
string_scanner: ^1.2.0
|
||||||
belatuk_symbol_table: ^4.0.0
|
lints: ^2.1.0
|
||||||
lints: ^2.0.0
|
stream_channel: ^2.1.0
|
||||||
|
async: ^2.11.0
|
||||||
executables:
|
executables:
|
||||||
jael3_language_server: jael3_language_server
|
jael3_language_server: jael3_language_server
|
||||||
dependency_overrides:
|
dependency_overrides:
|
||||||
|
|
|
@ -1,5 +1,10 @@
|
||||||
# Change Log
|
# Change Log
|
||||||
|
|
||||||
|
## 8.0.0
|
||||||
|
|
||||||
|
* Require Dart >= 3.0
|
||||||
|
* Updated `file` to 7.0.0
|
||||||
|
|
||||||
## 7.0.0
|
## 7.0.0
|
||||||
|
|
||||||
* Require Dart >= 2.17
|
* Require Dart >= 2.17
|
||||||
|
|
|
@ -1,19 +1,19 @@
|
||||||
name: jael3_preprocessor
|
name: jael3_preprocessor
|
||||||
version: 7.0.0
|
version: 8.0.0
|
||||||
description: A pre-processor for resolving blocks and includes within Jael templates.
|
description: A pre-processor for resolving blocks and includes within Jael templates.
|
||||||
homepage: https://angel3-framework.web.app/
|
homepage: https://angel3-framework.web.app/
|
||||||
repository: https://github.com/dukefirehawk/angel/tree/master/packages/jael/jael_preprocessor
|
repository: https://github.com/dukefirehawk/angel/tree/master/packages/jael/jael_preprocessor
|
||||||
environment:
|
environment:
|
||||||
sdk: '>=3.0.0 <4.0.0'
|
sdk: '>=3.0.0 <4.0.0'
|
||||||
dependencies:
|
dependencies:
|
||||||
file: ^6.1.0
|
file: ^7.0.0
|
||||||
jael3: ^7.0.0
|
jael3: ^8.0.0
|
||||||
belatuk_symbol_table: ^4.0.0
|
belatuk_symbol_table: ^5.0.0
|
||||||
collection: ^1.15.0
|
collection: ^1.17.0
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
belatuk_code_buffer: ^4.0.0
|
belatuk_code_buffer: ^5.0.0
|
||||||
test: ^1.21.0
|
test: ^1.24.0
|
||||||
lints: ^2.0.0
|
lints: ^2.1.0
|
||||||
# dependency_overrides:
|
dependency_overrides:
|
||||||
# jael3:
|
jael3:
|
||||||
# path: ../jael
|
path: ../jael
|
||||||
|
|
|
@ -1,5 +1,10 @@
|
||||||
# Change Log
|
# Change Log
|
||||||
|
|
||||||
|
## 8.0.0
|
||||||
|
|
||||||
|
* Require Dart >= 3.0
|
||||||
|
* Upgraded `http` to 1.0.0
|
||||||
|
|
||||||
## 7.0.0
|
## 7.0.0
|
||||||
|
|
||||||
* Require Dart >= 2.17
|
* Require Dart >= 2.17
|
||||||
|
|
|
@ -1,42 +1,42 @@
|
||||||
name: angel3_test
|
name: angel3_test
|
||||||
version: 7.0.0
|
version: 8.0.0
|
||||||
description: Testing utility library for the Angel3 framework. Use with package:test.
|
description: Testing utility library for the Angel3 framework. Use with package:test.
|
||||||
homepage: https://angel3-framework.web.app/
|
homepage: https://angel3-framework.web.app/
|
||||||
repository: https://github.com/dukefirehawk/angel/tree/master/packages/test
|
repository: https://github.com/dukefirehawk/angel/tree/master/packages/test
|
||||||
environment:
|
environment:
|
||||||
sdk: '>=3.0.0 <4.0.0'
|
sdk: '>=3.0.0 <4.0.0'
|
||||||
dependencies:
|
dependencies:
|
||||||
angel3_client: ^7.0.0
|
angel3_client: ^8.0.0
|
||||||
angel3_framework: ^7.0.0
|
angel3_framework: ^8.0.0
|
||||||
angel3_http_exception: ^7.0.0
|
angel3_http_exception: ^8.0.0
|
||||||
angel3_validate: ^7.0.0
|
angel3_validate: ^8.0.0
|
||||||
angel3_websocket: ^7.0.0
|
angel3_websocket: ^8.0.0
|
||||||
angel3_mock_request: ^7.0.0
|
angel3_mock_request: ^8.0.0
|
||||||
angel3_container: ^7.0.0
|
angel3_container: ^8.0.0
|
||||||
http: ^0.13.1
|
http: ^1.0.0
|
||||||
matcher: ^0.12.10
|
matcher: ^0.12.16
|
||||||
web_socket_channel: ^2.0.0
|
web_socket_channel: ^2.4.0
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
test: ^1.21.0
|
test: ^1.24.0
|
||||||
lints: ^2.0.0
|
lints: ^2.1.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
|
|
@ -11,7 +11,7 @@ dependencies:
|
||||||
angel3_framework: ^8.0.0
|
angel3_framework: ^8.0.0
|
||||||
angel3_http_exception: ^8.0.0
|
angel3_http_exception: ^8.0.0
|
||||||
belatuk_merge_map: ^5.0.0
|
belatuk_merge_map: ^5.0.0
|
||||||
http: ^0.13.1
|
http: ^1.0.0
|
||||||
meta: ^1.8.0
|
meta: ^1.8.0
|
||||||
stream_channel: ^2.1.0
|
stream_channel: ^2.1.0
|
||||||
web_socket_channel: ^2.1.0
|
web_socket_channel: ^2.1.0
|
||||||
|
@ -20,7 +20,7 @@ dependencies:
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
angel3_container: ^8.0.0
|
angel3_container: ^8.0.0
|
||||||
angel3_model: ^8.0.0
|
angel3_model: ^8.0.0
|
||||||
test: ^1.241.0
|
test: ^1.24.0
|
||||||
lints: ^2.1.0
|
lints: ^2.1.0
|
||||||
dependency_overrides:
|
dependency_overrides:
|
||||||
angel3_container:
|
angel3_container:
|
||||||
|
|
Loading…
Reference in a new issue