feat(install): 1. and 3. phase from design docs

jkuri · jkuri · commit b2dbad8c2940 · 2016-03-31T23:23:59.000+02:00
diff --git a/addon/ng2/blueprints/ng2/files/package.json b/addon/ng2/blueprints/ng2/files/package.json
@@ -35,6 +35,6 @@
     "ts-node": "^0.5.5",
     "tslint": "^3.6.0",
     "typescript": "^1.8.7",
-    "typings": "^0.6.6"
+    "typings": "^0.7.7"
   }
 }
diff --git a/addon/ng2/blueprints/ng2/files/src/config/system.config.js b/addon/ng2/blueprints/ng2/files/src/config/system.config.js
@@ -0,0 +1,8 @@
+System.config({
+  "packages": {
+    "app": {
+      "format": "register",
+      "defaultExtension": "js"
+    }
+  }
+});
diff --git a/addon/ng2/blueprints/ng2/files/src/index.html b/addon/ng2/blueprints/ng2/files/src/index.html
@@ -32,15 +32,8 @@
   <script src="vendor/angular2/bundles/http.dev.js"></script>
   <script src="vendor/angular2/bundles/router.dev.js"></script>
 
+  <script src="config/system.config.js"></script>
   <script>
-    System.config({
-      packages: {
-        app: {
-          format: 'register',
-          defaultExtension: 'js'
-        }
-      }
-    });
     System.import('app.js').then(null, console.error.bind(console));
   </script>
 </body>
diff --git a/addon/ng2/commands/install.js b/addon/ng2/commands/install.js
@@ -0,0 +1,39 @@
+/* jshint node: true, esnext: true */
+'use strict';
+
+const Command      = require('ember-cli/lib/models/command');
+const SilentError  = require('silent-error');
+const Promise      = require('ember-cli/lib/ext/promise');
+const InstallTask  = require('../tasks/install');
+
+module.exports = Command.extend({
+  name: 'install',
+  description: 'Adds 3rd party library to existing project',
+  works: 'insideProject',
+
+  availableOptions: [
+    { name: 'typings', type: String, aliases: ['t'], description: 'Installs specified typings' }
+  ],
+
+  run: function (commandOptions, rawArgs) {
+    if (!rawArgs.length) {
+      const msg = 'The `ng install` command must take an argument with ' +
+                  'a package name.';
+
+      return Promise.reject(new SilentError(msg));
+    }
+
+    const installTask = new InstallTask({
+      ui:         this.ui,
+      analytics:  this.analytics,
+      project:    this.project
+    });
+
+    return installTask.run({
+      packages: rawArgs,
+      typings: commandOptions.typings || null
+    });
+  }
+});
+
+module.exports.overrideCore = true;
diff --git a/addon/ng2/commands/uninstall.js b/addon/ng2/commands/uninstall.js
@@ -0,0 +1,39 @@
+/* jshint node: true, esnext: true */
+'use strict';
+
+const Command       = require('ember-cli/lib/models/command');
+const SilentError   = require('silent-error');
+const Promise       = require('ember-cli/lib/ext/promise');
+const UninstallTask = require('../tasks/uninstall');
+
+module.exports = Command.extend({
+  name: 'uninstall',
+  description: 'Removes 3rd party library from existing project',
+  works: 'insideProject',
+
+  availableOptions: [
+    { name: 'typings', type: String, aliases: ['t'], description: 'Removes specified typings' }
+  ],
+
+  run: function (commandOptions, rawArgs) {
+    if (!rawArgs.length) {
+      const msg = 'The `ng uninstall` command must take an argument with ' +
+                  'a package name.';
+
+      return Promise.reject(new SilentError(msg));
+    }
+
+    const uninstallTask = new UninstallTask({
+      ui:         this.ui,
+      analytics:  this.analytics,
+      project:    this.project
+    });
+
+    return uninstallTask.run({
+      packages: rawArgs,
+      typings: commandOptions.typings || null
+    });
+  }
+});
+
+module.exports.overrideCore = true;
diff --git a/addon/ng2/index.js b/addon/ng2/index.js
@@ -14,7 +14,9 @@ module.exports = {
       'format': require('./commands/format'),
       'version': require('./commands/version'),
       'completion': require('./commands/completion'),
-      'doc': require('./commands/doc')
+      'doc': require('./commands/doc'),
+      'install': require('./commands/install'),
+      'uninstall': require('./commands/uninstall')
     };
   }
 };
