Skip to content

Commit e4b7bc0

Browse files
committed
Merge branch 'main' into next
# Conflicts: # .github/ISSUE_TEMPLATE/bug_report.md # .github/workflows/nodejs.yml # package.json # packages/core/package.json # packages/core/rollup.config.js # packages/core/src/Actor.ts # packages/core/src/Machine.ts # packages/core/src/State.ts # packages/core/src/StateNode.ts # packages/core/src/actions.ts # packages/core/src/behaviors.ts # packages/core/src/dev/index.ts # packages/core/src/each.ts # packages/core/src/index.ts # packages/core/src/interpreter.ts # packages/core/src/model.ts # packages/core/src/model.types.ts # packages/core/src/scxml.ts # packages/core/src/stateUtils.ts # packages/core/src/types.ts # packages/core/src/utils.ts # packages/core/test/actionCreators.test.ts # packages/core/test/actions.test.ts # packages/core/test/actor.test.ts # packages/core/test/after.test.ts # packages/core/test/event.test.ts # packages/core/test/examples/6.16.test.ts # packages/core/test/examples/6.17.test.ts # packages/core/test/fixtures/id.ts # packages/core/test/guards.test.ts # packages/core/test/id.test.ts # packages/core/test/interpreter.test.ts # packages/core/test/invoke.test.ts # packages/core/test/order.test.ts # packages/core/test/parallel.test.ts # packages/core/test/scxml.test.ts # packages/core/test/types.test.ts # packages/core/test/utils.ts # packages/xstate-analytics/package.json # packages/xstate-analytics/src/index.ts # packages/xstate-fsm/package.json # packages/xstate-graph/package.json # packages/xstate-graph/src/graph.ts # packages/xstate-inspect/examples/server.ts # packages/xstate-inspect/package.json # packages/xstate-inspect/src/browser.ts # packages/xstate-inspect/src/inspectMachine.ts # packages/xstate-inspect/src/serialize.ts # packages/xstate-inspect/src/server.ts # packages/xstate-inspect/src/types.ts # packages/xstate-react/package.json # packages/xstate-react/src/useInterpret.ts # packages/xstate-react/src/useMachine.ts # packages/xstate-react/src/useService.ts # packages/xstate-react/src/useSpawn.ts # packages/xstate-react/test/types.test.tsx # packages/xstate-react/test/useActor.test.tsx # packages/xstate-react/test/useMachine.test.tsx # packages/xstate-react/test/useSelector.test.tsx # packages/xstate-react/test/useService.test.tsx # packages/xstate-scxml/package.json # packages/xstate-scxml/src/index.ts # packages/xstate-scxml/test/fixtures/assign-current-small-step/test1.ts # packages/xstate-scxml/test/fixtures/assign/assign_invalid.ts # packages/xstate-scxml/test/scxml.test.ts # packages/xstate-svelte/package.json # packages/xstate-svelte/src/useMachine.ts # packages/xstate-svelte/test/UseMachine.svelte # packages/xstate-test/package.json # packages/xstate-test/src/types.ts # packages/xstate-vue/package.json # packages/xstate-vue/src/useInterpret.ts # packages/xstate-vue/src/useSpawn.ts # packages/xstate-vue/test/UseMachine.vue # yarn.lock
2 parents d415de2 + e58857f commit e4b7bc0

File tree

137 files changed

+4493
-1728
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+4493
-1728
lines changed

.changeset/chilled-ghosts-turn.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'xstate': patch
3+
---
4+
5+
Added some internal `@ts-ignore` comments to fix consuming projects that do not use `skipLibCheck`.

.changeset/config.json

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
{
22
"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
3-
"changelog": [
4-
"@changesets/changelog-github",
5-
{ "repo": "davidkpiano/xstate" }
6-
],
3+
"changelog": ["@changesets/changelog-github", { "repo": "statelyai/xstate" }],
74
"commit": false,
85
"linked": [],
96
"access": "public",
107
"baseBranch": "main",
118
"ignore": ["@xstate/analytics", "@xstate/scxml"],
129
"___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
13-
"onlyUpdatePeerDependentsWhenOutOfRange": true
10+
"onlyUpdatePeerDependentsWhenOutOfRange": true,
11+
"useCalculatedVersionForSnapshots": true
1412
}
1513
}

.changeset/cuddly-hats-swim.md

Lines changed: 0 additions & 13 deletions
This file was deleted.

.changeset/empty-hairs-knock.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'xstate': patch
3+
---
4+
5+
Fixed an issue with context type being inferred from too many places within `createMachine` call and possibly ending up as `any` for the entire machine.

.changeset/lemon-mugs-attack.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'xstate': patch
3+
---
4+
5+
Fixed an issue with not being able to call `createMachine` in a generic context when the type for the context was generic and not concrete.

.changeset/red-frogs-yell.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'xstate': patch
3+
---
4+
5+
Fixed an issue with context type defined using `schema.context` being sometimes widened based on `config.context`. If both are given the `schema.context` should always take precedence and should represent the complete type of the context.

.changeset/short-eels-cough.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
'xstate': patch
3+
'@xstate/graph': patch
4+
'@xstate/inspect': patch
5+
'@xstate/react': patch
6+
'@xstate/vue': patch
7+
---
8+
9+
Fixed compatibility with Skypack by exporting some shared utilities from root entry of XState and consuming them directly in other packages (this avoids accessing those things using deep imports and thus it avoids creating those compatibility problems).

.changeset/thin-hounds-kiss.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'xstate': patch
3+
---
4+
5+
Fixed an issue with `ActorRefFrom` not resolving the typegen metadata from machine types given to it. This could sometimes result in types assignability problems, especially when using machine factories and `spawn`.

.codesandbox/ci.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"packages": [
3+
"packages/core",
4+
"packages/xstate-fsm",
5+
"packages/xstate-graph",
6+
"packages/xstate-react",
7+
"packages/xstate-test"
8+
],
9+
"sandboxes": ["xstate-example-template-m4ckv", "xstate-react-template-3t2tg"]
10+
}

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)