Skip to content

Commit

Permalink
Merge pull request #2203 from davidkpiano/rename-master-to-main
Browse files Browse the repository at this point in the history
Replace references to master with main
  • Loading branch information
davidkpiano committed May 17, 2021
2 parents 57430f6 + 9440fa1 commit f4aeccc
Show file tree
Hide file tree
Showing 23 changed files with 46 additions and 45 deletions.
2 changes: 1 addition & 1 deletion .changeset/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ with multi-package repos, or single-package repos to help you version and publis
find the full documentation for it [in our repository](https://github.com/changesets/changesets)

We have a quick list of common questions to get you started engaging with this project in
[our documentation](https://github.com/changesets/changesets/blob/master/docs/common-questions.md)
[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md)
2 changes: 1 addition & 1 deletion .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"commit": false,
"linked": [],
"access": "public",
"baseBranch": "master",
"baseBranch": "main",
"ignore": [
"@xstate/analytics",
"@xstate/scxml",
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Docs
on:
push:
branches:
- master
- main

jobs:
build:
Expand All @@ -13,7 +13,7 @@ jobs:
matrix:
node-version: [14.x]

steps:
steps:
- uses: actions/checkout@v2

- name: Build docs
Expand All @@ -25,6 +25,6 @@ jobs:
- name: Publish docs
uses: JamesIves/github-pages-deploy-action@4.1.0
with:
branch: gh-pages
folder: docs/.vuepress/dist
target-folder: docs
branch: gh-pages
folder: docs/.vuepress/dist
target-folder: docs
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Release
on:
push:
branches:
- master
- main

jobs:
release:
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ JavaScript and TypeScript [finite state machines](https://en.wikipedia.org/wiki/
## Packages

- 🤖 `xstate` - Core finite state machine and statecharts library + interpreter
- [🔬 `@xstate/fsm`](https://github.com/davidkpiano/xstate/tree/master/packages/xstate-fsm) - Minimal finite state machine library
- [📉 `@xstate/graph`](https://github.com/davidkpiano/xstate/tree/master/packages/xstate-graph) - Graph traversal utilities for XState
- [⚛️ `@xstate/react`](https://github.com/davidkpiano/xstate/tree/master/packages/xstate-react) - React hooks and utilities for using XState in React applications
- [💚 `@xstate/vue`](https://github.com/davidkpiano/xstate/tree/master/packages/xstate-vue) - Vue composition functions and utilities for using XState in Vue applications
- [🎷 `@xstate/svelte`](https://github.com/davidkpiano/xstate/tree/master/packages/xstate-svelte) - Svelte utilities for using XState in Svelte applications
- [`@xstate/test`](https://github.com/davidkpiano/xstate/tree/master/packages/xstate-test) - Model-Based-Testing utilities (using XState) for testing any software
- [🔍 `@xstate/inspect`](https://github.com/davidkpiano/xstate/tree/master/packages/xstate-inspect) - Inspection utilities for XState
- [🔬 `@xstate/fsm`](https://github.com/davidkpiano/xstate/tree/main/packages/xstate-fsm) - Minimal finite state machine library
- [📉 `@xstate/graph`](https://github.com/davidkpiano/xstate/tree/main/packages/xstate-graph) - Graph traversal utilities for XState
- [⚛️ `@xstate/react`](https://github.com/davidkpiano/xstate/tree/main/packages/xstate-react) - React hooks and utilities for using XState in React applications
- [💚 `@xstate/vue`](https://github.com/davidkpiano/xstate/tree/main/packages/xstate-vue) - Vue composition functions and utilities for using XState in Vue applications
- [🎷 `@xstate/svelte`](https://github.com/davidkpiano/xstate/tree/main/packages/xstate-svelte) - Svelte utilities for using XState in Svelte applications
- [`@xstate/test`](https://github.com/davidkpiano/xstate/tree/main/packages/xstate-test) - Model-Based-Testing utilities (using XState) for testing any software
- [🔍 `@xstate/inspect`](https://github.com/davidkpiano/xstate/tree/main/packages/xstate-inspect) - Inspection utilities for XState

## Templates

Expand Down
14 changes: 7 additions & 7 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ JavaScript and TypeScript [finite state machines](https://en.wikipedia.org/wiki/
## Packages

- 🤖 `xstate` - Core finite state machine and statecharts library + interpreter
- [🔬 `@xstate/fsm`](https://github.com/davidkpiano/xstate/tree/master/packages/xstate-fsm) - Minimal finite state machine library
- [📉 `@xstate/graph`](https://github.com/davidkpiano/xstate/tree/master/packages/xstate-graph) - Graph traversal utilities for XState
- [⚛️ `@xstate/react`](https://github.com/davidkpiano/xstate/tree/master/packages/xstate-react) - React hooks and utilities for using XState in React applications
- [💚 `@xstate/vue`](https://github.com/davidkpiano/xstate/tree/master/packages/xstate-vue) - Vue composition functions and utilities for using XState in Vue applications
- [🎷 `@xstate/svelte`](https://github.com/davidkpiano/xstate/tree/master/packages/xstate-svelte) - Svelte utilities for using XState in Svelte applications
- [`@xstate/test`](https://github.com/davidkpiano/xstate/tree/master/packages/xstate-test) - Model-Based-Testing utilities (using XState) for testing any software
- [🔍 `@xstate/inspect`](https://github.com/davidkpiano/xstate/tree/master/packages/xstate-inspect) - Inspection utilities for XState
- [🔬 `@xstate/fsm`](https://github.com/davidkpiano/xstate/tree/main/packages/xstate-fsm) - Minimal finite state machine library
- [📉 `@xstate/graph`](https://github.com/davidkpiano/xstate/tree/main/packages/xstate-graph) - Graph traversal utilities for XState
- [⚛️ `@xstate/react`](https://github.com/davidkpiano/xstate/tree/main/packages/xstate-react) - React hooks and utilities for using XState in React applications
- [💚 `@xstate/vue`](https://github.com/davidkpiano/xstate/tree/main/packages/xstate-vue) - Vue composition functions and utilities for using XState in Vue applications
- [🎷 `@xstate/svelte`](https://github.com/davidkpiano/xstate/tree/main/packages/xstate-svelte) - Svelte utilities for using XState in Svelte applications
- [`@xstate/test`](https://github.com/davidkpiano/xstate/tree/main/packages/xstate-test) - Model-Based-Testing utilities (using XState) for testing any software
- [🔍 `@xstate/inspect`](https://github.com/davidkpiano/xstate/tree/main/packages/xstate-inspect) - Inspection utilities for XState

## Templates

Expand Down
3 changes: 3 additions & 0 deletions docs/examples/calculator.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Calculator

## React

- Uses React, @xstate/react and Xstate 4.x.
- [GitHub repository](https://github.com/GiancarlosIO/xstate-react-calculator)

Expand All @@ -12,6 +14,7 @@
></iframe>
## Vue

- Uses Vue 2.x, @xstate/vue and Xstate 4.x.
- [GitHub repository](https://github.com/Glutnix/xstate-vue-calculator/tree/master/)
- Based on [earlier work by Mukesh Soni](https://github.com/mukeshsoni/statechart-calculator) (React, Xstate 3.x)
Expand Down
8 changes: 4 additions & 4 deletions docs/packages/core/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ JavaScript and TypeScript [finite state machines](https://en.wikipedia.org/wiki/
## Packages

- 🤖 `xstate` - Core finite state machine and statecharts library + interpreter
- [🔬 `@xstate/fsm`](https://github.com/davidkpiano/xstate/tree/master/packages/xstate-fsm) - Minimal finite state machine library
- [📉 `@xstate/graph`](https://github.com/davidkpiano/xstate/tree/master/packages/xstate-graph) - Graph traversal utilities for XState
- [⚛️ `@xstate/react`](https://github.com/davidkpiano/xstate/tree/master/packages/xstate-react) - React hooks and utilities for using XState in React applications
- [`@xstate/test`](https://github.com/davidkpiano/xstate/tree/master/packages/xstate-test) - Model-based testing utilities for XState
- [🔬 `@xstate/fsm`](https://github.com/davidkpiano/xstate/tree/main/packages/xstate-fsm) - Minimal finite state machine library
- [📉 `@xstate/graph`](https://github.com/davidkpiano/xstate/tree/main/packages/xstate-graph) - Graph traversal utilities for XState
- [⚛️ `@xstate/react`](https://github.com/davidkpiano/xstate/tree/main/packages/xstate-react) - React hooks and utilities for using XState in React applications
- [`@xstate/test`](https://github.com/davidkpiano/xstate/tree/main/packages/xstate-test) - Model-based testing utilities for XState

## Super quick start

Expand Down
2 changes: 1 addition & 1 deletion docs/recipes/react.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const toggleMachine = createMachine({

## Hooks

Using [React hooks](https://reactjs.org/hooks) makes it easier to use state machines with function components. You can either use the official [`@xstate/react`](https://github.com/davidkpiano/xstate/tree/master/packages/xstate-react) package, a community solution like [`use-machine` by Carlos Galarza](https://github.com/carloslfu/use-machine/), or implement your own hook to interpret and use XState machines:
Using [React hooks](https://reactjs.org/hooks) makes it easier to use state machines with function components. You can either use the official [`@xstate/react`](https://github.com/davidkpiano/xstate/tree/main/packages/xstate-react) package, a community solution like [`use-machine` by Carlos Galarza](https://github.com/carloslfu/use-machine/), or implement your own hook to interpret and use XState machines:

```js
// import { useMachine } from '../path/to/useMachine';
Expand Down
2 changes: 0 additions & 2 deletions docs/sandboxes/todomvc/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
![](https://github.com/tastejs/todomvc-app-css/raw/master/screenshot.png)


## Getting started

- Read the [Application Specification](https://github.com/tastejs/todomvc/blob/master/app-spec.md) before touching the template.
Expand All @@ -13,7 +12,6 @@

- Clone this repo and install the dependencies with [npm](https://npmjs.com) by running: `npm install`.


## License

<a rel="license" href="http://creativecommons.org/licenses/by/4.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by/4.0/80x15.png" /></a><br />This <span xmlns:dct="http://purl.org/dc/terms/" href="http://purl.org/dc/dcmitype/InteractiveResource" rel="dct:type">work</span> by <a xmlns:cc="http://creativecommons.org/ns#" href="http://sindresorhus.com" property="cc:attributionName" rel="cc:attributionURL">TasteJS</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/deed.en_US">Creative Commons Attribution 4.0 International License</a>.
2 changes: 1 addition & 1 deletion examples/fetch/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Fetch example

[Open in CodeSandbox](https://githubbox.com/davidkpiano/xstate/tree/master/examples/fetch)
[Open in CodeSandbox](https://githubbox.com/davidkpiano/xstate/tree/main/examples/fetch)

## Run this example locally

Expand Down
8 changes: 4 additions & 4 deletions packages/core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ JavaScript and TypeScript [finite state machines](https://en.wikipedia.org/wiki/
## Packages

- 🤖 `xstate` - Core finite state machine and statecharts library + interpreter
- [🔬 `@xstate/fsm`](https://github.com/davidkpiano/xstate/tree/master/packages/xstate-fsm) - Minimal finite state machine library
- [📉 `@xstate/graph`](https://github.com/davidkpiano/xstate/tree/master/packages/xstate-graph) - Graph traversal utilities for XState
- [⚛️ `@xstate/react`](https://github.com/davidkpiano/xstate/tree/master/packages/xstate-react) - React hooks and utilities for using XState in React applications
- [`@xstate/test`](https://github.com/davidkpiano/xstate/tree/master/packages/xstate-test) - Model-based testing utilities for XState
- [🔬 `@xstate/fsm`](https://github.com/davidkpiano/xstate/tree/main/packages/xstate-fsm) - Minimal finite state machine library
- [📉 `@xstate/graph`](https://github.com/davidkpiano/xstate/tree/main/packages/xstate-graph) - Graph traversal utilities for XState
- [⚛️ `@xstate/react`](https://github.com/davidkpiano/xstate/tree/main/packages/xstate-react) - React hooks and utilities for using XState in React applications
- [`@xstate/test`](https://github.com/davidkpiano/xstate/tree/main/packages/xstate-test) - Model-based testing utilities for XState

## Super quick start

Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"bugs": {
"url": "https://github.com/davidkpiano/xstate/issues"
},
"homepage": "https://github.com/davidkpiano/xstate/tree/master/packages/core#readme",
"homepage": "https://github.com/davidkpiano/xstate/tree/main/packages/core#readme",
"devDependencies": {
"@babel/cli": "^7.10.5",
"@babel/core": "^7.10.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/xstate-analytics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"analytics"
],
"author": "David Khourshid <davidkpiano@gmail.com>",
"homepage": "https://github.com/davidkpiano/xstate/tree/master/packages/xstate-analytics#readme",
"homepage": "https://github.com/davidkpiano/xstate/tree/main/packages/xstate-analytics#readme",
"license": "MIT",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/xstate-fsm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"automata"
],
"author": "David Khourshid <davidkpiano@gmail.com>",
"homepage": "https://github.com/davidkpiano/xstate/tree/master/packages/xstate-fsm#readme",
"homepage": "https://github.com/davidkpiano/xstate/tree/main/packages/xstate-fsm#readme",
"license": "MIT",
"main": "dist/xstate.fsm.js",
"types": "lib/index.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/xstate-graph/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"graph"
],
"author": "David Khourshid <davidkpiano@gmail.com>",
"homepage": "https://github.com/davidkpiano/xstate/tree/master/packages/xstate-test#readme",
"homepage": "https://github.com/davidkpiano/xstate/tree/main/packages/xstate-test#readme",
"license": "MIT",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/xstate-immer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"statechart"
],
"author": "David Khourshid <davidkpiano@gmail.com>",
"homepage": "https://github.com/davidkpiano/xstate/tree/master/packages/xstate-immer#readme",
"homepage": "https://github.com/davidkpiano/xstate/tree/main/packages/xstate-immer#readme",
"license": "MIT",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/xstate-inspect/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"viz"
],
"author": "David Khourshid <davidkpiano@gmail.com>",
"homepage": "https://github.com/davidkpiano/xstate/tree/master/packages/xstate-inspect#readme",
"homepage": "https://github.com/davidkpiano/xstate/tree/main/packages/xstate-inspect#readme",
"license": "MIT",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/xstate-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"hook"
],
"author": "David Khourshid <davidkpiano@gmail.com>",
"homepage": "https://github.com/davidkpiano/xstate/tree/master/packages/xstate-react#readme",
"homepage": "https://github.com/davidkpiano/xstate/tree/main/packages/xstate-react#readme",
"license": "MIT",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/xstate-scxml/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"state machine"
],
"author": "David Khourshid <davidkpiano@gmail.com>",
"homepage": "https://github.com/davidkpiano/xstate/tree/master/packages/xstate-scxml#readme",
"homepage": "https://github.com/davidkpiano/xstate/tree/main/packages/xstate-scxml#readme",
"license": "MIT",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/xstate-svelte/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"store"
],
"author": "David Khourshid <davidkpiano@gmail.com>",
"homepage": "https://github.com/davidkpiano/xstate/tree/master/packages/xstate-svelte#readme",
"homepage": "https://github.com/davidkpiano/xstate/tree/main/packages/xstate-svelte#readme",
"license": "MIT",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/xstate-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"testing"
],
"author": "David Khourshid <davidkpiano@gmail.com>",
"homepage": "https://github.com/davidkpiano/xstate/tree/master/packages/xstate-test#readme",
"homepage": "https://github.com/davidkpiano/xstate/tree/main/packages/xstate-test#readme",
"license": "MIT",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/xstate-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"composable"
],
"author": "David Khourshid <davidkpiano@gmail.com>",
"homepage": "https://github.com/davidkpiano/xstate/tree/master/packages/xstate-vue#readme",
"homepage": "https://github.com/davidkpiano/xstate/tree/main/packages/xstate-vue#readme",
"license": "MIT",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down

0 comments on commit f4aeccc

Please sign in to comment.