Merge branch 'main' into feat-radio-helper-text

addons/api/package.json

@@ -73,7 +73,7 @@
     "qunit-dom": "^2.0.0"
   },
   "engines": {
-    "node": ">=12 <=17"
+    "node": "12.* || 14.* || 16.*"
   },
   "ember": {
     "edition": "octane"

addons/auth/package.json

@@ -66,7 +66,7 @@
     "qunit-dom": "^2.0.0"
   },
   "engines": {
-    "node": ">=12 <=17"
+    "node": "12.* || 14.* || 16.*"
   },
   "ember": {
     "edition": "octane"

addons/core/package.json

@@ -81,7 +81,7 @@
     "qunit-dom": "^2.0.0"
   },
   "engines": {
-    "node": ">=12 <=17"
+    "node": "12.* || 14.* || 16.*"
   },
   "ember": {
     "edition": "octane"

addons/rose/package.json

@@ -97,7 +97,7 @@
     "webpack": "^5.59.1"
   },
   "engines": {
-    "node": ">=12 <=17"
+    "node": "12.* || 14.* || 16.*"
   },
   "ember": {
     "edition": "octane"

package.json

@@ -92,6 +92,6 @@
     }
   },
   "engines": {
-    "node": ">=12 <=17"
+    "node": "12.* || 14.* || 16.*"
   }
 }

ui/admin/app/controllers/scopes/scope/targets/target/add-credential-sources.js

@@ -0,0 +1,18 @@
+import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
+
+export default class ScopesScopeTargetsTargetAddCredentialSourcesController extends Controller {
+  // =services
+
+  @service intl;
+
+  // =attributes
+
+  /**
+   * Translated roles breadcrumb
+   * @type {string}
+   */
+  get breadCrumb() {
+    return this.intl.t('resources.target.actions.add-credential-sources');
+  }
+}

ui/admin/app/routes/scopes/scope/targets/target.js

@@ -12,28 +12,4 @@ export default class ScopesScopeTargetsTargetRoute extends Route {
   async model({ target_id }) {
     return this.store.findRecord('target', target_id, { reload: true });
   }
-
-  /**
-   * Renders the target-specific templates for header, navigation,
-   * and actions page sections.
-   * @override
-   */
-  renderTemplate() {
-    super.renderTemplate(...arguments);
-
-    this.render('scopes/scope/targets/target/-header', {
-      into: 'scopes/scope/targets/target',
-      outlet: 'header',
-    });
-
-    this.render('scopes/scope/targets/target/-navigation', {
-      into: 'scopes/scope/targets/target',
-      outlet: 'navigation',
-    });
-
-    this.render('scopes/scope/targets/target/-actions', {
-      into: 'scopes/scope/targets/target',
-      outlet: 'actions',
-    });
-  }
 }

ui/admin/app/routes/scopes/scope/targets/target/add-credential-sources.js

@@ -43,29 +43,6 @@ export default class ScopesScopeTargetsTargetAddCredentialSourcesRoute extends R
     };
   }
 
-  /**
-   * Renders credential libraries specific header template.
-   * @override
-   */
-  renderTemplate() {
-    super.renderTemplate(...arguments);
-
-    this.render('scopes/scope/targets/target/add-credential-sources/-header', {
-      into: 'scopes/scope/targets/target',
-      outlet: 'header',
-    });
-
-    this.render('-empty', {
-      into: 'scopes/scope/targets/target',
-      outlet: 'navigation',
-    });
-
-    this.render('-empty', {
-      into: 'scopes/scope/targets/target',
-      outlet: 'actions',
-    });
-  }
-
   // =actions
 
   /**

ui/admin/app/routes/scopes/scope/targets/target/add-host-sources.js

@@ -42,29 +42,6 @@ export default class ScopesScopeTargetsTargetAddHostSourcesRoute extends Route {
     };
   }
 
-  /**
-   * Renders the add-host-sources-specific header template.
-   * @override
-   */
-  renderTemplate() {
-    super.renderTemplate(...arguments);
-
-    this.render('scopes/scope/targets/target/add-host-sources/-header', {
-      into: 'scopes/scope/targets/target',
-      outlet: 'header',
-    });
-
-    this.render('-empty', {
-      into: 'scopes/scope/targets/target',
-      outlet: 'navigation',
-    });
-
-    this.render('-empty', {
-      into: 'scopes/scope/targets/target',
-      outlet: 'actions',
-    });
-  }
-
   // =actions
 
   @action