diff --git a/addon/ng2/tasks/install.js b/addon/ng2/tasks/install.js
@@ -0,0 +1,82 @@
+/* jshint node: true, esnext: true */
+'use strict';
+
+const Promise         = require('ember-cli/lib/ext/promise');
+const Task            = require('ember-cli/lib/models/task');
+const npmTask         = require('ember-cli/lib/tasks/npm-task');
+const chalk           = require('chalk');
+const path            = require('path');
+const fs              = require('fs');
+const fse             = require('fs-extra');
+const packageJSON     = path.resolve(process.cwd(), 'package.json');
+const nodeModules     = path.resolve(process.cwd(), 'node_modules');
+const typingsInstall  = require('./typings-install');
+const systemJS        = require('../utilities/systemjs-helper.ts');
+const ts              = require('typescript');
+const glob            = require('glob');
+const _               = require('lodash');
+
+module.exports = Task.extend({
+  completionOKMessage: 'Successfully installed.',
+  completionErrorMessage: 'Error installing package.',
+
+  run: function(options) {
+    this.packages = options.packages;
+    this.typings = options.typings;
+
+    if (this.packages.indexOf('sass') !== -1) {
+      this.packages[this.packages.indexOf('sass')] = 'node-sass';
+    }
+
+    if (this.packages.indexOf('compass') !== -1) {
+      this.packages[this.packages.indexOf('compass')] = 'compass-importer';
+      if (this.packages.indexOf('sass') === -1 || this.packages.indexOf('node-sass')) {
+        this.packages.push('node-sass');
+      }
+    }
+
+    return this.installProcedure();
+  },
+
+  installProcedure: function() {
+    const NpmTask = new npmTask({
+      command: 'install',
+      ui: this.ui,
+      analytics: this.analytics,
+      project: this.project,
+      startProgressMessage: `Installing packages: ${this.packages}`,
+      completionMessage: `Packages successfully installed.`
+    });
+
+    return NpmTask.run({
+      packages: this.packages,
+      verbose: false,
+    })
+    .then(() => this.storeInSystemJSConfig(this.packages))
+    .then(() => {
+      const typings = this.typings;
+      if (typings) {
+        this.ui.startProgress(chalk.green(`Installing typings: ${typings}`), chalk.green(`.`));
+        return typingsInstall(typings).then(() => {
+          this.ui.stopProgress();
+          this.ui.writeLine(chalk.green(`Typings successfully installed.`)); 
+        });
+      }
+    }.bind(this));
+  },
+
+  storeInSystemJSConfig: function(packages) {
+    const systemPath = path.resolve(process.cwd(), 'src', 'config', 'system.config.js');
+    let json = systemJS.loadSystemJson(systemPath);
+
+    let mappings = json.map || {};
+    packages.forEach(pkg => {
+      mappings[pkg] = `libs/${pkg}/${pkg}.js`;
+    });
+    json.map = mappings;
+    systemJS.saveSystemJson(systemPath, json);
+    
+    return Promise.resolve();
+  }
+
+});
diff --git a/addon/ng2/tasks/typings-install.js b/addon/ng2/tasks/typings-install.js
@@ -0,0 +1,16 @@
+/* jshint node: true, esversion: 6 */
+'use strict';
+
+const Promise = require('ember-cli/lib/ext/promise');
+const exec    = Promise.denodeify(require('child_process').exec);
+
+module.exports = function(pkg) {
+  let cmd = ['typings install'];
+  const options = [
+    '--ambient',
+    '--save'
+  ];
+  cmd.push(pkg);
+
+  return exec(cmd.concat(options).join(' '));
+};
diff --git a/addon/ng2/tasks/typings-uninstall.js b/addon/ng2/tasks/typings-uninstall.js
@@ -0,0 +1,16 @@
+/* jshint node: true, esversion: 6 */
+'use strict';
+
+const Promise = require('ember-cli/lib/ext/promise');
+const exec    = Promise.denodeify(require('child_process').exec);
+
+module.exports = function(pkg) {
+  let cmd = ['typings uninstall'];
+  const options = [
+    '--ambient',
+    '--save'
+  ];
+  cmd.push(pkg);
+
+  return exec(cmd.concat(options).join(' '));
+};
diff --git a/addon/ng2/tasks/uninstall.js b/addon/ng2/tasks/uninstall.js
@@ -0,0 +1,66 @@
+/* jshint node: true, esversion: 6 */
+'use strict';
+
+const Promise           = require('ember-cli/lib/ext/promise');
+const Task              = require('ember-cli/lib/models/task');
+const npmTask           = require('ember-cli/lib/tasks/npm-task');
+const chalk             = require('chalk');
+const path              = require('path');
+const fs                = require('fs');
+const fse               = require('fs-extra');
+const exec              = Promise.denodeify(require('child_process').exec);
+const packageJSON       = path.resolve(process.cwd(), 'package.json');
+const nodeModules       = path.resolve(process.cwd(), 'node_modules');
+const typingsUninstall  = require('./typings-uninstall');
+const systemJS          = require('../utilities/systemjs-helper.ts');
+
+module.exports = Task.extend({
+  run: function(options) {
+    this.packages = options.packages;
+    this.typings = options.typings;
+
+    return this.uninstallProcedure();
+  },
+
+  uninstallProcedure: function() {
+    const NpmTask = new npmTask({
+      command: 'uninstall',
+      ui: this.ui,
+      analytics: this.analytics,
+      project: this.project,
+      startProgressMessage: `Uninstalling packages: ${this.packages}`,
+      completionMessage: `Packages successfully uninstalled.`
+    });
+
+    return NpmTask.run({
+      packages: this.packages,
+      verbose: false
+    })
+    .then(() => this.removeFromSystemJSConfig(this.packages))
+    .then(() => {
+      const typings = this.typings;
+      if (typings) {
+        this.ui.startProgress(chalk.green(`Uninstalling typings: ${typings}`), chalk.green(`.`));
+        return typingsUninstall(typings).then(() => {
+          this.ui.stopProgress();
+          this.ui.writeLine(chalk.green(`Typings successfully uninstalled.`)); 
+        });
+      }
+    }.bind(this));
+  },
+
+  removeFromSystemJSConfig: function(packages) {
+    const systemPath = path.resolve(process.cwd(), 'src', 'config', 'system.config.js');
+
+    let json = systemJS.loadSystemJson(systemPath);
+    let mappings = json.map || {};
+    packages.forEach(pkg => {
+      delete mappings[pkg];
+    });
+    json.map = mappings;
+    systemJS.saveSystemJson(systemPath, json);
+
+    return Promise.resolve();
+  }
+
+});
diff --git a/addon/ng2/utilities/systemjs-helper.ts b/addon/ng2/utilities/systemjs-helper.ts
@@ -0,0 +1,15 @@
+/// <reference path="../../../typings/main.d.ts" />
+import fs = require('fs');
+
+export function loadSystemJson(systemPath: string): { [name: string]: any } {
+  const systemContents: any = fs.readFileSync(systemPath, 'utf8');
+  const jsonContent: any = systemContents.match(/^[^\{]*([\s\S]+)\);.*$/m)[1];
+  
+  return JSON.parse(jsonContent);
+}
+
+export function saveSystemJson(systemPath: string, json: { [name: string]: any }) {
+  const writeContents: any = 'System.config(' + JSON.stringify(json, null, '\t') + ');';
+  
+  fs.writeFileSync(systemPath, writeContents, 'utf8');
+}
diff --git a/lib/broccoli/angular2-app.js b/lib/broccoli/angular2-app.js
@@ -1,3 +1,8 @@
+'use strict';
+
+process.env.NODE_PATH += `:${process.env.PWD}/node_modules`;
+require('module').Module._initPaths();
+
 var path = require('path');
 var configReplace = require('./broccoli-config-replace');
 var compileWithTypescript = require('./broccoli-typescript');
