Merge branch 'main' into next

# Conflicts:
#	CONTRIBUTING.md
#	README.md
#	examples/counter/package.json
#	examples/counter/src/counterMachine.ts
#	examples/counter/src/main.ts
#	examples/stopwatch/package.json
#	examples/stopwatch/src/main.ts
#	examples/stopwatch/src/stopwatchMachine.ts
#	examples/tiles/package.json
#	examples/tiles/src/App.tsx
#	examples/tiles/src/tilesMachine.ts
#	examples/timer/package.json
#	examples/timer/src/App.tsx
#	examples/timer/src/timerMachine.ts
#	examples/toggle/src/main.ts
#	examples/toggle/src/toggleMachine.ts
#	packages/xstate-fsm/CHANGELOG.md
#	packages/xstate-fsm/package.json
#	packages/xstate-fsm/src/index.ts
#	packages/xstate-fsm/src/types.ts
#	packages/xstate-fsm/test/types.test.ts
#	packages/xstate-immer/package.json
#	packages/xstate-react/package.json
#	packages/xstate-solid/package.json
#	packages/xstate-svelte/package.json
#	packages/xstate-vue/package.json

CODE_OF_CONDUCT.md

@@ -2,75 +2,130 @@
 
 ## Our Pledge
 
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, sex characteristics, gender identity and expression,
-level of experience, education, socio-economic status, nationality, personal
-appearance, race, religion, or sexual identity and orientation.
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual
+identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
 
 ## Our Standards
 
-Examples of behavior that contributes to creating a positive environment
-include:
+Examples of behavior that contributes to a positive environment for our
+community include:
 
-- Using welcoming and inclusive language
-- Being respectful of differing viewpoints and experiences
-- Gracefully accepting constructive criticism
-- Focusing on what is best for the community
-- Showing empathy towards other community members
+- Demonstrating empathy and kindness toward other people
+- Being respectful of differing opinions, viewpoints, and experiences
+- Giving and gracefully accepting constructive feedback
+- Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+- Focusing on what is best not just for us as individuals, but for the overall
+  community
 
-Examples of unacceptable behavior by participants include:
+Examples of unacceptable behavior include:
 
-- The use of sexualized language or imagery and unwelcome sexual attention or
-  advances
-- Trolling, insulting/derogatory comments, and personal or political attacks
+- The use of sexualized language or imagery, and sexual attention or advances of
+  any kind
+- Trolling, insulting or derogatory comments, and personal or political attacks
 - Public or private harassment
-- Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
+- Publishing others' private information, such as a physical or email address,
+  without their explicit permission
 - Other conduct which could reasonably be considered inappropriate in a
   professional setting
 
