moving files around

Author: hansl

addon/ng2/package.json

@@ -10,42 +10,4 @@ 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');

bin/ng

@@ -1,6 +1,6 @@
 {
   "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",
   "trackingCode": "UA-8594346-19",

package.json

@@ -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);
+    }
+  });

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

@@ -0,0 +1,45 @@
+/*eslint-disable no-console */
+
+// This file hooks up on require calls to transpile TypeScript.
+const cli = require('ember-cli/lib/cli');
+const path = require('path');
+
+
+module.exports = function(options) {
+  const oldStdoutWrite = process.stdout.write;
+  process.stdout.write = function (line) {
+    line = line.toString();
+    if (line.match(/version:|WARNING:/)) {
+      return;
+    }
+    if (line.match(/ember-cli-(inject-)?live-reload/)) {
+      // don't replace 'ember-cli-live-reload' on ng init diffs
+      return oldStdoutWrite.apply(process.stdout, arguments);
+    }
+    line = line.replace(/ember-cli(?!.com)/g, 'angular-cli')
+      .replace(/\bember\b(?!-cli.com)/g, 'ng');
+    return oldStdoutWrite.apply(process.stdout, arguments);
+  };
+
+  const oldStderrWrite = process.stderr.write;
+  process.stderr.write = function (line) {
+    line = line.toString()
+      .replace(/ember-cli(?!.com)/g, 'angular-cli')
+      .replace(/\bember\b(?!-cli.com)/g, 'ng');
+    return oldStderrWrite.apply(process.stdout, arguments);
+  };
+
+  options.cli = {
+    name: 'ng',
+    root: path.join(__dirname, '..', '..'),
+    npmPackage: 'angular-cli'
+  };
+
+  // ensure the environemnt variable for dynamic paths
+  process.env.PWD = process.env.PWD || process.cwd();
+
+
+  process.env.CLI_ROOT = process.env.CLI_ROOT || path.resolve(__dirname, '..', '..');
+
+  return cli(options);
+};

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

@@ -0,0 +1,63 @@
+export interface CliConfig {
+    /**
+     * The global configuration of the project.
+     */
+    project?: {
+        version?: string;
+        name?: string;
+    };
+    /**
+     * Properties of the different applications in this project.
+     */
+    apps?: {
+        root?: string;
+        outDir?: string;
+        assets?: string;
+        index?: string;
+        main?: string;
+        test?: string;
+        tsconfig?: string;
+        prefix?: string;
+        mobile?: boolean;
+        /**
+         * Global styles to be included in the build.
+         */
+        styles?: string[];
+        /**
+         * Global scripts to be included in the build.
+         */
+        scripts?: string[];
+        /**
+         * Name and corresponding file for environment config.
+         */
+        environments?: {
+            [name: string]: any;
+        };
+    }[];
+    /**
+     * Configuration reserved for installed third party addons.
+     */
+    addons?: {
+        [name: string]: any;
+    }[];
+    /**
+     * Configuration reserved for installed third party packages.
+     */
+    packages?: {
+        [name: string]: any;
+    }[];
+    e2e?: {
+        protractor?: {
+            config?: string;
+        };
+    };
+    test?: {
+        karma?: {
+            config?: string;
+        };
+    };
+    defaults?: {
+        styleExt?: string;
+        prefixInterfaces?: boolean;
+    };
+}

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

@@ -0,0 +1,144 @@
+{
+  "$comment": "Please run `npm run build-config-interface` after changing this file. Thanks!",
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "id": "CliConfig",
+  "title": "Angular CLI Config Schema",
+  "type": "object",
+  "properties": {
+    "project": {
+      "description": "The global configuration of the project.",
+      "type": "object",
+      "properties": {
+        "version": {
+          "type": "string"
+        },
+        "name": {
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    },
+    "apps": {
+      "description": "Properties of the different applications in this project.",
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "root": {
+            "type": "string"
+          },
+          "outDir": {
+            "type": "string",
+            "default": "dist/"
+          },
+          "assets": {
+            "type": "string"
+          },
+          "index": {
+            "type": "string",
+            "default": "index.html"
+          },
+          "main": {
+            "type": "string"
+          },
+          "test": {
+            "type": "string"
+          },
+          "tsconfig": {
+            "type": "string"
+          },
+          "prefix": {
+            "type": "string"
+          },
+          "mobile": {
+            "type": "boolean"
+          },
+          "styles": {
+            "description": "Global styles to be included in the build.",
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "additionalProperties": false
+          },
+          "scripts": {
+            "description": "Global scripts to be included in the build.",
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "additionalProperties": false
+          },
+          "environments": {
+            "description": "Name and corresponding file for environment config.",
+            "type": "object",
+            "additionalProperties": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "additionalProperties": false
+    },
+    "addons": {
+      "description": "Configuration reserved for installed third party addons.",
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {},
+        "additionalProperties": true
+      }
+    },
+    "packages": {
+      "description": "Configuration reserved for installed third party packages.",
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {},
+        "additionalProperties": true
+      }
+    },
+    "e2e": {
+      "type": "object",
+      "properties": {
+        "protractor": {
+          "type": "object",
+          "properties": {
+            "config": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    "test": {
+      "type": "object",
+      "properties": {
+        "karma": {
+          "type": "object",
+          "properties": {
+            "config": {
+              "type": "string"
+            }
+          },
+          "additionalProperties": false
+        }
+      },
+      "additionalProperties": false
+    },
+    "defaults": {
+      "type": "object",
+      "properties": {
+        "styleExt": {
+          "type": "string"
+        },
+        "prefixInterfaces": {
+          "type": "boolean"
+        }
+      },
+      "additionalProperties": false
+    }
+  },
+  "additionalProperties": false
+}