Skip to content

Commit 14a9a2b

Browse files
authored
a few fixes (#20)
fix: ios improvements: always display full ui & no magnifier on double tap anymore fix: regression: connect to p2p peers
1 parent b6d236d commit 14a9a2b

20 files changed

Lines changed: 13080 additions & 56 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@ jobs:
1212
run: npm i -g pnpm
1313
- run: pnpm install
1414
- run: pnpm build
15+
- run: nohup pnpm prod-start & node cypress/minecraft-server.mjs &
1516
- uses: cypress-io/github-action@v5
1617
with:
1718
install: false
18-
# start: pnpm prod-start & node cypress/minecraft-server.mjs
19-
start: pnpm prod-start
2019
- uses: actions/upload-artifact@v3
2120
if: failure()
2221
with:

.github/workflows/preview.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,17 @@ env:
33
VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
44
VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
55
on:
6-
workflow_dispatch:
7-
pull_request:
6+
issue_comment:
7+
types: [created]
88
jobs:
99
deploy:
1010
runs-on: ubuntu-latest
11+
# todo skip already created deploys on that commit
12+
if: >-
13+
github.event.issue.pull_request != '' &&
14+
(
15+
contains(github.event.comment.body, '/deploy')
16+
)
1117
steps:
1218
- name: Checkout
1319
uses: actions/checkout@v2

.npmrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
package-lock=false
21
public-hoist-pattern=*
32
ignore-workspace-root-check=true
43
shell-emulator=true

cypress/integration/index.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ it('Loads & renders singleplayer', () => {
3030
})
3131
})
3232

33-
it.skip('Joins to server', () => {
33+
it('Joins to server', () => {
3434
cy.visit('/')
3535
setLocalStorageSettings()
3636
// todo replace with data-test

esbuild.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ const ctx = await esbuild.context({
6161
],
6262
metafile: true,
6363
plugins,
64-
sourcesContent: process.argv.includes('--no-sources'),
64+
sourcesContent: !process.argv.includes('--no-sources'),
6565
minify: process.argv.includes('--minify'),
6666
define: {
6767
'process.env.NODE_ENV': JSON.stringify(dev ? 'development' : 'production'),

index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
<link rel="manifest" href="manifest.json" crossorigin="use-credentials">
3838
</head>
3939
<body>
40+
<div id="react-root"></div>
4041
<div id="ui-root">
41-
<div id="react-root"></div>
4242
<pmui-hud id="hud" style="display: none;"></pmui-hud>
4343
<pmui-pausescreen id="pause-screen" style="display: none;"></pmui-pausescreen>
4444
<pmui-loading-error-screen id="loading-error-screen" style="display: none;"></pmui-loading-error-screen>

package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"author": "PrismarineJS",
2121
"license": "MIT",
2222
"dependencies": {
23-
"@dimaka/interface": "0.0.1",
23+
"@dimaka/interface": "0.0.3-alpha.0",
2424
"@emotion/css": "^11.11.2",
2525
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
2626
"@types/react": "^18.2.20",
@@ -46,9 +46,7 @@
4646
"net-browserify": "github:PrismarineJS/net-browserify",
4747
"peerjs": "^1.5.0",
4848
"pretty-bytes": "^6.1.1",
49-
"prismarine-world": "^3.6.2",
5049
"qrcode.react": "^3.1.0",
51-
"querystring": "^0.2.1",
5250
"react": "^18.2.0",
5351
"react-dom": "^18.2.0",
5452
"react-refresh": "^0.14.0",
@@ -100,7 +98,8 @@
10098
"webpack-dev-middleware": "^6.1.1",
10199
"webpack-dev-server": "^4.15.1",
102100
"webpack-merge": "^5.9.0",
103-
"workbox-webpack-plugin": "^6.6.0"
101+
"workbox-webpack-plugin": "^6.6.0",
102+
"yaml": "^2.3.2"
104103
},
105104
"pnpm": {
106105
"overrides": {

0 commit comments

Comments
 (0)