using WebpackBuild as seen in angular/angular-cli#1633

Author: JohannesHoppe

README.md

@@ -25,9 +25,9 @@ angular-cli-ghpages is right now not compatible with `angular-cli: 1.0.0-beta.11
 
 This addon has the following prerequisites:
 
-- Node.js 4.x
+- Node.js 4.x
 - Git 1.7.6 or higher
-- Angular project created via [angular-cli](https://github.com/angular/angular-cli)
+- Angular project created via [angular-cli](https://github.com/angular/angular-cli)
 
 To install this addon run the following command:
 
@@ -55,8 +55,8 @@ By default, __gh-pages__ assumes that the current working directory is a git rep
 
 #### <a id="message">--message</a>
  * optional
- * default: `Auto-generated commit`
-
+ * default: `Auto-generated commit`
+
 The commit message, __must be wrapped in quotes__.  
 Some handy additional text is always added, if the environment variable `process.env.TRAVIS` exists (for Travis CI).
 
@@ -68,7 +68,7 @@ ng ghpages --message="What could possibly go wrong?"
 
 #### <a id="branch">--branch</a>
  * optional
- * default: `gh-pages`
+ * default: `gh-pages`
 
 The name of the branch you'll be pushing to.  The default uses GitHub's `gh-pages` branch, but this can be configured to push to any branch on any remote.
 
@@ -86,43 +86,52 @@ If you are running the command in a repository without a `user.name` or `user.em
 
 Suppress logging. With silent `true` log messages are suppressed and error messages are sanitized.
 
