wip: refactor

wevm · Oct 22, 2023 · c95f0d6 · c95f0d6
1 parent d5d72e4
commit c95f0d6
Show file tree

Hide file tree

Showing 14 changed files with 32 additions and 22 deletions.
diff --git a/scripts/postbuild.ts b/scripts/postbuild.ts
@@ -5,8 +5,8 @@ import { resolve } from 'node:path'
 import { copy, copyFileSync, readFileSync, writeFileSync } from 'fs-extra'
 
 copyFileSync(
-  resolve(import.meta.dir, '../src/index.html'),
-  resolve(import.meta.dir, '../src/_lib/index.html'),
+  resolve(import.meta.dir, '../src/vite/index.html'),
+  resolve(import.meta.dir, '../src/_lib/vite/index.html'),
 )
 copy(
   resolve(import.meta.dir, '../src/app/styles'),

diff --git a/src/cli.ts b/src/cli.ts
@@ -10,21 +10,21 @@ cli
   .command('[root]')
   .alias('dev')
   .action(async () => {
-    const { createDevServer } = await import('./dev-server.js')
+    const { createDevServer } = await import('./vite/dev-server.js')
     const server = await createDevServer()
     await server.listen()
     server.printUrls()
   })
 
 // build
 cli.command('build').action(async () => {
-  const { build } = await import('./build.js')
+  const { build } = await import('./vite/build.js')
   await build()
 })
 
 // preview
 cli.command('preview').action(async () => {
-  const { preview } = await import('./preview.js')
+  const { preview } = await import('./vite/preview.js')
   const server = await preview()
   server.printUrls()
 })

diff --git a/src/index.ts b/src/index.ts
@@ -1,3 +1,3 @@
-export { build } from './build.js'
-export { createDevServer } from './dev-server.js'
-export { preview } from './preview.js'
+export { build } from './vite/build.js'
+export { createDevServer } from './vite/dev-server.js'
+export { preview } from './vite/preview.js'
diff --git a/src/build.ts → src/vite/build.ts b/src/build.ts → src/vite/build.ts
@@ -2,7 +2,7 @@ import { dirname, resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import * as vite from 'vite'
 
-import { prerender } from './vite-plugins/prerender.js'
+import { prerender } from './plugins/prerender.js'
 
 const __dirname = dirname(fileURLToPath(import.meta.url))
 
@@ -25,7 +25,7 @@ export async function build({ outDir = 'dist' }: BuildParameters = {}) {
     build: {
       emptyOutDir: false,
       outDir: resolve(outDir),
-      ssr: resolve(__dirname, 'app/index.server.tsx'),
+      ssr: resolve(__dirname, '../app/index.server.tsx'),
     },
     plugins: [prerender({ outDir })],
     root: __dirname,
@@ -37,7 +37,7 @@ export async function build({ outDir = 'dist' }: BuildParameters = {}) {
       lib: {
         formats: ['iife'],
         name: 'theme',
-        entry: [resolve(__dirname, './app/utils/initialize-theme.ts')],
+        entry: [resolve(__dirname, '../app/utils/initialize-theme.ts')],
       },
       minify: true,
       outDir: resolve(outDir),

diff --git a/src/dev-server.ts → src/vite/dev-server.ts b/src/dev-server.ts → src/vite/dev-server.ts
@@ -2,7 +2,7 @@ import { dirname } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { createServer } from 'vite'
 
-import { dev } from './vite-plugins/dev.js'
+import { dev } from './plugins/dev.js'
 
 const __dirname = dirname(fileURLToPath(import.meta.url))
 

diff --git a/src/index.html → src/vite/index.html b/src/index.html → src/vite/index.html
@@ -3,12 +3,12 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <script src="/app/utils/initialize-theme.ts"></script>
-    <link href="/app/styles/index.css" rel="stylesheet">
+    <script src="../app/utils/initialize-theme.ts"></script>
+    <link href="../app/styles/index.css" rel="stylesheet">
     <!--head-->
   </head>
   <body>
     <div id="app"><!--body--></div>
-    <script type="module" src="/app/index.client.tsx"></script>
+    <script type="module" src="../app/index.client.tsx"></script>
   </body>
 </html>
diff --git a/src/vite-plugins/dev.ts → src/vite/plugins/dev.ts b/src/vite-plugins/dev.ts → src/vite/plugins/dev.ts
@@ -27,9 +27,14 @@ export function dev(): PluginOption {
 
             const indexHtml = readFileSync(resolve(__dirname, '../index.html'), 'utf-8')
             const template = await server.transformIndexHtml(url!, indexHtml)
-            const module = await server.ssrLoadModule(resolve(__dirname, '../app/index.server.tsx'))
+            const module = await server.ssrLoadModule(
+              resolve(__dirname, '../../app/index.server.tsx'),
+            )
             const { head, body } = await module.render(req)
-            const html = template.replace('<!--body-->', body).replace('<!--head-->', head)
+            const html = template
+              .replace(/\.\.\/app/g, `/@fs${resolve(__dirname, '../../app')}`)
+              .replace('<!--body-->', body)
+              .replace('<!--head-->', head)
             res.end(html)
           } finally {
             next()

diff --git a/src/vite-plugins/prerender.ts → src/vite/plugins/prerender.ts b/src/vite-plugins/prerender.ts → src/vite/plugins/prerender.ts
@@ -24,7 +24,7 @@ export function prerender({ outDir = 'dist' }: PrerenderPluginParameters): Plugi
         const html = template
           .replace('<!--body-->', body)
           .replace('<!--head-->', head)
-          .replace('/app/utils/initialize-theme.ts', '/initialize-theme.iife.js')
+          .replace('../app/utils/initialize-theme.ts', '/initialize-theme.iife.js')
         const filePath = `${route.endsWith('/') ? `${route}index` : route}.html`.replace(/^\//, '')
         const path = resolve(outDir_resolved, filePath)
         const pathDir = dirname(path)

diff --git a/src/vite-plugins/routes.ts → src/vite/plugins/routes.ts b/src/vite-plugins/routes.ts → src/vite/plugins/routes.ts
diff --git a/src/preview.ts → src/vite/preview.ts b/src/preview.ts → src/vite/preview.ts
diff --git a/src/remark-plugins/callout.ts → src/vite/remark/callout.ts b/src/remark-plugins/callout.ts → src/vite/remark/callout.ts
diff --git a/src/remark-plugins/code-group.ts → src/vite/remark/code-group.ts b/src/remark-plugins/code-group.ts → src/vite/remark/code-group.ts
diff --git a/src/remark-plugins/subheading.ts → src/vite/remark/subheading.ts b/src/remark-plugins/subheading.ts → src/vite/remark/subheading.ts
diff --git a/src/vite.config.ts → src/vite/vite.config.ts b/src/vite.config.ts → src/vite/vite.config.ts
@@ -15,17 +15,22 @@ import {
 } from 'shiki-processor'
 import { defineConfig } from 'vite'
 
-import { remarkCallout } from './remark-plugins/callout.js'
-import { remarkCodeGroup } from './remark-plugins/code-group.js'
-import { remarkSubheading } from './remark-plugins/subheading.js'
-import { routes } from './vite-plugins/routes.js'
+import { routes } from './plugins/routes.js'
+import { remarkCallout } from './remark/callout.js'
+import { remarkCodeGroup } from './remark/code-group.js'
+import { remarkSubheading } from './remark/subheading.js'
 
 export default defineConfig({
   css: {
     postcss: {
       plugins: [(autoprefixer as any).default()],
     },
   },
+  server: {
+    fs: {
+      allow: ['..'],
+    },
+  },
   plugins: [
     react(),
     mdx({