@ditojs/server 2.2.16 → 2.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "2.2.16",
+  "version": "2.3.1",
   "type": "module",
   "description": "Dito.js Server – Dito.js is a declarative and modern web framework, based on Objection.js, Koa.js and Vue.js",
   "repository": "https://github.com/ditojs/dito/tree/master/packages/server",
@@ -22,10 +22,10 @@
     "node >= 18"
   ],
   "dependencies": {
-    "@ditojs/admin": "^2.2.16",
-    "@ditojs/build": "^2.2.3",
-    "@ditojs/router": "^2.2.0",
-    "@ditojs/utils": "^2.2.0",
+    "@ditojs/admin": "^2.3.1",
+    "@ditojs/build": "^2.3.0",
+    "@ditojs/router": "^2.3.0",
+    "@ditojs/utils": "^2.3.0",
     "@koa/cors": "^4.0.0",
     "@koa/multer": "^3.0.2",
     "@originjs/vite-plugin-commonjs": "^1.0.3",
@@ -88,7 +88,7 @@
     "typescript": "^5.0.4"
   },
   "types": "types",
-  "gitHead": "722b79d58335e249802d250fca9d250bad511b8c",
+  "gitHead": "1b5f5121a2e8e6d3741f0bb2b81d38c2343810d6",
   "scripts": {
     "types": "tsc --noEmit --esModuleInterop ./types/index.d.ts"
   },

package/src/app/Application.js

@@ -394,8 +394,32 @@ export class Application extends Koa {
     )
   }
 
+  defineAdminViteConfig(config) {
+    return this.getAdminController()?.defineViteConfig(config) || null
+  }
+
   getAdminViteConfig(config) {
-    return this.getAdminController()?.getViteConfig(config) || null
+    deprecate(
+      `app.getAdminViteConfig() is deprecated. Use app.defineAdminViteConfig() instead.`
+    )
+
+    return this.defineAdminViteConfig(config)
+  }
+
+  async loadAdminViteConfig() {
+    const cwd = process.cwd()
+    for (const extension of ['js', 'mjs', 'cjs', 'ts']) {
+      const file = path.join(cwd, `admin.vite.config.${extension}`)
+      try {
+        await fs.access(file)
+        return (await import(file)).default
+      } catch (error) {
+        if (error.code !== 'ENOENT') {
+          throw error
+        }
+      }
+    }
+    return null
   }
 
   getAssetConfig({
@@ -805,7 +829,7 @@ export class Application extends Koa {
   }
 
   startOrExit() {
-    deprecate(`app.startOrExit() is deprecated. Call app.execute() instead.`)
+    deprecate(`app.startOrExit() is deprecated. Use app.execute() instead.`)
     return this.execute()
   }
 

package/src/controllers/AdminController.js

@@ -128,7 +128,11 @@ export class AdminController extends Controller {
   }
 
   async setupViteServer() {
-    const config = this.getViteConfig()
+    const config = (
+      (await this.app.loadAdminViteConfig()) ||
+      this.defineViteConfig()
+    )
+
     const development = this.mode === 'development'
     const server = await createServer({
       ...config,
@@ -167,7 +171,7 @@ export class AdminController extends Controller {
     )
   }
 
-  getViteConfig(config = {}) {
+  defineViteConfig(config = {}) {
     const development = this.mode === 'development'
 
     const cwd = process.cwd()
@@ -202,37 +206,37 @@ export class AdminController extends Controller {
               }
             }
           ],
-          build: {
-            ...(!development && {
-              outDir: this.getPath('dist'),
-              assetsDir: '.',
-              emptyOutDir: true,
-              chunkSizeWarningLimit: 1000,
-              rollupOptions: {
-                output: {
-                  manualChunks(id) {
-                    if (id.startsWith(views)) {
-                      return 'views'
-                    } else if (id.startsWith(cwd)) {
-                      return 'common'
-                    } else {
-                      const module = id.match(
-                        /node_modules\/((?:@[^/]*\/)?[^/$]*)/
-                      )?.[1]
-                      // Internal ids (vite modules) don't come from
-                      // node_modules, and the ids actually start with \0x00.
-                      return (
-                        !module ||
-                        testModuleIdentifier(module, coreDependencies)
-                      )
-                        ? 'core'
-                        : 'vendor'
+          build: development
+            ? {}
+            : {
+                outDir: this.getPath('dist'),
+                assetsDir: '.',
+                emptyOutDir: true,
+                chunkSizeWarningLimit: 1000,
+                rollupOptions: {
+                  output: {
+                    manualChunks(id) {
+                      if (id.startsWith(views)) {
+                        return 'views'
+                      } else if (id.startsWith(cwd)) {
+                        return 'common'
+                      } else {
+                        const module = id.match(
+                          /node_modules\/((?:@[^/]*\/)?[^/$]*)/
+                        )?.[1]
+                        // Internal ids (vite modules) don't come from
+                        // node_modules, and the ids actually start with \0x00.
+                        return (
+                          !module ||
+                          testModuleIdentifier(module, coreDependencies)
+                        )
+                          ? 'core'
+                          : 'vendor'
+                      }
                     }
                   }
                 }
-              }
-            })
-          },
+              },
           css: {
             postcss: getPostCssConfig(),
             devSourcemap: development

package/types/index.d.ts

@@ -1089,6 +1089,8 @@ export class AdminController extends Controller {
   sendDitoObject(ctx: Koa.Context): void
   middleware(): Koa.Middleware
   setupViteServer(): void
+  defineViteConfig(config: UserConfig): UserConfig
+  /** @deprecated Use `defineViteConfig` instead. */
   getViteConfig(config: UserConfig): UserConfig
 }
 type ModelControllerHookType = 'collection' | 'member'