From 8634bcb241738696376e48addb5f39a33e392297 Mon Sep 17 00:00:00 2001 From: shleewhite Date: Fri, 5 Dec 2025 17:42:51 -0500 Subject: [PATCH] fix: how the intl service is initialized --- packages/components/package.json | 2 +- packages/components/src/services/hds-intl.ts | 15 ++------------- pnpm-lock.yaml | 6 +++--- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index 541aec57c35..7a0f3fb57a1 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -62,6 +62,7 @@ "ember-concurrency": "^4.0.4", "ember-element-helper": "^0.8.6", "ember-focus-trap": "^1.1.1", + "ember-intl": "^7.3.0", "ember-modifier": "^4.2.2", "ember-power-select": "^8.7.1", "ember-stargate": "^1.0.2", @@ -94,7 +95,6 @@ "babel-plugin-ember-template-compilation": "^2.4.1", "concurrently": "^9.1.2", "ember-basic-dropdown": "^8.6.1", - "ember-intl": "^7.3.0", "ember-source": "^6.4.0", "ember-template-lint": "^7.0.2", "ember-template-lint-plugin-prettier": "^5.0.0", diff --git a/packages/components/src/services/hds-intl.ts b/packages/components/src/services/hds-intl.ts index 73b81bfe3a8..8178a7b7c39 100644 --- a/packages/components/src/services/hds-intl.ts +++ b/packages/components/src/services/hds-intl.ts @@ -4,7 +4,7 @@ */ import Service from '@ember/service'; -import { getOwner } from '@ember/owner'; +import { service } from '@ember/service'; import { isPresent } from '@ember/utils'; import { assert } from '@ember/debug'; @@ -18,18 +18,7 @@ export type HdsIntlTOptions = FormatMessageParameters[1] & { }; export default class HdsIntlService extends Service { - get intl(): IntlService | undefined { - const owner = getOwner(this); - - if ( - typeof owner?.factoryFor === 'function' && - owner.factoryFor('service:intl') - ) { - return owner.lookup('service:intl'); - } - - return undefined; - } + @service('intl') declare intl: IntlService; t(key: string, options: HdsIntlTOptions): string { const { default: defaultString, ...restOptions } = options; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4c29137bb59..e4b30384de2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -151,6 +151,9 @@ importers: ember-focus-trap: specifier: ^1.1.1 version: 1.1.1(ember-source@6.5.0(@glimmer/component@2.0.0)(rsvp@4.8.5)) + ember-intl: + specifier: ^7.3.0 + version: 7.3.1(@ember/test-helpers@4.0.5(@babel/core@7.28.0)(@glint/template@1.5.2)(ember-source@6.5.0(@glimmer/component@2.0.0)(rsvp@4.8.5)))(@glint/template@1.5.2)(typescript@5.9.2)(webpack@5.101.0) ember-modifier: specifier: ^4.2.2 version: 4.2.2(@babel/core@7.28.0) @@ -242,9 +245,6 @@ importers: ember-basic-dropdown: specifier: ^8.6.1 version: 8.6.2(@babel/core@7.28.0)(@ember/string@4.0.1)(@ember/test-helpers@4.0.5(@babel/core@7.28.0)(@glint/template@1.5.2)(ember-source@6.5.0(@glimmer/component@2.0.0)(rsvp@4.8.5)))(@glimmer/component@2.0.0)(@glint/environment-ember-loose@1.5.2(@glimmer/component@2.0.0)(@glint/template@1.5.2)(ember-cli-htmlbars@6.3.0)(ember-modifier@4.2.2(@babel/core@7.28.0)))(@glint/template@1.5.2)(ember-source@6.5.0(@glimmer/component@2.0.0)(rsvp@4.8.5)) - ember-intl: - specifier: ^7.3.0 - version: 7.3.1(@ember/test-helpers@4.0.5(@babel/core@7.28.0)(@glint/template@1.5.2)(ember-source@6.5.0(@glimmer/component@2.0.0)(rsvp@4.8.5)))(@glint/template@1.5.2)(typescript@5.9.2)(webpack@5.101.0) ember-source: specifier: ^6.4.0 version: 6.5.0(@glimmer/component@2.0.0)(rsvp@4.8.5)