From 6f1b7b620453382a805334c4b7f60b5dcb50f405 Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Fri, 3 Feb 2017 11:21:38 -0800
Subject: [PATCH] refactor(@angular-cli): get rid of ast-tools and
 base-href-webpack

Those 2 packages were still using the wrong scope (@angular-cli) and were not used by anyone outside the CLI. Just moving the code in the main package is enough.
---
 packages/@angular-cli/ast-tools/package.json  | 32 -------------------
 packages/@angular-cli/ast-tools/tsconfig.json | 24 --------------
 .../base-href-webpack/package.json            | 25 ---------------
 .../base-href-webpack/tsconfig.json           | 27 ----------------
 .../cli/blueprints/component/index.ts         |  3 +-
 .../cli/blueprints/directive/index.ts         |  3 +-
 .../@angular/cli/blueprints/pipe/index.ts     |  3 +-
 .../@angular/cli/blueprints/service/index.ts  |  2 +-
 .../cli/lib/ast-tools}/ast-utils.spec.ts      |  0
 .../cli/lib/ast-tools}/ast-utils.ts           |  0
 .../cli/lib/ast-tools}/change.spec.ts         |  0
 .../cli/lib/ast-tools}/change.ts              |  0
 .../cli/lib/ast-tools}/index.ts               |  0
 .../cli/lib/ast-tools}/node.ts                |  0
 .../cli/lib/ast-tools}/route-utils.spec.ts    |  0
 .../cli/lib/ast-tools}/route-utils.ts         |  0
 .../cli/lib/ast-tools}/spec-utils.ts          |  0
 .../base-href-webpack-plugin.spec.ts          |  0
 .../base-href-webpack-plugin.ts               |  0
 .../cli/lib/base-href-webpack}/index.ts       |  0
 .../cli/models/webpack-configs/common.ts      |  2 +-
 packages/@angular/cli/package.json            |  4 +--
 packages/@angular/cli/tsconfig.json           |  3 --
 packages/@angular/cli/utilities/ast-utils.ts  |  2 +-
 packages/@angular/cli/utilities/change.ts     |  2 +-
 .../@angular/cli/utilities/module-resolver.ts |  2 +-
 .../@angular/cli/utilities/route-utils.ts     |  2 +-
 tests/e2e/utils/ast.ts                        |  2 +-
 28 files changed, 15 insertions(+), 123 deletions(-)
 delete mode 100644 packages/@angular-cli/ast-tools/package.json
 delete mode 100644 packages/@angular-cli/ast-tools/tsconfig.json
 delete mode 100644 packages/@angular-cli/base-href-webpack/package.json
 delete mode 100644 packages/@angular-cli/base-href-webpack/tsconfig.json
 rename packages/{@angular-cli/ast-tools/src => @angular/cli/lib/ast-tools}/ast-utils.spec.ts (100%)
 rename packages/{@angular-cli/ast-tools/src => @angular/cli/lib/ast-tools}/ast-utils.ts (100%)
 rename packages/{@angular-cli/ast-tools/src => @angular/cli/lib/ast-tools}/change.spec.ts (100%)
 rename packages/{@angular-cli/ast-tools/src => @angular/cli/lib/ast-tools}/change.ts (100%)
 rename packages/{@angular-cli/ast-tools/src => @angular/cli/lib/ast-tools}/index.ts (100%)
 rename packages/{@angular-cli/ast-tools/src => @angular/cli/lib/ast-tools}/node.ts (100%)
 rename packages/{@angular-cli/ast-tools/src => @angular/cli/lib/ast-tools}/route-utils.spec.ts (100%)
 rename packages/{@angular-cli/ast-tools/src => @angular/cli/lib/ast-tools}/route-utils.ts (100%)
 rename packages/{@angular-cli/ast-tools/src => @angular/cli/lib/ast-tools}/spec-utils.ts (100%)
 rename packages/{@angular-cli/base-href-webpack/src => @angular/cli/lib/base-href-webpack}/base-href-webpack-plugin.spec.ts (100%)
 rename packages/{@angular-cli/base-href-webpack/src => @angular/cli/lib/base-href-webpack}/base-href-webpack-plugin.ts (100%)
 rename packages/{@angular-cli/base-href-webpack/src => @angular/cli/lib/base-href-webpack}/index.ts (100%)

