Skip to content

Commit 98cd22b

Browse files
committed
Merge remote-tracking branch 'origin/main' into benelan/8057-input-message
* origin/main: (22 commits) build(deps): update dependency @types/lodash-es to v4.17.12 (#8347) build(deps): update dependency @types/semver to v7.5.6 (#8348) ci: stop formatting components.d.ts (#8358) build(deps): update dependency @types/shell-quote to v1.7.5 (#8349) ci: remove workarounds no longer needed with Stencil v4 (#8325) refactor(input, input-number, input-text): avoid redundant `:host` (#8163) fix(color-context tokens): only apply when `.calcite-mode-auto` is applied (#8344) test(dropdown): fix dropdown E2E suite grouping (#8319) build(deps): update dependency @types/jest-axe to v3.5.9 (#8346) refactor(dropdown): remove obsolete logic (#8321) fix(action-menu): fix closing action menu after a drag occurs (#8339) fix(shell, shell-panel): support resizing shell panel when there is an iframe slotted in shell content (#8317) chore(dropdown): update demo page to use selected vs active (removed) (#8322) fix(action-menu): Filter hidden or disabled actions via keyboard. (#8336) build(deps): update dependency @esri/calcite-ui-icons to v3.25.1 (#8331) build(deps): update dependency @types/color to v3.0.6 (#8332) build(deps): update dependency @types/dedent to v0.7.2 (#8334) build(deps): update dependency @types/estree to v1.0.5 (#8335) chore(demos): update outdated CSS variable names after token breaking changes (#8333) build(deps): update dependency @tokens-studio/sd-transforms to v0.12.1 (#8146) ...
2 parents a6b2c0c + 81fab56 commit 98cd22b

33 files changed

+14193
-16795
lines changed

.github/workflows/deploy-next.yml

+11-8
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@ jobs:
2121
registry-url: "https://registry.npmjs.org"
2222
env:
2323
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
24-
- name: e2e test
25-
run: |
26-
npm install
27-
npm run build
28-
npm test
2924
- name: storybook/next deployment
3025
env:
3126
NEXT_RELEASE_ENABLED: ${{ secrets.NEXT_RELEASE_ENABLED }}
@@ -36,14 +31,22 @@ jobs:
3631
if npm run util:is-next-deployable; then
3732
git config --global user.email "github-actions[bot]@users.noreply.github.com"
3833
git config --global user.name "github-actions[bot]"
34+
35+
npm install
36+
# version the packages with lerna before building to ensure
37+
# the version in the CC source code preamble is correct for deployment
38+
npm run version:next
39+
npm run build
40+
npm test
41+
3942
# deploy storybook, but still release next if it fails
4043
{ npm run --workspace=@esri/calcite-components build-storybook &&
4144
npx --workspace=@esri/calcite-components storybook-to-ghpages \
42-
--host-token-env-variable=GH_TOKEN_FOR_STORYBOOK --existing-output-dir=docs --ci; } || true
45+
--host-token-env-variable=GH_TOKEN_FOR_STORYBOOK \
46+
--existing-output-dir=docs --ci; } || true
4347
44-
# remove the build to docs after storybook deploys to gh-pages
48+
# remove the built docs after storybook deploys to gh-pages
4549
git reset --hard
46-
npm run version:next
4750
npm run publish:next
4851
npm run util:push-tags
4952
fi

.prettierignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
**/*.d.ts
2+
**/dist
3+
**/.turbo

package-lock.json

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

0 commit comments

Comments
 (0)