elegance-js 1.11.20 → 1.11.22

package/dist/build.mjs

@@ -535,13 +535,13 @@ var generateClientPageData = async (pageLocation, state, objectAttributes, pageL
 var buildDynamicPage = async (filePath, DIST_DIR, req) => {
   let pageElements;
   let metadata;
+  initializeState();
+  initializeObjectAttributes();
+  resetLoadHooks();
   try {
     const {
       construct
     } = await import("file://" + filePath);
-    initializeState();
-    initializeObjectAttributes();
-    resetLoadHooks();
     const {
       page,
       metadata: pageMetadata,

package/dist/compile_docs.mjs

@@ -538,13 +538,13 @@ var generateClientPageData = async (pageLocation, state, objectAttributes, pageL
 var buildDynamicPage = async (filePath, DIST_DIR, req) => {
   let pageElements;
   let metadata;
+  initializeState();
+  initializeObjectAttributes();
+  resetLoadHooks();
   try {
     const {
       construct
     } = await import("file://" + filePath);
-    initializeState();
-    initializeObjectAttributes();
-    resetLoadHooks();
     const {
       page,
       metadata: pageMetadata,

package/dist/dynamic_page.mjs

@@ -491,13 +491,13 @@ var generateClientPageData = async (pageLocation, state, objectAttributes, pageL
 var buildDynamicPage = async (filePath, DIST_DIR, req) => {
   let pageElements;
   let metadata;
+  initializeState();
+  initializeObjectAttributes();
+  resetLoadHooks();
   try {
     const {
       construct
     } = await import("file://" + filePath);
-    initializeState();
-    initializeObjectAttributes();
-    resetLoadHooks();
     const {
       page,
       metadata: pageMetadata,

package/dist/page_compiler.mjs

@@ -687,37 +687,24 @@ var buildPage = async (DIST_DIR2, directory, filePath, name) => {
     pageElements = page;
     metadata = pageMetadata;
     if (isDynamicPage === true) {
-      await esbuild.build({
+      const result = await esbuild.build({
         entryPoints: [filePath],
-        outfile: filePath,
-        allowOverwrite: true,
-        bundle: true,
-        format: "cjs",
+        bundle: false,
+        format: "iife",
+        globalName: "__exports",
+        write: false,
         platform: "node",
-        plugins: [
-          {
-            name: "wrap-cjs",
-            setup(build2) {
-              build2.onEnd(async () => {
-                const fs2 = await import("fs/promises");
-                const code = await fs2.readFile(build2.initialOptions.outfile, "utf8");
-                const wrapped = `export function construct() {
-    const exports = {};
-    const module = { exports };
-    (function(exports, module) {
-        ${code.split("\n").map((l) => "    " + l).join("\n")}
-    })(exports, module);
-    
-    return module.exports;
-}
-`;
-                await fs2.writeFile(build2.initialOptions.outfile, wrapped);
-              });
-            }
-          },
-          externalPackagesPlugin
-        ]
+        plugins: [externalPackagesPlugin]
       });
+      let iifeCode = result.outputFiles[0].text;
+      iifeCode = iifeCode.replace(/^var __exports = /, "");
+      const wrappedCode = `import { createRequire } from 'module'; const require = createRequire(import.meta.url);
+
+export function construct() {
+  ${iifeCode} 
+return __exports
+}`;
+      fs.writeFileSync(filePath, wrappedCode);
       return false;
     }
     fs.rmSync(filePath, { force: true });
@@ -781,6 +768,9 @@ var externalPackagesPlugin = {
         return result;
       }
       const isNested = result.path.includes("node_modules", nodeModulesIndex + 14);
+      if (args.path.startsWith("elegance-js")) {
+        return result;
+      }
       if (isNested) {
         return { path: args.path, external: true };
       }

package/dist/server/server.mjs

@@ -491,13 +491,13 @@ var generateClientPageData = async (pageLocation, state, objectAttributes, pageL
 var buildDynamicPage = async (filePath, DIST_DIR, req) => {
   let pageElements;
   let metadata;
+  initializeState();
+  initializeObjectAttributes();
+  resetLoadHooks();
   try {
     const {
       construct
     } = await import("file://" + filePath);
-    initializeState();
-    initializeObjectAttributes();
-    resetLoadHooks();
     const {
       page,
       metadata: pageMetadata,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "elegance-js",
-  "version": "1.11.20",
+  "version": "1.11.22",
   "description": "Web-Framework",
   "type": "module",
   "bin": {