Skip to content

Commit 66b68db

Browse files
committed
fix: untangling yarn mess
1 parent bc4f823 commit 66b68db

File tree

44 files changed

+148
-88
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+148
-88
lines changed

package.json

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
{
22
"name": "@hashicorp/design-system",
3-
"private": true,
43
"version": "0.0.0",
4+
"private": true,
5+
"scripts": {
6+
"release-packages": "pnpm changeset publish",
7+
"version-packages": "pnpm changeset version && pnpm install --mode update-lockfile && pnpm -F website generate-changelog-markdown-files"
8+
},
59
"devDependencies": {
610
"@changesets/cli": "^2.27.11",
711
"@changesets/get-github-info": "^0.6.0",
12+
"@glint/core": "^1.5.1",
813
"dotenv": "^16.4.7"
914
},
10-
"scripts": {
11-
"release-packages": "pnpm changeset publish",
12-
"version-packages": "pnpm changeset version && pnpm install --mode update-lockfile && pnpm -F website generate-changelog-markdown-files"
13-
},
1415
"packageManager": "pnpm@10.0.0+sha512.b8fef5494bd3fe4cbd4edabd0745df2ee5be3e4b0b8b08fa643aa3e4c6702ccc0f00d68fa8a8c9858a735a0032485a44990ed2810526c875e416f001b17df12b",
1516
"pnpm": {
1617
"patchedDependencies": {
17-
"@glint/environment-ember-loose": "patches/@glint__environment-ember-loose.patch",
18-
"@embroider/core": "patches/@embroider__core.patch"
18+
"@embroider/core": "patches/@embroider__core.patch",
19+
"@glint/environment-ember-loose": "patches/@glint__environment-ember-loose.patch"
1920
}
2021
}
2122
}

packages/components/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
"@ember/string": "^3.1.1",
4545
"@ember/test-waiters": "^3.1.0",
4646
"@embroider/addon-shim": "^1.9.0",
47+
"@embroider/macros": "^1.16.10",
4748
"@floating-ui/dom": "^1.6.12",
4849
"@glimmer/component": "^1.1.2",
4950
"@glimmer/tracking": "^1.1.2",

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import type { HdsAlertColors, HdsAlertTypes } from './types.ts';
1919
import type { HdsAlertTitleSignature } from './title.ts';
2020
import type { HdsAlertDescriptionSignature } from './description.ts';
2121
import type { HdsIconSignature } from '../icon';
22+
import type Owner from '@ember/owner';
2223