diff --git a/packages/@angular-cli/ast-tools/package.json b/packages/@angular-cli/ast-tools/package.json
deleted file mode 100644
index c46185d18784..000000000000
--- a/packages/@angular-cli/ast-tools/package.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "name": "@angular-cli/ast-tools",
-  "version": "1.0.16",
-  "description": "CLI tool for Angular",
-  "main": "./src/index.js",
-  "keywords": [
-    "angular",
-    "cli",
-    "ast",
-    "tool"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/angular/angular-cli.git"
-  },
-  "author": "angular",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/angular/angular-cli/issues"
-  },
-  "homepage": "https://github.com/angular/angular-cli",
-  "engines": {
-    "node": ">= 4.1.0",
-    "npm": ">= 3.0.0"
-  },
-  "dependencies": {
-    "@angular/tsc-wrapped": "^0.5.0",
-    "rxjs": "^5.0.1",
-    "denodeify": "^1.2.1",
-    "typescript": "~2.0.3"
-  }
-}
diff --git a/packages/@angular-cli/ast-tools/tsconfig.json b/packages/@angular-cli/ast-tools/tsconfig.json
deleted file mode 100644
index a6c7a38c8bc8..000000000000
--- a/packages/@angular-cli/ast-tools/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "compilerOptions": {
-    "declaration": true,
-    "experimentalDecorators": true,
-    "mapRoot": "",
-    "module": "commonjs",
-    "moduleResolution": "node",
-    "noEmitOnError": true,
-    "noImplicitAny": true,
-    "outDir": "../../../dist/@angular-cli/ast-tools",
-    "rootDir": ".",
-    "sourceMap": true,
-    "sourceRoot": "/",
-    "target": "es5",
-    "lib": ["es6"],
-    "typeRoots": [
-      "../../node_modules/@types"
-    ],
-    "types": [
-      "jasmine",
-      "node"
-    ]
-  }
-}
diff --git a/packages/@angular-cli/base-href-webpack/package.json b/packages/@angular-cli/base-href-webpack/package.json
deleted file mode 100644
index 614d80678f37..000000000000
--- a/packages/@angular-cli/base-href-webpack/package.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "name": "@angular-cli/base-href-webpack",
-  "version": "1.0.16",
-  "description": "Base HREF Webpack plugin",
-  "main": "./src/index.js",
-  "keywords": [
-    "angular",
-    "cli",
-    "webpack",
-    "plugin",
-    "tool"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/angular/angular-cli.git"
-  },
-  "author": "angular",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/angular/angular-cli/issues"
-  },
-  "homepage": "https://github.com/angular/angular-cli",
-  "dependencies": {
-  }
-}
diff --git a/packages/@angular-cli/base-href-webpack/tsconfig.json b/packages/@angular-cli/base-href-webpack/tsconfig.json
deleted file mode 100644
index 2a2f0f7c6e59..000000000000
--- a/packages/@angular-cli/base-href-webpack/tsconfig.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "compilerOptions": {
-    "declaration": true,
-    "experimentalDecorators": true,
-    "mapRoot": "",
-    "module": "commonjs",
-    "moduleResolution": "node",
-    "noEmitOnError": true,
-    "noImplicitAny": true,
-    "outDir": "../../../dist/@angular-cli/base-href-webpack",
-    "rootDir": ".",
-    "sourceMap": true,
-    "sourceRoot": "/",
-    "target": "es5",
-    "lib": ["es6"],
-    "typeRoots": [
-      "../../node_modules/@types"
-    ],
-    "types": [
-      "jasmine",
-      "node"
-    ]
-  },
-  "exclude": [
-    "**/*.spec.ts"
-  ]
-}
diff --git a/packages/@angular/cli/blueprints/component/index.ts b/packages/@angular/cli/blueprints/component/index.ts
index 2c858ca53662..f189a07fd595 100644
--- a/packages/@angular/cli/blueprints/component/index.ts
+++ b/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: '',
diff --git a/packages/@angular/cli/blueprints/directive/index.ts b/packages/@angular/cli/blueprints/directive/index.ts
index 455c839e197b..e7af617e032d 100644
--- a/packages/@angular/cli/blueprints/directive/index.ts
+++ b/packages/@angular/cli/blueprints/directive/index.ts
@@ -1,3 +1,5 @@
+import {NodeHost} from '../../lib/ast-tools';
+
 const path = require('path');
 const fs = require('fs');
 const chalk = require('chalk');
