chore(install): move ember cli in our repo and remove everything unnecessary

Author: hansl

.eslintignore

@@ -6,3 +6,6 @@ typings/
 
 # Ignore all blueprint files. We e2e tests those later on.
 packages/angular-cli/blueprints/*/files/
+
+# Ignore ember cli.
+packages/ember-cli/

lib/bootstrap-local.js

@@ -61,7 +61,13 @@ if (!__dirname.match(new RegExp(`\\${path.sep}node_modules\\${path.sep}`))) {
       const newRequest = path.relative(dir, path.join(__dirname, '../packages', request));
       return oldLoad.call(this, newRequest, parent);
     } else {
-      return oldLoad.apply(this, arguments);
+      let match = Object.keys(packages).find(pkgName => request.startsWith(pkgName + '/'));
+      if (match) {
+        const p = path.join(packages[match].root, request.substr(match.length));
+        return oldLoad.call(this, p, parent);
+      } else {
+        return oldLoad.apply(this, arguments);
+      }
     }
   };
 }

lib/packages.js

@@ -17,6 +17,7 @@ const packages = fs.readdirSync(packageRoot)
       dist: path.join(__dirname, '../dist', pkg.name),
       packageJson: path.join(pkg.root, 'package.json'),
       root: pkg.root,
+      relative: path.relative(path.dirname(__dirname), pkg.root),
       main: path.resolve(pkg.root, 'src/index.ts')
     };
     return packages;

package.json

@@ -71,7 +71,6 @@
     "fs-extra": "^0.30.0",
     "fs.realpath": "^1.0.0",
     "glob": "^7.0.3",
-    "handlebars": "^4.0.5",
     "html-webpack-plugin": "^2.19.0",
     "istanbul-instrumenter-loader": "^0.2.0",
     "json-loader": "^0.5.4",

packages/angular-cli/blueprints/class/index.js

@@ -1,6 +1,6 @@
 const stringUtils = require('ember-cli-string-utils');
 const dynamicPathParser = require('../../utilities/dynamic-path-parser');
-const Blueprint = require('ember-cli/lib/models/blueprint');
+const Blueprint = require('@angular-cli/ember-cli/lib/models/blueprint');
 const getFiles = Blueprint.prototype.files;
 
 module.exports = {

packages/angular-cli/blueprints/component/index.js

@@ -1,6 +1,6 @@
 const path = require('path');
 const chalk = require('chalk');
-const Blueprint = require('ember-cli/lib/models/blueprint');
+const Blueprint = require('@angular-cli/ember-cli/lib/models/blueprint');
 const dynamicPathParser = require('../../utilities/dynamic-path-parser');
 const findParentModule = require('../../utilities/find-parent-module').default;
 const getFiles = Blueprint.prototype.files;

packages/angular-cli/blueprints/directive/index.js

@@ -4,7 +4,7 @@ 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 Blueprint = require('@angular-cli/ember-cli/lib/models/blueprint');
 const getFiles = Blueprint.prototype.files;
 
 module.exports = {

packages/angular-cli/blueprints/module/index.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const Blueprint   = require('ember-cli/lib/models/blueprint');
+const Blueprint   = require('@angular-cli/ember-cli/lib/models/blueprint');
 const dynamicPathParser = require('../../utilities/dynamic-path-parser');
 const getFiles = Blueprint.prototype.files;
 

packages/angular-cli/blueprints/ng2/index.js

@@ -1,4 +1,4 @@
-const Blueprint   = require('ember-cli/lib/models/blueprint');
+const Blueprint   = require('@angular-cli/ember-cli/lib/models/blueprint');
 const path        = require('path');
 const stringUtils = require('ember-cli-string-utils');
 const getFiles = Blueprint.prototype.files;

packages/angular-cli/blueprints/pipe/index.js

@@ -4,7 +4,7 @@ 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 Blueprint = require('@angular-cli/ember-cli/lib/models/blueprint');
 const getFiles = Blueprint.prototype.files;
 
 module.exports = {

packages/angular-cli/blueprints/service/index.js

@@ -1,7 +1,7 @@
 const path = require('path');
 const chalk = require('chalk');
 const dynamicPathParser = require('../../utilities/dynamic-path-parser');
-const Blueprint = require('ember-cli/lib/models/blueprint');
+const Blueprint = require('@angular-cli/ember-cli/lib/models/blueprint');
 const getFiles = Blueprint.prototype.files;
 
 module.exports = {

packages/angular-cli/commands/build.ts

@@ -1,4 +1,4 @@
-const Command = require('ember-cli/lib/models/command');
+const Command = require('@angular-cli/ember-cli/lib/models/command');
 import WebpackBuild from '../tasks/build-webpack';
 import WebpackBuildWatch from '../tasks/build-webpack-watch';
 

packages/angular-cli/commands/completion.ts

@@ -1,7 +1,7 @@
 import * as path from 'path';
 import * as fs from 'fs';
 
-const Command = require('ember-cli/lib/models/command');
+const Command = require('@angular-cli/ember-cli/lib/models/command');
 
 const CompletionCommand = Command.extend({
   name: 'completion',

packages/angular-cli/commands/destroy.ts

@@ -1,4 +1,4 @@
-const Command = require('ember-cli/lib/models/command');
+const Command = require('@angular-cli/ember-cli/lib/models/command');
 const SilentError = require('silent-error');
 
 

packages/angular-cli/commands/doc.ts

@@ -1,4 +1,4 @@
-const Command = require('ember-cli/lib/models/command');
+const Command = require('@angular-cli/ember-cli/lib/models/command');
 import { DocTask } from '../tasks/doc';
 
 const DocCommand = Command.extend({

packages/angular-cli/commands/e2e.ts

@@ -1,4 +1,4 @@
-const Command = require('ember-cli/lib/models/command');
+const Command = require('@angular-cli/ember-cli/lib/models/command');
 import {E2eTask} from '../tasks/e2e';
 import {CliConfig} from '../models/config';
 

packages/angular-cli/commands/easter-egg.ts

@@ -1,4 +1,4 @@
-const Command = require('ember-cli/lib/models/command');
+const Command = require('@angular-cli/ember-cli/lib/models/command');
 const stringUtils = require('ember-cli-string-utils');
 import * as chalk from 'chalk';
 

packages/angular-cli/commands/generate.ts

@@ -3,8 +3,8 @@ import * as path from 'path';
 import * as os from 'os';
 
 const chalk = require('chalk');
-const EmberGenerateCommand = require('ember-cli/lib/commands/generate');
-const Blueprint = require('ember-cli/lib/models/blueprint');
+const EmberGenerateCommand = require('@angular-cli/ember-cli/lib/commands/generate');
+const Blueprint = require('@angular-cli/ember-cli/lib/models/blueprint');
 const SilentError = require('silent-error');
 
 

packages/angular-cli/commands/get.ts

@@ -1,7 +1,7 @@
 import * as chalk from 'chalk';
 import {CliConfig} from '../models/config';
 
-const Command = require('ember-cli/lib/models/command');
+const Command = require('@angular-cli/ember-cli/lib/models/command');
 
 const GetCommand = Command.extend({
   name: 'get',

packages/angular-cli/commands/github-pages-deploy.ts

@@ -1,4 +1,4 @@
-const Command = require('ember-cli/lib/models/command');
+const Command = require('@angular-cli/ember-cli/lib/models/command');
 const SilentError = require('silent-error');
 import denodeify = require('denodeify');
 

packages/angular-cli/commands/help.ts

@@ -1,9 +1,9 @@
 import * as fs from 'fs';
 import * as path from 'path';
 
-const Command = require('ember-cli/lib/models/command');
+const Command = require('@angular-cli/ember-cli/lib/models/command');
 const stringUtils = require('ember-cli-string-utils');
-const lookupCommand = require('ember-cli/lib/cli/lookup-command');
+const lookupCommand = require('@angular-cli/ember-cli/lib/cli/lookup-command');
 
 const commandsToIgnore = [
   'easter-egg',

packages/angular-cli/commands/init.ts

@@ -1,11 +1,12 @@
 import LinkCli from '../tasks/link-cli';
 import NpmInstall from '../tasks/npm-install';
 
-const Command = require('ember-cli/lib/models/command');
-const Promise = require('ember-cli/lib/ext/promise');
+const Command = require('@angular-cli/ember-cli/lib/models/command');
+const Promise = require('@angular-cli/ember-cli/lib/ext/promise');
 const SilentError = require('silent-error');
-const validProjectName = require('ember-cli/lib/utilities/valid-project-name');
-const normalizeBlueprint = require('ember-cli/lib/utilities/normalize-blueprint-option');
+const validProjectName = require('@angular-cli/ember-cli/lib/utilities/valid-project-name');
+const normalizeBlueprint = require(
+  '@angular-cli/ember-cli/lib/utilities/normalize-blueprint-option');
 const GitInit = require('../tasks/git-init');
 
 

packages/angular-cli/commands/lint.ts

@@ -1,4 +1,4 @@
-const Command = require('ember-cli/lib/models/command');
+const Command = require('@angular-cli/ember-cli/lib/models/command');
 import LintTask from '../tasks/lint';
 
 export default Command.extend({

packages/angular-cli/commands/new.ts

@@ -1,10 +1,10 @@
 import * as chalk from 'chalk';
 import InitCommand from './init';
 
-const Command = require('ember-cli/lib/models/command');
-const Project = require('ember-cli/lib/models/project');
+const Command = require('@angular-cli/ember-cli/lib/models/command');
+const Project = require('@angular-cli/ember-cli/lib/models/project');
 const SilentError = require('silent-error');
-const validProjectName = require('ember-cli/lib/utilities/valid-project-name');
+const validProjectName = require('@angular-cli/ember-cli/lib/utilities/valid-project-name');
 
 
 const NewCommand = Command.extend({

packages/angular-cli/commands/serve.ts

@@ -1,6 +1,6 @@
 import * as assign from 'lodash/assign';
 import * as denodeify from 'denodeify';
-const Command = require('ember-cli/lib/models/command');
+const Command = require('@angular-cli/ember-cli/lib/models/command');
 const SilentError = require('silent-error');
 const PortFinder = require('portfinder');
 import ServeWebpackTask from '../tasks/serve-webpack';
@@ -157,5 +157,4 @@ const ServeCommand = Command.extend({
   }
 });
 
-ServeCommand.overrideCore = true;
 export default ServeCommand;

packages/angular-cli/commands/set.ts

@@ -1,5 +1,5 @@
 const SilentError = require('silent-error');
-const Command = require('ember-cli/lib/models/command');
+const Command = require('@angular-cli/ember-cli/lib/models/command');
 import {CliConfig} from '../models/config';
 
 

packages/angular-cli/commands/test.ts

@@ -1,4 +1,4 @@
-const TestCommand = require('ember-cli/lib/commands/test');
+const TestCommand = require('@angular-cli/ember-cli/lib/commands/test');
 import TestTask from '../tasks/test';
 import {CliConfig} from '../models/config';
 

packages/angular-cli/commands/version.ts

@@ -1,4 +1,4 @@
-const Command = require('ember-cli/lib/models/command');
+const Command = require('@angular-cli/ember-cli/lib/models/command');
 import * as path from 'path';
 import * as child_process from 'child_process';
 

packages/angular-cli/lib/cli/index.js

@@ -1,9 +1,9 @@
 /*eslint-disable no-console */
 
 // This file hooks up on require calls to transpile TypeScript.