2324
export const TYPES: string[] = Object.values(HdsAlertTypeValues);
2425
export const DEFAULT_COLOR = HdsAlertColorValues.Neutral;
@@ -65,7 +66,7 @@ export default class HdsAlert extends Component<HdsAlertSignature> {
6566
@tracked private _role?: string;
6667
@tracked private _ariaLabelledBy?: string;
6768

68-
constructor(owner: unknown, args: HdsAlertSignature['Args']) {
69+
constructor(owner: Owner, args: HdsAlertSignature['Args']) {
6970
super(owner, args);
7071

7172
assert(

packages/components/src/components/hds/app-footer/status-link.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
55

66
import Component from '@glimmer/component';
77
import { htmlSafe } from '@ember/template';
8-
import type { SafeString } from '@ember/template/-private/handlebars';
98
import { assert } from '@ember/debug';
109

10+
import type { SafeString } from '@ember/template';
1111
import type { HdsInteractiveSignature } from '../interactive/';
1212
import { HdsAppFooterStatusLinkStatusValues } from './types.ts';
1313
import type { HdsAppFooterStatusTypes } from './types.ts';
1414
import type { HdsAppFooterLinkSignature } from './link.ts';
1515
import type { HdsIconSignature } from '../icon';
16+
import type Owner from '@ember/owner';
1617

1718
export const STATUSES = HdsAppFooterStatusLinkStatusValues;
1819

@@ -28,7 +29,7 @@ export interface HdsAppFooterStatusLinkSignature {
2829
}
2930

3031
export default class HdsAppFooterStatusLink extends Component<HdsAppFooterStatusLinkSignature> {
31-
constructor(owner: unknown, args: HdsInteractiveSignature['Args']) {
32+
constructor(owner: Owner, args: HdsInteractiveSignature['Args']) {
3233
super(owner, args);
3334

3435
assert(

packages/components/src/components/hds/app-header/index.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { action } from '@ember/object';
88
import { guidFor } from '@ember/object/internals';
99
import { tracked } from '@glimmer/tracking';
1010
import { registerDestructor } from '@ember/destroyable';
11+
import type Owner from '@ember/owner';
1112

1213
export interface HdsAppHeaderSignature {
1314
Args: {
@@ -50,7 +51,7 @@ export default class HdsAppHeader extends Component<HdsAppHeaderSignature> {
5051
'--hds-app-desktop-breakpoint'
5152
);
5253

53-
constructor(owner: unknown, args: Record<string, never>) {
54+
constructor(owner: Owner, args: Record<string, never>) {
5455
super(owner, args);
5556
this._desktopMQ = window.matchMedia(`(min-width: ${this._desktopMQVal})`);
5657
this.addEventListeners();

packages/components/src/components/hds/app-side-nav/index.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import Component from '@glimmer/component';
77
import { tracked } from '@glimmer/tracking';
88
import { action } from '@ember/object';
99
import { registerDestructor } from '@ember/destroyable';
10+
import type Owner from '@ember/owner';
1011

1112
export interface HdsAppSideNavSignature {
1213
Args: {
@@ -36,7 +37,7 @@ export default class HdsAppSideNav extends Component<HdsAppSideNavSignature> {
3637
document.documentElement
3738
).getPropertyValue('--hds-app-desktop-breakpoint');
3839

39-
constructor(owner: unknown, args: HdsAppSideNavSignature['Args']) {
40+
constructor(owner: Owner, args: HdsAppSideNavSignature['Args']) {
4041
super(owner, args);
4142
this._isMinimized = this.args.isMinimized ?? false; // sets the default state on 'desktop' viewports
4243
this._desktopMQ = window.matchMedia(`(min-width:${this._desktopMQVal})`);

packages/components/src/components/hds/app-side-nav/portal/target.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import Component from '@glimmer/component';
77
import { inject as service } from '@ember/service';
88
import { tracked } from '@glimmer/tracking';
99
import { action } from '@ember/object';
10-
import { DEBUG } from '@glimmer/env';
1110
import { macroCondition, isTesting } from '@embroider/macros';
1211

1312
import type { HdsAppSideNavPortalSignature } from './index';
@@ -152,7 +151,7 @@ export default class HdsAppSideNavPortalTarget extends Component<HdsAppSideNavPo
152151
}
153152
}
154153
// Notice: we don't add the styles by default because it writes a `style` attribute to the element and it causes an additional re-render
155-
if (DEBUG) {
154+
if (macroCondition(isTesting())) {
156155
// Check the visibility of the element before attempting to commitStyles.
157156
if (targetElement.offsetParent !== null) {
158157
anim.commitStyles();

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import Component from '@glimmer/component';
77
import { htmlSafe } from '@ember/template';
88
import { assert } from '@ember/debug';
9-
import type { SafeString } from '@ember/template/-private/handlebars';
9+
import type { SafeString } from '@ember/template';
1010
import type { HdsIconSignature } from '../icon';
1111

1212
export interface HdsBreadcrumbItemSignature {

packages/components/src/components/hds/code-block/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { guidFor } from '@ember/object/internals';
1313

1414
import Prism from 'prismjs';
1515

16-
import type { SafeString } from '@ember/template/-private/handlebars';
16+
import type { SafeString } from '@ember/template';
1717
import type { ComponentLike } from '@glint/template';
1818

1919
import type { HdsCodeBlockTitleSignature } from './title';

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@ import { action } from '@ember/object';
99
import { modifier } from 'ember-modifier';
1010

1111
import type { ComponentLike } from '@glint/template';
12-
import type { HdsCodeEditorSignature as HdsCodeEditorModifierSignature } from 'src/modifiers/hds-code-editor';
12+
import type { HdsCodeEditorSignature as HdsCodeEditorModifierSignature } from '../../../modifiers/hds-code-editor.ts';
1313
import type { HdsCodeEditorDescriptionSignature } from './description';
1414
import type { HdsCodeEditorTitleSignature } from './title';
1515
import type { HdsCodeEditorGenericSignature } from './generic';
1616
import type { EditorView } from '@codemirror/view';
1717
import { guidFor } from '@ember/object/internals';
18+
import type Owner from '@ember/owner';
1819
export interface HdsCodeEditorSignature {
1920
Args: {
2021
hasCopyButton?: boolean;
@@ -58,7 +59,7 @@ export default class HdsCodeEditor extends Component<HdsCodeEditorSignature> {
5859
};
5960
});
6061

61-
constructor(owner: unknown, args: HdsCodeEditorSignature['Args']) {
62+
constructor(owner: Owner, args: HdsCodeEditorSignature['Args']) {
6263
super(owner, args);
6364

6465
if (args.value) {

packages/components/src/components/hds/dropdown/toggle/icon.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import type { HdsIconSignature } from '../../icon';
1313
import type { HdsDropdownToggleIconSizes } from './types';
1414
import type { ModifierLike } from '@glint/template';
1515
import type { SetupPrimitiveToggleModifier } from '../../popover-primitive/index.ts';
16+
import type Owner from '@ember/owner';
1617

1718
export const DEFAULT_SIZE = HdsDropdownToggleIconSizeValues.Medium;
1819
export const SIZES: string[] = Object.values(HdsDropdownToggleIconSizeValues);
@@ -33,7 +34,7 @@ export interface HdsDropdownToggleIconSignature {
3334
export default class HdsDropdownToggleIcon extends Component<HdsDropdownToggleIconSignature> {
3435
@tracked private _hasImage = true;
3536

36-
constructor(owner: unknown, args: HdsDropdownToggleIconSignature['Args']) {
37+
constructor(owner: Owner, args: HdsDropdownToggleIconSignature['Args']) {
3738
super(owner, args);
3839
if (!(this.args.icon || this.args.imageSrc)) {
3940
assert(

packages/components/src/components/hds/flyout/body.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import Component from '@glimmer/component';
77
import { deprecate } from '@ember/debug';
88

9+
import type Owner from '@ember/owner';
10+
911
export interface HdsFlyoutBodySignature {
1012
// when component has no args, but constructor still needs to be defined, use `never`
1113
// see: https://github.com/hashicorp/design-system/pull/2511/files/f2146e5243d0431892a62d2fbf2889f1cbd3e525#r1815255004
@@ -17,7 +19,7 @@ export interface HdsFlyoutBodySignature {
1719
}
1820

1921
export default class HdsFlyoutBody extends Component<HdsFlyoutBodySignature> {
20-
constructor(owner: unknown, args: HdsFlyoutBodySignature['Args']) {
22+
constructor(owner: Owner, args: HdsFlyoutBodySignature['Args']) {
2123
super(owner, args);
2224

2325
deprecate(
@@ -30,6 +32,7 @@ export default class HdsFlyoutBody extends Component<HdsFlyoutBodySignature> {
3032
for: '@hashicorp/design-system-components',
3133
since: {
3234
enabled: '4.6.0',
35+
available: '4.6.0',
3336
},
3437
}
3538
);

packages/components/src/components/hds/flyout/description.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import Component from '@glimmer/component';
77
import { deprecate } from '@ember/debug';
88
import type { HdsTextBodySignature } from '../text/body';
9+
import type Owner from '@ember/owner';
910

1011
export interface HdsFlyoutDescriptionSignature {
1112
Args: never;
@@ -16,7 +17,7 @@ export interface HdsFlyoutDescriptionSignature {
1617
}
1718

1819
export default class HdsFlyoutDescription extends Component<HdsFlyoutDescriptionSignature> {
19-
constructor(owner: unknown, args: HdsFlyoutDescriptionSignature['Args']) {
20+
constructor(owner: Owner, args: HdsFlyoutDescriptionSignature['Args']) {
2021
super(owner, args);
2122

2223
deprecate(
@@ -28,6 +29,7 @@ export default class HdsFlyoutDescription extends Component<HdsFlyoutDescription
2829
url: 'https://helios.hashicorp.design/components/flyout?tab=version%20history#460',
2930
for: '@hashicorp/design-system-components',
3031
since: {
32+
available: '4.5.0',
3133
enabled: '4.6.0',
3234
},
3335
}

packages/components/src/components/hds/flyout/footer.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import Component from '@glimmer/component';
77
import { deprecate } from '@ember/debug';
8+
import type Owner from '@ember/owner';
89

910
export interface HdsFlyoutFooterSignature {
1011
Args: {
@@ -17,7 +18,7 @@ export interface HdsFlyoutFooterSignature {
1718
}
1819

1920
export default class HdsFlyoutFooter extends Component<HdsFlyoutFooterSignature> {
20-
constructor(owner: unknown, args: HdsFlyoutFooterSignature['Args']) {
21+
constructor(owner: Owner, args: HdsFlyoutFooterSignature['Args']) {
2122
super(owner, args);
2223

2324
deprecate(
@@ -30,6 +31,7 @@ export default class HdsFlyoutFooter extends Component<HdsFlyoutFooterSignature>
3031
for: '@hashicorp/design-system-components',
3132
since: {
3233
enabled: '4.6.0',
34+
available: '4.6.0',
3335
},
3436
}
3537
);

packages/components/src/components/hds/flyout/header.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import Component from '@glimmer/component';
77
import { deprecate } from '@ember/debug';
88
import type { HdsIconSignature } from '../icon';
9+
import type Owner from '@ember/owner';
910

1011
export interface HdsFlyoutHeaderSignature {
1112
Args: {
@@ -21,7 +22,7 @@ export interface HdsFlyoutHeaderSignature {
2122
}
2223

2324
export default class HdsFlyoutHeader extends Component<HdsFlyoutHeaderSignature> {
24-
constructor(owner: unknown, args: HdsFlyoutHeaderSignature['Args']) {
25+
constructor(owner: Owner, args: HdsFlyoutHeaderSignature['Args']) {
2526
super(owner, args);
2627

2728
deprecate(
@@ -34,6 +35,7 @@ export default class HdsFlyoutHeader extends Component<HdsFlyoutHeaderSignature>
3435
for: '@hashicorp/design-system-components',
3536
since: {
3637
enabled: '4.6.0',
38+
available: '4.6.0',
3739
},
3840
}
3941
);

packages/components/src/components/hds/form/masked-input/base.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { getElementId } from '../../../../utils/hds-get-element-id.ts';
99
import type { HdsCopyButtonSignature } from '../../copy/button/index.ts';
1010
import type { HdsFormVisibilityToggleSignature } from '../visibility-toggle/index.ts';
1111
import { tracked } from '@glimmer/tracking';
12+
import type Owner from '@ember/owner';
1213

1314
export interface HdsFormMaskedInputBaseSignature {
1415
Args: {
@@ -30,7 +31,7 @@ export interface HdsFormMaskedInputBaseSignature {
3031
export default class HdsFormMaskedInputBase extends Component<HdsFormMaskedInputBaseSignature> {
3132
@tracked isContentMasked;
3233

33-
constructor(owner: unknown, args: HdsFormMaskedInputBaseSignature['Args']) {
34+
constructor(owner: Owner, args: HdsFormMaskedInputBaseSignature['Args']) {
3435
super(owner, args);
3536
this.isContentMasked = this.args.isContentMasked ?? true;
3637
}

packages/components/src/components/hds/form/text-input/field.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import type { HdsFormHelperTextSignature } from '../helper-text';
1515
import type { HdsFormLabelSignature } from '../label';
1616
import type { HdsFormVisibilityToggleSignature } from '../visibility-toggle';
1717
import HdsFormCharacterCountComponent from '../character-count/index.ts';
18+
import type Owner from '@ember/owner';
1819

1920
export interface HdsFormTextInputFieldSignature {
2021
Args: Omit<HdsFormFieldSignature['Args'], 'contextualClass' | 'layout'> &
@@ -42,7 +43,7 @@ export default class HdsFormTextInputField extends Component<HdsFormTextInputFie
4243
@tracked private _isPasswordMasked = true;
4344
@tracked type;
4445

45-
constructor(owner: unknown, args: HdsFormTextInputFieldSignature['Args']) {
46+
constructor(owner: Owner, args: HdsFormTextInputFieldSignature['Args']) {
4647
super(owner, args);
4748
this.type = this.args.type ?? 'text';
4849
}

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { iconNames } from '@hashicorp/flight-icons/svg';
1010
import { HdsIconSizeValues, HdsIconColorValues } from './types.ts';
1111
import type { HdsIconSizes, HdsIconColors } from './types';
1212
import type { IconName } from '@hashicorp/flight-icons/svg';
13+
import type Owner from '@ember/owner';
1314

1415
export const AVAILABLE_COLORS: string[] = Object.values(HdsIconColorValues);
1516

@@ -29,7 +30,7 @@ export default class HdsIcon extends Component<HdsIconSignature> {
2930
private _iconId = 'icon-' + guidFor(this);
3031
private _titleId = 'title-' + guidFor(this);
3132

32-
constructor(owner: unknown, args: HdsIconSignature['Args']) {
33+
constructor(owner: Owner, args: HdsIconSignature['Args']) {
3334
super(owner, args);
3435

3536
if (!this.args.name) {

packages/components/src/components/hds/link/inline.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { HdsLinkColorValues, HdsLinkIconPositionValues } from './types.ts';
1010
import type { HdsInteractiveSignature } from '../interactive/';
1111
import type { HdsLinkColors, HdsLinkIconPositions } from './types.ts';
1212
import type { HdsIconSignature } from '../icon';
13+
import type Owner from '@ember/owner';
1314

1415
export const DEFAULT_ICONPOSITION = HdsLinkIconPositionValues.Trailing;
1516
export const DEFAULT_COLOR = HdsLinkColorValues.Primary;
@@ -29,7 +30,7 @@ export interface HdsLinkInlineSignature {
2930
}
3031

3132
export default class HdsLinkInline extends Component<HdsLinkInlineSignature> {
32-
constructor(owner: unknown, args: HdsLinkInlineSignature['Args']) {
33+
constructor(owner: Owner, args: HdsLinkInlineSignature['Args']) {
3334
super(owner, args);
3435
if (!(this.args.href || this.args.route)) {
3536
assert('@href or @route must be defined for <Hds::Link::Inline>');

packages/components/src/components/hds/link/standalone.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import type {
1818
HdsLinkStandaloneSizes,
1919
} from './types.ts';
2020
import type { HdsIconSignature } from '../icon';
21+
import type Owner from '@ember/owner';
2122

2223
export interface HdsLinkStandaloneSignature {
2324
Args: HdsInteractiveSignature['Args'] & {
@@ -38,7 +39,7 @@ export const COLORS: string[] = Object.values(HdsLinkColorValues);
3839
export const SIZES: string[] = Object.values(HdsLinkStandaloneSizeValues);
3940

4041
export default class HdsLinkStandalone extends Component<HdsLinkStandaloneSignature> {
41-
constructor(owner: unknown, args: HdsLinkStandaloneSignature['Args']) {
42+
constructor(owner: Owner, args: HdsLinkStandaloneSignature['Args']) {
4243
super(owner, args);
4344
if (!(this.args.href || this.args.route)) {
4445
assert('@href or @route must be defined for <Hds::Link::Standalone>');

0 commit comments

Comments
 (0)