#180 - Show version number on UI

.gitignore

@@ -2,7 +2,6 @@ tmp/
 dist/
 .exe
 node_modules/
-.vscode/
 .DS_Store
 cert/
 *.instance.*

.vscode/launch.json

@@ -5,18 +5,11 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "Launch Chrome (HTTPS)",
-            "request": "launch",
-            "type": "chrome",
-            "url": "https://localhost:8443",
-            "webRoot": "${workspaceFolder}/wwwroot"
-        },
-        {
-            "name": "Launch Firefox (HTTP)",
+            "name": "Firefox, serve and launch",
             "type": "firefox",
             "request": "launch",
             "reAttach": true,
-            "url": "http://localhost:8080/index.html",
+            "url": "http://localhost:8443/index.html",
             "webRoot": "${workspaceFolder}/wwwroot",
             "profile": "debug",
             "keepProfileChanges": true,
@@ -25,10 +18,12 @@
                     "url": "http://localhost:8080",
                     "path": "${workspaceFolder}/wwwroot"
                 }
-            ]
+            ],
+            "preLaunchTask": "launch-server",
+            "postDebugTask": "stop-server"
         },
         {
-            "name": "Launch Firefox (HTTPS)",
+            "name": "Firefox, launch",
             "type": "firefox",
             "request": "launch",
             "reAttach": true,
@@ -44,28 +39,58 @@
             ]
         },
         {
-            "name": "Launch Firefox (HTTPS) build",
+            "name": "Firefox, attach",
             "type": "firefox",
-            "request": "launch",
-            "reAttach": true,
+            "request": "attach",
             "url": "https://localhost:8443/index.html",
-            "webRoot": "${workspaceFolder}/dist",
-            "profile": "debug",
-            "keepProfileChanges": true
+            "webRoot": "${workspaceFolder}/wwwroot",
+            "pathMappings": [
+                {
+                    "url": "https://localhost:8443",
+                    "path": "${workspaceFolder}/wwwroot"
+                }
+            ]
         },
         {
-            "name": "Attach Firefox (HTTP)",
-            "type": "firefox",
-            "request": "attach",
-            "url": "http://localhost:8080/index.html",
+            "name": "Chrome, serve and launch",
+            "request": "launch",
+            "type": "chrome",
+            "url": "https://localhost:8443",
+            "webRoot": "${workspaceFolder}/wwwroot",
+            "preLaunchTask": "launch-server",
+            "postDebugTask": "stop-server"
+        },
+        {
+            "name": "Chrome, launch",
+            "request": "launch",
+            "type": "chrome",
+            "url": "https://localhost:8443",
             "webRoot": "${workspaceFolder}/wwwroot"
         },
         {
-            "name": "Attach Firefox (HTTPS)",
-            "type": "firefox",
+            "name": "Chrome, attach",
+            "port": 9222,
             "request": "attach",
+            "type": "chrome",
+            "webRoot": "${workspaceFolder}/wwwroot",
+        },
+        {
+            "name": "Firefox, build and launch",
+            "type": "firefox",
+            "request": "launch",
+            "reAttach": true,
             "url": "https://localhost:8443/index.html",
-            "webRoot": "${workspaceFolder}/wwwroot"
+            "webRoot": "${workspaceFolder}/dist",
+            "profile": "debug",
+            "keepProfileChanges": true,
+            "pathMappings": [
+                {
+                    "url": "https://localhost:8443",
+                    "path": "${workspaceFolder}/dist"
+                }
+            ],
+            "preLaunchTask": "launch-prod-server",
+            "postDebugTask": "stop-server"
         }
     ]
 }

.vscode/tasks.json

@@ -0,0 +1,41 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"label": "launch-server",
+			"command": "node ./app.js",
+			"type": "shell",
+			"isBackground": true,
+			"problemMatcher": []
+		},
+		{
+			"label": "launch-prod-server",
+			"command": "node ./app.js -p dist",
+			"type": "shell",
+			"isBackground": true,
+			"problemMatcher": [],
+			"dependsOn": ["build"]
+		},
+		{
+			"label": "build",
+			"command": "npm",
+			"type": "shell",
+			"args": [
+				"run", "build"
+			]
+		},
+		{
+			"label": "stop-server",
+			"command": "echo ${input:terminate}",
+			"type": "shell"
+		}
+	],
+	"inputs": [
+		{
+			"id": "terminate",
+			"type": "command",
+			"command": "workbench.action.tasks.terminate",
+			"args": "terminateAll"
+		}
+	]
+}