-const cli = require('ember-cli/lib/cli');
-const UI = require('ember-cli/lib/ui');
-const Watcher = require('ember-cli/lib/models/watcher');
+const cli = require('@angular-cli/ember-cli/lib/cli');
+const UI = require('@angular-cli/ember-cli/lib/ui');
+const Watcher = require('@angular-cli/ember-cli/lib/models/watcher');
 const path = require('path');
 
 Error.stackTraceLimit = Infinity;

packages/angular-cli/package.json

@@ -27,6 +27,7 @@
   "dependencies": {
     "@angular-cli/ast-tools": "^1.0.1",
     "@angular-cli/base-href-webpack": "^1.0.0",
+    "@angular-cli/ember-cli": "^1.0.0",
     "@angular/common": "~2.1.0",
     "@angular/compiler": "~2.1.0",
     "@angular/compiler-cli": "~2.1.0",
@@ -43,7 +44,6 @@
     "core-js": "^2.4.0",
     "css-loader": "^0.23.1",
     "denodeify": "^1.2.1",
-    "ember-cli": "2.5.0",
     "ember-cli-string-utils": "^1.0.0",
     "enhanced-resolve": "^2.2.2",
     "exit": "^0.1.2",
@@ -54,7 +54,6 @@
     "fs-extra": "^0.30.0",
     "fs.realpath": "^1.0.0",
     "glob": "^7.0.3",
-    "handlebars": "^4.0.5",
     "html-webpack-plugin": "^2.19.0",
     "istanbul-instrumenter-loader": "^0.2.0",
     "json-loader": "^0.5.4",

packages/angular-cli/tasks/build-webpack-watch.ts

@@ -1,6 +1,6 @@
 import * as rimraf from 'rimraf';
 import * as path from 'path';
-const Task = require('ember-cli/lib/models/task');
+const Task = require('@angular-cli/ember-cli/lib/models/task');
 import * as webpack from 'webpack';
 const ProgressPlugin = require('webpack/lib/ProgressPlugin');
 import { NgCliWebpackConfig } from '../models/webpack-config';

packages/angular-cli/tasks/build-webpack.ts

@@ -1,6 +1,6 @@
 import * as rimraf from 'rimraf';
 import * as path from 'path';
-const Task = require('ember-cli/lib/models/task');
+const Task = require('@angular-cli/ember-cli/lib/models/task');
 import * as webpack from 'webpack';
 import { BuildOptions } from '../commands/build';
 import { NgCliWebpackConfig } from '../models/webpack-config';

packages/angular-cli/tasks/create-github-repo.ts

@@ -1,5 +1,5 @@
 import * as denodeify from 'denodeify';
-const Task = require('ember-cli/lib/models/task');
+const Task = require('@angular-cli/ember-cli/lib/models/task');
 const SilentError = require('silent-error');
 import { exec } from 'child_process';
 import * as https from 'https';

packages/angular-cli/tasks/doc.ts

@@ -1,4 +1,4 @@
-const Task = require('ember-cli/lib/models/task');
+const Task = require('@angular-cli/ember-cli/lib/models/task');
 const opn = require('opn');
 
 export const DocTask: any = Task.extend({

packages/angular-cli/tasks/e2e.ts

@@ -1,4 +1,4 @@
-const Task = require('ember-cli/lib/models/task');
+const Task = require('@angular-cli/ember-cli/lib/models/task');
 import * as chalk from 'chalk';
 import {exec} from 'child_process';
 

packages/angular-cli/tasks/git-init.js

@@ -1,12 +1,12 @@
 'use strict';
 
-var Promise = require('ember-cli/lib/ext/promise');
+var Promise = require('@angular-cli/ember-cli/lib/ext/promise');
 var exec = Promise.denodeify(require('child_process').exec);
 var path = require('path');
 var pkg = require('../package.json');
 var fs = require('fs');
 var template = require('lodash/template');
-var Task = require('ember-cli/lib/models/task');
+var Task = require('@angular-cli/ember-cli/lib/models/task');
 
 var gitEnvironmentVariables = {
   GIT_AUTHOR_NAME: 'angular-cli',

packages/angular-cli/tasks/link-cli.ts

@@ -1,4 +1,4 @@
-const Task = require('ember-cli/lib/models/task');
+const Task = require('@angular-cli/ember-cli/lib/models/task');
 import * as chalk from 'chalk';
 import {exec} from 'child_process';
 

packages/angular-cli/tasks/lint.ts

@@ -1,4 +1,4 @@
-const Task = require('ember-cli/lib/models/task');
+const Task = require('@angular-cli/ember-cli/lib/models/task');
 import * as chalk from 'chalk';
 import {exec} from 'child_process';
 

packages/angular-cli/tasks/npm-install.ts

@@ -1,4 +1,4 @@
-const Task = require('ember-cli/lib/models/task');
+const Task = require('@angular-cli/ember-cli/lib/models/task');
 import * as chalk from 'chalk';
 import {exec} from 'child_process';
 

packages/angular-cli/tasks/serve-webpack.ts

@@ -2,7 +2,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as chalk from 'chalk';
 const SilentError = require('silent-error');
-const Task = require('ember-cli/lib/models/task');
+const Task = require('@angular-cli/ember-cli/lib/models/task');
 import * as webpack from 'webpack';
 const WebpackDevServer = require('webpack-dev-server');
 const ProgressPlugin = require('webpack/lib/ProgressPlugin');

packages/angular-cli/tasks/test.ts

@@ -1,4 +1,4 @@
-const Task = require('ember-cli/lib/models/task');
+const Task = require('@angular-cli/ember-cli/lib/models/task');
 import * as path from 'path';
 
 // require dependencies within the target project

packages/ast-tools/src/change.spec.ts

@@ -8,7 +8,7 @@ import {InsertChange, NodeHost, RemoveChange, ReplaceChange} from './change';
 import fs = require('fs');
 
 let path = require('path');
-let Promise = require('ember-cli/lib/ext/promise');
+let Promise = require('@angular-cli/ember-cli/lib/ext/promise');
 
 const readFile =  Promise.denodeify(fs.readFile);