@ditojs/server 1.2.1 → 1.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "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",
@@ -21,9 +21,9 @@
     "node >= 14"
   ],
   "dependencies": {
-    "@ditojs/admin": "^1.2.0",
-    "@ditojs/router": "^1.2.0",
-    "@ditojs/utils": "^1.2.0",
+    "@ditojs/admin": "^1.3.0",
+    "@ditojs/router": "^1.3.0",
+    "@ditojs/utils": "^1.3.0",
     "@koa/cors": "^3.2.0",
     "@koa/multer": "^3.0.0",
     "@originjs/vite-plugin-commonjs": "^1.0.3",
@@ -53,7 +53,6 @@
     "koa-session": "^6.2.0",
     "koa-static": "^5.0.0",
     "mime-types": "^2.1.35",
-    "minimatch": "^5.0.1",
     "multer": "^1.4.4",
     "multer-s3": "^2.10.0",
     "nanoid": "^3.3.1",
@@ -82,5 +81,5 @@
     "pg": "^8.7.3",
     "sqlite3": "^5.0.2"
   },
-  "gitHead": "14339419ebec275f8e611092d399acff706b9322"
+  "gitHead": "23aac9eddfc17e3e9367db2b7ac73595bc2bad37"
 }

package/src/controllers/AdminController.js

@@ -13,7 +13,7 @@ import { merge } from '@ditojs/utils'
 import { Controller } from './Controller.js'
 import { handleConnectMiddleware } from '../middleware/index.js'
 import { ControllerError } from '../errors/index.js'
-import { formatJson } from '../utils/index.js'
+import { formatJson, deprecate } from '../utils/index.js'
 
 export class AdminController extends Controller {
   // @override
@@ -34,11 +34,19 @@ export class AdminController extends Controller {
   }
 
   getPath(name) {
-    const str = this.config[name]?.path
+    const { config } = this
+    let str = config[name]
+    if (config.build?.path || config.dist?.path) {
+      deprecate(`config.admin.build.path and config.admin.dist.path are deprecated. Use config.admin.root and config.admin.dist instead.`)
+
+      str = name === 'root' ? config.build?.path
+        : name === 'dist' ? config.dist?.path
+        : null
+    }
     if (!str) {
       throw new ControllerError(
         this,
-        `Missing admin.${name}.path configuration.`
+        `Missing \`config.admin.${name}\` configuration.`
       )
     }
     return path.resolve(str)
@@ -85,8 +93,8 @@ export class AdminController extends Controller {
     this.koa = new Koa()
     this.koa.use(this.middleware())
     if (this.mode === 'development') {
-      // Calling getPath() throws exception if admin.build.path is not defined:
-      if (this.getPath('build')) {
+      // Calling getPath() throws exception if config.admin.root is not defined:
+      if (this.getPath('root')) {
         this.app.once('after:start', () => this.setupViteServer())
       }
     } else {
@@ -128,14 +136,14 @@ export class AdminController extends Controller {
     const development = this.mode === 'development'
 
     const cwd = path.resolve('.')
-    const root = this.getPath('build')
+    const root = this.getPath('root')
     const base = `${this.url}/`
     const views = path.join(root, 'views')
 
     // Read `package.json` from the closest package.json, so we can emulate
     // ESM-style imports mappings in rollup / vite.
     const pkg = findUpSync('package.json', { cwd: root })
-    const { imports } = JSON.parse(fs.readFileSync(pkg, 'utf8'))
+    const { imports = {} } = JSON.parse(fs.readFileSync(pkg, 'utf8'))
 
     return defineConfig(merge({
       root,
@@ -209,7 +217,7 @@ export class AdminController extends Controller {
             replacement: '#',
             customResolver(id) {
               for (const [find, replacement] of Object.entries(imports)) {
-                picomatch.isMatch(id, find, {
+                picomatch.isMatch(id, find.replace('*', '**'), {
                   capture: true,
                   onMatch({ input, regex }) {
                     const replacementPath = path.resolve(replacement)