angular · tbosch · Jan 6, 2016
diff --git a/gulpfile.js b/gulpfile.js
@@ -177,8 +177,8 @@ var PAYLOAD_TESTS_CONFIG = {
       return path.join(__dirname, CONFIG.dest.js.prod.es5, 'payload_tests', caseName,
                        'ts/' + packaging);
     },
-    systemjs: {sizeLimits: {'uncompressed': 870 * 1024, 'gzip level=9': 165 * 1024}},
-    webpack: {sizeLimits: {'uncompressed': 550 * 1024, 'gzip level=9': 120 * 1024}}
+    systemjs: {sizeLimits: {'uncompressed': 880 * 1024, 'gzip level=9': 170 * 1024}},
+    webpack: {sizeLimits: {'uncompressed': 560 * 1024, 'gzip level=9': 130 * 1024}}
   }
 };
 
@@ -640,7 +640,7 @@ gulp.task('buildRouter.dev', function() {
 gulp.task('test.unit.dart', function(done) {
   printModulesWarning();
   runSequence('build/tree.dart', 'build/pure-packages.dart', '!build/pubget.angular2.dart',
-              '!build/change_detect.dart', '!build/remove-pub-symlinks', function(error) {
+              '!build/remove-pub-symlinks', function(error) {
                 var watch = require('./tools/build/watch');
 
                 // if initial build failed (likely due to build or formatting step) then exit
@@ -779,7 +779,7 @@ gulp.task('!checkAndReport.payload.js', function() {
 
 gulp.task('watch.dart.dev', function(done) {
   runSequence('build/tree.dart', 'build/pure-packages.dart', '!build/pubget.angular2.dart',
-              '!build/change_detect.dart', '!build/remove-pub-symlinks', function(error) {
+              '!build/remove-pub-symlinks', function(error) {
                 var watch = require('./tools/build/watch');
 
                 // if initial build failed (likely due to build or formatting step) then exit
@@ -789,7 +789,8 @@ gulp.task('watch.dart.dev', function(done) {
                   return;
                 }
 
-                watch(['modules/angular2/**'], {ignoreInitial: true}, ['!build/tree.dart']);
+                watch(['modules/angular2/**', 'modules_dart/**'], {ignoreInitial: true},
+                      ['!build/tree.dart', 'build/pure-packages.dart']);
               });
 });
 
@@ -911,21 +912,20 @@ gulp.task('test.unit.cjs', ['build/clean.js', 'build.tools'], function(neverDone
 gulp.task('test.unit.dartvm', function(neverDone) {
   var watch = require('./tools/build/watch');
 
-  runSequence(
-      'build/tree.dart', 'build/pure-packages.dart', '!build/pubget.angular2.dart',
-      '!build/change_detect.dart', '!test.unit.dartvm/run', function(error) {
-        // Watch for changes made in the TS and Dart code under "modules" and
-        // run ts2dart and test change detector generator prior to rerunning the
-        // tests.
-        watch('modules/angular2/**', {ignoreInitial: true},
-              ['!build/tree.dart', '!build/change_detect.dart', '!test.unit.dartvm/run']);
-
-        // Watch for changes made in Dart code under "modules_dart", then copy it
-        // to dist and run test change detector generator prior to retunning the
-        // tests.
-        watch('modules_dart/**', {ignoreInitial: true},
-              ['build/pure-packages.dart', '!build/change_detect.dart', '!test.unit.dartvm/run']);
-      });
+  runSequence('build/tree.dart', 'build/pure-packages.dart', '!build/pubget.angular2.dart',
+              '!test.unit.dartvm/run', function(error) {
+                // Watch for changes made in the TS and Dart code under "modules" and
+                // run ts2dart and test change detector generator prior to rerunning the
+                // tests.
+                watch('modules/angular2/**', {ignoreInitial: true},
+                      ['!build/tree.dart', '!test.unit.dartvm/run']);
+
+                // Watch for changes made in Dart code under "modules_dart", then copy it
+                // to dist and run test change detector generator prior to retunning the
+                // tests.
+                watch('modules_dart/**', {ignoreInitial: true},
+                      ['build/pure-packages.dart', '!test.unit.dartvm/run']);
+              });
 });
 
 gulp.task('!test.unit.dartvm/run',
@@ -1069,9 +1069,9 @@ gulp.task('build/pure-packages.dart/angular2', function() {
 
 // Builds all Dart packages, but does not compile them
 gulp.task('build/packages.dart', function(done) {
-  runSequence('lint_protos.dart', 'build/tree.dart', 'build/pure-packages.dart',
+  runSequence('lint_protos.dart', 'pubget.dart', 'build/tree.dart', 'build/pure-packages.dart',
               // Run after 'build/tree.dart' because broccoli clears the dist/dart folder
-              '!build/pubget.angular2.dart', '!build/change_detect.dart', sequenceComplete(done));
+              '!build/pubget.angular2.dart', sequenceComplete(done));
 });
 
 // Builds and compiles all Dart packages
@@ -1467,34 +1467,6 @@ gulp.task('gen_protos.dart', function(done) {
       done);
 });
 
-// change detection codegen
-gulp.task('build.change_detect.dart', function(done) {
-  return runSequence('build/packages.dart', '!build/pubget.angular2.dart',
-                     '!build/change_detect.dart', done);
-});
-
-gulp.task('!build/change_detect.dart', function(done) {
-  var fs = require('fs');
-  var spawn = require('child_process').spawn;
-
-  var changeDetectDir = path.join(CONFIG.dest.dart, 'angular2/test/core/change_detection/');
-  var srcDir = path.join(changeDetectDir, 'generator');
-  var destDir = path.join(changeDetectDir, 'generated');
-
-  var dartStream = fs.createWriteStream(path.join(destDir, 'change_detector_classes.dart'));
-  var genMain = path.join(srcDir, 'gen_change_detectors.dart');
-  var proc = spawn(DART_SDK.VM, [genMain], {stdio: ['ignore', 'pipe', 'inherit']});
-  proc.on('error', function(code) {
-    done(new Error('Failed while generating change detector classes. Please run manually: ' +
-                   DART_SDK.VM + ' ' + dartArgs.join(' ')));
-  });
-  proc.on('close', function() {
-    dartStream.close();
-    done();
-  });
-  proc.stdout.pipe(dartStream);
-});
-
 // ------------
 
 gulp.task('cleanup.builder', function() { return angularBuilder.cleanup(); });

diff --git a/modules/angular2/angular2.dart b/modules/angular2/angular2.dart
@@ -14,4 +14,5 @@ export 'package:angular2/src/core/application_tokens.dart'
 export 'package:angular2/src/platform/dom/dom_tokens.dart';
 export 'package:angular2/src/platform/dom/dom_adapter.dart';
 export 'package:angular2/src/platform/dom/events/event_manager.dart';
-export 'package:angular2/src/compiler/url_resolver.dart';
+export 'package:angular2/src/compiler/compiler.dart' show UrlResolver, DirectiveResolver, ViewResolver;
+
diff --git a/modules/angular2/compiler.ts b/modules/angular2/compiler.ts
@@ -3,6 +3,35 @@
  * @description
  * Starting point to import all compiler APIs.
  */
-export * from './src/compiler/url_resolver';
-export * from './src/compiler/xhr';
-export * from './src/compiler/compiler';
+export {
+  PLATFORM_DIRECTIVES,
+  PLATFORM_PIPES,
+  COMPILER_PROVIDERS,
+  TEMPLATE_TRANSFORMS,
+  CompilerConfig,
+  RenderTypes,
+  UrlResolver,
+  DEFAULT_PACKAGE_URL_PROVIDER,
+  createOfflineCompileUrlResolver,
+  XHR,
+  ViewResolver,
+  DirectiveResolver,
+  PipeResolver,
+  SourceModule,
+  NormalizedComponentWithViewDirectives,
+  OfflineCompiler,
+  CompileMetadataWithIdentifier,
+  CompileMetadataWithType,
+  CompileIdentifierMetadata,
+  CompileDiDependencyMetadata,
+  CompileProviderMetadata,
+  CompileFactoryMetadata,
+  CompileTokenMetadata,
+  CompileTypeMetadata,
+  CompileQueryMetadata,
+  CompileTemplateMetadata,
+  CompileDirectiveMetadata,
+  CompilePipeMetadata
+} from 'angular2/src/compiler/compiler';
+
+export * from 'angular2/src/compiler/template_ast';
diff --git a/modules/angular2/platform/testing/browser_static.ts b/modules/angular2/platform/testing/browser_static.ts
@@ -1,12 +1,11 @@
 import {
   APP_ID,
-  DirectiveResolver,
   NgZone,
   Provider,
-  ViewResolver,
   PLATFORM_COMMON_PROVIDERS,
   PLATFORM_INITIALIZER
 } from 'angular2/core';
+import {DirectiveResolver, ViewResolver} from 'angular2/compiler';
 import {BROWSER_APP_COMMON_PROVIDERS} from 'angular2/src/platform/browser_common';
 import {BrowserDomAdapter} from 'angular2/src/platform/browser/browser_adapter';
 

diff --git a/modules/angular2/platform/testing/server.ts b/modules/angular2/platform/testing/server.ts
@@ -1,14 +1,14 @@
 import {
   APP_ID,
-  DirectiveResolver,
   NgZone,
   Provider,
-  ViewResolver,
   PLATFORM_COMMON_PROVIDERS,
   PLATFORM_INITIALIZER,
   APPLICATION_COMMON_PROVIDERS,
   Renderer
 } from 'angular2/core';
+import {DirectiveResolver, ViewResolver} from 'angular2/compiler';
+
 import {Parse5DomAdapter} from 'angular2/src/platform/server/parse5_adapter';
 
 import {AnimationBuilder} from 'angular2/src/animate/animation_builder';
@@ -28,7 +28,7 @@ import {DOCUMENT} from 'angular2/src/platform/dom/dom_tokens';
 import {DOM} from 'angular2/src/platform/dom/dom_adapter';
 import {RootRenderer} from 'angular2/src/core/render/api';
 import {DomRootRenderer, DomRootRenderer_} from 'angular2/src/platform/dom/dom_renderer';
-import {DomSharedStylesHost} from 'angular2/src/platform/dom/shared_styles_host';
+import {DomSharedStylesHost, SharedStylesHost} from 'angular2/src/platform/dom/shared_styles_host';
 
 import {
   EventManager,
@@ -78,6 +78,7 @@ export const TEST_SERVER_APPLICATION_PROVIDERS: Array<any /*Type | Provider | an
       new Provider(EVENT_MANAGER_PLUGINS, {useClass: DomEventsPlugin, multi: true}),
       new Provider(XHR, {useClass: XHR}),
       new Provider(APP_ID, {useValue: 'a'}),
+      new Provider(SharedStylesHost, {useExisting: DomSharedStylesHost}),
       DomSharedStylesHost,
       ELEMENT_PROBE_PROVIDERS,
       new Provider(DirectiveResolver, {useClass: MockDirectiveResolver}),

diff --git a/modules/angular2/src/common/directives/ng_for.ts b/modules/angular2/src/common/directives/ng_for.ts
@@ -153,7 +153,7 @@ export class NgFor implements DoCheck {
       var tuple = tuples[i];
       // separate moved views from removed views.
       if (isPresent(tuple.record.currentIndex)) {
-        tuple.view = this._viewContainer.detach(tuple.record.previousIndex);
+        tuple.view = <EmbeddedViewRef>this._viewContainer.detach(tuple.record.previousIndex);
         movedTuples.push(tuple);
       } else {
         this._viewContainer.remove(tuple.record.previousIndex);