GitHub sync

.gitignore

@@ -1,15 +1,8 @@
-# Files and directories created by pub
+# Ignore artifacts generated by "pub".
 .packages
-.pub/
-packages
+/*/build
+.pub
 pubspec.lock
 
-# Created by pkg/build_runner
+# Files generated by dart tools.
 .dart_tool
-
-# Directory created by dartdoc
-doc/api/
-
-
-# Files generated by dart test/source_gen/template_compiler/generate.dart
-test/source_gen/template_compiler/test_files/**/*.template_*.dart

.travis.yml

@@ -4,23 +4,4 @@ dart:
   - dev
   - stable
   - 1.23.0
-addons:
-  # otherwise a number of tests in test/security/html_sanitizer_test.dart fail
-  firefox: "latest"
-before_script: ./tool/travis_before_script.sh
-dart_task:
-  - test: -P travis -p vm
-    xvfb: false
-  # Disable parallelism on Firefox (-j 1)
-  # Causes flakiness – need to investigate
-  - test: -P travis -p firefox -j 1
-  - test: -P travis -p dartium
-    install_dartium: true
-  - dartfmt
-  # Treat warnings in lib directory as fatal
-  - dartanalyzer: --fatal-warnings .
-  # TODO(kevmoo) Enable codegen tests when issue is fixed
-  # https://github.com/dart-lang/angular2/issues/272
-cache:
-  directories:
-    - $HOME/.pub-cache
+script: ./tool/travis.sh

AUTHORS

@@ -1,5 +1,5 @@
 # Below is a list of people and organizations that have contributed to the
-# Angular 2 Dart project. Names should be added to the list like so:
+# AngularDart project. Names should be added to the list like so:
 #
 #   Name/Organization <email address>
 

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 ## <a name="question"></a> Got a Question or Problem?
 
-If you have questions about how to *use* Angular, please direct them to the
+If you have questions about how to *use* AngularDart, please direct them to the
 [Dart Web Group][web-group] discussion list or [Stack Overflow][stack-overflow].
 
 ## <a name="issue"></a> Found an Issue?
@@ -82,8 +82,8 @@ quick process, we promise!
 
 [web-group]: https://groups.google.com/a/dartlang.org/forum/#!forum/web
 [corporate-cla]: http://code.google.com/legal/corporate-cla-v1.0.html
-[github]: https://github.com/dart-lang/angular2
-[github-new-issue]: https://github.com/dart-lang/angular2/issues/new
-[github-pulls]: https://github.com/dart-lang/angular2/pulls
+[github]: https://github.com/dart-lang/angular
+[github-new-issue]: https://github.com/dart-lang/angular/issues/new
+[github-pulls]: https://github.com/dart-lang/angular/pulls
 [individual-cla]: http://code.google.com/legal/individual-cla-v1.0.html
 [stack-overflow]: https://stackoverflow.com/questions/tagged/angular-dart

README.md

