oc-template-solid-compiler 0.2.0 → 0.4.0

package/lib/compile.js

@@ -7,7 +7,6 @@ const solid = require('vite-plugin-solid');
 const { viteView, viteServer } = require('oc-vite-compiler');
 
 const verifyTypeScriptSetup = require('./verifyConfig');
-const higherOrderServerTemplate = require('./higherOrderServerTemplate');
 const solidOCProviderTemplate = require('./solidOCProviderTemplate');
 const htmlTemplate = require('./htmlTemplate');
 
@@ -23,8 +22,7 @@ const compiler = createCompile({
       },
       cb
     ),
-  compileServer: (options, cb) =>
-    viteServer({ ...options, serverWrapper: higherOrderServerTemplate }, cb),
+  compileServer: viteServer,
   compileStatics,
   getInfo
 });

package/lib/htmlTemplate.js

@@ -1,16 +1,19 @@
+const escapeCSS = require('cssesc');
+
 const viewTemplate = ({ templateId, css, bundle, hash }) => `function(model){
+  oc.solidComponents = oc.solidComponents || {};
+  oc.solidComponents['${hash}'] = oc.solidComponents['${hash}'] || (${bundle});
+  if (!model) return;
   var modelHTML =  model.__html ? model.__html : '';
-  var staticPath = model.solidComponent.props._staticPath;
-  var props = JSON.stringify(model.solidComponent.props);
+  var staticPath = model.component.props._staticPath;
+  var props = JSON.stringify(model.component.props);
   window.oc = window.oc || {};
   window.oc.__solidTemplate = window.oc.__solidTemplate || { count: 0 };
-  oc.solidComponents = oc.solidComponents || {};
-  oc.solidComponents['${hash}'] = oc.solidComponents['${hash}'] || (${bundle});
   var count = window.oc.__solidTemplate.count;
   var templateId = "${templateId}-" + count;
   window.oc.__solidTemplate.count++;
   return '<div id="' + templateId + '" class="${templateId}">' + modelHTML + '</div>' +
-    '${css ? '<style>' + css + '</style>' : ''}' +
+    '${css ? '<style>' + escapeCSS(css) + '</style>' : ''}' +
     '<script>' +
     'window.oc = window.oc || {};' +
     'oc.cmd = oc.cmd || [];' +

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oc-template-solid-compiler",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "description": "",
   "main": "index.js",
   "repository": {
@@ -25,13 +25,14 @@
   "types": "./lib/oc-app.d.ts",
   "dependencies": {
     "chalk": "^3.0.0",
+    "cssesc": "^3.0.0",
     "immer": "^9.0.6",
     "oc-generic-template-compiler": "2.1.0",
     "oc-statics-compiler": "2.0.10",
     "oc-template-solid": "0.0.1",
-    "oc-vite-compiler": "^2.0.0",
+    "oc-vite-compiler": "^2.1.0",
     "resolve": "^1.20.0",
-    "solid-js": "^1.7.6",
+    "solid-js": "^1.7.8",
     "vite-plugin-solid": "^2.7.0"
   },
   "files": [

package/scaffold/src/package.json

@@ -35,7 +35,7 @@
     "@types/testing-library__jest-dom": "^5.14.5",
     "jsdom": "^21.1.1",
     "oc-template-solid": "0.0.1",
-    "oc-template-solid-compiler": "0.1.0",
+    "oc-template-solid-compiler": "0.4.0",
     "solid-js": "^1.7.0",
     "typescript": "5.0.2",
     "vitest": "^0.29.7"

package/lib/higherOrderServerTemplate.js

@@ -1,28 +0,0 @@
-const removeExtension = (path) => path.replace(/\.(j|t)sx?$/, '');
-
-const higherOrderServerTemplate = ({ serverPath, componentName, componentVersion }) => `
-import { data as dataProvider } from '${removeExtension(serverPath)}';
-
-export const data = (context : any, callback : (error: any, data?: any) => void) => {
-  dataProvider(context, (error: any, model: any) => {
-    if (error) {
-      return callback(error);
-    }
-    const props = Object.assign({}, model, {
-      _staticPath: context.staticPath,
-      _baseUrl: context.baseUrl,
-      _componentName: "${componentName}",
-      _componentVersion: "${componentVersion}"
-    });
-    const srcPathHasProtocol = context.staticPath.indexOf("http") === 0;
-    const srcPath = srcPathHasProtocol ? context.staticPath : ("https:" + context.staticPath);
-    return callback(null, Object.assign({}, {
-      solidComponent: {
-        props
-      }
-    }));
-  });
-}
-`;
-
-module.exports = higherOrderServerTemplate;