Merge pull request #20 from thefrontside/tm/add-compiler-configs

Make www a non-workspace

deno.json

@@ -1,6 +1,12 @@
 {
+  "tasks": {
+    "dev": "deno run  -A --watch www/main.ts"
+  },
   "imports": {
-    "effection": "npm:effection",
+    "effection": "npm:[email protected]",
+    "effection-www/": "https://raw.githubusercontent.com/thefrontside/effection/4982887c1677b847d256402e8709f2b1d49437e6/www/",
+    "revolution": "https://deno.land/x/[email protected]/mod.ts",
+    "revolution/jsx-runtime": "https://deno.land/x/[email protected]/jsx-runtime.ts",
     "bdd": "jsr:@std/testing/bdd",
     "expect": "jsr:@std/expect"
   },
@@ -21,14 +27,26 @@
   },
   "lint": {
     "rules": {
-      "exclude": ["prefer-const", "require-yield"]
+      "exclude": [
+        "prefer-const",
+        "require-yield"
+      ]
     }
   },
   "workspace": [
-    "./www",
     "./deno-deploy",
     "./task-buffer",
     "./tinyexec",
     "./websocket"
-  ]
+  ],
+  "deploy": {
+    "project": "aa1dbfaa-d7c1-49d7-b514-69e1d8344f95",
+    "exclude": [
+      "**/node_modules"
+    ],
+    "include": [
+      "."
+    ],
+    "entrypoint": "www/main.ts"
+  }
 }

www/hooks/use-package.tsx

@@ -35,21 +35,19 @@ const DenoJson = z.object({
 export const DEFAULT_MODULE_KEY = ".";
 
 export function* usePackage(workspace: string): Operation<Package> {
-  const workspacePath = resolve(
-    import.meta.dirname ?? "",
-    `../../${workspace}`,
-  );
+  const workspacePath = resolve(Deno.cwd(), workspace);
 
-  const config: { default: unknown } = yield* call(
-    () => import(`../../${workspace}/deno.json`, { with: { type: "json" } }),
+  const config: { private?: boolean } = yield* call(
+    async () =>
+      JSON.parse(await Deno.readTextFile(`${workspacePath}/deno.json`)),
   );
 
-  const denoJson = DenoJson.parse(config.default);
-
-  if (denoJson.private === true) {
+  if (config.private === true) {
     throw new PrivatePackageError(workspace);
   }
 
+  const denoJson = DenoJson.parse(config);
+
   const readme = yield* call(async () => {
     try {
       return await Deno.readTextFile(join(workspacePath, "README.md"));

www/hooks/use-packages.ts

@@ -3,12 +3,21 @@ import { type Package, usePackage } from "./use-package.tsx";
 import { PrivatePackageError } from "../errors.ts";
 
 export function* usePackages(): Operation<Package[]> {
-  const root = yield* call(() =>
-    import("../../deno.json", { with: { type: "json" } })
-  );
+  const root = yield* call(async () => {
+    try {
+      const denoJson = await import("../../deno.json", {
+        with: { type: "json" },
+      });
+      return denoJson;
+    } catch (e) {
+      console.error(e);
+    }
+  });
+
+  console.log(`Found ${JSON.stringify(root?.default.workspace)}`);
 
   const workspaces: Package[] = [];
-  for (let workspace of root.default.workspace) {
+  for (let workspace of root?.default?.workspace ?? []) {
     try {
       const pkg = yield* usePackage(workspace);
       workspaces.push(pkg);

www/main.ts

@@ -1,6 +1,6 @@
 import { main, suspend } from "effection";
 import { createRevolution } from "revolution";
-import { initDenoDeploy } from "@effection-contrib/deno-deploy";
+import { initDenoDeploy } from "../deno-deploy/mod.ts";
 
 import { config } from "effection-www/tailwind.config.ts";
 import { route, sitemapPlugin } from "effection-www/plugins/sitemap.ts";

www/routes/app.html.tsx

@@ -1,6 +1,6 @@
 import type { Operation } from "effection";
 import type { JSXChild, JSXElement } from "revolution";
-import { useDenoDeploy } from "@effection-contrib/deno-deploy";
+import { useDenoDeploy } from "../../deno-deploy/mod.ts";
 
 import { useAbsoluteUrl } from "effection-www/plugins/rebase.ts";
 import { Header } from "effection-www/components/header.tsx";

www/routes/index.tsx

@@ -2,6 +2,7 @@ import type { SitemapRoute } from "effection-www/plugins/sitemap.ts";
 import type { JSXElement } from "revolution";
 import { usePackages } from "../hooks/use-packages.ts";
 import { useAppHtml } from "./app.html.tsx";
+import { Package } from "../hooks/use-package.tsx";
 
 export function indexRoute(): SitemapRoute<JSXElement> {
   return {
@@ -18,7 +19,12 @@ export function indexRoute(): SitemapRoute<JSXElement> {
         pageTitle: "Contribs | Effection",
       });
 
-      const packages = yield* usePackages();
+      let packages: Package[] = [];
+      try {
+        packages = yield* usePackages();
+      } catch (e) {
+        console.log("Could not read packages", e);
+      }
 
       return (
         <AppHTML>