Skip to content

Commit 03722cb

Browse files
committed
Merge remote-tracking branch 'origin/dev' into benelan/9255-add-icons-to-monorepo
* origin/dev: (206 commits) fix(tile): center align slot's text when alignment is equal to center (#9773) build: regenerate package lock due to build errors (#9774) build(deps): update dependency @floating-ui/dom to v1.6.7 (#9766) chore(common-tests): add themed test helper (#9763) chore: release next fix(shell): update shell to correctly position calcite shell panel at shell's bottom (#9748) chore: release next fix(tile): center align contentTop and contentBottom slots when alignment prop equals "center" (#9732) chore: release next chore(tree-item): fix mutable warning `indeterminate` prop (#9760) fix(panel, flow-item): fix footer-padding CSS prop regression (#9757) build(deps): update angular monorepo to v18 (major) (#9587) chore: release next Chore: remove component usage files (#9052) fix(input-number): restore decimal input mode default (#9741) test(panel, flow-item): add scale control to simple stories (#9747) chore: release next feat(panel, flow-item): add scale property (#9730) chore: release next fix(segmented-control): Make check state update correctly (#9733) ...
2 parents 79e32a2 + 4a26398 commit 03722cb

File tree

590 files changed

+15598
-12374
lines changed

Some content is hidden

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

590 files changed

+15598
-12374
lines changed

.github/ISSUE_TEMPLATE/accessibility.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ body:
9999
id: packages
100100
attributes:
101101
label: Calcite package
102-
description: Select the relevant [package(s)](https://github.com/Esri/calcite-design-system/tree/main/packages) related to the request.
102+
description: Select the relevant [package(s)](https://github.com/Esri/calcite-design-system/tree/dev/packages) related to the request.
103103
options:
104104
- label: "@esri/calcite-components"
105105
- label: "@esri/calcite-components-angular"

.github/ISSUE_TEMPLATE/bug.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ body:
9393
id: packages
9494
attributes:
9595
label: Calcite package
96-
description: Select the relevant [package(s)](https://github.com/Esri/calcite-design-system/tree/main/packages) related to the request.
96+
description: Select the relevant [package(s)](https://github.com/Esri/calcite-design-system/tree/dev/packages) related to the request.
9797
options:
9898
- label: "@esri/calcite-components"
9999
- label: "@esri/calcite-components-angular"

.github/ISSUE_TEMPLATE/enhancement.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ body:
6262
id: packages
6363
attributes:
6464
label: Calcite package
65-
description: Select the relevant [package(s)](https://github.com/Esri/calcite-design-system/tree/main/packages) related to the request.
65+
description: Select the relevant [package(s)](https://github.com/Esri/calcite-design-system/tree/dev/packages) related to the request.
6666
options:
6767
- label: "@esri/calcite-components"
6868
- label: "@esri/calcite-components-angular"

.github/ISSUE_TEMPLATE/refactor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ body:
3838
id: packages
3939
attributes:
4040
label: Calcite package
41-
description: Select the relevant [package(s)](https://github.com/Esri/calcite-design-system/tree/main/packages) related to the request.
41+
description: Select the relevant [package(s)](https://github.com/Esri/calcite-design-system/tree/dev/packages) related to the request.
4242
options:
4343
- label: "@esri/calcite-components"
4444
- label: "@esri/calcite-components-angular"

.github/scripts/publishPrerelease.sh

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
#!/usr/bin/env bash
2+
set -o errexit
3+
4+
if [ "$BRANCH" = "dev" ] && [ "$NEXT_RELEASE_ENABLED" != "true" ]; then
5+
echo "Next release is disabled"
6+
exit 0
7+
fi
8+
9+
npm install
10+
11+
if [ "$BRANCH" = "dev" ] && ! npm run util:is-next-deployable; then
12+
echo "No deployable changes on dev"
13+
exit 0
14+
fi
15+
16+
git config --global user.email "github-actions[bot]@users.noreply.github.com"
17+
git config --global user.name "github-actions[bot]"
18+
19+
# version the packages with lerna before building to ensure the version in
20+
# Calcite components' source code preamble is correct for deployment
21+
if [ "$BRANCH" = "dev" ]; then
22+
npm run version:next
23+
elif [ "$BRANCH" = "rc" ]; then
24+
npm run version:rc
25+
else
26+
echo "Prereleases are only deployable from the 'dev' and 'rc' branches."
27+
exit 1
28+
fi
29+
30+
npm run build
31+
npm test
32+
33+
# try deploying storybook, but still release next if it fails with "|| true"
34+
if [ "$BRANCH" = "dev" ]; then
35+
{ npm run --workspace=@esri/calcite-components build-storybook &&
36+
npx --workspace=@esri/calcite-components storybook-to-ghpages \
37+
--host-token-env-variable=GH_TOKEN_FOR_STORYBOOK \
38+
--existing-output-dir=docs --ci; } || true
39+
40+
# remove the built docs after storybook deploys to gh-pages
41+
git reset --hard
42+
fi
43+
44+
if [ "$BRANCH" = "dev" ]; then
45+
npm run publish:next
46+
elif [ "$BRANCH" = "rc" ]; then
47+
npm run publish:rc
48+
fi
49+
50+
npm run util:push-tags

.github/workflows/add-esri-product-label.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

.github/workflows/add-package-label.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

.github/workflows/add-priority-label.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

.github/workflows/assign-for-verification.yml

Lines changed: 0 additions & 17 deletions
This file was deleted.

.github/workflows/chromatic.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: Chromatic
22
on:
33
push:
4-
branches: [main, hotfix, rc]
4+
branches: [rc, dev]
55
pull_request:
6-
branches: [main, hotfix, rc]
6+
branches: [rc, dev]
77
types: [labeled, synchronize]
88
jobs:
99
run:
@@ -20,7 +20,7 @@ jobs:
2020
- run: npm install
2121
- run: npm --workspace="packages/calcite-design-tokens" run build
2222
- name: Publish to Chromatic
23-
uses: chromaui/action@v1
23+
uses: chromaui/action@v11
2424
with:
2525
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
2626
zip: true

0 commit comments

Comments
 (0)