@ditojs/server 1.30.0 → 2.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "1.30.0",
+  "version": "2.0.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,13 +22,15 @@
     "node >= 18"
   ],
   "dependencies": {
-    "@ditojs/admin": "^1.30.0",
-    "@ditojs/build": "^1.30.0",
-    "@ditojs/router": "^1.30.0",
-    "@ditojs/utils": "^1.30.0",
+    "@ditojs/admin": "^2.0.1",
+    "@ditojs/build": "^2.0.0",
+    "@ditojs/router": "^2.0.1",
+    "@ditojs/utils": "^2.0.1",
     "@koa/cors": "^4.0.0",
     "@koa/multer": "^3.0.2",
     "@originjs/vite-plugin-commonjs": "^1.0.3",
+    "@vitejs/plugin-vue": "^4.1.0",
+    "@vue/compiler-sfc": "^3.2.47",
     "ajv": "^8.12.0",
     "ajv-formats": "^2.1.1",
     "bcryptjs": "^2.4.3",
@@ -42,17 +44,17 @@
     "koa-compress": "^5.1.0",
     "koa-conditional-get": "^3.0.0",
     "koa-etag": "^4.0.0",
-    "koa-helmet": "^7.0.1",
+    "koa-helmet": "^7.0.2",
     "koa-mount": "^4.0.0",
     "koa-passport": "^6.0.0",
     "koa-response-time": "^2.1.0",
     "koa-session": "^6.4.0",
     "koa-static": "^5.0.0",
-    "leather": "^2.1.4",
+    "leather": "^3.0.0",
     "mime-types": "^2.1.35",
     "multer": "^1.4.5-lts.1",
     "multer-s3": "https://github.com/ditojs/multer-s3#dito",
-    "nanoid": "^4.0.1",
+    "nanoid": "^4.0.2",
     "parse-duration": "^1.0.3",
     "passport-local": "^1.0.0",
     "passthrough-counter": "^1.0.0",
@@ -64,9 +66,7 @@
     "repl": "^0.1.3",
     "uuid": "^9.0.0",
     "vite": "^4.2.1",
-    "vite-plugin-vue2": "^2.0.3",
-    "vue": "^2.7.14",
-    "vue-template-compiler": "^2.7.14"
+    "vue": "^3.2.47"
   },
   "peerDependencies": {
     "@aws-sdk/client-s3": "^3.0.0",
@@ -74,7 +74,7 @@
     "objection": "^3.0.1"
   },
   "devDependencies": {
-    "@aws-sdk/client-s3": "^3.295.0",
+    "@aws-sdk/client-s3": "^3.304.0",
     "@types/koa-bodyparser": "^4.3.10",
     "@types/koa-compress": "^4.0.3",
     "@types/koa-logger": "^3.1.2",
@@ -83,14 +83,14 @@
     "@types/koa-session": "^6.4.0",
     "@types/koa-static": "^4.0.2",
     "@types/koa__cors": "^4.0.0",
-    "@types/node": "^18.15.5",
+    "@types/node": "^18.15.11",
     "knex": "^2.4.2",
-    "objection": "^3.0.1",
-    "type-fest": "^3.6.1",
-    "typescript": "^5.0.2"
+    "objection": "^3.0.2",
+    "type-fest": "^3.7.2",
+    "typescript": "^5.0.3"
   },
   "types": "types",
-  "gitHead": "5d09dc24ecb77b511f3c25643275ea1b9514fb52",
+  "gitHead": "80c209774fe4ee5243eb25d77ac9a97bfb694d8c",
   "scripts": {
     "types": "tsc --noEmit ./src/index.d.ts"
   },

package/src/cli/index.js

