Merge branch 'master' into gh-pages

.github/workflows/webapp.yml

@@ -0,0 +1,28 @@
+name: NodeJS with Webpack
+
+on:
+  push:
+    branches: [ "gh-pages" ]
+  pull_request:
+    branches: [ "gh-pages" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [14.x, 16.x, 18.x]
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v3
+      with:
+        node-version: ${{ matrix.node-version }}
+
+    - name: Build
+      run: |
+        npm install
+        npm run prepublish

.gitignore

@@ -1,4 +1,7 @@
 /dist/
 index.php
 electron-builder.env
-node_modules/
+node_modules/
+js/bundle.js
+workbox-*.js
+service_worker.js

.travis.yml

@@ -3,7 +3,7 @@ dist: trusty
 
 language: node_js
 node:
-  - 14
+  - 18
 
 if: tag IS blank AND commit_message =~ ci-build
 
@@ -13,11 +13,13 @@ jobs:
       os: osx
       osx_image: "xcode12.5"
       script:
+        - npm run prepublish
         - electron-builder --publish=always
 
     - name: "Linux"
       os: linux
       script:
+        - npm run prepublish
         - sudo apt-get install rpm
         - electron-builder --publish=onTagOrDraft
 

index.html

@@ -87,7 +87,7 @@
 		<script src="lib/molang.umd.js"></script>
 		<script src="lib/wintersky.umd.js"></script>
 
-		<script src="js/webpack/bundle.js"></script>
+		<script src="js/bundle.js"></script>
 		<script src="js/preview/OrbitControls.js"></script>
 		<script src="js/util/util.js"></script>
 		<script src="js/util/math_util.js"></script>

scripts/generate_pwa.js

@@ -1,11 +1,4 @@
 const workbox = require('workbox-build');
-const fs = require('fs');
-
-let bundle_file = fs.readFileSync('./js/webpack/bundle.js', 'utf-8');
-/*if (bundle_file.match(/</)) {
-	console.error('\x1b[31m', 'Invalid symbol detected in bundle');
-	process.exit(1);
-}*/
 
 workbox.generateSW({
 	cacheId: 'blockbench',

webpack.config.js

@@ -7,7 +7,7 @@ module.exports = {
     entry: './src/index.js',
     output: {
         filename: 'bundle.js',
-        path: PathModule.resolve(__dirname, 'js', 'webpack')
+        path: PathModule.resolve(__dirname, 'js')
     },
     module: {
         rules: [