-> This option should be used if the repository URL or other information passed to git commands is sensitive and should not be logged (== you have a public build server). By default the silent mode is enabled to avoid sensitive data exposure.
-
-
-#### <a id="dir">--dir</a>
- * optional
- * default: `dist`
-
-Directory for all published sources, relative to the project-root.  
-Most probably no change is required here, useful together with --skip-build.
-This option can be used to deploy completely different folders, which are note related at all to angular.
-
-
-#### <a id="environment">--environment</a>
- * optional
- * default: `production`
-
-The Angular environment to create a build for.
-The build artifacts are always placed into the path `dist/`.
-The option `--dir` has no effect on the output path.
-
-
-#### <a id="skip-build">--skip-build</a>
- * optional
- * default: `false` (boolean)
-
-Skip building the project before deploying, useful together with --dir.
-
-
-
-#### <a id="dotfiles">--dotfiles</a>
- * optional
- * default: `true` (boolean)
-
-Includes dotfiles by default. When set to `false` files starting with `.` are ignored.
-
-
-
+> This option should be used if the repository URL or other information passed to git commands is sensitive and should not be logged (== you have a public build server). By default the silent mode is enabled to avoid sensitive data exposure.
+
+
+#### <a id="dir">--dir</a>
+ * optional
+ * default: `dist`
+
+Directory for all published sources, relative to the project-root.  
+Most probably no change is required here, useful together with --skip-build.
+This option can be used to deploy completely different folders, which are note related at all to angular.
+(Hint: usual angular-cli config is ignored here!)
+
+AND ALSO: Output path for the build, if a build is done.
+
+#### <a id="target">--target</a>
+ * optional
+ * default: `production`
+ * alias: `t`
+
+Build target (`development` or `production`), see [Build Targets and Environment Files](https://github.com/angular/angular-cli/#build-targets-and-environment-files).
+
+
+#### <a id="environment">--environment</a>
+ * optional
+ * default: `prod`
+  * alias: `e`
+
+Environment file to be used with that build (`dev`, `prod` or own), see [Build Targets and Environment Files](https://github.com/angular/angular-cli/#build-targets-and-environment-files).
+
+
+#### <a id="skip-build">--skip-build</a>
+ * optional
+ * default: `false` (boolean)
+
+Skip building the project before deploying, useful together with --dir.
+
+
+
+#### <a id="dotfiles">--dotfiles</a>
+ * optional
+ * default: `true` (boolean)
+
+Includes dotfiles by default. When set to `false` files starting with `.` are ignored.
+
+
+
 ## Extra
 
 For your convenience, the addon will recognize the [environment variable](https://docs.travis-ci.com/user/environment-variables/#Defining-Variables-in-Repository-Settings) `GH_TOKEN` and will replace this pattern in the `--repo` string. Please __do NOT disable the silent mode__ if you have any credentials in the repository URL! Read more about [Github tokens here](https://help.github.com/articles/creating-an-access-token-for-command-line-use/).

deploy.js

@@ -1,8 +1,14 @@
 'use strict';
 
-var Command = require('ember-cli/lib/models/command');
-var Promise = require('ember-cli/lib/ext/promise');
-var BuildTask = require('ember-cli/lib/tasks/build');
+// `require.main.require` so that plugin even works when linked with `npm link`
+// see https://github.com/npm/npm/issues/5875 / http://stackoverflow.com/a/25800501
+//
+// hint:
+// this asumes a flat node_modules structure with ember-cli and angular-cli on top
+// and does not work in NPM 2 until ember-cli is directly in package.json
+var Command = require.main.require('ember-cli/lib/models/command');
+var Promise = require.main.require('ember-cli/lib/ext/promise');
+var WebpackBuild = require.main.require('angular-cli/addon/ng2/tasks/build-webpack.ts'); // see angular-cli/lib/cli/index.js which hooks up on require calls to transpile TypeScript.
 
 var path = require('path');
 var fs = require('fs');
@@ -49,21 +55,28 @@ module.exports =  Command.extend({
     type:         String,
     default:      'dist',
     description:  'Directory for all published sources, relative to the project-root. Most probably no change is required here.'
+  }, { 
+    name:         'target',
+    type:         String,
+    default:      'production', 
+    aliases:      ['t', { 'dev': 'development' }, { 'prod': 'production' }],
+    description:  'Build target (`development` or `production`)'
+  }, { 
+    name:         'environment',
+    type:         String,
+    default:      'prod',
+    aliases:      ['e'],
+    description:  'Environment file to be used with that build (`dev`, `prod` or own)'
   }, {
-      name: 'environment',
-      type: String,
-      default: 'production',
-      description: 'The Angular environment to create a build for'
-  }, {
-      name: 'skip-build',
-      type: Boolean,
-      default: false,
-      description: 'Skip building the project before deploying, useful together with --dir'
+    name:         'skip-build',
+    type:         Boolean,
+    default:      false,
+    description: 'Skip building the project before deploying, useful together with --dir'
   }, {
-      name: 'dotfiles',
-      type: Boolean,
-      default: true,
-      description: 'Includes dotfiles by default. When set to `false` files starting with `.` are ignored.'
+    name:        'dotfiles',
+    type:         Boolean,
+    default:      true,
+    description:  'Includes dotfiles by default. When set to `false` files starting with `.` are ignored.'
   }],
   run: function(options, rawArgs) {
 
@@ -82,15 +95,19 @@ module.exports =  Command.extend({
     // gh-pages: forwards  messages to ui
     options.logger = function(message) { ui.write(message + "\n"); }
 
-    var buildTask = new BuildTask({
+    var buildTask = new WebpackBuild({
       ui: this.ui,
       analytics: this.analytics,
-      project: this.project
+      cliProject: this.project,
+      target: options.target,
+      environment: options.environment,
+      outputPath: dir
     });
 
     var buildOptions = {
+      target: options.target,
       environment: options.environment,
-      outputPath: 'dist/'
+      outputPath: dir
     };
 
     if (process.env.TRAVIS) {

package.json

@@ -34,7 +34,7 @@
   "license": "MIT",
   "dependencies": {
     "gh-pages": "^0.11.0"
-  }
+  },
   "peerDependencies": {
     "ember-cli": "^2.5.0"
   },