@ditojs/server 1.10.1 → 1.12.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/server",
-  "version": "1.10.1",
+  "version": "1.12.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",
@@ -14,29 +14,28 @@
     "dito": "./src/cli/index.js"
   },
   "engines": {
-    "node": ">= 16.0.0",
+    "node": ">= 18.0.0",
     "yarn": ">= 1.0.0"
   },
   "browserslist": [
-    "node >= 16"
+    "node >= 18"
   ],
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.135.0",
-    "@ditojs/admin": "^1.10.1",
-    "@ditojs/build": "^1.10.1",
-    "@ditojs/router": "^1.10.1",
-    "@ditojs/utils": "^1.10.1",
-    "@koa/cors": "^3.4.3",
+    "@aws-sdk/client-s3": "^3.200.0",
+    "@ditojs/admin": "^1.12.0",
+    "@ditojs/build": "^1.12.0",
+    "@ditojs/router": "^1.12.0",
+    "@ditojs/utils": "^1.12.0",
+    "@koa/cors": "^4.0.0",
     "@koa/multer": "^3.0.0",
     "@originjs/vite-plugin-commonjs": "^1.0.3",
     "ajv": "^8.11.0",
     "ajv-formats": "^2.1.1",
-    "axios": "^0.27.2",
     "bcryptjs": "^2.4.3",
     "bytes": "^3.1.2",
     "data-uri-to-buffer": "^4.0.0",
     "eventemitter2": "^6.4.9",
-    "file-type": "^17.1.6",
+    "file-type": "^18.0.0",
     "fs-extra": "^10.1.0",
     "image-size": "^1.0.2",
     "is-svg": "^4.3.2",
@@ -62,7 +61,7 @@
     "picocolors": "^1.0.0",
     "picomatch": "^2.3.1",
     "pino": "^8.7.0",
-    "pino-pretty": "^8.1.0",
+    "pino-pretty": "^9.1.1",
     "pluralize": "^8.0.0",
     "repl": "^0.1.3",
     "uuid": "^9.0.0",
@@ -79,5 +78,5 @@
     "knex": "^2.3.0",
     "objection": "^3.0.1"
   },
-  "gitHead": "2a5658aeeef2666b0a5ddd37ce6fbdb1d9eab3c3"
+  "gitHead": "3707045b72d84db4b5174d2efeb8cf62e2065ffa"
 }

package/src/app/Application.js

@@ -5,7 +5,6 @@ import zlib from 'zlib'
 import fs from 'fs-extra'
 import Koa from 'koa'
 import Knex from 'knex'
-import axios from 'axios'
 import pico from 'picocolors'
 import pino from 'pino'
 import parseDuration from 'parse-duration'
@@ -888,12 +887,8 @@ export class Application extends Koa {
                   const filepath = path.resolve(url.substring(7))
                   data = await fs.readFile(filepath)
                 } else {
-                  const response = await axios.request({
-                    method: 'get',
-                    responseType: 'arraybuffer',
-                    url
-                  })
-                  data = response.data
+                  const response = await fetch(url)
+                  data = await response.arrayBuffer()
                 }
               }
               const importedFile = await storage.addFile(file, data)

package/src/controllers/AdminController.js

@@ -1,5 +1,4 @@
 import path from 'path'
-import { exit } from 'process'
 import Koa from 'koa'
 import serve from 'koa-static'
 import { defineConfig, createServer } from 'vite'
@@ -147,24 +146,9 @@ export class AdminController extends Controller {
 
     this.closed = false
 
-    // Monkey-patch `process.exit()` to filter out the calls caused by vite's
-    // handling of SIGTERM, see: https://github.com/vitejs/vite/issues/7627
-    process.exit = code => {
-      // Filter out calls from inside vite by looking at the stack trace.
-      if (new Error().stack.includes('/vite/dist/')) {
-        // vite's own `exitProcess()` just called `process.exit(), and this
-        // means it has already called `server.close()` internally.
-        this.closed = true
-        process.exit = exit
-      } else {
-        exit(code)
-      }
-    }
-
     this.app.once('after:stop', () => {
       // For good timing it seems crucial to not add more ticks with async
       // signature, so we directly return the `server.close()` promise instead.
-      process.exit = exit
       if (!this.closed) {
         this.closed = true
         return server.close()
@@ -289,7 +273,6 @@ const CORE_DEPENDENCIES = [
   'vue-upload-component',
   'vuedraggable',
 
-  'axios',
   'core-js',
   'lowlight',
   'sortablejs',

package/src/errors/ResponseError.js

@@ -9,8 +9,6 @@ export class ResponseError extends Error {
           // Copy error into object so they can be merged with defaults after.
           // First copy everything that is enumerable, unless the error is from
           // axios, in which case we don't want to leak config information.
-          // TODO: Use `instanceof AxiosException` instead once axios is v1.0.0:
-          // https://github.com/axios/axios/pull/2014
           ...(error.isAxiosError ? null : error),
           // Also explicitly copy message, status and code.
           message: error.message,

package/src/graph/expression.js

@@ -39,7 +39,7 @@ export function expressionPathToString(path, start = 0) {
 
 export function modelGraphToExpression(modelGraph, expr) {
   if (modelGraph) {
-    expr = expr || {}
+    expr ||= {}
     for (const model of asArray(modelGraph)) {
       if (model) {
         const relations = model.constructor.getRelations()

package/src/graph/graph.js

@@ -49,7 +49,7 @@ function parseRelationArray(json, relation, options) {
   let changed = false
   for (let i = 0, l = json.length; i < l; i++) {
     const model = parseRelationObject(json[i], relation, options)
-    changed = changed || (model !== json[i])
+    changed ||= model !== json[i]
     models[i] = model
   }
   return changed ? models : json

package/src/models/Model.js

@@ -168,7 +168,7 @@ export class Model extends objection.Model {
       // extensions (async and graph for now):
       return super.$validate(json, options)
     }
-    json = json || this
+    json ||= this
     const inputJson = json
     const shallow = json.$isObjectionModel && !options.graph
     if (shallow) {
@@ -471,7 +471,7 @@ export class Model extends objection.Model {
 
   // @override
   $setJson(json, options) {
-    options = options || {}
+    options ||= {}
     const callInitialize = (
       // Only call initialize when:
       // 1. we're not partially patching:

package/src/schema/relations.js

@@ -193,7 +193,7 @@ export function convertRelation(schema, models) {
       throw new RelationError('Unsupported through join definition')
     }
     // Combine `modify` and `filter`. Setting both together is not supported.
-    modify = modify || filter
+    modify ||= filter
     if (isObject(modify)) {
       // Convert a find-filter object to a filter function, same as in the
       // handling of definition.scopes, see Model.js