ui/admin/app/styles/app.scss

@@ -150,6 +150,7 @@
         0% {
           background-position: -100% 0;
         }
+
         100% {
           background-position: -200% 0;
         }
@@ -197,6 +198,7 @@
       0% {
         background-color: var(--action-subtler-1);
       }
+
       100% {
         background-color: transparent;
       }

ui/admin/app/templates/scopes/scope/targets/target.hbs

@@ -1,25 +1,3 @@
 {{page-title @model.displayName}}
 
-<Rose::Layout::Page as |page|>
-
-  <page.breadcrumbs>
-    <BreadCrumbs />
-  </page.breadcrumbs>
-
-  <page.header>
-    {{outlet 'header'}}
-  </page.header>
-
-  <page.navigation>
-    {{outlet 'navigation'}}
-  </page.navigation>
-
-  <page.actions>
-    {{outlet 'actions'}}
-  </page.actions>
-
-  <page.body>
-    {{outlet}}
-  </page.body>
-
-</Rose::Layout::Page>
+{{outlet}}

ui/admin/app/templates/scopes/scope/targets/target/add-credential-sources.hbs

@@ -1,27 +1,44 @@
 {{page-title (t 'resources.target.actions.add-credential-sources')}}
 
-{{#if @model.credentialLibraries}}
-  <Form::Target::AddCredentialLibraries
-    @model={{@model.target}}
-    @credentialLibraries={{@model.credentialLibraries}}
-    @submit={{route-action 'save' @model.target}}
-    @cancel={{route-action 'cancel'}}
-  />
-{{/if}}
+<Rose::Layout::Page as |page|>
 
-{{#unless @model.credentialLibraries}}
-  <Rose::Layout::Centered>
-    <Rose::Message
-      @title={{t 'resources.target.credential-source.messages.none.title'}}
-      as |message|
-    >
-      <message.description>
-        {{t 'resources.target.credential-source.messages.none.description'}}
-      </message.description>
-      <message.link @route='scopes.scope.targets.target.credential-sources'>
-        <Rose::Icon @name='flight-icons/svg/chevron-left-16' />
-        {{t 'actions.back'}}
-      </message.link>
-    </Rose::Message>
-  </Rose::Layout::Centered>
-{{/unless}}
+  <page.breadcrumbs>
+    <BreadCrumbs />
+  </page.breadcrumbs>
+
+  <page.header>
+    <h2>
+      {{t 'resources.target.credential-source.messages.add.title'}}
+    </h2>
+    <p>{{t 'resources.target.credential-source.messages.add.description'}}</p>
+  </page.header>
+
+  <page.body>
+    {{#if @model.credentialLibraries}}
+      <Form::Target::AddCredentialLibraries
+        @model={{@model.target}}
+        @credentialLibraries={{@model.credentialLibraries}}
+        @submit={{route-action 'save' @model.target}}
+        @cancel={{route-action 'cancel'}}
+      />
+    {{/if}}
+
+    {{#unless @model.credentialLibraries}}
+      <Rose::Layout::Centered>
+        <Rose::Message
+          @title={{t 'resources.target.credential-source.messages.none.title'}}
+          as |message|
+        >
+          <message.description>
+            {{t 'resources.target.credential-source.messages.none.description'}}
+          </message.description>
+          <message.link @route='scopes.scope.targets.target.credential-sources'>
+            <Rose::Icon @name='flight-icons/svg/chevron-left-16' />
+            {{t 'actions.back'}}
+          </message.link>
+        </Rose::Message>
+      </Rose::Layout::Centered>
+    {{/unless}}
+  </page.body>
+
+</Rose::Layout::Page>

ui/admin/app/templates/scopes/scope/targets/target/add-credential-sources/-header.hbs

@@ -1,4 +0,0 @@
-<h2>
-  {{t 'resources.target.credential-source.messages.add.title'}}
-</h2>
-<p>{{t 'resources.target.credential-source.messages.add.description'}}</p>

ui/admin/app/templates/scopes/scope/targets/target/add-host-sources.hbs

@@ -1,28 +1,46 @@
 {{page-title (t 'resources.target.actions.add-host-sources')}}
 
-{{#if @model.hostSets}}
-  <Form::Target::AddHostSets
-    @model={{@model.target}}
-    @hostCatalogs={{@model.hostCatalogs}}
-    @hostSets={{@model.hostSets}}
-    @submit={{route-action 'save' @model.target}}
-    @cancel={{route-action 'cancel'}}
-  />
-{{/if}}
+<Rose::Layout::Page as |page|>
 
-{{#unless @model.hostSets}}
-  <Rose::Layout::Centered>
-    <Rose::Message
-      @title={{t 'resources.target.host-source.messages.none.title'}}
-      as |message|
-    >
-      <message.description>
-        {{t 'resources.target.host-source.messages.none.description'}}
-      </message.description>
-      <message.link @route='scopes.scope.targets.target.host-sources'>
-        <Rose::Icon @name='flight-icons/svg/chevron-left-16' />
-        {{t 'actions.back'}}
-      </message.link>
-    </Rose::Message>
-  </Rose::Layout::Centered>
-{{/unless}}
+  <page.breadcrumbs>
+    <BreadCrumbs />
+  </page.breadcrumbs>
+
+  <page.header>
+    <h2>
+      {{t 'resources.target.host-source.messages.add.title'}}
+      <DocLink @doc='target.add-host-sources' @iconSize='large' />
+    </h2>
+    <p>{{t 'resources.target.host-source.messages.add.description'}}</p>
+  </page.header>
+
+  <page.body>
+    {{#if @model.hostSets}}
+      <Form::Target::AddHostSets
+        @model={{@model.target}}
+        @hostCatalogs={{@model.hostCatalogs}}
+        @hostSets={{@model.hostSets}}
+        @submit={{route-action 'save' @model.target}}
+        @cancel={{route-action 'cancel'}}
+      />
+    {{/if}}
+
+    {{#unless @model.hostSets}}
+      <Rose::Layout::Centered>
+        <Rose::Message
+          @title={{t 'resources.target.host-source.messages.none.title'}}
+          as |message|
+        >
+          <message.description>
+            {{t 'resources.target.host-source.messages.none.description'}}
+          </message.description>
+          <message.link @route='scopes.scope.targets.target.host-sources'>
+            <Rose::Icon @name='flight-icons/svg/chevron-left-16' />
+            {{t 'actions.back'}}
+          </message.link>
+        </Rose::Message>
+      </Rose::Layout::Centered>
+    {{/unless}}
+  </page.body>
+
+</Rose::Layout::Page>

ui/admin/app/templates/scopes/scope/targets/target/add-host-sources/-header.hbs

@@ -1,5 +0,0 @@
-<h2>
-  {{t 'resources.target.host-source.messages.add.title'}}
-  <DocLink @doc='target.add-host-sources' @iconSize='large' />
-</h2>
-<p>{{t 'resources.target.host-source.messages.add.description'}}</p>

ui/admin/app/templates/scopes/scope/targets/target/credential-sources.hbs

@@ -1,91 +1,120 @@
 {{page-title (t 'resources.target.credential-source.title_plural')}}
 
-{{#if @model.credentialLibraries}}
+<Rose::Layout::Page as |page|>
 
-  <Rose::Table as |table|>
-    <table.header as |header|>
-      <header.row as |row|>
-        <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
-        <row.headerCell>{{t 'form.type.label'}}</row.headerCell>
-        <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
-        <row.headerCell>{{t 'titles.actions'}}</row.headerCell>
-      </header.row>
-    </table.header>
-    <table.body as |body|>
-      {{#each @model.credentialLibraries as |credentialLibrary|}}
-        <body.row as |row|>
-          <row.headerCell>
-            <LinkTo
-              @route='scopes.scope.credential-stores.credential-store.credential-libraries.credential-library'
-              @models={{array
-                credentialLibrary.credential_store_id
-                credentialLibrary.id
-              }}
-            >
-              {{credentialLibrary.displayName}}
-            </LinkTo>
-            <p>{{credentialLibrary.description}}</p>
-          </row.headerCell>
-          <row.cell>
-            <Rose::Badge>{{t
-                (concat
-                  'resources.credential-library.types.' credentialLibrary.type
-                )
-              }}</Rose::Badge>
-          </row.cell>
-          <row.cell>
-            <Copyable
-              @text={{credentialLibrary.id}}
-              @buttonText={{t 'actions.copy-to-clipboard'}}
-              @acknowledgeText={{t 'states.copied'}}
-            >
-              <code>{{credentialLibrary.id}}</code>
-            </Copyable>
-          </row.cell>
-          <row.cell>
-            {{#if (can 'removeCredentialSources target' @model)}}
-              <Rose::Dropdown
-                @icon='flight-icons/svg/more-horizontal-16'
-                @iconOnly={{true}}
-                @showCaret={{false}}
-                @dropdownRight={{true}}
-                @text={{t 'actions.manage'}}
-                as |dropdown|
-              >
-                <dropdown.button
-                  @style='danger'
-                  {{on
-                    'click'
-                    (route-action
-                      'removeCredentialSource' @model credentialLibrary
-                    )
+  <page.breadcrumbs>
+    <BreadCrumbs />
+  </page.breadcrumbs>
+
+  <page.header>
+    <Targets::Target::Header @model={{@model}} />
+  </page.header>
+
+  <page.navigation>
+    <Targets::Target::Nav @model={{@model}} />
+  </page.navigation>
+
+  <page.actions>
+    <Targets::Target::Actions @model={{@model}} />
+  </page.actions>
+
+  <page.body>
+    {{#if @model.credentialLibraries}}
+
+      <Rose::Table as |table|>
+        <table.header as |header|>
+          <header.row as |row|>
+            <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
+            <row.headerCell>{{t 'form.type.label'}}</row.headerCell>
+            <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
+            <row.headerCell>{{t 'titles.actions'}}</row.headerCell>
+          </header.row>
+        </table.header>
+        <table.body as |body|>
+          {{#each @model.credentialLibraries as |credentialLibrary|}}
+            <body.row as |row|>
+              <row.headerCell>
+                <LinkTo
+                  @route='scopes.scope.credential-stores.credential-store.credential-libraries.credential-library'
+                  @models={{array
+                    credentialLibrary.credential_store_id
+                    credentialLibrary.id
                   }}
                 >
-                  {{t 'actions.remove'}}
-                </dropdown.button>
-              </Rose::Dropdown>
-            {{/if}}
-          </row.cell>
-        </body.row>
-      {{/each}}
-    </table.body>
-  </Rose::Table>
+                  {{credentialLibrary.displayName}}
+                </LinkTo>
+                <p>{{credentialLibrary.description}}</p>
+              </row.headerCell>
+              <row.cell>
+                <Rose::Badge>{{t
+                    (concat
+                      'resources.credential-library.types.'
+                      credentialLibrary.type
+                    )
+                  }}</Rose::Badge>
+              </row.cell>
+              <row.cell>
+                <Copyable
+                  @text={{credentialLibrary.id}}
+                  @buttonText={{t 'actions.copy-to-clipboard'}}
+                  @acknowledgeText={{t 'states.copied'}}
+                >
+                  <code>{{credentialLibrary.id}}</code>
+                </Copyable>
+              </row.cell>
+              <row.cell>
+                {{#if (can 'removeCredentialSources target' @model)}}
+                  <Rose::Dropdown
+                    @icon='flight-icons/svg/more-horizontal-16'
+                    @iconOnly={{true}}
+                    @showCaret={{false}}
+                    @dropdownRight={{true}}
+                    @text={{t 'actions.manage'}}
+                    as |dropdown|
+                  >
+                    <dropdown.button
+                      @style='danger'
+                      {{on
+                        'click'
+                        (route-action
+                          'removeCredentialSource' @model credentialLibrary
+                        )
+                      }}
+                    >
+                      {{t 'actions.remove'}}
+                    </dropdown.button>
+                  </Rose::Dropdown>
+                {{/if}}
+              </row.cell>
+            </body.row>
+          {{/each}}
+        </table.body>
+      </Rose::Table>
 
-{{else}}
+    {{else}}
 
-  <Rose::Layout::Centered>
-    <Rose::Message
-      @title={{t 'resources.target.credential-source.messages.welcome.title'}}
-      as |message|
-    >
-      <message.description>
-        {{t 'resources.target.credential-source.messages.welcome.description'}}
-      </message.description>
-      <message.link @route='scopes.scope.targets.target.add-credential-sources'>
-        <Rose::Icon @name='flight-icons/svg/plus-circle-16' />
-        {{t 'resources.target.actions.add-credential-sources'}}
-      </message.link>
-    </Rose::Message>
-  </Rose::Layout::Centered>
+      <Rose::Layout::Centered>
+        <Rose::Message
+          @title={{t
+            'resources.target.credential-source.messages.welcome.title'
+          }}
+          as |message|
+        >
+          <message.description>
+            {{t
+              'resources.target.credential-source.messages.welcome.description'
+            }}
+          </message.description>
+          <message.link
+            @route='scopes.scope.targets.target.add-credential-sources'
+          >
+            <Rose::Icon @name='flight-icons/svg/plus-circle-16' />
+            {{t 'resources.target.actions.add-credential-sources'}}
+          </message.link>
+        </Rose::Message>
+      </Rose::Layout::Centered>
 
-{{/if}}
+    {{/if}}
+  </page.body>
+
+</Rose::Layout::Page>

ui/admin/app/templates/scopes/scope/targets/target/host-sources.hbs

@@ -1,79 +1,101 @@
 {{page-title (t 'resources.target.host-source.title_plural')}}
 
-{{#if @model.hostSets}}
+<Rose::Layout::Page as |page|>
 
-  <Rose::Table as |table|>
-    <table.header as |header|>
-      <header.row as |row|>
-        <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
-        <row.headerCell>{{t 'form.type.label'}}</row.headerCell>
-        <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
-        <row.headerCell>{{t 'titles.actions'}}</row.headerCell>
-      </header.row>
-    </table.header>
-    <table.body as |body|>
-      {{#each @model.hostSets as |hostSet|}}
-        <body.row as |row|>
-          <row.headerCell>
-            {{hostSet.model.displayName}}
-            <p>{{hostSet.model.description}}</p>
-          </row.headerCell>
-          <row.cell>
-            <Rose::Badge>{{t
-                (concat 'resources.host-set.types.' hostSet.model.type)
-              }}</Rose::Badge>
-          </row.cell>
-          <row.cell>
-            <Copyable
-              @text={{hostSet.model.id}}
-              @buttonText={{t 'actions.copy-to-clipboard'}}
-              @acknowledgeText={{t 'states.copied'}}
-            >
-              <code>{{hostSet.model.id}}</code>
-            </Copyable>
-          </row.cell>
-          <row.cell>
-            {{#if (can 'removeHostSources target' @model)}}
-              <Rose::Dropdown
-                @icon='flight-icons/svg/more-horizontal-16'
-                @iconOnly={{true}}
-                @showCaret={{false}}
-                @dropdownRight={{true}}
-                @text='{{t 'actions.manage'}}'
-                as |dropdown|
-              >
-                <dropdown.button
-                  @style='danger'
-                  {{on
-                    'click'
-                    (route-action 'removeHostSource' @model hostSet.model)
-                  }}
+  <page.breadcrumbs>
+    <BreadCrumbs />
+  </page.breadcrumbs>
+
+  <page.header>
+    <Targets::Target::Header @model={{@model}} />
+  </page.header>
+
+  <page.navigation>
+    <Targets::Target::Nav @model={{@model}} />
+  </page.navigation>
+
+  <page.actions>
+    <Targets::Target::Actions @model={{@model}} />
+  </page.actions>
+
+  <page.body>
+    {{#if @model.hostSets}}
+
+      <Rose::Table as |table|>
+        <table.header as |header|>
+          <header.row as |row|>
+            <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
+            <row.headerCell>{{t 'form.type.label'}}</row.headerCell>
+            <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
+            <row.headerCell>{{t 'titles.actions'}}</row.headerCell>
+          </header.row>
+        </table.header>
+        <table.body as |body|>
+          {{#each @model.hostSets as |hostSet|}}
+            <body.row as |row|>
+              <row.headerCell>
+                {{hostSet.model.displayName}}
+                <p>{{hostSet.model.description}}</p>
+              </row.headerCell>
+              <row.cell>
+                <Rose::Badge>{{t
+                    (concat 'resources.host-set.types.' hostSet.model.type)
+                  }}</Rose::Badge>
+              </row.cell>
+              <row.cell>
+                <Copyable
+                  @text={{hostSet.model.id}}
+                  @buttonText={{t 'actions.copy-to-clipboard'}}
+                  @acknowledgeText={{t 'states.copied'}}
                 >
-                  {{t 'actions.remove'}}
-                </dropdown.button>
-              </Rose::Dropdown>
-            {{/if}}
-          </row.cell>
-        </body.row>
-      {{/each}}
-    </table.body>
-  </Rose::Table>
+                  <code>{{hostSet.model.id}}</code>
+                </Copyable>
+              </row.cell>
+              <row.cell>
+                {{#if (can 'removeHostSources target' @model)}}
+                  <Rose::Dropdown
+                    @icon='flight-icons/svg/more-horizontal-16'
+                    @iconOnly={{true}}
+                    @showCaret={{false}}
+                    @dropdownRight={{true}}
+                    @text='{{t 'actions.manage'}}'
+                    as |dropdown|
+                  >
+                    <dropdown.button
+                      @style='danger'
+                      {{on
+                        'click'
+                        (route-action 'removeHostSource' @model hostSet.model)
+                      }}
+                    >
+                      {{t 'actions.remove'}}
+                    </dropdown.button>
+                  </Rose::Dropdown>
+                {{/if}}
+              </row.cell>
+            </body.row>
+          {{/each}}
+        </table.body>
+      </Rose::Table>
 
-{{else}}
+    {{else}}
 
-  <Rose::Layout::Centered>
-    <Rose::Message
-      @title={{t 'resources.target.host-source.messages.welcome.title'}}
-      as |message|
-    >
-      <message.description>
-        {{t 'resources.target.host-source.messages.welcome.description'}}
-      </message.description>
-      <message.link @route='scopes.scope.targets.target.add-host-sources'>
-        <Rose::Icon @name='flight-icons/svg/plus-circle-16' />
-        {{t 'resources.target.actions.add-host-sources'}}
-      </message.link>
-    </Rose::Message>
-  </Rose::Layout::Centered>
+      <Rose::Layout::Centered>
+        <Rose::Message
+          @title={{t 'resources.target.host-source.messages.welcome.title'}}
+          as |message|
+        >
+          <message.description>
+            {{t 'resources.target.host-source.messages.welcome.description'}}
+          </message.description>
+          <message.link @route='scopes.scope.targets.target.add-host-sources'>
+            <Rose::Icon @name='flight-icons/svg/plus-circle-16' />
+            {{t 'resources.target.actions.add-host-sources'}}
+          </message.link>
+        </Rose::Message>
+      </Rose::Layout::Centered>
 
-{{/if}}
+    {{/if}}
+  </page.body>
+
+</Rose::Layout::Page>

ui/admin/app/templates/scopes/scope/targets/target/index.hbs

@@ -1,5 +1,27 @@
-<Form::Target
-  @model={{@model}}
-  @submit={{route-action 'save' @model}}
-  @cancel={{route-action 'cancel' @model}}
-/>
+<Rose::Layout::Page as |page|>
+
+  <page.breadcrumbs>
+    <BreadCrumbs />
+  </page.breadcrumbs>
+
+  <page.header>
+    <Targets::Target::Header @model={{@model}} />
+  </page.header>
+
+  <page.navigation>
+    <Targets::Target::Nav @model={{@model}} />
+  </page.navigation>
+
+  <page.actions>
+    <Targets::Target::Actions @model={{@model}} />
+  </page.actions>
+
+  <page.body>
+    <Form::Target
+      @model={{@model}}
+      @submit={{route-action 'save' @model}}
+      @cancel={{route-action 'cancel' @model}}
+    />
+  </page.body>
+
+</Rose::Layout::Page>

ui/admin/package.json

@@ -37,7 +37,7 @@
   "devDependencies": {
     "@babel/core": "^7.16.5",
     "@ember/optional-features": "^2.0.0",
-    "@ember/render-modifiers": "^1.0.2",
+    "@ember/render-modifiers": "^2.0.2",
     "@ember/test-helpers": "^2.4.2",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
@@ -95,7 +95,7 @@
     "sinon": "^11.1.2"
   },
   "engines": {
-    "node": ">=12 <=17"
+    "node": "12.* || 14.* || 16.*"
   },
   "ember": {
     "edition": "octane"

ui/desktop/package.json

@@ -55,7 +55,7 @@
   "devDependencies": {
     "@doyensec/electronegativity": "^1.9.1",
     "@ember/optional-features": "^2.0.0",
-    "@ember/render-modifiers": "^1.0.2",
+    "@ember/render-modifiers": "^2.0.2",
     "@ember/test-helpers": "^2.4.2",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
@@ -119,7 +119,7 @@
     "stylelint-config-sass-guidelines": "^8.0.0"
   },
   "engines": {
-    "node": ">=12 <=17"
+    "node": "12.* || 14.* || 16.*"
   },
   "ember": {
     "edition": "octane"

yarn.lock

@@ -2851,13 +2851,14 @@
     ember-cli-babel "^7.22.1"
     ember-compatibility-helpers "^1.1.1"
 
-"@ember/render-modifiers@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@ember/render-modifiers/-/render-modifiers-1.0.2.tgz#2e87c48db49d922ce4850d707215caaac60d8444"
-  integrity sha512-6tEnHl5+62NTSAG2mwhGMFPhUrJQjoVqV+slsn+rlTknm2Zik+iwxBQEbwaiQOU1FUYxkS8RWcieovRNMR8inQ==
+"@ember/render-modifiers@^2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@ember/render-modifiers/-/render-modifiers-2.0.2.tgz#a5a84c7d1481ac4936ba03695ba98776f1274afd"
+  integrity sha512-TURKkO+ihsgVAw1gql/76DILs2VbJZGWeB4pUsGFxFEeC8SFRD9N58Wlh+uJS3Q8vg6oZZa16dw1rFiTv0q43Q==
   dependencies:
-    ember-cli-babel "^7.10.0"
-    ember-modifier-manager-polyfill "^1.1.0"
+    "@embroider/macros" ">= 0.48.1 < 2.0.0-alpha.1"
+    ember-cli-babel "^7.26.6"
+    ember-modifier-manager-polyfill "^1.2.0"
 
 "@ember/string@^1.0.0":
   version "1.0.0"
@@ -3019,6 +3020,19 @@
     resolve "^1.8.1"
     semver "^7.3.2"
 
+"@embroider/macros@>= 0.48.1 < 2.0.0-alpha.1":
+  version "0.50.0"
+  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.50.0.tgz#7a3676f2fe983316b9470c5422c099d7cfeebfb2"
+  integrity sha512-9yek4uRrWPd/pvQg1amAr8GJSTv1tcGhsbvLXjUnAaJfHZQ4OlycfpXUsSGujqPI3DkOOL6TvPl0jQaEooE6cQ==
+  dependencies:
+    "@embroider/shared-internals" "0.50.0"
+    assert-never "^1.2.1"
+    ember-cli-babel "^7.26.6"
+    find-up "^5.0.0"
+    lodash "^4.17.21"
+    resolve "^1.20.0"
+    semver "^7.3.2"
+
 "@embroider/macros@^0.40.0":
   version "0.40.0"
   resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.40.0.tgz#f58763b4cfb9b4089679b478a28627595341bc5a"
@@ -3069,6 +3083,19 @@
     semver "^7.3.2"
     typescript-memoize "^1.0.0-alpha.3"
 
+"@embroider/shared-internals@0.50.0":
+  version "0.50.0"
+  resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.50.0.tgz#e8f7474af6b8896a91da4ec700810587fa61f7c2"
+  integrity sha512-pu4YQGyoTsz+KWGTKwMyCMzhoJkUI9PuWiivRilKsywiFt8Ke4ns+nFNnHtPqPKChR72xY2qFjWOP5yAqZq3kw==
+  dependencies:
+    babel-import-util "^1.1.0"
+    ember-rfc176-data "^0.3.17"
+    fs-extra "^9.1.0"
+    lodash "^4.17.21"
+    resolve-package-path "^4.0.1"
+    semver "^7.3.5"
+    typescript-memoize "^1.0.1"
+
 "@emotion/cache@^10.0.27", "@emotion/cache@^10.0.9":
   version "10.0.29"
   resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-10.0.29.tgz#87e7e64f412c060102d589fe7c6dc042e6f9d1e0"
@@ -6278,7 +6305,7 @@ asn1@~0.2.3:
   dependencies:
     safer-buffer "~2.1.0"
 
-assert-never@^1.1.0:
+assert-never@^1.1.0, assert-never@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/assert-never/-/assert-never-1.2.1.tgz#11f0e363bf146205fb08193b5c7b90f4d1cf44fe"
   integrity sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==
@@ -6505,6 +6532,11 @@ babel-import-util@^0.2.0:
   resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-0.2.0.tgz#b468bb679919601a3570f9e317536c54f2862e23"
   integrity sha512-CtWYYHU/MgK88rxMrLfkD356dApswtR/kWZ/c6JifG1m10e7tBBrs/366dFzWMAoqYmG5/JSh+94tUSpIwh+ag==
 
+babel-import-util@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-1.1.0.tgz#4156b16ef090c4f0d3cdb869ff799202f24aeb93"
+  integrity sha512-sfzgAiJsUT1es9yrHAuJZuJfBkkOE7Og6rovAIwK/gNJX6MjDfWTprbPngdJZTd5ye4F3FvpvpQmvKXObRzVYA==
+
 babel-loader@^8.0.6, babel-loader@^8.2.2:
   version "8.2.2"
   resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz#9363ce84c10c9a40e6c753748e1441b60c8a0b81"
@@ -10922,7 +10954,7 @@ ember-maybe-import-regenerator@^1.0.0:
     ember-cli-babel "^7.26.6"
     regenerator-runtime "^0.13.2"
 
-ember-modifier-manager-polyfill@^1.1.0, ember-modifier-manager-polyfill@^1.2.0:
+ember-modifier-manager-polyfill@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/ember-modifier-manager-polyfill/-/ember-modifier-manager-polyfill-1.2.0.tgz#cf4444e11a42ac84f5c8badd85e635df57565dda"
   integrity sha512-bnaKF1LLKMkBNeDoetvIJ4vhwRPKIIumWr6dbVuW6W6p4QV8ZiO+GdF8J7mxDNlog9CeL9Z/7wam4YS86G8BYA==
@@ -20428,6 +20460,13 @@ resolve-package-path@^4.0.0:
   dependencies:
     path-root "^0.1.1"
 
+resolve-package-path@^4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-4.0.3.tgz#31dab6897236ea6613c72b83658d88898a9040aa"
+  integrity sha512-SRpNAPW4kewOaNUt8VPqhJ0UMxawMwzJD8V7m1cJfdSTK9ieZwS6K7Dabsm4bmLFM96Z5Y/UznrpG5kt1im8yA==
+  dependencies:
+    path-root "^0.1.1"
+
 resolve-package@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-package/-/resolve-package-1.0.1.tgz#686f70b188bd7d675f5bbc4282ccda060abb9d27"
@@ -22677,6 +22716,11 @@ typescript-memoize@^1.0.0-alpha.3:
   resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.0.1.tgz#0a8199aa28f6fe18517f6e9308ef7bfbe9a98d59"
   integrity sha512-oJNge1qUrOK37d5Y6Ly2txKeuelYVsFtNF6U9kXIN7juudcQaHJQg2MxLOy0CqtkW65rVDYuTCOjnSIVPd8z3w==
 
+typescript-memoize@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.1.0.tgz#4a8f512d06fc995167c703a3592219901db8bc79"
+  integrity sha512-LQPKVXK8QrBBkL/zclE6YgSWn0I8ew5m0Lf+XL00IwMhlotqRLlzHV+BRrljVQIc+NohUAuQP7mg4HQwrx5Xbg==
+
 typescript@~4.2.4:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.4.tgz#8610b59747de028fda898a8aef0e103f156d0961"