Merge branch 'emberjs:main' into template-tag-blueprints

Author: IgnaceMaes

.eslintrc.js

@@ -137,10 +137,8 @@ module.exports = {
         'testem.js',
         'testem.ci-browsers.js',
         'testem.browserstack.js',
-        'd8-runner.js',
         'broccoli/**/*.js',
         'ember-cli-build.js',
-        'rollup.config.js',
       ],
 
       parserOptions: {
@@ -153,8 +151,8 @@ module.exports = {
         es6: true,
       },
 
-      plugins: ['node'],
-      extends: ['plugin:node/recommended'],
+      plugins: ['n'],
+      extends: ['plugin:n/recommended'],
       rules: {
         // add your custom rules and overrides for node files here
         'no-process-exit': 'off',

CHANGELOG.md

@@ -1,29 +1,31 @@
 # Ember Changelog
 
-## v5.2.0-beta.4 (July 17, 2023)
+## v5.4.0-beta.1 (September 18, 2023)
 
-- [#20501](https://github.com/emberjs/ember.js/pull/20501) [BUGFIX] Fix the types for the mutation-methods of `NativeArray`
+- [#20521](https://github.com/emberjs/ember.js/pull/20521) [FEATURE] Add TypeScript support for looking up controllers in DI registry
+- [#20529](https://github.com/emberjs/ember.js/pull/20529) [BUGFIX] Don't rethrow string errors in handleTransitionReject
+- [#20210](https://github.com/emberjs/ember.js/pull/20210) [BUGFIX] Fix hanging tests caused by legacy rsvp code
+- [#20530](https://github.com/emberjs/ember.js/pull/20530) Upgrade the Glimmer VM to 0.84.3
 
-## v4.12.3 (June 30, 2023)
+## v5.3.0 (September 18, 2023)
 
-- [#20493](https://github.com/emberjs/ember.js/pull/20493) [BUGFIX] Backport more types fixes
+- [#20376](https://github.com/emberjs/ember.js/pull/20376) / [#20524](https://github.com/emberjs/ember.js/pull/20524) [DEPRECATION] Deprecate implicit record loading in Ember Route per [RFC #774](https://rfcs.emberjs.com/id/0774-implicit-record-route-loading).
 
-## v5.2.0-beta.3 (June 30, 2023)
+## v5.2.0 (August 7, 2023)
 
-- [#20491](https://github.com/emberjs/ember.js/pull/20491) [BUGFIX] Types: EmberComponent's `element` is an `Element`
-- [#20492](https://github.com/emberjs/ember.js/pull/20492) [BUGFIX] Types: EmberComponent init can have no args
+- [#20464](https://github.com/emberjs/ember.js/pull/20464) [FEATURE] Create public import for uniqueId helper per [RFC #659](https://rfcs.emberjs.com/id/0659-unique-id-helper).
+- [#20505](https://github.com/emberjs/ember.js/pull/20505) [BUGFIX] Remove use of `this.element` in `component-test` and `helper-test` blueprints
+- [#20501](https://github.com/emberjs/ember.js/pull/20501) [BUGFIX] Fix the types for the mutation-methods of `NativeArray`
+- [#20477](https://github.com/emberjs/ember.js/pull/20477) Upgrade TS and configure TS CI accordingly to test against TS 4.9, 5.0, and 5.1
 
 ## v5.1.2 (June 30, 2023)
 
 - [#20491](https://github.com/emberjs/ember.js/pull/20491) [BUGFIX] Types: EmberComponent's `element` is an `Element`
 - [#20492](https://github.com/emberjs/ember.js/pull/20492) [BUGFIX] Types: EmberComponent init can have no args
 
-## v5.2.0-beta.2 (June 29, 2023)
+## v4.12.3 (June 30, 2023)
 
-- [#20480](https://github.com/emberjs/ember.js/pull/20480) [BUGFIX] Fix type dependency issues
-- [#20482](https://github.com/emberjs/ember.js/pull/20482) [BUGFIX] Types: Allow `store` to be injected on `Route`
-- [#20489](https://github.com/emberjs/ember.js/pull/20489) [BUGFIX] Fix types for Resolver contract
-- [#20490](https://github.com/emberjs/ember.js/pull/20490) [BUGFIX] Types: Fix model arg to a Route `serialize`
+- [#20493](https://github.com/emberjs/ember.js/pull/20493) [BUGFIX] Backport more types fixes
 
 ## v5.1.1 (June 29, 2023)
 
@@ -36,11 +38,6 @@
 
 - [#20481](https://github.com/emberjs/ember.js/pull/20481) [BUGFIX] Backport some stable type import locations
 
-## v5.2.0-beta.1 (June 26, 2023)
-
-- [#20464](https://github.com/emberjs/ember.js/pull/20464) [FEATURE] Create public import for uniqueId helper per [RFC #659](https://rfcs.emberjs.com/id/0659-unique-id-helper).
-- [#20477](https://github.com/emberjs/ember.js/pull/20477) Upgrade TS and configure TS CI accordingly to test against TS 4.9, 5.0, and 5.1
-
 ## v5.1.0 (June 26, 2023)
 
 - [#20449](https://github.com/emberjs/ember.js/pull/20449) [FEATURE] Publish stable types for Ember per [RFC #800](https://rfcs.emberjs.com/id/0800-ts-adoption-plan).

RELEASE.md

@@ -41,7 +41,7 @@
 1. Go to [https://github.com/emberjs/ember.js/releases](https://github.com/emberjs/ember.js/releases)
 1. Click on the most recent tag (2.5.0-beta.2), and then click "Edit"
 1. Start with `### Changelog` and copy/paste the changelog into the box
-1. Make the title `Ember 2.5.0-beta.2` and check "This is a prerelease" for betas
+1. Make the title `Ember 2.5.0-beta.2` and check "This is a pre-release" for betas
 1. Update [builds page](https://github.com/ember-learn/builds/tree/master/app/fixtures/ember)
 1. Deploy
 

bin/build-for-publishing.js

@@ -93,6 +93,7 @@ Promise.resolve()
       // eslint-disable-next-line
       console.log('build-for-publishing failed');
       // failure, must manually exit non-zero
+      // eslint-disable-next-line n/no-process-exit
       process.exit(1);
     }
   );

bin/changelog.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-/* eslint-disable no-console, node/shebang */
+/* eslint-disable no-console, n/shebang */
 
 'use strict';
 

bin/publish-to-s3.mjs

@@ -118,5 +118,5 @@ if (!buildInfo.isBuildForTag) {
 
 function exitGracefully(err) {
   console.log(err); // eslint-disable-line no-console
-  process.exit(1);
+  process.exit(1); // eslint-disable-line n/no-process-exit
 }

bin/run-browserstack-tests.js

@@ -32,7 +32,7 @@ function run(command, args = []) {
       ]);
 
       console.log('success');
-      process.exit(0);
+      process.exit(0); // eslint-disable-line n/no-process-exit
     } finally {
       if (process.env.GITHUB_RUN_ID) {
         await run('ember', ['browserstack:results']);
@@ -42,6 +42,6 @@ function run(command, args = []) {
   } catch (error) {
     console.log('error');
     console.log(error);
-    process.exit(1);
+    process.exit(1); // eslint-disable-line n/no-process-exit
   }
 })();

bin/run-tests.js

@@ -104,12 +104,12 @@ function runAndExit() {
   runInSequence(testFunctions)
     .then(function () {
       console.log(chalk.green('Passed!'));
-      process.exit(0);
+      process.exit(0); // eslint-disable-line n/no-process-exit
     })
     .catch(function (err) {
       console.error(chalk.red(err.toString()));
       console.error(chalk.red('Failed!'));
-      process.exit(1);
+      process.exit(1); // eslint-disable-line n/no-process-exit
     });
 }
 

broccoli/packages.js

@@ -274,7 +274,7 @@ module.exports.glimmerES = function glimmerES(environment) {
   if (environment === 'development') {
     let hasGlimmerDebug = true;
     try {
-      require.resolve('@glimmer/debug'); // eslint-disable-line node/no-missing-require
+      require.resolve('@glimmer/debug'); // eslint-disable-line n/no-missing-require
     } catch (e) {
       hasGlimmerDebug = false;
     }