From d00a6ba227dcd400dbac60809f364a940c5a1eb4 Mon Sep 17 00:00:00 2001 From: David Khourshid Date: Mon, 6 May 2024 10:05:30 -0400 Subject: [PATCH 1/2] Update dependencies --- package.json | 2 +- packages/sky-core/package.json | 6 +- packages/sky-core/src/actorFromStately.ts | 3 + packages/sky-react/package.json | 10 +-- packages/sky-react/src/useStatelyActor.ts | 1 + yarn.lock | 79 ++++++++++++----------- 6 files changed, 53 insertions(+), 48 deletions(-) diff --git a/package.json b/package.json index a59182b..965285b 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "@preconstruct/cli": "^2.8.1", "prettier": "^3.0.3", "prettier-plugin-organize-imports": "^3.2.3", - "typescript": "^5.2.2" + "typescript": "^5.4.5" }, "scripts": { "preinstall": "node ./scripts/ensure-yarn.js", diff --git a/packages/sky-core/package.json b/packages/sky-core/package.json index d8fa696..12c4be8 100644 --- a/packages/sky-core/package.json +++ b/packages/sky-core/package.json @@ -30,8 +30,8 @@ }, "homepage": "https://github.com/statelyai/sky/tree/main/packages/sky-core#readme", "dependencies": { - "partysocket": "0.0.17", - "superjson": "1.13.1", - "xstate": "5.2.1" + "partysocket": "^1.0.1", + "superjson": "^2.2.1", + "xstate": "^5.13.0" } } diff --git a/packages/sky-core/src/actorFromStately.ts b/packages/sky-core/src/actorFromStately.ts index 4b48eb1..386dca8 100644 --- a/packages/sky-core/src/actorFromStately.ts +++ b/packages/sky-core/src/actorFromStately.ts @@ -17,12 +17,14 @@ export async function actorFromStately( sessionId, onPlayerJoined, onPlayerLeft, + input, }: { apiKey: string; url: string; sessionId: string; onPlayerJoined?: ({ numberOfPlayers }: { numberOfPlayers: number }) => void; onPlayerLeft?: ({ numberOfPlayers }: { numberOfPlayers: number }) => void; + input: unknown; }, skyConfig?: SkyConfigFile, ): Promise> { @@ -80,6 +82,7 @@ export async function actorFromStately( // Start the actor with the initial value from Sky actor = createActor(machine as never, { snapshot: skyEvent.snapshot, + input: input as any, }); // Send all events from the actor to Sky except for events that originate from Sky diff --git a/packages/sky-react/package.json b/packages/sky-react/package.json index 24db073..6d48a26 100644 --- a/packages/sky-react/package.json +++ b/packages/sky-react/package.json @@ -30,13 +30,13 @@ }, "homepage": "https://github.com/statelyai/sky/tree/main/packages/sky-react#readme", "dependencies": { - "@statelyai/sky": "*", - "@xstate/react": "4.0.1", - "xstate": "5.2.1" + "@statelyai/sky": "^0.0.11", + "@xstate/react": "^4.1.1", + "xstate": "^5.13.0" }, "devDependencies": { - "@types/react": "^18.2.22", - "react": "^18.2.0" + "@types/react": "^18.3.1", + "react": "^18.3.1" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0" diff --git a/packages/sky-react/src/useStatelyActor.ts b/packages/sky-react/src/useStatelyActor.ts index 7f47eae..e3aa59e 100644 --- a/packages/sky-react/src/useStatelyActor.ts +++ b/packages/sky-react/src/useStatelyActor.ts @@ -27,6 +27,7 @@ export function useStatelyActor( const [maybeActor, setMaybeActor] = useState>(); const state = useSelector( + // @ts-ignore TODO: fix maybeActor ?? createActor(skyConfig.machine as never), (snapshot) => snapshot, ); diff --git a/yarn.lock b/yarn.lock index 67be80d..1db843f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -807,13 +807,12 @@ resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.7.tgz#f9361f7b87fd5d8188b2c998db0a1f47e9fb391a" integrity sha512-FbtmBWCcSa2J4zL781Zf1p5YUBXQomPEcep9QZCfRfQgTxz3pJWiDFLebohZ9fFntX5ibzOkSsrJ0TEew8cAog== -"@types/react@^18.2.22": - version "18.2.22" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.22.tgz#abe778a1c95a07fa70df40a52d7300a40b949ccb" - integrity sha512-60fLTOLqzarLED2O3UQImc/lsNRgG0jE/a1mPW9KjMemY0LMITWEsbS4VvZ4p6rorEHd5YKxxmMKSDK505GHpA== +"@types/react@^18.3.1": + version "18.3.1" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.1.tgz#fed43985caa834a2084d002e4771e15dfcbdbe8e" + integrity sha512-V0kuGBX3+prX+DQ/7r2qsv1NsdfnCLnTgnRJ1pYnxykBhGMz+qj+box5lq7XsO5mtZsBqpjwwTu/7wszPfMBcw== dependencies: "@types/prop-types" "*" - "@types/scheduler" "*" csstype "^3.0.2" "@types/resolve@1.17.1": @@ -823,11 +822,6 @@ dependencies: "@types/node" "*" -"@types/scheduler@*": - version "0.16.4" - resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.4.tgz#fedc3e5b15c26dc18faae96bf1317487cb3658cf" - integrity sha512-2L9ifAGl7wmXwP4v3pN4p2FLhD0O1qsJpvKmNin5VA8+UvNVb447UDaAEV6UdrkA+m/Xs58U1RFps44x6TFsVQ== - "@types/semver@^6.0.1": version "6.2.4" resolved "https://registry.yarnpkg.com/@types/semver/-/semver-6.2.4.tgz#0b548b3d5fd7a86c038b5768944a99d1e70a1c31" @@ -838,13 +832,13 @@ resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.3.tgz#9a726e116beb26c24f1ccd6850201e1246122e04" integrity sha512-OxepLK9EuNEIPxWNME+C6WwbRAOOI2o2BaQEGzz5Lu2e4Z5eDnEo+/aVEDMIXywoJitJ7xWd641wrGLZdtwRyw== -"@xstate/react@4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@xstate/react/-/react-4.0.1.tgz#a5cec511e23e44ac5dd64852a1497efb6434c3f0" - integrity sha512-UB9qUC11wcaYd05wGea0mvEA3uTHikNaB4InMZfxD7MVFxzBFU+3JFkemjiN8bDdPJfDrObyP9ZPDVojq2LytA== +"@xstate/react@^4.1.1": + version "4.1.1" + resolved "https://registry.yarnpkg.com/@xstate/react/-/react-4.1.1.tgz#2f580fc5f83d195f95b56df6cd8061c66660d9fa" + integrity sha512-pFp/Y+bnczfaZ0V8B4LOhx3d6Gd71YKAPbzerGqydC2nsYN/mp7RZu3q/w6/kvI2hwR/jeDeetM7xc3JFZH2NA== dependencies: use-isomorphic-layout-effect "^1.1.2" - use-sync-external-store "^1.0.0" + use-sync-external-store "^1.2.0" acorn@^8.8.2: version "8.10.0" @@ -1410,6 +1404,11 @@ estree-walker@^2.0.1: resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac" integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w== +event-target-shim@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-6.0.2.tgz#ea5348c3618ee8b62ff1d344f01908ee2b8a2b71" + integrity sha512-8q3LsZjRezbFZ2PN+uP+Q7pnHUMmAOziU2vA2OwoFaKIXxlxl38IylhSSgUorWu/rf4er67w0ikBqjBFk/pomA== + extendable-error@^0.1.5: version "0.1.7" resolved "https://registry.yarnpkg.com/extendable-error/-/extendable-error-0.1.7.tgz#60b9adf206264ac920058a7395685ae4670c2b96" @@ -2445,10 +2444,12 @@ parse-json@^5.0.0, parse-json@^5.1.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" -partysocket@0.0.17: - version "0.0.17" - resolved "https://registry.yarnpkg.com/partysocket/-/partysocket-0.0.17.tgz#cb36858e5c2749cbf3ef9208f7df22c028162105" - integrity sha512-8Re9nmgP2LzQhq+FBs9+BZNTjmMwoF4geEKlpH0lxW1JKp3FmplN74306afGH9EsOjdfcXqKY2VCZtc3iAHIow== +partysocket@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/partysocket/-/partysocket-1.0.1.tgz#17ed3b4df146b6d9e9f169418436d27622e4ff1e" + integrity sha512-sSnLf9X0Oaxw0wXp0liKho0QQqStDJB5I4ViaqmtI4nHm6cpb2kUealErPrcQpYUF6zgTHzLQhIO++2tcJc59A== + dependencies: + event-target-shim "^6.0.2" path-exists@^4.0.0: version "4.0.0" @@ -2565,10 +2566,10 @@ rc@1.2.8, rc@^1.2.8: minimist "^1.2.0" strip-json-comments "~2.0.1" -react@^18.2.0: - version "18.2.0" - resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5" - integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ== +react@^18.3.1: + version "18.3.1" + resolved "https://registry.yarnpkg.com/react/-/react-18.3.1.tgz#49ab892009c53933625bd16b2533fc754cab2891" + integrity sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ== dependencies: loose-envify "^1.1.0" @@ -2917,10 +2918,10 @@ strip-json-comments@~2.0.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ== -superjson@1.13.1: - version "1.13.1" - resolved "https://registry.yarnpkg.com/superjson/-/superjson-1.13.1.tgz#a0b6ab5d22876f6207fcb9d08b0cb2acad8ee5cd" - integrity sha512-AVH2eknm9DEd3qvxM4Sq+LTCkSXE2ssfh1t11MHMXyYXFQyQ1HLgVvV+guLTsaQnJU3gnaVo34TohHPulY/wLg== +superjson@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/superjson/-/superjson-2.2.1.tgz#9377a7fa80fedb10c851c9dbffd942d4bcf79733" + integrity sha512-8iGv75BYOa0xRJHK5vRLEjE2H/i4lulTjzpUXic3Eg8akftYjkmQDa8JARQ42rlczXyFR3IeRoeFCc7RxHsYZA== dependencies: copy-anything "^3.0.2" @@ -3059,10 +3060,10 @@ typed-array-length@^1.0.4: for-each "^0.3.3" is-typed-array "^1.1.9" -typescript@^5.2.2: - version "5.2.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78" - integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w== +typescript@^5.4.5: + version "5.4.5" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611" + integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ== unbox-primitive@^1.0.2: version "1.0.2" @@ -3104,10 +3105,10 @@ use-isomorphic-layout-effect@^1.1.2: resolved "https://registry.yarnpkg.com/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz#497cefb13d863d687b08477d9e5a164ad8c1a6fb" integrity sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA== -use-sync-external-store@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a" - integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA== +use-sync-external-store@^1.2.0: + version "1.2.2" + resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.2.tgz#c3b6390f3a30eba13200d2302dcdf1e7b57b2ef9" + integrity sha512-PElTlVMwpblvbNqQ82d2n6RjStvdSoNe9FG28kNfz3WiXilJm4DdNkEzRhCZuIDwY8U08WVihhGR5iRqAwfDiw== v8-compile-cache@^2.1.1: version "2.4.0" @@ -3214,10 +3215,10 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== -xstate@5.2.1: - version "5.2.1" - resolved "https://registry.yarnpkg.com/xstate/-/xstate-5.2.1.tgz#55f1736cccdff58938277d1e1e2a91a01d37f008" - integrity sha512-qPYPnoYIvNSwSv4uIwV+V/uFeGk6houLGmZy0io1XsfImBrp1AKbw9ADNJytCksCDP/YOAg1EtiWjXFzsT1rdw== +xstate@^5.13.0: + version "5.13.0" + resolved "https://registry.yarnpkg.com/xstate/-/xstate-5.13.0.tgz#7f7092d813a89d94024b083fe23a86b6cf4a323a" + integrity sha512-Z0om784N5u8sAzUvQJBa32jiTCIGGF/2ZsmKkerQEqeeUktAeOMK20FIHFUMywC4GcAkNksSvaeX7lwoRNXPEQ== y18n@^4.0.0: version "4.0.3" From acad6179e6cba3bdcd1167255937cd2a4d888163 Mon Sep 17 00:00:00 2001 From: David Khourshid Date: Mon, 6 May 2024 10:05:56 -0400 Subject: [PATCH 2/2] Changeset --- .changeset/angry-experts-think.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changeset/angry-experts-think.md diff --git a/.changeset/angry-experts-think.md b/.changeset/angry-experts-think.md new file mode 100644 index 0000000..38138d7 --- /dev/null +++ b/.changeset/angry-experts-think.md @@ -0,0 +1,6 @@ +--- +'@statelyai/sky-react': patch +'@statelyai/sky': patch +--- + +Update dependencies