Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: single file build #181

Merged
merged 24 commits into from
Mar 11, 2025
Merged

feat: single file build #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
77b11ea
wip one file build
zardoy Aug 18, 2024
b13f759
add script
zardoy Aug 18, 2024
a5def81
bundle worker: its all working now!
zardoy Aug 18, 2024
ee18a68
Merge branch 'next' into one-file-build
zardoy Sep 10, 2024
d311110
restore bunblind
zardoy Sep 10, 2024
725103b
restore bunblind
zardoy Sep 10, 2024
d22cdb7
Merge branch 'next' into one-file-build
zardoy Sep 30, 2024
e6b0d79
Merge branch 'next' into one-file-build
zardoy Oct 21, 2024
a45a215
Merge remote-tracking branch 'origin/next' into one-file-build
zardoy Nov 1, 2024
d93cbf9
rename to single file build, implement panorama replacement, fix all …
zardoy Nov 1, 2024
7a6b471
remove a lot of not used data from entities.json, make it 60% smaller
zardoy Nov 1, 2024
9b6fc35
enable config.json inlining on prod as it won't change anyway on vercel
zardoy Nov 1, 2024
3f14d9c
all done! now only recipes needs to be fixed and sounds added
zardoy Nov 21, 2024
319b2d3
WIP TO REVERT / TEST & FIX
zardoy Dec 1, 2024
20b4014
Merge branch 'next' into one-file-build
zardoy Jan 25, 2025
9e5a412
crash fixes
zardoy Jan 25, 2025
64b424a
Merge branch 'next' into one-file-build
zardoy Feb 5, 2025
fbd9351
Merge branch 'next' into one-file-build
zardoy Feb 17, 2025
79a6c7c
Merge branch 'next' into one-file-build
zardoy Mar 11, 2025
ca3684a
final workflows
zardoy Mar 11, 2025
435e247
ci fixes
zardoy Mar 11, 2025
3afa092
minor comment adjust
zardoy Mar 11, 2025
a8bca03
fix sp 1 in singlefile build
zardoy Mar 11, 2025
06b295a
fix panorama in sfb
zardoy Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions .github/workflows/build-single-file.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: build-single-file

on:
workflow_dispatch:

jobs:
build-and-bundle:
runs-on: ubuntu-latest
permissions: write-all
steps:
- name: Checkout repository
uses: actions/checkout@master

- uses: actions/setup-node@v4
with:
node-version: 22

- name: Install pnpm
uses: pnpm/action-setup@v4

- name: Install dependencies
run: pnpm install

- name: Build single-file version - minecraft.html
run: pnpm build-single-file && mv dist/single/index.html minecraft.html

- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: minecraft.html
path: minecraft.html
2 changes: 2 additions & 0 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ jobs:
publish_dir: .vercel/output/static
force_orphan: true

- name: Build single-file version - minecraft.html
run: pnpm build-single-file && mv dist/single/index.html minecraft.html
- name: Build self-host version
run: pnpm build
- name: Bundle server.js
Expand Down
2 changes: 1 addition & 1 deletion config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"defaultHost": "<from-proxy>",
"defaultProxy": "proxy.mcraft.fun",
"defaultProxy": "https://proxy.mcraft.fun",
"mapsProvider": "https://maps.mcraft.fun/",
"peerJsServer": "",
"peerJsServerFallback": "https://p2p.mcraft.fun",
Expand Down
4 changes: 0 additions & 4 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,6 @@
}
</script> -->
<title>Minecraft Web Client</title>
<link rel="favicon" href="favicon.png">
<link rel="icon" type="image/png" href="favicon.png" />
<!-- <link rel="canonical" href="https://mcraft.fun"> -->
<meta name="description" content="Minecraft web client running in your browser">
<meta name="keywords" content="Play, Minecraft, Online, Web, Java, Server, Single player, Javascript, PrismarineJS, Voxel, WebGL, Three.js">
Expand All @@ -140,9 +138,7 @@
<meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover'>
<meta property="og:title" content="Minecraft Web Client" />
<meta property="og:type" content="website" />
<meta property="og:image" content="favicon.png" />
<meta name="format-detection" content="telephone=no">
<link rel="manifest" href="manifest.json" crossorigin="use-credentials">
</head>
<body>
<div id="react-root"></div>
Expand Down
7 changes: 5 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
"start2": "run-p dev-rsbuild watch-mesher",
"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",
"build-single-file": "SINGLE_FILE_BUILD=true rsbuild build",
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Fix environment variable mismatch.

Your code checks SINGLE_FILE_BUILD_MODE, but the script sets SINGLE_FILE_BUILD. This mismatch will prevent logic from running as intended.

- "build-single-file": "SINGLE_FILE_BUILD=true rsbuild build",
+ "build-single-file": "SINGLE_FILE_BUILD_MODE=true rsbuild build",
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
"build-single-file": "SINGLE_FILE_BUILD=true rsbuild build",
"build-single-file": "SINGLE_FILE_BUILD_MODE=true rsbuild build",

"prepare-project": "tsx scripts/genShims.ts && tsx scripts/makeOptimizedMcData.mjs && tsx scripts/genLargeDataAliases.ts",
"check-build": "pnpm prepare-project && tsc && pnpm build",
"test:cypress": "cypress run",
"test:cypress:open": "cypress open",
"test-unit": "vitest",
Expand All @@ -36,7 +38,7 @@
"client"
],
"release": {
"attachReleaseFiles": "self-host.zip"
"attachReleaseFiles": "{self-host.zip,minecraft.html}"
},
"publish": {
"preset": {
Expand Down Expand Up @@ -171,6 +173,7 @@
"optionalDependencies": {
"cypress": "^10.11.0",
"cypress-plugin-snapshots": "^1.4.4",
"sharp": "^0.33.5",
"systeminformation": "^5.21.22"
},
"browserslist": {
Expand Down
Loading
Loading