reactivated 0.38.2 → 0.39.0-a2286

package/dist/server.mjs

@@ -1,7 +1,7 @@
 import express from "express";
+import http from "node:http";
 import { render } from "./render.mjs";
 const isProduction = process.env.NODE_ENV === "production";
-const port = process.env.REACTIVATED_VITE_PORT || 5173;
 const base = process.env.BASE || "/";
 const escapedBase = base.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 const reactivatedEndpoint = "/_reactivated/".replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
@@ -17,7 +17,11 @@ app.use("/_reactivated/", async (req, res) => {
         res.status(500).json({ error: {} });
     }
 });
-app.listen(port, () => {
-    process.stdout.write(`RENDERER:http://localhost:${port}:LISTENING`);
+// By telling express to listen in port 0, we let the OS auto select a currently
+// available port.
+const server = http.createServer(app);
+server.listen(0, () => {
+    const addr = server.address();
+    process.stdout.write(`RENDERER:http://localhost:${addr.port}:LISTENING`);
 });
 //# sourceMappingURL=server.mjs.map

package/dist/server.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"server.mjs","sourceRoot":"","sources":["../src/server.mts"],"names":[],"mappings":"AACA,OAAO,OAAO,MAAM,SAAS,CAAC;AAI9B,OAAO,EAAC,MAAM,EAAC,MAAM,cAAc,CAAC;AAQpC,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAC;AAC3D,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,IAAI,CAAC;AACvD,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC;AACrC,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC;AAChE,MAAM,mBAAmB,GAAG,gBAAgB,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC;AAEpF,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC;AAEtB,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAC,KAAK,EAAE,OAAO,EAAC,CAAC,CAAC,CAAC;AACxC,GAAG,CAAC,GAAG,CAAC,gBAAgB,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IACzC,MAAM,EAAC,OAAO,EAAE,KAAK,EAAC,GAAG,GAAG,CAAC,IAAI,CAAC;IAElC,IAAI;QACA,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,GAAG,EAAE,EAAE,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;QAC9D,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,EAAC,cAAc,EAAE,WAAW,EAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;KACpE;IAAC,OAAO,KAAK,EAAE;QACZ,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAC,KAAK,EAAE,EAAE,EAAC,CAAC,CAAC;KACrC;AACL,CAAC,CAAC,CAAC;AAEH,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE;IAClB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,IAAI,YAAY,CAAC,CAAC;AACxE,CAAC,CAAC,CAAC"}
+{"version":3,"file":"server.mjs","sourceRoot":"","sources":["../src/server.mts"],"names":[],"mappings":"AACA,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,IAAI,MAAM,WAAW,CAAC;AAI7B,OAAO,EAAC,MAAM,EAAC,MAAM,cAAc,CAAC;AAQpC,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAC;AAC3D,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC;AACrC,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC;AAChE,MAAM,mBAAmB,GAAG,gBAAgB,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC;AAEpF,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC;AAEtB,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAC,KAAK,EAAE,OAAO,EAAC,CAAC,CAAC,CAAC;AACxC,GAAG,CAAC,GAAG,CAAC,gBAAgB,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;IACzC,MAAM,EAAC,OAAO,EAAE,KAAK,EAAC,GAAG,GAAG,CAAC,IAAI,CAAC;IAElC,IAAI;QACA,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,GAAG,EAAE,EAAE,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;QAC9D,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,EAAC,cAAc,EAAE,WAAW,EAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;KACpE;IAAC,OAAO,KAAK,EAAE;QACZ,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAC,KAAK,EAAE,EAAE,EAAC,CAAC,CAAC;KACrC;AACL,CAAC,CAAC,CAAC;AAEH,gFAAgF;AAChF,kBAAkB;AAClB,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;AACtC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE;IAClB,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,EAAiB,CAAC;IAC7C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,IAAI,CAAC,IAAI,YAAY,CAAC,CAAC;AAC7E,CAAC,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "reactivated",
-    "version": "0.38.2",
+    "version": "0.39.0-a2286",
     "description": "",
     "type": "module",
     "exports": {

package/scripts/setup_environment.sh

@@ -11,6 +11,10 @@ POSTGRESQL_LOGS="$VIRTUAL_ENV/postgresql/logs.txt"
 # $PWD returning /tmp or /private/tmp, we resolve with readlink.
 TMP_ENV="$TMPDIR/reactivated/$(readlink -f "$VIRTUAL_ENV" | md5sum | awk '{print $1}')"
 
+# https://github.com/python/mypy/issues/13392
+# https://setuptools.pypa.io/en/latest/userguide/development_mode.html#legacy-behavior
+export SETUPTOOLS_ENABLE_FEATURES="legacy-editable"
+
 export PGPORT=1
 export PGDATABASE="database"
 export PGHOST=$TMP_ENV
@@ -23,8 +27,7 @@ if [ ! -d "$VIRTUAL_ENV" ]; then
     fi
 
     rm -rf "$TMP_ENV"
-    virtualenv "$VIRTUAL_ENV"
-    mkdir "$VIRTUAL_ENV/static"
+    python -m venv "$VIRTUAL_ENV"
     pip install -r requirements.txt
 fi
 

package/src/server.mts

@@ -1,6 +1,8 @@
 import React from "react";
 import express from "express";
-import path from "path";
+import path from "node:path";
+import http from "node:http";
+import type {AddressInfo} from "node:net";
 import react from "@vitejs/plugin-react";
 import ReactDOMServer from "react-dom/server";
 import {render} from "./render.mjs";
@@ -12,7 +14,6 @@ import {vanillaExtractPlugin} from "@vanilla-extract/vite-plugin";
 import {Provider, getTemplate} from "@reactivated";
 
 const isProduction = process.env.NODE_ENV === "production";
-const port = process.env.REACTIVATED_VITE_PORT || 5173;
 const base = process.env.BASE || "/";
 const escapedBase = base.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 const reactivatedEndpoint = "/_reactivated/".replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
@@ -31,6 +32,10 @@ app.use("/_reactivated/", async (req, res) => {
     }
 });
 
-app.listen(port, () => {
-    process.stdout.write(`RENDERER:http://localhost:${port}:LISTENING`);
+// By telling express to listen in port 0, we let the OS auto select a currently
+// available port.
+const server = http.createServer(app);
+server.listen(0, () => {
+    const addr = server.address() as AddressInfo;
+    process.stdout.write(`RENDERER:http://localhost:${addr.port}:LISTENING`);
 });