ember-cli 3.28.5 → 3.28.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (68) hide show
  1. package/CHANGELOG.md +13 -0
  2. package/docs/build/classes/Addon.html +1 -1
  3. package/docs/build/classes/AmdTransformAddon.html +1 -1
  4. package/docs/build/classes/Blueprint.html +1 -1
  5. package/docs/build/classes/Builder.html +3 -3
  6. package/docs/build/classes/CLI.html +1 -1
  7. package/docs/build/classes/Command.html +1 -1
  8. package/docs/build/classes/DefaultPackager.html +1 -1
  9. package/docs/build/classes/EmberAddon.html +1 -1
  10. package/docs/build/classes/EmberApp.html +1 -1
  11. package/docs/build/classes/HardwareInfo.html +1 -1
  12. package/docs/build/classes/HistorySupportAddon.html +1 -1
  13. package/docs/build/classes/Instrumentation.html +1 -1
  14. package/docs/build/classes/NodeModulesList.html +1 -1
  15. package/docs/build/classes/NpmTask.html +1 -1
  16. package/docs/build/classes/PackageInfo.html +1 -1
  17. package/docs/build/classes/PackageInfoCache.html +1 -1
  18. package/docs/build/classes/PerBundleAddonCache {.html +1 -1
  19. package/docs/build/classes/Project.html +1 -1
  20. package/docs/build/classes/ServeFilesAddon.html +1 -1
  21. package/docs/build/classes/TestsServerAddon.html +1 -1
  22. package/docs/build/classes/WatcherAddon.html +1 -1
  23. package/docs/build/classes/WindowsSymlinkChecker.html +1 -1
  24. package/docs/build/data.json +3 -3
  25. package/docs/build/files/lib_broccoli_default-packager.js.html +1 -1
  26. package/docs/build/files/lib_broccoli_ember-addon.js.html +1 -1
  27. package/docs/build/files/lib_broccoli_ember-app.js.html +1 -1
  28. package/docs/build/files/lib_cli_cli.js.html +1 -1
  29. package/docs/build/files/lib_models_addon-info.js.html +1 -1
  30. package/docs/build/files/lib_models_addon.js.html +1 -1
  31. package/docs/build/files/lib_models_blueprint.js.html +1 -1
  32. package/docs/build/files/lib_models_builder.js.html +5 -1
  33. package/docs/build/files/lib_models_command.js.html +1 -1
  34. package/docs/build/files/lib_models_hardware-info.js.html +1 -1
  35. package/docs/build/files/lib_models_host-info-cache.js.html +1 -1
  36. package/docs/build/files/lib_models_installation-checker.js.html +1 -1
  37. package/docs/build/files/lib_models_instantiate-addons.js.html +1 -1
  38. package/docs/build/files/lib_models_instrumentation.js.html +1 -1
  39. package/docs/build/files/lib_models_package-info-cache_index.js.html +1 -1
  40. package/docs/build/files/lib_models_package-info-cache_node-modules-list.js.html +1 -1
  41. package/docs/build/files/lib_models_package-info-cache_package-info.js.html +1 -1
  42. package/docs/build/files/lib_models_per-bundle-addon-cache_addon-proxy.js.html +1 -1
  43. package/docs/build/files/lib_models_per-bundle-addon-cache_index.js.html +1 -1
  44. package/docs/build/files/lib_models_per-bundle-addon-cache_target-instance.js.html +1 -1
  45. package/docs/build/files/lib_models_project.js.html +1 -1
  46. package/docs/build/files/lib_models_task.js.html +1 -1
  47. package/docs/build/files/lib_tasks_build-watch.js.html +1 -1
  48. package/docs/build/files/lib_tasks_npm-task.js.html +1 -1
  49. package/docs/build/files/lib_tasks_serve.js.html +1 -1
  50. package/docs/build/files/lib_tasks_server_middleware_broccoli-serve-files_index.js.html +1 -1
  51. package/docs/build/files/lib_tasks_server_middleware_broccoli-watcher_index.js.html +1 -1
  52. package/docs/build/files/lib_tasks_server_middleware_history-support_index.js.html +11 -2
  53. package/docs/build/files/lib_tasks_server_middleware_tests-server_index.js.html +1 -1
  54. package/docs/build/files/lib_tasks_test-server.js.html +1 -1
  55. package/docs/build/files/lib_tasks_transforms_amd_index.js.html +1 -1
  56. package/docs/build/files/lib_utilities_ember-app-utils.js.html +1 -1
  57. package/docs/build/files/lib_utilities_insert-into-file.js.html +1 -1
  58. package/docs/build/files/lib_utilities_is-lazy-engine.js.html +1 -1
  59. package/docs/build/files/lib_utilities_is-yarn-project.js.html +1 -1
  60. package/docs/build/files/lib_utilities_valid-project-name.js.html +1 -1
  61. package/docs/build/files/lib_utilities_will-interrupt-process.js.html +1 -1
  62. package/docs/build/files/lib_utilities_windows-admin.js.html +1 -1
  63. package/docs/build/index.html +1 -1
  64. package/docs/build/modules/ember-cli.html +1 -1
  65. package/docs/build/modules/is-lazy-engine.html +1 -1
  66. package/lib/models/builder.js +4 -0
  67. package/lib/tasks/server/middleware/history-support/index.js +10 -1
  68. package/package.json +1 -1
package/CHANGELOG.md CHANGED
@@ -1,5 +1,18 @@
1
1
  # ember-cli Changelog
2
2
 
3
+ ## v3.28.6
4
+
5
+ #### Blueprint Changes
6
+
7
+ - [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v3.28.5...v3.28.6)
8
+ - [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v3.28.5...v3.28.6)
9
+
10
+ #### Changelog
11
+
12
+ - [#10013](https://github.com/ember-cli/ember-cli/pull/10013) [BUGFIX] Handle rebuild failures without exiting [@bendemboski](https://github.com/bendemboski)
13
+
14
+ Thank you to all who took the time to contribute!
15
+
3
16
  ## v3.28.5
4
17
 
5
18
  #### Blueprint Changes
@@ -173,7 +173,7 @@
173
173
 
174
174
 
175
175
  <div class="version-info">
176
- Version: 3.28.5-lts-3-28-53b5dcc903
176
+ Version: 3.28.6-lts-3-28-23a0d98b59
177
177
  </div>
178
178
 
179
179
  </div>
@@ -100,7 +100,7 @@
100
100
 
101
101
 
102
102
  <div class="version-info">
103
- Version: 3.28.5-lts-3-28-53b5dcc903
103
+ Version: 3.28.6-lts-3-28-23a0d98b59
104
104
  </div>
105
105
 
106
106
  </div>
@@ -182,7 +182,7 @@
182
182
 
183
183
 
184
184
  <div class="version-info">
185
- Version: 3.28.5-lts-3-28-53b5dcc903
185
+ Version: 3.28.6-lts-3-28-23a0d98b59
186
186
  </div>
187
187
 
188
188
  </div>
@@ -107,7 +107,7 @@
107
107
 
108
108
 
109
109
  <div class="version-info">
110
- Version: 3.28.5-lts-3-28-53b5dcc903
110
+ Version: 3.28.6-lts-3-28-23a0d98b59
111
111
  </div>
112
112
 
113
113
  </div>
@@ -367,7 +367,7 @@ return <code>true</code>.</p>
367
367
  </div>
368
368
  <div class="method item private">
369
369
  <div id="method_checkForPostBuildEnvironmentIssues" class="title">
370
- <span class="source-link"><a href="../files/lib_models_builder.js.html#l265"><code>lib&#x2F;models&#x2F;builder.js:265</code></a></span>
370
+ <span class="source-link"><a href="../files/lib_models_builder.js.html#l269"><code>lib&#x2F;models&#x2F;builder.js:269</code></a></span>
371
371
  <h3 class="">
372
372
  private
373
373
 
@@ -391,7 +391,7 @@ after a build and issues any necessary deprecation warnings.</p>
391
391
  </div>
392
392
  <div class="method item private">
393
393
  <div id="method_cleanup" class="title">
394
- <span class="source-link"><a href="../files/lib_models_builder.js.html#l233"><code>lib&#x2F;models&#x2F;builder.js:233</code></a></span>
394
+ <span class="source-link"><a href="../files/lib_models_builder.js.html#l237"><code>lib&#x2F;models&#x2F;builder.js:237</code></a></span>
395
395
  <h3 class="">
396
396
  private
397
397
 
@@ -120,7 +120,7 @@
120
120
 
121
121
 
122
122
  <div class="version-info">
123
- Version: 3.28.5-lts-3-28-53b5dcc903
123
+ Version: 3.28.6-lts-3-28-23a0d98b59
124
124
  </div>
125
125
 
126
126
  </div>
@@ -131,7 +131,7 @@
131
131
 
132
132
 
133
133
  <div class="version-info">
134
- Version: 3.28.5-lts-3-28-53b5dcc903
134
+ Version: 3.28.6-lts-3-28-23a0d98b59
135
135
  </div>
136
136
 
137
137
  </div>
@@ -100,7 +100,7 @@
100
100
 
101
101
 
102
102
  <div class="version-info">
103
- Version: 3.28.5-lts-3-28-53b5dcc903
103
+ Version: 3.28.6-lts-3-28-23a0d98b59
104
104
  </div>
105
105
 
106
106
  </div>
@@ -135,7 +135,7 @@
135
135
 
136
136
 
137
137
  <div class="version-info">
138
- Version: 3.28.5-lts-3-28-53b5dcc903
138
+ Version: 3.28.6-lts-3-28-23a0d98b59
139
139
  </div>
140
140
 
141
141
  </div>
@@ -140,7 +140,7 @@
140
140
 
141
141
 
142
142
  <div class="version-info">
143
- Version: 3.28.5-lts-3-28-53b5dcc903
143
+ Version: 3.28.6-lts-3-28-23a0d98b59
144
144
  </div>
145
145
 
146
146
  </div>
@@ -107,7 +107,7 @@
107
107
 
108
108
 
109
109
  <div class="version-info">
110
- Version: 3.28.5-lts-3-28-53b5dcc903
110
+ Version: 3.28.6-lts-3-28-23a0d98b59
111
111
  </div>
112
112
 
113
113
  </div>
@@ -100,7 +100,7 @@
100
100
 
101
101
 
102
102
  <div class="version-info">
103
- Version: 3.28.5-lts-3-28-53b5dcc903
103
+ Version: 3.28.6-lts-3-28-23a0d98b59
104
104
  </div>
105
105
 
106
106
  </div>
@@ -108,7 +108,7 @@
108
108
 
109
109
 
110
110
  <div class="version-info">
111
- Version: 3.28.5-lts-3-28-53b5dcc903
111
+ Version: 3.28.6-lts-3-28-23a0d98b59
112
112
  </div>
113
113
 
114
114
  </div>
@@ -106,7 +106,7 @@
106
106
 
107
107
 
108
108
  <div class="version-info">
109
- Version: 3.28.5-lts-3-28-53b5dcc903
109
+ Version: 3.28.6-lts-3-28-23a0d98b59
110
110
  </div>
111
111
 
112
112
  </div>
@@ -106,7 +106,7 @@
106
106
 
107
107
 
108
108
  <div class="version-info">
109
- Version: 3.28.5-lts-3-28-53b5dcc903
109
+ Version: 3.28.6-lts-3-28-23a0d98b59
110
110
  </div>
111
111
 
112
112
  </div>
@@ -124,7 +124,7 @@
124
124
 
125
125
 
126
126
  <div class="version-info">
127
- Version: 3.28.5-lts-3-28-53b5dcc903
127
+ Version: 3.28.6-lts-3-28-23a0d98b59
128
128
  </div>
129
129
 
130
130
  </div>
@@ -115,7 +115,7 @@
115
115
 
116
116
 
117
117
  <div class="version-info">
118
- Version: 3.28.5-lts-3-28-53b5dcc903
118
+ Version: 3.28.6-lts-3-28-23a0d98b59
119
119
  </div>
120
120
 
121
121
  </div>
@@ -108,7 +108,7 @@
108
108
 
109
109
 
110
110
  <div class="version-info">
111
- Version: 3.28.5-lts-3-28-53b5dcc903
111
+ Version: 3.28.6-lts-3-28-23a0d98b59
112
112
  </div>
113
113
 
114
114
  </div>
@@ -151,7 +151,7 @@
151
151
 
152
152
 
153
153
  <div class="version-info">
154
- Version: 3.28.5-lts-3-28-53b5dcc903
154
+ Version: 3.28.6-lts-3-28-23a0d98b59
155
155
  </div>
156
156
 
157
157
  </div>
@@ -105,7 +105,7 @@
105
105
 
106
106
 
107
107
  <div class="version-info">
108
- Version: 3.28.5-lts-3-28-53b5dcc903
108
+ Version: 3.28.6-lts-3-28-23a0d98b59
109
109
  </div>
110
110
 
111
111
  </div>
@@ -100,7 +100,7 @@
100
100
 
101
101
 
102
102
  <div class="version-info">
103
- Version: 3.28.5-lts-3-28-53b5dcc903
103
+ Version: 3.28.6-lts-3-28-23a0d98b59
104
104
  </div>
105
105
 
106
106
  </div>
@@ -100,7 +100,7 @@
100
100
 
101
101
 
102
102
  <div class="version-info">
103
- Version: 3.28.5-lts-3-28-53b5dcc903
103
+ Version: 3.28.6-lts-3-28-23a0d98b59
104
104
  </div>
105
105
 
106
106
  </div>
@@ -122,7 +122,7 @@
122
122
 
123
123
 
124
124
  <div class="version-info">
125
- Version: 3.28.5-lts-3-28-53b5dcc903
125
+ Version: 3.28.6-lts-3-28-23a0d98b59
126
126
  </div>
127
127
 
128
128
  </div>
@@ -3,7 +3,7 @@
3
3
  "logo": "https://ember-cli.com/assets/images/ember-cli-logo-small-dark.png",
4
4
  "name": "ember-cli",
5
5
  "description": "Command line tool for developing ambitious ember.js apps",
6
- "version": "3.28.5-lts-3-28-53b5dcc903"
6
+ "version": "3.28.6-lts-3-28-23a0d98b59"
7
7
  },
8
8
  "files": {
9
9
  "lib/broccoli/default-packager.js": {
@@ -4998,7 +4998,7 @@
4998
4998
  },
4999
4999
  {
5000
5000
  "file": "lib/models/builder.js",
5001
- "line": 233,
5001
+ "line": 237,
5002
5002
  "description": "Delegates to the `cleanup` method of the wrapped Broccoli builder.",
5003
5003
  "access": "private",
5004
5004
  "tagname": "",
@@ -5013,7 +5013,7 @@
5013
5013
  },
5014
5014
  {
5015
5015
  "file": "lib/models/builder.js",
5016
- "line": 265,
5016
+ "line": 269,
5017
5017
  "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",
5018
5018
  "access": "private",
5019
5019
  "tagname": "",
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -303,6 +303,10 @@ class Builder extends CoreObject {
303
303
  } catch (error) {
304
304
  await this.processAddonBuildSteps(&#x27;buildError&#x27;, error);
305
305
 
306
+ // Mark this as a builder error so the watcher knows it has been handled
307
+ // and won&#x27;t re-throw it
308
+ error.isBuilderError = true;
309
+
306
310
  throw error;
307
311
  } finally {
308
312
  clearInterval(uiProgressIntervalID);
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -131,7 +131,16 @@ class HistorySupportAddon {
131
131
 
132
132
  app.use(async (req, _, next) =&gt; {
133
133
  try {
134
- const results = await watcher;
134
+ let results;
135
+ try {
136
+ results = await watcher;
137
+ } catch (e) {
138
+ // This means there was a build error, so we won&#x27;t actually be serving
139
+ // index.html, and we have nothing to do. We have to catch it here,
140
+ // though, or it will go uncaught and cause the process to exit.
141
+ return;
142
+ }
143
+
135
144
  if (this.shouldHandleRequest(req, options)) {
136
145
  let assetPath = req.path.slice(baseURL.length);
137
146
  let isFile = false;
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -96,7 +96,7 @@
96
96
 
97
97
 
98
98
  <div class="version-info">
99
- Version: 3.28.5-lts-3-28-53b5dcc903
99
+ Version: 3.28.6-lts-3-28-23a0d98b59
100
100
  </div>
101
101
 
102
102
  </div>
@@ -69,7 +69,7 @@
69
69
 
70
70
 
71
71
  <div class="version-info">
72
- Version: 3.28.5-lts-3-28-53b5dcc903
72
+ Version: 3.28.6-lts-3-28-23a0d98b59
73
73
  </div>
74
74
 
75
75
  </div>
@@ -221,6 +221,10 @@ class Builder extends CoreObject {
221
221
  } catch (error) {
222
222
  await this.processAddonBuildSteps('buildError', error);
223
223
 
224
+ // Mark this as a builder error so the watcher knows it has been handled
225
+ // and won't re-throw it
226
+ error.isBuilderError = true;
227
+
224
228
  throw error;
225
229
  } finally {
226
230
  clearInterval(uiProgressIntervalID);
@@ -49,7 +49,16 @@ class HistorySupportAddon {
49
49
 
50
50
  app.use(async (req, _, next) => {
51
51
  try {
52
- const results = await watcher;
52
+ let results;
53
+ try {
54
+ results = await watcher;
55
+ } catch (e) {
56
+ // This means there was a build error, so we won't actually be serving
57
+ // index.html, and we have nothing to do. We have to catch it here,
58
+ // though, or it will go uncaught and cause the process to exit.
59
+ return;
60
+ }
61
+
53
62
  if (this.shouldHandleRequest(req, options)) {
54
63
  let assetPath = req.path.slice(baseURL.length);
55
64
  let isFile = false;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ember-cli",
3
- "version": "3.28.5",
3
+ "version": "3.28.6",
4
4
  "description": "Command line tool for developing ambitious ember.js apps",
5
5
  "keywords": [
6
6
  "app",