reactivated 0.41.0 → 0.41.1

package/dist/build.client.d.mts

@@ -1,11 +1,17 @@
 #!/usr/bin/env node
+export default function capacitorPlugin(): {
+    name: string;
+    writeBundle(): void;
+};
 declare const clientConfig: {
     define: {
         "process.env.NODE_ENV": string;
         "process.env": string;
     };
+    mode: string;
     build: {
-        minify: true;
+        minify: boolean;
+        watch: {} | undefined;
         target: string;
         sourcemap: true;
         emptyOutDir: true;
@@ -21,7 +27,10 @@ declare const clientConfig: {
             };
         };
     };
-    plugins: (import("vite").PluginOption[] | import("vite").Plugin<any>)[];
+    plugins: (import("vite").PluginOption[] | {
+        name: string;
+        writeBundle(): void;
+    } | import("vite").Plugin<any>)[];
     resolve: {
         alias: {
             "@client": string;

package/dist/build.client.mjs

@@ -3,16 +3,39 @@ import react from "@vitejs/plugin-react";
 import { vanillaExtractPlugin } from "@vanilla-extract/vite-plugin";
 import { build } from "vite";
 import { builtinModules } from "node:module";
+import { execSync } from "child_process";
 import path from "path";
+import { rmSync } from "fs";
 import { define } from "./conf.js";
 import * as esbuild from "esbuild";
 import { promises as fs } from "fs";
+const REACTIVATED_WATCH = "REACTIVATED_WATCH" in process.env;
+const { minify, mode, watch } = REACTIVATED_WATCH == true
+    ? { minify: false, watch: {}, mode: "development" }
+    : { minify: true, watch: undefined, mode: "production" };
+export default function capacitorPlugin() {
+    return {
+        name: "capacitor-plugin",
+        writeBundle() {
+            if (watch == null) {
+                return;
+            }
+            const sourcePath = "static";
+            const targetPath = "capacitor/ios/App/App/public/static";
+            rmSync(targetPath, { force: true, recursive: true });
+            execSync(`cp -R ${sourcePath} ${targetPath}`);
+            console.log("Capacitor files copied");
+        },
+    };
+}
 const base = process.env.BASE ?? "/";
 const identifiers = "short";
 const clientConfig = {
     define: define(),
+    mode,
     build: {
-        minify: true,
+        minify,
+        watch,
         target: "esnext",
         sourcemap: true,
         emptyOutDir: true,
@@ -28,7 +51,7 @@ const clientConfig = {
             },
         },
     },
-    plugins: [react(), vanillaExtractPlugin({ identifiers })],
+    plugins: [capacitorPlugin(), react(), vanillaExtractPlugin({ identifiers })],
     resolve: {
         alias: {
             "@client": path.resolve(process.cwd(), "./client"),
@@ -75,16 +98,18 @@ const rendererConfig = {
     base,
 };
 await build(clientConfig);
-await build(rendererConfig);
-// Currently, vanilla-extract plugins are not bundled even though we tell rollup
-// to bundle in the renderer build. So we do an esbuild pass after. Really clunky.
-await esbuild.build({
-    sourcemap: true,
-    entryPoints: ["./node_modules/_reactivated/renderer.mjs"],
-    bundle: true,
-    platform: "node",
-    outfile: "./node_modules/_reactivated/renderer.js",
-});
-await fs.unlink("./node_modules/_reactivated/renderer.mjs");
-await fs.unlink("./node_modules/_reactivated/renderer.mjs.map");
+if (watch == null) {
+    await build(rendererConfig);
+    // Currently, vanilla-extract plugins are not bundled even though we tell rollup
+    // to bundle in the renderer build. So we do an esbuild pass after. Really clunky.
+    await esbuild.build({
+        sourcemap: true,
+        entryPoints: ["./node_modules/_reactivated/renderer.mjs"],
+        bundle: true,
+        platform: "node",
+        outfile: "./node_modules/_reactivated/renderer.js",
+    });
+    await fs.unlink("./node_modules/_reactivated/renderer.mjs");
+    await fs.unlink("./node_modules/_reactivated/renderer.mjs.map");
+}
 //# sourceMappingURL=build.client.mjs.map

package/dist/build.client.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"build.client.mjs","sourceRoot":"","sources":["../src/build.client.mts"],"names":[],"mappings":"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"}
+{"version":3,"file":"build.client.mjs","sourceRoot":"","sources":["../src/build.client.mts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "reactivated",
-    "version": "0.41.0",
+    "version": "0.41.1",
     "description": "",
     "type": "module",
     "exports": {

package/scripts/setup_environment.sh

@@ -33,6 +33,13 @@ fi
 
 if [ ! -d "$POSTGRESQL_DATA" ]; then
     initdb "$POSTGRESQL_DATA"
+
+    if [ -f "$EXTERNAL_PID" ]; then
+        pid_to_kill=$(cat "$EXTERNAL_PID")
+        kill -9 "$pid_to_kill" &>/dev/null || echo "No PostgresSQL process to kill"
+    fi
+
+    rm -rf "$TMP_ENV"
     NEED_DATABASE=true
 fi
 

package/src/build.client.mts

@@ -4,18 +4,48 @@ import react from "@vitejs/plugin-react";
 import {vanillaExtractPlugin} from "@vanilla-extract/vite-plugin";
 import {InlineConfig, build} from "vite";
 import {builtinModules} from "node:module";
+import {execSync} from "child_process";
 import path from "path";
+import {existsSync, mkdirSync, rmSync} from "fs";
 import {define, Options} from "./conf.js";
 import * as esbuild from "esbuild";
 import {promises as fs} from "fs";
 
+const REACTIVATED_WATCH = "REACTIVATED_WATCH" in process.env;
+
+const {minify, mode, watch} =
+    REACTIVATED_WATCH == true
+        ? {minify: false, watch: {}, mode: "development"}
+        : {minify: true, watch: undefined, mode: "production"};
+
+export default function capacitorPlugin() {
+    return {
+        name: "capacitor-plugin",
+
+        writeBundle() {
+            if (watch == null) {
+                return;
+            }
+
+            const sourcePath = "static";
+            const targetPath = "capacitor/ios/App/App/public/static";
+
+            rmSync(targetPath, {force: true, recursive: true});
+            execSync(`cp -R ${sourcePath} ${targetPath}`);
+            console.log("Capacitor files copied");
+        },
+    };
+}
+
 const base = process.env.BASE ?? "/";
 const identifiers = "short";
 
 const clientConfig = {
     define: define(),
+    mode,
     build: {
-        minify: true,
+        minify,
+        watch,
         target: "esnext",
         sourcemap: true,
         emptyOutDir: true,
@@ -31,8 +61,7 @@ const clientConfig = {
             },
         },
     },
-
-    plugins: [react(), vanillaExtractPlugin({identifiers})],
+    plugins: [capacitorPlugin(), react(), vanillaExtractPlugin({identifiers})],
     resolve: {
         alias: {
             "@client": path.resolve(process.cwd(), "./client"),
@@ -87,17 +116,18 @@ export type ClientConfig = typeof clientConfig;
 export type RendererConfig = typeof rendererConfig;
 
 await build(clientConfig);
-await build(rendererConfig);
-
-// Currently, vanilla-extract plugins are not bundled even though we tell rollup
-// to bundle in the renderer build. So we do an esbuild pass after. Really clunky.
-await esbuild.build({
-    sourcemap: true,
-    entryPoints: ["./node_modules/_reactivated/renderer.mjs"],
-    bundle: true,
-    platform: "node",
-    outfile: "./node_modules/_reactivated/renderer.js",
-});
-
-await fs.unlink("./node_modules/_reactivated/renderer.mjs");
-await fs.unlink("./node_modules/_reactivated/renderer.mjs.map");
+
+if (watch == null) {
+    await build(rendererConfig);
+    // Currently, vanilla-extract plugins are not bundled even though we tell rollup
+    // to bundle in the renderer build. So we do an esbuild pass after. Really clunky.
+    await esbuild.build({
+        sourcemap: true,
+        entryPoints: ["./node_modules/_reactivated/renderer.mjs"],
+        bundle: true,
+        platform: "node",
+        outfile: "./node_modules/_reactivated/renderer.js",
+    });
+    await fs.unlink("./node_modules/_reactivated/renderer.mjs");
+    await fs.unlink("./node_modules/_reactivated/renderer.mjs.map");
+}