From 1aaceec246a70642f84ed7d0193c09222b3bb20d Mon Sep 17 00:00:00 2001
From: ignace <ignace@otainsight.com>
Date: Mon, 20 Nov 2023 21:09:58 +0100
Subject: [PATCH 01/41] docs: add initial template tag format page

---
 .../release/components/template-tag-format.md | 39 +++++++++++++++++++
 guides/release/pages.yml                      |  2 +
 2 files changed, 41 insertions(+)
 create mode 100644 guides/release/components/template-tag-format.md

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
new file mode 100644
index 0000000000..e2ff86d7a9
--- /dev/null
+++ b/guides/release/components/template-tag-format.md
@@ -0,0 +1,39 @@
+The template tag component format allows defining a component's template using a `<template>` tag block. This block is a first-class participant in JavaScript and TypeScript with strict mode template semantics. For this new format, the extensions `.gjs` and `.gts` are used respectively.
+
+Template tag components address a number of pain points when defining a template as a separate file, and provide a number of new capabilities:
+
+- Accessing local JavaScript values requires no backing class, enabling much easier use of existing JavaScript ecosystem tools.
+- Authoring more than one component in a single file, where colocation makes sense.
+- Creating locally-scoped helpers, modifiers, and other JavaScript functionality *just works*.
+
+## Installation
+
+To use template tag components, you must install the [ember-template-imports](https://github.com/ember-template-imports/ember-template-imports) addon:
+
+```bash
+npm add --save-dev ember-template-imports
+```
+
+For integration with tools like Prettier and Glint, and information on version compatibility, refer to the addon's readme.
+
+## Using Template Tags and `.gjs`/`.gts` Files
+
+The new `<template>` tag format is available in `.gjs` and `.gts` files. These file extensions represent a new file format "GlimmerJS" and "GlimmerTS", which are supersets of standard JavaScript and TypeScript respectively. In this syntax, templates are defined in JavaScript files directly.
+
+This example defines a template-only component, which is the default export of hello.gjs:
+
+```text {data-filename="app/components/hello.gjs"}
+<template>
+  <span>Hello, {{@name}}!</span>
+</template>
+```
+
+You would be able to use this component in another component like so:
+
+```text {data-filename="app/components/world.gjs"}
+import Hello from 'example-app/components/hello';
+
+<template>
+  <Hello @name="world" />
+</template>
+```
diff --git a/guides/release/pages.yml b/guides/release/pages.yml
index b3904879c1..3e8c094082 100644
--- a/guides/release/pages.yml
+++ b/guides/release/pages.yml
@@ -86,6 +86,8 @@
       url: template-lifecycle-dom-and-modifiers
     - title: "Built-in Components"
       url: "built-in-components"
+    - title: "Template Tag Format"
+      url: "template-tag-format"
 - title: "Routing"
   url: "routing"
   pages:

From 2c2a67a0bfbb5ab9793faae4c8b6fb976752512c Mon Sep 17 00:00:00 2001
From: ignace <ignace@otainsight.com>
Date: Tue, 21 Nov 2023 18:41:06 +0100
Subject: [PATCH 02/41] docs: add IDE setup

---
 .../release/components/template-tag-format.md | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index e2ff86d7a9..736d0f5784 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -16,6 +16,28 @@ npm add --save-dev ember-template-imports
 
 For integration with tools like Prettier and Glint, and information on version compatibility, refer to the addon's readme.
 
+## Editor Integrations
+
+To get syntax highlighting inside embedded templates and support for the GJS file extension, you may need to configure your editor.
+
+### Visual Studio Code
+
+The [Ember.js extension pack](https://marketplace.visualstudio.com/items?itemName=EmberTooling.emberjs) bundles everything you need to get started. More specifically, the [vscode-glimmer-syntax](https://marketplace.visualstudio.com/items?itemName=lifeart.vscode-glimmer-syntax) extension will add support for `glimmer-js` and `glimmer-ts` languages.
+
+### Neovim
+
+Here's an [example Neovim Config](https://github.com/NullVoxPopuli/dotfiles/blob/main/home/.config/nvim/lua/plugins/syntax.lua#L52) with support for good highlighting of embedded templates in JS and TS, using:
+
+- [nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter)
+- [tree-sitter-glimmer](https://github.com/alexlafroscia/tree-sitter-glimmer)
+
+### Other editors
+
+For other editors, you may be able to get support using one of these other syntax definitions:
+
+- [TextMate](https://github.com/IgnaceMaes/glimmer-textmate-grammar)
+- [TreeSitter](https://github.com/alexlafroscia/tree-sitter-glimmer)
+
 ## Using Template Tags and `.gjs`/`.gts` Files
 
 The new `<template>` tag format is available in `.gjs` and `.gts` files. These file extensions represent a new file format "GlimmerJS" and "GlimmerTS", which are supersets of standard JavaScript and TypeScript respectively. In this syntax, templates are defined in JavaScript files directly.

From e5e765b537b8b87a5759b7023048dbf6a47b6857 Mon Sep 17 00:00:00 2001
From: ignace <ignace@otainsight.com>
Date: Tue, 21 Nov 2023 18:41:40 +0100
Subject: [PATCH 03/41] docs: tweak sentence

---
 guides/release/components/template-tag-format.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index 736d0f5784..40dc34da47 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -8,7 +8,7 @@ Template tag components address a number of pain points when defining a template
 
 ## Installation
 
-To use template tag components, you must install the [ember-template-imports](https://github.com/ember-template-imports/ember-template-imports) addon:
+To use template tag components, install the [ember-template-imports](https://github.com/ember-template-imports/ember-template-imports) addon:
 
 ```bash
 npm add --save-dev ember-template-imports

From 528f4f6b97dd22a624e6af545fa6ede0a1f3f5e5 Mon Sep 17 00:00:00 2001
From: ignace <ignace@otainsight.com>
Date: Tue, 21 Nov 2023 18:50:46 +0100
Subject: [PATCH 04/41] docs: port code examples of template-imports readme

---
 .../release/components/template-tag-format.md | 110 ++++++++++++++++++
 1 file changed, 110 insertions(+)

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index 40dc34da47..0fc6f15d98 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -59,3 +59,113 @@ import Hello from 'example-app/components/hello';
   <Hello @name="world" />
 </template>
 ```
+You can also export the component explicitly:
+
+```text {data-filename="components/hello.gjs"}
+export default <template>
+  <span>Hello, {{@name}}!</span>
+</template>;
+```
+
+Omitting the `export default` is just syntactic sugar. In addition, you can
+define template-only components and assign them to variables, allowing you to
+export components with named exports:
+
+```text {data-filename="components/hello.gjs"}
+export const First = <template>First</template>;
+
+export const Second = <template>Second</template>;
+
+export const Third = <template>Third</template>;
+```
+
+This also allows you to create components that are only used locally, in the
+same file:
+
+```text {data-filename="components/custom-select.gjs"}
+const Option = <template>
+  <option selected={{@selected}} value={{@value}}>
+    {{or @title @value}}
+  </option>
+</template>;
+
+export const CustomSelect = <template>
+  <select>
+    {{#each @options as |opt|}}
+      <Option
+        @value={{opt.value}}
+        @selected={{eq opt @selectedOption}}
+      />
+    {{/each}}
+  </select>
+</template>;
+```
+
+Helpers and modifiers can also be defined in the same file as your components,
+making them very flexible:
+
+```text {data-filename="components/list.gjs"}
+import { modifier } from 'ember-modifier';
+
+const plusOne = (num) => num + 1;
+
+const setScrollPosition = modifier((element, [position]) => {
+  element.scrollTop = position
+});
+
+<template>
+  <div class="scroll-container" {{setScrollPosition @scrollPos}}>
+    {{#each @items as |item index|}}
+      Item #{{plusOne index}}: {{item}}
+    {{/each}}
+  </div>
+</template>
+```
+
+Finally, to associate a template with a class-based component, you can use the
+template syntax directly in the class body:
+
+```text {data-filename="components/hello.gjs"}
+import Component from '@glimmer/component';
+import { tracked } from '@glimmer/tracking';
+import { on } from '@ember/modifier';
+
+export default class Hello extends Component {
+  @tracked count = 0;
+
+  increment = () => {
+    this.count += 1;
+  };
+
+  decrement = () => {
+    this.count -= 1;
+  };
+
+  <template>
+    <button {{on "click" this.increment}}>+</button>
+    Count: {{this.count}}
+    <button {{on "click" this.decrement}}>&minus;</button>
+  </template>
+}
+```
+
+Template tag components can also be used for writing tests. In fact, this aligned syntax between app code and test code is one of the big advantages of the new authoring format.
+
+Just like in app code, the template tag has access to the outer scope. This means you can reference variables directly in your tests:
+
+```text {data-filename="tests/integration/components/hello-test.gjs"}
+import Hello from 'example-app/components/hello';
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
+import { render } from '@ember/test-helpers';
+
+module('Integration | Component | hello', function (hooks) {
+  setupRenderingTest(hooks);
+
+  test('renders name argument', async function (assert) {
+    const name = 'world';
+    await render(<template><Hello @name={{name}} /></template>);
+    assert.dom('[data-test-id="some-selector"]').hasText(name);
+  });
+});
+```

From 3f4a1b498b8a61708e1c9c22016f329dc1b73e9d Mon Sep 17 00:00:00 2001
From: ignace <ignace@otainsight.com>
Date: Thu, 21 Dec 2023 20:52:38 +0100
Subject: [PATCH 05/41] docs: full rewrite of the template tag format guide

---
 .../release/components/template-tag-format.md | 292 ++++++++++++------
 1 file changed, 189 insertions(+), 103 deletions(-)

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index 0fc6f15d98..5a76b8d604 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -1,95 +1,177 @@
-The template tag component format allows defining a component's template using a `<template>` tag block. This block is a first-class participant in JavaScript and TypeScript with strict mode template semantics. For this new format, the extensions `.gjs` and `.gts` are used respectively.
+The template tag format is a powerful, new way to write components in Ember. It's a single-file format that combines the component's JavaScript and Glimmer template code. The `<template>` tag is used to keep a clear separation between the template language and the JavaScript around it.
 
-Template tag components address a number of pain points when defining a template as a separate file, and provide a number of new capabilities:
+Template tag components use the file extension `.gjs`. This abbreviation is short for "Glimmer JavaScript". The file extension `.gts` is also supported for TypeScript components.
 
-- Accessing local JavaScript values requires no backing class, enabling much easier use of existing JavaScript ecosystem tools.
-- Authoring more than one component in a single file, where colocation makes sense.
-- Creating locally-scoped helpers, modifiers, and other JavaScript functionality *just works*.
+This new format is the official future of Ember's component authoring story, and is stable and usable today. We expect it to become the recommended way of authoring all Ember apps in the near future, once we are satisfied that we have sufficiently polished up all the corners of the implementation.
 
-## Installation
+## Writing template tag components
 
-To use template tag components, install the [ember-template-imports](https://github.com/ember-template-imports/ember-template-imports) addon:
+Just like with separate JavaScript and Glimmer template files, the template tag format has the concept of template-only components and class-based components. Let's take a closer look at how they compare between both component formats in the next sections.
 
-```bash
-npm add --save-dev ember-template-imports
+### Template-only components
+
+The following template-only component was created in a previous section to extract an avatar layout into a reusable component.
+
+```handlebars {data-filename="app/components/avatar.hbs"}
+<aside>
+  <div class="avatar" title={{@title}}>{{@initial}}</div>
+</aside>
 ```
 
-For integration with tools like Prettier and Glint, and information on version compatibility, refer to the addon's readme.
+This layout can be turned into a template tag component simply by wrapping the code in a `<template>` tag and changing the file extension to `.gjs`.
 
-## Editor Integrations
+```text {data-filename="app/components/avatar.gjs"}
+<template>
+  <aside>
+    <div class="avatar" title={{@title}}>{{@initial}}</div>
+  </aside>
+</template>
+```
 
-To get syntax highlighting inside embedded templates and support for the GJS file extension, you may need to configure your editor.
+The top-level template tag is exported as default component from the file. You *can* write this export explicitly, but it's not necessary. The following example is equivalent to the previous one.
 
-### Visual Studio Code
+```text {data-filename="app/components/avatar.gjs"}
+export default <template>
+  <aside>
+    <div class="avatar" title={{@title}}>{{@initial}}</div>
+  </aside>
+</template>;
+```
 
-The [Ember.js extension pack](https://marketplace.visualstudio.com/items?itemName=EmberTooling.emberjs) bundles everything you need to get started. More specifically, the [vscode-glimmer-syntax](https://marketplace.visualstudio.com/items?itemName=lifeart.vscode-glimmer-syntax) extension will add support for `glimmer-js` and `glimmer-ts` languages.
+### Class-based components
 
-### Neovim
+A `<template>` tag can also be embedded inside a class definition of a component. This is useful when you need to add state or other logic to your component. Take for example the following "Avatar" component, where a default title is added when the `title` argument is not provided.
 
-Here's an [example Neovim Config](https://github.com/NullVoxPopuli/dotfiles/blob/main/home/.config/nvim/lua/plugins/syntax.lua#L52) with support for good highlighting of embedded templates in JS and TS, using:
+```text {data-filename="app/components/avatar.gjs"}
+import Component from '@glimmer/component';
 
-- [nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter)
-- [tree-sitter-glimmer](https://github.com/alexlafroscia/tree-sitter-glimmer)
+export default class Avatar extends Component {
+  get titleWithDefault() {
+    return this.args.title ?? 'No avatar title provided';
+  }
 
-### Other editors
+  <template>
+    <aside>
+      <div class="avatar" title={{this.titleWithDefault}}>{{@initial}}</div>
+    </aside>
+  </template>
+}
+```
 
-For other editors, you may be able to get support using one of these other syntax definitions:
+## Importing components, helpers, and modifiers
 
-- [TextMate](https://github.com/IgnaceMaes/glimmer-textmate-grammar)
-- [TreeSitter](https://github.com/alexlafroscia/tree-sitter-glimmer)
+The template tag format uses strict template semantics. This means that you can only use components, helpers, and modifiers that are explicitly imported. This makes it easier to understand where things come from and what they do, as well as unlocks build optimizations.
 
-## Using Template Tags and `.gjs`/`.gts` Files
+### Importing invokables from the own app
 
-The new `<template>` tag format is available in `.gjs` and `.gts` files. These file extensions represent a new file format "GlimmerJS" and "GlimmerTS", which are supersets of standard JavaScript and TypeScript respectively. In this syntax, templates are defined in JavaScript files directly.
+When making use of the "Avatar" component as defined before in a different component file, it first needs to be imported. This is done using the `import` statement, just like you would import any other JavaScript module.
 
-This example defines a template-only component, which is the default export of hello.gjs:
+```text {data-filename="app/components/message.gjs"}
+import Avatar from 'app/components/avatar';
 
-```text {data-filename="app/components/hello.gjs"}
 <template>
-  <span>Hello, {{@name}}!</span>
+  <Avatar
+    @title={{@avatarTitle}}
+    @initial={{@avatarInitial}}
+  />
+  <section>
+    {{@message}}
+  </section>
 </template>
 ```
 
-You would be able to use this component in another component like so:
+The example above demonstrates defining a "Message" template-only component. The import syntax for class-based components is the same.
+
+<div class="cta">
+  <div class="cta-note">
+    <div class="cta-note-body">
+      <div class="cta-note-heading">Zoey says...</div>
+      <div class="cta-note-message">
+        The components that are imported are not required to use the new template tag format. This is intentional, and very powerful, as it <strong>allows incremental adoption</strong> of the new format.
+        <br><br>
+        The only prerequisite is that the component is defined using the template-colocation structure instead of the separating the JavaScript and Glimmer template code into separate folders.
+      </div>
+    </div>
+    <img src="/images/mascots/zoey.png" role="presentation" alt="">
+  </div>
+</div>
 
-```text {data-filename="app/components/world.gjs"}
-import Hello from 'example-app/components/hello';
+Importing helpers and modifiers from the own app also follows the same principle of using standard JavaScript import syntax. Instead of importing from `app/components`, the path to import from is `app/helpers` and `app/modifiers` respectively.
 
-<template>
-  <Hello @name="world" />
-</template>
-```
-You can also export the component explicitly:
+### Importing from addons
 
-```text {data-filename="components/hello.gjs"}
-export default <template>
-  <span>Hello, {{@name}}!</span>
-</template>;
-```
+Just as with components, helpers, and modifiers from the own app, external invokables from addons also have to be imported. This is done using the same `import` statement, but with a path referencing the addon.
+
+The structure of files within Ember addons is mostly standardized. This means that the path to import from can be derived from the addon's name. For example, an addon that is named `ember-foo` will have its components, helpers, and modifiers available as default import from `ember-foo/components/<component-name>`, `ember-foo/helpers/<helper-name>` and `ember-foo/modifiers/<modifier-name>` respectively.
+
+Some addons may choose to re-export their invokables from the root index as named exports. (This is known as the barrel file pattern) Usually addons will document this usage in their README, which may look like `import { ComponentName } from 'ember-foo';`, if supported.
+
+### Importing built-ins
 
-Omitting the `export default` is just syntactic sugar. In addition, you can
-define template-only components and assign them to variables, allowing you to
-export components with named exports:
+The Ember built-in helpers, modifiers, and components are available for import from the following locations.
 
-```text {data-filename="components/hello.gjs"}
-export const First = <template>First</template>;
+- `array` (`import { array } from '@ember/helper';`)
+- `concat` (`import { concat } from '@ember/helper';`)
+- `fn` (`import { fn } from '@ember/helper';`)
+- `get` (`import { get } from '@ember/helper';`)
+- `hash` (`import { hash } from '@ember/helper';`)
+- `on` (`import { on } from '@ember/modifier';`)
+- `Input` (`import { Input } from '@ember/component';`)
+- `LinkTo` (`import { LinkTo } from '@ember/routing';`)
+- `Textarea` (`import { Textarea } from '@ember/component';`)
 
-export const Second = <template>Second</template>;
+<div class="cta">
+  <div class="cta-note">
+    <div class="cta-note-body">
+      <div class="cta-note-heading">Zoey says...</div>
+      <div class="cta-note-message">
+        Feeling a bit lost with remembering all import paths?
+        <br><br>
+        Make sure to look at your editor setup to see if it can help you with auto-completion of import paths. See the <a href="#toc_editor-integrations">Editor Integrations</a> section for more information.
+      </div>
+    </div>
+    <img src="/images/mascots/zoey.png" role="presentation" alt="">
+  </div>
+</div>
+
+## New capabilities
+
+In the examples above, functionality that was already available before was covered using the template tag format. The template tag format, however, unlocks a number of new capabilities that were not possible before.
+
+### Locally-scoped values
+
+The template tag format follows JavaScript module syntax. Any value that isn't exported is only available locally within the file. This is useful for defining helper functions that are only used within the component, or for defining constants that are used multiple times within the template.
+
+In the following example, a "Square" component is defined that calculates the square of a number. The `value` constant is defined locally, and the `square` helper function is only available within the component.
 
-export const Third = <template>Third</template>;
+```text {data-filename="app/components/square.gjs"}
+const value = 2;
+
+const square = (number) => {
+  return number * number;
+};
+
+<template>
+  The square of {{value}} equals {{square value}}
+</template>
 ```
 
-This also allows you to create components that are only used locally, in the
-same file:
+This will render to `The square of 2 equals 4`.
+
+### Multiple components per file
+
+The template tag format allows defining multiple components within a single file. This is useful for defining components that are closely related to each other, but are not used in other parts of the app.
 
-```text {data-filename="components/custom-select.gjs"}
+The following example defines a "CustomSelect" component that renders a `<select>` element with a list of options. The locally-defined "Option" component is used to render each option in the list.
+
+```text {data-filename="app/components/custom-select.gjs"}
 const Option = <template>
   <option selected={{@selected}} value={{@value}}>
-    {{or @title @value}}
+    {{@value}}
   </option>
 </template>;
 
-export const CustomSelect = <template>
+const CustomSelect = <template>
   <select>
     {{#each @options as |opt|}}
       <Option
@@ -99,73 +181,77 @@ export const CustomSelect = <template>
     {{/each}}
   </select>
 </template>;
+
+export default CustomSelect;
 ```
 
-Helpers and modifiers can also be defined in the same file as your components,
-making them very flexible:
+This can be a powerful refactoring technique to break up large components into smaller ones. (where it makes sense!)
+
+## Testing
 
-```text {data-filename="components/list.gjs"}
-import { modifier } from 'ember-modifier';
+Historically, Ember's integration tests have been written using the `hbs` tagged template literal. This is no longer necessary with the template tag format. Instead, simply use the `<template>` tag to define a template to render.
+
+The following example showacases how the "Avatar" component can be tested using the template tag format.
+
+```text {data-filename="tests/integration/components/avatar-test.gjs"}
+import Avatar from 'app/components/avatar';
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
+import { render } from '@ember/test-helpers';
 
-const plusOne = (num) => num + 1;
+module('Integration | Component | avatar', function (hooks) {
+  setupRenderingTest(hooks);
 
-const setScrollPosition = modifier((element, [position]) => {
-  element.scrollTop = position
+  test('renders name argument', async function (assert) {
+    const initial = 'Zoey';
+    await render(
+      <template>
+        <Avatar @title={{"Picture of Zoey"}} @initial={{initial}} />
+      </template>
+    );
+    assert.dom().hasText(initial);
+  });
 });
+```
 
-<template>
-  <div class="scroll-container" {{setScrollPosition @scrollPos}}>
-    {{#each @items as |item index|}}
-      Item #{{plusOne index}}: {{item}}
-    {{/each}}
-  </div>
-</template>
+Notice how the same semantics now apply to tests as well: local values in scope can be referenced directly, and invokables from the own app or addons need to be imported.
+
+## Installation
+
+Install the [ember-template-imports](https://github.com/ember-template-imports/ember-template-imports) addon to start using template tag components. This addon provides all the build tooling required to support the new component authoring format.
+
+```bash
+npm add --save-dev ember-template-imports
 ```
 
-Finally, to associate a template with a class-based component, you can use the
-template syntax directly in the class body:
+### Integration with external tooling
 
-```text {data-filename="components/hello.gjs"}
-import Component from '@glimmer/component';
-import { tracked } from '@glimmer/tracking';
-import { on } from '@ember/modifier';
+You may need to upgrade dependency versions or install additional plugins to have proper integration with external tools. The following commonly-used tools are supported:
+
+- [ember-template-lint](https://github.com/ember-template-lint/ember-template-lint): Versions 5.8.0 and up.
+- [eslint-plugin-ember](https://github.com/ember-cli/eslint-plugin-ember): Versions 11.6.0 and up.
+- [Prettier](https://github.com/prettier/prettier): Versions 3.0.0 and up. This requires installing the [prettier-plugin-ember-template-tag](https://github.com/gitKrystan/prettier-plugin-ember-template-tag).
+- [Glint](https://github.com/typed-ember/glint): Requires installing the [environment-ember-template-imports](https://github.com/typed-ember/glint/tree/main/packages/environment-ember-template-imports) plugin.
 
-export default class Hello extends Component {
-  @tracked count = 0;
+## Editor Integrations
 
-  increment = () => {
-    this.count += 1;
-  };
+You may need to configure your editor to get syntax highlighting inside embedded templates and support for the `.gjs` and `.gts` file extension.
 
-  decrement = () => {
-    this.count -= 1;
-  };
+### Visual Studio Code
 
-  <template>
-    <button {{on "click" this.increment}}>+</button>
-    Count: {{this.count}}
-    <button {{on "click" this.decrement}}>&minus;</button>
-  </template>
-}
-```
+The [Ember.js extension pack](https://marketplace.visualstudio.com/items?itemName=EmberTooling.emberjs) bundles everything you need to get started. More specifically, the [vscode-glimmer-syntax](https://marketplace.visualstudio.com/items?itemName=lifeart.vscode-glimmer-syntax) extension will add support for `glimmer-js` and `glimmer-ts` languages and provide syntax highlighting. The [ember-language-server](https://github.com/lifeart/ember-language-server) extension provides automatic import completions and other useful features.
 
-Template tag components can also be used for writing tests. In fact, this aligned syntax between app code and test code is one of the big advantages of the new authoring format.
+### Neovim
 
-Just like in app code, the template tag has access to the outer scope. This means you can reference variables directly in your tests:
+Here's an [example Neovim Config](https://github.com/NullVoxPopuli/dotfiles/blob/main/home/.config/nvim/lua/plugins/syntax.lua#L52) with support for good highlighting of embedded templates in JS and TS, using:
 
-```text {data-filename="tests/integration/components/hello-test.gjs"}
-import Hello from 'example-app/components/hello';
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
-import { render } from '@ember/test-helpers';
+- [nvim-treesitter](https://github.com/nvim-treesitter/nvim-treesitter)
+- [tree-sitter-glimmer](https://github.com/alexlafroscia/tree-sitter-glimmer)
 
-module('Integration | Component | hello', function (hooks) {
-  setupRenderingTest(hooks);
+### Other editors
+
+For other editors, you may be able to get support using one of these other syntax definitions:
+
+- [TextMate](https://github.com/IgnaceMaes/glimmer-textmate-grammar)
+- [TreeSitter](https://github.com/alexlafroscia/tree-sitter-glimmer)
 
-  test('renders name argument', async function (assert) {
-    const name = 'world';
-    await render(<template><Hello @name={{name}} /></template>);
-    assert.dom('[data-test-id="some-selector"]').hasText(name);
-  });
-});
-```

From e7151b056c3ed107525c6150b57b080da56072cf Mon Sep 17 00:00:00 2001
From: ignace <ignace@otainsight.com>
Date: Thu, 21 Dec 2023 20:55:14 +0100
Subject: [PATCH 06/41] fix: typos

---
 guides/release/components/template-tag-format.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index 5a76b8d604..35bed5964d 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -6,7 +6,7 @@ This new format is the official future of Ember's component authoring story, and
 
 ## Writing template tag components
 
-Just like with separate JavaScript and Glimmer template files, the template tag format has the concept of template-only components and class-based components. Let's take a closer look at how they compare between both component formats in the next sections.
+Just like with separate JavaScript and Glimmer template files, the template tag format has the concept of template-only components and class-based components. Let's take a closer look at how they compare between both component formats in the next section.
 
 ### Template-only components
 
@@ -191,7 +191,7 @@ This can be a powerful refactoring technique to break up large components into s
 
 Historically, Ember's integration tests have been written using the `hbs` tagged template literal. This is no longer necessary with the template tag format. Instead, simply use the `<template>` tag to define a template to render.
 
-The following example showacases how the "Avatar" component can be tested using the template tag format.
+The following example showcases how the "Avatar" component can be tested using the template tag format.
 
 ```text {data-filename="tests/integration/components/avatar-test.gjs"}
 import Avatar from 'app/components/avatar';

From 2cc1e39c91a13025d0abe4b21fbadbdb42af9de3 Mon Sep 17 00:00:00 2001
From: ignace <ignace@otainsight.com>
Date: Thu, 21 Dec 2023 21:32:56 +0100
Subject: [PATCH 07/41] docs: remove simply as it might not be simple for
 everyone

---
 guides/release/components/template-tag-format.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index 35bed5964d..4416ac7324 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -18,7 +18,7 @@ The following template-only component was created in a previous section to extra
 </aside>
 ```
 
-This layout can be turned into a template tag component simply by wrapping the code in a `<template>` tag and changing the file extension to `.gjs`.
+This layout can be turned into a template tag component by wrapping the code in a `<template>` tag and changing the file extension to `.gjs`.
 
 ```text {data-filename="app/components/avatar.gjs"}
 <template>
@@ -189,7 +189,7 @@ This can be a powerful refactoring technique to break up large components into s
 
 ## Testing
 
-Historically, Ember's integration tests have been written using the `hbs` tagged template literal. This is no longer necessary with the template tag format. Instead, simply use the `<template>` tag to define a template to render.
+Historically, Ember's integration tests have been written using the `hbs` tagged template literal. This is no longer necessary with the template tag format. Instead, use the `<template>` tag to define a template to render.
 
 The following example showcases how the "Avatar" component can be tested using the template tag format.
 

From b78bbcbdf7a4eb26e3bc3918d6dbf2e2599885b4 Mon Sep 17 00:00:00 2001
From: ignace <ignace@otainsight.com>
Date: Thu, 21 Dec 2023 21:53:26 +0100
Subject: [PATCH 08/41] docs: add nested component info

---
 .../release/components/template-tag-format.md | 30 ++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index 4416ac7324..fe76386903 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -96,6 +96,34 @@ The example above demonstrates defining a "Message" template-only component. The
   </div>
 </div>
 
+#### Nested components
+
+Component files can be organized in nested directory structures on the file system. Prior to the template tag format, the file path from the root component directory had be specified before to the component name, separated with `::`.
+
+For example, when moving the "Avatar" component to the `app/components/messages` namespace, referencing it using double collons would be done as follows.
+
+```handlebars {data-filename="app/components/avatar-usage.hbs"}
+<Messages::Avatar
+  @title="Picture of Zoey"
+  @initial="Zoey"
+/>
+```
+
+This quirk is no longer necessary with the template tag format. Instead, importing now works the same as importing any other JavaScript module.
+
+```text {data-filename="app/components/avatar-usage.gjs"}
+import Avatar from 'app/components/message/avatar';
+
+<template>
+  <Avatar
+    @title="Picture of Zoey"
+    @initial="Zoey"
+  />
+</template>
+```
+
+#### Helpers and modifiers
+
 Importing helpers and modifiers from the own app also follows the same principle of using standard JavaScript import syntax. Instead of importing from `app/components`, the path to import from is `app/helpers` and `app/modifiers` respectively.
 
 ### Importing from addons
@@ -206,7 +234,7 @@ module('Integration | Component | avatar', function (hooks) {
     const initial = 'Zoey';
     await render(
       <template>
-        <Avatar @title={{"Picture of Zoey"}} @initial={{initial}} />
+        <Avatar @title="Picture of Zoey" @initial={{initial}} />
       </template>
     );
     assert.dom().hasText(initial);

From 3e16462be692e299d8bd32461d106af95a263b9c Mon Sep 17 00:00:00 2001
From: ignace <ignace@otainsight.com>
Date: Thu, 21 Dec 2023 21:56:31 +0100
Subject: [PATCH 09/41] docs: fix import path

---
 guides/release/components/template-tag-format.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index fe76386903..fa97968933 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -112,7 +112,7 @@ For example, when moving the "Avatar" component to the `app/components/messages`
 This quirk is no longer necessary with the template tag format. Instead, importing now works the same as importing any other JavaScript module.
 
 ```text {data-filename="app/components/avatar-usage.gjs"}
-import Avatar from 'app/components/message/avatar';
+import Avatar from 'app/components/messages/avatar';
 
 <template>
   <Avatar

From 11474cf2aab4dd0435c0402f8f1311ebc560788d Mon Sep 17 00:00:00 2001
From: Ignace Maes <ignacemaes100@msn.com>
Date: Fri, 22 Dec 2023 10:43:21 +0100
Subject: [PATCH 10/41] Update guides/release/components/template-tag-format.md

Co-authored-by: Lukas Nys <nyslukas@gmail.com>
---
 guides/release/components/template-tag-format.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index fa97968933..ecc0663709 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -89,7 +89,7 @@ The example above demonstrates defining a "Message" template-only component. The
       <div class="cta-note-message">
         The components that are imported are not required to use the new template tag format. This is intentional, and very powerful, as it <strong>allows incremental adoption</strong> of the new format.
         <br><br>
-        The only prerequisite is that the component is defined using the template-colocation structure instead of the separating the JavaScript and Glimmer template code into separate folders.
+        The only prerequisite is that the component is defined using the template-colocation structure instead of separating the JavaScript and Glimmer template code into separate folders.
       </div>
     </div>
     <img src="/images/mascots/zoey.png" role="presentation" alt="">

From 206b7460ac3f37b5bac46899f945a6c0098a6639 Mon Sep 17 00:00:00 2001
From: ignace <ignace@otainsight.com>
Date: Fri, 22 Dec 2023 10:45:03 +0100
Subject: [PATCH 11/41] docs: reword tip sentence

---
 guides/release/components/template-tag-format.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index ecc0663709..43807a44b2 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -89,7 +89,7 @@ The example above demonstrates defining a "Message" template-only component. The
       <div class="cta-note-message">
         The components that are imported are not required to use the new template tag format. This is intentional, and very powerful, as it <strong>allows incremental adoption</strong> of the new format.
         <br><br>
-        The only prerequisite is that the component is defined using the template-colocation structure instead of separating the JavaScript and Glimmer template code into separate folders.
+        The only prerequisite is that the component is defined using the template-colocation structure instead of splitting up the JavaScript and Glimmer template files into separate folders.
       </div>
     </div>
     <img src="/images/mascots/zoey.png" role="presentation" alt="">

From aa39c521635f0565b36a89adebed40a5f0dae58a Mon Sep 17 00:00:00 2001
From: ignace <ignace@otainsight.com>
Date: Fri, 22 Dec 2023 10:46:34 +0100
Subject: [PATCH 12/41] fix: use your own app

---
 guides/release/components/template-tag-format.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index 43807a44b2..19f763a951 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -62,7 +62,7 @@ export default class Avatar extends Component {
 
 The template tag format uses strict template semantics. This means that you can only use components, helpers, and modifiers that are explicitly imported. This makes it easier to understand where things come from and what they do, as well as unlocks build optimizations.
 
-### Importing invokables from the own app
+### Importing invokables from your own app
 
 When making use of the "Avatar" component as defined before in a different component file, it first needs to be imported. This is done using the `import` statement, just like you would import any other JavaScript module.
 
@@ -124,11 +124,11 @@ import Avatar from 'app/components/messages/avatar';
 
 #### Helpers and modifiers
 
-Importing helpers and modifiers from the own app also follows the same principle of using standard JavaScript import syntax. Instead of importing from `app/components`, the path to import from is `app/helpers` and `app/modifiers` respectively.
+Importing helpers and modifiers from your own app also follows the same principle of using standard JavaScript import syntax. Instead of importing from `app/components`, the path to import from is `app/helpers` and `app/modifiers` respectively.
 
 ### Importing from addons
 
-Just as with components, helpers, and modifiers from the own app, external invokables from addons also have to be imported. This is done using the same `import` statement, but with a path referencing the addon.
+Just as with components, helpers, and modifiers from your own app, external invokables from addons also have to be imported. This is done using the same `import` statement, but with a path referencing the addon.
 
 The structure of files within Ember addons is mostly standardized. This means that the path to import from can be derived from the addon's name. For example, an addon that is named `ember-foo` will have its components, helpers, and modifiers available as default import from `ember-foo/components/<component-name>`, `ember-foo/helpers/<helper-name>` and `ember-foo/modifiers/<modifier-name>` respectively.
 
@@ -242,7 +242,7 @@ module('Integration | Component | avatar', function (hooks) {
 });
 ```
 
-Notice how the same semantics now apply to tests as well: local values in scope can be referenced directly, and invokables from the own app or addons need to be imported.
+Notice how the same semantics now apply to tests as well: local values in scope can be referenced directly, and invokables from your own app or addons need to be imported.
 
 ## Installation
 

From a494d3431afc9f4338ec82398c2cbd4d9447bc9d Mon Sep 17 00:00:00 2001
From: ignace <ignace@otainsight.com>
Date: Fri, 22 Dec 2023 10:48:01 +0100
Subject: [PATCH 13/41] docs: rephrase sentence

---
 guides/release/components/template-tag-format.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index 19f763a951..3bca353ec3 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -6,7 +6,7 @@ This new format is the official future of Ember's component authoring story, and
 
 ## Writing template tag components
 
-Just like with separate JavaScript and Glimmer template files, the template tag format has the concept of template-only components and class-based components. Let's take a closer look at how they compare between both component formats in the next section.
+Just like with separate JavaScript and Glimmer template files, the template tag format has the concept of template-only components and class-based components. Let's take a closer look at how these concepts compare between both component formats in the next section.
 
 ### Template-only components
 

From c57a53c87892f90d905812acf03c195b0554cb65 Mon Sep 17 00:00:00 2001
From: ignace <ignace@otainsight.com>
Date: Fri, 22 Dec 2023 11:08:01 +0100
Subject: [PATCH 14/41] fix: colon typo

---
 guides/release/components/template-tag-format.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index 3bca353ec3..23ab366008 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -100,7 +100,7 @@ The example above demonstrates defining a "Message" template-only component. The
 
 Component files can be organized in nested directory structures on the file system. Prior to the template tag format, the file path from the root component directory had be specified before to the component name, separated with `::`.
 
-For example, when moving the "Avatar" component to the `app/components/messages` namespace, referencing it using double collons would be done as follows.
+For example, when moving the "Avatar" component to the `app/components/messages` namespace, referencing it using double colons would be done as follows.
 
 ```handlebars {data-filename="app/components/avatar-usage.hbs"}
 <Messages::Avatar

From a61262ed24e431de7f5bcc8f619e40229629446a Mon Sep 17 00:00:00 2001
From: Ignace Maes <ignacemaes100@msn.com>
Date: Wed, 27 Dec 2023 10:10:55 +0100
Subject: [PATCH 15/41] Apply suggestions from code review

Co-authored-by: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
---
 guides/release/components/template-tag-format.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index 23ab366008..12813e4d10 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -2,7 +2,7 @@ The template tag format is a powerful, new way to write components in Ember. It'
 
 Template tag components use the file extension `.gjs`. This abbreviation is short for "Glimmer JavaScript". The file extension `.gts` is also supported for TypeScript components.
 
-This new format is the official future of Ember's component authoring story, and is stable and usable today. We expect it to become the recommended way of authoring all Ember apps in the near future, once we are satisfied that we have sufficiently polished up all the corners of the implementation.
+This new format is the official future of Ember's component authoring story, and is stable and usable today. We expect it to become the recommended and default way of authoring all Ember apps in the near future, once we are satisfied that we have sufficiently polished up all the corners of the implementation.
 
 ## Writing template tag components
 
@@ -258,7 +258,7 @@ You may need to upgrade dependency versions or install additional plugins to hav
 
 - [ember-template-lint](https://github.com/ember-template-lint/ember-template-lint): Versions 5.8.0 and up.
 - [eslint-plugin-ember](https://github.com/ember-cli/eslint-plugin-ember): Versions 11.6.0 and up.
-- [Prettier](https://github.com/prettier/prettier): Versions 3.0.0 and up. This requires installing the [prettier-plugin-ember-template-tag](https://github.com/gitKrystan/prettier-plugin-ember-template-tag).
+- [Prettier](https://github.com/prettier/prettier): Versions 3.1.0 and up. This requires installing the [prettier-plugin-ember-template-tag](https://github.com/gitKrystan/prettier-plugin-ember-template-tag).
 - [Glint](https://github.com/typed-ember/glint): Requires installing the [environment-ember-template-imports](https://github.com/typed-ember/glint/tree/main/packages/environment-ember-template-imports) plugin.
 
 ## Editor Integrations

From 0fa636e225e4df2df14becafea9895e8dc312e2b Mon Sep 17 00:00:00 2001
From: ignace <ignace@otainsight.com>
Date: Wed, 27 Dec 2023 10:19:18 +0100
Subject: [PATCH 16/41] refactor: use function over arrow syntax

---
 guides/release/components/template-tag-format.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index 12813e4d10..1c0c5d19de 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -175,9 +175,9 @@ In the following example, a "Square" component is defined that calculates the sq
 ```text {data-filename="app/components/square.gjs"}
 const value = 2;
 
-const square = (number) => {
+function square(number) {
   return number * number;
-};
+}
 
 <template>
   The square of {{value}} equals {{square value}}

From 11ff45a684a781cc46bce0538f84e2eae51a1eec Mon Sep 17 00:00:00 2001
From: ignace <ignace@otainsight.com>
Date: Wed, 27 Dec 2023 16:53:04 +0100
Subject: [PATCH 17/41] feat: link to previous section

---
 guides/release/components/template-tag-format.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index 1c0c5d19de..c21e6293c7 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -10,7 +10,7 @@ Just like with separate JavaScript and Glimmer template files, the template tag
 
 ### Template-only components
 
-The following template-only component was created in a previous section to extract an avatar layout into a reusable component.
+The following template-only component was created in a [previous section](../component-arguments-and-html-attributes) to extract an avatar layout into a reusable component.
 
 ```handlebars {data-filename="app/components/avatar.hbs"}
 <aside>

From af944442319bb5f0689902531e5f9a399ab35bec Mon Sep 17 00:00:00 2001
From: ignace <ignace@otainsight.com>
Date: Wed, 27 Dec 2023 16:57:34 +0100
Subject: [PATCH 18/41] feat: add co-location RFC link

---
 guides/release/components/template-tag-format.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index c21e6293c7..b542b27909 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -89,7 +89,7 @@ The example above demonstrates defining a "Message" template-only component. The
       <div class="cta-note-message">
         The components that are imported are not required to use the new template tag format. This is intentional, and very powerful, as it <strong>allows incremental adoption</strong> of the new format.
         <br><br>
-        The only prerequisite is that the component is defined using the template-colocation structure instead of splitting up the JavaScript and Glimmer template files into separate folders.
+        The only prerequisite is that the component is defined using the <a href="https://rfcs.emberjs.com/id/0481-component-templates-co-location">template-colocation structure</a> instead of splitting up the JavaScript and Glimmer template files into separate folders.
       </div>
     </div>
     <img src="/images/mascots/zoey.png" role="presentation" alt="">

From c03e9100b5829df29ac10f6cb796e450a646472b Mon Sep 17 00:00:00 2001
From: ignace <ignace@otainsight.com>
Date: Sun, 31 Dec 2023 10:18:08 +0100
Subject: [PATCH 19/41] docs: use relative imports

---
 guides/release/components/template-tag-format.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index b542b27909..25a7d3661e 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -67,7 +67,7 @@ The template tag format uses strict template semantics. This means that you can
 When making use of the "Avatar" component as defined before in a different component file, it first needs to be imported. This is done using the `import` statement, just like you would import any other JavaScript module.
 
 ```text {data-filename="app/components/message.gjs"}
-import Avatar from 'app/components/avatar';
+import Avatar from './avatar';
 
 <template>
   <Avatar
@@ -112,7 +112,7 @@ For example, when moving the "Avatar" component to the `app/components/messages`
 This quirk is no longer necessary with the template tag format. Instead, importing now works the same as importing any other JavaScript module.
 
 ```text {data-filename="app/components/avatar-usage.gjs"}
-import Avatar from 'app/components/messages/avatar';
+import Avatar from './messages/avatar';
 
 <template>
   <Avatar

From af128c45546223e27e4c7f0108aa8ab3fb1a5c41 Mon Sep 17 00:00:00 2001
From: Ignace Maes <ignacemaes100@msn.com>
Date: Mon, 22 Jan 2024 20:27:30 +0100
Subject: [PATCH 20/41] Update guides/release/components/template-tag-format.md

Co-authored-by: Chris Manson <mansona@users.noreply.github.com>
---
 guides/release/components/template-tag-format.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index 25a7d3661e..948d1a558c 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -28,7 +28,7 @@ This layout can be turned into a template tag component by wrapping the code in
 </template>
 ```
 
-The top-level template tag is exported as default component from the file. You *can* write this export explicitly, but it's not necessary. The following example is equivalent to the previous one.
+The top-level template tag is exported as the default component from the file. You *can* write this export explicitly, but it's not necessary. The following example is equivalent to the previous one.
 
 ```text {data-filename="app/components/avatar.gjs"}
 export default <template>

From 4214351a8815c1e28f9c1ba67389b161e37c431a Mon Sep 17 00:00:00 2001
From: ignace <ignace@otainsight.com>
Date: Mon, 22 Jan 2024 20:43:23 +0100
Subject: [PATCH 21/41] docs: add link to rfc

---
 guides/release/components/template-tag-format.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index 948d1a558c..f927aa58f5 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -2,7 +2,7 @@ The template tag format is a powerful, new way to write components in Ember. It'
 
 Template tag components use the file extension `.gjs`. This abbreviation is short for "Glimmer JavaScript". The file extension `.gts` is also supported for TypeScript components.
 
-This new format is the official future of Ember's component authoring story, and is stable and usable today. We expect it to become the recommended and default way of authoring all Ember apps in the near future, once we are satisfied that we have sufficiently polished up all the corners of the implementation.
+This new format is the [official future of Ember's component authoring story](https://rfcs.emberjs.com/id/0779-first-class-component-templates/), and is stable and usable today. We expect it to become the recommended and default way of authoring all Ember apps in the near future, once we are satisfied that we have sufficiently polished up all the corners of the implementation.
 
 ## Writing template tag components
 

From 4a24993869b00ca24728746264634f244c3cde28 Mon Sep 17 00:00:00 2001
From: ignace <ignace@otainsight.com>
Date: Mon, 22 Jan 2024 20:43:51 +0100
Subject: [PATCH 22/41] fix: include the in link

---
 guides/release/components/template-tag-format.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index f927aa58f5..2244ef70f4 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -2,7 +2,7 @@ The template tag format is a powerful, new way to write components in Ember. It'
 
 Template tag components use the file extension `.gjs`. This abbreviation is short for "Glimmer JavaScript". The file extension `.gts` is also supported for TypeScript components.
 
-This new format is the [official future of Ember's component authoring story](https://rfcs.emberjs.com/id/0779-first-class-component-templates/), and is stable and usable today. We expect it to become the recommended and default way of authoring all Ember apps in the near future, once we are satisfied that we have sufficiently polished up all the corners of the implementation.
+This new format is [the official future of Ember's component authoring story](https://rfcs.emberjs.com/id/0779-first-class-component-templates/), and is stable and usable today. We expect it to become the recommended and default way of authoring all Ember apps in the near future, once we are satisfied that we have sufficiently polished up all the corners of the implementation.
 
 ## Writing template tag components
 

From aeb3de20e30f91f9f88c7728539ca967667d6903 Mon Sep 17 00:00:00 2001
From: Ignace Maes <ignacemaes100@msn.com>
Date: Tue, 23 Jan 2024 20:53:13 +0100
Subject: [PATCH 23/41] Update guides/release/components/template-tag-format.md

Co-authored-by: Chris Manson <mansona@users.noreply.github.com>
---
 guides/release/components/template-tag-format.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index 2244ef70f4..ea9ec6761a 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -130,7 +130,7 @@ Importing helpers and modifiers from your own app also follows the same principl
 
 Just as with components, helpers, and modifiers from your own app, external invokables from addons also have to be imported. This is done using the same `import` statement, but with a path referencing the addon.
 
-The structure of files within Ember addons is mostly standardized. This means that the path to import from can be derived from the addon's name. For example, an addon that is named `ember-foo` will have its components, helpers, and modifiers available as default import from `ember-foo/components/<component-name>`, `ember-foo/helpers/<helper-name>` and `ember-foo/modifiers/<modifier-name>` respectively.
+The structure of files within Ember addons is mostly standardized. This means that the path to import from can be derived from the addon's name. For example, an addon that is named `ember-foo` will likely have its components, helpers, and modifiers available as default import from `ember-foo/components/<component-name>`, `ember-foo/helpers/<helper-name>` and `ember-foo/modifiers/<modifier-name>` respectively.
 
 Some addons may choose to re-export their invokables from the root index as named exports. (This is known as the barrel file pattern) Usually addons will document this usage in their README, which may look like `import { ComponentName } from 'ember-foo';`, if supported.
 

From ad2ebd6fee4bb2cfb8db141d717fd2ead633e765 Mon Sep 17 00:00:00 2001
From: ignace <ignace@otainsight.com>
Date: Tue, 23 Jan 2024 21:07:38 +0100
Subject: [PATCH 24/41] docs: clarify invokables

---
 guides/release/components/template-tag-format.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index ea9ec6761a..14ca27554f 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -60,7 +60,11 @@ export default class Avatar extends Component {
 
 ## Importing components, helpers, and modifiers
 
-The template tag format uses strict template semantics. This means that you can only use components, helpers, and modifiers that are explicitly imported. This makes it easier to understand where things come from and what they do, as well as unlocks build optimizations.
+In Ember templates, **“invokables”** are things you can _invoke_ in a template. These include [components][], [helpers][], and [modifiers][]. In the template tag format, these invokables need to be imported before they can be used. This makes it easier to understand where values come from and what they do, as well as unlocks build optimizations.
+
+[components]: ../../../components/introducing-components/
+[helpers]: ../../../components/helper-functions/
+[modifiers]: ../../../components/template-lifecycle-dom-and-modifiers/
 
 ### Importing invokables from your own app
 

From 294d26bbecf238681d57f1b6e4655a90637bb8fa Mon Sep 17 00:00:00 2001
From: ignace <ignace@otainsight.com>
Date: Tue, 23 Jan 2024 21:19:47 +0100
Subject: [PATCH 25/41] docs: make inline import blocks explicit

---
 .../release/components/template-tag-format.md | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index 14ca27554f..148b6d105a 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -134,9 +134,25 @@ Importing helpers and modifiers from your own app also follows the same principl
 
 Just as with components, helpers, and modifiers from your own app, external invokables from addons also have to be imported. This is done using the same `import` statement, but with a path referencing the addon.
 
-The structure of files within Ember addons is mostly standardized. This means that the path to import from can be derived from the addon's name. For example, an addon that is named `ember-foo` will likely have its components, helpers, and modifiers available as default import from `ember-foo/components/<component-name>`, `ember-foo/helpers/<helper-name>` and `ember-foo/modifiers/<modifier-name>` respectively.
+The structure of files within Ember addons is mostly standardized. This means that the path to import from can be derived from the addon's name. For example, an addon that is named `ember-foo` will likely have its components, helpers, and modifiers available as default import from the following locations:
 
-Some addons may choose to re-export their invokables from the root index as named exports. (This is known as the barrel file pattern) Usually addons will document this usage in their README, which may look like `import { ComponentName } from 'ember-foo';`, if supported.
+```text
+ember-foo/components/example-component
+ember-foo/helpers/example-helper
+ember-foo/modifiers/example-modifier
+```
+
+To import the "ExampleComponent" component from the `ember-foo` addon, the following import statement can be used.
+
+```js
+import ExampleComponent from 'ember-foo/components/example-component';
+```
+
+Some addons may choose to re-export their invokables from the root index as named exports. (This is known as the barrel file pattern) Usually addons will document this usage in their README, if supported, which may look like:
+
+```js
+import { ExampleComponent } from 'ember-foo';
+```
 
 ### Importing built-ins
 

From 7cd69d09e13f03c32c999b540dfacf755d318d8d Mon Sep 17 00:00:00 2001
From: ignace <ignace@otainsight.com>
Date: Tue, 23 Jan 2024 21:20:26 +0100
Subject: [PATCH 26/41] docs: remove barrel file mention

---
 guides/release/components/template-tag-format.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index 148b6d105a..56e2d22719 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -148,7 +148,7 @@ To import the "ExampleComponent" component from the `ember-foo` addon, the follo
 import ExampleComponent from 'ember-foo/components/example-component';
 ```
 
-Some addons may choose to re-export their invokables from the root index as named exports. (This is known as the barrel file pattern) Usually addons will document this usage in their README, if supported, which may look like:
+Some addons may choose to re-export their invokables from the root index as named exports. Usually addons will document this usage in their README, if supported, which may look like:
 
 ```js
 import { ExampleComponent } from 'ember-foo';

From b3d6344abd60b5fca9f820801444715a50f43fe8 Mon Sep 17 00:00:00 2001
From: ignace <ignace@otainsight.com>
Date: Tue, 23 Jan 2024 21:26:23 +0100
Subject: [PATCH 27/41] docs: clarify rfc stage

---
 guides/release/components/template-tag-format.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index 56e2d22719..fcaf79bc5f 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -2,7 +2,7 @@ The template tag format is a powerful, new way to write components in Ember. It'
 
 Template tag components use the file extension `.gjs`. This abbreviation is short for "Glimmer JavaScript". The file extension `.gts` is also supported for TypeScript components.
 
-This new format is [the official future of Ember's component authoring story](https://rfcs.emberjs.com/id/0779-first-class-component-templates/), and is stable and usable today. We expect it to become the recommended and default way of authoring all Ember apps in the near future, once we are satisfied that we have sufficiently polished up all the corners of the implementation.
+This new format is [the official future of Ember's component authoring story](https://rfcs.emberjs.com/id/0779-first-class-component-templates/), and is stable and usable today. The RFC is currently in the "Accepted" stage, and work is ongoing to get it to "Ready for Release". We expect it to become the recommended and default way of authoring all Ember apps in the near future, once we are satisfied that we have sufficiently polished up all the corners of the implementation.
 
 ## Writing template tag components
 

From 57cdaa3f0331f846063d2ed19f651cf9a4109fab Mon Sep 17 00:00:00 2001
From: ignace <ignace@otainsight.com>
Date: Tue, 23 Jan 2024 21:54:45 +0100
Subject: [PATCH 28/41] docs: add camelCase convention

---
 guides/release/components/template-tag-format.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index fcaf79bc5f..385c09725c 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -130,6 +130,16 @@ import Avatar from './messages/avatar';
 
 Importing helpers and modifiers from your own app also follows the same principle of using standard JavaScript import syntax. Instead of importing from `app/components`, the path to import from is `app/helpers` and `app/modifiers` respectively.
 
+Prior to the template tag format, helpers and modifiers were referenced based on their name in the "kebal-case" convention. For example, a `randomNumber` function as helper would be referenced as `{{random-number}}` in a template. In the new way of doing things, ES import standards and conventions are used instead. This means that the helper is referenced using the name it is exported as, which is `randomNumber` in this case.
+
+```text {data-filename="app/components/random-number.gjs"}
+import randomNumber from '../helpers/random-number';
+
+<template>
+  {{randomNumber}}
+</template>
+```
+
 ### Importing from addons
 
 Just as with components, helpers, and modifiers from your own app, external invokables from addons also have to be imported. This is done using the same `import` statement, but with a path referencing the addon.

From dd0fc7461ae341dbaec9a1fae0dd89a3fc32855d Mon Sep 17 00:00:00 2001
From: ignace <ignace@otainsight.com>
Date: Tue, 23 Jan 2024 22:02:31 +0100
Subject: [PATCH 29/41] docs: callout installation

---
 guides/release/components/template-tag-format.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index 385c09725c..bca5d450be 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -4,6 +4,8 @@ Template tag components use the file extension `.gjs`. This abbreviation is shor
 
 This new format is [the official future of Ember's component authoring story](https://rfcs.emberjs.com/id/0779-first-class-component-templates/), and is stable and usable today. The RFC is currently in the "Accepted" stage, and work is ongoing to get it to "Ready for Release". We expect it to become the recommended and default way of authoring all Ember apps in the near future, once we are satisfied that we have sufficiently polished up all the corners of the implementation.
 
+> Can't wait to get started? Head over to the [installation section](#installation) to start using template tag components in your apps and addons today.
+
 ## Writing template tag components
 
 Just like with separate JavaScript and Glimmer template files, the template tag format has the concept of template-only components and class-based components. Let's take a closer look at how these concepts compare between both component formats in the next section.

From b3b707f16e57ec5afa9856f7eecb5a8307975ba3 Mon Sep 17 00:00:00 2001
From: ignace <ignace@otainsight.com>
Date: Tue, 23 Jan 2024 22:05:24 +0100
Subject: [PATCH 30/41] docs: make built-ins an actual code block

---
 .../release/components/template-tag-format.md | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index bca5d450be..8ac6064cf6 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -170,15 +170,22 @@ import { ExampleComponent } from 'ember-foo';
 
 The Ember built-in helpers, modifiers, and components are available for import from the following locations.
 
-- `array` (`import { array } from '@ember/helper';`)
-- `concat` (`import { concat } from '@ember/helper';`)
-- `fn` (`import { fn } from '@ember/helper';`)
-- `get` (`import { get } from '@ember/helper';`)
-- `hash` (`import { hash } from '@ember/helper';`)
-- `on` (`import { on } from '@ember/modifier';`)
-- `Input` (`import { Input } from '@ember/component';`)
-- `LinkTo` (`import { LinkTo } from '@ember/routing';`)
-- `Textarea` (`import { Textarea } from '@ember/component';`)
+```js
+// Built-in helpers
+import { array } from '@ember/helper';
+import { concat } from '@ember/helper';
+import { fn } from '@ember/helper';
+import { get } from '@ember/helper';
+import { hash } from '@ember/helper';
+
+// Built-in modifiers
+import { on } from '@ember/modifier';
+
+// Built-in components
+import { Input } from '@ember/component';
+import { LinkTo } from '@ember/routing';
+import { Textarea } from '@ember/component';
+```
 
 <div class="cta">
   <div class="cta-note">

From d7f6312fbc41609bec0ef2562d71fb06d18aeb3a Mon Sep 17 00:00:00 2001
From: ignace <ignace@otainsight.com>
Date: Tue, 23 Jan 2024 22:10:54 +0100
Subject: [PATCH 31/41] docs: fix internal link

---
 guides/release/components/template-tag-format.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index 8ac6064cf6..6abdb9852f 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -4,7 +4,7 @@ Template tag components use the file extension `.gjs`. This abbreviation is shor
 
 This new format is [the official future of Ember's component authoring story](https://rfcs.emberjs.com/id/0779-first-class-component-templates/), and is stable and usable today. The RFC is currently in the "Accepted" stage, and work is ongoing to get it to "Ready for Release". We expect it to become the recommended and default way of authoring all Ember apps in the near future, once we are satisfied that we have sufficiently polished up all the corners of the implementation.
 
-> Can't wait to get started? Head over to the [installation section](#installation) to start using template tag components in your apps and addons today.
+> Can't wait to get your hands on it? Head over to the [installation section](#toc_installation) to start using template tag components in your apps and addons today.
 
 ## Writing template tag components
 

From 9e40721b6ae5ed7c3fdd4b2ee797c511c8eb5f9e Mon Sep 17 00:00:00 2001
From: ignace <ignace@otainsight.com>
Date: Tue, 23 Jan 2024 22:12:26 +0100
Subject: [PATCH 32/41] docs: reword

---
 guides/release/components/template-tag-format.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index 6abdb9852f..bb8fb15516 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -4,7 +4,7 @@ Template tag components use the file extension `.gjs`. This abbreviation is shor
 
 This new format is [the official future of Ember's component authoring story](https://rfcs.emberjs.com/id/0779-first-class-component-templates/), and is stable and usable today. The RFC is currently in the "Accepted" stage, and work is ongoing to get it to "Ready for Release". We expect it to become the recommended and default way of authoring all Ember apps in the near future, once we are satisfied that we have sufficiently polished up all the corners of the implementation.
 
-> Can't wait to get your hands on it? Head over to the [installation section](#toc_installation) to start using template tag components in your apps and addons today.
+> Can't wait to get started? Head over to the [installation section](#toc_installation) to begin using template tag components in your apps and addons today.
 
 ## Writing template tag components
 

From 020308e381db57b783c009972543083f597da98f Mon Sep 17 00:00:00 2001
From: ignace <ignace@otainsight.com>
Date: Tue, 23 Jan 2024 22:16:34 +0100
Subject: [PATCH 33/41] fix: typo

---
 guides/release/components/template-tag-format.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index bb8fb15516..f5a51e6ead 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -132,7 +132,7 @@ import Avatar from './messages/avatar';
 
 Importing helpers and modifiers from your own app also follows the same principle of using standard JavaScript import syntax. Instead of importing from `app/components`, the path to import from is `app/helpers` and `app/modifiers` respectively.
 
-Prior to the template tag format, helpers and modifiers were referenced based on their name in the "kebal-case" convention. For example, a `randomNumber` function as helper would be referenced as `{{random-number}}` in a template. In the new way of doing things, ES import standards and conventions are used instead. This means that the helper is referenced using the name it is exported as, which is `randomNumber` in this case.
+Prior to the template tag format, helpers and modifiers were referenced based on their name in the "kebab-case" convention. For example, a `randomNumber` function as helper would be referenced as `{{random-number}}` in a template. In the new way of doing things, ES import standards and conventions are used instead. This means that the helper is referenced using the name it is exported as, which is `randomNumber` in this case.
 
 ```text {data-filename="app/components/random-number.gjs"}
 import randomNumber from '../helpers/random-number';

From c68687ace7ba910e0800b9485f735fa893c5c74c Mon Sep 17 00:00:00 2001
From: ignace <ignace@otainsight.com>
Date: Tue, 23 Jan 2024 22:17:29 +0100
Subject: [PATCH 34/41] docs: reword sentence on imports

---
 guides/release/components/template-tag-format.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index f5a51e6ead..8c6fa65ab9 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -132,7 +132,7 @@ import Avatar from './messages/avatar';
 
 Importing helpers and modifiers from your own app also follows the same principle of using standard JavaScript import syntax. Instead of importing from `app/components`, the path to import from is `app/helpers` and `app/modifiers` respectively.
 
-Prior to the template tag format, helpers and modifiers were referenced based on their name in the "kebab-case" convention. For example, a `randomNumber` function as helper would be referenced as `{{random-number}}` in a template. In the new way of doing things, ES import standards and conventions are used instead. This means that the helper is referenced using the name it is exported as, which is `randomNumber` in this case.
+Prior to the template tag format, helpers and modifiers were referenced based on their name in the "kebab-case" convention. For example, a `randomNumber` function as helper would be referenced as `{{random-number}}` in a template. In the new way of doing things, standard module import conventions are used. This means that the helper is referenced using the name it is exported as, which is `randomNumber` in this case.
 
 ```text {data-filename="app/components/random-number.gjs"}
 import randomNumber from '../helpers/random-number';

From 5ea8d3de19dec65500f40f592dfe71ee61eef032 Mon Sep 17 00:00:00 2001
From: ignace <ignace@otainsight.com>
Date: Thu, 25 Jan 2024 13:24:08 +0100
Subject: [PATCH 35/41] deps: set override for ember-cli-showdown

---
 package-lock.json | 523 ++++++++++++++++++++++++++++++++++++++++++++--
 package.json      |   3 +
 2 files changed, 504 insertions(+), 22 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index de8037a159..741058c348 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15579,24 +15579,296 @@
       "dev": true
     },
     "node_modules/ember-cli-showdown": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ember-cli-showdown/-/ember-cli-showdown-6.0.1.tgz",
-      "integrity": "sha512-yQJf6ffpnn/5fTiDbwL/zvfzIuRepXzUNpaE9qrI+fo3fhn6KlrbDnr+UqkWYR41DqpspVwV4/sodkyENFu9SQ==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/ember-cli-showdown/-/ember-cli-showdown-7.0.0.tgz",
+      "integrity": "sha512-xpmqv+pSK1hMG50CD8DqClS0uEyTGF+jE1c/32otiZTslDMcISQC1xysdtdx2RHC+Uu0EpiS+WGp0oDznrH+WA==",
       "dev": true,
       "dependencies": {
-        "broccoli-funnel": "^2.0.0",
-        "broccoli-source": "^1.1.0",
-        "broccoli-string-replace": "^0.1.2",
-        "ember-cli-babel": "^7.26.6",
-        "ember-cli-htmlbars": "^5.7.1",
-        "resolve": "^1.8.1",
-        "semver": "^5.5.0",
+        "ember-auto-import": "^2.6.3",
+        "ember-cli-babel": "^7.26.11",
+        "ember-cli-htmlbars": "^6.2.0",
         "showdown": "^1.8.6"
       },
+      "engines": {
+        "node": "14.* || 16.* || >= 18"
+      },
+      "peerDependencies": {
+        "ember-source": "^3.12.0 || >4.0.0"
+      }
+    },
+    "node_modules/ember-cli-showdown/node_modules/async-disk-cache": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/async-disk-cache/-/async-disk-cache-2.1.0.tgz",
+      "integrity": "sha512-iH+boep2xivfD9wMaZWkywYIURSmsL96d6MoqrC94BnGSvXE4Quf8hnJiHGFYhw/nLeIa1XyRaf4vvcvkwAefg==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.1",
+        "heimdalljs": "^0.2.3",
+        "istextorbinary": "^2.5.1",
+        "mkdirp": "^0.5.0",
+        "rimraf": "^3.0.0",
+        "rsvp": "^4.8.5",
+        "username-sync": "^1.0.2"
+      },
+      "engines": {
+        "node": "8.* || >= 10.*"
+      }
+    },
+    "node_modules/ember-cli-showdown/node_modules/broccoli-persistent-filter": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/broccoli-persistent-filter/-/broccoli-persistent-filter-3.1.3.tgz",
+      "integrity": "sha512-Q+8iezprZzL9voaBsDY3rQVl7c7H5h+bvv8SpzCZXPZgfBFCbx7KFQ2c3rZR6lW5k4Kwoqt7jG+rZMUg67Gwxw==",
+      "dev": true,
+      "dependencies": {
+        "async-disk-cache": "^2.0.0",
+        "async-promise-queue": "^1.0.3",
+        "broccoli-plugin": "^4.0.3",
+        "fs-tree-diff": "^2.0.0",
+        "hash-for-dep": "^1.5.0",
+        "heimdalljs": "^0.2.1",
+        "heimdalljs-logger": "^0.1.7",
+        "promise-map-series": "^0.2.1",
+        "rimraf": "^3.0.0",
+        "symlink-or-copy": "^1.0.1",
+        "sync-disk-cache": "^2.0.0"
+      },
+      "engines": {
+        "node": "10.* || >= 12.*"
+      }
+    },
+    "node_modules/ember-cli-showdown/node_modules/broccoli-plugin": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/broccoli-plugin/-/broccoli-plugin-4.0.7.tgz",
+      "integrity": "sha512-a4zUsWtA1uns1K7p9rExYVYG99rdKeGRymW0qOCNkvDPHQxVi3yVyJHhQbM3EZwdt2E0mnhr5e0c/bPpJ7p3Wg==",
+      "dev": true,
+      "dependencies": {
+        "broccoli-node-api": "^1.7.0",
+        "broccoli-output-wrapper": "^3.2.5",
+        "fs-merger": "^3.2.1",
+        "promise-map-series": "^0.3.0",
+        "quick-temp": "^0.1.8",
+        "rimraf": "^3.0.2",
+        "symlink-or-copy": "^1.3.1"
+      },
+      "engines": {
+        "node": "10.* || >= 12.*"
+      }
+    },
+    "node_modules/ember-cli-showdown/node_modules/broccoli-plugin/node_modules/promise-map-series": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/promise-map-series/-/promise-map-series-0.3.0.tgz",
+      "integrity": "sha512-3npG2NGhTc8BWBolLLf8l/92OxMGaRLbqvIh9wjCHhDXNvk4zsxaTaCpiCunW09qWPrN2zeNSNwRLVBrQQtutA==",
+      "dev": true,
+      "engines": {
+        "node": "10.* || >= 12.*"
+      }
+    },
+    "node_modules/ember-cli-showdown/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ember-cli-showdown/node_modules/editions": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/editions/-/editions-2.3.1.tgz",
+      "integrity": "sha512-ptGvkwTvGdGfC0hfhKg0MT+TRLRKGtUiWGBInxOm5pz7ssADezahjCUaYuZ8Dr+C05FW0AECIIPt4WBxVINEhA==",
+      "dev": true,
+      "dependencies": {
+        "errlop": "^2.0.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=0.8"
+      },
+      "funding": {
+        "url": "https://bevry.me/fund"
+      }
+    },
+    "node_modules/ember-cli-showdown/node_modules/editions/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/ember-cli-showdown/node_modules/ember-cli-htmlbars": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/ember-cli-htmlbars/-/ember-cli-htmlbars-6.3.0.tgz",
+      "integrity": "sha512-N9Y80oZfcfWLsqickMfRd9YByVcTGyhYRnYQ2XVPVrp6jyUyOeRWmEAPh7ERSXpp8Ws4hr/JB9QVQrn/yZa+Ag==",
+      "dev": true,
+      "dependencies": {
+        "@ember/edition-utils": "^1.2.0",
+        "babel-plugin-ember-template-compilation": "^2.0.0",
+        "babel-plugin-htmlbars-inline-precompile": "^5.3.0",
+        "broccoli-debug": "^0.6.5",
+        "broccoli-persistent-filter": "^3.1.2",
+        "broccoli-plugin": "^4.0.3",
+        "ember-cli-version-checker": "^5.1.2",
+        "fs-tree-diff": "^2.0.1",
+        "hash-for-dep": "^1.5.1",
+        "heimdalljs-logger": "^0.1.10",
+        "js-string-escape": "^1.0.1",
+        "semver": "^7.3.4",
+        "silent-error": "^1.1.1",
+        "walk-sync": "^2.2.0"
+      },
       "engines": {
         "node": "12.* || 14.* || >= 16"
       }
     },
+    "node_modules/ember-cli-showdown/node_modules/ember-cli-version-checker": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/ember-cli-version-checker/-/ember-cli-version-checker-5.1.2.tgz",
+      "integrity": "sha512-rk7GY+FmLn/2e22HsZs0Ycrz8HQ1W3Fv+2TFOuEFW9optnDXDgkntPBIl6gact/LHsfBM5RKbM3dHsIIeLgl0Q==",
+      "dev": true,
+      "dependencies": {
+        "resolve-package-path": "^3.1.0",
+        "semver": "^7.3.4",
+        "silent-error": "^1.1.1"
+      },
+      "engines": {
+        "node": "10.* || >= 12.*"
+      }
+    },
+    "node_modules/ember-cli-showdown/node_modules/fs-tree-diff": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/fs-tree-diff/-/fs-tree-diff-2.0.1.tgz",
+      "integrity": "sha512-x+CfAZ/lJHQqwlD64pYM5QxWjzWhSjroaVsr8PW831zOApL55qPibed0c+xebaLWVr2BnHFoHdrwOv8pzt8R5A==",
+      "dev": true,
+      "dependencies": {
+        "@types/symlink-or-copy": "^1.2.0",
+        "heimdalljs-logger": "^0.1.7",
+        "object-assign": "^4.1.0",
+        "path-posix": "^1.0.0",
+        "symlink-or-copy": "^1.1.8"
+      },
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/ember-cli-showdown/node_modules/istextorbinary": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/istextorbinary/-/istextorbinary-2.6.0.tgz",
+      "integrity": "sha512-+XRlFseT8B3L9KyjxxLjfXSLMuErKDsd8DBNrsaxoViABMEZlOSCstwmw0qpoFX3+U6yWU1yhLudAe6/lETGGA==",
+      "dev": true,
+      "dependencies": {
+        "binaryextensions": "^2.1.2",
+        "editions": "^2.2.0",
+        "textextensions": "^2.5.0"
+      },
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://bevry.me/fund"
+      }
+    },
+    "node_modules/ember-cli-showdown/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ember-cli-showdown/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/ember-cli-showdown/node_modules/resolve-package-path": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/resolve-package-path/-/resolve-package-path-3.1.0.tgz",
+      "integrity": "sha512-2oC2EjWbMJwvSN6Z7DbDfJMnD8MYEouaLn5eIX0j8XwPsYCVIyY9bbnX88YHVkbr8XHqvZrYbxaLPibfTYKZMA==",
+      "dev": true,
+      "dependencies": {
+        "path-root": "^0.1.1",
+        "resolve": "^1.17.0"
+      },
+      "engines": {
+        "node": "10.* || >= 12"
+      }
+    },
+    "node_modules/ember-cli-showdown/node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/ember-cli-showdown/node_modules/rsvp": {
+      "version": "4.8.5",
+      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
+      "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
+      "dev": true,
+      "engines": {
+        "node": "6.* || >= 7.*"
+      }
+    },
+    "node_modules/ember-cli-showdown/node_modules/semver": {
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ember-cli-showdown/node_modules/sync-disk-cache": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/sync-disk-cache/-/sync-disk-cache-2.1.0.tgz",
+      "integrity": "sha512-vngT2JmkSapgq0z7uIoYtB9kWOOzMihAAYq/D3Pjm/ODOGMgS4r++B+OZ09U4hWR6EaOdy9eqQ7/8ygbH3wehA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.1",
+        "heimdalljs": "^0.2.6",
+        "mkdirp": "^0.5.0",
+        "rimraf": "^3.0.0",
+        "username-sync": "^1.0.2"
+      },
+      "engines": {
+        "node": "8.* || >= 10.*"
+      }
+    },
+    "node_modules/ember-cli-showdown/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
     "node_modules/ember-cli-sri": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ember-cli-sri/-/ember-cli-sri-2.1.1.tgz",
@@ -53490,19 +53762,226 @@
       }
     },
     "ember-cli-showdown": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ember-cli-showdown/-/ember-cli-showdown-6.0.1.tgz",
-      "integrity": "sha512-yQJf6ffpnn/5fTiDbwL/zvfzIuRepXzUNpaE9qrI+fo3fhn6KlrbDnr+UqkWYR41DqpspVwV4/sodkyENFu9SQ==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/ember-cli-showdown/-/ember-cli-showdown-7.0.0.tgz",
+      "integrity": "sha512-xpmqv+pSK1hMG50CD8DqClS0uEyTGF+jE1c/32otiZTslDMcISQC1xysdtdx2RHC+Uu0EpiS+WGp0oDznrH+WA==",
       "dev": true,
       "requires": {
-        "broccoli-funnel": "^2.0.0",
-        "broccoli-source": "^1.1.0",
-        "broccoli-string-replace": "^0.1.2",
-        "ember-cli-babel": "^7.26.6",
-        "ember-cli-htmlbars": "^5.7.1",
-        "resolve": "^1.8.1",
-        "semver": "^5.5.0",
+        "ember-auto-import": "^2.6.3",
+        "ember-cli-babel": "^7.26.11",
+        "ember-cli-htmlbars": "^6.2.0",
         "showdown": "^1.8.6"
+      },
+      "dependencies": {
+        "async-disk-cache": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/async-disk-cache/-/async-disk-cache-2.1.0.tgz",
+          "integrity": "sha512-iH+boep2xivfD9wMaZWkywYIURSmsL96d6MoqrC94BnGSvXE4Quf8hnJiHGFYhw/nLeIa1XyRaf4vvcvkwAefg==",
+          "dev": true,
+          "requires": {
+            "debug": "^4.1.1",
+            "heimdalljs": "^0.2.3",
+            "istextorbinary": "^2.5.1",
+            "mkdirp": "^0.5.0",
+            "rimraf": "^3.0.0",
+            "rsvp": "^4.8.5",
+            "username-sync": "^1.0.2"
+          }
+        },
+        "broccoli-persistent-filter": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/broccoli-persistent-filter/-/broccoli-persistent-filter-3.1.3.tgz",
+          "integrity": "sha512-Q+8iezprZzL9voaBsDY3rQVl7c7H5h+bvv8SpzCZXPZgfBFCbx7KFQ2c3rZR6lW5k4Kwoqt7jG+rZMUg67Gwxw==",
+          "dev": true,
+          "requires": {
+            "async-disk-cache": "^2.0.0",
+            "async-promise-queue": "^1.0.3",
+            "broccoli-plugin": "^4.0.3",
+            "fs-tree-diff": "^2.0.0",
+            "hash-for-dep": "^1.5.0",
+            "heimdalljs": "^0.2.1",
+            "heimdalljs-logger": "^0.1.7",
+            "promise-map-series": "^0.2.1",
+            "rimraf": "^3.0.0",
+            "symlink-or-copy": "^1.0.1",
+            "sync-disk-cache": "^2.0.0"
+          }
+        },
+        "broccoli-plugin": {
+          "version": "4.0.7",
+          "resolved": "https://registry.npmjs.org/broccoli-plugin/-/broccoli-plugin-4.0.7.tgz",
+          "integrity": "sha512-a4zUsWtA1uns1K7p9rExYVYG99rdKeGRymW0qOCNkvDPHQxVi3yVyJHhQbM3EZwdt2E0mnhr5e0c/bPpJ7p3Wg==",
+          "dev": true,
+          "requires": {
+            "broccoli-node-api": "^1.7.0",
+            "broccoli-output-wrapper": "^3.2.5",
+            "fs-merger": "^3.2.1",
+            "promise-map-series": "^0.3.0",
+            "quick-temp": "^0.1.8",
+            "rimraf": "^3.0.2",
+            "symlink-or-copy": "^1.3.1"
+          },
+          "dependencies": {
+            "promise-map-series": {
+              "version": "0.3.0",
+              "resolved": "https://registry.npmjs.org/promise-map-series/-/promise-map-series-0.3.0.tgz",
+              "integrity": "sha512-3npG2NGhTc8BWBolLLf8l/92OxMGaRLbqvIh9wjCHhDXNvk4zsxaTaCpiCunW09qWPrN2zeNSNwRLVBrQQtutA==",
+              "dev": true
+            }
+          }
+        },
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "editions": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/editions/-/editions-2.3.1.tgz",
+          "integrity": "sha512-ptGvkwTvGdGfC0hfhKg0MT+TRLRKGtUiWGBInxOm5pz7ssADezahjCUaYuZ8Dr+C05FW0AECIIPt4WBxVINEhA==",
+          "dev": true,
+          "requires": {
+            "errlop": "^2.0.0",
+            "semver": "^6.3.0"
+          },
+          "dependencies": {
+            "semver": {
+              "version": "6.3.1",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+              "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+              "dev": true
+            }
+          }
+        },
+        "ember-cli-htmlbars": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/ember-cli-htmlbars/-/ember-cli-htmlbars-6.3.0.tgz",
+          "integrity": "sha512-N9Y80oZfcfWLsqickMfRd9YByVcTGyhYRnYQ2XVPVrp6jyUyOeRWmEAPh7ERSXpp8Ws4hr/JB9QVQrn/yZa+Ag==",
+          "dev": true,
+          "requires": {
+            "@ember/edition-utils": "^1.2.0",
+            "babel-plugin-ember-template-compilation": "^2.0.0",
+            "babel-plugin-htmlbars-inline-precompile": "^5.3.0",
+            "broccoli-debug": "^0.6.5",
+            "broccoli-persistent-filter": "^3.1.2",
+            "broccoli-plugin": "^4.0.3",
+            "ember-cli-version-checker": "^5.1.2",
+            "fs-tree-diff": "^2.0.1",
+            "hash-for-dep": "^1.5.1",
+            "heimdalljs-logger": "^0.1.10",
+            "js-string-escape": "^1.0.1",
+            "semver": "^7.3.4",
+            "silent-error": "^1.1.1",
+            "walk-sync": "^2.2.0"
+          }
+        },
+        "ember-cli-version-checker": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/ember-cli-version-checker/-/ember-cli-version-checker-5.1.2.tgz",
+          "integrity": "sha512-rk7GY+FmLn/2e22HsZs0Ycrz8HQ1W3Fv+2TFOuEFW9optnDXDgkntPBIl6gact/LHsfBM5RKbM3dHsIIeLgl0Q==",
+          "dev": true,
+          "requires": {
+            "resolve-package-path": "^3.1.0",
+            "semver": "^7.3.4",
+            "silent-error": "^1.1.1"
+          }
+        },
+        "fs-tree-diff": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/fs-tree-diff/-/fs-tree-diff-2.0.1.tgz",
+          "integrity": "sha512-x+CfAZ/lJHQqwlD64pYM5QxWjzWhSjroaVsr8PW831zOApL55qPibed0c+xebaLWVr2BnHFoHdrwOv8pzt8R5A==",
+          "dev": true,
+          "requires": {
+            "@types/symlink-or-copy": "^1.2.0",
+            "heimdalljs-logger": "^0.1.7",
+            "object-assign": "^4.1.0",
+            "path-posix": "^1.0.0",
+            "symlink-or-copy": "^1.1.8"
+          }
+        },
+        "istextorbinary": {
+          "version": "2.6.0",
+          "resolved": "https://registry.npmjs.org/istextorbinary/-/istextorbinary-2.6.0.tgz",
+          "integrity": "sha512-+XRlFseT8B3L9KyjxxLjfXSLMuErKDsd8DBNrsaxoViABMEZlOSCstwmw0qpoFX3+U6yWU1yhLudAe6/lETGGA==",
+          "dev": true,
+          "requires": {
+            "binaryextensions": "^2.1.2",
+            "editions": "^2.2.0",
+            "textextensions": "^2.5.0"
+          }
+        },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        },
+        "resolve-package-path": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/resolve-package-path/-/resolve-package-path-3.1.0.tgz",
+          "integrity": "sha512-2oC2EjWbMJwvSN6Z7DbDfJMnD8MYEouaLn5eIX0j8XwPsYCVIyY9bbnX88YHVkbr8XHqvZrYbxaLPibfTYKZMA==",
+          "dev": true,
+          "requires": {
+            "path-root": "^0.1.1",
+            "resolve": "^1.17.0"
+          }
+        },
+        "rimraf": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
+        "rsvp": {
+          "version": "4.8.5",
+          "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
+          "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
+          "dev": true
+        },
+        "semver": {
+          "version": "7.5.4",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "sync-disk-cache": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/sync-disk-cache/-/sync-disk-cache-2.1.0.tgz",
+          "integrity": "sha512-vngT2JmkSapgq0z7uIoYtB9kWOOzMihAAYq/D3Pjm/ODOGMgS4r++B+OZ09U4hWR6EaOdy9eqQ7/8ygbH3wehA==",
+          "dev": true,
+          "requires": {
+            "debug": "^4.1.1",
+            "heimdalljs": "^0.2.6",
+            "mkdirp": "^0.5.0",
+            "rimraf": "^3.0.0",
+            "username-sync": "^1.0.2"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
+        }
       }
     },
     "ember-cli-sri": {
@@ -62311,7 +62790,7 @@
         "ember-body-class": "^3.0.0",
         "ember-cli-babel": "^7.26.10",
         "ember-cli-htmlbars": "^5.7.2",
-        "ember-cli-showdown": "^6.0.1",
+        "ember-cli-showdown": "^7.0.0",
         "ember-get-config": "^2.1.1",
         "ember-meta": "^2.0.0",
         "ember-scroll": "^1.0.3",
@@ -62426,7 +62905,7 @@
         "ember-auto-import": "^2.4.2",
         "ember-cli-babel": "^7.26.10",
         "ember-cli-htmlbars": "^5.7.2",
-        "ember-cli-showdown": "^6.0.1",
+        "ember-cli-showdown": "^7.0.0",
         "ember-collapsible-panel": "^5.0.0",
         "ember-composable-helpers": "^4.4.1",
         "ember-concurrency": "^2.0.1",
diff --git a/package.json b/package.json
index 7ec5dd1253..db9cae4bee 100644
--- a/package.json
+++ b/package.json
@@ -113,6 +113,9 @@
     "unified": "^9.2.1",
     "walk-sync": "^2.0.2"
   },
+  "overrides": {
+    "ember-cli-showdown": "^7.0.0"
+  },
   "engines": {
     "node": "12.* || 14.* || >= 16"
   },

From 6ad0e9b829dc64bad6253504c8877da494bb529c Mon Sep 17 00:00:00 2001
From: ignace <ignace@otainsight.com>
Date: Thu, 25 Jan 2024 14:24:27 +0100
Subject: [PATCH 36/41] Revert "deps: set override for ember-cli-showdown"

This reverts commit 5ea8d3de19dec65500f40f592dfe71ee61eef032.
---
 package-lock.json | 523 ++--------------------------------------------
 package.json      |   3 -
 2 files changed, 22 insertions(+), 504 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 741058c348..de8037a159 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15579,296 +15579,24 @@
       "dev": true
     },
     "node_modules/ember-cli-showdown": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/ember-cli-showdown/-/ember-cli-showdown-7.0.0.tgz",
-      "integrity": "sha512-xpmqv+pSK1hMG50CD8DqClS0uEyTGF+jE1c/32otiZTslDMcISQC1xysdtdx2RHC+Uu0EpiS+WGp0oDznrH+WA==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ember-cli-showdown/-/ember-cli-showdown-6.0.1.tgz",
+      "integrity": "sha512-yQJf6ffpnn/5fTiDbwL/zvfzIuRepXzUNpaE9qrI+fo3fhn6KlrbDnr+UqkWYR41DqpspVwV4/sodkyENFu9SQ==",
       "dev": true,
       "dependencies": {
-        "ember-auto-import": "^2.6.3",
-        "ember-cli-babel": "^7.26.11",
-        "ember-cli-htmlbars": "^6.2.0",
+        "broccoli-funnel": "^2.0.0",
+        "broccoli-source": "^1.1.0",
+        "broccoli-string-replace": "^0.1.2",
+        "ember-cli-babel": "^7.26.6",
+        "ember-cli-htmlbars": "^5.7.1",
+        "resolve": "^1.8.1",
+        "semver": "^5.5.0",
         "showdown": "^1.8.6"
       },
-      "engines": {
-        "node": "14.* || 16.* || >= 18"
-      },
-      "peerDependencies": {
-        "ember-source": "^3.12.0 || >4.0.0"
-      }
-    },
-    "node_modules/ember-cli-showdown/node_modules/async-disk-cache": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/async-disk-cache/-/async-disk-cache-2.1.0.tgz",
-      "integrity": "sha512-iH+boep2xivfD9wMaZWkywYIURSmsL96d6MoqrC94BnGSvXE4Quf8hnJiHGFYhw/nLeIa1XyRaf4vvcvkwAefg==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.1.1",
-        "heimdalljs": "^0.2.3",
-        "istextorbinary": "^2.5.1",
-        "mkdirp": "^0.5.0",
-        "rimraf": "^3.0.0",
-        "rsvp": "^4.8.5",
-        "username-sync": "^1.0.2"
-      },
-      "engines": {
-        "node": "8.* || >= 10.*"
-      }
-    },
-    "node_modules/ember-cli-showdown/node_modules/broccoli-persistent-filter": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/broccoli-persistent-filter/-/broccoli-persistent-filter-3.1.3.tgz",
-      "integrity": "sha512-Q+8iezprZzL9voaBsDY3rQVl7c7H5h+bvv8SpzCZXPZgfBFCbx7KFQ2c3rZR6lW5k4Kwoqt7jG+rZMUg67Gwxw==",
-      "dev": true,
-      "dependencies": {
-        "async-disk-cache": "^2.0.0",
-        "async-promise-queue": "^1.0.3",
-        "broccoli-plugin": "^4.0.3",
-        "fs-tree-diff": "^2.0.0",
-        "hash-for-dep": "^1.5.0",
-        "heimdalljs": "^0.2.1",
-        "heimdalljs-logger": "^0.1.7",
-        "promise-map-series": "^0.2.1",
-        "rimraf": "^3.0.0",
-        "symlink-or-copy": "^1.0.1",
-        "sync-disk-cache": "^2.0.0"
-      },
-      "engines": {
-        "node": "10.* || >= 12.*"
-      }
-    },
-    "node_modules/ember-cli-showdown/node_modules/broccoli-plugin": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/broccoli-plugin/-/broccoli-plugin-4.0.7.tgz",
-      "integrity": "sha512-a4zUsWtA1uns1K7p9rExYVYG99rdKeGRymW0qOCNkvDPHQxVi3yVyJHhQbM3EZwdt2E0mnhr5e0c/bPpJ7p3Wg==",
-      "dev": true,
-      "dependencies": {
-        "broccoli-node-api": "^1.7.0",
-        "broccoli-output-wrapper": "^3.2.5",
-        "fs-merger": "^3.2.1",
-        "promise-map-series": "^0.3.0",
-        "quick-temp": "^0.1.8",
-        "rimraf": "^3.0.2",
-        "symlink-or-copy": "^1.3.1"
-      },
-      "engines": {
-        "node": "10.* || >= 12.*"
-      }
-    },
-    "node_modules/ember-cli-showdown/node_modules/broccoli-plugin/node_modules/promise-map-series": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/promise-map-series/-/promise-map-series-0.3.0.tgz",
-      "integrity": "sha512-3npG2NGhTc8BWBolLLf8l/92OxMGaRLbqvIh9wjCHhDXNvk4zsxaTaCpiCunW09qWPrN2zeNSNwRLVBrQQtutA==",
-      "dev": true,
-      "engines": {
-        "node": "10.* || >= 12.*"
-      }
-    },
-    "node_modules/ember-cli-showdown/node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/ember-cli-showdown/node_modules/editions": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/editions/-/editions-2.3.1.tgz",
-      "integrity": "sha512-ptGvkwTvGdGfC0hfhKg0MT+TRLRKGtUiWGBInxOm5pz7ssADezahjCUaYuZ8Dr+C05FW0AECIIPt4WBxVINEhA==",
-      "dev": true,
-      "dependencies": {
-        "errlop": "^2.0.0",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=0.8"
-      },
-      "funding": {
-        "url": "https://bevry.me/fund"
-      }
-    },
-    "node_modules/ember-cli-showdown/node_modules/editions/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/ember-cli-showdown/node_modules/ember-cli-htmlbars": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/ember-cli-htmlbars/-/ember-cli-htmlbars-6.3.0.tgz",
-      "integrity": "sha512-N9Y80oZfcfWLsqickMfRd9YByVcTGyhYRnYQ2XVPVrp6jyUyOeRWmEAPh7ERSXpp8Ws4hr/JB9QVQrn/yZa+Ag==",
-      "dev": true,
-      "dependencies": {
-        "@ember/edition-utils": "^1.2.0",
-        "babel-plugin-ember-template-compilation": "^2.0.0",
-        "babel-plugin-htmlbars-inline-precompile": "^5.3.0",
-        "broccoli-debug": "^0.6.5",
-        "broccoli-persistent-filter": "^3.1.2",
-        "broccoli-plugin": "^4.0.3",
-        "ember-cli-version-checker": "^5.1.2",
-        "fs-tree-diff": "^2.0.1",
-        "hash-for-dep": "^1.5.1",
-        "heimdalljs-logger": "^0.1.10",
-        "js-string-escape": "^1.0.1",
-        "semver": "^7.3.4",
-        "silent-error": "^1.1.1",
-        "walk-sync": "^2.2.0"
-      },
       "engines": {
         "node": "12.* || 14.* || >= 16"
       }
     },
-    "node_modules/ember-cli-showdown/node_modules/ember-cli-version-checker": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/ember-cli-version-checker/-/ember-cli-version-checker-5.1.2.tgz",
-      "integrity": "sha512-rk7GY+FmLn/2e22HsZs0Ycrz8HQ1W3Fv+2TFOuEFW9optnDXDgkntPBIl6gact/LHsfBM5RKbM3dHsIIeLgl0Q==",
-      "dev": true,
-      "dependencies": {
-        "resolve-package-path": "^3.1.0",
-        "semver": "^7.3.4",
-        "silent-error": "^1.1.1"
-      },
-      "engines": {
-        "node": "10.* || >= 12.*"
-      }
-    },
-    "node_modules/ember-cli-showdown/node_modules/fs-tree-diff": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fs-tree-diff/-/fs-tree-diff-2.0.1.tgz",
-      "integrity": "sha512-x+CfAZ/lJHQqwlD64pYM5QxWjzWhSjroaVsr8PW831zOApL55qPibed0c+xebaLWVr2BnHFoHdrwOv8pzt8R5A==",
-      "dev": true,
-      "dependencies": {
-        "@types/symlink-or-copy": "^1.2.0",
-        "heimdalljs-logger": "^0.1.7",
-        "object-assign": "^4.1.0",
-        "path-posix": "^1.0.0",
-        "symlink-or-copy": "^1.1.8"
-      },
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
-    },
-    "node_modules/ember-cli-showdown/node_modules/istextorbinary": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/istextorbinary/-/istextorbinary-2.6.0.tgz",
-      "integrity": "sha512-+XRlFseT8B3L9KyjxxLjfXSLMuErKDsd8DBNrsaxoViABMEZlOSCstwmw0qpoFX3+U6yWU1yhLudAe6/lETGGA==",
-      "dev": true,
-      "dependencies": {
-        "binaryextensions": "^2.1.2",
-        "editions": "^2.2.0",
-        "textextensions": "^2.5.0"
-      },
-      "engines": {
-        "node": ">=0.12"
-      },
-      "funding": {
-        "url": "https://bevry.me/fund"
-      }
-    },
-    "node_modules/ember-cli-showdown/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/ember-cli-showdown/node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/ember-cli-showdown/node_modules/resolve-package-path": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/resolve-package-path/-/resolve-package-path-3.1.0.tgz",
-      "integrity": "sha512-2oC2EjWbMJwvSN6Z7DbDfJMnD8MYEouaLn5eIX0j8XwPsYCVIyY9bbnX88YHVkbr8XHqvZrYbxaLPibfTYKZMA==",
-      "dev": true,
-      "dependencies": {
-        "path-root": "^0.1.1",
-        "resolve": "^1.17.0"
-      },
-      "engines": {
-        "node": "10.* || >= 12"
-      }
-    },
-    "node_modules/ember-cli-showdown/node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/ember-cli-showdown/node_modules/rsvp": {
-      "version": "4.8.5",
-      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
-      "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
-      "dev": true,
-      "engines": {
-        "node": "6.* || >= 7.*"
-      }
-    },
-    "node_modules/ember-cli-showdown/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/ember-cli-showdown/node_modules/sync-disk-cache": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/sync-disk-cache/-/sync-disk-cache-2.1.0.tgz",
-      "integrity": "sha512-vngT2JmkSapgq0z7uIoYtB9kWOOzMihAAYq/D3Pjm/ODOGMgS4r++B+OZ09U4hWR6EaOdy9eqQ7/8ygbH3wehA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.1.1",
-        "heimdalljs": "^0.2.6",
-        "mkdirp": "^0.5.0",
-        "rimraf": "^3.0.0",
-        "username-sync": "^1.0.2"
-      },
-      "engines": {
-        "node": "8.* || >= 10.*"
-      }
-    },
-    "node_modules/ember-cli-showdown/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
     "node_modules/ember-cli-sri": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ember-cli-sri/-/ember-cli-sri-2.1.1.tgz",
@@ -53762,226 +53490,19 @@
       }
     },
     "ember-cli-showdown": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/ember-cli-showdown/-/ember-cli-showdown-7.0.0.tgz",
-      "integrity": "sha512-xpmqv+pSK1hMG50CD8DqClS0uEyTGF+jE1c/32otiZTslDMcISQC1xysdtdx2RHC+Uu0EpiS+WGp0oDznrH+WA==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ember-cli-showdown/-/ember-cli-showdown-6.0.1.tgz",
+      "integrity": "sha512-yQJf6ffpnn/5fTiDbwL/zvfzIuRepXzUNpaE9qrI+fo3fhn6KlrbDnr+UqkWYR41DqpspVwV4/sodkyENFu9SQ==",
       "dev": true,
       "requires": {
-        "ember-auto-import": "^2.6.3",
-        "ember-cli-babel": "^7.26.11",
-        "ember-cli-htmlbars": "^6.2.0",
+        "broccoli-funnel": "^2.0.0",
+        "broccoli-source": "^1.1.0",
+        "broccoli-string-replace": "^0.1.2",
+        "ember-cli-babel": "^7.26.6",
+        "ember-cli-htmlbars": "^5.7.1",
+        "resolve": "^1.8.1",
+        "semver": "^5.5.0",
         "showdown": "^1.8.6"
-      },
-      "dependencies": {
-        "async-disk-cache": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/async-disk-cache/-/async-disk-cache-2.1.0.tgz",
-          "integrity": "sha512-iH+boep2xivfD9wMaZWkywYIURSmsL96d6MoqrC94BnGSvXE4Quf8hnJiHGFYhw/nLeIa1XyRaf4vvcvkwAefg==",
-          "dev": true,
-          "requires": {
-            "debug": "^4.1.1",
-            "heimdalljs": "^0.2.3",
-            "istextorbinary": "^2.5.1",
-            "mkdirp": "^0.5.0",
-            "rimraf": "^3.0.0",
-            "rsvp": "^4.8.5",
-            "username-sync": "^1.0.2"
-          }
-        },
-        "broccoli-persistent-filter": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/broccoli-persistent-filter/-/broccoli-persistent-filter-3.1.3.tgz",
-          "integrity": "sha512-Q+8iezprZzL9voaBsDY3rQVl7c7H5h+bvv8SpzCZXPZgfBFCbx7KFQ2c3rZR6lW5k4Kwoqt7jG+rZMUg67Gwxw==",
-          "dev": true,
-          "requires": {
-            "async-disk-cache": "^2.0.0",
-            "async-promise-queue": "^1.0.3",
-            "broccoli-plugin": "^4.0.3",
-            "fs-tree-diff": "^2.0.0",
-            "hash-for-dep": "^1.5.0",
-            "heimdalljs": "^0.2.1",
-            "heimdalljs-logger": "^0.1.7",
-            "promise-map-series": "^0.2.1",
-            "rimraf": "^3.0.0",
-            "symlink-or-copy": "^1.0.1",
-            "sync-disk-cache": "^2.0.0"
-          }
-        },
-        "broccoli-plugin": {
-          "version": "4.0.7",
-          "resolved": "https://registry.npmjs.org/broccoli-plugin/-/broccoli-plugin-4.0.7.tgz",
-          "integrity": "sha512-a4zUsWtA1uns1K7p9rExYVYG99rdKeGRymW0qOCNkvDPHQxVi3yVyJHhQbM3EZwdt2E0mnhr5e0c/bPpJ7p3Wg==",
-          "dev": true,
-          "requires": {
-            "broccoli-node-api": "^1.7.0",
-            "broccoli-output-wrapper": "^3.2.5",
-            "fs-merger": "^3.2.1",
-            "promise-map-series": "^0.3.0",
-            "quick-temp": "^0.1.8",
-            "rimraf": "^3.0.2",
-            "symlink-or-copy": "^1.3.1"
-          },
-          "dependencies": {
-            "promise-map-series": {
-              "version": "0.3.0",
-              "resolved": "https://registry.npmjs.org/promise-map-series/-/promise-map-series-0.3.0.tgz",
-              "integrity": "sha512-3npG2NGhTc8BWBolLLf8l/92OxMGaRLbqvIh9wjCHhDXNvk4zsxaTaCpiCunW09qWPrN2zeNSNwRLVBrQQtutA==",
-              "dev": true
-            }
-          }
-        },
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "editions": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/editions/-/editions-2.3.1.tgz",
-          "integrity": "sha512-ptGvkwTvGdGfC0hfhKg0MT+TRLRKGtUiWGBInxOm5pz7ssADezahjCUaYuZ8Dr+C05FW0AECIIPt4WBxVINEhA==",
-          "dev": true,
-          "requires": {
-            "errlop": "^2.0.0",
-            "semver": "^6.3.0"
-          },
-          "dependencies": {
-            "semver": {
-              "version": "6.3.1",
-              "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-              "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-              "dev": true
-            }
-          }
-        },
-        "ember-cli-htmlbars": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/ember-cli-htmlbars/-/ember-cli-htmlbars-6.3.0.tgz",
-          "integrity": "sha512-N9Y80oZfcfWLsqickMfRd9YByVcTGyhYRnYQ2XVPVrp6jyUyOeRWmEAPh7ERSXpp8Ws4hr/JB9QVQrn/yZa+Ag==",
-          "dev": true,
-          "requires": {
-            "@ember/edition-utils": "^1.2.0",
-            "babel-plugin-ember-template-compilation": "^2.0.0",
-            "babel-plugin-htmlbars-inline-precompile": "^5.3.0",
-            "broccoli-debug": "^0.6.5",
-            "broccoli-persistent-filter": "^3.1.2",
-            "broccoli-plugin": "^4.0.3",
-            "ember-cli-version-checker": "^5.1.2",
-            "fs-tree-diff": "^2.0.1",
-            "hash-for-dep": "^1.5.1",
-            "heimdalljs-logger": "^0.1.10",
-            "js-string-escape": "^1.0.1",
-            "semver": "^7.3.4",
-            "silent-error": "^1.1.1",
-            "walk-sync": "^2.2.0"
-          }
-        },
-        "ember-cli-version-checker": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/ember-cli-version-checker/-/ember-cli-version-checker-5.1.2.tgz",
-          "integrity": "sha512-rk7GY+FmLn/2e22HsZs0Ycrz8HQ1W3Fv+2TFOuEFW9optnDXDgkntPBIl6gact/LHsfBM5RKbM3dHsIIeLgl0Q==",
-          "dev": true,
-          "requires": {
-            "resolve-package-path": "^3.1.0",
-            "semver": "^7.3.4",
-            "silent-error": "^1.1.1"
-          }
-        },
-        "fs-tree-diff": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/fs-tree-diff/-/fs-tree-diff-2.0.1.tgz",
-          "integrity": "sha512-x+CfAZ/lJHQqwlD64pYM5QxWjzWhSjroaVsr8PW831zOApL55qPibed0c+xebaLWVr2BnHFoHdrwOv8pzt8R5A==",
-          "dev": true,
-          "requires": {
-            "@types/symlink-or-copy": "^1.2.0",
-            "heimdalljs-logger": "^0.1.7",
-            "object-assign": "^4.1.0",
-            "path-posix": "^1.0.0",
-            "symlink-or-copy": "^1.1.8"
-          }
-        },
-        "istextorbinary": {
-          "version": "2.6.0",
-          "resolved": "https://registry.npmjs.org/istextorbinary/-/istextorbinary-2.6.0.tgz",
-          "integrity": "sha512-+XRlFseT8B3L9KyjxxLjfXSLMuErKDsd8DBNrsaxoViABMEZlOSCstwmw0qpoFX3+U6yWU1yhLudAe6/lETGGA==",
-          "dev": true,
-          "requires": {
-            "binaryextensions": "^2.1.2",
-            "editions": "^2.2.0",
-            "textextensions": "^2.5.0"
-          }
-        },
-        "lru-cache": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-          "dev": true,
-          "requires": {
-            "yallist": "^4.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "resolve-package-path": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/resolve-package-path/-/resolve-package-path-3.1.0.tgz",
-          "integrity": "sha512-2oC2EjWbMJwvSN6Z7DbDfJMnD8MYEouaLn5eIX0j8XwPsYCVIyY9bbnX88YHVkbr8XHqvZrYbxaLPibfTYKZMA==",
-          "dev": true,
-          "requires": {
-            "path-root": "^0.1.1",
-            "resolve": "^1.17.0"
-          }
-        },
-        "rimraf": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
-        "rsvp": {
-          "version": "4.8.5",
-          "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
-          "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
-          "dev": true
-        },
-        "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "sync-disk-cache": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/sync-disk-cache/-/sync-disk-cache-2.1.0.tgz",
-          "integrity": "sha512-vngT2JmkSapgq0z7uIoYtB9kWOOzMihAAYq/D3Pjm/ODOGMgS4r++B+OZ09U4hWR6EaOdy9eqQ7/8ygbH3wehA==",
-          "dev": true,
-          "requires": {
-            "debug": "^4.1.1",
-            "heimdalljs": "^0.2.6",
-            "mkdirp": "^0.5.0",
-            "rimraf": "^3.0.0",
-            "username-sync": "^1.0.2"
-          }
-        },
-        "yallist": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-          "dev": true
-        }
       }
     },
     "ember-cli-sri": {
@@ -62790,7 +62311,7 @@
         "ember-body-class": "^3.0.0",
         "ember-cli-babel": "^7.26.10",
         "ember-cli-htmlbars": "^5.7.2",
-        "ember-cli-showdown": "^7.0.0",
+        "ember-cli-showdown": "^6.0.1",
         "ember-get-config": "^2.1.1",
         "ember-meta": "^2.0.0",
         "ember-scroll": "^1.0.3",
@@ -62905,7 +62426,7 @@
         "ember-auto-import": "^2.4.2",
         "ember-cli-babel": "^7.26.10",
         "ember-cli-htmlbars": "^5.7.2",
-        "ember-cli-showdown": "^7.0.0",
+        "ember-cli-showdown": "^6.0.1",
         "ember-collapsible-panel": "^5.0.0",
         "ember-composable-helpers": "^4.4.1",
         "ember-concurrency": "^2.0.1",
diff --git a/package.json b/package.json
index db9cae4bee..7ec5dd1253 100644
--- a/package.json
+++ b/package.json
@@ -113,9 +113,6 @@
     "unified": "^9.2.1",
     "walk-sync": "^2.0.2"
   },
-  "overrides": {
-    "ember-cli-showdown": "^7.0.0"
-  },
   "engines": {
     "node": "12.* || 14.* || >= 16"
   },

From 3a96d537b4c5bcf2a2653512cc73cd4f98689b3e Mon Sep 17 00:00:00 2001
From: ignace <ignace@mylighthouse.com>
Date: Wed, 7 Feb 2024 10:11:38 +0100
Subject: [PATCH 37/41] chore: point to vsc repo for textmate grammars

---
 guides/release/components/template-tag-format.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index 8c6fa65ab9..5c45a9f09e 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -319,6 +319,6 @@ Here's an [example Neovim Config](https://github.com/NullVoxPopuli/dotfiles/blob
 
 For other editors, you may be able to get support using one of these other syntax definitions:
 
-- [TextMate](https://github.com/IgnaceMaes/glimmer-textmate-grammar)
+- [TextMate](https://github.com/lifeart/vsc-ember-syntax/tree/master/syntaxes)
 - [TreeSitter](https://github.com/alexlafroscia/tree-sitter-glimmer)
 

From ceaa2e0373612d9c0b8bf16f8d890c057fe24a22 Mon Sep 17 00:00:00 2001
From: ignace <ignace@mylighthouse.com>
Date: Wed, 7 Feb 2024 10:29:06 +0100
Subject: [PATCH 38/41] docs: add keywords section

---
 guides/release/components/template-tag-format.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index 5c45a9f09e..c419992eac 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -187,6 +187,14 @@ import { LinkTo } from '@ember/routing';
 import { Textarea } from '@ember/component';
 ```
 
+#### Keywords
+
+While most items should be imported into scope explicitly, some of the existing constructs in the language are unimportable and are available as keywords instead:
+
+`action`, `debugger`, `each-in`, `each`, `has-block-params`, `has-block`, `hasBlock`, `if`, `in-element`, `let`, `link-to`  (non-block form curly invocations), `loc`, `log`, `mount`, `mut`, `outlet`, `query-params`, `readonly`, `unbound`, `unless`, `with`, and `yield`
+
+These keywords do not have to be imported into scope and will always be ambiently available.
+
 <div class="cta">
   <div class="cta-note">
     <div class="cta-note-body">

From 7334378cb2d4e6b4f2580cfd1f39ec46aaf10635 Mon Sep 17 00:00:00 2001
From: Chris Manson <chris@manson.ie>
Date: Wed, 7 Feb 2024 10:25:51 +0000
Subject: [PATCH 39/41] Fix linting

---
 .local.dic                                       | 4 ++++
 guides/release/components/template-tag-format.md | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.local.dic b/.local.dic
index f34eb99b94..0b1e2f0dd4 100644
--- a/.local.dic
+++ b/.local.dic
@@ -109,6 +109,7 @@ instantiation
 Intellisense
 IntelliSense
 interop
+integrations
 interoperable
 invokable
 invokables
@@ -137,6 +138,7 @@ nav
 nav-bar
 Neovim
 NVDA
+nvim-treesitter
 onboarding
 Orca
 page-crafter
@@ -207,6 +209,7 @@ TalkBack
 teardown
 template-lifecycle-dom-and-modifiers
 templating
+TextMate
 todo
 todos
 tooltip
@@ -237,6 +240,7 @@ VM
 VoiceOver
 voilà
 Voilà
+vscode-glimmer-syntax
 websocket
 working-with-html-css-and-javascript
 yay
diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index c419992eac..4969f84566 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -62,7 +62,7 @@ export default class Avatar extends Component {
 
 ## Importing components, helpers, and modifiers
 
-In Ember templates, **“invokables”** are things you can _invoke_ in a template. These include [components][], [helpers][], and [modifiers][]. In the template tag format, these invokables need to be imported before they can be used. This makes it easier to understand where values come from and what they do, as well as unlocks build optimizations.
+In Ember templates, **“invokables”** are things you can *invoke* in a template. These include [components][], [helpers][], and [modifiers][]. In the template tag format, these invokables need to be imported before they can be used. This makes it easier to understand where values come from and what they do, as well as unlocks build optimizations.
 
 [components]: ../../../components/introducing-components/
 [helpers]: ../../../components/helper-functions/
@@ -189,11 +189,11 @@ import { Textarea } from '@ember/component';
 
 #### Keywords
 
-While most items should be imported into scope explicitly, some of the existing constructs in the language are unimportable and are available as keywords instead:
+While most items should be imported into scope explicitly, some of the existing constructs in the language are not importable and are available as keywords instead:
 
 `action`, `debugger`, `each-in`, `each`, `has-block-params`, `has-block`, `hasBlock`, `if`, `in-element`, `let`, `link-to`  (non-block form curly invocations), `loc`, `log`, `mount`, `mut`, `outlet`, `query-params`, `readonly`, `unbound`, `unless`, `with`, and `yield`
 
-These keywords do not have to be imported into scope and will always be ambiently available.
+These keywords do not have to be imported into scope and will always be available.
 
 <div class="cta">
   <div class="cta-note">

From a406109542df9ce701a0cbb5203136f51b30a3fe Mon Sep 17 00:00:00 2001
From: Chris Manson <chris@manson.ie>
Date: Wed, 7 Feb 2024 10:34:15 +0000
Subject: [PATCH 40/41] fix test

---
 tests/acceptance/side-bar-links-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/acceptance/side-bar-links-test.js b/tests/acceptance/side-bar-links-test.js
index aeed616a12..9184ef730c 100644
--- a/tests/acceptance/side-bar-links-test.js
+++ b/tests/acceptance/side-bar-links-test.js
@@ -24,7 +24,7 @@ module('Acceptance | side bar links', function (hooks) {
   setupApplicationTest(hooks);
 
   test('release links go to correct page', async function (assert) {
-    assert.expect(130);
+    assert.expect(131);
     await visit('/release');
 
     let store = this.owner.lookup('service:store');

From 41bd12b2791e51c0e4f09979a2c0cf4f31f91049 Mon Sep 17 00:00:00 2001
From: Chris Manson <chris@manson.ie>
Date: Wed, 7 Feb 2024 10:37:18 +0000
Subject: [PATCH 41/41] fix node tests

---
 guides/release/components/template-tag-format.md | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/guides/release/components/template-tag-format.md b/guides/release/components/template-tag-format.md
index 4969f84566..0336b69a06 100644
--- a/guides/release/components/template-tag-format.md
+++ b/guides/release/components/template-tag-format.md
@@ -12,7 +12,7 @@ Just like with separate JavaScript and Glimmer template files, the template tag
 
 ### Template-only components
 
-The following template-only component was created in a [previous section](../component-arguments-and-html-attributes) to extract an avatar layout into a reusable component.
+The following template-only component was created in a [previous section](../component-arguments-and-html-attributes/) to extract an avatar layout into a reusable component.
 
 ```handlebars {data-filename="app/components/avatar.hbs"}
 <aside>
@@ -62,11 +62,8 @@ export default class Avatar extends Component {
 
 ## Importing components, helpers, and modifiers
 
-In Ember templates, **“invokables”** are things you can *invoke* in a template. These include [components][], [helpers][], and [modifiers][]. In the template tag format, these invokables need to be imported before they can be used. This makes it easier to understand where values come from and what they do, as well as unlocks build optimizations.
+In Ember templates, **“invokables”** are things you can *invoke* in a template. These include [components](./introducing-components/), [helpers](./helper-functions/), and [modifiers](./template-lifecycle-dom-and-modifiers/). In the template tag format, these invokables need to be imported before they can be used. This makes it easier to understand where values come from and what they do, as well as unlocks build optimizations.
 
-[components]: ../../../components/introducing-components/
-[helpers]: ../../../components/helper-functions/
-[modifiers]: ../../../components/template-lifecycle-dom-and-modifiers/
 
 ### Importing invokables from your own app