Merge pull request #10407 from ember-cli/beta

merge beta branch
ember-cli · Nov 22, 2023 · d3b19b5 · d3b19b5
2 parents 11679c7 + 6ab4c5f
commit d3b19b5
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # ember-cli Changelog
 
+## v5.5.0-beta.1
+
+#### Blueprint Changes
+
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v5.5.0-beta.0...v5.5.0-beta.1)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v5.5.0-beta.0...v5.5.0-beta.1)
+
+#### Changelog
+
+- [#10403](https://github.com/ember-cli/ember-cli/pull/10403) Fix some docs that were showing up weirdly in generated api docs [@kategengler](https://github.com/kategengler)
+- [#10406](https://github.com/ember-cli/ember-cli/pull/10406) [BUGFIX beta] use import type in helpers/index.ts :: typechecking in new apps otherwise fails [@NullVoxPopuli](https://github.com/NullVoxPopuli)
+
+Thank you to all who took the time to contribute!
+
 ## v5.5.0-beta.0
 
 #### Blueprint Changes

diff --git a/blueprints/app/files/tests/helpers/index.ts b/blueprints/app/files/tests/helpers/index.ts
@@ -2,7 +2,7 @@ import {
   setupApplicationTest as upstreamSetupApplicationTest,
   setupRenderingTest as upstreamSetupRenderingTest,
   setupTest as upstreamSetupTest,
-  SetupTestOptions,
+  type SetupTestOptions,
 } from 'ember-qunit';
 
 // This file exists to provide wrappers around ember-qunit's

diff --git a/lib/models/per-bundle-addon-cache/index.js b/lib/models/per-bundle-addon-cache/index.js
@@ -91,7 +91,7 @@ function resolvePerBundleAddonCacheUtil(project) {
  * https://github.com/ember-engines/ember-engines/blob/master/packages/ember-engines/lib/engine-addon.js#L396
  *
  * @public
- * @class PerBundleAddonCache {
+ * @class PerBundleAddonCache
  */
 class PerBundleAddonCache {
   constructor(project) {

diff --git a/lib/models/per-bundle-addon-cache/target-instance.js b/lib/models/per-bundle-addon-cache/target-instance.js
@@ -5,8 +5,9 @@
  * putting the symbol into the Symbol global cache. The symbol is used in per-bundle
  * cache entries to refer to the field that points at the real instance that a Proxy
  * refers to.
- * @property
+ * @class TARGET_INSTANCE
  * @type Symbol
+ * @private
  * @final
  */
 const TARGET_INSTANCE = Symbol('_targetInstance_');

diff --git a/lib/utilities/is-lazy-engine.js b/lib/utilities/is-lazy-engine.js
@@ -3,7 +3,8 @@
 /**
  * Indicate if a given object is a constructor function or class or an instance of an Addon.
  *
- * @module is-lazy-engine
+ * @private
+ * @method
  * @param {Object} addonCtorOrInstance the constructor function/class or an instance of an Addon.
  * @return {Boolean} True if the addonCtorOrInstance is a lazy engine, False otherwise.
  */

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-cli",
-  "version": "5.5.0-beta.0",
+  "version": "5.5.0-beta.1",
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",

diff --git a/tests/fixtures/addon/typescript/tests/helpers/index.ts b/tests/fixtures/addon/typescript/tests/helpers/index.ts
@@ -2,7 +2,7 @@ import {
   setupApplicationTest as upstreamSetupApplicationTest,
   setupRenderingTest as upstreamSetupRenderingTest,
   setupTest as upstreamSetupTest,
-  SetupTestOptions,
+  type SetupTestOptions,
 } from 'ember-qunit';
 
 // This file exists to provide wrappers around ember-qunit's

diff --git a/tests/fixtures/app/typescript-embroider/tests/helpers/index.ts b/tests/fixtures/app/typescript-embroider/tests/helpers/index.ts
@@ -2,7 +2,7 @@ import {
   setupApplicationTest as upstreamSetupApplicationTest,
   setupRenderingTest as upstreamSetupRenderingTest,
   setupTest as upstreamSetupTest,
-  SetupTestOptions,
+  type SetupTestOptions,
 } from 'ember-qunit';
 
 // This file exists to provide wrappers around ember-qunit's

diff --git a/tests/fixtures/app/typescript/tests/helpers/index.ts b/tests/fixtures/app/typescript/tests/helpers/index.ts
@@ -2,7 +2,7 @@ import {
   setupApplicationTest as upstreamSetupApplicationTest,
   setupRenderingTest as upstreamSetupRenderingTest,
   setupTest as upstreamSetupTest,
-  SetupTestOptions,
+  type SetupTestOptions,
 } from 'ember-qunit';
 
 // This file exists to provide wrappers around ember-qunit's