read assets dir from config

jarle · Aug 16, 2024 · c364a4a · c364a4a
1 parent c68b06d
commit c364a4a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/packages/adapter/src/hooks/build_hook.ts b/packages/adapter/src/hooks/build_hook.ts
@@ -14,8 +14,9 @@ export default async function remixBuildHook({ logger }: Parameters<AssemblerHoo
   const config = await resolveViteConfig()
   // const cli = await import('@remix-run/dev')
   // await cli.run(['vite:build'])
-  const source = app.makePath('build', 'remix', 'client')
-  const target = app.makePath('build', 'public', 'assets', config?.base ?? '/')
+  const assetsDir = config?.build?.assetsDir ?? 'assets'
+  const source = app.makePath('build', 'remix', 'client', assetsDir)
+  const target = app.makePath('build', 'public', assetsDir, config?.base ?? '/')
   moveDirectorySync(source, target)
 }
 

diff --git a/packages/reference-app/vite.config.ts b/packages/reference-app/vite.config.ts
@@ -1,18 +1,13 @@
-import adonisjs from '@adonisjs/vite/client'
 import { vitePlugin as remix } from '@remix-run/dev'
 import { defineConfig } from 'vite'
 
 export default defineConfig(({ isSsrBuild }) => ({
-  base: '/assets/',
   plugins: [
     remix({
       appDirectory: 'resources/remix_app',
       buildDirectory: 'build/remix',
       serverBuildFile: 'server.js',
     }),
-    adonisjs({
-      entrypoints: [],
-    }),
   ],
   optimizeDeps: {
     esbuildOptions: isSsrBuild