Use JSX for rendering in game debugger message

4ian · Nov 30, 2023 · 2cf4d7c · 2cf4d7c
1 parent e2c40ff
commit 2cf4d7c
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 44 deletions.
diff --git a/...Runtime/debugger-client/InGameDebugger.ts → ...untime/debugger-client/InGameDebugger.tsx b/...Runtime/debugger-client/InGameDebugger.ts → ...untime/debugger-client/InGameDebugger.tsx
@@ -1,3 +1,5 @@
+// @jsx h
+
 namespace gdjs {
   /** A minimal utility to define DOM elements. */
   function h<K extends keyof HTMLElementTagNameMap>(
@@ -123,48 +125,34 @@ namespace gdjs {
         const errorIsInJs = isErrorComingFromJavaScriptCode(
           this._uncaughtException
         );
-        this._uncaughtExceptionElement = h(
-          'div',
-          {
-            style: styles.errorContainer,
-          },
-          h(
-            'button',
-            {
-              style: styles.closeButton,
-              onClick: () => this.setUncaughtException(null),
-            },
-            '×'
-          ),
-          h(
-            'h2',
-            {
-              style: styles.errorTitle,
-            },
-            errorIsInJs
-              ? 'An error happened in a JavaScript code event.'
-              : 'A crash or error happened in the game.'
-          ),
-          h(
-            'p',
-            {
-              style: styles.errorMessage,
-            },
-            (errorIsInJs
-              ? 'This error comes from a JavaScript code event. Verify your code to ensure no error is happening. You can use the Developer Tools (menu "View" > "Toggle Developer Tools"). Full error is: '
-              : "If you're using JavaScript, verify your code. Otherwise, this might be an issue with GDevelop - consider reporting a bug. Full error is: ") +
-              this._uncaughtException.message
-          ),
-          h(
-            'pre',
-            {
-              style: styles.stacktrace,
-            },
-            this._uncaughtException.stack || '(No stracktrace).'
-          )
+        this._uncaughtExceptionElement = (
+          <div style={styles.errorContainer}>
+            <button
+              style={styles.closeButton}
+              onClick={() => this.setUncaughtException(null)}
+            >
+              ×
+            </button>
+            <h2 style={styles.errorTitle}>
+              {errorIsInJs
+                ? 'An error happened in a JavaScript code event.'
+                : 'A crash or error happened in the game.'}
+            </h2>
+            <p style={styles.errorMessage}>
+              {(errorIsInJs
+                ? 'This error comes from a JavaScript code event. Verify your code to ensure no error is happening. You can use the Developer Tools (menu "View" > "Toggle Developer Tools"). Full error is: '
+                : "If you're using JavaScript, verify your code. Otherwise, this might be an issue with GDevelop - consider reporting a bug. Full error is: ") +
+                this._uncaughtException.message}
+            </p>
+            <pre style={styles.stacktrace}>
+              {this._uncaughtException.stack || '(No stracktrace).'}
+            </pre>
+            ,
+          </div>
         );
 
-        domElementContainer.appendChild(this._uncaughtExceptionElement);
+        if (this._uncaughtExceptionElement)
+          domElementContainer.appendChild(this._uncaughtExceptionElement);
       }
     }
   }

diff --git a/GDJS/scripts/build.js b/GDJS/scripts/build.js
@@ -12,7 +12,7 @@ const fs = require('fs').promises;
 
 /** @param {string} outPath */
 const renameBuiltFile = (outPath) => {
-  return outPath.replace(/\.ts$/, '.js');
+  return outPath.replace(/\.tsx?$/, '.js');
 };
 
 const bundledOutPath =

diff --git a/GDJS/scripts/lib/runtime-files-list.js b/GDJS/scripts/lib/runtime-files-list.js
@@ -9,10 +9,10 @@ const extensionsRuntimePath = path.join(gdevelopRootPath, 'Extensions');
 const gdjsRuntimePath = path.join(gdjsRootPath, 'Runtime');
 
 // The extensions to be included in the bundled Runtime (will be built with esbuild or copied).
-const allowedExtensions = ['.js', '.ts', '.html', '.json', '.xml', '.map', '.wasm'];
+const allowedExtensions = ['.js', '.ts', '.tsx', '.html', '.json', '.xml', '.map', '.wasm'];
 
 // These extensions will be built with esbuild (the other will be copied).
-const transformIncludedExtensions = ['.js', '.ts'];
+const transformIncludedExtensions = ['.js', '.ts', '.tsx'];
 
 // Among the files matching the previous extensions, these extensions won't be built with esbuild
 // (they will be copied).

diff --git a/tsconfig.json b/tsconfig.json
@@ -23,7 +23,11 @@
     },
     "baseUrl": "./",
     "lib": ["DOM", "ES5", "ScriptHost", "ES2015.Iterable", "ES2015.Promise"],
-    "typeRoots": ["GDJS/node_modules/@types/"]
+    "typeRoots": ["GDJS/node_modules/@types/"],
+    // JSX syntax for lightweight rendering in the game engine:
+    "jsx": "react",
+    "jsxFactory": "h",
+    "jsxFragmentFactory": "Fragment"
   },
   "include": [
     "GDJS/Runtime/**/*",