Skip to content

[2.x] Merge prop #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Draft
wants to merge 42 commits into
base: main
Choose a base branch
from
Draft

[2.x] Merge prop #23

wants to merge 42 commits into from

Conversation

adrum
Copy link
Contributor

@adrum adrum commented Dec 21, 2024 •
edited
Loading

@adrum adrum mentioned this pull request Dec 21, 2024
Open
10 tasks
@adrum adrum marked this pull request as draft December 21, 2024 19:45
@adrum adrum mentioned this pull request Dec 21, 2024
Draft
@kapi2289 kapi2289 added this to the v2.0.0 milestone Jan 3, 2025
kapi2289 and others added 6 commits January 6, 2025 17:29
@kapi2289
Merge branch 'main' into fork/adrum/feature/optional-prop
bd5b6c1 
# Conflicts:
#	InertiaCore/Extensions/Configure.cs
#	InertiaCore/Extensions/InertiaExtensions.cs
#	InertiaCore/Response.cs
#	InertiaCore/ResponseFactory.cs
#	InertiaCore/Utils/AlwaysProp.cs
#	InertiaCore/Utils/LocationResult.cs
#	InertiaCoreTests/UnitTestAlwaysData.cs
@kapi2289
Merge branch 'main' into fork/adrum/feature/merge-prop
d71be3b 
# Conflicts:
#	InertiaCore/Extensions/Configure.cs
#	InertiaCore/Extensions/InertiaExtensions.cs
#	InertiaCore/Inertia.cs
#	InertiaCore/Response.cs
#	InertiaCore/ResponseFactory.cs
#	InertiaCore/Utils/AlwaysProp.cs
#	InertiaCore/Utils/LocationResult.cs
#	InertiaCoreTests/UnitTestAlwaysData.cs
@kapi2289
Merge branch 'main' into fork/adrum/feature/optional-prop
66312a3
@kapi2289
Minor fixes and changes
cf2c45e
@kapi2289
Add missing Inertia static methods
42396a7
@adrum
Merge branch 'main' into feature/optional-prop
6b383a3 
# Conflicts:
#	InertiaCore/Props/LazyProp.cs
#	InertiaCore/Response.cs
adrum and others added 16 commits January 10, 2025 21:32
@adrum
make optional prop invokable
ea4592e
@adrum
Merge branch 'main' into feature/merge-prop
f62c188 
# Conflicts:
#	InertiaCore/Response.cs
@adrum
fix merge prop tests
1e949b0
@adrum
fix test sdks?
ad8c476
@adrum
fix test sdks?
6333daa
@adrum
Merge branch 'v1' into feature/optional-prop
a6a9fe0 
# Conflicts:
#	.github/workflows/dotnet.yml
#	InertiaCore/Response.cs
#	InertiaCore/ResponseFactory.cs
@adrum
revert formatting
2ae0bff
@adrum
one more formatting fix
0e9353c
@adrum
Merge branch 'feature/optional-prop' into feature/merge-prop
eb076cc 
# Conflicts:
#	.github/workflows/dotnet.yml
#	InertiaCore/Extensions/InertiaExtensions.cs
#	InertiaCore/Inertia.cs
#	InertiaCore/Response.cs
#	InertiaCore/ResponseFactory.cs
@kapi2289
Merge branch 'main' into fork/adrum/feature/merge-prop
28afc55 
# Conflicts:
#	InertiaCore/Models/Page.cs
#	InertiaCore/ResponseFactory.cs
@adrum
[2.x] Keep only partial data in mergeProps
d842ac8 
inertiajs/inertia-laravel#745
@adrum
[2.x] Allow deepMerge on custom properties
58913c9 
inertiajs/inertia-laravel#732

inertiajs/inertia#2344
@adrum
Add Inertia::deepMerge Method for Handling Complex Data Merges in Res…
0d393c0 
…ponses #

inertiajs/inertia-laravel#679
@adrum
[2.x] Refactor mergeStrategies argument to matchOn() method
a82297a 
inertiajs/inertia-laravel#747
@adrum
deep merge on mergable interface
6ab08f5
@adrum
fix merge prop
e1899d5
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

v2.0.0

Development

Successfully merging this pull request may close these issues.

2 participants

@adrum @kapi2289