prep work to get CI working

Archmonger · Archmonger · commit bd7f40d717ce · 2025-01-17T04:08:35.000-08:00
diff --git a/.editorconfig b/.editorconfig
@@ -17,6 +17,9 @@ max_line_length = 120
 [*.md]
 indent_size = 4
 
+[*.yml]
+indent_size = 4
+
 [*.html]
 max_line_length = off
 
diff --git a/.github/workflows/.hatch-run.yml b/.github/workflows/.hatch-run.yml
@@ -9,18 +9,14 @@ on:
             hatch-run:
                 required: true
                 type: string
-            runs-on-array:
+            runs-on:
                 required: false
                 type: string
                 default: '["ubuntu-latest"]'
-            python-version-array:
+            python-version:
                 required: false
                 type: string
                 default: '["3.x"]'
-            node-registry-url:
-                required: false
-                type: string
-                default: ""
         secrets:
             node-auth-token:
                 required: false
@@ -34,17 +30,14 @@ jobs:
         name: ${{ format(inputs.job-name, matrix.python-version, matrix.runs-on) }}
         strategy:
             matrix:
-                python-version: ${{ fromJson(inputs.python-version-array) }}
-                runs-on: ${{ fromJson(inputs.runs-on-array) }}
+                python-version: ${{ fromJson(inputs.python-version) }}
+                runs-on: ${{ fromJson(inputs.runs-on) }}
         runs-on: ${{ matrix.runs-on }}
         steps:
             - uses: actions/checkout@v4
-            - uses: actions/setup-node@v4
+            - uses: oven-sh/setup-bun@v2
               with:
-                  node-version: "23.x"
-                  registry-url: ${{ inputs.node-registry-url }}
-            - name: Pin NPM Version
-              run: npm install -g npm@8.19.3
+                  bun-version: latest
             - name: Use Python ${{ matrix.python-version }}
               uses: actions/setup-python@v5
               with:
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -26,16 +26,16 @@ jobs:
         with:
             job-name: "python-{0} {1}"
             hatch-run: "test-py --no-cov"
-            runs-on-array: '["ubuntu-latest", "macos-latest", "windows-latest"]'
-            python-version-array: '["3.9", "3.10", "3.11"]'
+            runs-on: '["ubuntu-latest", "macos-latest", "windows-latest"]'
+            python-version: '["3.9", "3.10", "3.11"]'
     test-docs:
         uses: ./.github/workflows/.hatch-run.yml
         with:
             job-name: "python-{0}"
             hatch-run: "test-docs"
             # as of Dec 2023 lxml does have wheels for 3.12
             # https://bugs.launchpad.net/lxml/+bug/2040440
-            python-version-array: '["3.11"]'
+            python-version: '["3.11"]'
     test-js:
         uses: ./.github/workflows/.hatch-run.yml
         with:
diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
@@ -1,6 +1,3 @@
-# This workflows will upload a Python Package using Twine when a release is created
-# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries
-
 name: deploy-docs
 
 on:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -1,6 +1,3 @@
-# This workflows will upload a Javscript Package using NPM to npmjs.org when a release is created
-# For more information see: https://docs.github.com/en/actions/guides/publishing-nodejs-packages
-
 name: publish
 
 on:
@@ -13,7 +10,6 @@ jobs:
         with:
             job-name: "publish"
             hatch-run: "publish"
-            node-registry-url: "https://registry.npmjs.org"
         secrets:
             node-auth-token: ${{ secrets.NODE_AUTH_TOKEN }}
             pypi-username: ${{ secrets.PYPI_USERNAME }}
diff --git a/pyproject.toml b/pyproject.toml
@@ -128,17 +128,14 @@ log_cli_level = "INFO"
 
 [tool.hatch.envs.default.scripts]
 test-cov = "playwright install && coverage run -m pytest {args:tests}"
-cov-report = [
-  # "- coverage combine",
-  "coverage report",
-]
+cov-report = ["coverage report"]
 cov = ["test-cov {args}", "cov-report"]
 
 [tool.hatch.envs.default.env-vars]
 REACTPY_DEBUG_MODE = "1"
 
 ################################
-# >>> Hatch Lint Scripts <<< #
+# >>> Hatch Python Scripts <<< #
 ################################
 
 [tool.hatch.envs.lint]
@@ -157,12 +154,26 @@ extra-dependencies = [
   "types-requests",
 ]
 
-[tool.hatch.envs.lint.scripts]
-types = "mypy --strict reactpy"
-all = ["types"]
+[tool.hatch.envs.python.scripts]
+# TODO: Replace mypy with pylint
+type_check = "mypy --strict src/reactpy"
+
+############################
+# >>> Hatch JS Scripts <<< #
+############################
+
+[tool.hatch.envs.javascript]
+detached = true
 
