@dtwo/schema 3.1.0 → 3.1.2

package/LICENSE

@@ -1,4 +1,4 @@
-MIT License
+The MIT License (MIT)
 
 Copyright (c) 2022 - Dtwo Team
 

package/dist/index.d.ts

@@ -611,8 +611,9 @@ interface ModuleDefinition<T extends ModuleOptions = ModuleOptions> {
     setup?: (this: void, resolvedOptions: T, dtwo: Dtwo) => void | Promise<void>;
 }
 /** Dtwo modules are always a simple function. */
+type Awaitable<T> = T | Promise<T>;
 interface DtwoModule<T extends ModuleOptions = ModuleOptions> {
-    (this: void, inlineOptions: T, dtwo: Dtwo): void | Promise<void>;
+    (this: void, inlineOptions: T, dtwo: Dtwo): Awaitable<void | false>;
     getOptions?: (inlineOptions?: T, dtwo?: Dtwo) => Promise<T>;
     getMeta?: () => Promise<ModuleMeta>;
 }

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { defineUntypedSchema } from 'untyped';
-import defu from 'defu';
+import { defu } from 'defu';
 import { join, resolve } from 'pathe';
 import { isDevelopment, isDebug } from 'std-env';
 import { findWorkspaceDir } from 'pkg-types';
@@ -757,14 +757,17 @@ const common = defineUntypedSchema({
    * @type {typeof import('../src/types/config').RuntimeConfig}
    */
   runtimeConfig: {
-    $resolve: async (val, get) => defu(val, {
-      public: {},
-      app: {
-        baseURL: (await get("app")).baseURL,
-        buildAssetsDir: (await get("app")).buildAssetsDir,
-        cdnURL: (await get("app")).cdnURL
-      }
-    })
+    $resolve: async (val, get) => {
+      provideFallbackValues(val);
+      return defu(val, {
+        public: {},
+        app: {
+          baseURL: (await get("app")).baseURL,
+          buildAssetsDir: (await get("app")).buildAssetsDir,
+          cdnURL: (await get("app")).cdnURL
+        }
+      });
+    }
   },
   /**
    * Additional app configuration
@@ -777,6 +780,15 @@ const common = defineUntypedSchema({
   appConfig: {},
   $schema: {}
 });
+function provideFallbackValues(obj) {
+  for (const key in obj) {
+    if (typeof obj[key] === "undefined" || obj[key] === null) {
+      obj[key] = "";
+    } else if (typeof obj[key] === "object") {
+      provideFallbackValues(obj[key]);
+    }
+  }
+}
 
 const dev = defineUntypedSchema({
   devServer: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dtwo/schema",
-  "version": "3.1.0",
+  "version": "3.1.2",
   "repository": "d2js/dtwo",
   "license": "MIT",
   "type": "module",
@@ -13,25 +13,25 @@
   "devDependencies": {
     "@types/lodash.template": "4.5.1",
     "@types/semver": "7.3.13",
-    "@kdhead/schema": "1.0.19",
+    "@kdhead/schema": "1.0.20",
     "@witejs/plugin-kdu": "4.0.0",
-    "holepack": "2.0.0",
+    "holepack": "2.1.1",
     "kdu-router": "4.1.6",
     "unbuild": "1.1.1",
-    "wite": "4.0.0"
+    "wite": "4.2.0"
   },
   "dependencies": {
     "c12": "1.1.0",
     "create-require": "1.1.1",
-    "defu": "6.1.1",
+    "defu": "6.1.2",
     "hookable": "5.4.2",
     "jiti": "1.16.2",
-    "kdimport": "2.0.1",
-    "pathe": "1.0.0",
+    "kdimport": "2.1.0",
+    "pathe": "1.1.0",
     "pkg-types": "1.0.1",
     "postcss-import-resolver": "2.0.0",
     "scule": "1.0.0",
-    "std-env": "3.3.1",
+    "std-env": "3.3.2",
     "ufo": "1.0.1",
     "untyped": "1.2.2"
   },