ember-cli 4.9.0 → 4.9.2

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # ember-cli Changelog
 
+## v4.9.2
+
+#### Blueprint Changes
+
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v4.9.1...v4.9.2)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v4.9.1...v4.9.2)
+
+#### Changelog
+
+- [#10108](https://github.com/ember-cli/ember-cli/pull/10108) [BUGFIX release] Correctly instantiate server watcher [@bertdeblock](https://github.com/bertdeblock)
+
+Thank you to all who took the time to contribute!
+
+## v4.9.1
+
+#### Blueprint Changes
+
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v4.9.0...v4.9.1)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v4.9.0...v4.9.1)
+
+#### Changelog
+
+- [#10101](https://github.com/ember-cli/ember-cli/pull/10101) [BUGFIX release] Correctly instantiate `Watcher` instance when running `ember test --serve` [@bertdeblock](https://github.com/bertdeblock)
+
+Thank you to all who took the time to contribute!
+
 ## v4.9.0
 
 #### Blueprint Changes

package/docs/build/data.json

@@ -3,7 +3,7 @@
         "logo": "https://ember-cli.com/assets/images/ember-cli-logo-small-dark.png",
         "name": "ember-cli",
         "description": "Command line tool for developing ambitious ember.js apps",
-        "version": "4.9.0-release-f420b7f917"
+        "version": "4.9.2-release-7c2cee092c"
     },
     "files": {
         "lib/broccoli/default-packager.js": {
@@ -6437,7 +6437,7 @@
         },
         {
             "file": "lib/tasks/serve.js",
-            "line": 103,
+            "line": 105,
             "description": "Exit silently",
             "access": "private",
             "tagname": "",

package/lib/commands/test.js

@@ -182,13 +182,15 @@ module.exports = Command.extend({
         session = this.runTask('TestServer', testOptions);
       } else {
         let builder = new this.Builder(testOptions);
-        testOptions.watcher = new this.Watcher(
-          Object.assign(this._env(), {
-            builder,
-            verbose: false,
-            options: commandOptions,
-          })
-        );
+        testOptions.watcher = (
+          await this.Watcher.build(
+            Object.assign(this._env(), {
+              builder,
+              verbose: false,
+              options: commandOptions,
+            })
+          )
+        ).watcher;
         session = this.runTask('TestServer', testOptions).finally(() => builder.cleanup());
       }
     } else if (hasBuild) {

package/lib/models/server-watcher.js

@@ -3,11 +3,13 @@
 const Watcher = require('./watcher');
 
 module.exports = class ServerWatcher extends Watcher {
-  constructor(options, build) {
-    super(options, build);
+  static async build(options, build) {
+    let { watcher: instance } = await super.build(options, build);
 
-    this.watcher.on('add', this.didAdd.bind(this));
-    this.watcher.on('delete', this.didDelete.bind(this));
+    instance.watcher.on('add', instance.didAdd.bind(instance));
+    instance.watcher.on('delete', instance.didDelete.bind(instance));
+
+    return { watcher: instance };
   }
 
   constructBroccoliWatcher(options) {

package/lib/tasks/serve.js

@@ -69,12 +69,14 @@ class ServeTask extends Task {
     let serverRoot = './server';
     let serverWatcher = null;
     if (fs.existsSync(serverRoot)) {
-      serverWatcher = new ServerWatcher({
-        ui: this.ui,
-        analytics: this.analytics,
-        watchedDir: path.resolve(serverRoot),
-        options,
-      });
+      serverWatcher = (
+        await ServerWatcher.build({
+          ui: this.ui,
+          analytics: this.analytics,
+          watchedDir: path.resolve(serverRoot),
+          options,
+        })
+      ).watcher;
     }
 
     let expressServer =

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "4.9.0",
+  "version": "4.9.2",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",