add support for favicon in app dir (#41)

whopio · Mar 16, 2023 · 5158746 · 5158746
1 parent 4e6208b
commit 5158746
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/examples/basic-js/app/[locale]/head.jsx b/examples/basic-js/app/[locale]/head.jsx
diff --git a/examples/basic-js/public/favicon.ico → examples/basic-js/app/favicon.ico b/examples/basic-js/public/favicon.ico → examples/basic-js/app/favicon.ico
diff --git a/examples/basic/app/favicon.ico b/examples/basic/app/favicon.ico
diff --git a/packages/codegen/src/build/collect-public.ts b/packages/codegen/src/build/collect-public.ts
@@ -1,12 +1,21 @@
 import _glob from "glob";
 import { promisify } from "util";
 const glob = promisify(_glob);
+import fse from "fs-extra";
+const { stat } = fse;
 
 /**
  * @returns A string array of all the files in the public folder
  */
 const collectPublicFiles = async () => {
-  return (await glob("public/**/*")).map((path) => path.slice(6));
+  const publicFiles = (await glob("public/**/*")).map((path) => path.slice(6));
+  try {
+    if ((await stat("app/favicon.ico")).isFile())
+      publicFiles.push("/favicon.ico");
+  } catch {
+    /* empty */
+  }
+  return publicFiles;
 };
 
 export default collectPublicFiles;
diff --git a/packages/codegen/src/dev.ts b/packages/codegen/src/dev.ts
@@ -28,6 +28,7 @@ const watchConfig = {
     "app/**/route.{ts,js}",
     "app/**/redirect.{ts,js}",
     "public/**/*",
+    "app/favicon.ico",
   ],
   "add unlink change": [
     "app/**/forward.dynamic.{ts,js}",

diff --git a/packages/runtime/src/router/ejected/head/index.ts b/packages/runtime/src/router/ejected/head/index.ts
@@ -10,7 +10,7 @@ ${renderHooksImport(hooks)}
 
 ${renderDynamicImports(imports)}
 
-const publicFiles = new Set<string>([${publicFiles
+const publicFiles = new Set<string>([${Array.from(new Set(publicFiles))
     .map((publicFile) => `"${publicFile}"`)
     .join(", ")}]);
 `.trim();