Skip to content
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

Update TypeScript to 5.7.2 #5128

Merged
merged 9 commits into from
Nov 29, 2024
Merged

Update TypeScript to 5.7.2 #5128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a807b33
Update TypeScript version and add type assertions in tests
davidkpiano Nov 27, 2024
7075525
Merge branch 'main' into davidkpiano/ts-5.7.2
davidkpiano Nov 28, 2024
ad418e4
Revert pnpm-lock.yaml
davidkpiano Nov 28, 2024
17ea46c
Lockfile
davidkpiano Nov 28, 2024
9b988ec
Lockfile?
davidkpiano Nov 28, 2024
66f8a50
Update typescript-eslint
davidkpiano Nov 28, 2024
05c87c9
Make eslint happy
davidkpiano Nov 28, 2024
b798338
fixed it without casts
Andarist Nov 28, 2024
52d9cdd
ugh, use `unknown` annotation to satisfy eslin
Andarist Nov 28, 2024
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 @@ -79,8 +79,8 @@
"prettier-plugin-jsdoc": "^1.3.0",
"svelte-jester": "^2.3.2",
"synckit": "^0.8.5",
"typescript": "^5.6.2",
"typescript-eslint": "^8.0.1",
"typescript": "^5.7.2",
"typescript-eslint": "^8.16.0",
"vue": "^3.0.11"
},
"husky": {
Expand Down
2 changes: 1 addition & 1 deletion packages/xstate-inspect/src/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export function inspect(options: ServerInspectorOptions): Inspector {
};

server.on('connection', function connection(wsClient) {
wsClient.on('message', function incoming(data, isBinary) {
wsClient.on('message', function incoming(data: unknown, isBinary) {
if (isBinary) {
return;
}
Expand Down
58 changes: 30 additions & 28 deletions packages/xstate-react/test/useActor.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ import {
assign,
createActor,
createMachine,
raise
raise,
setup
} from 'xstate';
import { fromCallback, fromObservable, fromPromise } from 'xstate/actors';
import { useActor, useSelector } from '../src/index.ts';
Expand Down Expand Up @@ -664,37 +665,34 @@ describeEachReactMode('useActor (%s)', ({ suiteKey, render }) => {
it('should be able to use a delay provided outside of React', () => {
jest.useFakeTimers();

const machine = createMachine(
{
initial: 'a',
states: {
a: {
on: {
EV: 'b'
}
},
b: {
after: {
myDelay: 'c'
}
},
c: {}
const machine = setup({
delays: {
myDelay: () => {
return 300;
}
},
{
delays: {
myDelay: () => {
return 300;
}
}).createMachine({
initial: 'a',
states: {
a: {
on: {
EV: 'b'
}
}
},
b: {
after: {
myDelay: 'c'
}
},
c: {}
}
);
});

const App = () => {
const [state, send] = useActor(machine);
return (
<>
<div data-testid="result">{state.value as string}</div>
<div data-testid="result">{state.value}</div>
<button onClick={() => send({ type: 'EV' })} />
</>
);
Expand All @@ -715,7 +713,11 @@ describeEachReactMode('useActor (%s)', ({ suiteKey, render }) => {
});

it('should not use stale data in a guard', () => {
const machine = createMachine({
const machine = setup({
guards: {
isAwesome: () => false
}
}).createMachine({
initial: 'a',
states: {
a: {
Expand All @@ -740,7 +742,7 @@ describeEachReactMode('useActor (%s)', ({ suiteKey, render }) => {
);
return (
<>
<div data-testid="result">{state.value as string}</div>
<div data-testid="result">{state.value}</div>
<button onClick={() => send({ type: 'EV' })} />
</>
);
Expand Down Expand Up @@ -784,7 +786,7 @@ describeEachReactMode('useActor (%s)', ({ suiteKey, render }) => {
});

it('child component should be able to send an event to a parent immediately in an effect', () => {
const machine = createMachine({
const machine = setup({}).createMachine({
types: {} as {
events: {
type: 'FINISH';
Expand Down Expand Up @@ -1030,7 +1032,7 @@ describeEachReactMode('useActor (%s)', ({ suiteKey, render }) => {
});

it('should execute a delayed transition of the initial state', async () => {
const machine = createMachine({
const machine = setup({}).createMachine({
initial: 'one',
states: {
one: {
Expand Down
14 changes: 8 additions & 6 deletions packages/xstate-react/test/useSelector.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ import {
StateFrom,
Snapshot,
TransitionSnapshot,
AnyEventObject
AnyEventObject,
setup
} from 'xstate';
import {
shallowEqual,
Expand Down Expand Up @@ -537,7 +538,7 @@ describeEachReactMode('useSelector (%s)', ({ suiteKey, render }) => {

return (
<>
{value}
{value as number}
<button
type="button"
onClick={() => forceRerender((s) => s + 1)}
Expand Down Expand Up @@ -647,7 +648,7 @@ describeEachReactMode('useSelector (%s)', ({ suiteKey, render }) => {
});

it('should work with initially deferred actors spawned in lazy context', () => {
const childMachine = createMachine({
const childMachine = setup({}).createMachine({
initial: 'one',
states: {
one: {
Expand All @@ -657,10 +658,11 @@ describeEachReactMode('useSelector (%s)', ({ suiteKey, render }) => {
}
});

const machine = createMachine({
const machine = setup({
types: {} as {
context: { ref: ActorRefFrom<typeof childMachine> };
},
}
}).createMachine({
context: ({ spawn }) => ({
ref: spawn(childMachine)
}),
Expand All @@ -682,7 +684,7 @@ describeEachReactMode('useSelector (%s)', ({ suiteKey, render }) => {

return (
<>
<div data-testid="child-state">{childState.value as string}</div>
<div data-testid="child-state">{childState.value}</div>
<button
data-testid="child-send"
onClick={() => childRef.send({ type: 'NEXT' })}
Expand Down
Loading