build/plugins/HtmlWebpackExcludeScriptsPlugin.js

@@ -132,5 +132,5 @@ export default class HtmlWebpackExcludeScriptsPlugin {
 }
 
 /** 
- * @typedef {object} HtmlWebpackExcludeScriptsPluginFilters
+ * @typedef {Object} HtmlWebpackExcludeScriptsPluginFilters
  */

build/post-build.js

@@ -17,16 +17,11 @@ function run() {
 
 
 function makeConfig() {
-    const patreonHandle = process.env[`HANDLE_PATREON`] ?? null;
-    const kofiHandle = process.env[`HANDLE_KOFI`] ?? null;
-    const documentationUrl = process.env[`DOCUMENTATION_URL`] ?? null;
-    const documentationInlineUrl = process.env[`DOCUMENTATION_INLINE_URL`] ?? null;
-
     const config = {
-        patreonHandle: patreonHandle,
-        kofiHandle: kofiHandle,
-        documentationUrl: documentationUrl, 
-        documentationInlineUrl: documentationInlineUrl
+        patreonHandle: process.env[`HANDLE_PATREON`] ?? null,
+        kofiHandle: process.env[`HANDLE_KOFI`] ?? null,
+        documentationUrl: process.env[`DOCUMENTATION_URL`] ?? null, 
+        documentationInlineUrl: process.env[`DOCUMENTATION_INLINE_URL`] ?? null
     };
     const configString = JSON.stringify(config);
     const distDir = path.resolve(__dirname, '..', 'dist');

package.json

@@ -5,6 +5,7 @@
   "private": true,
   "type": "module",
   "scripts": {
+    "launch": "node ./app.js",
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "webpack && node ./build/post-build.js"
   },

webpack.config.js

@@ -4,22 +4,41 @@ import CopyPlugin from "copy-webpack-plugin";
 import path from "path";
 import fs from "fs";
 import url from 'url';
+import dotenv from 'dotenv';
+
+dotenv.config();
 
 const __filename = url.fileURLToPath(import.meta.url);
 const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
+const environment = process.env[`ENVIRONMENT`]?.toLowerCase() ?? null;
+
+console.log(`Environment: ${(environment ?? '')}`);
+console.log(`(Configure using 'ENVIRONMENT' environment variable, eg. ENVIRONMENT=develop)`);
+
+const envSettings = {
+    mode: 'production'
+};
+if (environment === 'develop') {
+    envSettings.mode = 'development';
+    envSettings.devtool = 'source-map';
+}
 
 export default {
-    mode: 'production',
+    ...envSettings,
     entry: {
         main: './wwwroot/modules/main.js',
-        pages: './wwwroot/pages/pages.js'
+        pages: './wwwroot/pages/pages.js',
+        tileEditorViewportWorker: './wwwroot/modules/worker/tileEditorViewportWorker.js',
+        tileImageWorker: './wwwroot/modules/worker/tileImageWorker.js',
     },
     output: {
         filename: (pathData) => {
-            if (pathData.chunk.name === 'main')
+            if (pathData.chunk.name === 'main') {
                 return 'modules/[name].js?v=[hash]';
-            else if (pathData.chunk.name === 'pages') {
+            } else if (pathData.chunk.name === 'pages') {
                 return 'pages/[name].js?v=[hash]';
+            } else if (pathData.chunk.name.toLowerCase().includes('worker')) {
+                return 'modules/worker/[name].js?v=[hash]';
             } else {
                 return 'assets/scripts/[name].js?v=[hash]';
             }
@@ -65,7 +84,8 @@ export default {
             patterns: [
                 { from: 'wwwroot/assets/image', to: 'assets/image' },
                 { from: 'wwwroot/assets/sample', to: 'assets/sample', noErrorOnMissing: true },
-                { from: 'wwwroot/config', to: 'config', noErrorOnMissing: true }
+                { from: 'wwwroot/config', to: 'config', noErrorOnMissing: true },
+                { from: 'wwwroot/metadata', to: 'metadata' },
             ]
         }),
         new HtmlWebpackPlugin({