chore: update dependencies, fix some bundler errors

explodingcamera · explodingcamera · commit 23c50b7f3721 · 2024-01-10T01:32:21.000+01:00
Signed-off-by: Henry Gressmann &lt;mail@henrygressmann.de&gt;
diff --git a/bun.lockb b/bun.lockb
diff --git a/configs/tsconfig.base.json b/configs/tsconfig.base.json
@@ -3,13 +3,13 @@
 		"lib": [
 			"es2022"
 		],
-		"module": "es2022",
+		"module": "ESNext",
 		"target": "es2022",
 		"strict": true,
 		"esModuleInterop": true,
 		"skipLibCheck": true,
 		"forceConsistentCasingInFileNames": true,
-		"moduleResolution": "node",
+		"moduleResolution": "Bundler",
 		"allowJs": true,
 		"allowUnusedLabels": false,
 		"allowUnreachableCode": false,
diff --git a/package.json b/package.json
@@ -1,6 +1,7 @@
 {
   "name": "@explodingcamera/esm",
   "private": true,
+  "type": "module",
   "keywords": [],
   "license": "MIT",
   "workspaces": [
@@ -15,14 +16,14 @@
     "test": "bun test"
   },
   "devDependencies": {
-    "@biomejs/biome": "1.4.1",
-    "@biomejs/cli-linux-x64": "^1.4.1",
+    "@biomejs/biome": "1.5.0",
+    "@biomejs/cli-linux-x64": "^1.5.0",
     "@changesets/changelog-github": "^0.5.0",
     "@changesets/cli": "^2.27.1",
-    "@types/node": "^20.10.6",
+    "@types/node": "^20.10.8",
     "bun-types": "^1.0.21",
     "scripts": "workspace:*",
-    "turbo": "^1.11.2"
+    "turbo": "^1.11.3"
   },
   "dependencies": {
     "typescript": "^5.3.3"
diff --git a/packages/minify-literals/lib/index.test.ts b/packages/minify-literals/lib/index.test.ts
@@ -368,7 +368,7 @@ describe("minifyHTMLLiterals()", () => {
 		});
 
 		it("should use MagicString constructor", async () => {
-			let msUsed;
+			let msUsed: MagicStringLike | undefined;
 			await minifyHTMLLiterals(SOURCE, {
 				fileName: "test.js",
 				generateSourceMap(ms) {
@@ -381,7 +381,7 @@ describe("minifyHTMLLiterals()", () => {
 		});
 
 		it("should allow custom MagicStringLike constructor", async () => {
-			let msUsed;
+			let msUsed: MagicStringLike | undefined;
 			await minifyHTMLLiterals(SOURCE, {
 				fileName: "test.js",
 				MagicString: MagicStringLike,
diff --git a/packages/spaify/lib/index.ts b/packages/spaify/lib/index.ts
@@ -70,7 +70,7 @@ const init = (opts: Partial<Options> = {}) => {
 		if (abort.signal) abort.abort();
 		abort = new AbortController();
 
-		let res;
+		let res: { doc: Document; firstLoad: boolean };
 		try {
 			res = await getDoc(to, abort.signal);
 		} catch (e: unknown) {
diff --git a/packages/touch-grass/README.md b/packages/touch-grass/README.md
@@ -0,0 +1,10 @@
+# touch-grass
+
+Go touch some grass.
+
+## Usage
+
+```bash
+$ npx touch-grass   # node
+$ bunx touch-grass  # bun
+```
diff --git a/packages/touch-grass/bin.mjs b/packages/touch-grass/bin.mjs
@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+import "./dist/index.js";
diff --git a/packages/touch-grass/lib/index.test.ts b/packages/touch-grass/lib/index.test.ts
@@ -1,6 +1,6 @@
 import { test, expect } from "bun:test";
-import { func } from "./index";
+// import {} from "./index.js";
 
 test("test", async () => {
-	expect(func()).toMatch("Hello, World!");
+	expect(1).toBe(1);
 });
diff --git a/packages/touch-grass/lib/index.ts b/packages/touch-grass/lib/index.ts
diff --git a/packages/touch-grass/lib/index.tsx b/packages/touch-grass/lib/index.tsx
@@ -0,0 +1,61 @@
+import { Box, render, Text, useApp, useInput, useStdin } from "ink";
+import { useEffect, useState } from "react";
+import useScreenSize from "./screensize.js";
+
+const formatDuration = (seconds: number): string => {
+	const minutes = Math.floor(seconds / 60);
+	const remainingSeconds = seconds % 60;
+	return `${minutes}:${remainingSeconds.toString().padStart(2, "0")}`;
+};
+
+const TouchGrass = () => {
+	const app = useApp();
+	const { stdin } = useStdin();
+	const { height, width } = useScreenSize();
+
+	const [time, setTime] = useState(0);
+
+	useEffect(() => {
+		const timer = setInterval(() => {
+			setTime((time) => time + 1);
+		}, 1000);
+		return () => clearInterval(timer);
+	}, []);
+
+	useEffect(() => {
+		stdin.setRawMode(true);
+		stdin.resume();
+		stdin.setEncoding("utf8");
+	}, [stdin]);
+
+	useInput((input, key) => {
+		if (key.escape) {
+			app.exit();
+		}
+	});
+
+	return (
+		<Box width={width} height={height} flexDirection="column">
+			<Box flexDirection="column" justifyContent="center" alignItems="center" flexGrow={1}>
+				<Box height={1} />
+				<Text color="#999999">You can stop sitting at your computer now.</Text>
+				<Box height={1} />
+				<Text>
+					You've been here for <Text bold>{formatDuration(time)}</Text>
+				</Text>
+			</Box>
+			<Box alignSelf="flex-end">
+				<Text color="#999999">
+					Press <Text bold>ESC</Text> to exit.
+				</Text>
+			</Box>
+		</Box>
+	);
+};
+
+process.stdout.write("\x1b[?1049h");
+const app = render(<TouchGrass />);
+await app.waitUntilExit();
+process.stdout.write("\x1b[?1049l");
+process.stdin.setRawMode(false);
+process.exit();
diff --git a/packages/touch-grass/lib/screensize.ts b/packages/touch-grass/lib/screensize.ts
@@ -0,0 +1,26 @@
+import { useCallback, useEffect, useState } from "react";
+import { useStdout } from "ink";
+
+const useScreenSize = () => {
+	const { stdout } = useStdout();
+	const getSize = useCallback(
+		() => ({
+			height: stdout.rows,
+			width: stdout.columns,
+		}),
+		[stdout],
+	);
+	const [size, setSize] = useState(getSize);
+
+	useEffect(() => {
+		const onResize = () => setSize(getSize());
+		stdout.on("resize", onResize);
+		return () => {
+			stdout.off("resize", onResize);
+		};
+	}, [stdout, getSize]);
+
+	return size;
+};
+
+export default useScreenSize;
diff --git a/packages/touch-grass/package.json b/packages/touch-grass/package.json
@@ -3,29 +3,30 @@
   "version": "0.0.1",
   "private": true,
   "description": "",
+  "types": "module",
   "keywords": [],
   "homepage": "https://github.com/explodingcamera/esm/tree/main/packages/touch-grass",
   "repository": "https://github.com/explodingcamera/esm",
   "license": "MIT",
   "author": "Henry Gressmann <mail@henrygressmann.de> (https://henrygressmann.de)",
   "type": "module",
-  "exports": {
-    ".": {
-      "require": "./dist/index.cjs",
-      "import": "./dist/index.js",
-      "types": "./types/index.d.ts"
-    }
+  "bin": {
+    "touch-grass": "./bin.mjs"
   },
-  "main": "dist/index.cjs",
-  "module": "dist/index.js",
-  "types": "dist/index.d.ts",
   "files": [
     "dist"
   ],
   "scripts": {
-    "build": "scripts build --name touch-grass"
+    "start": "bun run ./lib/index.tsx",
+    "build": "bun build ./lib/index.tsx --outdir=dist --target=node -e react -e ink"
   },
   "devDependencies": {
+    "@types/ink": "^2.0.3",
+    "@types/react": "^18.2.47",
     "scripts": "workspace:*"
+  },
+  "dependencies": {
+    "ink": "^4.4.1",
+    "react": "^18.2.0"
   }
 }
diff --git a/packages/touch-grass/tsconfig.json b/packages/touch-grass/tsconfig.json
@@ -1,4 +1,10 @@
 {
-  "exclude": ["dist/", "node_modules/"],
+  "exclude": [
+    "dist/",
+    "node_modules/"
+  ],
+  "compilerOptions": {
+    "jsx": "react-jsx",
+  },
   "extends": "../../configs/tsconfig.base.json"
-}
+}
diff --git a/packages/ucmd/lib/index.ts b/packages/ucmd/lib/index.ts
@@ -9,8 +9,8 @@ import type {
 	CommandFn,
 	CommandsLike,
 	ucmdState,
-} from "./types";
-import { normalizeCommandArgs, type NormalizedCommandArg, toParseArgOptions } from "./utils";
+} from "./types.js";
+import { normalizeCommandArgs, type NormalizedCommandArg, toParseArgOptions } from "./utils.js";
 
 const defaultState: ucmdState<{}> = {
 	name: "",
diff --git a/packages/ucmd/lib/utils.ts b/packages/ucmd/lib/utils.ts
@@ -1,4 +1,4 @@
-import type { CommandArgOptions, CommandArgs, ParseArgsOptionConfig } from "./types";
+import type { CommandArgOptions, CommandArgs, ParseArgsOptionConfig } from "./types.js";
 
 export type NormalizedCommandArg = CommandArgOptions & { name: string };
 
diff --git a/scripts/lib/index.ts b/scripts/lib/index.ts
@@ -1,6 +1,6 @@
 import { ucmd } from "ucmd";
-import { buildCommand, buildCommandOptions } from "./build";
-import { mdtableCommand, mdtableCommandOptions } from "./mdtable";
+import { buildCommand, buildCommandOptions } from "./build.js";
+import { mdtableCommand, mdtableCommandOptions } from "./mdtable.js";
 
 const cmd = ucmd()
 	.withName("scripts")

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+#!/usr/bin/env node`
	`2`	`+import "./dist/index.js";`