next release (#200)

.eslintignore

@@ -3,4 +3,6 @@ rsbuild.config.ts
 *.module.css.d.ts
 *.generated.ts
 generated
+dist
 public
+**/*/rsbuildSharedConfig.ts

.github/workflows/ci.yml

@@ -35,10 +35,8 @@ jobs:
         if: failure()
         with:
           name: cypress-images
-          path: cypress/integration/__image_snapshots__/
-      - name: print current ref
-        run: echo ${{ github.event.pull_request.base.ref }}
-      - run: node scripts/outdatedGitPackages.mjs
-        if: ${{ github.event.pull_request.base.ref == 'next' }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          path: cypress/screenshots/
+      # - run: node scripts/outdatedGitPackages.mjs
+      #   if: ${{ github.event.pull_request.base.ref == 'release' }}
+      #   env:
+      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/merge-next.yml

@@ -17,10 +17,11 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0 # Fetch all history so we can merge branches
+          ref: refs/pull/${{ github.event.issue.number }}/head
       - name: Fetch All Branches
         run: git fetch --all
-      - name: Checkout PR
-        run: git checkout ${{ github.event.issue.pull_request.head.ref }}
+      # - name: Checkout PR
+      #   run: git checkout ${{ github.event.issue.pull_request.head.ref }}
       - name: Merge From Next
         run: git merge origin/next --strategy-option=theirs
       - name: Push Changes

.github/workflows/next-deploy.yml

@@ -24,7 +24,10 @@ jobs:
         run: vercel build --token=${{ secrets.VERCEL_TOKEN }}
       - run: pnpm build-storybook
       - name: Copy playground files
-        run: pnpm build-playground && cp prismarine-viewer/public/index.html .vercel/output/static/playground.html && cp prismarine-viewer/public/playground.js .vercel/output/static/playground.js
+        run: |
+          mkdir -p .vercel/output/static/playground
+          pnpm build-playground
+          cp -r prismarine-viewer/dist/* .vercel/output/static/playground/
       - name: Download Generated Sounds map
         run: node scripts/downloadSoundsMap.mjs
       - name: Deploy Project Artifacts to Vercel

.github/workflows/preview.yml

@@ -35,7 +35,10 @@ jobs:
         run: vercel build --token=${{ secrets.VERCEL_TOKEN }}
       - run: pnpm build-storybook
       - name: Copy playground files
-        run: pnpm build-playground && cp prismarine-viewer/public/index.html .vercel/output/static/playground.html && cp prismarine-viewer/public/playground.js .vercel/output/static/playground.js
+        run: |
+          mkdir -p .vercel/output/static/playground
+          pnpm build-playground
+          cp -r prismarine-viewer/dist/* .vercel/output/static/playground/
       - name: Download Generated Sounds map
         run: node scripts/downloadSoundsMap.mjs
       - name: Deploy Project Artifacts to Vercel
@@ -48,7 +51,7 @@ jobs:
           allow-repeats: true
           message: |
             Deployed to Vercel Preview: ${{ steps.deploy.outputs.stdout }}
-            [Playground](${{ steps.deploy.outputs.stdout }}/playground.html)
+            [Playground](${{ steps.deploy.outputs.stdout }}/playground/)
             [Storybook](${{ steps.deploy.outputs.stdout }}/storybook/)
       # - run: git checkout next scripts/githubActions.mjs
       - name: Get deployment alias

.github/workflows/publish.yml

@@ -23,7 +23,10 @@ jobs:
       - run: vercel build --token=${{ secrets.VERCEL_TOKEN }} --prod
       - run: pnpm build-storybook
       - name: Copy playground files
-        run: pnpm build-playground && cp prismarine-viewer/public/index.html .vercel/output/static/playground.html && cp prismarine-viewer/public/playground.js .vercel/output/static/playground.js
+        run: |
+          mkdir -p .vercel/output/static/playground
+          pnpm build-playground
+          cp -r prismarine-viewer/dist/* .vercel/output/static/playground/
       - name: Download Generated Sounds map
         run: node scripts/downloadSoundsMap.mjs
       - name: Deploy Project to Vercel

README.MD

@@ -87,7 +87,7 @@ To open the console, press `F12`, or if you are on mobile, you can type `#dev` i
 
 It should be easy to build/start the project locally. See [CONTRIBUTING.MD](./CONTRIBUTING.md) for more info. Also you can look at Dockerfile for reference.
 
-There is world renderer playground ([link](https://mcon.vercel.app/playground.html)).
+There is world renderer playground ([link](https://mcon.vercel.app/playground/)).
 
 However, there are many things that can be done in online production version (like debugging actual source code). Also you can access some global variables in the console and there are a few useful examples:
 

assets/playground.html

@@ -0,0 +1,4 @@
+<!-- just redirect to /playground/ -->
+<script>
+window.location.href = `/playground/${window.location.search}`
+</script>

cypress.config.ts

@@ -3,6 +3,7 @@ import { defineConfig } from 'cypress'
 export default defineConfig({
   video: false,
   chromeWebSecurity: false,
+  screenshotOnRunFailure: true, // Enable screenshots on test failures
   e2e: {
     // We've imported your old cypress plugins here.
     // You may want to clean this up later by importing these.

cypress/e2e/index.spec.ts

@@ -49,7 +49,7 @@ it('Joins to local flying-squid server', () => {
   testWorldLoad()
 })
 
-it('Joins to local latest Java vanilla server', () => {
+it.skip('Joins to local latest Java vanilla server', () => {
   const version = supportedVersions.at(-1)!
   cy.task('startServer', [version, 25_590]).then(() => {
     visit('/?ip=localhost:25590&username=bot')

package.json

@@ -6,9 +6,8 @@
     "dev-rsbuild": "rsbuild dev",
     "dev-proxy": "node server.js",
     "start": "run-p dev-rsbuild dev-proxy watch-mesher",
-    "start-watch-script": "nodemon -w rsbuild.config.ts --watch",
-    "build": "rsbuild build",
-    "build-analyze": "BUNDLE_ANALYZE=true rsbuild build",
+    "build": "pnpm build-other-workers && rsbuild build",
+    "build-analyze": "BUNDLE_ANALYZE=true rsbuild build && pnpm build-other-workers",
     "check-build": "tsx scripts/genShims.ts && tsc && pnpm build",
     "test:cypress": "cypress run",
     "test-unit": "vitest",
@@ -20,13 +19,13 @@
     "build-storybook": "storybook build && node scripts/build.js moveStorybookFiles",
     "start-experiments": "vite --config experiments/vite.config.ts --host",
     "watch-other-workers": "echo NOT IMPLEMENTED",
+    "build-other-workers": "echo NOT IMPLEMENTED",
     "build-mesher": "node prismarine-viewer/buildMesherWorker.mjs",
     "watch-mesher": "pnpm build-mesher -w",
-    "run-playground": "run-p watch-mesher watch-other-workers playground-server watch-playground",
+    "run-playground": "run-p watch-mesher watch-other-workers watch-playground",
     "run-all": "run-p start run-playground",
-    "playground-server": "live-server --port=9090 prismarine-viewer/public",
-    "build-playground": "node prismarine-viewer/esbuild.mjs",
-    "watch-playground": "node prismarine-viewer/esbuild.mjs -w"
+    "build-playground": "rsbuild build --config prismarine-viewer/rsbuild.config.ts",
+    "watch-playground": "rsbuild dev --config prismarine-viewer/rsbuild.config.ts"
   },
   "keywords": [
     "prismarine",

prismarine-viewer/buildMesherWorker.mjs

@@ -30,7 +30,7 @@ const buildOptions = {
   sourcemap: 'linked',
   write: false,
   metafile: true,
-  outdir: path.join(__dirname, './public'),
+  outdir: path.join(__dirname, './dist'),
   define: {
     'process.env.BROWSER': '"true"',
   },
@@ -108,9 +108,9 @@ const buildOptions = {
         })
         build.onEnd(({ metafile, outputFiles }) => {
           if (!metafile) return
-          fs.mkdirSync(path.join(__dirname, './public'), { recursive: true })
-          fs.writeFileSync(path.join(__dirname, './public/metafile.json'), JSON.stringify(metafile))
-          for (const outDir of ['../dist/', './public/']) {
+          fs.mkdirSync(path.join(__dirname, './dist'), { recursive: true })
+          fs.writeFileSync(path.join(__dirname, './dist/metafile.json'), JSON.stringify(metafile))
+          for (const outDir of ['../dist/', './dist/']) {
             for (const outputFile of outputFiles) {
               if (outDir === '../dist/' && outputFile.path.endsWith('.map')) {
                 // skip writing & browser loading sourcemap there, worker debugging should be done in playground

prismarine-viewer/playground.html

@@ -29,8 +29,14 @@
           src: url(../../../assets/mojangles.ttf);
       }
     </style>
+    <script>
+      if (window.location.pathname.endsWith('playground')) {
+        // add trailing slash
+        window.location.href = `${window.location.origin}${window.location.pathname}/${window.location.search}`
+      }
+    </script>
   </head>
   <body>
-    <script type="text/javascript" src="playground.js"></script>
+    <div id="root"></div>
   </body>
 </html>

prismarine-viewer/rsbuild.config.ts

@@ -0,0 +1,40 @@
+import { defineConfig, mergeRsbuildConfig } from '@rsbuild/core';
+import supportedVersions from '../src/supportedVersions.mjs'
+import childProcess from 'child_process'
+import path, { dirname, join } from 'path'
+import { pluginReact } from '@rsbuild/plugin-react';
+import { pluginNodePolyfill } from '@rsbuild/plugin-node-polyfill';
+import fs from 'fs'
+import { appAndRendererSharedConfig, rspackViewerConfig } from './rsbuildSharedConfig';
+
+const mcDataPath = join(__dirname, '../generated/minecraft-data-optimized.json')
+
+if (!fs.existsSync(mcDataPath)) {
+    childProcess.execSync('tsx ./scripts/makeOptimizedMcData.mjs', { stdio: 'inherit', cwd: path.join(__dirname, '..') })
+}
+
+export default mergeRsbuildConfig(
+    appAndRendererSharedConfig(),
+    defineConfig({
+        html: {
+            template: join(__dirname, './playground.html'),
+        },
+        output: {
+            cleanDistPath: false,
+            distPath: {
+                root: join(__dirname, './dist'),
+            },
+        },
+        server: {
+            port: 9090,
+        },
+        source: {
+            entry: {
+                index: join(__dirname, './examples/playground.ts')
+            },
+            define: {
+                'globalThis.includedVersions': JSON.stringify(supportedVersions),
+            },
+        },
+    })
+)