ember-cli 4.6.0-beta.1 → 4.7.0

package/CHANGELOG.md

@@ -1,11 +1,24 @@
 # ember-cli Changelog
 
-## v4.6.0-beta.1
+## v4.7.0
 
 #### Blueprint Changes
 
-- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v4.5.0...v4.6.0-beta.1)
-- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v4.5.0...v4.6.0-beta.1)
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v4.6.0...v4.7.0)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v4.6.0...v4.7.0)
+
+#### Changelog
+
+- [#10009](https://github.com/ember-cli/ember-cli/pull/10009) [BUGFIX] Handle rebuild failures without exiting [@bendemboski](https://github.com/bendemboski)
+
+Thank you to all who took the time to contribute!
+
+## v4.6.0
+
+#### Blueprint Changes
+
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v4.5.0...v4.6.0)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v4.5.0...v4.6.0)
 
 #### Changelog
 

package/blueprints/addon/additional-dev-dependencies.json

@@ -1,6 +1,6 @@
 {
   "devDependencies": {
-    "@embroider/test-setup": "^1.8.0",
+    "@embroider/test-setup": "^1.8.3",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-try": "^2.0.0",
     "ember-source-channel-url": "^3.0.0"

package/blueprints/app/files/package.json

@@ -25,9 +25,9 @@
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.8.1<% if (embroider) { %>",
-    "@embroider/compat": "^1.8.0",
-    "@embroider/core": "^1.8.0",
-    "@embroider/webpack": "^1.8.0<% } %>",
+    "@embroider/compat": "^1.8.3",
+    "@embroider/core": "^1.8.3",
+    "@embroider/webpack": "^1.8.3<% } %>",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "babel-eslint": "^10.1.0",
@@ -37,31 +37,31 @@
     "ember-cli-app-version": "^5.0.0",
     "ember-cli-babel": "^7.26.11",
     "ember-cli-dependency-checker": "^3.3.1",
-    "ember-cli-htmlbars": "^6.0.1",
+    "ember-cli-htmlbars": "^6.1.0",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-data": "~4.4.0",
-    "ember-fetch": "^8.1.1",
+    "ember-data": "~4.7.1",
+    "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^2.1.2",
     "ember-page-title": "^7.0.0",
     "ember-qunit": "^5.1.5",
     "ember-resolver": "^8.0.3",
-    "ember-source": "~4.6.0-beta.2",
-    "ember-template-lint": "^4.10.0<% if (welcome) { %>",
+    "ember-source": "~4.7.0",
+    "ember-template-lint": "^4.14.0<% if (welcome) { %>",
     "ember-welcome-page": "^6.2.0<% } %>",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-ember": "^10.6.1",
+    "eslint-plugin-ember": "^11.0.6",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-qunit": "^7.3.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-qunit": "^7.3.1",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.7.1",
     "qunit": "^2.19.1",
     "qunit-dom": "^2.0.0",
-    "webpack": "^5.73.0"
+    "webpack": "^5.74.0"
   },
   "engines": {
     "node": "14.* || >= 16"

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.6.0-beta.1-beta-79f8547eb8"
+        "version": "4.7.0-release-6277227f89"
     },
     "files": {
         "lib/broccoli/default-packager.js": {
@@ -5109,7 +5109,7 @@
         },
         {
             "file": "lib/models/builder.js",
-            "line": 233,
+            "line": 237,
             "description": "Delegates to the `cleanup` method of the wrapped Broccoli builder.",
             "access": "private",
             "tagname": "",
@@ -5124,7 +5124,7 @@
         },
         {
             "file": "lib/models/builder.js",
-            "line": 265,
+            "line": 269,
             "description": "Checks for issues in the environment that can't easily be detected until\nafter a build and issues any necessary deprecation warnings.\n\n- check for old (pre 0.1.4) versions of heimdalljs",
             "access": "private",
             "tagname": "",

package/lib/models/builder.js

@@ -221,6 +221,10 @@ class Builder extends CoreObject {
     } catch (error) {
       await this.processAddonBuildSteps('buildError', error);
 
+      // Mark this as a builder error so the watcher knows it has been handled
+      // and won't re-throw it
+      error.isBuilderError = true;
+
       throw error;
     } finally {
       clearInterval(uiProgressIntervalID);

package/lib/tasks/server/middleware/history-support/index.js

@@ -49,7 +49,16 @@ class HistorySupportAddon {
 
     app.use(async (req, _, next) => {
       try {
-        const results = await watcher;
+        let results;
+        try {
+          results = await watcher;
+        } catch (e) {
+          // This means there was a build error, so we won't actually be serving
+          // index.html, and we have nothing to do. We have to catch it here,
+          // though, or it will go uncaught and cause the process to exit.
+          return;
+        }
+
         if (this.shouldHandleRequest(req, options)) {
           let assetPath = req.path.slice(baseURL.length);
           let isFile = false;

package/package.json

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