New build method of @reactpy/app

Archmonger · Archmonger · commit 28e0119999da · 2025-01-23T23:42:27.000-08:00
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 # --- Build Artifacts ---
-src/reactpy/static/**/index.js*
+src/reactpy/static/*
 
 # --- Jupyter ---
 *.ipynb_checkpoints
diff --git a/pyproject.toml b/pyproject.toml
@@ -69,7 +69,7 @@ commands = [
   'bun run --cwd "src/js/packages/@reactpy/client" build',
   'bun install --cwd "src/js/packages/@reactpy/app"',
   'bun run --cwd "src/js/packages/@reactpy/app" build',
-  'python "src/build_scripts/copy_dir.py" "src/js/packages/@reactpy/app/dist" "src/reactpy/static/assets"',
+  'python "src/build_scripts/copy_dir.py" "src/js/packages/@reactpy/app/dist" "src/reactpy/static"',
 ]
 artifacts = []
 
diff --git a/src/js/packages/@reactpy/app/package.json b/src/js/packages/@reactpy/app/package.json
@@ -11,7 +11,7 @@
     "typescript": "^5.7.3"
   },
   "scripts": {
-    "build": "bun build \"src/index.ts\" --outdir \"dist\" --minify --sourcemap=linked",
+    "build": "bun build \"src/index.html\" --outdir=\"dist\" --minify --sourcemap=\"linked\" --experimental-html --public-path=\"reactpy/static/\"",
     "checkTypes": "tsc --noEmit"
   }
 }
diff --git a/src/js/packages/@reactpy/app/src/index.html b/src/js/packages/@reactpy/app/src/index.html
@@ -0,0 +1,15 @@
+<!doctype html>
+<html lang="en">
+
+<head>
+  <meta charset="utf-8" />
+  <script type="module" crossorigin src="index.ts"></script>
+</head>
+
+<body>
+  <div id="app"></div>
+  {mount_script}
+  <!-- TODO: Replace `mount_script` with template tag -->
+</body>
+
+</html>
diff --git a/src/js/packages/@reactpy/app/src/index.ts b/src/js/packages/@reactpy/app/src/index.ts
@@ -1,19 +1 @@
-import { mount, SimpleReactPyClient } from "@reactpy/client";
-
-function app(element: HTMLElement) {
-  const client = new SimpleReactPyClient({
-    serverLocation: {
-      url: document.location.origin,
-      route: document.location.pathname,
-      query: document.location.search,
-    },
-  });
-  mount(element, client);
-}
-
-const element = document.getElementById("app");
-if (element) {
-  app(element);
-} else {
-  console.error("Element with id 'app' not found");
-}
+export { mount } from "@reactpy/client";
diff --git a/src/reactpy/static/index.html b/src/reactpy/static/index.html

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ commands = [`
`69`	`69`	`'bun run --cwd "src/js/packages/@reactpy/client" build',`
`70`	`70`	`'bun install --cwd "src/js/packages/@reactpy/app"',`
`71`	`71`	`'bun run --cwd "src/js/packages/@reactpy/app" build',`
`72`		`- 'python "src/build_scripts/copy_dir.py" "src/js/packages/@reactpy/app/dist" "src/reactpy/static/assets"',`
	`72`	`+ 'python "src/build_scripts/copy_dir.py" "src/js/packages/@reactpy/app/dist" "src/reactpy/static"',`
`73`	`73`	`]`
`74`	`74`	`artifacts = []`
`75`	`75`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`"typescript": "^5.7.3"`
`12`	`12`	`},`
`13`	`13`	`"scripts": {`
`14`		`- "build": "bun build \"src/index.ts\" --outdir \"dist\" --minify --sourcemap=linked",`
	`14`	`+ "build": "bun build \"src/index.html\" --outdir=\"dist\" --minify --sourcemap=\"linked\" --experimental-html --public-path=\"reactpy/static/\"",`
`15`	`15`	`"checkTypes": "tsc --noEmit"`
`16`	`16`	`}`
`17`	`17`	`}`