@data-fair/dev-server 2.0.23 → 2.1.0

package/config/custom-environment-variables.js

@@ -14,5 +14,14 @@ export default {
       __name: 'APP_PROXY_PATHS',
       __format: 'json'
     },
+  },
+  site: {
+    primaryColor: 'SITE_PRIMARY_COLOR'
+  },
+  theme: {
+    default: 'THEME_DEFAULT'
+  },
+  lang: {
+    default: 'LANG_DEFAULT'
   }
 }

package/config/default.js

@@ -13,5 +13,14 @@ export default {
     url: 'http://localhost:3000',
     proxyPaths: ['/_nuxt/']
   },
+  site: {
+    primaryColor: '#1e88e5'
+  },
+  theme: {
+    default: 'default'
+  },
+  lang: {
+    default: 'fr'
+  },
   serveUi: true
 }

package/config/type/.type/index.d.ts

@@ -17,6 +17,15 @@ export type DevServerConfig = {
     url: string;
     proxyPaths: string[];
   };
+  site?: {
+    primaryColor?: string;
+  };
+  theme?: {
+    default?: string;
+  };
+  lang?: {
+    default?: string;
+  };
   serveUi?: boolean;
 }
 

package/config/type/.type/validate.js

@@ -4,7 +4,7 @@
 "use strict";
 export const validate = validate14;
 export default validate14;
-const schema16 = {"$id":"https://github.com/data-fair/dev-server/config","x-exports":["types","validate"],"x-ajv":{"coerceTypes":"array"},"x-jstt":{"additionalProperties":false},"type":"object","title":"Dev server config","required":["port","dataFair","app"],"properties":{"port":{"type":"number"},"dataFair":{"type":"object","required":["url","owner"],"properties":{"url":{"type":"string"},"owner":{"type":"object","required":["type","id"],"properties":{"type":{"type":"string"},"id":{"type":"string"},"department":{"type":"string"}}},"apiKey":{"type":"string"}}},"app":{"type":"object","required":["url","proxyPaths"],"properties":{"url":{"type":"string"},"proxyPaths":{"type":"array","items":{"type":"string"}}}},"serveUi":{"type":"boolean"}}};
+const schema16 = {"$id":"https://github.com/data-fair/dev-server/config","x-exports":["types","validate"],"x-ajv":{"coerceTypes":"array"},"x-jstt":{"additionalProperties":false},"type":"object","title":"Dev server config","required":["port","dataFair","app"],"properties":{"port":{"type":"number"},"dataFair":{"type":"object","required":["url","owner"],"properties":{"url":{"type":"string"},"owner":{"type":"object","required":["type","id"],"properties":{"type":{"type":"string"},"id":{"type":"string"},"department":{"type":"string"}}},"apiKey":{"type":"string"}}},"app":{"type":"object","required":["url","proxyPaths"],"properties":{"url":{"type":"string"},"proxyPaths":{"type":"array","items":{"type":"string"}}}},"site":{"type":"object","properties":{"primaryColor":{"type":"string"}}},"theme":{"type":"object","properties":{"default":{"type":"string"}}},"lang":{"type":"object","properties":{"default":{"type":"string"}}},"serveUi":{"type":"boolean"}}};
 
 function validate14(data, {instancePath="", parentData, parentDataProperty, rootData=data}={}){
 /*# sourceURL="https://github.com/data-fair/dev-server/config" */;
@@ -487,27 +487,30 @@ vErrors.push(err20);
 errors++;
 }
 }
