Skip to content

Commit

Permalink
Merge branch 'main' into hds-2688-copy-button-ts-conversion
Browse files Browse the repository at this point in the history
  • Loading branch information
KristinLBradley committed May 23, 2024
2 parents 0fe7bd3 + 98fd5c5 commit a89bb3e
Show file tree
Hide file tree
Showing 104 changed files with 1,114 additions and 415 deletions.
5 changes: 5 additions & 0 deletions .changeset/lucky-stingrays-call.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@hashicorp/design-system-components": patch
---

Template Registry - Removed redundant entries
5 changes: 5 additions & 0 deletions .changeset/rare-suns-love.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@hashicorp/design-system-components": patch
---

Fix missing TypeScript `declaration`
5 changes: 5 additions & 0 deletions .changeset/tiny-apes-sin.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@hashicorp/design-system-components": patch
---

`Hds::BadgeCount` - Fixed typo in template registry declaration
12 changes: 6 additions & 6 deletions .github/workflows/ci-components.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,18 @@ jobs:
cache-dependency-path: yarn.lock
- name: Install Dependencies
run: yarn install --immutable
- name: Lint Showcase
run: yarn run lint
working-directory: showcase
- name: Lint Components
run: yarn run lint
working-directory: packages/components
- name: Build Icons
run: yarn build
working-directory: packages/ember-flight-icons
- name: Build Components
run: yarn build
working-directory: packages/components
- name: Lint Showcase
run: yarn run lint
working-directory: showcase
- name: Lint Components
run: yarn run lint
working-directory: packages/components
- name: Run Tests
run: yarn run test:ember:percy
working-directory: showcase
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
diff --git a/-private/environment/index.js b/-private/environment/index.js
index 217583f4bae53f6f72db8d3debd0f31b3dac2b8e..8caf5463cf2be2248952c2347c738b98d2b7e22b 100644
--- a/-private/environment/index.js
+++ b/-private/environment/index.js
@@ -46,10 +46,8 @@ function emberLooseEnvironment(options) {
// Pod component/controller/route
candidates.push(templatePath.replace(REGEXES.POD_TEMPLATE, '/component.ts'), templatePath.replace(REGEXES.POD_TEMPLATE, '/controller.ts'), templatePath.replace(REGEXES.POD_TEMPLATE, '/route.ts'));
}
- else if (templatePath.includes('/templates/components/')) {
- // Classic component
- candidates.push(colocatedTsScriptPath.replace('/templates/components/', '/components/'));
- }
+ // we no longer need this as it remnant of classic components and it interferes with our route stricture in showcase up
+ // upstream PR: https://github.com/typed-ember/glint/pull/721
else if (templatePath.includes('/templates/')) {
// Classic controller/route
candidates.push(colocatedTsScriptPath.replace('/templates/', '/controllers/'), colocatedTsScriptPath.replace('/templates/', '/routes/'));
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
},
"packageManager": "yarn@4.0.2",
"resolutions": {
"broccoli-asset-rewrite@^2.0.0": "patch:broccoli-asset-rewrite@npm%3A2.0.0#./.yarn/patches/broccoli-asset-rewrite-npm-2.0.0-c4ce42084a.patch"
"broccoli-asset-rewrite@^2.0.0": "patch:broccoli-asset-rewrite@npm%3A2.0.0#./.yarn/patches/broccoli-asset-rewrite-npm-2.0.0-c4ce42084a.patch",
"@glint/environment-ember-loose": "patch:@glint/environment-ember-loose@npm%3A1.4.0#~/.yarn/patches/@glint-environment-ember-loose-npm-1.4.0-31c2f31bcb.patch"
}
}
58 changes: 58 additions & 0 deletions packages/components/.eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
'use strict';

