refactor(@angular-cli): get rid of ast-tools and base-href-webpack

packages/@angular/cli/blueprints/component/index.ts

@@ -1,3 +1,5 @@
+import {NodeHost} from '../../lib/ast-tools';
+
 const path = require('path');
 const fs = require('fs');
 const chalk = require('chalk');
@@ -7,7 +9,6 @@ const findParentModule = require('../../utilities/find-parent-module').default;
 const getFiles = Blueprint.prototype.files;
 const stringUtils = require('ember-cli-string-utils');
 const astUtils = require('../../utilities/ast-utils');
-const NodeHost = require('@angular-cli/ast-tools').NodeHost;
 
 export default Blueprint.extend({
   description: '',

packages/@angular/cli/blueprints/directive/index.ts

@@ -1,11 +1,12 @@
+import {NodeHost} from '../../lib/ast-tools';
+
 const path = require('path');
 const fs = require('fs');
 const chalk = require('chalk');
 const dynamicPathParser = require('../../utilities/dynamic-path-parser');
 const stringUtils = require('ember-cli-string-utils');
 const astUtils = require('../../utilities/ast-utils');
 const findParentModule = require('../../utilities/find-parent-module').default;
-const NodeHost = require('@angular-cli/ast-tools').NodeHost;
 const Blueprint = require('../../ember-cli/lib/models/blueprint');
 const getFiles = Blueprint.prototype.files;
 

packages/@angular/cli/blueprints/pipe/index.ts

@@ -1,11 +1,12 @@
+import {NodeHost} from '../../lib/ast-tools';
+
 const path = require('path');
 const fs = require('fs');
 const chalk = require('chalk');
 const dynamicPathParser = require('../../utilities/dynamic-path-parser');
 const stringUtils = require('ember-cli-string-utils');
 const astUtils = require('../../utilities/ast-utils');
 const findParentModule = require('../../utilities/find-parent-module').default;
-const NodeHost = require('@angular-cli/ast-tools').NodeHost;
 const Blueprint = require('../../ember-cli/lib/models/blueprint');
 const getFiles = Blueprint.prototype.files;
 

packages/@angular/cli/blueprints/service/index.ts

@@ -1,11 +1,11 @@
+import {NodeHost} from '../../lib/ast-tools';
 import { oneLine } from 'common-tags';
 
 const path = require('path');
 const fs = require('fs');
 const chalk = require('chalk');
 const dynamicPathParser = require('../../utilities/dynamic-path-parser');
 const Blueprint = require('../../ember-cli/lib/models/blueprint');
-const NodeHost = require('@angular-cli/ast-tools').NodeHost;
 const stringUtils = require('ember-cli-string-utils');
 const astUtils = require('../../utilities/ast-utils');
 const getFiles = Blueprint.prototype.files;

packages/@angular/cli/models/webpack-configs/common.ts

@@ -2,7 +2,7 @@ import * as webpack from 'webpack';
 import * as path from 'path';
 import { GlobCopyWebpackPlugin } from '../../plugins/glob-copy-webpack-plugin';
 import { packageChunkSort } from '../../utilities/package-chunk-sort';
-import { BaseHrefWebpackPlugin } from '@angular-cli/base-href-webpack';
+import { BaseHrefWebpackPlugin } from '../../lib/base-href-webpack';
 import { extraEntryParser, lazyChunksFilter, getOutputHashFormat } from './utils';
 import { WebpackConfigOptions } from '../webpack-config';
 

packages/@angular/cli/package.json

@@ -26,11 +26,10 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-cli/ast-tools": "^1.0.14",
-    "@angular-cli/base-href-webpack": "^1.0.14",
     "@angular/compiler": "^2.3.1",
     "@angular/compiler-cli": "^2.3.1",
     "@angular/core": "^2.3.1",
+    "@angular/tsc-wrapped": "^0.5.0",
     "@ngtools/json-schema": "^1.0.0",
     "@ngtools/webpack": "^1.2.3",
     "async": "^2.1.4",
@@ -74,6 +73,7 @@
     "resolve": "^1.1.7",
     "rimraf": "^2.5.3",
     "rsvp": "^3.0.17",
+    "rxjs": "^5.0.1",
     "sass-loader": "^4.1.1",
     "script-loader": "^0.7.0",
     "semver": "^5.1.0",

packages/@angular/cli/tsconfig.json

@@ -20,9 +20,6 @@
     ],
     "baseUrl": "",
     "paths": {
-      "@angular-cli/ast-tools": [ "../../../dist/@angular-cli/ast-tools/src" ],
-      "@angular-cli/base-href-webpack": [ "../../../dist/@angular-cli/base-href-webpack/src" ],
-      "@angular-cli/version": [ "../../../dist/@angular-cli/version/src" ],
       "@ngtools/json-schema": [ "../../../dist/@ngtools/json-schema/src" ],
       "@ngtools/webpack": [ "../../../dist/@ngtools/webpack/src" ]
     }

packages/@angular/cli/utilities/ast-utils.ts

@@ -10,4 +10,4 @@ export {
   addDeclarationToModule,
   addProviderToModule,
   addExportToModule
-} from '@angular-cli/ast-tools';
+} from '../lib/ast-tools';

packages/@angular/cli/utilities/change.ts

@@ -5,4 +5,4 @@ export {
   InsertChange,
   RemoveChange,
   ReplaceChange
-} from '@angular-cli/ast-tools';
+} from '../lib/ast-tools';

packages/@angular/cli/utilities/module-resolver.ts

@@ -6,7 +6,7 @@ import * as dependentFilesUtils from './get-dependent-files';
 
 
 import {Change, ReplaceChange} from './change';
-import {NodeHost, Host} from '@angular-cli/ast-tools';
+import {NodeHost, Host} from '../lib/ast-tools';
 
 /**
  * Rewrites import module of dependent files when the file is moved.

packages/@angular/cli/utilities/route-utils.ts

@@ -8,4 +8,4 @@ export {
   confirmComponentExport,
   resolveComponentPath,
   applyChanges
-} from '@angular-cli/ast-tools';
+} from '../lib/ast-tools';

tests/e2e/utils/ast.ts

@@ -2,7 +2,7 @@ import {
   insertImport as _insertImport,
   addImportToModule as _addImportToModule,
   NodeHost
-} from '@angular-cli/ast-tools';
+} from '../../../packages/@angular/cli/lib/ast-tools';
 
 
 export function insertImport(file: string, symbol: string, module: string) {