chore(install): move ember-cli to a directory in angular-cli

Author: hansl

package.json

@@ -57,21 +57,36 @@
     "chalk": "^1.1.3",
     "common-tags": "^1.3.1",
     "compression-webpack-plugin": "^0.3.2",
+    "configstore": "^2.0.0",
     "core-js": "^2.4.0",
+    "core-object": "0.0.2",
     "css-loader": "^0.23.1",
+    "debug": "^2.1.3",
     "denodeify": "^1.2.1",
-    "ember-cli": "2.5.0",
+    "diff": "^2.2.2",
+    "ember-cli-normalize-entity-name": "^1.0.0",
+    "ember-cli-preprocess-registry": "^2.0.0",
     "ember-cli-string-utils": "^1.0.0",
     "enhanced-resolve": "^2.2.2",
+    "exists-sync": "0.0.3",
     "exit": "^0.1.2",
     "exports-loader": "^0.6.3",
     "expose-loader": "^0.7.1",
     "extract-text-webpack-plugin": "^2.0.0-beta.4",
     "file-loader": "^0.8.5",
+    "findup": "0.1.5",
+    "findup-sync": "^0.2.1",
     "fs-extra": "^0.30.0",
+    "fs-monitor-stack": "^1.0.2",
     "fs.realpath": "^1.0.0",
+    "get-caller-file": "^1.0.0",
+    "git-repo-info": "^1.0.4",
     "glob": "^7.0.3",
     "html-webpack-plugin": "^2.19.0",
+    "inflection": "^1.7.0",
+    "inquirer": "^0.12.0",
+    "is-git-url": "^0.2.0",
+    "isbinaryfile": "^2.0.3",
     "istanbul-instrumenter-loader": "^0.2.0",
     "json-loader": "^0.5.4",
     "karma-sourcemap-loader": "^0.3.7",
@@ -80,21 +95,35 @@
     "less": "^2.7.1",
     "less-loader": "^2.2.3",
     "lodash": "^4.11.1",
+    "markdown-it": "4.3.0",
+    "markdown-it-terminal": "0.0.3",
+    "minimatch": "^3.0.0",
+    "mkdirp": "^0.5.1",
+    "node-modules-path": "^1.0.0",
     "node-sass": "^3.10.1",
+    "node-uuid": "^1.4.3",
+    "nopt": "^3.0.1",
     "npm-run-all": "^3.0.0",
     "offline-plugin": "^3.4.1",
     "opn": "4.0.1",
+    "ora": "^0.2.0",
     "parse5": "^2.1.5",
+    "portfinder": "^1.0.7",
     "postcss-discard-comments": "^2.0.4",
     "postcss-loader": "^0.9.1",
     "protractor": "^3.3.0",
+    "quick-temp": "0.1.5",
     "raw-loader": "^0.5.1",
+    "readline2": "0.1.1",
     "remap-istanbul": "^0.6.4",
     "resolve": "^1.1.7",
     "rimraf": "^2.5.3",
+    "rsvp": "^3.0.17",
     "rxjs": "5.0.0-beta.12",
+    "sane": "^1.1.1",
     "sass-loader": "^3.2.0",
     "script-loader": "^0.7.0",
+    "semver": "^5.1.0",
     "shelljs": "^0.7.0",
     "silent-error": "^1.0.0",
     "source-map-loader": "^0.1.5",
@@ -103,15 +132,20 @@
     "style-loader": "^0.13.1",
     "stylus": "^0.54.5",
     "stylus-loader": "^2.1.0",
+    "temp": "0.8.3",
+    "through": "^2.3.6",
+    "tree-sync": "^1.1.0",
     "ts-loader": "^0.8.2",
     "tslint": "^3.15.1",
     "tslint-loader": "^2.1.4",
     "typescript": "~2.0.3",
     "url-loader": "^0.5.7",
+    "walk-sync": "^0.2.6",
     "webpack": "2.1.0-beta.25",
     "webpack-dev-server": "2.1.0-beta.9",
     "webpack-md5-hash": "0.0.5",
     "webpack-merge": "^0.14.0",
