chore(webpack): resolve au run (without watch) error

aurelia · Jul 24, 2017 · 7f5e84c · 7f5e84c
1 parent e1f8b94
commit 7f5e84c
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 7 deletions.
diff --git a/lib/resources/tasks/run-webpack.js b/lib/resources/tasks/run-webpack.js
@@ -3,6 +3,7 @@ import webpack from 'webpack';
 import Server from 'webpack-dev-server';
 import project from '../aurelia.json';
 import {CLIOptions, reportWebpackReadiness} from 'aurelia-cli';
+import build from './build';
 
 function run(done) {
   // https://webpack.github.io/docs/webpack-dev-server.html
@@ -21,7 +22,7 @@ function run(done) {
   };
 
   if (!CLIOptions.hasFlag('watch')) {
-    opts.watch = false;
+    opts.lazy = true;
   }
 
   if (project.platform.hmr || CLIOptions.hasFlag('hmr')) {
@@ -34,8 +35,16 @@ function run(done) {
 
   server.listen(opts.port, opts.host, function(err) {
     if (err) throw err;
-    reportWebpackReadiness(opts);
-    done();
+
+    if (opts.lazy) {
+      build(() => {
+        reportWebpackReadiness(opts);
+        done();
+      });
+    } else {
+      reportWebpackReadiness(opts);
+      done();
+    }
   });
 }
 

diff --git a/lib/resources/tasks/run-webpack.ts b/lib/resources/tasks/run-webpack.ts
@@ -3,6 +3,7 @@ import * as webpack from 'webpack';
 import * as Server from 'webpack-dev-server';
 import * as project from '../aurelia.json';
 import {CLIOptions, reportWebpackReadiness} from 'aurelia-cli';
+import build from './build';
 
 function run(done) {
   // https://webpack.github.io/docs/webpack-dev-server.html
@@ -18,10 +19,10 @@ function run(done) {
     stats: {
       colors: require('supports-color')
     }
-  };
+  } as any;
 
   if (!CLIOptions.hasFlag('watch')) {
-    opts.watch = false;
+    opts.lazy = true;
   }
 
   if (project.platform.hmr || CLIOptions.hasFlag('hmr')) {
@@ -34,8 +35,16 @@ function run(done) {
 
   server.listen(opts.port, opts.host, function(err) {
     if (err) throw err;
-    reportWebpackReadiness(opts);
-    done();
+
+    if (opts.lazy) {
+      build(() => {
+        reportWebpackReadiness(opts);
+        done();
+      });
+    } else {
+      reportWebpackReadiness(opts);
+      done();
+    }
   });
 }