@@ -6,6 +11,10 @@ var fs = require('fs');
 var Funnel = require('broccoli-funnel');
 var mergeTrees = require('broccoli-merge-trees');
 var Project = require('ember-cli/lib/models/project');
+var sass = require('./broccoli-sass');
+var less = require('./broccoli-less');
+var stylus = require('./broccoli-stylus');
+var compass = require('./broccoli-compass');
 
 module.exports = Angular2App;
 
@@ -59,6 +68,21 @@ Angular2App.prototype.toTree = function () {
     }
   });
 
+  var tsconfig = JSON.parse(fs.readFileSync('src/tsconfig.json', 'utf-8'));
+  // Add all spec files to files. We need this because spec files are their own entry
+  // point.
+  fs.readdirSync(sourceDir).forEach(function addPathRecursive(name) {
+    const filePath = path.join(sourceDir, name);
+    if (filePath.match(/\.spec\.[jt]s$/)) {
+      tsconfig.files.push(name);
+    } else if (fs.statSync(filePath).isDirectory()) {
+      // Recursively call this function with the full sub-path.
+      fs.readdirSync(filePath).forEach(function(n) {
+        addPathRecursive(path.join(name, n));
+      });
+    }
+  });
+
   // Because the tsconfig does not include the source directory, add this as the first path
   // element.
   tsconfig.files = tsconfig.files.map(name => path.join(sourceDir, name));
@@ -72,14 +96,21 @@ Angular2App.prototype.toTree = function () {
   });
 
   var jsTree = new Funnel(sourceDir, {
-    include: ['**/*.js'],
-    allowEmpty: true
+      include: ['**/*.js'],
+      allowEmpty: true
   });
 
   var assetTree = new Funnel(sourceDir, {
-    include: ['**/*.*'],
-    exclude: ['**/*.ts', '**/*.js'],
-    allowEmpty: true
+      include: ['**/*.*'],
+      exclude: [
+        '**/*.ts', 
+        '**/*.js', 
+        '**/*.scss', 
+        '**/*.sass', 
+        '**/*.less',
+        '**/*.styl'
+      ],
+      allowEmpty: true
   });
 
   var vendorNpmTree = new Funnel('node_modules', {
diff --git a/package.json b/package.json
diff --git a/tests/e2e/e2e_workflow.spec.js b/tests/e2e/e2e_workflow.spec.js

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,6 @@`
`35`	`35`	`"ts-node": "^0.5.5",`
`36`	`36`	`"tslint": "^3.6.0",`
`37`	`37`	`"typescript": "^1.8.7",`
`38`		`- "typings": "^0.6.6"`
	`38`	`+ "typings": "^0.7.7"`
`39`	`39`	`}`
`40`	`40`	`}`