+    "yam": "0.0.18",
     "zone.js": "^0.6.23"
   },
   "ember-addon": {

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('@angular-cli/ember-cli/lib/models/blueprint');
+const Blueprint = require('../../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('@angular-cli/ember-cli/lib/models/blueprint');
+const Blueprint = require('../../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('@angular-cli/ember-cli/lib/models/blueprint');
+const Blueprint = require('../../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('@angular-cli/ember-cli/lib/models/blueprint');
+const Blueprint   = require('../../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('@angular-cli/ember-cli/lib/models/blueprint');
+const Blueprint   = require('../../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('@angular-cli/ember-cli/lib/models/blueprint');
+const Blueprint = require('../../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('@angular-cli/ember-cli/lib/models/blueprint');
+const Blueprint = require('../../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('@angular-cli/ember-cli/lib/models/command');
+const Command = require('../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('@angular-cli/ember-cli/lib/models/command');
+const Command = require('../ember-cli/lib/models/command');
 
 const CompletionCommand = Command.extend({
   name: 'completion',

packages/angular-cli/commands/destroy.ts

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

packages/angular-cli/commands/doc.ts

@@ -1,4 +1,4 @@
-const Command = require('@angular-cli/ember-cli/lib/models/command');
+const Command = require('../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('@angular-cli/ember-cli/lib/models/command');
+const Command = require('../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('@angular-cli/ember-cli/lib/models/command');
+const Command = require('../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('@angular-cli/ember-cli/lib/commands/generate');
-const Blueprint = require('@angular-cli/ember-cli/lib/models/blueprint');
+const EmberGenerateCommand = require('../ember-cli/lib/commands/generate');
+const Blueprint = require('../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('@angular-cli/ember-cli/lib/models/command');
+const Command = require('../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('@angular-cli/ember-cli/lib/models/command');
+const Command = require('../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('@angular-cli/ember-cli/lib/models/command');
+const Command = require('../ember-cli/lib/models/command');
 const stringUtils = require('ember-cli-string-utils');
-const lookupCommand = require('@angular-cli/ember-cli/lib/cli/lookup-command');
+const lookupCommand = require('../ember-cli/lib/cli/lookup-command');
 
 const commandsToIgnore = [
   'easter-egg',

packages/angular-cli/commands/init.ts

@@ -1,12 +1,11 @@
 import LinkCli from '../tasks/link-cli';
 import NpmInstall from '../tasks/npm-install';
 
-const Command = require('@angular-cli/ember-cli/lib/models/command');
-const Promise = require('@angular-cli/ember-cli/lib/ext/promise');
+const Command = require('../ember-cli/lib/models/command');
+const Promise = require('../ember-cli/lib/ext/promise');
 const SilentError = require('silent-error');
-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 validProjectName = require('../ember-cli/lib/utilities/valid-project-name');
+const normalizeBlueprint = require('../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('@angular-cli/ember-cli/lib/models/command');
+const Command = require('../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('@angular-cli/ember-cli/lib/models/command');
-const Project = require('@angular-cli/ember-cli/lib/models/project');
+const Command = require('../ember-cli/lib/models/command');
+const Project = require('../ember-cli/lib/models/project');
 const SilentError = require('silent-error');
-const validProjectName = require('@angular-cli/ember-cli/lib/utilities/valid-project-name');
+const validProjectName = require('../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('@angular-cli/ember-cli/lib/models/command');
+const Command = require('../ember-cli/lib/models/command');
 const SilentError = require('silent-error');
 const PortFinder = require('portfinder');
 import ServeWebpackTask from '../tasks/serve-webpack';

packages/angular-cli/commands/set.ts

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

packages/angular-cli/commands/test.ts

@@ -1,4 +1,4 @@
-const TestCommand = require('@angular-cli/ember-cli/lib/commands/test');
+const TestCommand = require('../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('@angular-cli/ember-cli/lib/models/command');
+const Command = require('../ember-cli/lib/models/command');
 import * as path from 'path';
 import * as child_process from 'child_process';
 

packages/ember-cli/LICENSE.md renamed to packages/angular-cli/ember-cli/LICENSE.md

@@ -293,7 +293,7 @@ Command.prototype.parseAlias = function(option, alias) {
       try {
         aliasValue = JSON.parse(alias);
       } catch (e) {
-        var debug = require('debug')('@angular-cli/ember-cli/models/command');
+        var debug = require('debug')('angular-cli/ember-cli/models/command');
         debug(e);
       }
     }

packages/ember-cli/bin/ember renamed to packages/angular-cli/ember-cli/bin/ember

@@ -0,0 +1,21 @@
+{
+  "author": {
+    "name": "Stefan Penner, Robert Jackson and ember-cli contributors"
+  },
+  "bugs": {
+    "url": "https://github.com/ember-cli/ember-cli/issues"
+  },
+  "dependencies": {
+  },
+  "description": "Command line tool for developing ambitious ember.js apps",
+  "directories": {},
+  "homepage": "https://github.com/ember-cli/ember-cli#readme",
+  "license": "MIT",
+  "main": "lib/cli/index.js",
+  "name": "angular-cli/ember-cli",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ember-cli/ember-cli.git"
+  },
+  "version": "2.5.0"
+}

packages/ember-cli/lib/cli/cli.js renamed to packages/angular-cli/ember-cli/lib/cli/cli.js

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