Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into benelan/revert-icon-types
Browse files Browse the repository at this point in the history
* origin/dev:
  docs(list-item): add list as a type of element allowed in default slot. (#9934)
  build(deps): pin dependency @esri/calcite-ui-icons to 3.30.0 (#9918)
  build(deps): update dependency eslint-plugin-jsdoc to v48.8.3 (#9919)
  build: update browserslist db (#9927)
  docs: update component READMEs (#9928)
  docs(modal): update component deprecation message to v4 (#9925)
  test(tooltip): enhance test to better cover shadow root elements being focused (#9911)
  build(deps): update nrwl monorepo to v19.5.3 (#9902)
  build(deps): update dependency cpy to v11.1.0 (#9903)
  chore: release main (#9716) (#9916)
  chore: release next
  fix: widen icon type to allow string (#9915)
  ci: fix chromatic icon build errors (#9906)
  chore: release next
  • Loading branch information
benelan committed Aug 1, 2024
2 parents 768fa3b + ee257a6 commit 6dd5f48
Show file tree
Hide file tree
Showing 54 changed files with 587 additions and 970 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/chromatic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@ jobs:
- uses: actions/setup-node@v4
with:
node-version-file: package.json
- run: npm install
- run: npm --workspace="packages/calcite-design-tokens" run build
- run: |
npm install
npm --workspace="packages/calcite-design-tokens" run build
npm --workspace="packages/calcite-ui-icons" run build
- name: Publish to Chromatic
uses: chromaui/action@v11
with:
Expand Down
8 changes: 4 additions & 4 deletions .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"packages/calcite-components": "2.10.1",
"packages/calcite-components-react": "2.10.1",
"packages/calcite-components": "2.11.0",
"packages/calcite-components-react": "2.11.0",
"packages/calcite-design-tokens": "2.2.0",
"packages/calcite-ui-icons": "3.29.0",
"packages/calcite-ui-icons": "3.30.0",
"packages/eslint-plugin-calcite-components": "1.2.0",
"packages/calcite-components-angular/projects/component-library": "2.10.1"
"packages/calcite-components-angular/projects/component-library": "2.11.0"
}
166 changes: 75 additions & 91 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,14 @@
"chromatic": "11.5.6",
"concurrently": "8.2.2",
"conventional-changelog-conventionalcommits": "7.0.2",
"cpy": "11.0.1",
"cpy": "11.1.0",
"cpy-cli": "5.0.0",
"dedent": "1.5.3",
"eslint": "8.57.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-import": "2.29.1",
"eslint-plugin-jest": "28.6.0",
"eslint-plugin-jsdoc": "48.4.0",
"eslint-plugin-jsdoc": "48.8.3",
"eslint-plugin-prettier": "5.1.3",
"eslint-plugin-react": "7.34.4",
"eslint-plugin-unicorn": "54.0.0",
Expand Down Expand Up @@ -135,8 +135,8 @@
"patch-package": "8.0.0"
},
"optionalDependencies": {
"@nx/nx-darwin-arm64": "19.5.1",
"@nx/nx-darwin-arm64": "19.5.3",
"@nx/nx-linux-x64-gnu": "18.3.5",
"@nx/nx-win32-x64-msvc": "19.5.1"
"@nx/nx-win32-x64-msvc": "19.5.3"
}
}
Loading

0 comments on commit 6dd5f48

Please sign in to comment.