Merge branch 'fix test hangs in __DEV__ mode'

* Branch commit log:
  ui/index.html: use __DEV__ flag for debug() function
  vite.config.ts: use version.json for __DEV__, enable proxy for DEVPORT_MKDOCS
  electron/Makefile.mk: add revdate and use __DEV__ flag for app/package.json
  Makefile.mk: introduce __DEV__ flag and shrink config.sh
  ui/b/app.js: call async_modal_dialog on Shell instead of this.shell

Author: tim-janik

Makefile.mk

@@ -79,6 +79,7 @@ override MODE !=  case "$(MODE)" in \
 .config.defaults += MODE
 $(info $S  MODE     $(MODE))
 .config.defaults += INSN
+__DEV__		 := $(if $(filter production,$(MODE)),false,true)
 
 # == Dirctories ==
 prefix		 ?= /usr/local
@@ -242,7 +243,7 @@ CLEANDIRS += $>/codegen/
 define PACKAGE_VERSIONS
   "version": "$(version_short)",
   "revdate": "$(version_date)",
-  "mode": "$(MODE)"
+  "__DEV__": $(__DEV__)
 endef
 
 # == config.sh ==
@@ -251,9 +252,6 @@ $>/config.sh: $(wildcard config-defaults.mk)				| $>/
 	$Q echo 'srcdir="$(abspath .)"'					>  $@.tmp
 	$Q echo 'outdir="$(abspath $>)"'				>> $@.tmp
 	$Q echo 'pkgdir="$(abspath $(pkgdir))"'				>> $@.tmp
-	$Q echo 'version="$(version_short)"'				>> $@.tmp
-	$Q echo 'revdate="$(version_date)"'				>> $@.tmp
-	$Q echo 'mode="$(MODE)"'					>> $@.tmp
 	$Q mv $@.tmp $@
 ALL_TARGETS += $>/config.sh
 

electron/Makefile.mk

@@ -3,7 +3,8 @@
 # ELECTRON_PKG_NAME determines the default name of app.getPath('appData')
 ELECTRON_PKG_NAME	:= Anklang
 ELECTRON_VERSION	:= $(version_short)
-ELECTRON_DEV		:= false
+ELECTRON_REVDATE	:= $(version_date)
+ELECTRON_DEV		:= $(__DEV__)
 ELECTRON_SOURCES	:= electron/main.js electron/sourcemapping.js electron/preload.js electron/htmlgui.svg
 ELECTRON_DEPS		:= node_modules/.npm.done
 ELECTRON_INSTALLDIR	:= $(pkgdir)/electron
@@ -23,6 +24,7 @@ $>/electron/htmlgui: electron/Makefile.mk $(ELECTRON_SOURCES) $(ELECTRON_DEPS)
 	$Q echo '{ "private": true,'				>  $(@D)/resources/app/package.json
 	$Q echo '  "name": "$(ELECTRON_PKG_NAME)",'		>> $(@D)/resources/app/package.json
 	$Q echo '  "version": "$(ELECTRON_VERSION)",'		>> $(@D)/resources/app/package.json
+	$Q echo '  "revdate": "$(ELECTRON_REVDATE)",'		>> $(@D)/resources/app/package.json
 	$Q echo '  "__DEV__": "$(ELECTRON_DEV)",'		>> $(@D)/resources/app/package.json
 	$Q echo '  "main": "main.js" }'				>> $(@D)/resources/app/package.json
 	$Q chmod g-w -R $>/electron/

ui/b/app.js

@@ -197,7 +197,7 @@ export class AppClass {
       buttons,
       emblem,
     };
-    return this.shell.async_modal_dialog (dialog_setup);
+    return Shell.async_modal_dialog (dialog_setup);
   }
   zmoves_add = Mouse.zmove_add;
   zmove = Mouse.zmove_trigger;

ui/index.html

