Merge branch 'master' into nvp/trustHTML

Author: kategengler

.stylelintignore

@@ -4,6 +4,7 @@
 # compiled output
 /dist/
 /public/assets
+/public/downloads
 
 # addons
 /.node_modules.ember-try/

guides/release/code-editors/index.md

@@ -102,22 +102,6 @@ Shortcuts to navigate related files with Ember.js projects.
 [Ember Tools](https://github.com/AndrewRadev/ember_tools.vim) -
 Various tools for working with Ember.js projects.
 
-## Atom
-
-Atom is hackable text editor for the 21st Century.
-
-[atom-ide-ember](https://github.com/josa42/atom-ide-ember) -
-Atom package to use the Ember Language Server.
-
-[emberjs-atom](https://atom.io/packages/emberjs-atom) -
-Atom autocomplete and snippets for Ember.js.
-
-[atom-ember-snippets](https://github.com/mattmcmanus/atom-ember-snippets) -
-Ember.js ES6, EmberData & Handlebars snippets for Atom editor.
-
-[language-ember-htmlbars](https://atom.io/packages/language-ember-htmlbars) -
-Add Ember template syntax highlighting and indentation to Atom
-
 ## Sublime Text
 
 A sophisticated text editor for code, markup and prose.
@@ -127,9 +111,3 @@ Ember CLI snippets for Sublime Text 3.
 
 [ember-component-template-split-view](https://github.com/mmitchellgarcia/ember-component-template-split-view) -
 Super simple Sublime Text plugin that will let you open corresponding template or route files with Ember.js components.
-
-## CodeLobster IDE
-
-CodeLobster IDE is a smart free cross-platform editor.
-
-[CodeLobster IDE plug-in for Ember](http://www.codelobster.com/emberjs.html) gives autocomplete and tooltips for Ember.js functions, context and dynamic help.

guides/release/components/template-tag-format.md

@@ -174,6 +174,7 @@ import { concat } from '@ember/helper';
 import { fn } from '@ember/helper';
 import { get } from '@ember/helper';
 import { hash } from '@ember/helper';
+import { uniqueId } from '@ember/helper';
 
 // Built-in modifiers
 import { on } from '@ember/modifier';

guides/release/routing/controllers.md

@@ -1,6 +1,6 @@
 ### What is a Controller?
 
-A [Controller](https://api.emberjs.com/ember/release/classes/Ember.Controller) is routable object which receives a single property from the Route – `model` – which is the return value of the Route's [`model()`](https://api.emberjs.com/ember/release/classes/Route/methods/model?anchor=model) method.
+A [Controller](https://api.emberjs.com/ember/release/classes/Ember.Controller) is a routable object which receives a single property from the Route – `model` – which is the return value of the Route's [`model()`](https://api.emberjs.com/ember/release/classes/Route/methods/model?anchor=model) method.
 
 The model is passed from the Route to the Controller by default using the [`setupController()`](https://api.emberjs.com/ember/release/classes/Route/methods/setupController?anchor=setupController) function. The Controller is then often used to decorate the model with display properties such as retrieving the full name from a name model.
 

guides/release/routing/linking-between-routes.md

@@ -91,6 +91,34 @@ will be given the `active` CSS class. For example, if you were at the URL
 </ul>
 ```
 
+The CSS class name used for active classes can be customized for a single use of `<LinkTo />` by passing an `@activeClass` argument:
+
+```handlebars {data-filename=app/templates/photos.hbs}
+<ul>
+  {{#each this.photos as |p|}}
+    <li>
+      <LinkTo @route="photos.edit" @model={{p}} @activeClass="font-bold">{{p.title}}</LinkTo>
+    </li>
+  {{/each}}
+</ul>
+```
+
+will result in:
+
+```html
+<ul>
+  <li>
+    <a href="/photos/1">Happy Kittens</a>
+  </li>
+  <li>
+    <a href="/photos/2" class="font-bold">Puppy Running</a>
+  </li>
+  <li>
+    <a href="/photos/3">Mountain Landscape</a>
+  </li>
+</ul>
+```
+
 ### Multiple Dynamic Segments
 
 Sometimes, you may need to generate links for nested routes which can

guides/release/tutorial/part-1/orientation.md

@@ -24,8 +24,8 @@ To verify that your installation was successful, run:
 
 ```shell
 $ ember --version
-ember-cli: 6.0.1
-node: 18.20.5
+ember-cli: 6.4.0
+node: 18.20.8
 os: linux x64
 ```
 
@@ -38,13 +38,11 @@ We can create a new project using Ember CLI's `new` command. It follows the patt
 ```shell
 $ ember new super-rentals --lang en
 installing app
-Ember CLI v6.0.1
+Ember CLI v6.4.0
 
 Creating a new Ember app in /home/runner/work/super-rentals-tutorial/super-rentals-tutorial/dist/code/super-rentals:
   create .editorconfig
   create .ember-cli
-  create .eslintignore
-  create .eslintrc.js
   create .github/workflows/ci.yml
   create .prettierignore
   create .prettierrc.js
@@ -53,9 +51,11 @@ Creating a new Ember app in /home/runner/work/super-rentals-tutorial/super-renta
   create .template-lintrc.js
   create .watchmanconfig
   create README.md
+  create /home/runner/work/super-rentals-tutorial/super-rentals-tutorial/dist/code/super-rentals/eslint.config.mjs
   create app/app.js
   create app/components/.gitkeep
   create app/controllers/.gitkeep
+  create app/deprecation-workflow.js
   create app/helpers/.gitkeep
   create app/index.html
   create app/models/.gitkeep
@@ -123,6 +123,7 @@ super-rentals
 │   ├── templates
 │   │   └── application.hbs
 │   ├── app.js
+│   ├── deprecation-workflow.js
 │   ├── index.html
 │   └── router.js
 ├── config
@@ -144,8 +145,6 @@ super-rentals
 ├── .editorconfig
 ├── .ember-cli
 ├── .eslintcache
-├── .eslintignore
-├── .eslintrc.js
 ├── .gitignore
 ├── .prettierignore
 ├── .prettierrc.js
@@ -155,6 +154,7 @@ super-rentals
 ├── .watchmanconfig
 ├── README.md
 ├── ember-cli-build.js
+├── eslint.config.mjs
 ├── package.json
 ├── package-lock.json
 └── testem.js

guides/release/tutorial/part-2/ember-data.md

@@ -334,17 +334,22 @@ Let's start customizing the things that didn't work for us by default. Specifica
 
 The first thing we want to do is have our builder respect a configurable default host and/or namespace. Adding a namespace prefix happens to be pretty common across Ember apps, so EmberData provides a global config mechanism for host and namespace. Typically you will want to do this either in your store file or app file.
 
-```js { data-filename="app/app.js" data-diff="+5,+6,+7,+8,+9" }
+```js { data-filename="app/app.js" data-diff="+6,+7,+8,+9,+10" }
 import Application from '@ember/application';
 import Resolver from 'ember-resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from 'super-rentals/config/environment';
+import { importSync, isDevelopingApp, macroCondition } from '@embroider/macros';
 import { setBuildURLConfig } from '@ember-data/request-utils';
 
 setBuildURLConfig({
   namespace: 'api',
 });
 
+if (macroCondition(isDevelopingApp())) {
+  importSync('./deprecation-workflow');
+}
+
 export default class App extends Application {
   modulePrefix = config.modulePrefix;
   podModulePrefix = config.podModulePrefix;

guides/v6.3.0/contributing/index.md

@@ -31,7 +31,7 @@ At the top of the page (for the package, method, or class), you will find the wo
 
 You can open the link to find a comment block. Make a pull request to update the comment block. The API Guides may take a few weeks to update while the future release is finalized.
 
-Here is an example of updating a method. At the top of the section for [`store.createRecord()`](https://api.emberjs.com/ember-data/5.4.0/classes/Store/methods/createRecord?anchor=createRecord), you can find the words "Defined in."
+Here is an example of updating a method. At the top of the section for [`store.createRecord()`](https://api.emberjs.com/ember-data/5.3.12/classes/Store/methods/createRecord?anchor=createRecord), you can find the words "Defined in."
 
 Next to the words is, once again, the link to the source code [`ds-model-store.ts`](https://github.com/emberjs/data/blob/master/packages/store/addon/-private/system/ds-model-store.ts).
 

guides/v6.3.0/in-depth-topics/native-classes-in-depth.md

@@ -720,7 +720,7 @@ after overriding. This allows the super class method to continue operating as it
 normally would.
 
 One common example is when overriding the
-[`normalizeResponse()`](https://api.emberjs.com/ember-data/5.4.0/classes/JSONAPISerializer/methods/normalizeResponse?anchor=normalizeResponse)
+[`normalizeResponse()`](https://api.emberjs.com/ember-data/5.3.12/classes/JSONAPISerializer/methods/normalizeResponse?anchor=normalizeResponse)
 hook in one of EmberData's serializers.
 
 A handy shortcut for this is to use a "spread operator", like `...arguments`:

guides/v6.3.0/models/creating-updating-and-deleting-records.md

@@ -1,7 +1,7 @@
 ## Creating Records
 
 You can create records by calling the
-[`createRecord()`](https://api.emberjs.com/ember-data/5.4.0/classes/Store/methods/createRecord?anchor=createRecord)
+[`createRecord()`](https://api.emberjs.com/ember-data/5.3.12/classes/Store/methods/createRecord?anchor=createRecord)
 method on the store.
 
 ```javascript
@@ -28,7 +28,7 @@ this.store.findRecord('post', 1).then(function(post) {
 ## Persisting Records
 
 Records in EmberData are persisted on a per-instance basis.
-Call [`save()`](https://api.emberjs.com/ember-data/5.4.0/classes/Model/methods/save?anchor=save)
+Call [`save()`](https://api.emberjs.com/ember-data/5.3.12/classes/Model/methods/save?anchor=save)
 on any instance of `Model` and it will make a network request.
 
 EmberData takes care of tracking the state of each record for
@@ -60,10 +60,10 @@ store.findRecord('post', 1).then(function(post) {
 
 You can tell if a record has outstanding changes that have not yet been
 saved by checking its
-[`hasDirtyAttributes`](https://api.emberjs.com/ember-data/5.4.0/classes/Model/properties/hasDirtyAttributes?anchor=hasDirtyAttributes)
+[`hasDirtyAttributes`](https://api.emberjs.com/ember-data/5.3.12/classes/Model/properties/hasDirtyAttributes?anchor=hasDirtyAttributes)
 property. You can also see which parts of
 the record were changed and what the original value was using the
-[`changedAttributes()`](https://api.emberjs.com/ember-data/5.4.0/classes/Model/methods/changedAttributes?anchor=changedAttributes)
+[`changedAttributes()`](https://api.emberjs.com/ember-data/5.3.12/classes/Model/methods/changedAttributes?anchor=changedAttributes)
 method. `changedAttributes` returns an object, whose keys are the changed
 properties and values are an array of values `[oldValue, newValue]`.
 
@@ -75,7 +75,7 @@ person.hasDirtyAttributes; // => true
 person.changedAttributes(); // => { isAdmin: [false, true] }
 ```
 
-At this point, you can either persist your changes via `save()` or you can roll back your changes using [`rollbackAttributes()`](https://api.emberjs.com/ember-data/5.4.0/classes/Model/methods/rollbackAttributes?anchor=rollbackAttributes).
+At this point, you can either persist your changes via `save()` or you can roll back your changes using [`rollbackAttributes()`](https://api.emberjs.com/ember-data/5.3.12/classes/Model/methods/rollbackAttributes?anchor=rollbackAttributes).
 
 ```javascript
 person.hasDirtyAttributes; // => true
@@ -105,7 +105,7 @@ the errors from saving a blog post in your template:
 
 ## Promises
 
-[`save()`](https://api.emberjs.com/ember-data/5.4.0/classes/Model/methods/save?anchor=save) returns
+[`save()`](https://api.emberjs.com/ember-data/5.3.12/classes/Model/methods/save?anchor=save) returns
 a promise, which makes it easy to asynchronously handle success and failure
 scenarios. Here's a common pattern:
 
@@ -126,10 +126,10 @@ try {
 
 ## Deleting Records
 
-Deleting records is as straightforward as creating records. Call [`deleteRecord()`](https://api.emberjs.com/ember-data/5.4.0/classes/Model/methods/deleteRecord?anchor=deleteRecord)
+Deleting records is as straightforward as creating records. Call [`deleteRecord()`](https://api.emberjs.com/ember-data/5.3.12/classes/Model/methods/deleteRecord?anchor=deleteRecord)
 on any instance of `Model`. This flags the record as `isDeleted`. The
 deletion can then be persisted using `save()`. Alternatively, you can use
-the [`destroyRecord`](https://api.emberjs.com/ember-data/5.4.0/classes/Model/methods/destroyRecord?anchor=destroyRecord) method to delete and persist at the same time.
+the [`destroyRecord`](https://api.emberjs.com/ember-data/5.3.12/classes/Model/methods/destroyRecord?anchor=destroyRecord) method to delete and persist at the same time.
 
 ```javascript
 let post = store.peekRecord('post', 1);