Skip to content

Commit f935f78

Browse files
committed
fix: missing deps & type fixes
1 parent 06671a2 commit f935f78

File tree

15 files changed

+48
-21
lines changed

15 files changed

+48
-21
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"@glint/core": "^1.5.1",
1313
"dotenv": "^16.4.7"
1414
},
15-
"packageManager": "pnpm@10.0.0+sha512.b8fef5494bd3fe4cbd4edabd0745df2ee5be3e4b0b8b08fa643aa3e4c6702ccc0f00d68fa8a8c9858a735a0032485a44990ed2810526c875e416f001b17df12b",
15+
"packageManager": "pnpm@10.1.0+sha512.c89847b0667ddab50396bbbd008a2a43cf3b581efd59cf5d9aa8923ea1fb4b8106c041d540d08acb095037594d73ebc51e1ec89ee40c88b30b8a66c0fae0ac1b",
1616
"pnpm": {
1717
"patchedDependencies": {
1818
"@embroider/core": "patches/@embroider__core.patch",

packages/components/src/components/hds/breadcrumb/item.hbs

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
</div>
1515
{{else}}
1616
{{#if @isRouteExternal}}
17+
{{! @glint-expect-error: FIXME: pnpm migration }}
1718
<LinkToExternal
1819
class="hds-breadcrumb__link"
1920
@current-when={{@current-when}}

packages/components/src/components/hds/interactive/index.hbs

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
{{! NOTICE: we can't support the direct use of the "href" HTML attribute via ...attributes in the <a> elements, because we need to rely on the "@href" Ember argument to differentiate between different types of generated output }}
44
{{~#if @route~}}
55
{{~#if this.isRouteExternal~}}
6+
{{! @glint-expect-error: FIXME: pnpm migration }}
67
<LinkToExternal
78
@current-when={{@current-when}}
89
@models={{hds-link-to-models @model @models}}

packages/components/src/components/hds/interactive/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export interface HdsInteractiveSignature {
1616
route?: string;
1717
models?: unknown[];
1818
model?: unknown;
19-
query?: Record<string, unknown>;
19+
query?: Record<string, string>;
2020
'current-when'?: string | boolean;
2121
replace?: boolean;
2222
};

packages/components/src/components/hds/time/index.hbs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
{{~#if this.hasTooltip~}}
99
<Hds::TooltipButton
1010
class="hds-time-wrapper"
11+
{{! @glint-expect-error: FIXME: pnpm migration }}
1112
@text={{if
1213
display.options.tooltipFormat
1314
(hds-format-date this.date display.options.tooltipFormat)

packages/components/src/components/hds/time/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ export default class HdsTime extends Component<HdsTimeSignature> {
118118
return {
119119
options: undefined,
120120
difference: { absValueInMs: 0, valueInMs: 0 },
121-
relative: { value: 0, unit: '' },
121+
relative: { value: 0, unit: undefined },
122122
};
123123
}
124124

packages/components/src/helpers/hds-format-date.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import { helper } from '@ember/component/helper';
1717
*/
1818

1919
export function hdsFormatDate([date, options]: [
20-
Date,
21-
{
20+
date: Date | undefined,
21+
options: {
2222
month: Intl.DateTimeFormatOptions['month'];
2323
day: Intl.DateTimeFormatOptions['day'];
2424
year?: Intl.DateTimeFormatOptions['year'];

packages/components/src/helpers/hds-format-relative.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import { helper } from '@ember/component/helper';
1616
*/
1717

1818
export function hdsFormatRelative([value, unit]: [
19-
number,
20-
Intl.RelativeTimeFormatUnit,
19+
value: number,
20+
unit?: Intl.RelativeTimeFormatUnit,
2121
]): string {
2222
if (unit) {
2323
return new Intl.RelativeTimeFormat(navigator.language).format(value, unit);

packages/components/src/services/hds-time-types.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ export type DefaultDisplayType = {
1111
};
1212

1313
export type DisplayFormatType = {
14-
month: string;
15-
day: string;
16-
year: string;
17-
hour?: string;
18-
minute?: string;
19-
second?: string;
14+
month: Intl.DateTimeFormatOptions['month'];
15+
day: Intl.DateTimeFormatOptions['day'];
16+
year?: Intl.DateTimeFormatOptions['year'];
17+
hour?: Intl.DateTimeFormatOptions['hour'];
18+
minute?: Intl.DateTimeFormatOptions['minute'];
19+
second?: Intl.DateTimeFormatOptions['second'];
2020
timeZoneName?: string;
2121
};
2222

2323
export type DisplayType = {
2424
options?: DefaultDisplayType;
2525
difference: { absValueInMs: number; valueInMs: number };
26-
relative: { value: number; unit: string };
26+
relative: { value: number; unit?: Intl.RelativeTimeFormatUnit };
2727
};

packages/components/src/services/hds-time.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ export default class TimeService extends Service {
161161
// Formats the value of a relative unit.
162162
formatTimeRelativeUnit(
163163
value: number,
164-
unit: string
165-
): { value: number; unit: string } {
164+
unit: Intl.RelativeTimeFormatUnit
165+
): { value: number; unit: Intl.RelativeTimeFormatUnit } {
166166
return {
167167
value: Math.trunc(value),
168168
unit,
@@ -178,7 +178,7 @@ export default class TimeService extends Service {
178178
hour: number;
179179
day: number;
180180
} = DEFAULT_RELATIVE_THRESHOLDS
181-
): { value: number; unit: string } {
181+
): { value: number; unit: Intl.RelativeTimeFormatUnit } {
182182
if (absValueInMs < thresholds[HdsTimeRelativeUnitValues.Second]) {
183183
return this.formatTimeRelativeUnit(
184184
valueInMs / SECOND_IN_MS,

pnpm-lock.yaml

+19-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

showcase/blueprints/hds-component-test/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55

66
/* eslint-disable ember/no-string-prototype-extensions */
7-
/* eslint-disable n/no-extraneous-require */
7+
/* eslint-disable n/no-missing-require */
88
'use strict';
99

1010
const stringUtil = require('ember-cli-string-utils');

showcase/blueprints/hds-component/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55

66
/* eslint-disable ember/no-string-prototype-extensions */
7-
/* eslint-disable n/no-extraneous-require */
7+
/* eslint-disable n/no-missing-require */
88
'use strict';
99

1010
const stringUtil = require('ember-cli-string-utils');

showcase/package.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
"devDependencies": {
3737
"@babel/core": "^7.26.0",
3838
"@ember/optional-features": "^2.2.0",
39+
"@ember/render-modifiers": "^2.1.0",
3940
"@ember/string": "^3.1.1",
4041
"@ember/test-helpers": "^4.0.4",
4142
"@ember/test-waiters": "^3.1.0",
@@ -71,6 +72,7 @@
7172
"ember-cli-sass": "^11.0.1",
7273
"ember-cli-sri": "^2.1.1",
7374
"ember-cli-string-helpers": "^6.1.0",
75+
"ember-cli-string-utils": "^1.1.0",
7476
"ember-cli-terser": "^4.0.2",
7577
"ember-concurrency": "^4.0.2",
7678
"ember-deep-tracked": "^2.0.1",
@@ -81,6 +83,7 @@
8183
"ember-power-select": "^8.6.2",
8284
"ember-qunit": "^9.0.1",
8385
"ember-resolver": "^13.1.0",
86+
"ember-router-generator": "^2.0.0",
8487
"ember-set-helper": "^3.0.1",
8588
"ember-source": "~5.12.0",
8689
"ember-source-channel-url": "^3.0.0",
@@ -97,6 +100,7 @@
97100
"eslint-plugin-n": "^17.15.1",
98101
"eslint-plugin-prettier": "^5.2.1",
99102
"eslint-plugin-qunit": "^8.1.2",
103+
"fs-extra": "^11.2.0",
100104
"loader.js": "^4.7.0",
101105
"postcss": "^8.4.49",
102106
"prettier": "^3.4.2",
@@ -119,4 +123,4 @@
119123
"ember": {
120124
"edition": "octane"
121125
}
122-
}
126+
}

website/package.json

+2
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
"@algolia/client-search": "^5.18.0",
4242
"@babel/core": "^7.26.0",
4343
"@babel/eslint-parser": "^7.25.9",
44+
"@babel/plugin-proposal-decorators": "^7.25.9",
4445
"@ember/optional-features": "^2.2.0",
4546
"@ember/render-modifiers": "^2.1.0",
4647
"@ember/string": "^3.1.1",
@@ -76,6 +77,7 @@
7677
"ember-cli-sass": "^11.0.1",
7778
"ember-cli-sri": "^2.1.1",
7879
"ember-cli-string-helpers": "^6.1.0",
80+
"ember-cli-string-utils": "^1.1.0",
7981
"ember-cli-terser": "^4.0.2",
8082
"ember-concurrency": "^4.0.2",
8183
"ember-fetch": "^8.1.2",

0 commit comments

Comments
 (0)