web-angular: Ensure compatibility between all angular packages (#505)

dart-archive · May 17, 2018 · 3e9080e · 3e9080e
1 parent 7089961
commit 3e9080e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,9 @@
 ## 2.0.1
 
-- Updated the dependency on `package:build_web_compilers` in all `web-`
-  templates.
+- All `web-` templates:
+  - Updated the dependency on `package:build_web_compilers`.
+- `web-angular` template:
+  - Add dependency override on `angular_compiler` to ensure compatibility.
 
 ## 2.0.0
 

diff --git a/lib/generators/web_angular_data.dart b/lib/generators/web_angular_data.dart
@@ -113,7 +113,10 @@ CgplbnZpcm9ubWVudDoKICBzZGs6ICc+PTIuMC4wLWRldi41MS4wIDwyLjAuMCcKCmRlcGVuZGVu
 Y2llczoKICBhbmd1bGFyOiBeNS4wLjAtYWxwaGErMTEKICBhbmd1bGFyX2NvbXBvbmVudHM6IF4w
 LjkuMC1hbHBoYSsxMQoKZGV2X2RlcGVuZGVuY2llczoKICBhbmd1bGFyX3Rlc3Q6IF4yLjAuMC1h
 bHBoYSs5CiAgYnVpbGRfcnVubmVyOiBeMC44LjcKICBidWlsZF90ZXN0OiBeMC4xMC4wCiAgYnVp
-bGRfd2ViX2NvbXBpbGVyczogXjAuNC4wCiAgdGVzdDogXjAuMTIuMzAK''',
+bGRfd2ViX2NvbXBpbGVyczogXjAuNC4wCiAgdGVzdDogXjAuMTIuMzAKCmRlcGVuZGVuY3lfb3Zl
+cnJpZGVzOgogICMgTmVlZGVkIHRvIGVuc3VyZSAwLjQuMC1hbHBoYSsxMiAob3IgZ3JlYXRlcikg
+aXMgbm90IGFjY2Vzc2VkCiAgIyBodHRwczovL2dpdGh1Yi5jb20vZGFydC1sYW5nL3N0YWdlaGFu
+ZC9pc3N1ZXMvNTA2CiAgYW5ndWxhcl9jb21waWxlcjogMC40LjAtYWxwaGErMTEK''',
   'test/app_test.dart',
   'text',
   '''QFRlc3RPbignYnJvd3NlcicpCmltcG9ydCAncGFja2FnZTphbmd1bGFyX3Rlc3QvYW5ndWxhcl90

diff --git a/templates/web-angular/pubspec.yaml b/templates/web-angular/pubspec.yaml
@@ -17,3 +17,8 @@ dev_dependencies:
   build_test: ^0.10.0
   build_web_compilers: ^0.4.0
   test: ^0.12.30
+
+dependency_overrides:
+  # Needed to ensure 0.4.0-alpha+12 (or greater) is not accessed
+  # https://github.com/dart-lang/stagehand/issues/506
+  angular_compiler: 0.4.0-alpha+11