Skip to content

Commit

Permalink
Merge pull request #2782 from brandingbrand/develop
Browse files Browse the repository at this point in the history
gitflow: merge develop to main with jest-config release
  • Loading branch information
crherman7 authored Dec 18, 2024
2 parents 7beeea1 + 0dcc874 commit c572d00
Show file tree
Hide file tree
Showing 6 changed files with 1,492 additions and 654 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pr-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
with:
node-version: 20
- name: Setup Ruby
uses: ruby/setup-ruby@5f19ec79cedfadb78ab837f95b87734d0003c899
uses: ruby/setup-ruby@f26937343756480a8cb3ae1f623b9c8d89ed6984
with:
ruby-version: '3.1'
- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion apps/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"dependencies": {
"@astrojs/check": "^0.4.1",
"@astrojs/starlight": "^0.17.0",
"astro": "^4.2.1",
"astro": "^4.16.17",
"lottie-web": "^5.12.2",
"sharp": "^0.32.5",
"typescript": "^5.3.3"
Expand Down
6 changes: 3 additions & 3 deletions apps/example/coderc/plugins/plugin-example/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1013,9 +1013,9 @@ create-jest@^29.7.0:
prompts "^2.0.1"

cross-spawn@^7.0.2, cross-spawn@^7.0.3:
version "7.0.3"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
version "7.0.6"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
dependencies:
path-key "^3.1.0"
shebang-command "^2.0.0"
Expand Down
6 changes: 6 additions & 0 deletions packages/jest-config/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @brandingbrand/code-jest-config

## 1.1.0

### Patch Changes

- update to support @brandingbrand/code-cli version 13.1.0 changes

## 1.0.0

### Major Changes
Expand Down
5 changes: 4 additions & 1 deletion packages/jest-config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@brandingbrand/code-jest-config",
"version": "1.0.0",
"version": "1.1.0",
"license": "MIT",
"files": [
"build",
Expand All @@ -18,6 +18,9 @@
"dependencies": {
"ts-jest": "^29.1.2"
},
"peerDependencies": {
"@brandingbrand/code-cli": "^13.1.0"
},
"devDependencies": {
"@types/jest": "^29.5.11",
"@types/temp": "^0.9.4",
Expand Down
Loading

0 comments on commit c572d00

Please sign in to comment.