@discoveryjs/cli
Advanced tools
Comparing version 2.6.0 to 2.6.1
@@ -220,9 +220,6 @@ const fs = require('fs'); | ||
function normalizeConfig(config, model, basedir) { | ||
let result; | ||
config = config || {}; | ||
const cwd = process.env.PWD || process.cwd(); | ||
const configBasedir = config.basedir ? path.resolve(basedir || cwd, config.basedir) : basedir || cwd; | ||
let modelBaseConfig = normalizeModelConfig(config.modelBaseConfig || {}, configBasedir); | ||
let result; | ||
// if no models treat it as single model configuration | ||
@@ -246,2 +243,6 @@ if (!config.models) { | ||
const cwd = process.env.PWD || process.cwd(); | ||
const configBasedir = result.basedir ? path.resolve(basedir || cwd, result.basedir) : basedir || cwd; | ||
let modelBaseConfig = normalizeModelConfig(result.modelBaseConfig || {}, configBasedir); | ||
result.darkmode = result.darkmode !== undefined ? result.darkmode : 'auto'; | ||
@@ -248,0 +249,0 @@ result.download = result.download !== undefined ? Boolean(result.download) : true; |
@@ -64,5 +64,13 @@ /* eslint-env browser */ | ||
const el = document.createElement('pre'); | ||
const errorText = String(error); | ||
let errorStack = String(error.stack || ''); | ||
if (errorStack.startsWith(errorText)) { | ||
errorStack = errorStack.slice(errorText.length); | ||
} | ||
el.className = 'error'; | ||
el.append(document.createTextNode('[ERROR] ' + error + (error.stack ? '\n\n' + error.stack : ''))); | ||
el.append(document.createTextNode('[ERROR] ' + errorText + | ||
(errorStack ? '\n' + errorStack.replace(/^[\r\n]+/, '') : '')) | ||
); | ||
@@ -69,0 +77,0 @@ loadData.progressbar.el.replaceWith(el); |
{ | ||
"name": "@discoveryjs/cli", | ||
"version": "2.6.0", | ||
"version": "2.6.1", | ||
"description": "CLI tools to serve & build projects based on Discovery.js", | ||
@@ -39,3 +39,3 @@ "author": "Roman Dvornov <rdvornov@gmail.com> (https://github.com/lahmatiy)", | ||
"cronstrue": "^2.21.0", | ||
"esbuild": "^0.17.3", | ||
"esbuild": "^0.19.5", | ||
"express": "^4.18.2", | ||
@@ -42,0 +42,0 @@ "mime": "^3.0.0", |
242798
4433
+ Added@esbuild/aix-ppc64@0.19.12(transitive)
+ Added@esbuild/android-arm@0.19.12(transitive)
+ Added@esbuild/android-arm64@0.19.12(transitive)
+ Added@esbuild/android-x64@0.19.12(transitive)
+ Added@esbuild/darwin-arm64@0.19.12(transitive)
+ Added@esbuild/darwin-x64@0.19.12(transitive)
+ Added@esbuild/freebsd-arm64@0.19.12(transitive)
+ Added@esbuild/freebsd-x64@0.19.12(transitive)
+ Added@esbuild/linux-arm@0.19.12(transitive)
+ Added@esbuild/linux-arm64@0.19.12(transitive)
+ Added@esbuild/linux-ia32@0.19.12(transitive)
+ Added@esbuild/linux-loong64@0.19.12(transitive)
+ Added@esbuild/linux-mips64el@0.19.12(transitive)
+ Added@esbuild/linux-ppc64@0.19.12(transitive)
+ Added@esbuild/linux-riscv64@0.19.12(transitive)
+ Added@esbuild/linux-s390x@0.19.12(transitive)
+ Added@esbuild/linux-x64@0.19.12(transitive)
+ Added@esbuild/netbsd-x64@0.19.12(transitive)
+ Added@esbuild/openbsd-x64@0.19.12(transitive)
+ Added@esbuild/sunos-x64@0.19.12(transitive)
+ Added@esbuild/win32-arm64@0.19.12(transitive)
+ Added@esbuild/win32-ia32@0.19.12(transitive)
+ Added@esbuild/win32-x64@0.19.12(transitive)
+ Addedesbuild@0.19.12(transitive)
- Removed@esbuild/android-arm@0.17.19(transitive)
- Removed@esbuild/android-arm64@0.17.19(transitive)
- Removed@esbuild/android-x64@0.17.19(transitive)
- Removed@esbuild/darwin-arm64@0.17.19(transitive)
- Removed@esbuild/darwin-x64@0.17.19(transitive)
- Removed@esbuild/freebsd-arm64@0.17.19(transitive)
- Removed@esbuild/freebsd-x64@0.17.19(transitive)
- Removed@esbuild/linux-arm@0.17.19(transitive)
- Removed@esbuild/linux-arm64@0.17.19(transitive)
- Removed@esbuild/linux-ia32@0.17.19(transitive)
- Removed@esbuild/linux-loong64@0.17.19(transitive)
- Removed@esbuild/linux-mips64el@0.17.19(transitive)
- Removed@esbuild/linux-ppc64@0.17.19(transitive)
- Removed@esbuild/linux-riscv64@0.17.19(transitive)
- Removed@esbuild/linux-s390x@0.17.19(transitive)
- Removed@esbuild/linux-x64@0.17.19(transitive)
- Removed@esbuild/netbsd-x64@0.17.19(transitive)
- Removed@esbuild/openbsd-x64@0.17.19(transitive)
- Removed@esbuild/sunos-x64@0.17.19(transitive)
- Removed@esbuild/win32-arm64@0.17.19(transitive)
- Removed@esbuild/win32-ia32@0.17.19(transitive)
- Removed@esbuild/win32-x64@0.17.19(transitive)
- Removedesbuild@0.17.19(transitive)
Updatedesbuild@^0.19.5