merge in 0.4.2 branch

sjc5 · Oct 24, 2023 · c01f60e · c01f60e
1 parent 8fc6859
commit c01f60e
Show file tree

Hide file tree

Showing 30 changed files with 289 additions and 217 deletions.
diff --git a/docs/package-lock.json b/docs/package-lock.json
diff --git a/docs/package.json b/docs/package.json
@@ -11,15 +11,15 @@
   },
   "dependencies": {
     "@hono/node-server": "^1.2.0",
-    "highlight.js": "^11.8.0",
-    "hono": "^3.7.5",
-    "hwy": "^0.4.1"
+    "highlight.js": "^11.9.0",
+    "hono": "^3.8.3",
+    "hwy": "0.4.2-beta.6"
   },
   "devDependencies": {
-    "@hwy-js/build": "^0.4.1",
-    "@hwy-js/dev": "^0.4.1",
-    "@types/node": "^20.8.3",
-    "@types/nprogress": "^0.2.1",
+    "@hwy-js/build": "0.4.2-beta.6",
+    "@hwy-js/dev": "0.4.2-beta.6",
+    "@types/node": "^20.8.7",
+    "@types/nprogress": "^0.2.2",
     "htmx.org": "^1.9.6",
     "nprogress": "^0.2.0",
     "tailwindcss": "^3.3.3",

diff --git a/docs/src/components/inline-code.tsx b/docs/src/components/inline-code.tsx
@@ -16,7 +16,7 @@ function InlineCode({
         high_contrast
           ? "bg-black text-white dark:bg-white dark:text-black"
           : "bg-[#7772] dark:bg-[#7773] rounded",
-        rest.class
+        rest.class,
       )}
     >
       {children}

diff --git a/docs/src/main.tsx b/docs/src/main.tsx
@@ -85,7 +85,7 @@ app.all("*", async (c, next) => {
     return (
       <html lang="en">
         <head>
-          <meta charSet="UTF-8" />
+          <meta charset="UTF-8" />
           <meta name="viewport" content="width=device-width,initial-scale=1" />
 
           <HeadElements

diff --git a/docs/src/pages/docs.page.tsx b/docs/src/pages/docs.page.tsx
@@ -582,7 +582,7 @@ app.all('*', async (c, next) => {
     return (
       <html lang="en">
         <head>
-          <meta charSet="UTF-8" />
+          <meta charset="UTF-8" />
           <meta name="viewport" content="width=device-width,initial-scale=1" />
 
           <HeadElements

diff --git a/packages/build/package.json b/packages/build/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hwy-js/build",
-  "version": "0.4.1",
+  "version": "0.4.2-beta.6",
   "author": {
     "name": "Samuel J. Cook"
   },
@@ -24,13 +24,13 @@
   "dependencies": {
     "chokidar": "^3.5.3",
     "dotenv": "^16.3.1",
-    "esbuild": "^0.19.2",
+    "esbuild": "^0.19.5",
     "picocolors": "^1.0.0",
     "readdirp": "^3.6.0"
   },
   "devDependencies": {
-    "@types/node": "^20.8.3",
-    "hono": "^3.7.5",
+    "@types/node": "^20.8.7",
+    "hono": "^3.8.3",
     "tsup": "^7.2.0",
     "typescript": "^5.2.2"
   },

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hwy",
-  "version": "0.4.1",
+  "version": "0.4.2-beta.6",
   "author": {
     "name": "Samuel J. Cook"
   },
@@ -21,8 +21,8 @@
     "@hono/node-server": "^1.2.0",
     "@hwy-js/build": "workspace:*",
     "@hwy-js/dev": "workspace:*",
-    "@types/node": "^20.8.3",
-    "hono": "^3.7.5",
+    "@types/node": "^20.8.7",
+    "hono": "^3.8.3",
     "tsup": "^7.2.0"
   },
   "repository": {

diff --git a/packages/core/src/components/client-entry-script.tsx b/packages/core/src/components/client-entry-script.tsx
@@ -24,7 +24,6 @@ function ClientScripts({
         .map((x) => {
           return (
             <script
-              key={x.path}
               src={getPublicUrl("dist/pages/" + x.fileRefFromPagesDirWithJsExt)}
               {...{ [pageStrategy]: true }}
             />

diff --git a/packages/core/src/components/head-elements.tsx b/packages/core/src/components/head-elements.tsx
@@ -86,9 +86,9 @@ function HeadElements(props: {
     <>
       {head_blocks.map((block, i) => {
         if ("title" in block) {
-          return <title key={i}>{block.title}</title>;
+          return <title>{block.title}</title>;
         } else {
-          return <block.tag key={i} {...block.props} />;
+          return <block.tag {...block.props} />;
         }
       })}
     </>

diff --git a/packages/core/src/router/get-matching-path-data-internal.ts b/packages/core/src/router/get-matching-path-data-internal.ts
@@ -13,7 +13,28 @@ function get_matching_paths_internal(__paths: Array<SemiDecoratedPath>) {
       : x.realSegmentsLength;
 
     // make sure any remaining matches are not longer than the path itself
-    return x.segments.length <= index_adjusted_real_segments_length;
+    const should_move_on =
+      x.segments.length <= index_adjusted_real_segments_length;
+
+    if (!should_move_on) {
+      return false;
+    }
+
+    // now we need to remove ineligible indices
+    if (!x.isIndex) {
+      // if not an index, then you're already confirmed good
+      return true;
+    }
+
+    const truthy_segments_length = x.segments.filter((x) => x.segment).length;
+
+    const path_segments_length = x.path.split("/").filter(Boolean).length;
+
+    if (truthy_segments_length === path_segments_length) {
+      return true;
+    }
+
+    return false;
   });
 
   // if there are multiple matches, filter out the ultimate catch-all

diff --git a/packages/core/src/router/get-matching-path-data.ts b/packages/core/src/router/get-matching-path-data.ts
@@ -60,20 +60,20 @@ function fully_decorate_paths({
             throw e;
           }
         },
-        loader: async (loader_args: DataFunctionArgs) => {
+        loader: async (loaderArgs: DataFunctionArgs) => {
           try {
             const imported = await get_imported();
-            return imported.loader ? imported.loader(loader_args) : undefined;
+            return imported.loader ? imported.loader(loaderArgs) : undefined;
           } catch (e) {
             if (e instanceof Response) return e;
             console.error(e);
             throw e;
           }
         },
-        action: async (action_args: DataFunctionArgs) => {
+        action: async (actionArgs: DataFunctionArgs) => {
           try {
             const imported = await get_imported();
-            return imported.action ? imported.action(action_args) : undefined;
+            return imported.action ? imported.action(actionArgs) : undefined;
           } catch (e) {
             if (e instanceof Response) return e;
             console.error(e);

diff --git a/packages/create-hwy/__common/pages/_index.client.ts b/packages/create-hwy/__common/pages/_index.client.ts
@@ -0,0 +1,12 @@
+/// <reference lib="dom" />
+
+const el = document.getElementById("increment-button");
+
+if (el) {
+  let count = 0;
+
+  el.addEventListener("click", () => {
+    count++;
+    el.innerHTML = count.toString();
+  });
+}
diff --git a/packages/create-hwy/__common/pages/_index.page.tsx b/packages/create-hwy/__common/pages/_index.page.tsx
@@ -10,6 +10,15 @@ export default function () {
         The nav bar above is being rendered from <code>src/main.tsx</code>,
         which is your site's main server "entry point".
       </p>
+
+      <p>
+        Click the button below to increment the number (my click handler is in{" "}
+        <code>src/pages/_index.client.ts</code>):
+      </p>
+
+      <button id="increment-button" class="btn">
+        0
+      </button>
     </>
   );
 }
diff --git a/packages/create-hwy/index.ts b/packages/create-hwy/index.ts
@@ -355,8 +355,8 @@ async function main() {
       is_jsx: false,
     });
 
-    // pages
-    const pages_to_copy = [
+    // pages dir in __common
+    const tsx_list = [
       "about.page",
       "$.page",
       "_index.page",
@@ -365,15 +365,24 @@ async function main() {
       "__auth/login.page",
     ];
 
+    const ts_list = ["_index.client"];
+
+    const files_to_copy = [...tsx_list, ...ts_list];
+
     await Promise.all(
-      pages_to_copy.map(async (page) => {
+      files_to_copy.map(async (file) => {
+        const is_jsx = tsx_list.includes(file);
+
         return handle_ts_or_js_file_copy({
           code: fs.readFileSync(
-            path.join(root_dir_path, "__common/pages/" + page + ".tsx"),
+            path.join(
+              root_dir_path,
+              "__common/pages/" + file + (is_jsx ? ".tsx" : ".ts"),
+            ),
             "utf8",
           ),
-          destination_without_extension: "src/pages/" + page,
-          is_jsx: true,
+          destination_without_extension: "src/pages/" + file,
+          is_jsx,
         });
       }),
     );

diff --git a/packages/create-hwy/package.json b/packages/create-hwy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-hwy",
-  "version": "0.4.1",
+  "version": "0.4.2-beta.6",
   "author": {
     "name": "Samuel J. Cook"
   },
@@ -28,10 +28,10 @@
     "picocolors": "^1.0.0"
   },
   "devDependencies": {
-    "@types/inquirer": "^9.0.3",
-    "@types/node": "^20.8.3",
-    "@types/nprogress": "^0.2.1",
-    "hono": "^3.7.5",
+    "@types/inquirer": "^9.0.6",
+    "@types/node": "^20.8.7",
+    "@types/nprogress": "^0.2.2",
+    "hono": "^3.8.3",
     "hwy": "workspace:*",
     "nprogress": "^0.2.0",
     "prettier": "^3.0.3",

diff --git a/packages/create-hwy/src/get-main.ts b/packages/create-hwy/src/get-main.ts
@@ -65,11 +65,7 @@ ${
     : `await hwyInit({
   app,
   importMetaUrl: import.meta.url,
-  serveStatic,${
-    options.css_preference === "tailwind"
-      ? `\n  watchExclusions: ["src/styles/tw-output.bundle.css"],`
-      : ""
-  }
+  serveStatic,
 });`
 }
 
@@ -81,7 +77,7 @@ app.all("*", async (c, next) => {
     return (
       <html lang="en">
         <head>
-          <meta charSet="UTF-8" />
+          <meta charset="UTF-8" />
           <meta name="viewport" content="width=device-width,initial-scale=1" />
 
           <HeadElements

diff --git a/packages/create-hwy/src/get-readme.ts b/packages/create-hwy/src/get-readme.ts
@@ -40,7 +40,6 @@ await hwyInit({
   * to add a publicUrlPrefix.
   */
   publicUrlPrefix: process.env.NODE_ENV === "production" ? "docs/" : undefined,
-  watchExclusions: ["src/styles/tw-output.bundle.css"],
 });
 \`\`\`
 `.trim() +

diff --git a/packages/create-hwy/src/get-tsconfig.ts b/packages/create-hwy/src/get-tsconfig.ts
@@ -40,6 +40,14 @@ function get_ts_config(options: Options) {
     return JSON.stringify(deno_config).trim() + "\n";
   }
 
+  if (
+    options.deployment_target === "node" ||
+    options.deployment_target === "vercel-lambda"
+  ) {
+    // @ts-ignore
+    ts_config.compilerOptions.types = ["node"];
+  }
+
   if (options.deployment_target === "bun") {
     // @ts-ignore
     ts_config.compilerOptions.types = ["bun-types"];