Fix version number issue

Author: faassen

CHANGELOG.md

@@ -7,7 +7,7 @@ release date when you use `npm version` (see `README.md`).
 
 ## [Unreleased]
 
-## Added
+### Added
 
 - A new mobile tab. This shows the instances in iframes. Console log messages
   are instrumented so that the instance port number and color is shown ahead
@@ -17,9 +17,14 @@ release date when you use `npm version` (see `README.md`).
   tells it basic information about the application. This allows us to set the
   name of the webxdc app in the title of each instance tab.
 
+### Fixed
+
+- The version number in the info tab should now show properly in the released
+  version.
+
 ## [0.11.0][] - 2022-06-28
 
-## Added
+### Added
 
 - Show version number of dev tool in info tab.
 
@@ -36,7 +41,7 @@ release date when you use `npm version` (see `README.md`).
 - Add `--open` option to automatically open instances on startup and as soon as
   they're created.
 
-## Changed
+### Changed
 
 - Better handling of command-line arguments.
 

backend/appInfo.ts

@@ -3,6 +3,7 @@ import fs from "fs";
 import toml from "toml";
 // have to use v2 otherwise end up in config hell because v3 is ESM only
 import nodeFetch from "node-fetch";
+import pkg from "../package.json";
 
 import { Location, UrlLocation } from "./location";
 import { waitOnUrl } from "./waitOn";
@@ -59,7 +60,7 @@ export async function getAppInfoUrl(
 }
 
 export function getToolVersion(): string {
-  return process.env.npm_package_version || "Unknown";
+  return pkg.version || "Unknown";
 }
 
 async function getManifestInfoFromUrl(

tsconfig-backend.json

@@ -1,9 +1,10 @@
 {
   "extends": "@tsconfig/recommended/tsconfig.json",
-  "include": ["backend", "types"],
+  "include": ["backend", "types", "package.json"],
   "compilerOptions": {
     "target": "ES2016",
     "module": "commonjs",
-    "outDir": "dist"
+    "outDir": "dist",
+    "resolveJsonModule": true
   }
 }

tsconfig.json

@@ -10,6 +10,7 @@
     "jsxImportSource": "solid-js",
     "noEmit": true,
     "outDir": "dist",
-    "isolatedModules": true
+    "isolatedModules": true,
+    "resolveJsonModule": true
   }
 }

webpack.common.js

@@ -33,7 +33,9 @@ module.exports = {
     publicPath: "/",
     // clean assets, except backend which is generated by typescript
     clean: {
-      keep: "backend",
+      keep(asset) {
+        return ["backend", "package.json"].includes(asset);
+      },
     },
   },
   plugins: [