chore(generator): Update template barrels to use 'export *'

Close angular#863

removed pwa option

added custom serve task

universal serve alpha

changed ember-cli-live-reload to inline script. live reload works now with universal-serve

Author: delasteve

addon/ng2/blueprints/component/files/__path__/index.ts

@@ -1 +1 @@
-export { <%= classifiedModuleName %>Component } from './<%= dasherizedModuleName %>.component';
+export * from './<%= dasherizedModuleName %>.component';

addon/ng2/blueprints/directive/files/__path__/index.ts

@@ -1 +1 @@
-export {<%= classifiedModuleName %>} from './<%= dasherizedModuleName %>.directive';
+export * from './<%= dasherizedModuleName %>.directive';

addon/ng2/blueprints/ng2/files/__path__/index.html

@@ -6,10 +6,18 @@
   <base href="/">
 
   {{#unless environment.production}}
-  <script src="/ember-cli-live-reload.js" type="text/javascript"></script>
+  <script type="text/javascript">
+    (function() {
+      var src = (location.protocol || 'http:') + '//' + (location.hostname || 'localhost') + ':49153/livereload.js?snipver=1';
+      var script    = document.createElement('script');
+      script.type   = 'text/javascript';
+      script.src    = src;
+      document.getElementsByTagName('head')[0].appendChild(script);
+    }());
+  </script>
   {{/unless}}
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="icon" type="image/x-icon" href="favicon.ico"><% if (isMobile || pwa) { %>
+  <link rel="icon" type="image/x-icon" href="favicon.ico"><% if (isMobile) { %>
   <meta name="apple-mobile-web-app-capable" content="yes">
   <meta name="theme-color" content="#000000">
   <link rel="manifest" href="/manifest.webapp">

addon/ng2/blueprints/ng2/files/angular-cli.json

@@ -8,8 +8,7 @@
       "main": "<%= sourceDir %>/start-browser.ts",
       "tsconfig": "<%= sourceDir %>/tsconfig.json",
       "mobile": <%= isMobile %>,
-      "universal" : <%= universal %>,
-      "pwa": <%= pwa %>
+      "universal" : <%= universal %>
     }
   ],
   "addons": [],

addon/ng2/blueprints/ng2/files/package.json

@@ -26,9 +26,7 @@
     "angular2-universal-polyfills": "^0.4.1",
     "preboot": "^2.0.10",
     "body-parser": "^1.15.0",
-    "express": "^4.13.4",<% } %><% if(pwa) { %>
-    "@angular/service-worker": "^0.2.0",
-    "@angular/app-shell": "^0.0.0",<% } %>
+    "express": "^4.13.4",<% } %>
     "es6-shim": "^0.35.0",
     "reflect-metadata": "0.1.3",
     "rxjs": "5.0.0-beta.6",

addon/ng2/blueprints/ng2/index.js

@@ -11,8 +11,7 @@ module.exports = {
     { name: 'prefix', type: String, default: 'app', aliases: ['p'] },
     { name: 'style', type: String, default: 'css' },
     { name: 'mobile', type: Boolean, default: false },
-    { name: 'universal', type: Boolean, default: false },
-    { name: 'pwa', type: Boolean, default: false }
+    { name: 'universal', type: Boolean, default: false }
   ],
 
   afterInstall: function (options) {
@@ -43,8 +42,7 @@ module.exports = {
       styleExt: this.styleExt,
       refToTypings: refToTypings,
       isMobile: options.mobile,
-      universal: options.universal,
-      pwa: options.pwa
+      universal: options.universal
     };
   },
 

addon/ng2/blueprints/pipe/files/__path__/index.ts

@@ -1 +1 @@
-export { <%= classifiedModuleName %> } from './<%= dasherizedModuleName %>.pipe';
+export * from './<%= dasherizedModuleName %>.pipe';

addon/ng2/blueprints/service/files/__path__/index.ts

