Skip to content

Commit

Permalink
Merge branch 'main' into feat/lifecycle-api
Browse files Browse the repository at this point in the history
  • Loading branch information
olijeffers0n authored May 11, 2024
2 parents 0b0edc1 + fec3b83 commit 8225537
Show file tree
Hide file tree
Showing 167 changed files with 16,663 additions and 21,037 deletions.
48 changes: 23 additions & 25 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,25 @@
{
"image": "mcr.microsoft.com/vscode/devcontainers/base:ubuntu-20.04",
"settings": {
"[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
},
"[typescriptreact]": {
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
},
"[markdown]": {
"editor.wordWrap": "on"
}
},
"extensions": [
"esbenp.prettier-vscode"
],
"forwardPorts": [3000],
"postCreateCommand": ["yarn", "install"],
"waitFor": "postCreateCommand",
"features": {
"node": {
"version": "18"
}
}
"image": "mcr.microsoft.com/vscode/devcontainers/base:ubuntu-20.04",
"settings": {
"[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
},
"[typescriptreact]": {
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
},
"[markdown]": {
"editor.wordWrap": "on"
}
},
"extensions": ["esbenp.prettier-vscode"],
"forwardPorts": [3000],
"postCreateCommand": ["pnpm", "install"],
"waitFor": "postCreateCommand",
"features": {
"node": {
"version": "20"
}
}
}
12 changes: 2 additions & 10 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
root = true

[*]
insert_final_newline = true
charset = utf-8
end_of_line = lf
indent_style = space

[*.{ts,md,mdx,css,json,yml}]
indent_size = 2
tab_width = 2

[*.{ts,mdx,css,json,yml}]
max_line_length = 100
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
trim_trailing_whitespace = false

26 changes: 26 additions & 0 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: "Format check"

on:
- push
- pull_request

jobs:
format:
# run on all push events or on PR syncs not from the same repo
if: github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name

runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/action-setup@v3
- name: Set up Node
uses: actions/setup-node@v4
with:
node-version: 20
cache: "pnpm"
- name: Install dependencies
run: pnpm install
- name: Check format
run: pnpm run format:check
4 changes: 1 addition & 3 deletions .github/workflows/spellcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,4 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4
- name: Spell check
uses: crate-ci/[email protected]
with:
config: ./.typos.toml
uses: crate-ci/[email protected]
8 changes: 0 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,5 @@
.cache-loader
.DS_Store
npm-debug.log*
yarn-debug.log*
yarn-error.log*
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
/.meta
16 changes: 6 additions & 10 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
/.docusaurus
/.vscode
/.yarn
/build
/node_modules
/.pnp*
/*.js
/*.js.map
/config/*.js
/.meta
pnpm-lock.yaml
docs/versioned
*.md
*.mdx
!README.md
!CONTRIBUTING.md
14 changes: 4 additions & 10 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
{
"printWidth": 100,
"proseWrap": "always",
"overrides": [
{
"files": "*.md",
"options": {
"parser": "mdx"
}
}
]
"arrowParens": "always",
"singleQuote": false,
"semi": true,
"trailingComma": "es5"
}
23 changes: 22 additions & 1 deletion .typos.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
[files]
extend-exclude = ["docs/versioned"] # don't check ./docs/versioned
extend-exclude = [
"docs/versioned", # old documentation shouldn't be checked
"*.json" # mostly configuration, not worth checking
]

[default]
locale = "en-us"
Expand All @@ -15,18 +18,25 @@ armour = "armor"
authorise = "authorize"
authorised = "authorized"
authorising = "authorizing"
behaviour = "behavior"
capitalise = "capitalize"
catalogue = "catalog"
centre = "center"
civilisation = "civilization"
civilised = "civilized"
colour = "color"
colours = "colors"
defence = "defense"
generalise = "generalize"
generalised = "generalized"
gramme = "gram"
grammes = "grams"
grey = "gray"
honour = "honor"
honours = "honors"
initialise = "initialize"
initialised = "initialized"
initialiser = "initializer"
kerb = "curb"
kerbs = "curbs"
labour = "labor"
Expand All @@ -40,6 +50,9 @@ modelled = "modeled"
neighbour = "neighbor"
neighbours = "neighbors"
neighbouring = "neighboring"
optimise = "optimize"
optimised = "optimized"
optimisation = "optimization"
organisation = "organization"
organise = "organize"
organised = "organized"
Expand All @@ -65,3 +78,11 @@ regionise = "regionize"
regioniser = "regionizer"
regionising = "regionizing"
regionised = "regionized"

# exceptions:

# use British spelling to stay consistent with Bukkit
canceled = "cancelled"
canceling = "cancelling"
cancelable = "cancellable"
cancelation = "cancellation"
541 changes: 0 additions & 541 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

This file was deleted.

9 changes: 0 additions & 9 deletions .yarn/plugins/@yarnpkg/plugin-typescript.cjs

This file was deleted.

873 changes: 0 additions & 873 deletions .yarn/releases/yarn-3.5.0.cjs

This file was deleted.

16 changes: 0 additions & 16 deletions .yarnrc.yml

This file was deleted.

Loading

0 comments on commit 8225537

Please sign in to comment.