-## Our Responsibilities
+## Enforcement Responsibilities
 
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
 
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
 
 ## Scope
 
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
 
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at [email protected]. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
+reported to the community leaders responsible for enforcement at **[email protected]**.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of
+actions.
 
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or permanent
+ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the
+community.
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.1, available at
+[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
 
-[homepage]: https://www.contributor-covenant.org
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][mozilla coc].
 
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][faq]. Translations are available at
+[https://www.contributor-covenant.org/translations][translations].
+
+[homepage]: https://www.contributor-covenant.org
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[mozilla coc]: https://github.com/mozilla/diversity
+[faq]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations

CONTRIBUTING.md

@@ -1,26 +1,56 @@
 # Contributing
 
-Thank you for your interest in contributing to XState! This project is made possible by contributors like you, and we welcome any contributions to the code base and the documentation.
+Thank you for your interest in contributing to XState! Contributors like you make this project possible, and we welcome any contributions to the code base and the documentation.
+
+There are several ways you can contribute to XState:
+
+- 📥 [Submit an issue](#submit-an-issue)
+- ✨ [Solve an issue or make a change](#making-changes)
+- 🖊️ [Write documentation](https://github.com/statelyai/docs)
+- 💬 [Respond to support questions in the GitHub discussions](https://github.com/statelyai/xstate/discussions)
+- 🛟 [Respond to questions in the Help channel on Discord](https://discord.gg/xstate)
+
+Please read [our code of conduct](https://github.com/statelyai/xstate/blob/main/CODE_OF_CONDUCT.md).
 
 ## Environment
 
 - Ensure you have the latest version of Node and Yarn.
 - Run `yarn` to install all needed dev dependencies.
 
-## Making Changes
+## Making changes
 
 Pull requests are encouraged. If you want to add a feature or fix a bug:
 
-1. [Fork](https://docs.github.com/en/github/getting-started-with-github/fork-a-repo) and [clone](https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/cloning-a-repository) the [repository](https://github.com/statelyai/xstate)
-2. [Create a separate branch](https://docs.github.com/en/desktop/contributing-and-collaborating-using-github-desktop/managing-branches) for your changes
-3. Make your changes, and ensure that it is formatted by [Prettier](https://prettier.io) and type-checks without errors in [TypeScript](https://www.typescriptlang.org/)
+1. [Fork](https://docs.github.com/en/github/getting-started-with-github/fork-a-repo) and [clone](https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/cloning-a-repository) the [repository](https://github.com/statelyai/xstate).
+2. [Create a separate branch](https://docs.github.com/en/desktop/contributing-and-collaborating-using-github-desktop/managing-branches) for your changes.
+3. Make your changes, and ensure that it is formatted by [Prettier](https://prettier.io) and type-checks without errors in [TypeScript](https://www.typescriptlang.org/).
 4. Write tests that validate your change and/or fix.
 5. Run `yarn build` and then run tests with `yarn test` (for all packages) or `yarn test:core` (for only changes to core XState).
-6. For package changes, add docs inside the `/packages/*/README.md`. They will be copied on build to the corresponding `/docs/packages/*/index.md` file.
-7. Create a changeset by running `yarn changeset`. [More info](https://github.com/atlassian/changesets).
+6. For package changes, add docs inside the `/packages/*/README.md`. These docs will be copied on build to the corresponding `/docs/packages/*/index.md` file.
+7. Create a changeset by running `yarn changeset`. [More about changesets](https://github.com/atlassian/changesets).
 8. Push your branch and open a PR 🚀
 
-PRs are reviewed promptly and merged in within a day or two (or even within an hour), if everything looks good.
+PRs are reviewed promptly and merged in within a day or two (or even within an hour) if everything looks good.
+
+## Submit an issue
+
+Issues and bug reports are also encouraged. If you want to submit an issue:
+
+1. Search [existing issues](https://github.com/statelyai/xstate/issues) to check if your issue already exists or has been solved.
+2. [Create a new issue](https://github.com/statelyai/xstate/issues/new/choose) if your issue has not yet been submitted.
+3. Ensure you fill out all the details in the issue template to help us understand the issue.
+
+We’ll try to respond promptly and address your issue as soon as possible.
+
+## Contributing to our docs
+
+Our [new docs](https://stately.ai/docs) are now in their own [docs repo](https://github.com/statelyai/docs). [Read the contribution guide for our Stately Studio and XState docs](https://github.com/statelyai/docs/blob/main/CONTRIBUTING.md).
+
+### Legacy docs and xstate.js.org
+
+The docs at `/docs` in this repo are legacy XState docs. They are built using [Vuepress](https://vuepress.vuejs.org) and deployed to [xstate.js.org/docs](https://xstate.js.org/docs) using GitHub pages from the `gh-pages` branch using the `pages build and deployment` workflow.
+
+The [xstate.js.org](https://xstate.js.org) landing page is currently stored at `index.html` and deployed from the `gh-pages` branch using the `pages build and deployment` workflow.
 
 ## Setup
 

README.md

@@ -18,9 +18,9 @@
 
 JavaScript and TypeScript [finite state machines](https://en.wikipedia.org/wiki/Finite-state_machine) and [statecharts](https://www.sciencedirect.com/science/article/pii/0167642387900359/pdf) for the modern web.
 
-📖 [Read the documentation](https://stately.ai/docs/xstate)
+### ✨ Create state machines visually → [state.new](https://state.new)
 
-💙 [Explore our catalogue of examples](https://xstate-catalogue.com/)
+📖 [Read the documentation](https://stately.ai/docs/xstate)
 
 ➡️ [Create state machines with the Stately Editor](https://stately.ai/editor)
 
@@ -63,7 +63,7 @@ npm install xstate
 ```js
 import { createMachine, interpret } from 'xstate';
 
-// Stateless machine definition
+// State machine definition
 // machine.transition(...) is a pure function used by the interpreter.
 const toggleMachine = createMachine({
   id: 'toggle',
@@ -75,79 +75,18 @@ const toggleMachine = createMachine({
 });
 
 // Machine instance with internal state
-const toggleService = interpret(toggleMachine)
-  .onTransition((state) => console.log(state.value))
-  .start();
-// => 'inactive'
+const toggleActor = interpret(toggleMachine);
+toggleActor.subscribe((state) => console.log(state.value))
+toggleActor.start();
+// => logs 'inactive'
 
 toggleService.send({ type: 'TOGGLE' });
-// => 'active'
+// => logs 'active'
 
 toggleService.send({ type: 'TOGGLE' });
-// => 'inactive'
-```
-
-## Promise example
-
-[📉 See the visualization on stately.ai/viz](https://stately.ai/viz?gist=bbcb4379b36edea0458f597e5eec2f91)
-
-<details>
-<summary>See the code</summary>
-
-```js
-import { createMachine, interpret, assign } from 'xstate';
-
-const fetchMachine = createMachine({
-  id: 'Dog API',
-  initial: 'idle',
-  context: {
-    dog: null
-  },
-  states: {
-    idle: {
-      on: {
-        FETCH: 'loading'
-      }
-    },
-    loading: {
-      invoke: {
-        id: 'fetchDog',
-        src: (context, event) =>
-          fetch('https://dog.ceo/api/breeds/image/random').then((data) =>
-            data.json()
-          ),
-        onDone: {
-          target: 'resolved',
-          actions: assign({
-            dog: (_, event) => event.data
-          })
-        },
-        onError: 'rejected'
-      },
-      on: {
-        CANCEL: 'idle'
-      }
-    },
-    resolved: {
-      type: 'final'
-    },
-    rejected: {
-      on: {
-        FETCH: 'loading'
-      }
-    }
-  }
-});
-
-const dogService = interpret(fetchMachine)
-  .onTransition((state) => console.log(state.value))
-  .start();
-
-dogService.send({ type: 'FETCH' });
+// => logs 'inactive'
 ```
 
-</details>
-
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->