@@ -1 +1 @@
-export {<%= classifiedModuleName %>Service} from './<%= dasherizedModuleName %>.service';
+export * from './<%= dasherizedModuleName %>.service';

addon/ng2/blueprints/universal/files/__path__/start-node.ts

@@ -140,9 +140,4 @@ function ngApp(req, res) {
  */
 app.get('/**', ngApp);
 
-/**
- * start server
- */
-app.listen(4200, () => {
-  console.log('Listen on http://localhost:4200');
-});
+module.exports = app;

addon/ng2/commands/init.js

@@ -26,8 +26,7 @@ module.exports = Command.extend({
     { name: 'style', type: String, default: 'css' },
     { name: 'prefix', type: String, default: 'app', aliases: ['p'] },
     { name: 'mobile', type: Boolean, default: false },
-    { name: 'universal', type: Boolean, default: false },
-    { name: 'pwa', type: Boolean, default: false }
+    { name: 'universal', type: Boolean, default: false }
   ],
 
   anonymousOptions: ['<glob-pattern>'],
@@ -106,8 +105,7 @@ module.exports = Command.extend({
       style: commandOptions.style,
       prefix: commandOptions.prefix,
       mobile: commandOptions.mobile,
-      universal: commandOptions.universal,
-      pwa: commandOptions.pwa
+      universal: commandOptions.universal
     };
 
     if (!validProjectName(packageName)) {

addon/ng2/commands/new.ts

@@ -25,8 +25,7 @@ const NewCommand = Command.extend({
     { name: 'style', type: String, default: 'css' },
     { name: 'prefix', type: String, default: 'app', aliases: ['p'] },
     { name: 'mobile', type: Boolean, default: false },
-    { name: 'universal', type: Boolean, default: false },
-    { name: 'pwa', type: Boolean, default: false }
+    { name: 'universal', type: Boolean, default: false }
   ],
 
   run: function (commandOptions, rawArgs) {
@@ -60,10 +59,6 @@ const NewCommand = Command.extend({
       commandOptions.directory = packageName;
     }
 
-    if (commandOptions.pwa === true) {
-      commandOptions.universal = true;
-    }
-
     const createAndStepIntoDirectory =
       new this.tasks.CreateAndStepIntoDirectory({ ui: this.ui, analytics: this.analytics });
 

addon/ng2/commands/serve.js

@@ -0,0 +1,137 @@
+'use strict';
+
+var assign = require('lodash/assign');
+var Command = require('ember-cli/lib/models/command');
+var Promise = require('ember-cli/lib/ext/promise');
+var SilentError = require('silent-error');
+var PortFinder = require('portfinder');
+var win = require('ember-cli/lib/utilities/windows-admin');
+var EOL = require('os').EOL;
+var UniversalServe = require('../tasks/universal-serve');
+const config = require('../models/config');
+
+PortFinder.basePort = 49152;
+
+var getPort = Promise.denodeify(PortFinder.getPort);
+var defaultPort = process.env.PORT || 4200;
+
+const NewCommand = Command.extend({
+  name: 'serve',
+  description: 'Builds and serves your app, rebuilding on file changes.',
+  aliases: ['server', 's'],
+
+  availableOptions: [
+    { name: 'port', type: Number, default: defaultPort, aliases: ['p'] },
+    { name: 'host', type: String, aliases: ['H'], description: 'Listens on all interfaces by default' },
+    { name: 'proxy', type: String, aliases: ['pr', 'pxy'] },
+    {
+      name: 'insecure-proxy',
+      type: Boolean,
+      default: false,
+      aliases: ['inspr'],
+      description: 'Set false to proxy self-signed SSL certificates'
+    },
+    { name: 'watcher', type: String, default: 'events', aliases: ['w'] },
+    { name: 'live-reload', type: Boolean, default: true, aliases: ['lr'] },
+    { name: 'live-reload-host', type: String, aliases: ['lrh'], description: 'Defaults to host' },
+    { name: 'live-reload-base-url', type: String, aliases: ['lrbu'], description: 'Defaults to baseURL' },
+    {
+      name: 'live-reload-port',
+      type: Number,
+      aliases: ['lrp'],
+      description: '(Defaults to port number within [49152...65535])'
+    },
+    {
+      name: 'environment',
+      type: String,
+      default: 'development',
+      aliases: ['e', { 'dev': 'development' }, { 'prod': 'production' }]
+    },
+    { name: 'output-path', type: 'Path', default: 'dist/', aliases: ['op', 'out'] },
+    { name: 'ssl', type: Boolean, default: false },
+    { name: 'ssl-key', type: String, default: 'ssl/server.key' },
+    { name: 'ssl-cert', type: String, default: 'ssl/server.crt' }
+  ],
+
+  run: function (commandOptions) {
+    this.project.ngConfig = this.project.ngConfig || config.CliConfig.fromProject();
+    commandOptions.liveReloadHost = commandOptions.liveReloadHost || commandOptions.host;
+
+    return this._checkExpressPort(commandOptions)
+      .then(this._autoFindLiveReloadPort.bind(this))
+      .then(function (commandOptions) {
+        var serve;
+        commandOptions = assign({}, commandOptions, {
+          baseURL: this.project.config(commandOptions.environment).baseURL || '/'
+        });
+
+        if (commandOptions.proxy) {
+          if (!commandOptions.proxy.match(/^(http:|https:)/)) {
+            var message = 'You need to include a protocol with the proxy URL.' + EOL + 'Try --proxy http://' + commandOptions.proxy;
+
+            return Promise.reject(new SilentError(message));
+          }
+        }
+
+        if (this.project.ngConfig.apps[0].universal === false) {
+          var ServeTask = this.tasks.Serve;
+          serve = new ServeTask({
+            ui: this.ui,
+            analytics: this.analytics,
+            project: this.project
+          });
+        } else {
+          serve = new UniversalServe({
+            ui: this.ui,
+            analytics: this.analytics,
+            project: this.project
+          });
+        }
+
+        return win.checkWindowsElevation(this.ui).then(function () {
+          return serve.run(commandOptions);
+        });
+      }.bind(this));
+  },
+
+  _checkExpressPort: function (commandOptions) {
+    return getPort({ port: commandOptions.port, host: commandOptions.host })
+      .then(function (foundPort) {
+
+        if (commandOptions.port !== foundPort && commandOptions.port !== 0) {
+          var message = 'Port ' + commandOptions.port + ' is already in use.';
+          return Promise.reject(new SilentError(message));
+        }
+
+        // otherwise, our found port is good
+        commandOptions.port = foundPort;
+        return commandOptions;
+
+      }.bind(this));
+  },
+
+  _autoFindLiveReloadPort: function (commandOptions) {
+    return getPort({ port: commandOptions.liveReloadPort, host: commandOptions.liveReloadHost })
+      .then(function (foundPort) {
+
+        // if live reload port matches express port, try one higher
+        if (foundPort === commandOptions.port) {
+          commandOptions.liveReloadPort = foundPort + 1;
+          return this._autoFindLiveReloadPort(commandOptions);
+        }
+
+        // port was already open
+        if (foundPort === commandOptions.liveReloadPort) {
+          return commandOptions;
+        }
+
+        // use found port as live reload port
+        commandOptions.liveReloadPort = foundPort;
+        return commandOptions;
+
+      }.bind(this));
+  }
+});
+
+module.exports = NewCommand;
+module.exports.overrideCore = true;

addon/ng2/index.js

@@ -12,6 +12,7 @@ module.exports = {
 
   includedCommands: function () {
     return {
+      'serve': require('./commands/serve'),
       'new': require('./commands/new'),
       'generate': require('./commands/generate'),
       'init': require('./commands/init'),