File linking

jamesgpearce · jamesgpearce · commit dda8807cc87a · 2026-01-09T17:28:28.000-08:00
diff --git a/src/cli.ts b/src/cli.ts
@@ -89,75 +89,19 @@ const config = {
     await mkdir(join(targetDir, 'public'), {recursive: true});
   },
 
-  getFiles: (context: Record<string, unknown>) => {
-    const {typescript, react, ext, prettier, eslint} = context;
-
-    const files = [
+  getFiles: () => {
+    return [
       {
         template: 'base/package.json.hbs',
         output: 'package.json',
         prettier: true,
       },
-      {
-        template: 'base/index.html.hbs',
-        output: 'index.html',
-        prettier: true,
-      },
-      {
-        template: 'public/favicon.svg',
-        output: 'public/favicon.svg',
-      },
       {
         template: 'base/README.md.hbs',
         output: 'README.md',
         prettier: true,
       },
-      {
-        template: 'src/index.css.hbs',
-        output: 'src/index.css',
-        prettier: true,
-      },
-      {
-        template: 'src/index.tsx.hbs',
-        output: `src/index.${ext}`,
-        prettier: true,
-        transpile: !typescript,
-      },
     ];
-
-    if (prettier) {
-      files.push({
-        template: 'base/.prettierrc.hbs',
-        output: '.prettierrc',
-        prettier: true,
-      });
-    }
-
-    if (eslint) {
-      files.push({
-        template: 'base/eslint.config.js.hbs',
-        output: 'eslint.config.js',
-        prettier: true,
-      });
-    }
-
-    if (react) {
-      files.push({
-        template: 'base/vite.config.js.hbs',
-        output: 'vite.config.js',
-        prettier: true,
-      });
-    }
-
-    if (typescript) {
-      files.push({
-        template: 'base/tsconfig.json.hbs',
-        output: 'tsconfig.json',
-        prettier: true,
-      });
-    }
-
-    return files;
   },
 
   processIncludedFile: (file: FileConfig, context: TemplateContext) => {
diff --git a/templates/base/index.html.hbs b/templates/base/index.html.hbs
@@ -7,6 +7,7 @@
   <link rel="preconnect" href="https://fonts.googleapis.com" />
   <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
   <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Inter:wght@400;800&display=swap" />
+  {{includeFile template="public/favicon.svg" output="public/favicon.svg"}}
   <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
   <title>
     TinyBase / {{#if typescript}}TypeScript{{else}}JavaScript{{/if}}{{#if react}} + React{{/if}}
@@ -47,6 +48,7 @@
       </details>
     </div>
   {{/if}}
+  {{includeFile template="src/index.tsx.hbs" output="src/index.{{ext}}"}}
   <script type="module" src="/src/index.{{ext}}"></script>
 </body>
 
diff --git a/templates/base/package.json.hbs b/templates/base/package.json.hbs
@@ -3,6 +3,7 @@
 "version": "1.0.0",
 "scripts": {
 {{#list}}
+  {{includeFile template="base/index.html.hbs" output="index.html"}}
   "dev": "vite"
   {{#if typescript}}
     "build": "tsc && vite build"
@@ -57,4 +58,16 @@
   {{/if}}
 {{/list}}
 }
-}
+}
+{{#if prettier}}
+  {{includeFile template="base/.prettierrc.hbs" output=".prettierrc"}}
+{{/if}}
+{{#if eslint}}
+  {{includeFile template="base/eslint.config.js.hbs" output="eslint.config.js"}}
+{{/if}}
+{{#if react}}
+  {{includeFile template="base/vite.config.js.hbs" output="vite.config.js"}}
+{{/if}}
+{{#if typescript}}
+  {{includeFile template="base/tsconfig.json.hbs" output="tsconfig.json"}}
+{{/if}}
diff --git a/templates/src/index.tsx.hbs b/templates/src/index.tsx.hbs
@@ -1,7 +1,6 @@
+{{includeFile template="src/index.css.hbs" output="src/index.css"}}
 import './index.css';
-
 {{#if react}}
-
   import ReactDOM from 'react-dom/client';
   import {App} from './App';
   {{includeFile template="src/App.tsx.hbs" output="src/App.{{ext}}"}}
@@ -11,12 +10,9 @@ import './index.css';
   ReactDOM.createRoot(document.getElementById('app')!).render(
   <App />),
   );
-
 {{else}}
-
   import {app} from './app';
   {{includeFile template="src/app.ts.hbs" output="src/app.{{ext}}"}}
 
   addEventListener('load', app);
-
 {{/if}}
diff --git a/test/__snapshots__/cli.test.js.snap b/test/__snapshots__/cli.test.js.snap
@@ -29,12 +29,14 @@ npm run dev
       rel="stylesheet"
       href="https://fonts.googleapis.com/css2?family=Inter:wght@400;800&display=swap"
     />
+
     <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
     <title>TinyBase / JavaScript + React</title>
   </head>
 
   <body>
     <div id="app"></div>
+
     <script type="module" src="/src/index.jsx"></script>
   </body>
 </html>
@@ -335,6 +337,7 @@ npm run dev
       rel="stylesheet"
       href="https://fonts.googleapis.com/css2?family=Inter:wght@400;800&display=swap"
     />
+
     <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
     <title>TinyBase / JavaScript</title>
   </head>
@@ -369,6 +372,7 @@ npm run dev
         <pre id="tablesJson"></pre>
       </details>
     </div>
+
     <script type="module" src="/src/index.js"></script>
   </body>
 </html>
@@ -603,12 +607,14 @@ npm run dev
       rel="stylesheet"
       href="https://fonts.googleapis.com/css2?family=Inter:wght@400;800&display=swap"
     />
+
     <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
     <title>TinyBase / TypeScript + React</title>
   </head>
 
   <body>
     <div id="app"></div>
+
     <script type="module" src="/src/index.tsx"></script>
   </body>
 </html>
@@ -871,7 +877,6 @@ table.sortedTable thead th {
 }
 ",
   "src/index.tsx": "import './index.css';
-
 import ReactDOM from 'react-dom/client';
 import {App} from './App';
 
@@ -944,6 +949,7 @@ npm run dev
       rel="stylesheet"
       href="https://fonts.googleapis.com/css2?family=Inter:wght@400;800&display=swap"
     />
+
     <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
     <title>TinyBase / TypeScript</title>
   </head>
@@ -978,6 +984,7 @@ npm run dev
         <pre id="tablesJson"></pre>
       </details>
     </div>
+
     <script type="module" src="/src/index.ts"></script>
   </body>
 </html>
@@ -1185,7 +1192,6 @@ table.sortedTable thead th {
 }
 ",
   "src/index.ts": "import './index.css';
-
 import {app} from './app';
 
 addEventListener('load', app);
