Skip to content

Commit

Permalink
Merge branch 'inertiajs:master' into frames
Browse files Browse the repository at this point in the history
  • Loading branch information
buhrmi authored Apr 4, 2024
2 parents 1e3517d + 7fc076c commit 009e183
Show file tree
Hide file tree
Showing 13 changed files with 1,283 additions and 3,601 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

For changes prior to v1.0.0, see the [legacy releases](https://legacy.inertiajs.com/releases).

## [Unreleased](https://github.com/inertiajs/inertia/compare/v1.0.14...HEAD)
## [Unreleased](https://github.com/inertiajs/inertia/compare/v1.0.15...HEAD)

- Nothing

## [v1.0.15](https://github.com/inertiajs/inertia/compare/v1.0.14...v1.0.15)

- Bump axios from `v1.4.0` to `v1.6.0` ([#1723](https://github.com/inertiajs/inertia/pull/1723))

## [v1.0.14](https://github.com/inertiajs/inertia/compare/v1.0.13...v1.0.14)

- Revert "Clear errors on form reset (#1568)" ([#1716](https://github.com/inertiajs/inertia/pull/1716))
Expand Down
4,839 changes: 1,258 additions & 3,581 deletions package-lock.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"name": "inertia",
"private": true,
"workspaces": [
"packages/*",
Expand Down
4 changes: 2 additions & 2 deletions packages/core/package.json
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@inertiajs/core",
"version": "1.0.14",
"version": "1.0.15",
"license": "MIT",
"description": "A framework for creating server-driven single page apps.",
"contributors": [
Expand Down Expand Up @@ -50,7 +50,7 @@
"prepublishOnly": "npm run build"
},
"dependencies": {
"axios": "^1.2.0",
"axios": "^1.6.0",
"deepmerge": "^4.0.0",
"nprogress": "^0.2.0",
"qs": "^6.9.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@inertiajs/react",
"version": "1.0.14",
"version": "1.0.15",
"license": "MIT",
"description": "The React adapter for Inertia.js",
"contributors": [
Expand Down Expand Up @@ -59,7 +59,7 @@
"react": "^16.9.0 || ^17.0.0 || ^18.0.0"
},
"dependencies": {
"@inertiajs/core": "1.0.14",
"@inertiajs/core": "1.0.15",
"lodash.isequal": "^4.5.0"
}
}
4 changes: 2 additions & 2 deletions packages/svelte/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@inertiajs/svelte",
"version": "1.0.14",
"version": "1.0.15",
"license": "MIT",
"description": "The Svelte adapter for Inertia.js",
"contributors": [
Expand Down Expand Up @@ -28,7 +28,7 @@
"svelte": "^3.20.0 || ^4.0.0"
},
"dependencies": {
"@inertiajs/core": "1.0.14",
"@inertiajs/core": "1.0.15",
"lodash.clonedeep": "^4.5.0",
"lodash.isequal": "^4.5.0"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/vue2/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@inertiajs/vue2",
"version": "1.0.14",
"version": "1.0.15",
"license": "MIT",
"description": "The Vue 2 adapter for Inertia.js",
"contributors": [
Expand Down Expand Up @@ -58,7 +58,7 @@
"vue": "^2.7.0"
},
"dependencies": {
"@inertiajs/core": "1.0.14",
"@inertiajs/core": "1.0.15",
"lodash.clonedeep": "^4.5.0",
"lodash.isequal": "^4.5.0"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/vue3/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@inertiajs/vue3",
"version": "1.0.14",
"version": "1.0.15",
"license": "MIT",
"description": "The Vue 3 adapter for Inertia.js",
"contributors": [
Expand Down Expand Up @@ -56,7 +56,7 @@
"vue": "^3.0.0"
},
"dependencies": {
"@inertiajs/core": "1.0.14",
"@inertiajs/core": "1.0.15",
"lodash.clonedeep": "^4.5.0",
"lodash.isequal": "^4.5.0"
}
Expand Down
4 changes: 2 additions & 2 deletions playgrounds/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
"@types/react-dom": "^16.9.18",
"@vitejs/plugin-react": "^3.0.0",
"autoprefixer": "^10.4.13",
"axios": "^1.1.2",
"axios": "^1.6.0",
"laravel-vite-plugin": "^0.7.2",
"lodash": "^4.17.19",
"postcss": "^8.4.31",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"tailwindcss": "^3.2.4",
"typescript": "^4.9.5",
"vite": "^4.0.5"
"vite": "^4.5.3"
}
}
4 changes: 2 additions & 2 deletions playgrounds/svelte/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
"@inertiajs/svelte": "^1.0.0",
"@sveltejs/vite-plugin-svelte": "^2.4.2",
"autoprefixer": "^10.4.13",
"axios": "^1.1.2",
"axios": "^1.6.0",
"laravel-vite-plugin": "^0.7.2",
"lodash": "^4.17.19",
"postcss": "^8.4.31",
"svelte": "^4.0.0",
"tailwindcss": "^3.2.4",
"vite": "^4.0.5"
"vite": "^4.5.3"
}
}
4 changes: 2 additions & 2 deletions playgrounds/vue2/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
"@vitejs/plugin-vue2": "^2.2.0",
"@volar/vue-typescript": "^1.0.22",
"autoprefixer": "^10.4.13",
"axios": "^1.1.2",
"axios": "^1.6.0",
"laravel-vite-plugin": "^0.7.2",
"lodash": "^4.17.19",
"postcss": "^8.4.31",
"tailwindcss": "^3.2.4",
"vite": "^4.0.5",
"vite": "^4.5.3",
"vue": "^2.7.14",
"vue-server-renderer": "^2.7.14"
}
Expand Down
4 changes: 2 additions & 2 deletions playgrounds/vue3/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
"@volar/vue-typescript": "^1.0.22",
"@vue/server-renderer": "^3.3.4",
"autoprefixer": "^10.4.13",
"axios": "^1.1.2",
"axios": "^1.6.0",
"laravel-vite-plugin": "^0.7.2",
"lodash": "^4.17.19",
"postcss": "^8.4.31",
"tailwindcss": "^3.2.4",
"typescript": "^4.9.4",
"vite": "^4.0.5",
"vite": "^4.5.3",
"vue": "^3.3.4",
"vue-tsc": "^1.0.24"
}
Expand Down
2 changes: 1 addition & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ A huge thanks to all [our sponsors](https://inertiajs.com/sponsors) who help pus
</a>
</p>

If you'd like to become a sponsor, please [see here](https://inertiajs.com/sponsors) for more information. 💜
If you'd like to become a sponsor, please [see here](https://github.com/sponsors/reinink) for more information. 💜

0 comments on commit 009e183

Please sign in to comment.