@@ -5,7 +7,6 @@ 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;
 
diff --git a/packages/@angular/cli/blueprints/pipe/index.ts b/packages/@angular/cli/blueprints/pipe/index.ts
index 8d37e0d05b67..bee149028d27 100644
--- a/packages/@angular/cli/blueprints/pipe/index.ts
+++ b/packages/@angular/cli/blueprints/pipe/index.ts
@@ -1,3 +1,5 @@
+import {NodeHost} from '../../lib/ast-tools';
+
 const path = require('path');
 const fs = require('fs');
 const chalk = require('chalk');
@@ -5,7 +7,6 @@ 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;
 
diff --git a/packages/@angular/cli/blueprints/service/index.ts b/packages/@angular/cli/blueprints/service/index.ts
index bc1366e8f186..b86f0e3968c4 100644
--- a/packages/@angular/cli/blueprints/service/index.ts
+++ b/packages/@angular/cli/blueprints/service/index.ts
@@ -1,3 +1,4 @@
+import {NodeHost} from '../../lib/ast-tools';
 import { oneLine } from 'common-tags';
 
 const path = require('path');
@@ -5,7 +6,6 @@ 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;
diff --git a/packages/@angular-cli/ast-tools/src/ast-utils.spec.ts b/packages/@angular/cli/lib/ast-tools/ast-utils.spec.ts
similarity index 100%
rename from packages/@angular-cli/ast-tools/src/ast-utils.spec.ts
rename to packages/@angular/cli/lib/ast-tools/ast-utils.spec.ts
diff --git a/packages/@angular-cli/ast-tools/src/ast-utils.ts b/packages/@angular/cli/lib/ast-tools/ast-utils.ts
similarity index 100%
rename from packages/@angular-cli/ast-tools/src/ast-utils.ts
rename to packages/@angular/cli/lib/ast-tools/ast-utils.ts
diff --git a/packages/@angular-cli/ast-tools/src/change.spec.ts b/packages/@angular/cli/lib/ast-tools/change.spec.ts
similarity index 100%
rename from packages/@angular-cli/ast-tools/src/change.spec.ts
rename to packages/@angular/cli/lib/ast-tools/change.spec.ts
diff --git a/packages/@angular-cli/ast-tools/src/change.ts b/packages/@angular/cli/lib/ast-tools/change.ts
similarity index 100%
rename from packages/@angular-cli/ast-tools/src/change.ts
rename to packages/@angular/cli/lib/ast-tools/change.ts
diff --git a/packages/@angular-cli/ast-tools/src/index.ts b/packages/@angular/cli/lib/ast-tools/index.ts
similarity index 100%
rename from packages/@angular-cli/ast-tools/src/index.ts
rename to packages/@angular/cli/lib/ast-tools/index.ts
diff --git a/packages/@angular-cli/ast-tools/src/node.ts b/packages/@angular/cli/lib/ast-tools/node.ts
similarity index 100%
rename from packages/@angular-cli/ast-tools/src/node.ts
rename to packages/@angular/cli/lib/ast-tools/node.ts
diff --git a/packages/@angular-cli/ast-tools/src/route-utils.spec.ts b/packages/@angular/cli/lib/ast-tools/route-utils.spec.ts
similarity index 100%
rename from packages/@angular-cli/ast-tools/src/route-utils.spec.ts
rename to packages/@angular/cli/lib/ast-tools/route-utils.spec.ts
diff --git a/packages/@angular-cli/ast-tools/src/route-utils.ts b/packages/@angular/cli/lib/ast-tools/route-utils.ts
similarity index 100%
rename from packages/@angular-cli/ast-tools/src/route-utils.ts
rename to packages/@angular/cli/lib/ast-tools/route-utils.ts
diff --git a/packages/@angular-cli/ast-tools/src/spec-utils.ts b/packages/@angular/cli/lib/ast-tools/spec-utils.ts
similarity index 100%
rename from packages/@angular-cli/ast-tools/src/spec-utils.ts
rename to packages/@angular/cli/lib/ast-tools/spec-utils.ts
diff --git a/packages/@angular-cli/base-href-webpack/src/base-href-webpack-plugin.spec.ts b/packages/@angular/cli/lib/base-href-webpack/base-href-webpack-plugin.spec.ts
similarity index 100%
rename from packages/@angular-cli/base-href-webpack/src/base-href-webpack-plugin.spec.ts
rename to packages/@angular/cli/lib/base-href-webpack/base-href-webpack-plugin.spec.ts
diff --git a/packages/@angular-cli/base-href-webpack/src/base-href-webpack-plugin.ts b/packages/@angular/cli/lib/base-href-webpack/base-href-webpack-plugin.ts
similarity index 100%
rename from packages/@angular-cli/base-href-webpack/src/base-href-webpack-plugin.ts
rename to packages/@angular/cli/lib/base-href-webpack/base-href-webpack-plugin.ts
diff --git a/packages/@angular-cli/base-href-webpack/src/index.ts b/packages/@angular/cli/lib/base-href-webpack/index.ts
similarity index 100%
rename from packages/@angular-cli/base-href-webpack/src/index.ts
rename to packages/@angular/cli/lib/base-href-webpack/index.ts
diff --git a/packages/@angular/cli/models/webpack-configs/common.ts b/packages/@angular/cli/models/webpack-configs/common.ts
index bee0221f76cf..3bb619876df6 100644
--- a/packages/@angular/cli/models/webpack-configs/common.ts
+++ b/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';
 
