Skip to content

Commit ca56cca

Browse files
Merge branch 'hds-4254-super-select-search-position' into hds-4254-super-select-search-position-docs
2 parents efa614b + cbee0c5 commit ca56cca

File tree

74 files changed

+2274
-1837
lines changed

Some content is hidden

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

74 files changed

+2274
-1837
lines changed

.changeset/sharp-beds-approve.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@hashicorp/flight-icons": minor
3+
---
4+
5+
`confluence` and `confluence-color` icons added.

.changeset/silver-trees-occur.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@hashicorp/design-system-components": patch
3+
"@hashicorp/design-system-codemods": patch
4+
---
5+
6+
Shifted our supported version of Node.js from `16* || >= 18` to `>=18`

.github/workflows/ci-components.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
name: CI - Components
2-
2+
33
on:
44
push:
55
branches:
66
- main
77
pull_request: {}
88

99
env:
10-
NODE_VERSION: '20.x'
10+
NODE_VERSION: '22.x'
1111

1212
concurrency:
1313
group: ci-components-${{ github.head_ref || github.ref }}
1414
cancel-in-progress: true
1515

1616
jobs:
1717
conditional-skip:
18-
runs-on: ubuntu-latest
18+
runs-on: ubuntu-latest
1919
name: Get files changed and conditionally skip CI
2020
outputs:
2121
trigger-ci: ${{ steps.read-files.outputs.trigger-ci }}
2222
steps:
2323
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2424
with:
25-
fetch-depth: 0
25+
fetch-depth: 0
2626
- name: Get changed files
2727
id: read-files
2828
run: ./.github/scripts/filter_changed_files.sh "packages/components" "packages/flight-icons/catalog.json" "showcase" ".github/workflows/ci-components.yml" "packages/tokens"

.github/workflows/ci-compress-images.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
- cron: '00 23 * * 0'
66

77
env:
8-
NODE_VERSION: '20.x'
8+
NODE_VERSION: '22.x'
99

1010
jobs:
1111
build:

.github/workflows/ci-website.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,26 @@ on:
77
pull_request: {}
88

99
env:
10-
NODE_VERSION: '20.x'
10+
NODE_VERSION: '22.x'
1111

1212
concurrency:
1313
group: ci-website-${{ github.head_ref || github.ref }}
1414
cancel-in-progress: true
1515

1616
jobs:
1717
conditional-skip:
18-
runs-on: ubuntu-latest
18+
runs-on: ubuntu-latest
1919
name: Get files changed and conditionally skip CI
2020
outputs:
2121
trigger-ci: ${{ steps.read-files.outputs.trigger-ci }}
2222
steps:
2323
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2424
with:
25-
fetch-depth: 0
25+
fetch-depth: 0
2626
- name: Get changed files
2727
id: read-files
2828
run: ./.github/scripts/filter_changed_files.sh "website" "packages/flight-icons/catalog.json" ".github/workflows/ci-website.yml"
29-
29+
3030
lint:
3131
name: 'Lint'
3232
runs-on: ubuntu-latest

.github/workflows/open-pull-request-for-icon-update.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
workflow_dispatch:
55

66
env:
7-
NODE_VERSION: '20.x'
7+
NODE_VERSION: '22.x'
88

99
jobs:
1010
sync_iconset:

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- main
77

88
env:
9-
NODE_VERSION: '20.x'
9+
NODE_VERSION: '22.x'
1010

1111
jobs:
1212
release:

.yarn/releases/yarn-4.4.0.cjs

-925
This file was deleted.

.yarn/releases/yarn-4.5.3.cjs

+934
Large diffs are not rendered by default.

.yarnrc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ enableGlobalCache: false
44

55
nodeLinker: node-modules
66

7-
yarnPath: .yarn/releases/yarn-4.4.0.cjs
7+
yarnPath: .yarn/releases/yarn-4.5.3.cjs

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"release-packages": "yarn changeset publish",
1717
"version-packages": "yarn changeset version && yarn install --mode update-lockfile && yarn workspace website generate-changelog-markdown-files"
1818
},
19-
"packageManager": "yarn@4.4.0",
19+
"packageManager": "yarn@4.5.3",
2020
"resolutions": {
2121
"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",
2222
"@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"

packages/codemods/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"prettier": "^3.3.2"
3939
},
4040
"engines": {
41-
"node": "14.* || 16.* || >= 18"
41+
"node": ">= 18"
4242
},
4343
"jest": {
4444
"testEnvironment": "node"

packages/components/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"lint": "concurrently \"yarn:lint:*(!fix)\" --names \"lint:\"",
2828
"lint:fix": "concurrently \"yarn:lint:*:fix\" --names \"fix:\"",
2929
"lint:css": "stylelint \"src/styles/**/*.scss\"",
30-
"lint:css:fix": "concurrently \"yarn:lint:css -- --fix\"",
30+
"lint:css:fix": "concurrently \"yarn:lint:css --fix\"",
3131
"lint:types": "glint",
3232
"lint:hbs": "ember-template-lint .",
3333
"lint:hbs:fix": "ember-template-lint . --fix",
@@ -330,6 +330,6 @@
330330
"dist"
331331
],
332332
"engines": {
333-
"node": "16.* || >= 18"
333+
"node": ">= 18"
334334
}
335335
}

packages/ember-flight-icons/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Goals:
1818

1919
* Ember.js v3.28 or above
2020
* Ember CLI v3.28 or above
21-
* Node.js v16 or above
21+
* Node.js v18 or above
2222

2323
## Installation and Usage
2424

packages/ember-flight-icons/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,6 @@
110110
"dist"
111111
],
112112
"engines": {
113-
"node": "16.* || >= 18"
113+
"node": ">= 18"
114114
}
115115
}

packages/flight-icons/catalog.json

+41-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"lastRunTimeISO": "2024-11-15T20:52:01.535Z",
2+
"lastRunTimeISO": "2025-01-03T21:27:03.652Z",
33
"lastRunFigma": {
44
"id": "TLnoT5AYQfy3tZ0H68BgOr",
55
"page": "Export",
@@ -886,6 +886,46 @@
886886
"width": 16,
887887
"height": 16
888888
},
889+
{
890+
"id": "7057:66",
891+
"fileName": "confluence-24",
892+
"iconName": "confluence",
893+
"description": "confluence, atlassian, document",
894+
"category": "Services",
895+
"size": "24",
896+
"width": 24,
897+
"height": 24
898+
},
899+
{
900+
"id": "7057:70",
901+
"fileName": "confluence-16",
902+
"iconName": "confluence",
903+
"description": "confluence, atlassian, document",
904+
"category": "Services",
905+
"size": "16",
906+
"width": 16,
907+
"height": 16
908+
},
909+
{
910+
"id": "7057:77",
911+
"fileName": "confluence-color-24",
912+
"iconName": "confluence-color",
913+
"description": "confluence, atlassian, document",
914+
"category": "Services",
915+
"size": "24",
916+
"width": 24,
917+
"height": 24
918+
},
919+
{
920+
"id": "7057:81",
921+
"fileName": "confluence-color-16",
922+
"iconName": "confluence-color",
923+
"description": "confluence, atlassian, document",
924+
"category": "Services",
925+
"size": "16",
926+
"width": 16,
927+
"height": 16
928+
},
889929
{
890930
"id": "6750:66",
891931
"fileName": "confluent-24",
Loading
Loading
Loading
Loading

0 commit comments

Comments
 (0)