refactor(all): Repackaging (#2056)

Moving Angular-CLI into `packages/` and building the angular-cli.

The published packages will now have JavaScript only (with their d.ts), instead of being a mix of TypeScript and JavaScript, and it won't have the hacks of having a custom require extension to load the TypeScript.

Our development flow will be more streamlined, tools are going to be better (no more undefined symbols that are actually defined), and the npm packages will boot up way faster (since there's no more compilation during runtime).

Locally nothing changes, use `npm link` and run your local `ng`. Using the `npm` releases though it should be all javascript from the release.

The E2E tests also now uses the `dist` folder output to install in the new E2E app, making sure the process works for an app published to npm.

Note: Even though we're following the lerna structure, we won't be using their tool anytime soon.

Author: hansl

.eslintignore

@@ -5,4 +5,4 @@ tmp/
 typings/
 
 # Ignore all blueprint files. We e2e tests those later on.
-addon/ng2/blueprints/*/files/
+packages/angular-cli/blueprints/*/files/

.travis.yml

@@ -12,7 +12,7 @@ env:
     - DBUS_SESSION_BUS_ADDRESS=/dev/null
   matrix:
     - SCRIPT=lint
-#    - SCRIPT=build
+    - SCRIPT=build
     - SCRIPT=e2e
     - SCRIPT=e2e:nightly
     - SCRIPT=test

addon/ng2/index.js

@@ -4,48 +4,5 @@
 // Provide a title to the process in `ps`
 process.title = 'angular-cli';
 
-const resolve = require('resolve');
-const exit = require('exit');
-const packageJson = require('../package.json');
-const Leek = require('leek');
-
 require('../lib/bootstrap-local');
-
-
-resolve('angular-cli', { basedir: process.cwd() },
-  function (error, projectLocalCli) {
-    var cli;
-    if (error) {
-      // If there is an error, resolve could not find the ng-cli
-      // library from a package.json. Instead, include it from a relative
-      // path to this script file (which is likely a globally installed
-      // npm package). Most common cause for hitting this is `ng new`
-      cli = require('../lib/cli');
-    } else {
-      // No error implies a projectLocalCli, which will load whatever
-      // version of ng-cli you have installed in a local package.json
-      cli = require(projectLocalCli);
-    }
-
-    if ('default' in cli) {
-      cli = cli['default'];
-    }
-
-    cli({
-      cliArgs: process.argv.slice(2),
-      inputStream: process.stdin,
-      outputStream: process.stdout,
-      Leek: CustomLeek
-    }).then(function (result) {
-      var exitCode = typeof result === 'object' ? result.exitCode : result;
-      exit(exitCode);
-    });
-
-    function CustomLeek(options) {
-      options.trackingCode = packageJson.trackingCode;
-      options.globalName = packageJson.name;
-      options.name = packageJson.name;
-      options.version = packageJson.version;
-      return new Leek(options);
-    }
-  });
+require('../packages/angular-cli/bin/ng');

addon/ng2/package.json

@@ -6,6 +6,8 @@ const path = require('path');
 const ts = require('typescript');
 
 
+global.angularCliIsLocal = true;
+
 const compilerOptions = JSON.parse(fs.readFileSync(path.join(__dirname, '../tsconfig.json')));
 
 const oldRequireTs = require.extensions['.ts'];
@@ -51,6 +53,12 @@ if (!__dirname.match(new RegExp(`\\${path.sep}node_modules\\${path.sep}`))) {
   Module._load = function (request, parent) {
     if (request in packages) {
       return oldLoad.call(this, packages[request].main, parent);
+    } else if (request.startsWith('angular-cli/')) {
+      // We allow deep imports (for now).
+      // TODO: move tests to inside angular-cli package so they don't have to deep import.
+      const dir = path.dirname(parent.filename);
+      const newRequest = path.relative(dir, path.join(__dirname, '../packages', request));
+      return oldLoad.call(this, newRequest, parent);
     } else {
       return oldLoad.apply(this, arguments);
     }

bin/ng

@@ -1,3 +1,5 @@
+'use strict';
+
 const fs = require('fs');
 const path = require('path');
 
@@ -9,7 +11,8 @@ const packages = fs.readdirSync(packageRoot)
   .map(pkgName => ({ name: pkgName, root: path.join(packageRoot, pkgName) }))
   .filter(pkg => fs.statSync(pkg.root).isDirectory())
   .reduce((packages, pkg) => {
-    packages[`@angular-cli/${pkg.name}`] = {
+    let name = pkg == 'angular-cli' ? 'angular-cli' : `@angular-cli/${pkg.name}`;
+    packages[name] = {
       root: pkg.root,
       main: path.resolve(pkg.root, 'src/index.ts')
     };

index.js

@@ -1,17 +1,17 @@
 {
   "name": "angular-cli",
-  "version": "1.0.0-beta.11-webpack.8",
+  "version": "0.0.0",
   "description": "CLI tool for Angular",
-  "main": "lib/cli/index.js",
+  "main": "packages/angular-cli/lib/cli/index.js",
   "trackingCode": "UA-8594346-19",
   "bin": {
     "ng": "./bin/ng"
   },
   "keywords": [],
   "scripts": {
-    "build": "npm-run-all -c build:main build:packages",
-    "build:main": "tsc -p addon/ng2",
-    "build:packages": "for PKG in packages/*; do echo Building $PKG...; tsc -P $PKG; done",
+    "build": "node ./scripts/publish/build.js",
+    "build:patch": "node ./scripts/patch.js",
+    "build:packages": "for PKG in packages/*; do echo Building $PKG...; tsc -p $PKG; done",
     "test": "npm run test:packages && npm run test:cli",
     "e2e": "npm run test:e2e",
     "e2e:nightly": "node tests/e2e_runner.js --nightly",
@@ -47,7 +47,7 @@
     "@angular/compiler": "^2.0.0-rc.6",
     "@angular/compiler-cli": "^0.6.0",
     "@angular/core": "^2.0.0-rc.6",
-    "@angular/tsc-wrapped": "^0.2.2",
+    "@angular/tsc-wrapped": "^0.3.0",
     "angular2-template-loader": "^0.5.0",
     "awesome-typescript-loader": "^2.2.3",
     "chalk": "^1.1.3",
@@ -113,13 +113,13 @@
   },
   "ember-addon": {
     "paths": [
-      "./addon/ng2/"
+      "./packages/angular-cli/lib/addon"
     ]
   },
   "devDependencies": {
     "@types/chai": "^3.4.32",
     "@types/chalk": "^0.4.28",
-    "@types/common-tags": "^1.2.3",
+    "@types/common-tags": "^1.2.4",
     "@types/denodeify": "^1.2.29",
     "@types/express": "^4.0.32",
     "@types/fs-extra": "^0.0.31",
@@ -143,8 +143,10 @@
     "minimist": "^1.2.0",
     "mocha": "^2.4.5",
     "mock-fs": "3.10.0",
+    "npm-run": "^4.1.0",
     "object-assign": "^4.0.1",
     "request": "^2.74.0",
+    "resolve-bin": "^0.4.0",
     "rewire": "^2.5.1",
     "sinon": "^1.17.3",
     "through": "^2.3.8",

lib/bootstrap-local.js

@@ -0,0 +1,42 @@
+/* jshint node: true */
+'use strict';
+
+const config = require('../models/config');
+const path = require('path');
+
+module.exports = {
+  name: 'ng2',
+
+  config: function () {
+    this.project.ngConfig = this.project.ngConfig || config.CliConfig.fromProject().config;
+  },
+
+  blueprintsPath: function () {
+    return path.join(__dirname, '../blueprints');
+  },
+
+  includedCommands: function () {
+    return {
+      'build': require('../commands/build').default,
+      'serve': require('../commands/serve').default,
+      'new': require('../commands/new').default,
+      'generate': require('../commands/generate').default,
+      'init': require('../commands/init').default,
+      'test': require('../commands/test').default,
+      'e2e': require('../commands/e2e').default,
+      'help': require('../commands/help').default,
+      'lint': require('../commands/lint').default,
+      'version': require('../commands/version').default,
+      'completion': require('../commands/completion').default,
+      'doc': require('../commands/doc').default,
+      'github-pages-deploy': require('../commands/github-pages-deploy').default,
+
+      // Easter eggs.
+      'make-this-awesome': require('../commands/easter-egg').default,
+
+      // Configuration.
+      'set': require('../commands/set').default,
+      'get': require('../commands/get').default
+    };
+  }
+};

lib/packages.js

@@ -0,0 +1,49 @@
+#!/usr/bin/env node
+'use strict';
+
+// Provide a title to the process in `ps`
+process.title = 'angular-cli';
+
+const resolve = require('resolve');
+const exit = require('exit');
+const packageJson = require('../package.json');
+const Leek = require('leek');
+
+
+resolve('angular-cli', { basedir: process.cwd() },
+  function (error, projectLocalCli) {
+    var cli;
+    if (error) {
+      // If there is an error, resolve could not find the ng-cli
+      // library from a package.json. Instead, include it from a relative
+      // path to this script file (which is likely a globally installed
+      // npm package). Most common cause for hitting this is `ng new`
+      cli = require('../lib/cli');
+    } else {
+      // No error implies a projectLocalCli, which will load whatever
+      // version of ng-cli you have installed in a local package.json
+      cli = require(projectLocalCli);
+    }
+
+    if ('default' in cli) {
+      cli = cli['default'];
+    }
+
+    cli({
+      cliArgs: process.argv.slice(2),
+      inputStream: process.stdin,
+      outputStream: process.stdout,
+      Leek: CustomLeek
+    }).then(function (result) {
+      var exitCode = typeof result === 'object' ? result.exitCode : result;
+      exit(exitCode);
+    });
+
+    function CustomLeek(options) {
+      options.trackingCode = packageJson.trackingCode;
+      options.globalName = packageJson.name;
+      options.name = packageJson.name;
+      options.version = packageJson.version;
+      return new Leek(options);
+    }
+  });

package.json

@@ -3,7 +3,7 @@
 
 module.exports = function (config) {
   config.set({
-    basePath: './',
+    basePath: '',
     frameworks: ['jasmine', 'angular-cli'],
     plugins: [
       require('karma-jasmine'),

packages/angular-cli/addon/index.js

@@ -21,7 +21,7 @@ module.exports = {
 
   locals: function(options) {
     this.styleExt = options.style;
-    this.version = require(path.resolve(__dirname, '../../../../package.json')).version;
+    this.version = require(path.resolve(__dirname, '../../package.json')).version;
 
     // Join with / not path.sep as reference to typings require forward slashes.
     const relativeRootPath = options.sourceDir.split(path.sep).map(() => '..').join('/');

packages/angular-cli/bin/ng

@@ -32,11 +32,7 @@ const InitCommand: any = Command.extend({
   anonymousOptions: ['<glob-pattern>'],
 
   _defaultBlueprint: function () {
-    if (this.project.isEmberCLIAddon()) {
-      return 'addon';
-    } else {
-      return 'ng2';
-    }
+    return 'ng2';
   },
 
   run: function (commandOptions: any, rawArgs: string[]) {

addon/ng2/blueprints/class/files/__path__/__name__.spec.ts renamed to packages/angular-cli/blueprints/class/files/__path__/__name__.spec.ts

@@ -3,7 +3,7 @@ import * as denodeify from 'denodeify';
 const Command = require('ember-cli/lib/models/command');
 const SilentError = require('silent-error');
 const PortFinder = require('portfinder');
-import ServeWebpackTask from '../tasks/serve-webpack.ts';
+import ServeWebpackTask from '../tasks/serve-webpack';
 
 PortFinder.basePort = 49152;
 

addon/ng2/blueprints/class/files/__path__/__name__.ts renamed to packages/angular-cli/blueprints/class/files/__path__/__name__.ts

@@ -15,7 +15,7 @@ const VersionCommand = Command.extend({
 
   run: function (options: any) {
     const versions: any = process.versions;
-    const pkg = require(path.resolve(__dirname, '..', '..', '..', 'package.json'));
+    const pkg = require(path.resolve(__dirname, '..', 'package.json'));
 
     versions['os'] = process.platform + ' ' + process.arch;
 

addon/ng2/blueprints/class/index.js renamed to packages/angular-cli/blueprints/class/index.js

@@ -4,6 +4,7 @@
 const cli = require('ember-cli/lib/cli');
 const path = require('path');
 
+Error.stackTraceLimit = Infinity;
 
 module.exports = function(options) {
   const oldStdoutWrite = process.stdout.write;

addon/ng2/blueprints/component-test/index.js renamed to packages/angular-cli/blueprints/component-test/index.js

@@ -1,5 +1,5 @@
 import {CliConfig as CliConfigBase} from './config/config';
-import {CliConfig as ConfigInterface} from '../../../lib/config/schema';
+import {CliConfig as ConfigInterface} from '../lib/config/schema';
 import { oneLine } from 'common-tags';
 import * as chalk from 'chalk';
 import * as fs from 'fs';

addon/ng2/blueprints/component/files/__path__/__name__.component.__styleext__ renamed to packages/angular-cli/blueprints/component/files/__path__/__name__.component.__styleext__

@@ -4,7 +4,7 @@ import * as path from 'path';
 import {SchemaClass, SchemaClassFactory} from '../json-schema/schema-class-factory';
 
 
-const DEFAULT_CONFIG_SCHEMA_PATH = path.join(__dirname, '../../../../lib/config/schema.json');
+const DEFAULT_CONFIG_SCHEMA_PATH = path.join(__dirname, '../../lib/config/schema.json');
 
 
 export class InvalidConfigError extends Error {

addon/ng2/blueprints/component/files/__path__/__name__.component.html renamed to packages/angular-cli/blueprints/component/files/__path__/__name__.component.html

@@ -50,7 +50,7 @@ export function findLoadChildren(tsFilePath: string): string[] {
 }
 
 
-export function findLazyModules(projectRoot: any): string[] {
+export function findLazyModules(projectRoot: any): {[key: string]: string} {
   const result: {[key: string]: string} = {};
   glob.sync(path.join(projectRoot, '/**/*.ts'))
     .forEach(tsPath => {