@ditojs/server 1.29.0 → 2.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "1.29.0",
+  "version": "2.0.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",
@@ -22,13 +22,15 @@
     "node >= 18"
   ],
   "dependencies": {
-    "@ditojs/admin": "^1.29.0",
-    "@ditojs/build": "^1.29.0",
-    "@ditojs/router": "^1.29.0",
-    "@ditojs/utils": "^1.29.0",
+    "@ditojs/admin": "^2.0.0",
+    "@ditojs/build": "^2.0.0",
+    "@ditojs/router": "^2.0.0",
+    "@ditojs/utils": "^2.0.0",
     "@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",
@@ -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",
@@ -90,7 +90,7 @@
     "typescript": "^5.0.2"
   },
   "types": "types",
-  "gitHead": "6e93fe59126eab3d5ee1961d9e03f0fbdc297fba",
+  "gitHead": "dde9462e778bce37bc4fa3e47127a9ba12a4d5e2",
   "scripts": {
     "types": "tsc --noEmit ./src/index.d.ts"
   },

package/src/app/Application.js

@@ -819,12 +819,13 @@ export class Application extends Koa {
         addedFiles.length > 0 ||
         removedFiles.length > 0
       ) {
-        const changeCount = (files, increment) => (
-          files.length > 0 &&
-          AssetModel.query(trx)
-            .whereIn('key', files.map(file => file.key))
-            .increment('count', increment)
-        )
+        const changeCount = async (files, increment) => {
+          if (files.length > 0) {
+            await AssetModel.query(trx)
+              .whereIn('key', files.map(file => file.key))
+              .increment('count', increment)
+          }
+        }
         await Promise.all([
           changeCount(addedFiles, 1),
           changeCount(removedFiles, -1)

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,15 +2,11 @@ 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'
-import {
-  createRollupImportsResolver,
-  testModuleIdentifier,
-  getPostCssConfig
-} from '@ditojs/build'
+import { testModuleIdentifier, getPostCssConfig } from '@ditojs/build'
 import { merge } from '@ditojs/utils'
 import { Controller } from './Controller.js'
 import { handleConnectMiddleware } from '../middleware/index.js'
@@ -210,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'
@@ -226,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
         ]
       },
@@ -237,8 +244,7 @@ export class AdminController extends Controller {
           {
             find: '@',
             replacement: root
-          },
-          createRollupImportsResolver({ cwd: root })
+          }
         ]
       }
     }, config))
@@ -254,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 = [
@@ -270,29 +272,21 @@ const coreDependencies = [
   // a json file?
 
   'vue',
-  'vue-color',
-  'vue-js-modal',
+  '@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-*',
   'codeflask',
   'rope-sequence',
-  'tinycolor2',
-  'fault',
   'filesize',
   'filesize-parser',
-  'format',
-  'highlight.js',
+  'tslib',
   'orderedmap',
   'w3c-keyname'
 ]

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 {}