Skip to content

Commit 41c5e91

Browse files
committed
Merge master.
1 parent f01c864 commit 41c5e91

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+428
-459
lines changed

.github/workflows/dart.yml

Lines changed: 181 additions & 181 deletions
Large diffs are not rendered by default.

_tests/pubspec.yaml

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,32 @@ description: Tests for AngularDart.
33
publish_to: none
44

55
environment:
6-
sdk: ">=3.1.0 <4.0.0"
6+
sdk: ">=3.6.0 <4.0.0"
7+
8+
resolution: workspace
79

810
dependencies:
911
build: ^2.4.1
10-
build_resolvers: ^2.4.1
11-
build_test: ^2.2.1
12-
collection: ^1.18.0
12+
build_resolvers: ^2.4.2
13+
build_test: ^2.2.2
14+
collection: ^1.19.1
1315
glob: ^2.1.2
14-
js: ^0.6.7
15-
logging: ^1.2.0
16-
ngcompiler: ^3.0.0-dev.2
17-
ngdart: ^8.0.0-dev.3
16+
js: ^0.7.1
17+
logging: ^1.3.0
18+
ngcompiler: ^3.0.0-dev.3
19+
ngdart: ^8.0.0-dev.4
1820
ngtest: ^5.0.0-dev.2
19-
source_gen: ^1.4.0
20-
test: ">=1.24.0 <1.25.0"
21+
source_gen: ^1.5.0
22+
test: ^1.25.9
2123

2224
dev_dependencies:
23-
analyzer: ^6.0.0
24-
build_runner: ^2.4.6
25-
build_web_compilers: ^4.0.4
26-
csslib: ^1.0.0
27-
lints: ^2.1.0
28-
meta: ^1.11.0
29-
mockito: ^5.4.3
30-
package_config: ^2.1.0
31-
source_span: ^1.10.0
25+
analyzer: ^6.5.0
26+
build_runner: ^2.4.12
27+
build_web_compilers: ^4.0.11
28+
csslib: ^1.0.2
29+
lints: ^5.0.0
30+
meta: ^1.16.0
31+
mockito: ^5.4.4
32+
package_config: ^2.1.1
33+
source_span: ^1.10.1
3234
term_glyph: ^1.2.1

_tests/pubspec_overrides.yaml

Lines changed: 0 additions & 10 deletions
This file was deleted.

examples/hello_world/pubspec.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
name: examples_hello_world
22

33
environment:
4-
sdk: ">=3.0.0 <4.0.0"
4+
sdk: ">=3.6.0 <4.0.0"
5+
6+
resolution: workspace
57

68
dependencies:
79
# No strict dependencies, we always use dependency_overrides.
810
ngdart: ^8.0.0-dev.4
911

1012
dev_dependencies:
11-
build_runner: ^2.4.6
12-
build_web_compilers: ^4.0.4
13-
lints: ^3.0.0
13+
build_runner: ^2.4.12
14+
build_web_compilers: ^4.0.11
15+
lints: ^5.0.0

examples/hello_world/pubspec_overrides.yaml

Lines changed: 0 additions & 8 deletions
This file was deleted.

goldens/pubspec.yaml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,19 @@ description: Goldens for AngularDart.
33
publish_to: none
44

55
environment:
6-
sdk: ">=3.1.0 <4.0.0"
6+
sdk: ">=3.6.0 <4.0.0"
7+
8+
resolution: workspace
79

810
dependencies:
9-
js: ^0.6.7
10-
meta: ^1.11.0
11+
js: ^0.7.1
12+
meta: ^1.16.0
1113
ngdart: ^8.0.0-dev.4
1214

1315
dev_dependencies:
14-
build_runner: ^2.4.6
15-
build_web_compilers: ^4.0.4
16-
dart_style: ^2.3.3
16+
build_runner: ^2.4.12
17+
build_web_compilers: ^4.0.11
18+
dart_style: ^2.3.7
1719
glob: ^2.1.2
18-
lints: ^3.0.0
19-
path: ^1.8.3
20+
lints: ^5.0.0
21+
path: ^1.9.1

goldens/pubspec_overrides.yaml

Lines changed: 0 additions & 8 deletions
This file was deleted.

ngast/lib/src/ast/content.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ abstract mixin class EmbeddedContentAst implements StandaloneTemplateAst {
4646
///
4747
/// May be null if and only if decorator 'select' is defined,
4848
/// but no value is assigned.
49-
/// If 'select' is not defined at all (simple <ng-content>), then the value
49+
/// If 'select' is not defined at all (simple `<ng-content>`), then the value
5050
/// will default to '*'.
5151
String? get selector;
5252

@@ -58,7 +58,7 @@ abstract mixin class EmbeddedContentAst implements StandaloneTemplateAst {
5858
/// Reference assignment.
5959
ReferenceAst? get reference;
6060

61-
/// </ng-content> that is paired to this <ng-content>.
61+
/// `</ng-content>` that is paired to this `<ng-content>`.
6262
CloseElementAst get closeComplement;
6363
set closeComplement(CloseElementAst closeComplement);
6464

ngast/lib/src/recovery_protocol/angular_analyzer_protocol.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
part of angular_ast.src.recovery_protocol.recovery_protocol;
1+
part of 'recovery_protocol.dart';
22

33
class NgAnalyzerRecoveryProtocol extends RecoveryProtocol {
44
@override

ngast/lib/src/recovery_protocol/recovery_protocol.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
library angular_ast.src.recovery_protocol.recovery_protocol;
2-
31
import '../parser/reader.dart';
42
import '../scanner.dart';
53
import '../token/tokens.dart';

0 commit comments

Comments
 (0)