module.exports = {
root: true,
parser: '@typescript-eslint/parser',
parserOptions: {
ecmaVersion: 'latest',
},
plugins: ['ember', 'import'],
extends: [
'eslint:recommended',
'plugin:ember/recommended',
'plugin:prettier/recommended',
],
env: {
browser: true,
},
rules: {},
overrides: [
// ts files
{
files: ['**/*.ts', '**/*.gts'],
extends: [
'plugin:@typescript-eslint/eslint-recommended',
'plugin:@typescript-eslint/recommended',
],
rules: {
// Add any custom rules here
},
},
// require relative imports use full extensions
{
files: ['src/**/*.{js,ts,gjs,gts}'],
rules: {
'import/extensions': ['error', 'always', { ignorePackages: true }],
},
},
// node files
{
files: [
'./.eslintrc.cjs',
'./.prettierrc.cjs',
'./.template-lintrc.cjs',
'./addon-main.cjs',
'.stylelintrc.js',
],
parserOptions: {
sourceType: 'script',
},
env: {
browser: false,
node: true,
},
plugins: ['n'],
extends: ['plugin:n/recommended'],
},
],
};
67 changes: 0 additions & 67 deletions packages/components/.eslintrc.js

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
19 changes: 0 additions & 19 deletions packages/components/config/environment.d.ts

This file was deleted.

10 changes: 0 additions & 10 deletions packages/components/config/environment.js

This file was deleted.

