fixup! Use await import in findBuildFile

ember-cli · Oct 18, 2022 · b2c2b37 · b2c2b37
1 parent 6384eb0
commit b2c2b37
Show file tree

Hide file tree

Showing 7 changed files with 167 additions and 130 deletions.
diff --git a/lib/models/builder.js b/lib/models/builder.js
@@ -51,6 +51,12 @@ class Builder extends CoreObject {
     throw new SilentError('No ember-cli-build.js found.');
   }
 
+  async ensureBroccoliBuilder() {
+    if (this.builder === undefined) {
+      await this.setupBroccoliBuilder();
+    }
+  }
+
   /**
    * @private
    * @method setupBroccoliBuilder
@@ -166,9 +172,7 @@ class Builder extends CoreObject {
    * @return {Promise}
    */
   async build(addWatchDirCallback, resultAnnotation) {
-    if (this.builder === undefined) {
-      await this.setupBroccoliBuilder();
-    }
+    await this.ensureBroccoliBuilder();
 
     let buildResults, uiProgressIntervalID;
 

diff --git a/lib/models/server-watcher.js b/lib/models/server-watcher.js
@@ -3,8 +3,8 @@
 const Watcher = require('./watcher');
 
 module.exports = class ServerWatcher extends Watcher {
-  constructor(options) {
-    super(options);
+  constructor(options, build) {
+    super(options, build);
 
     this.watcher.on('add', this.didAdd.bind(this));
     this.watcher.on('delete', this.didDelete.bind(this));

diff --git a/lib/models/watcher.js b/lib/models/watcher.js
@@ -12,19 +12,35 @@ const eventTypeNormalization = {
   change: 'changed',
 };
 
+const ConstructedFromBuilder = Symbol('Watcher.build');
+
 module.exports = class Watcher extends CoreObject {
-  constructor(_options) {
+  constructor(_options, build) {
+    if (build !== ConstructedFromBuilder) {
+      throw new Error('instantiate Watcher with (await Watcher.build()).watcher, not new Watcher()');
+    }
+
     super(_options);
 
     this.verbose = true;
+    this.serving = _options.serving;
+  }
 
-    let options = this.buildOptions();
+  static async build(_options) {
+    let watcher = new this(_options, ConstructedFromBuilder);
+    await watcher.setupBroccoliWatcher(_options);
 
-    logger.info('initialize %o', options);
+    // This indirection is because Watcher instances are themselves spec
+    // noncompliant thennables (see the then() method) so returning watcher
+    // directly will interfere with `await Watcher.build()`
+    return { watcher };
+  }
 
-    this.serving = _options.serving;
+  async setupBroccoliWatcher() {
+    let options = this.buildOptions();
 
-    this.watcher = this.watcher || this.constructBroccoliWatcher(options);
+    logger.info('initialize %o', options);
+    this.watcher = this.watcher || (await this.constructBroccoliWatcher(options));
 
     this.setupBroccoliChangeEvent();
     this.watcher.on('buildStart', this._setupBroccoliWatcherBuild.bind(this));
@@ -38,8 +54,9 @@ module.exports = class Watcher extends CoreObject {
     this.serveURL = serveURL;
   }
 
-  constructBroccoliWatcher(options) {
+  async constructBroccoliWatcher(options) {
     const { Watcher } = require('broccoli');
+    await this.builder.ensureBroccoliBuilder();
     const { watchedSourceNodeWrappers } = this.builder.builder;
 
     let watcher = new Watcher(this.builder, watchedSourceNodeWrappers, { saneOptions: options, ignored: this.ignored });

diff --git a/lib/tasks/build-watch.js b/lib/tasks/build-watch.js
@@ -35,13 +35,15 @@ class BuildWatchTask extends Task {
 
     let watcher =
       options._watcher ||
-      new Watcher({
-        ui,
-        builder,
-        analytics: this.analytics,
-        options,
-        ignored: [path.resolve(this.project.root, options.outputPath)],
-      });
+      (
+        await Watcher.build({
+          ui,
+          builder,
+          analytics: this.analytics,
+          options,
+          ignored: [path.resolve(this.project.root, options.outputPath)],
+        })
+      ).watcher;
 
     await watcher;
     // Run until failure or signal to exit

diff --git a/lib/tasks/serve.js b/lib/tasks/serve.js
@@ -55,14 +55,16 @@ class ServeTask extends Task {
 
     let watcher =
       options._watcher ||
-      new Watcher({
-        ui: this.ui,
-        builder,
-        analytics: this.analytics,
-        options,
-        serving: true,
-        ignored: [path.resolve(this.project.root, options.outputPath)],
-      });
+      (
+        await Watcher.build({
+          ui: this.ui,
+          builder,
+          analytics: this.analytics,
+          options,
+          serving: true,
+          ignored: [path.resolve(this.project.root, options.outputPath)],
+        })
+      ).watcher;
 
     let serverRoot = './server';
     let serverWatcher = null;

diff --git a/tests/unit/models/server-watcher-test.js b/tests/unit/models/server-watcher-test.js
@@ -12,12 +12,12 @@ describe('Server Watcher', function () {
   let analytics;
   let watcher;
 
-  beforeEach(function () {
+  beforeEach(async function () {
     ui = new MockUI();
     analytics = new MockAnalytics();
     watcher = new MockServerWatcher();
 
-    new ServerWatcher({
+    await ServerWatcher.build({
       ui,
       analytics,
       watcher,