@@ -18,9 +18,9 @@ function getCommand(commands, parts) {
 }
 
 function setSilent(silent) {
-  const oldValue = process.env.DITO_SILENT
+  const wasSilent = process.env.DITO_SILENT
   process.env.DITO_SILENT = silent
-  return oldValue
+  return wasSilent
 }
 
 async function execute() {

package/src/controllers/AdminController.js

@@ -2,7 +2,7 @@ import path from 'path'
 import Koa from 'koa'
 import serve from 'koa-static'
 import { defineConfig, createServer } from 'vite'
-import { createVuePlugin } from 'vite-plugin-vue2'
+import createVuePlugin from '@vitejs/plugin-vue'
 import {
   viteCommonjs as createCommonJsPlugin
 } from '@originjs/vite-plugin-commonjs'
@@ -206,7 +206,9 @@ export class AdminController extends Controller {
                 } else if (id.startsWith(cwd)) {
                   return 'common'
                 } else {
-                  const module = id.match(/node_modules\/([^/$]*)/)?.[1] || ''
+                  const module = (
+                    id.match(/node_modules\/((?:@[^/]*\/)?[^/$]*)/)?.[1] || ''
+                  )
                   return testModuleIdentifier(module, coreDependencies)
                     ? 'core'
                     : 'vendor'
@@ -222,7 +224,16 @@ export class AdminController extends Controller {
       optimizeDeps: {
         exclude: development ? ditoPackages : [],
         include: [
-          ...(development ? [] : ditoPackages),
+          ...(development
+            // https://discuss.prosemirror.net/t/rangeerror-adding-different-instances-of-a-keyed-plugin-plugin/4242/13
+            ? [
+              'prosemirror-state',
+              'prosemirror-transform',
+              'prosemirror-model',
+              'prosemirror-view'
+            ]
+            : ditoPackages
+          ),
           ...nonEsmDependencies
         ]
       },
@@ -249,11 +260,7 @@ const ditoPackages = [
 const nonEsmDependencies = [
   // All non-es modules need to be explicitly included here, and some of
   // them only work due to the use of `createCommonJsPlugin()`.
-  'vue-color',
-  'vue-js-modal',
-  'vue-multiselect',
-  'vue-notification',
-  'lowlight'
+  '@lk77/vue3-color'
 ]
 
 const coreDependencies = [
@@ -265,29 +272,24 @@ const coreDependencies = [
   // a json file?
 
   'vue',
-  'vue-color',
-  'vue-js-modal',
+  '@vue/*',
+  '@lk77/vue3-color',
+  '@kyvg/vue3-notification',
   'vue-multiselect',
-  'vue-notification',
   'vue-router',
   'vue-upload-component',
-  'vuedraggable',
-
-  'core-js',
-  'lowlight',
+  'tinycolor2',
+  'sortablejs-vue3',
   'sortablejs',
-  'tiptap',
-  'tiptap-*',
-  'tslib',
+  '@tiptap/*',
   'prosemirror-*',
+  'linkifyjs',
   'codeflask',
+  'punycode',
   'rope-sequence',
-  'tinycolor2',
-  'fault',
   'filesize',
   'filesize-parser',
-  'format',
-  'highlight.js',
+  'tslib',
   'orderedmap',
   'w3c-keyname'
 ]

package/src/storage/S3Storage.js

@@ -3,7 +3,7 @@ import { fileTypeFromBuffer } from 'file-type'
 import { Storage } from './Storage.js'
 import { PassThrough } from 'stream'
 import consumers from 'stream/consumers'
-import { attributes as readMediaAttributes } from 'leather'
+import { readMediaAttributes } from 'leather'
 
 export class S3Storage extends Storage {
   static type = 's3'

package/src/storage/Storage.js

@@ -3,7 +3,7 @@ import { URL } from 'url'
 import multer from '@koa/multer'
 import picomatch from 'picomatch'
 import { PassThrough } from 'stream'
-import { attributes as readMediaAttributes } from 'leather'
+import { readMediaAttributes } from 'leather'
 import { hyphenate, toPromiseCallback } from '@ditojs/utils'
 import { AssetFile } from './AssetFile.js'
 import { deprecate } from '../utils/deprecate.js'

package/types/index.d.ts

@@ -1571,6 +1571,7 @@ export class QueryBuilder<
   SingleQueryBuilderType: QueryBuilder<M, M>
   NumberQueryBuilderType: QueryBuilder<M, number>
   PageQueryBuilderType: QueryBuilder<M, objection.Page<M>>
+  MaybeSingleQueryBuilderType: QueryBuilder<M, M | undefined>
 }
 export interface QueryBuilder<M extends Model, R = M[]> extends KnexHelper {}