Skip to content

Commit

Permalink
Merge branch 'dev' into loader-default-material-name
Browse files Browse the repository at this point in the history
  • Loading branch information
Methuselah96 committed Jul 6, 2023
2 parents 02e77d6 + c9afe05 commit 19c2868
Show file tree
Hide file tree
Showing 614 changed files with 16,738 additions and 7,170 deletions.
18 changes: 18 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -754,6 +754,24 @@
"doc",
"maintenance"
]
},
{
"login": "Yonet",
"name": "Yönet",
"avatar_url": "https://avatars.githubusercontent.com/u/3523671?v=4",
"profile": "https://github.com/Yonet",
"contributions": [
"code"
]
},
{
"login": "ericbroberic",
"name": "Eric Benn",
"avatar_url": "https://avatars.githubusercontent.com/u/9359928?v=4",
"profile": "https://github.com/ericbroberic",
"contributions": [
"code"
]
}
],
"skipCi": true,
Expand Down
40 changes: 31 additions & 9 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,39 @@ on:
jobs:
test:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 'lts/*'
cache: 'yarn'

# Get local dependencies
- run: yarn install

# Run tests
- run: yarn run prettier:check
- run: yarn run test-all
cache: 'npm'
- run: npm ci
- run: npm run test-all
check-fomatting:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 'lts/*'
cache: 'npm'
- run: npm ci
- run: npm run format-check
test-examples:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
submodules: true
- uses: actions/setup-node@v3
with:
node-version: 'lts/*'
cache: 'npm'
- run: npm ci
- run: npm run create-examples
working-directory: examples-testing
- run: git apply changes.patch
working-directory: examples-testing
- run: npm run type-check
working-directory: examples-testing
- run: npm run format-check
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "three.js"]
path = three.js
url = https://github.com/mrdoob/three.js
7 changes: 3 additions & 4 deletions .husky/pre-commit
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

yarn pretty-quick pretty-quick
yarn prettier:check
npx lint-staged
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
.pnp.*
.yarn/*
three.js
873 changes: 0 additions & 873 deletions .yarn/releases/yarn-3.5.1.cjs

This file was deleted.

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

This file was deleted.

4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Thanks for wanting to make a contribution and wanting to improve this library fo
## Project setup

1. Fork and clone the repo
2. Run `yarn install` to install dependencies
2. Run `npm install` to install dependencies
3. Create a branch for your PR with `git checkout -b pr-type/issue-number-your-branch-name`
4. Let's get cooking! 👨🏻‍🍳🥓

Expand All @@ -18,7 +18,7 @@ Be sure your commit messages follow this specification: https://www.conventional
This project follows the [all contributors](https://github.com/kentcdodds/all-contributors) specification. To add yourself to the table of contributors on the `README.md`, please use the automated script as part of your PR:

```console
yarn contributors:add
npm run contributors:add
```

Follow the prompt and commit `.all-contributorsrc` and `README.md` in the PR. If you've already added yourself to the list and are making a new type of contribution, you can run it again and select the added contribution type.
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Mik-pe"><img src="https://avatars.githubusercontent.com/u/5653426?v=4?s=100" width="100px;" alt="Mikael Pettersson"/><br /><sub><b>Mikael Pettersson</b></sub></a><br /><a href="https://github.com/three-types/three-ts-types/commits?author=Mik-pe" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/magnostherobot"><img src="https://avatars.githubusercontent.com/u/24718981?v=4?s=100" width="100px;" alt="Tom Harley"/><br /><sub><b>Tom Harley</b></sub></a><br /><a href="https://github.com/three-types/three-ts-types/commits?author=Mik-pe" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/OndrejSpanel"><img src="https://avatars.githubusercontent.com/u/6927223?v=4?s=100" width="100px;" alt="Ondřej Španěl"/><br /><sub><b>Ondřej Španěl</b></sub></a><br /><a href="https://github.com/three-types/three-ts-types/issues?q=author%3AOndrejSpanel" title="Bug reports">🐛</a> <a href="https://github.com/three-types/three-ts-types/commits?author=OndrejSpanel" title="Code">💻</a> <a href="https://github.com/three-types/three-ts-types/commits?author=OndrejSpanel" title="Documentation">📖</a> <a href="#maintenance-OndrejSpanel" title="Maintenance">🚧</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Yonet"><img src="https://avatars.githubusercontent.com/u/3523671?v=4?s=100" width="100px;" alt="Yönet"/><br /><sub><b>Yönet</b></sub></a><br /><a href="https://github.com/three-types/three-ts-types/commits?author=Yonet" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/ericbroberic"><img src="https://avatars.githubusercontent.com/u/9359928?v=4?s=100" width="100px;" alt="Eric Benn"/><br /><sub><b>Eric Benn</b></sub></a><br /><a href="https://github.com/three-types/three-ts-types/commits?author=ericbroberic" title="Code">💻</a></td>
</tr>
</tbody>
</table>
Expand Down
22 changes: 22 additions & 0 deletions examples-testing/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Update patch

- `npm run create-examples`
- Commit changes
- `git apply changes.patch`
- Make changes
- `yarn run type-check`
- `git diff > ../changes.patch`
- Reset changes
- Move patch file

# Update sources

- `npm run create-examples`
- Commit changes
- `git apply --reject changes.patch`
- Fix conflicts
- `yarn run type-check`
- `git diff > ../changes.patch`
- Reset example changes
- Move patch file
- Commit changes
Loading

0 comments on commit 19c2868

Please sign in to comment.