Skip to content

Fix false conflict detection when revisionHistory is empty #519

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

Open
wcr-karan wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix false conflict detection when revisionHistory is empty #519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5018513
Fix false conflict detection when revisionHistory is empty
wcr-karan Nov 29, 2025
1f9a3da
chore: update node engine to >=20
wcr-karan Nov 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@
},
"packageManager": "yarn@3.6.3",
"engines": {
"node": ">=18"
"node": ">=20"
},
"dependencies": {
"@actions/core": "^1.10.0"
}
}
}
15 changes: 8 additions & 7 deletions packages/core/src/projects/initialiseProjectState.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// import type {Studio} from '@theatre/studio/Studio'
import delay from '@theatre/utils/delay'
import type Project from './Project'
import type {OnDiskState} from '@theatre/core/types/private/core'
import {globals} from '@theatre/core/globals'
import {val} from '@theatre/dataverse'
import type {$____FixmeStudio} from '@theatre/core/types/public'
import type { OnDiskState } from '@theatre/core/types/private/core'
import { globals } from '@theatre/core/globals'
import { val } from '@theatre/dataverse'
import type { $____FixmeStudio } from '@theatre/core/types/public'

type Studio = $____FixmeStudio

Expand Down Expand Up @@ -32,7 +32,7 @@ export default async function initialiseProjectState(
(p: $____FixmeStudio) => p.coreByProject[projectId],
{
lastExportedObject: null,
loadingState: {type: 'loading'},
loadingState: { type: 'loading' },
},
)

Expand All @@ -49,6 +49,7 @@ export default async function initialiseProjectState(
useBrowserState()
} else {
if (
onDiskState.revisionHistory.length > 0 &&
browserState.revisionHistory.indexOf(onDiskState.revisionHistory[0]) ==
-1
) {
Expand All @@ -60,7 +61,7 @@ export default async function initialiseProjectState(
}

function useInitialState() {
studio.transaction(({stateEditors}: $____FixmeStudio) => {
studio.transaction(({ stateEditors }: $____FixmeStudio) => {
stateEditors.coreByProject.historic.setProjectState({
projectId,
state: {
Expand All @@ -79,7 +80,7 @@ export default async function initialiseProjectState(
}

function useOnDiskState(state: OnDiskState) {
studio.transaction(({stateEditors}: $____FixmeStudio) => {
studio.transaction(({ stateEditors }: $____FixmeStudio) => {
stateEditors.coreByProject.historic.setProjectState({
projectId,
state,
Expand Down