diff --git a/packages/@angular/cli/package.json b/packages/@angular/cli/package.json
index 5799e0fa8055..cc02b2f1d1b2 100644
--- a/packages/@angular/cli/package.json
+++ b/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",
diff --git a/packages/@angular/cli/tsconfig.json b/packages/@angular/cli/tsconfig.json
index b71226c5e9da..e7131d94ff2a 100644
--- a/packages/@angular/cli/tsconfig.json
+++ b/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" ]
     }
diff --git a/packages/@angular/cli/utilities/ast-utils.ts b/packages/@angular/cli/utilities/ast-utils.ts
index 0a8a6b0be3fe..0369f46df36e 100644
--- a/packages/@angular/cli/utilities/ast-utils.ts
+++ b/packages/@angular/cli/utilities/ast-utils.ts
@@ -10,4 +10,4 @@ export {
   addDeclarationToModule,
   addProviderToModule,
   addExportToModule
-} from '@angular-cli/ast-tools';
+} from '../lib/ast-tools';
diff --git a/packages/@angular/cli/utilities/change.ts b/packages/@angular/cli/utilities/change.ts
index af47c4fd021a..0bd56ebbf5a9 100644
--- a/packages/@angular/cli/utilities/change.ts
+++ b/packages/@angular/cli/utilities/change.ts
@@ -5,4 +5,4 @@ export {
   InsertChange,
   RemoveChange,
   ReplaceChange
-} from '@angular-cli/ast-tools';
+} from '../lib/ast-tools';
diff --git a/packages/@angular/cli/utilities/module-resolver.ts b/packages/@angular/cli/utilities/module-resolver.ts
index 020b25a11389..2949d95f551d 100644
--- a/packages/@angular/cli/utilities/module-resolver.ts
+++ b/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.
diff --git a/packages/@angular/cli/utilities/route-utils.ts b/packages/@angular/cli/utilities/route-utils.ts
index cc08ad7dd6f1..267789c32224 100644
--- a/packages/@angular/cli/utilities/route-utils.ts
+++ b/packages/@angular/cli/utilities/route-utils.ts
@@ -8,4 +8,4 @@ export {
   confirmComponentExport,
   resolveComponentPath,
   applyChanges
-} from '@angular-cli/ast-tools';
+} from '../lib/ast-tools';
diff --git a/tests/e2e/utils/ast.ts b/tests/e2e/utils/ast.ts
index b23be570a8fd..c3ac718b8a7e 100644
--- a/tests/e2e/utils/ast.ts
+++ b/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) {