-if(data.serveUi !== undefined){
-let data12 = data.serveUi;
-if(typeof data12 !== "boolean"){
-let dataType9 = typeof data12;
+if(data.site !== undefined){
+let data12 = data.site;
+if(data12 && typeof data12 == "object" && !Array.isArray(data12)){
+if(data12.primaryColor !== undefined){
+let data13 = data12.primaryColor;
+if(typeof data13 !== "string"){
+let dataType9 = typeof data13;
 let coerced9 = undefined;
-if(dataType9 == 'object' && Array.isArray(data12) && data12.length == 1){
-data12 = data12[0];
-dataType9 = typeof data12;
-if(typeof data12 === "boolean"){
-coerced9 = data12;
+if(dataType9 == 'object' && Array.isArray(data13) && data13.length == 1){
+data13 = data13[0];
+dataType9 = typeof data13;
+if(typeof data13 === "string"){
+coerced9 = data13;
 }
 }
 if(!(coerced9 !== undefined)){
-if(data12 === "false" || data12 === 0 || data12 === null){
-coerced9 = false;
+if(dataType9 == "number" || dataType9 == "boolean"){
+coerced9 = "" + data13;
 }
-else if(data12 === "true" || data12 === 1){
-coerced9 = true;
+else if(data13 === null){
+coerced9 = "";
 }
 else {
-const err21 = {instancePath:instancePath+"/serveUi",schemaPath:"#/properties/serveUi/type",keyword:"type",params:{type: "boolean"},message:"must be boolean"};
+const err21 = {instancePath:instancePath+"/site/primaryColor",schemaPath:"#/properties/site/properties/primaryColor/type",keyword:"type",params:{type: "string"},message:"must be string"};
 if(vErrors === null){
 vErrors = [err21];
 }
@@ -518,16 +521,16 @@ errors++;
 }
 }
 if(coerced9 !== undefined){
-data12 = coerced9;
-if(data !== undefined){
-data["serveUi"] = coerced9;
+data13 = coerced9;
+if(data12 !== undefined){
+data12["primaryColor"] = coerced9;
 }
 }
 }
 }
 }
 else {
-const err22 = {instancePath,schemaPath:"#/type",keyword:"type",params:{type: "object"},message:"must be object"};
+const err22 = {instancePath:instancePath+"/site",schemaPath:"#/properties/site/type",keyword:"type",params:{type: "object"},message:"must be object"};
 if(vErrors === null){
 vErrors = [err22];
 }
@@ -536,6 +539,162 @@ vErrors.push(err22);
 }
 errors++;
 }
+}
+if(data.theme !== undefined){
+let data14 = data.theme;
+if(data14 && typeof data14 == "object" && !Array.isArray(data14)){
+if(data14.default !== undefined){
+let data15 = data14.default;
+if(typeof data15 !== "string"){
+let dataType10 = typeof data15;
+let coerced10 = undefined;
+if(dataType10 == 'object' && Array.isArray(data15) && data15.length == 1){
+data15 = data15[0];
+dataType10 = typeof data15;
+if(typeof data15 === "string"){
+coerced10 = data15;
+}
+}
+if(!(coerced10 !== undefined)){
+if(dataType10 == "number" || dataType10 == "boolean"){
+coerced10 = "" + data15;
+}
+else if(data15 === null){
+coerced10 = "";
+}
+else {
+const err23 = {instancePath:instancePath+"/theme/default",schemaPath:"#/properties/theme/properties/default/type",keyword:"type",params:{type: "string"},message:"must be string"};
+if(vErrors === null){
+vErrors = [err23];
+}
+else {
+vErrors.push(err23);
+}
+errors++;
+}
+}
+if(coerced10 !== undefined){
+data15 = coerced10;
+if(data14 !== undefined){
+data14["default"] = coerced10;
+}
+}
+}
+}
+}
+else {
+const err24 = {instancePath:instancePath+"/theme",schemaPath:"#/properties/theme/type",keyword:"type",params:{type: "object"},message:"must be object"};
+if(vErrors === null){
+vErrors = [err24];
+}
+else {
+vErrors.push(err24);
+}
+errors++;
+}
+}
+if(data.lang !== undefined){
+let data16 = data.lang;
+if(data16 && typeof data16 == "object" && !Array.isArray(data16)){
+if(data16.default !== undefined){
+let data17 = data16.default;
+if(typeof data17 !== "string"){
+let dataType11 = typeof data17;
+let coerced11 = undefined;
+if(dataType11 == 'object' && Array.isArray(data17) && data17.length == 1){
+data17 = data17[0];
+dataType11 = typeof data17;
+if(typeof data17 === "string"){
+coerced11 = data17;
+}
+}
+if(!(coerced11 !== undefined)){
+if(dataType11 == "number" || dataType11 == "boolean"){
+coerced11 = "" + data17;
+}
+else if(data17 === null){
+coerced11 = "";
+}
+else {
+const err25 = {instancePath:instancePath+"/lang/default",schemaPath:"#/properties/lang/properties/default/type",keyword:"type",params:{type: "string"},message:"must be string"};
+if(vErrors === null){
+vErrors = [err25];
+}
+else {
+vErrors.push(err25);
+}
+errors++;
+}
+}
+if(coerced11 !== undefined){
+data17 = coerced11;
+if(data16 !== undefined){
+data16["default"] = coerced11;
+}
+}
+}
+}
+}
+else {
+const err26 = {instancePath:instancePath+"/lang",schemaPath:"#/properties/lang/type",keyword:"type",params:{type: "object"},message:"must be object"};
+if(vErrors === null){
+vErrors = [err26];
+}
+else {
+vErrors.push(err26);
+}
+errors++;
+}
+}
+if(data.serveUi !== undefined){
+let data18 = data.serveUi;
+if(typeof data18 !== "boolean"){
+let dataType12 = typeof data18;
+let coerced12 = undefined;
+if(dataType12 == 'object' && Array.isArray(data18) && data18.length == 1){
+data18 = data18[0];
+dataType12 = typeof data18;
+if(typeof data18 === "boolean"){
+coerced12 = data18;
+}
+}
+if(!(coerced12 !== undefined)){
+if(data18 === "false" || data18 === 0 || data18 === null){
+coerced12 = false;
+}
+else if(data18 === "true" || data18 === 1){
+coerced12 = true;
+}
+else {
+const err27 = {instancePath:instancePath+"/serveUi",schemaPath:"#/properties/serveUi/type",keyword:"type",params:{type: "boolean"},message:"must be boolean"};
+if(vErrors === null){
+vErrors = [err27];
+}
+else {
+vErrors.push(err27);
+}
+errors++;
+}
+}
+if(coerced12 !== undefined){
+data18 = coerced12;
+if(data !== undefined){
+data["serveUi"] = coerced12;
+}
+}
+}
+}
+}
+else {
+const err28 = {instancePath,schemaPath:"#/type",keyword:"type",params:{type: "object"},message:"must be object"};
+if(vErrors === null){
+vErrors = [err28];
+}
+else {
+vErrors.push(err28);
+}
+errors++;
+}
 validate14.errors = vErrors;
 return errors === 0;
 }

package/config/type/schema.js

@@ -63,6 +63,30 @@ export default {
         }
       }
     },
+    site: {
+      type: 'object',
+      properties: {
+        primaryColor: {
+          type: 'string'
+        }
+      }
+    },
+    theme: {
+      type: 'object',
+      properties: {
+        default: {
+          type: 'string'
+        }
+      }
+    },
+    lang: {
+      type: 'object',
+      properties: {
+        default: {
+          type: 'string'
+        }
+      }
+    },
     serveUi: {
       type: 'boolean'
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-fair/dev-server",
-  "version": "2.0.23",
+  "version": "2.1.0",
   "description": "A development server for optimal development experience of data-fair applications.",
   "main": "src/index.js",
   "bin": {
@@ -13,6 +13,7 @@
     "dev": "NODE_ENV=development node --watch src/index.js",
     "dev-test-app-minimal": "http-server test-apps/minimal --port=3000 --cors --silent",
     "dev-test-app-vue3": "cd test-apps/vue3 && npm run dev",
+    "dev-test-app-modern": "cd test-apps/modern && npm run dev",
     "dev-zellij": "zellij --layout .zellij.kdl",
     "prepublishOnly": "npm run lint && npm run build && npm -w ui run build",
     "lint": "eslint . && npm -w ui run lint",

package/src/app.js

@@ -183,12 +183,13 @@ app.use('/app', createProxyMiddleware({
                                     meta[name] = content;
                             }
                         }
-                        if (meta['df:sync-state'] === 'true' || meta['df:overflow'] === 'true') {
-                            bodyNode.childNodes.push(createElement('script', {
-                                type: 'text/javascript',
-                                src: 'https://cdn.jsdelivr.net/npm/@data-fair/frame@0.12/dist/v-iframe-compat/d-frame-content.min.js'
-                            }));
-                        }
+                        // companion script that lets the embedded app report its height / sync params
+                        // to the parent <d-frame> ; injected for every mode so the UI mode toggle works
+                        // without requiring a df:overflow meta (same variant & version as data-fair prod)
+                        bodyNode.childNodes.push(createElement('script', {
+                            type: 'text/javascript',
+                            src: 'https://cdn.jsdelivr.net/npm/@data-fair/frame@0.18/dist/v-iframe-compat/d-frame-content.min.js'
+                        }));
                         output = parse5.serialize(document);
                         // proxyRes.headers['content-length'] = output.length
                         delete proxyRes.headers['content-length'];

package/src/ui-config.d.ts

@@ -8,6 +8,15 @@ export declare const uiConfig: {
         };
         apiKey?: string;
     };
+    site: {
+        primaryColor?: string;
+    } | undefined;
+    theme: {
+        default?: string;
+    } | undefined;
+    lang: {
+        default?: string;
+    } | undefined;
 };
 export type UiConfig = typeof uiConfig;
 export default uiConfig;

package/src/ui-config.js

@@ -1,3 +1,8 @@
 import config from './config.js';
-export const uiConfig = { dataFair: config.dataFair };
+export const uiConfig = {
+    dataFair: config.dataFair,
+    site: config.site,
+    theme: config.theme,
+    lang: config.lang
+};
 export default uiConfig;