@@ -26,7 +26,7 @@
     Object.defineProperty (globalThis, '_', { value: t9n => t9n });
     Object.defineProperty (globalThis, 'CONFIG', { value: __VITE_CONFIG__ });
     Object.defineProperty (globalThis, '__DEV__', { value: !!CONFIG.__DEV__ });
-    Object.defineProperty (globalThis, 'debug', { value: CONFIG.mode != "production" ? console.log : () => undefined });
+    Object.defineProperty (globalThis, 'debug', { value: CONFIG.__DEV__ ? console.log : () => undefined });
     Object.defineProperty (globalThis, 'assert', { value: console.assert });
     Object.defineProperty (globalThis, 'Extra_css', { value: () => undefined });
     Object.defineProperty (document, 'skipViewTransition', { value: func => func() });

vite.config.ts

@@ -18,31 +18,30 @@ import extra_css from './ui/extra-css';
 import stylelint from 'stylelint';
 import stylelintrc from './ui/stylelintrc.cjs';
 import postcssReporter from "postcss-reporter";
-
 const BUILDDIR = path.resolve (process.env.BUILDDIR || 'out/');
 const gen_path = path.resolve (BUILDDIR + "/gen/");
+const __VITE_CONFIG__ = JSON.parse (fs.readFileSync (path.resolve (BUILDDIR + "/version.json"), 'utf8'));
+const __DEV__ = __VITE_CONFIG__.__DEV__;
 // Note: For development, ports are hard coded, synchronize port numbers with serve.sh
-const DEVPORT_ANKLANG = process.env.DEVPORT_ANKLANG || 1776;
 const DEVPORT_VITE = process.env.DEVPORT_VITE || 1777;
-const DEVPORT_MKDOCS = process.env.DEVPORT_MKDOCS || 1778;
+const DEVPORT_ANKLANG = process.env.DEVPORT_ANKLANG || 0;
+const DEVPORT_MKDOCS = process.env.DEVPORT_MKDOCS || 0;
 
 // Debug Info:
 console.log (`VITE: CWD=${process.cwd()} BUILDDIR=${BUILDDIR} gen_path=${gen_path}`);
 
 // Plugin to inject __VITE_CONFIG__ into html
-const html_inject_vite_config = (__DEV__: Boolean) => {
-  build_config_json.__DEV__ = __DEV__;
-  if (__DEV__) {
-    build_config_json.ws_port = DEVPORT_ANKLANG;
+const html_inject_vite_config = () => {
+  if (__DEV__ && DEVPORT_ANKLANG) {
+    __VITE_CONFIG__.ws_port = DEVPORT_ANKLANG;
   }
   return {
     name: 'html_inject_vite_config',
     transformIndexHtml (html, ctx) {
-      return html.replace ('__VITE_CONFIG__', JSON.stringify (build_config_json));
+      return html.replace ('__VITE_CONFIG__', JSON.stringify (__VITE_CONFIG__));
     },
   }
 };
-const build_config_json = JSON.parse (fs.readFileSync (path.resolve (BUILDDIR + "/version.json"), 'utf8'));
 
 // Plugin to force full reloads if anything changed
 const full_reload_always: PluginOption = {
@@ -73,7 +72,6 @@ function postcss_formatter (input)
 // Mode dependent vite config
 function vite_config ({ mode })
 {
-  const __DEV__ = mode == 'development';
   console.log (`VITE: mode=${mode}`);
   return defineConfig ({
     root: "ui/",
@@ -84,7 +82,7 @@ function vite_config ({ mode })
     }, },
     server: {
       // open: "index.html",
-      proxy: {
+      proxy: !DEVPORT_MKDOCS ? {} : {
 	'/anklang/': {
           target: 'http://localhost:' + String (DEVPORT_MKDOCS) + '/',
           changeOrigin: true,               			// Adjusts the origin header
@@ -130,7 +128,7 @@ function vite_config ({ mode })
       tailwindcss(),
       extra_css(),
       solidPlugin(),
-      html_inject_vite_config (__DEV__),
+      html_inject_vite_config(),
       ...maybe_full_reload_always,
     ],