a few fixes (#20)

fix: ios improvements: always display full ui & no magnifier on double tap anymore fix: regression: connect to p2p peers
zardoy · Sep 19, 2023 · 14a9a2b · 14a9a2b
1 parent b6d236d
commit 14a9a2b
Show file tree

Hide file tree

Showing 20 changed files with 13,080 additions and 56 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,11 +12,10 @@ jobs:
         run: npm i -g pnpm
       - run: pnpm install
       - run: pnpm build
+      - run: nohup pnpm prod-start & node cypress/minecraft-server.mjs &
       - uses: cypress-io/github-action@v5
         with:
           install: false
-          # start: pnpm prod-start & node cypress/minecraft-server.mjs
-          start: pnpm prod-start
       - uses: actions/upload-artifact@v3
         if: failure()
         with:

diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
@@ -3,11 +3,17 @@ env:
   VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
   VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
 on:
-  workflow_dispatch:
-  pull_request:
+  issue_comment:
+    types: [created]
 jobs:
   deploy:
     runs-on: ubuntu-latest
+    # todo skip already created deploys on that commit
+    if: >-
+      github.event.issue.pull_request != '' &&
+      (
+        contains(github.event.comment.body, '/deploy')
+      )
     steps:
       - name: Checkout
         uses: actions/checkout@v2

diff --git a/.npmrc b/.npmrc
@@ -1,4 +1,3 @@
-package-lock=false
 public-hoist-pattern=*
 ignore-workspace-root-check=true
 shell-emulator=true
diff --git a/cypress/integration/index.spec.ts b/cypress/integration/index.spec.ts
@@ -30,7 +30,7 @@ it('Loads & renders singleplayer', () => {
     })
 })
 
-it.skip('Joins to server', () => {
+it('Joins to server', () => {
     cy.visit('/')
     setLocalStorageSettings()
     // todo replace with data-test

diff --git a/esbuild.mjs b/esbuild.mjs
@@ -61,7 +61,7 @@ const ctx = await esbuild.context({
   ],
   metafile: true,
   plugins,
-  sourcesContent: process.argv.includes('--no-sources'),
+  sourcesContent: !process.argv.includes('--no-sources'),
   minify: process.argv.includes('--minify'),
   define: {
     'process.env.NODE_ENV': JSON.stringify(dev ? 'development' : 'production'),

diff --git a/index.html b/index.html
@@ -37,8 +37,8 @@
     <link rel="manifest" href="manifest.json" crossorigin="use-credentials">
   </head>
   <body>
+    <div id="react-root"></div>
     <div id="ui-root">
-      <div id="react-root"></div>
       <pmui-hud id="hud" style="display: none;"></pmui-hud>
       <pmui-pausescreen id="pause-screen" style="display: none;"></pmui-pausescreen>
       <pmui-loading-error-screen id="loading-error-screen" style="display: none;"></pmui-loading-error-screen>

diff --git a/package.json b/package.json
@@ -20,7 +20,7 @@
   "author": "PrismarineJS",
   "license": "MIT",
   "dependencies": {
-    "@dimaka/interface": "0.0.1",
+    "@dimaka/interface": "0.0.3-alpha.0",
     "@emotion/css": "^11.11.2",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
     "@types/react": "^18.2.20",
@@ -46,9 +46,7 @@
     "net-browserify": "github:PrismarineJS/net-browserify",
     "peerjs": "^1.5.0",
     "pretty-bytes": "^6.1.1",
-    "prismarine-world": "^3.6.2",
     "qrcode.react": "^3.1.0",
-    "querystring": "^0.2.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-refresh": "^0.14.0",
@@ -100,7 +98,8 @@
     "webpack-dev-middleware": "^6.1.1",
     "webpack-dev-server": "^4.15.1",
     "webpack-merge": "^5.9.0",
-    "workbox-webpack-plugin": "^6.6.0"
+    "workbox-webpack-plugin": "^6.6.0",
+    "yaml": "^2.3.2"
   },
   "pnpm": {
     "overrides": {