11 changes: 6 additions & 5 deletions packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"build": "concurrently 'npm:build:*'",
"build:js": "rollup --config",
"build:types": "glint --declaration",
"prepublishOnly": "yarn workspace @hashicorp/ember-flight-icons build && rollup --config && test -f 'dist/styles/@hashicorp/design-system-components.css' || (echo 'The pre-compiled CSS file was not found' && exit 1)",
"prepublishOnly": "yarn workspace @hashicorp/ember-flight-icons build && yarn build && test -f 'dist/styles/@hashicorp/design-system-components.css' || (echo 'The pre-compiled CSS file was not found' && exit 1)",
"start": "rollup --config --watch --environment development",
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
"lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
Expand Down Expand Up @@ -88,7 +88,8 @@
"eslint": "^8.52.0",
"eslint-config-prettier": "^8.10.0",
"eslint-plugin-ember": "^11.11.1",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-n": "^17.7.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-qunit": "^8.0.1",
"npm-run-all": "^4.1.5",
Expand All @@ -109,7 +110,7 @@
"edition": "octane"
},
"ember-addon": {
"main": "addon-main.js",
"main": "addon-main.cjs",
"type": "addon",
"version": 2,
"app-js": {
Expand Down Expand Up @@ -292,7 +293,7 @@
"types": "./declarations/*.d.ts",
"default": "./dist/*"
},
"./addon-main.js": "./addon-main.js"
"./addon-main.js": "./addon-main.cjs"
},
"typesVersions": {
"*": {
Expand All @@ -302,7 +303,7 @@
}
},
"files": [
"addon-main.js",
"addon-main.cjs",
"declarations",
"dist"
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

import Component from '@glimmer/component';
import { getElementId } from '../../../../utils/hds-get-element-id';
import { getElementId } from '../../../../utils/hds-get-element-id.js';

export default class HdsDropdownListItemCheckboxComponent extends Component {
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

import Component from '@glimmer/component';
import { getElementId } from '../../../../utils/hds-get-element-id';
import { getElementId } from '../../../../utils/hds-get-element-id.js';

export default class HdsDropdownListItemRadioComponent extends Component {
/**
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/components/hds/flyout/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Component from '@glimmer/component';
import { tracked } from '@glimmer/tracking';
import { action } from '@ember/object';
import { assert } from '@ember/debug';
import { getElementId } from '../../../utils/hds-get-element-id';
import { getElementId } from '../../../utils/hds-get-element-id.js';
import { buildWaiter } from '@ember/test-waiters';

let waiter = buildWaiter('@hashicorp/design-system-components:flyout');
Expand Down
4 changes: 2 additions & 2 deletions packages/components/src/components/hds/form/field/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import { tracked } from '@glimmer/tracking';
import { assert } from '@ember/debug';
import { action } from '@ember/object';
import { schedule } from '@ember/runloop';
import { getElementId } from '../../../../utils/hds-get-element-id';
import { setAriaDescribedBy } from '../../../../utils/hds-set-aria-described-by';
import { getElementId } from '../../../../utils/hds-get-element-id.js';
import { setAriaDescribedBy } from '../../../../utils/hds-set-aria-described-by.js';

export const LAYOUT_TYPES = ['vertical', 'flag'];

Expand Down
4 changes: 2 additions & 2 deletions packages/components/src/components/hds/form/fieldset/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import Component from '@glimmer/component';
import { tracked } from '@glimmer/tracking';
import { action } from '@ember/object';
import { getElementId } from '../../../../utils/hds-get-element-id';
import { setAriaDescribedBy } from '../../../../utils/hds-set-aria-described-by';
import { getElementId } from '../../../../utils/hds-get-element-id.js';
import { setAriaDescribedBy } from '../../../../utils/hds-set-aria-described-by.js';

export default class HdsFormFieldsetIndexComponent extends Component {
@tracked ariaDescribedBy = this.args.extraAriaDescribedBy;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import Component from '@glimmer/component';
import { tracked } from '@glimmer/tracking';
import { action } from '@ember/object';
import { getElementId } from '../../../../utils/hds-get-element-id';
import { getElementId } from '../../../../utils/hds-get-element-id.js';

export default class HdsFormMaskedInputBaseComponent extends Component {
@tracked isContentMasked = this.args.isContentMasked ?? true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { tracked } from '@glimmer/tracking';
import { action } from '@ember/object';
import { assert } from '@ember/debug';
import { schedule } from '@ember/runloop';
import { setAriaDescribedBy } from '../../../../utils/hds-set-aria-described-by';
import { setAriaDescribedBy } from '../../../../utils/hds-set-aria-described-by.js';

export const DEFAULT_CONTROL_POSITION = 'bottom';
export const DEFAULT_ALIGNMENT = 'left';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

import PowerSelectComponent from 'ember-power-select/components/power-select';
import anchoredPositionModifier from '../../../../../modifiers/hds-anchored-position';
import anchoredPositionModifier from '../../../../../modifiers/hds-anchored-position.js';
import { action } from '@ember/object';
import { tracked } from '@glimmer/tracking';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

import PowerSelectComponent from 'ember-power-select/components/power-select';
import { ID_PREFIX } from '../../label/index';
import { ID_PREFIX } from '../../label/index.js';

export default class HdsSuperSelectMultipleFieldComponent extends PowerSelectComponent {
get idPrefix() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

import PowerSelectComponent from 'ember-power-select/components/power-select';
import anchoredPositionModifier from '../../../../../modifiers/hds-anchored-position';
import anchoredPositionModifier from '../../../../../modifiers/hds-anchored-position.js';
import { action } from '@ember/object';

const DEFAULT_HORIZONTAL_POSITION = 'bottom-start';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

import PowerSelectComponent from 'ember-power-select/components/power-select';
import { ID_PREFIX } from '../../label/index';
import { ID_PREFIX } from '../../label/index.js';

export default class HdsSuperSelectSingleFieldComponent extends PowerSelectComponent {
get idPrefix() {
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/components/hds/modal/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Component from '@glimmer/component';
import { tracked } from '@glimmer/tracking';
import { action } from '@ember/object';
import { assert } from '@ember/debug';
import { getElementId } from '../../../utils/hds-get-element-id';
import { getElementId } from '../../../utils/hds-get-element-id.js';
import { buildWaiter } from '@ember/test-waiters';

let waiter = buildWaiter('@hashicorp/design-system-components:modal');
Expand Down
Loading

0 comments on commit a89bb3e

Please sign in to comment.