more fixes for new build format

.github/workflows/build-latest-v2.yml

@@ -59,8 +59,8 @@ jobs:
       run: |
         mv res/run-faucet.* ./
         chmod +x ./run-faucet.sh
-        tar cfz powfaucet-server-all.tar.gz dist static faucet-config.example.yaml run-faucet.sh
-        zip -r powfaucet-server-all.zip dist static faucet-config.example.yaml run-faucet.bat
+        tar cfz powfaucet-server-all.tar.gz bundle static faucet-config.example.yaml run-faucet.sh
+        zip -r powfaucet-server-all.zip bundle static faucet-config.example.yaml run-faucet.bat
     
     # package static folder
     - name: Package static folder
@@ -158,7 +158,7 @@ jobs:
       uses: actions/upload-release-asset@v1
       with:
         upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./dist/pow-faucet-server-linux
+        asset_path: ./bin/pow-faucet-server-linux
         asset_name: powfaucet-server-linux
         asset_content_type: application/octet-stream
       env:
@@ -167,7 +167,7 @@ jobs:
       uses: actions/upload-release-asset@v1
       with:
         upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./dist/pow-faucet-server-win.exe
+        asset_path: ./bin/pow-faucet-server-win.exe
         asset_name: powfaucet-server-win.exe
         asset_content_type: application/octet-stream
       env:

.github/workflows/release-v2.yml

@@ -48,8 +48,8 @@ jobs:
       run: |
         mv res/run-faucet.* ./
         chmod +x ./run-faucet.sh
-        tar cfz powfaucet-server-all.tar.gz dist static faucet-config.example.yaml run-faucet.sh
-        zip -r powfaucet-server-all.zip dist static faucet-config.example.yaml run-faucet.bat
+        tar cfz powfaucet-server-all.tar.gz bundle static faucet-config.example.yaml run-faucet.sh
+        zip -r powfaucet-server-all.zip bundle static faucet-config.example.yaml run-faucet.bat
     
     # package static folder
     - name: Package static folder
@@ -95,7 +95,7 @@ jobs:
       uses: actions/upload-release-asset@v1
       with:
         upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./dist/pow-faucet-server-linux
+        asset_path: ./bin/pow-faucet-server-linux
         asset_name: powfaucet-server-linux
         asset_content_type: application/octet-stream
       env:
@@ -104,7 +104,7 @@ jobs:
       uses: actions/upload-release-asset@v1
       with:
         upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./dist/pow-faucet-server-win.exe
+        asset_path: ./bin/pow-faucet-server-win.exe
         asset_name: powfaucet-server-win.exe
         asset_content_type: application/octet-stream
       env:

.github/workflows/test-build.yml

@@ -41,15 +41,15 @@ jobs:
     - name: Upload powfaucet.js artifact
       uses: actions/upload-artifact@v3
       with:
-        path: ./dist/powfaucet.js
+        path: ./bundle/powfaucet.cjs
         name: powfaucet.js
     - name: Upload linux binary artifact
       uses: actions/upload-artifact@v3
       with:
-        path: ./dist/pow-faucet-server-linux
+        path: ./bin/pow-faucet-server-linux
         name: powfaucet-server-linux
     - name: Upload windows binary artifact
       uses: actions/upload-artifact@v3
       with:
-        path: ./dist/pow-faucet-server-win.exe
+        path: ./bin/pow-faucet-server-win.exe
         name: powfaucet-server-win.exe

Dockerfile

@@ -24,10 +24,10 @@ FROM node:18-slim
 WORKDIR /app
 RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates
 RUN update-ca-certificates
-COPY --from=build-server-env /build/dist ./dist
+COPY --from=build-server-env /build/bundle ./bundle
 COPY --from=build-client-env /build/static ./static
 COPY ./faucet-config.example.yaml .
 RUN cp ./static/index.html ./static/index.seo.html && chmod 777 ./static/index.seo.html
 
 EXPOSE 8080
-ENTRYPOINT [ "node", "--no-deprecation", "dist/powfaucet.js" ]
+ENTRYPOINT [ "node", "--no-deprecation", "bundle/powfaucet.cjs" ]

res/run-faucet.bat

@@ -1,2 +1,2 @@
 
-node --no-deprecation .\dist\powfaucet.js
+node --no-deprecation .\bundle\powfaucet.cjs

res/run-faucet.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 cd $( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )
 
-until node --no-deprecation ./dist/powfaucet.js; do
-  echo "powfaucet.js crashed with exit code $?.  Respawning.." >&2
+until node --no-deprecation ./bundle/powfaucet.cjs; do
+  echo "powfaucet.cjs crashed with exit code $?.  Respawning.." >&2
   sleep 1
 done

webpack.config.js

@@ -1,5 +1,6 @@
 import path, { dirname } from 'path'
 import { fileURLToPath } from "url";
+import webpack from "webpack";
 
 let importUrl = fileURLToPath(import.meta.url);
 const __dirname = dirname(importUrl);
@@ -12,8 +13,11 @@ export default {
   },
   output: {
     filename: 'powfaucet.cjs',
-    chunkFilename: 'powfaucet-[name].cjs',
     path: path.resolve(__dirname, 'bundle'),
-    libraryTarget: 'umd',
-  }
+  },
+  plugins: [
+    new webpack.optimize.LimitChunkCountPlugin({
+      maxChunks: 1,
+    }),
+  ],
 };