merge master

opencomponents · Sep 7, 2023 · 687f9e8 · 687f9e8
2 parents 90298cd + 4d25745
commit 687f9e8
Show file tree

Hide file tree

Showing 21 changed files with 1,794 additions and 1,640 deletions.
diff --git a/packages/oc-template-es6-compiler/lib/compile.js b/packages/oc-template-es6-compiler/lib/compile.js
@@ -1,11 +1,25 @@
 'use strict';
 
-const compileServer = require('oc-server-compiler');
 const compileStatics = require('oc-statics-compiler');
 const createCompile = require('oc-generic-template-compiler').createCompile;
 const getInfo = require('oc-template-es6').getInfo;
+const { viteView, viteServer } = require('oc-vite-compiler');
+const htmlTemplate = require('./viewTemplate');
+
+const compiler = createCompile({
+  compileView: (options, cb) =>
+    viteView(
+      {
+        ...options,
+        htmlTemplate,
+      },
+      cb
+    ),
+  compileServer: viteServer,
+  compileStatics,
+  getInfo
+});
 
-const compileView = require('./compileView');
 
 // OPTIONS
 // =======
@@ -17,9 +31,4 @@ const compileView = require('./compileView');
 // publishPath
 // verbose,
 // watch,
-module.exports = createCompile({
-  compileServer,
-  compileStatics,
-  compileView,
-  getInfo
-});
+module.exports = compiler;
diff --git a/packages/oc-template-es6-compiler/lib/compileView.js b/packages/oc-template-es6-compiler/lib/compileView.js
diff --git a/packages/oc-template-es6-compiler/lib/to-abstract-base-template-utils/oc-webpack/index.js b/packages/oc-template-es6-compiler/lib/to-abstract-base-template-utils/oc-webpack/index.js
diff --git a/...emplate-es6-compiler/lib/to-abstract-base-template-utils/oc-webpack/lib/compiler/index.js b/...emplate-es6-compiler/lib/to-abstract-base-template-utils/oc-webpack/lib/compiler/index.js
diff --git a/...ler/lib/to-abstract-base-template-utils/oc-webpack/lib/configurator/createExcludeRegex.js b/...ler/lib/to-abstract-base-template-utils/oc-webpack/lib/configurator/createExcludeRegex.js
diff --git a/...ate-es6-compiler/lib/to-abstract-base-template-utils/oc-webpack/lib/configurator/index.js b/...ate-es6-compiler/lib/to-abstract-base-template-utils/oc-webpack/lib/configurator/index.js
diff --git a/packages/oc-template-es6-compiler/lib/viewTemplate.js b/packages/oc-template-es6-compiler/lib/viewTemplate.js
@@ -1,7 +1,7 @@
 const viewTemplate = ({ css, bundle }) => `function(model){
-  ${bundle};
+  const fn = ${bundle};
   return '' + 
-    module.default(model) +
+    fn(model) +
     '${
       css
         ? '<style>' +