@ditojs/server 1.5.0 → 1.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "1.5.0",
+  "version": "1.5.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",
@@ -60,6 +60,7 @@
     "passport-local": "^1.0.0",
     "passthrough-counter": "^1.0.0",
     "picocolors": "^1.0.0",
+    "picomatch": "^2.3.1",
     "pino": "^7.9.2",
     "pino-pretty": "^7.6.0",
     "pluralize": "^8.0.0",
@@ -80,5 +81,5 @@
     "pg": "^8.7.3",
     "sqlite3": "^5.0.2"
   },
-  "gitHead": "36a57512228cc233211bf6e4038123a9e775f5c5"
+  "gitHead": "40731960cf8b528f4f40f8b7e43e2e966138337c"
 }

package/src/storage/Storage.js

@@ -1,11 +1,11 @@
 import path from 'path'
+import { URL } from 'url'
 import multer from '@koa/multer'
+import picomatch from 'picomatch'
 import imageSize from 'image-size'
 import { PassThrough } from 'stream'
-import { URL } from 'url'
 import { hyphenate, toPromiseCallback } from '@ditojs/utils'
 import { AssetFile } from './AssetFile.js'
-import { matchGlobPattern } from '../utils/glob.js'
 
 const storageClasses = {}
 
@@ -59,11 +59,7 @@ export class Storage {
   }
 
   isImportSourceAllowed(url) {
-    const { allowedImports = [] } = this.config
-    for (const pattern of allowedImports) {
-      if (matchGlobPattern(url, pattern)) return true
-    }
-    return false
+    return picomatch.isMatch(url, this.config.allowedImports || [])
   }
 
   convertAssetFile(file) {

package/src/utils/glob.js

@@ -1,9 +0,0 @@
-import { escapeRegexp } from '@ditojs/utils'
-
-export function matchGlobPattern(str, pattern) {
-  const exp = escapeRegexp(pattern).replace(
-    /\\([*?])/,
-    (_, chr) => chr === '*' ? '.*' : chr
-  )
-  return new RegExp(`^${exp}$`).test(str)
-}