-[tool.hatch.envs.publish]
-extra-dependencies = ["semver >=2, <3", "twine", "pre-commit"]
+[tool.hatch.envs.javascript.scripts]
+check = [
+  'bun install --cwd "src/js" --frozen-lockfile',
+  'bun run --cwd "src/js" check',
+]
+fix = [
+  'bun install --cwd "src/js" --frozen-lockfile',
+  'bun run --cwd "src/js" format',
+]
 
 #########################
 # >>> Generic Tools <<< #
diff --git a/src/js/.gitignore b/src/js/.gitignore
@@ -1,3 +1,3 @@
 tsconfig.tsbuildinfo
 packages/**/package-lock.json
-dist
+**/dist/*
diff --git a/src/js/package.json b/src/js/package.json
@@ -1,10 +1,14 @@
 {
-  "license": "MIT",
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^5.58.0",
     "@typescript-eslint/parser": "^5.58.0",
     "eslint": "^8.38.0",
     "eslint-plugin-react": "^7.32.2",
     "prettier": "^3.0.0-alpha.6"
+  },
+  "license": "MIT",
+  "scripts": {
+    "check": "prettier --check . && eslint",
+    "format": "prettier --write . && eslint --fix"
   }
 }
diff --git a/src/js/packages/@reactpy/app/package.json b/src/js/packages/@reactpy/app/package.json
@@ -1,8 +1,7 @@
 {
-  "author": "Ryan Morshead",
-  "license": "MIT",
   "name": "@reactpy/app",
-  "description": "Main entry point for ReactPy.",
+  "description": "ReactPy's client-side entry point. This is strictly for internal use and is not designed to be distributed.",
+  "license": "MIT",
   "dependencies": {
     "@reactpy/client": "^0.3.2",
     "event-to-object": "^0.1.2",
@@ -11,9 +10,5 @@
   "devDependencies": {
     "@types/react": "^17.0",
     "@types/react-dom": "^17.0"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/reactive-python/reactpy"
   }
 }
diff --git a/src/js/packages/@reactpy/app/src/index.ts b/src/js/packages/@reactpy/app/src/index.ts
@@ -11,10 +11,9 @@ function app(element: HTMLElement) {
   mount(element, client);
 }
 
-let element = document.getElementById("app");
-if (element){
+const element = document.getElementById("app");
+if (element) {
   app(element);
-}
-else {
+} else {
   console.error("Element with id 'app' not found");
 }
diff --git a/src/js/packages/@reactpy/app/tsconfig.json b/src/js/packages/@reactpy/app/tsconfig.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "dist",
+    "rootDir": "src",
+    "composite": true
+  },
+  "include": ["src"],
+  "references": [
+    {
+      "path": "../client"
+    }
+  ]
+}
diff --git a/src/js/packages/@reactpy/client/bun.lockb b/src/js/packages/@reactpy/client/bun.lockb
diff --git a/src/js/packages/@reactpy/client/package.json b/src/js/packages/@reactpy/client/package.json
@@ -1,25 +1,33 @@
 {
-  "author": "Ryan Morshead",
+  "name": "@reactpy/client",
+  "version": "0.3.2",
   "description": "A client for ReactPy implemented in React",
+  "author": "Ryan Morshead",
   "license": "MIT",
-  "name": "@reactpy/client",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/reactive-python/reactpy"
+  },
+  "keywords": [
+    "react",
+    "reactive",
+    "python",
+    "reactpy"
+  ],
   "type": "module",
-  "version": "0.3.2",
+  "main": "dist/index.js",
   "dependencies": {
     "event-to-object": "^0.1.2",
-    "json-pointer": "^0.6.2"
+    "json-pointer": "^0.6.2",
+    "preact": "^10.25.4"
   },
   "devDependencies": {
     "@types/json-pointer": "^1.0.31",
     "@types/react": "^17.0",
     "@types/react-dom": "^17.0"
   },
-  "peerDependencies": {
-    "react": ">=16 <18",
-    "react-dom": ">=16 <18"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/reactive-python/reactpy"
+  "scripts": {
+    "build": "tsc -b",
+    "checkTypes": "tsc --noEmit"
   }
 }
diff --git a/src/js/packages/@reactpy/client/src/components.tsx b/src/js/packages/@reactpy/client/src/components.tsx
@@ -8,7 +8,7 @@ import React, {
   Fragment,
   MutableRefObject,
   ChangeEvent,
-} from "react";
+} from "preact/compat";
 // @ts-ignore
 import { set as setJsonPointer } from "json-pointer";
 import {
@@ -95,7 +95,9 @@ function UserInputElement({ model }: { model: ReactPyVdom }): JSX.Element {
   if (typeof givenOnChange === "function") {
     props.onChange = (event: ChangeEvent<any>) => {
       // immediately update the value to give the user feedback
-      setValue(event.target.value);
+      if (event.target) {
+        setValue((event.target as HTMLInputElement).value);
+      }
       // allow the client to respond (and possibly change the value)
       givenOnChange(event);
     };
diff --git a/src/js/packages/@reactpy/client/src/mount.tsx b/src/js/packages/@reactpy/client/src/mount.tsx
@@ -1,5 +1,5 @@
-import React from "react";
-import { render } from "react-dom";
+import React from "preact/compat";
+import { render } from "preact/compat";
 import { Layout } from "./components";
 import { ReactPyClient } from "./reactpy-client";
 
diff --git a/src/js/packages/@reactpy/client/tsconfig.json b/src/js/packages/@reactpy/client/tsconfig.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "dist",
+    "rootDir": "src",
+    "composite": true
+  },
+  "include": ["src"],
+  "references": [
+    {
+      "path": "../../event-to-object"
+    }
+  ]
+}
diff --git a/src/js/packages/event-to-object/bun.lockb b/src/js/packages/event-to-object/bun.lockb
diff --git a/src/js/packages/event-to-object/package.json b/src/js/packages/event-to-object/package.json
@@ -1,26 +1,34 @@
 {
-  "author": "Ryan Morshead",
-  "license": "MIT",
   "name": "event-to-object",
+  "version": "0.1.2",
   "description": "Convert native events to JSON serializable objects",
+  "author": "Ryan Morshead",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/reactive-python/reactpy"
+  },
+  "keywords": [
+    "event",
+    "json",
+    "object",
+    "convert"
+  ],
   "type": "module",
-  "version": "0.1.2",
+  "main": "dist/index.js",
   "dependencies": {
     "json-pointer": "^0.6.2"
   },
   "devDependencies": {
     "happy-dom": "^8.9.0",
     "lodash": "^4.17.21",
+    "tsm": "^2.0.0",
+    "typescript": "^5.7.3",
     "uvu": "^0.5.1"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/reactive-python/reactpy"
-  },
   "scripts": {
     "build": "tsc -b",
-    "test": "npm run check:tests",
-    "check:tests": "uvu -r tsm tests",
-    "check:types": "tsc --noEmit"
+    "test": "uvu -r tsm tests",
+    "checkTypes": "tsc --noEmit"
   }
 }
diff --git a/src/js/packages/event-to-object/src/events.ts b/src/js/packages/event-to-object/src/events.ts
@@ -56,7 +56,6 @@ export interface GamepadObject {
   axes: number[];
   buttons: GamepadButtonObject[];
   connected: boolean;
-  hapticActuators: GamepadHapticActuatorObject[];
   id: string;
   index: number;
   mapping: GamepadMappingType;
diff --git a/src/js/packages/event-to-object/src/index.ts b/src/js/packages/event-to-object/src/index.ts
@@ -324,9 +324,6 @@ const convertGamepad = (gamepad: Gamepad): e.GamepadObject => ({
   index: gamepad.index,
   mapping: gamepad.mapping,
   timestamp: gamepad.timestamp,
-  hapticActuators: Array.from(gamepad.hapticActuators).map(
-    convertGamepadHapticActuator,
-  ),
 });
 
 const convertGamepadButton = (
@@ -337,12 +334,6 @@ const convertGamepadButton = (
   value: button.value,
 });
 
-const convertGamepadHapticActuator = (
-  actuator: GamepadHapticActuator,
-): e.GamepadHapticActuatorObject => ({
-  type: actuator.type,
-});
-
 const convertFile = (file: File) => ({
   lastModified: file.lastModified,
   name: file.name,
diff --git a/src/js/packages/event-to-object/tsconfig.json b/src/js/packages/event-to-object/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "dist",
+    "rootDir": "src",
+    "composite": true
+  },
+  "include": ["src"]
+}
diff --git a/src/js/tsconfig.json b/src/js/tsconfig.json

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,14 @@`
`1`	`1`	`{`
`2`		`- "license": "MIT",`
`3`	`2`	`"devDependencies": {`
`4`	`3`	`"@typescript-eslint/eslint-plugin": "^5.58.0",`
`5`	`4`	`"@typescript-eslint/parser": "^5.58.0",`
`6`	`5`	`"eslint": "^8.38.0",`
`7`	`6`	`"eslint-plugin-react": "^7.32.2",`
`8`	`7`	`"prettier": "^3.0.0-alpha.6"`
	`8`	`+ },`
	`9`	`+ "license": "MIT",`
	`10`	`+ "scripts": {`
	`11`	`+ "check": "prettier --check . && eslint",`
	`12`	`+ "format": "prettier --write . && eslint --fix"`
`9`	`13`	`}`
`10`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,9 @@ function app(element: HTMLElement) {`
`11`	`11`	`mount(element, client);`
`12`	`12`	`}`
`13`	`13`
`14`		`-let element = document.getElementById("app");`
`15`		`-if (element){`
	`14`	`+const element = document.getElementById("app");`
	`15`	`+if (element) {`
`16`	`16`	`app(element);`
`17`		`-}`
`18`		`-else {`
	`17`	`+} else {`
`19`	`18`	`console.error("Element with id 'app' not found");`
`20`	`19`	`}`