Skip to content

Commit da00dd6

Browse files
aklkvzamoore
authored andcommitted
feat(components): remove ember-get-config (#3277)
1 parent 19db269 commit da00dd6

File tree

10 files changed

+26
-40
lines changed

10 files changed

+26
-40
lines changed

packages/components/addon-main.cjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ const flightIconSprite = require('@hashicorp/flight-icons/svg-sprite/svg-sprite-
88

99
module.exports = {
1010
...addonV1Shim(__dirname),
11+
1112
contentFor(type, config) {
1213
if (
1314
!config.flightIconsSpriteLazyEmbed &&

packages/components/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
"ember-concurrency": "^4.0.4",
6363
"ember-element-helper": "^0.8.6",
6464
"ember-focus-trap": "^1.1.1",
65-
"ember-get-config": "^2.1.1",
6665
"ember-modifier": "^4.2.2",
6766
"ember-power-select": "^8.7.1",
6867
"ember-stargate": "^1.0.2",

packages/components/src/instance-initializers/load-sprite.ts

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,27 @@
33
* SPDX-License-Identifier: MPL-2.0
44
*/
55

6-
import config from 'ember-get-config';
6+
import { isTesting } from '@embroider/macros';
77

8-
export async function initialize() {
9-
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
10-
if (config?.flightIconsSpriteLazyEmbed) {
8+
import type ApplicationInstance from '@ember/application/instance';
9+
10+
interface Config {
11+
flightIconsSpriteLazyEmbed?: boolean;
12+
}
13+
14+
export async function initialize(appInstance: ApplicationInstance) {
15+
const config = appInstance.resolveRegistration(
16+
'config:environment'
17+
) as Config;
18+
19+
if (config.flightIconsSpriteLazyEmbed) {
1120
const { default: svgSprite } = await import(
1221
'@hashicorp/flight-icons/svg-sprite/svg-sprite-module'
1322
);
1423

1524
// in test environments we can inject the sprite directly into the ember testing container
1625
// to avoid issues with tools like Percy that only consider content inside that element
17-
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
18-
if (config.environment === 'test') {
26+
if (isTesting()) {
1927
const container = window.document?.getElementById('ember-testing');
2028

2129
if (container && !container.querySelector('.flight-sprite-container')) {

packages/components/src/modifiers/hds-code-editor.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import Modifier from 'ember-modifier';
77
import { assert, warn } from '@ember/debug';
88
import { registerDestructor } from '@ember/destroyable';
99
import { task } from 'ember-concurrency';
10-
import config from 'ember-get-config';
10+
import { macroCondition, isTesting } from '@embroider/macros';
1111
import { Compartment } from '@codemirror/state';
1212
import { EditorView } from '@codemirror/view';
1313
import { guidFor } from '@ember/object/internals';
@@ -208,8 +208,7 @@ export default class HdsCodeEditorModifier extends Modifier<HdsCodeEditorSignatu
208208
// if the editor does not exist, setup the editor
209209
else {
210210
// the intersection observer makes loading unreliable in tests
211-
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
212-
if (config.environment === 'test') {
211+
if (macroCondition(isTesting())) {
213212
// eslint-disable-next-line @typescript-eslint/no-floating-promises
214213
this._setupTask.perform(element, positional, named);
215214
} else {

pnpm-lock.yaml

Lines changed: 3 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

showcase/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@
101101
"ember-template-lint": "^7.7.0",
102102
"ember-truth-helpers": "^4.0.3",
103103
"ember-try": "^4.0.0",
104-
"ember-unique-id-helper-polyfill": "^1.2.2",
105104
"eslint": "^9.27.0",
106105
"eslint-config-prettier": "^10.1.5",
107106
"eslint-plugin-ember": "^12.5.0",

website/app/routes/application.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import Route from '@ember/routing/route';
22
import fetch from 'fetch';
3-
import config from 'ember-get-config';
3+
4+
import config from 'website/config/environment';
45

56
export default class ApplicationRoute extends Route {
67
model() {

website/app/routes/show.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ import {
66
isUnauthorizedResponse,
77
isNotFoundResponse,
88
} from 'ember-fetch/errors';
9-
import config from 'ember-get-config';
109
import { service } from '@ember/service';
1110
import { action } from '@ember/object';
1211
import { reject } from 'rsvp';
1312

13+
import config from 'website/config/environment';
14+
1415
export default class ShowRoute extends Route {
1516
@service router;
1617
queryParams = {

website/app/services/head-data.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
*/
55

66
import HeadDataService from 'ember-meta/services/head-data';
7-
import config from 'ember-get-config';
87
import { service } from '@ember/service';
98

9+
import config from 'website/config/environment';
10+
1011
export default class CustomHeadDataService extends HeadDataService {
1112
@service router;
1213

website/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@
9090
"ember-cli-terser": "^4.0.2",
9191
"ember-concurrency": "^4.0.4",
9292
"ember-fetch": "^8.1.2",
93-
"ember-get-config": "^2.1.1",
9493
"ember-load-initializers": "^3.0.1",
9594
"ember-math-helpers": "^4.2.1",
9695
"ember-meta": "^2.0.0",

0 commit comments

Comments
 (0)