@@ -1,65 +1,30 @@
-![AngularDart](https://raw.githubusercontent.com/dart-lang/logos/master/logos_and_wordmarks/angulardart-logo.png)
-
-[AngularDart][angular_dart] is a productive web application framework that
-powers some of Google's most critical applications.
+# AngularDart
 
 <!-- Badges -->
 
 [![Pub Package](https://img.shields.io/pub/v/angular2.svg)](https://pub.dartlang.org/packages/angular2)
 [![Build Status](https://travis-ci.org/dart-lang/angular2.svg?branch=master)](https://travis-ci.org/dart-lang/angular2)
 [![Gitter](https://img.shields.io/gitter/room/dart-lang/angular2.svg)](https://gitter.im/dart-lang/angular2)
 
-It's built on [Dart][dart_web] and is used extensively by Google 
-[AdWords][ad_words], [AdSense][ad_sense], [Fiber][fiber], and much much more!
-
-[![Built with AngularDart](https://2.bp.blogspot.com/-T50YZP5hlW4/Vv07k1PPVmI/AAAAAAAAM_Q/kVo8eImMOFUWLYqXg_xGzaWPvvlO7lhng/s0/adwords-dart.png)][ad_words]
-
-## Overview
-
- * [Pub package][pub]
- * [Source code](https://github.com/dart-lang/angular2)
- * [Issues](https://github.com/dart-lang/angular2/issues)
- * [Mailing List](https://groups.google.com/a/dartlang.org/forum/#!forum/web)
- * [Documentation][angular_dart]
- * [Contributor guidelines][contribute]
- * [Logo](https://raw.githubusercontent.com/dart-lang/logos/master/logos_and_wordmarks/angulardart-logo.svg)
+AngularDart is a fast and productive web framework provided by [Dart][].
 
-[ad_sense]: http://news.dartlang.org/2016/10/google-adsense-angular-dart.html
-[ad_words]: http://news.dartlang.org/2016/03/the-new-adwords-ui-uses-dart-we-asked.html
-[fiber]: http://news.dartlang.org/2015/11/how-google-uses-angular-2-with-dart.html
-[angular_dart]: https://webdev.dartlang.org/angular
-[dart_web]: https://webdev.dartlang.org/
-[pub]: https://pub.dartlang.org/packages/angular2
-[contribute]: https://github.com/dart-lang/angular2/blob/master/CONTRIBUTING.md
-
-## Examples
+[Dart]: https://webdev.dartlang.org/angular/
 
-Is this your first time using AngularDart?
+![AdWords is written in AngularDart](https://webdev.dartlang.org/angular/images/Google-AdWords-Next-Interface-800x342.png)
 
-* Start with a [tutorial][tutorial] to build a fully working application,
-  including routing, HTTP networking, and more.
+---
 
-* Next, try a [code-lab on writing material design applications][code_lab],
-  which uses the [`angular_components`](https://webdev.dartlang.org/components)
-  package for production-quality material design widgets built and used by
-  Google.
+## Packages
 
-You may also be interested in a set of [community contributed tutorials][comm].
+This repository is the home of a set of packages for AngularDart:
 
-[tutorial]: https://webdev.dartlang.org/angular/tutorial
-[code_lab]: https://codelabs.developers.google.com/codelabs/your-first-angulardart-web-app/
-[comm]: https://dart.academy/tag/angular2/
+### [angular](angular/README.md)
 
-## Installation
+The web framework.
 
-AngularDart is available as the `angular2` package on [pub][]. We recommend
-following our [tutorial][] to get started.
+### [angular_test](angular_test/README.md)
 
-> For historic reasons, this package is called `angular2`, instead of an older
-> implementation called `angular`. We hope to rename this package to avoid
-> confusion in the near future - [track our progress][track_rename].
-
-[track_rename]: https://github.com/dart-lang/angular2/issues/78
+High-level but optional testing API.
 
 ## Contributing
 
@@ -69,3 +34,4 @@ Please read and agree to our [contribution guidelines][contribute]. We sync
 internally periodically, and test against thousands of component and e2e tests
 so please excuse small delays in merging pull requests.
 
+[contribute]: https://github.com/dart-lang/angular2/blob/master/CONTRIBUTING.md

_tests/pubspec.yaml

@@ -0,0 +1,20 @@
+name: _tests
+version: 0.0.1
+author: Dart Team <web@dartlang.org>
+description: Tests for the angular web framework.
+homepage: https://webdev.dartlang.org/angular
+documentation: https://webdev.dartlang.org/angular/api
+environment:
+  sdk: '>=1.23.0 <2.0.0'
+dependencies:
+  angular: 4.0.0-dev
+  angular_test: '^1.0.0-beta'
+  build_runner: ^0.3.4
+  build_test: ^0.6.0
+  mockito: '>=0.11.0 <3.0.0'
+  test: ^0.12.6
+dependency_overrides:
+  angular:
+    path: ../angular
+  angular_test:
+    path: ../angular_test

test/api_test.dart → _tests/test/api_test.dart

@@ -1,3 +1,4 @@
+@Skip('Test broken by package refactoring. See issue #466')
 @TestOn('!browser')
 import 'package:analyzer/dart/element/element.dart';
 

test/common/control_mocks.dart → _tests/test/common/control_mocks.dart

@@ -1,5 +1,5 @@
-import 'package:angular2/angular2.dart';
 import 'package:mockito/mockito.dart';
+import 'package:angular/angular.dart';
 
 @proxy
 class MockNgControl extends Mock implements NgControl {}

test/common/directives/for_test.dart → _tests/test/common/directives/for_test.dart

@@ -3,10 +3,11 @@
 library angular2.test.common.directives.for_test;
 
 import 'dart:html';
-import 'package:angular2/angular2.dart';
-import "package:angular2/src/testing/internal.dart";
+
 import 'package:angular_test/angular_test.dart';
 import 'package:test/test.dart';
+import 'package:angular/angular.dart';
+import "package:angular/src/testing/internal.dart";
 
 void main() {
   group('ngFor', () {

test/common/directives/if_test.dart → _tests/test/common/directives/if_test.dart

@@ -4,9 +4,9 @@ library angular2.test.common.directives.if_test;
 
 import 'dart:html';
 
-import 'package:angular2/angular2.dart';
 import 'package:angular_test/angular_test.dart';
 import 'package:test/test.dart';
+import 'package:angular/angular.dart';
 
 void main() {
   group('ngIf', () {

test/common/directives/ng_class_test.dart → _tests/test/common/directives/ng_class_test.dart

@@ -1,9 +1,9 @@
 @Tags(const ['codegen'])
 @TestOn('browser')
 
-import 'package:angular2/angular2.dart';
 import 'package:angular_test/angular_test.dart';
 import 'package:test/test.dart';
+import 'package:angular/angular.dart';
 
 void main() {
   group('ngClass', () {

test/common/directives/ng_style_test.dart → _tests/test/common/directives/ng_style_test.dart

@@ -1,9 +1,9 @@
 @Tags(const ['codegen'])
 @TestOn('browser')
 
-import 'package:angular2/angular2.dart';
 import 'package:angular_test/angular_test.dart';
 import 'package:test/test.dart';
+import 'package:angular/angular.dart';
 
 void main() {
   group('ngStyle', () {

test/common/directives/ng_switch_test.dart → _tests/test/common/directives/ng_switch_test.dart

@@ -1,9 +1,9 @@
 @Tags(const ['codegen'])
 @TestOn('browser')
 
-import 'package:angular2/angular2.dart';
 import 'package:angular_test/angular_test.dart';
 import 'package:test/test.dart';
+import 'package:angular/angular.dart';
 
 void main() {
   group('ngSwitch', () {

test/common/directives/ng_template_outlet_test.dart → _tests/test/common/directives/ng_template_outlet_test.dart

@@ -4,13 +4,13 @@ library angular2.test.common.directives.ng_template_outlet_test;
 
 import 'dart:html';
 
-import 'package:angular2/angular2.dart';
-import "package:angular2/src/common/directives/ng_template_outlet.dart"
-    show NgTemplateOutlet;
-import 'package:angular2/src/debug/debug_node.dart';
-import 'package:angular2/src/testing/matchers.dart';
 import 'package:angular_test/angular_test.dart';
 import 'package:test/test.dart';
+import 'package:angular/angular.dart';
+import "package:angular/src/common/directives/ng_template_outlet.dart"
+    show NgTemplateOutlet;
+import 'package:angular/src/debug/debug_node.dart';
+import 'package:angular/src/testing/matchers.dart';
 
 void main() {
   group("insert", () {

test/common/directives/non_bindable_test.dart → _tests/test/common/directives/non_bindable_test.dart

@@ -3,9 +3,9 @@
 
 import 'dart:html';
 
-import 'package:angular2/angular2.dart';
 import 'package:angular_test/angular_test.dart';
 import 'package:test/test.dart';
+import 'package:angular/angular.dart';
 
 void main() {
   group('ngNonBindable', () {

test/common/forms/accessor_test.dart → _tests/test/common/forms/accessor_test.dart

@@ -4,10 +4,10 @@ library angular2.test.common.forms.accessor_test;
 
 import 'dart:js_util' as js_util;
 
-import 'package:angular2/angular2.dart';
-import 'package:angular2/src/common/forms/directives/control_value_accessor.dart';
 import 'package:angular_test/angular_test.dart';
 import 'package:test/test.dart';
+import 'package:angular/angular.dart';
+import 'package:angular/src/common/forms/directives/control_value_accessor.dart';
 
 void main() {
   group('accessor test', () {

test/common/forms/directives_test.dart → _tests/test/common/forms/directives_test.dart

@@ -1,12 +1,12 @@
 @TestOn('browser')
 import 'dart:html';
 
-import 'package:angular2/angular2.dart';
-import 'package:angular2/src/common/forms/directives/shared.dart'
-    show selectValueAccessor, composeValidators;
-import 'package:angular2/src/testing/internal.dart';
 import 'package:mockito/mockito.dart';
 import 'package:test/test.dart';
+import 'package:angular/angular.dart';
+import 'package:angular/src/common/forms/directives/shared.dart'
+    show selectValueAccessor, composeValidators;
+import 'package:angular/src/testing/internal.dart';
 
 import '../../test_util.dart';
 import '../control_mocks.dart';

test/common/forms/form_builder_test.dart → _tests/test/common/forms/form_builder_test.dart

@@ -1,6 +1,6 @@
 @TestOn('browser')
-import 'package:angular2/angular2.dart';
 import 'package:test/test.dart';
+import 'package:angular/angular.dart';
 
 Map<String, dynamic> _syncValidator(AbstractControl c) {
   return null;

test/common/forms/integration_test.dart → _tests/test/common/forms/integration_test.dart

@@ -3,11 +3,11 @@
 import 'dart:async';
 import 'dart:html';
 
-import 'package:angular2/angular2.dart';
-import 'package:angular2/src/debug/debug_node.dart';
-import 'package:angular2/src/testing/utils.dart';
 import 'package:angular_test/angular_test.dart';
 import 'package:test/test.dart';
+import 'package:angular/angular.dart';
+import 'package:angular/src/debug/debug_node.dart';
+import 'package:angular/src/testing/utils.dart';
 
 void main() {
   group('ngForm', () {

test/common/forms/model_test.dart → _tests/test/common/forms/model_test.dart

@@ -1,8 +1,8 @@
 @Tags(const ['codegen'])
 @TestOn('browser')
 
-import 'package:angular2/angular2.dart';
 import 'package:test/test.dart';
+import 'package:angular/angular.dart';
 
 void main() {
   group('Form Model', () {

test/common/forms/ng_control_repeated_test.dart → _tests/test/common/forms/ng_control_repeated_test.dart

@@ -2,9 +2,9 @@
 @TestOn('browser')
 import 'dart:async';
 
-import 'package:angular2/angular2.dart';
 import 'package:angular_test/angular_test.dart';
 import 'package:test/test.dart';
+import 'package:angular/angular.dart';
 
 void main() {
   tearDown(disposeAnyRunningTest);

test/common/forms/validators_test.dart → _tests/test/common/forms/validators_test.dart

@@ -1,6 +1,6 @@
 @TestOn('browser')
-import 'package:angular2/angular2.dart';
 import 'package:test/test.dart';
+import 'package:angular/angular.dart';
 
 void main() {
   var validator = (String key, dynamic error) {

test/common/pipes/async_pipe_test.dart → _tests/test/common/pipes/async_pipe_test.dart

@@ -2,9 +2,9 @@
 
 import 'dart:async';
 
-import 'package:angular2/angular2.dart';
 import 'package:mockito/mockito.dart';
 import 'package:test/test.dart';
+import 'package:angular/angular.dart';
 
 import '../../test_util.dart';
 import '../control_mocks.dart';

test/common/pipes/date_pipe_test.dart → _tests/test/common/pipes/date_pipe_test.dart

@@ -1,7 +1,7 @@
 @TestOn('browser')
 
-import 'package:angular2/angular2.dart';
 import 'package:test/test.dart';
+import 'package:angular/angular.dart';
 
 void main() {
   group('DatePipe', () {

test/common/pipes/json_pipe_test.dart → _tests/test/common/pipes/json_pipe_test.dart

@@ -2,9 +2,9 @@
 @Tags(const ['codegen'])
 import 'dart:convert';
 
-import 'package:angular2/angular2.dart';
 import 'package:angular_test/angular_test.dart';
 import 'package:test/test.dart';
+import 'package:angular/angular.dart';
 
 void main() {
   group('JsonPipe', () {

test/common/pipes/lowercase_pipe_test.dart → _tests/test/common/pipes/lowercase_pipe_test.dart

@@ -1,5 +1,5 @@
-import "package:angular2/src/common/pipes/lowercase_pipe.dart";
 import 'package:test/test.dart';
+import "package:angular/src/common/pipes/lowercase_pipe.dart";
 
 import '../../test_util.dart';