Skip to content

Commit 621446a

Browse files
committed
Merge remote-tracking branch 'origin/main' into react-18
2 parents 7fad57d + 9ae48ce commit 621446a

9 files changed

Lines changed: 39 additions & 87 deletions

File tree

README.md

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -30,54 +30,6 @@ We currently only have one package that is open-source, and its documentation is
3030

3131
The source of the documentation (for contributions) is available at the [documentation branch](https://github.com/Mojang/ore-ui/tree/documentation).
3232

33-
## Maintainers
34-
35-
The repository is maintained by JavaScript developers at Mojang Studios.
36-
37-
<table>
38-
<tbody>
39-
<tr>
40-
<td align="center" valign="top">
41-
<img width="150" height="150" src="https://github.com/pirelenito.png?s=150">
42-
<br />
43-
<a href="https://github.com/pirelenito">Paulo Ragonha</a>
44-
</td>
45-
<td align="center" valign="top">
46-
<img width="150" height="150" src="https://github.com/xaviervia.png?s=150">
47-
<br />
48-
<a href="https://github.com/xaviervia">Fernando Vía Canel</a>
49-
</td>
50-
<td align="center" valign="top">
51-
<img width="150" height="150" src="https://github.com/marlonicus.png?s=150">
52-
<br />
53-
<a href="https://github.com/marlonicus">Marlon Huber-Smith</a>
54-
</td>
55-
<td align="center" valign="top">
56-
<img width="150" height="150" src="https://github.com/hebbeh.png?s=150">
57-
<br />
58-
<a href="https://github.com/hebbeh">Anna Päärni</a>
59-
</td>
60-
</tr>
61-
<tr>
62-
<td align="center" valign="top">
63-
<img width="150" height="150" src="https://github.com/dderg.png?s=150">
64-
<br>
65-
<a href="https://github.com/dderg">Danila Dergachev</a>
66-
</td>
67-
<td align="center" valign="top">
68-
<img width="150" height="150" src="https://github.com/Shenato.png?s=150">
69-
<br />
70-
<a href="https://github.com/Shenato">Omar ElGaml</a>
71-
</td>
72-
<td align="center" valign="top">
73-
<img width="150" height="150" src="https://github.com/ja-ni.png?s=150">
74-
<br />
75-
<a href="https://github.com/ja-ni">James Nicholls</a>
76-
</td>
77-
</tr>
78-
</tbody>
79-
</table>
80-
8133
## Logo
8234

8335
The **React Facet** and **Ore UI** logos are designed by [Nekofresa](https://twitter.com/nekofresa).

examples/benchmarking/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
"compare": "ts-node compare.ts"
1010
},
1111
"dependencies": {
12-
"@react-facet/core": "0.6.1",
13-
"@react-facet/dom-fiber": "0.6.1",
14-
"@react-facet/shared-facet": "0.6.1",
15-
"@react-facet/spring": "0.6.1",
12+
"@react-facet/core": "0.6.4",
13+
"@react-facet/dom-fiber": "0.6.4",
14+
"@react-facet/shared-facet": "0.6.4",
15+
"@react-facet/spring": "0.6.4",
1616
"ramda": "^0.27.1",
1717
"react": "18.2.0",
1818
"react-dom": "^18.2.0"

packages/@react-facet/core/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"homepage": "https://react-facet.mojang.com/",
3030
"bugs": "https://github.com/Mojang/ore-ui/issues",
3131
"license": "MIT",
32-
"version": "0.6.1",
32+
"version": "0.6.4",
3333
"main": "src/index.ts",
3434
"publishConfig": {
3535
"main": "dist/index.js",
@@ -44,7 +44,7 @@
4444
"react": "^18.2.0"
4545
},
4646
"devDependencies": {
47-
"@react-facet/dom-fiber-testing-library": "0.6.1",
47+
"@react-facet/dom-fiber-testing-library": "0.6.4",
4848
"@types/react": "^18.2.0",
4949
"@types/react-reconciler": "^0.28.0",
5050
"@types/rimraf": "^3",

packages/@react-facet/dom-fiber-testing-library/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"homepage": "https://react-facet.mojang.com/",
3030
"bugs": "https://github.com/Mojang/ore-ui/issues",
3131
"license": "MIT",
32-
"version": "0.6.1",
32+
"version": "0.6.4",
3333
"main": "src/index.ts",
3434
"publishConfig": {
3535
"main": "dist/index.js",
@@ -44,11 +44,11 @@
4444
"@testing-library/dom": "^8.20.0"
4545
},
4646
"peerDependencies": {
47-
"@react-facet/dom-fiber": "0.6.1",
47+
"@react-facet/dom-fiber": "0.6.4",
4848
"react": "^18.2.0"
4949
},
5050
"devDependencies": {
51-
"@react-facet/dom-fiber": "0.6.1",
51+
"@react-facet/dom-fiber": "0.6.4",
5252
"react": "^18.2.0",
5353
"rimraf": "^3.0.2",
5454
"typescript": "^4.8.2"

packages/@react-facet/dom-fiber/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"homepage": "https://react-facet.mojang.com/",
3030
"bugs": "https://github.com/Mojang/ore-ui/issues",
3131
"license": "MIT",
32-
"version": "0.6.1",
32+
"version": "0.6.4",
3333
"main": "src/index.ts",
3434
"publishConfig": {
3535
"main": "dist/index.js",
@@ -44,11 +44,11 @@
4444
"react-reconciler": "^0.28.0"
4545
},
4646
"peerDependencies": {
47-
"@react-facet/core": "0.6.1",
47+
"@react-facet/core": "0.6.4",
4848
"react": "^18.2.0"
4949
},
5050
"devDependencies": {
51-
"@react-facet/core": "0.6.1",
51+
"@react-facet/core": "0.6.4",
5252
"@react-facet/dom-fiber-testing-library": "workspace:^",
5353
"@types/react": "^18.2.0",
5454
"@types/react-reconciler": "^0.28.0",

packages/@react-facet/eslint-config/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"homepage": "https://react-facet.mojang.com/",
3030
"bugs": "https://github.com/Mojang/ore-ui/issues",
3131
"license": "MIT",
32-
"version": "0.6.1",
32+
"version": "0.6.4",
3333
"main": "src/index.js",
3434
"sideEffects": false,
3535
"peerDependencies": {

packages/@react-facet/shared-facet/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"homepage": "https://react-facet.mojang.com/",
3030
"bugs": "https://github.com/Mojang/ore-ui/issues",
3131
"license": "MIT",
32-
"version": "0.6.1",
32+
"version": "0.6.4",
3333
"main": "src/index.ts",
3434
"publishConfig": {
3535
"main": "dist/index.js",
@@ -41,12 +41,12 @@
4141
"prepublish": "yarn build"
4242
},
4343
"peerDependencies": {
44-
"@react-facet/core": "0.6.1",
44+
"@react-facet/core": "0.6.4",
4545
"react": "^18.2.0"
4646
},
4747
"devDependencies": {
48-
"@react-facet/core": "0.6.1",
49-
"@react-facet/dom-fiber-testing-library": "0.6.1",
48+
"@react-facet/core": "0.6.4",
49+
"@react-facet/dom-fiber-testing-library": "0.6.4",
5050
"@types/react": "^18.2.0",
5151
"@types/rimraf": "^3",
5252
"cross-env": "^7.0.3",

packages/@react-facet/spring/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"homepage": "https://react-facet.mojang.com/",
3030
"bugs": "https://github.com/Mojang/ore-ui/issues",
3131
"license": "MIT",
32-
"version": "0.6.1",
32+
"version": "0.6.4",
3333
"main": "src/index.ts",
3434
"publishConfig": {
3535
"main": "dist/index.js",
@@ -41,11 +41,11 @@
4141
"prepublish": "yarn build"
4242
},
4343
"peerDependencies": {
44-
"@react-facet/core": "0.6.1",
44+
"@react-facet/core": "0.6.4",
4545
"react": "^18.2.0"
4646
},
4747
"devDependencies": {
48-
"@react-facet/core": "0.6.1",
48+
"@react-facet/core": "0.6.4",
4949
"@testing-library/jest-dom": "^5.16.5",
5050
"@types/react": "^18.2.0",
5151
"@types/rimraf": "^3",

yarn.lock

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1149,11 +1149,11 @@ __metadata:
11491149
languageName: node
11501150
linkType: hard
11511151

1152-
"@react-facet/core@0.6.1, @react-facet/core@workspace:packages/@react-facet/core":
1152+
"@react-facet/core@0.6.4, @react-facet/core@workspace:packages/@react-facet/core":
11531153
version: 0.0.0-use.local
11541154
resolution: "@react-facet/core@workspace:packages/@react-facet/core"
11551155
dependencies:
1156-
"@react-facet/dom-fiber-testing-library": 0.6.1
1156+
"@react-facet/dom-fiber-testing-library": 0.6.4
11571157
"@types/react": ^18.2.0
11581158
"@types/react-reconciler": ^0.28.0
11591159
"@types/rimraf": ^3
@@ -1166,26 +1166,26 @@ __metadata:
11661166
languageName: unknown
11671167
linkType: soft
11681168

1169-
"@react-facet/dom-fiber-testing-library@0.6.1, @react-facet/dom-fiber-testing-library@workspace:^, @react-facet/dom-fiber-testing-library@workspace:packages/@react-facet/dom-fiber-testing-library":
1169+
"@react-facet/dom-fiber-testing-library@0.6.4, @react-facet/dom-fiber-testing-library@workspace:^, @react-facet/dom-fiber-testing-library@workspace:packages/@react-facet/dom-fiber-testing-library":
11701170
version: 0.0.0-use.local
11711171
resolution: "@react-facet/dom-fiber-testing-library@workspace:packages/@react-facet/dom-fiber-testing-library"
11721172
dependencies:
1173-
"@react-facet/dom-fiber": 0.6.1
1173+
"@react-facet/dom-fiber": 0.6.4
11741174
"@testing-library/dom": ^8.20.0
11751175
react: ^18.2.0
11761176
rimraf: ^3.0.2
11771177
typescript: ^4.8.2
11781178
peerDependencies:
1179-
"@react-facet/dom-fiber": 0.6.1
1179+
"@react-facet/dom-fiber": 0.6.4
11801180
react: ^18.2.0
11811181
languageName: unknown
11821182
linkType: soft
11831183

1184-
"@react-facet/dom-fiber@0.6.1, @react-facet/dom-fiber@workspace:packages/@react-facet/dom-fiber":
1184+
"@react-facet/dom-fiber@0.6.4, @react-facet/dom-fiber@workspace:packages/@react-facet/dom-fiber":
11851185
version: 0.0.0-use.local
11861186
resolution: "@react-facet/dom-fiber@workspace:packages/@react-facet/dom-fiber"
11871187
dependencies:
1188-
"@react-facet/core": 0.6.1
1188+
"@react-facet/core": 0.6.4
11891189
"@react-facet/dom-fiber-testing-library": "workspace:^"
11901190
"@types/react": ^18.2.0
11911191
"@types/react-reconciler": ^0.28.0
@@ -1196,7 +1196,7 @@ __metadata:
11961196
rimraf: ^3.0.2
11971197
typescript: ^4.8.2
11981198
peerDependencies:
1199-
"@react-facet/core": 0.6.1
1199+
"@react-facet/core": 0.6.4
12001200
react: ^18.2.0
12011201
languageName: unknown
12021202
linkType: soft
@@ -1211,29 +1211,29 @@ __metadata:
12111211
languageName: unknown
12121212
linkType: soft
12131213

1214-
"@react-facet/shared-facet@0.6.1, @react-facet/shared-facet@workspace:packages/@react-facet/shared-facet":
1214+
"@react-facet/shared-facet@0.6.4, @react-facet/shared-facet@workspace:packages/@react-facet/shared-facet":
12151215
version: 0.0.0-use.local
12161216
resolution: "@react-facet/shared-facet@workspace:packages/@react-facet/shared-facet"
12171217
dependencies:
1218-
"@react-facet/core": 0.6.1
1219-
"@react-facet/dom-fiber-testing-library": 0.6.1
1218+
"@react-facet/core": 0.6.4
1219+
"@react-facet/dom-fiber-testing-library": 0.6.4
12201220
"@types/react": ^18.2.0
12211221
"@types/rimraf": ^3
12221222
cross-env: ^7.0.3
12231223
react: ^18.2.0
12241224
rimraf: ^3.0.2
12251225
typescript: ^4.8.2
12261226
peerDependencies:
1227-
"@react-facet/core": 0.6.1
1227+
"@react-facet/core": 0.6.4
12281228
react: ^18.2.0
12291229
languageName: unknown
12301230
linkType: soft
12311231

1232-
"@react-facet/spring@0.6.1, @react-facet/spring@workspace:packages/@react-facet/spring":
1232+
"@react-facet/spring@0.6.4, @react-facet/spring@workspace:packages/@react-facet/spring":
12331233
version: 0.0.0-use.local
12341234
resolution: "@react-facet/spring@workspace:packages/@react-facet/spring"
12351235
dependencies:
1236-
"@react-facet/core": 0.6.1
1236+
"@react-facet/core": 0.6.4
12371237
"@testing-library/jest-dom": ^5.16.5
12381238
"@types/react": ^18.2.0
12391239
"@types/rimraf": ^3
@@ -1243,7 +1243,7 @@ __metadata:
12431243
rimraf: ^3.0.2
12441244
typescript: ^4.8.2
12451245
peerDependencies:
1246-
"@react-facet/core": 0.6.1
1246+
"@react-facet/core": 0.6.4
12471247
react: ^18.2.0
12481248
languageName: unknown
12491249
linkType: soft
@@ -2925,10 +2925,10 @@ __metadata:
29252925
version: 0.0.0-use.local
29262926
resolution: "benchmarking@workspace:examples/benchmarking"
29272927
dependencies:
2928-
"@react-facet/core": 0.6.1
2929-
"@react-facet/dom-fiber": 0.6.1
2930-
"@react-facet/shared-facet": 0.6.1
2931-
"@react-facet/spring": 0.6.1
2928+
"@react-facet/core": 0.6.4
2929+
"@react-facet/dom-fiber": 0.6.4
2930+
"@react-facet/shared-facet": 0.6.4
2931+
"@react-facet/spring": 0.6.4
29322932
"@types/fs-extra": ^9.0.12
29332933
"@types/puppeteer": ^5.4.4
29342934
"@types/ramda": ^0

0 commit comments

Comments
 (0)