xpine 0.0.43 → 0.0.44

package/dist/index.js

@@ -269,7 +269,7 @@ function getXpineOnLoadFunction(pathName, source, onLoadFileResult) {
       value.imports = importText + "\n" + value.imports;
     }
     if ([ts.SyntaxKind.FirstStatement, ts.SyntaxKind.FunctionDeclaration].includes(child.kind)) {
-      let text = child.getText(source);
+      const text = child.getText(source);
       if (text.includes("xpineOnLoad")) {
         const body = child?.body?.getText(source) || "";
         value.fn = value.fn + "\n" + body ? `(function() ${body})();` : "";
@@ -386,7 +386,7 @@ function transformTSXFiles(componentData, pageConfigFiles) {
 import fs3 from "fs-extra";
 import path4 from "path";
 import builtinModules from "builtin-modules";
-function addDotJS(allPackages2, extensions2, isDev) {
+function addDotJS(allPackages2, extensions2, isDev2) {
   const allPackagesIncludingNode = allPackages2.concat(builtinModules);
   return {
     name: "add-dot-js",
@@ -404,7 +404,7 @@ function addDotJS(allPackages2, extensions2, isDev) {
           }
           let outputPath = args.path + (existsAsFile ? "" : "/index") + ".js";
           outputPath = args.path.endsWith(".js") || args.path.endsWith(".mjs") ? args.path : outputPath;
-          return { path: outputPath + (isDev ? `?cache=${Date.now()}` : ""), external: true };
+          return { path: outputPath + (isDev2 ? `?cache=${Date.now()}` : ""), external: true };
         }
       });
     }
@@ -485,6 +485,8 @@ import requestIP from "request-ip";
 import fs5 from "fs-extra";
 import path5 from "path";
 import EventEmitter from "events";
+var methods = ["get", "post", "put", "patch", "delete"];
+var isDev = process.env.NODE_ENV === "development";
 var OnInitEmitter = class extends EventEmitter {
 };
 var onInitEmitter = new OnInitEmitter();
@@ -507,94 +509,107 @@ function getAllBuiltRoutes() {
     };
   }).filter(Boolean);
 }
-async function createRouter() {
-  const isDev = process.env.NODE_ENV === "development";
-  const methods = ["get", "post", "put", "patch", "delete"];
-  const router = express.Router();
-  const routeMap = getAllBuiltRoutes();
-  const routeResults = [];
-  const configFiles = globSync(config.pagesDir + "/**/+config.{tsx,ts}");
-  await triggerXPineOnLoad();
-  for (const route of routeMap) {
-    const isJSX = route.originalRoute.endsWith(".tsx") || route.originalRoute.endsWith(".jsx");
-    const slugRoute = route.route.replace(/[ ]/g, "");
-    const foundMethod = methods.find((method) => slugRoute.endsWith(`.${method}`));
-    const isDynamicRoute = slugRoute.match(regex_default.isDynamicRoute);
-    let formattedRouteItem = slugRoute;
-    if (foundMethod) formattedRouteItem = formattedRouteItem.split(".").shift();
-    if (isDynamicRoute) {
-      const result = [...formattedRouteItem.matchAll(regex_default.dynamicRoutes)];
-      for (const match of result) {
-        formattedRouteItem = formattedRouteItem.replace(match[0], ":" + match[2]);
-      }
+async function createRouteFunction(route, configFiles) {
+  const isJSX = route.originalRoute.endsWith(".tsx") || route.originalRoute.endsWith(".jsx");
+  const slugRoute = route.route.replace(/[ ]/g, "");
+  const foundMethod = methods.find((method) => slugRoute.endsWith(`.${method}`));
+  const isDynamicRoute = slugRoute.match(regex_default.isDynamicRoute);
+  let formattedRouteItem = slugRoute;
+  if (foundMethod) formattedRouteItem = formattedRouteItem.split(".").shift();
+  if (isDynamicRoute) {
+    const result = [...formattedRouteItem.matchAll(regex_default.dynamicRoutes)];
+    for (const match of result) {
+      formattedRouteItem = formattedRouteItem.replace(match[0], ":" + match[2]);
     }
-    const hasCatchAll = formattedRouteItem.match(regex_default.catchAllRoute);
-    if (hasCatchAll) formattedRouteItem = formattedRouteItem.replace(regex_default.catchAllRoute, "/*");
-    const componentImport = await import(route.path);
-    const componentFn = isDev ? null : componentImport?.default;
-    if (componentImport?.config?.onInit) {
-      await componentImport.config?.onInit();
+  }
+  const hasCatchAll = formattedRouteItem.match(regex_default.catchAllRoute);
+  if (hasCatchAll) formattedRouteItem = formattedRouteItem.replace(regex_default.catchAllRoute, "/*");
+  const componentImport = await import(route.path);
+  const componentFn = isDev ? null : componentImport?.default;
+  if (componentImport?.config?.onInit) {
+    await componentImport.config?.onInit();
+  }
+  let config2 = {};
+  const configFilePaths = getConfigFiles(route.originalRoute, configFiles);
+  if (!isDev) {
+    config2 = configFilePaths && await getCompleteConfig(configFilePaths, Date.now());
+    if (componentImport?.config) {
+      config2 = {
+        ...config2,
+        ...componentImport.config
+      };
     }
-    let config2 = {};
-    const configFilePaths = getConfigFiles(route.originalRoute, configFiles);
-    if (!isDev) {
-      config2 = configFilePaths && await getCompleteConfig(configFilePaths, Date.now());
-      if (componentImport?.config) {
-        config2 = {
-          ...config2,
-          ...componentImport.config
-        };
+  }
+  async function routeFn(req, res) {
+    const urlPath = req?.route?.path || "/";
+    try {
+      const staticPath = routeHasStaticPath(formattedRouteItem, req.params);
+      if (staticPath && !isDev) {
+        res.sendFile(staticPath);
+        return;
       }
-    }
-    routeResults.push({
-      formattedRouteItem,
-      foundMethod,
-      route
-    });
-    router[foundMethod || "get"](formattedRouteItem, async (req, res) => {
-      const urlPath = req?.route?.path || "/";
-      try {
-        const staticPath = routeHasStaticPath(formattedRouteItem, req.params);
-        if (staticPath && !isDev) {
-          res.sendFile(staticPath);
-          return;
-        }
-        if (componentFn && !isDev) {
-          if (isJSX) {
-            const data = config2?.data ? await config2.data(req) : null;
-            const originalResult = await componentFn({ req, res, data, routePath: urlPath });
-            const output = config2?.wrapper ? await config2.wrapper({ req, children: originalResult, config: config2, data, routePath: urlPath }) : originalResult;
-            res.send(doctypeHTML + output);
-          } else {
-            await componentFn(req, res);
-          }
-          return;
-        }
-        await triggerXPineOnLoad(true);
-        const componentImportDev = await import(route.path + `?cache=${Date.now()}`);
-        const componentFnDev = componentImportDev.default;
-        onInitEmitter.emit("triggerOnInit", getAllBuiltRoutes());
+      if (componentFn && !isDev) {
         if (isJSX) {
-          let config3 = configFilePaths && await getCompleteConfig(configFilePaths, Date.now());
-          if (componentImportDev?.config) {
-            config3 = {
-              ...config3,
-              ...componentImportDev.config
-            };
-          }
-          const data = config3?.data ? await config3.data(req) : null;
-          const originalResult = await componentFnDev({ req, res, data, config: config3, routePath: urlPath });
-          const output = config3?.wrapper ? await config3.wrapper({ req, children: originalResult, config: config3, data, routePath: urlPath }) : originalResult;
-          context.clear();
+          const data = config2?.data ? await config2.data(req) : null;
+          const originalResult = await componentFn({ req, res, data, routePath: urlPath });
+          const output = config2?.wrapper ? await config2.wrapper({ req, children: originalResult, config: config2, data, routePath: urlPath }) : originalResult;
           res.send(doctypeHTML + output);
         } else {
-          await componentFnDev(req, res);
+          await componentFn(req, res);
         }
-      } catch (err) {
-        console.error(err);
-        res.status(err?.status || 500).send(err?.message || "Error");
+        return;
       }
-    });
+      await triggerXPineOnLoad(true);
+      const componentImportDev = await import(route.path + `?cache=${Date.now()}`);
+      const componentFnDev = componentImportDev.default;
+      onInitEmitter.emit("triggerOnInit", getAllBuiltRoutes());
+      if (isJSX) {
+        let config3 = configFilePaths && await getCompleteConfig(configFilePaths, Date.now());
+        if (componentImportDev?.config) {
+          config3 = {
+            ...config3,
+            ...componentImportDev.config
+          };
+        }
+        const data = config3?.data ? await config3.data(req) : null;
+        const originalResult = await componentFnDev({ req, res, data, config: config3, routePath: urlPath });
+        const output = config3?.wrapper ? await config3.wrapper({ req, children: originalResult, config: config3, data, routePath: urlPath }) : originalResult;
+        context.clear();
+        res.send(doctypeHTML + output);
+      } else {
+        await componentFnDev(req, res);
+      }
+    } catch (err) {
+      console.error(err);
+      res.status(err?.status || 500).send(err?.message || "Error");
+    }
+  }
+  return {
+    formattedRouteItem,
+    foundMethod,
+    route,
+    routeFn
+  };
+}
+async function createRouter() {
+  const router = express.Router();
+  const routeMap = getAllBuiltRoutes();
+  const routeResults = [];
+  const configFiles = globSync(config.pagesDir + "/**/+config.{tsx,ts}");
+  await triggerXPineOnLoad();
+  for (const route of routeMap) {
+    try {
+      const { formattedRouteItem, foundMethod, routeFn } = await createRouteFunction(route, configFiles);
+      router[foundMethod || "get"](formattedRouteItem, routeFn);
+      routeResults.push({
+        formattedRouteItem,
+        foundMethod,
+        route,
+        routeFn
+      });
+    } catch (err) {
+      console.error(err);
+    }
   }
   return {
     router,
@@ -623,15 +638,11 @@ async function createXPineRouter(app, beforeErrorRoute) {
     router(req, res, next);
   });
   const found404 = routeResults?.find((item) => item?.formattedRouteItem === "/404");
-  const import404 = process.env.NODE_ENV === "development" || !found404 ? null : (await import(found404.route.path)).default;
   if (beforeErrorRoute) beforeErrorRoute(app);
   app.use(async function(req, res) {
     res.status(404);
-    if (import404) {
-      res.send(doctypeHTML + await import404(req, res));
-    } else if (found404 && process.env.NODE_ENV === "development") {
-      const import404Item = (await import(found404.route.path + `?cache=${Date.now()}`)).default;
-      res.send(doctypeHTML + await import404Item(req, res));
+    if (found404?.routeFn) {
+      found404?.routeFn(req, res);
     } else {
       res.send("Error");
     }
@@ -700,19 +711,19 @@ var plugin2 = (opts = {}) => {
     },
     OnceExit(root) {
       root.append([
-        `:root {`,
-        `--active-breakpoint: "default";`,
-        `}`
+        ":root {",
+        '--active-breakpoint: "default";',
+        "}"
       ].join(""));
       const nodeValuesMapped = nodeValues.sort((a, b) => {
         return Number(a.value.replace(/[^0-9]/g, "")) - Number(b.value.replace(/[^0-9]/g, ""));
       }).map(({ breakpoint, value }) => {
         return [
           `@media (min-width: ${value}) {`,
-          `:root {`,
+          ":root {",
           `--active-breakpoint: "${breakpoint}";`,
-          `}`,
-          `}`
+          "}",
+          "}"
         ].join("");
       });
       for (const value of nodeValuesMapped) {
@@ -748,28 +759,28 @@ var packageJson = JSON.parse(fs7.readFileSync(config.packageJsonPath, "utf-8"));
 var allPackages = Object.keys(packageJson.devDependencies).concat(Object.keys(packageJson.dependencies));
 var xpineDistDir = getXPineDistDir();
 async function buildApp(args) {
-  const isDev = args?.isDev || false;
+  const isDev2 = args?.isDev || false;
   const removePreviousBuild = args?.removePreviousBuild || false;
   const disableTailwind = args?.disableTailwind || false;
   try {
     if (removePreviousBuild) fs7.removeSync(config.distDir);
     const srcDirFiles = globSync3(config.srcDir + "/**/*.{js,ts,tsx,jsx}");
-    const { componentData, dataFiles } = await buildAppFiles(srcDirFiles, isDev);
+    const { componentData, dataFiles } = await buildAppFiles(srcDirFiles, isDev2);
     const alpineDataFile = await buildAlpineDataFile(componentData, dataFiles);
-    await buildClientSideFiles([alpineDataFile], isDev);
+    await buildClientSideFiles([alpineDataFile], isDev2);
     fs7.removeSync(config.distTempFolder);
     await buildCSS(disableTailwind);
     await buildPublicFolderSymlinks();
-    await buildOnLoadFile(componentData, isDev);
-    if (!isDev) await triggerXPineOnLoad();
-    if (!isDev) await buildFilesWithConfigs(componentData);
-    if (!isDev) context.clear();
+    await buildOnLoadFile(componentData, isDev2);
+    if (!isDev2) await triggerXPineOnLoad();
+    if (!isDev2) await buildFilesWithConfigs(componentData);
+    if (!isDev2) context.clear();
   } catch (err) {
     console.error("Build failed");
     console.error(err);
   }
 }
-async function buildAppFiles(files, isDev) {
+async function buildAppFiles(files, isDev2) {
   const componentData = [];
   const dataFiles = [];
   const pageConfigFiles = files.filter((file) => {
@@ -784,12 +795,12 @@ async function buildAppFiles(files, isDev) {
     platform: "node",
     outdir: config.distDir,
     bundle: true,
-    sourcemap: isDev ? "inline" : false,
+    sourcemap: isDev2 ? "inline" : false,
     external: allPackages,
     jsx: "transform",
-    minify: !isDev,
+    minify: !isDev2,
     plugins: [
-      addDotJS(allPackages, extensions, isDev),
+      addDotJS(allPackages, extensions, isDev2),
       transformTSXFiles(componentData, pageConfigFiles),
       getDataFiles(dataFiles)
     ]
@@ -800,7 +811,7 @@ async function buildAppFiles(files, isDev) {
     dataFiles
   };
 }
-async function buildClientSideFiles(alpineDataFiles = [], isDev) {
+async function buildClientSideFiles(alpineDataFiles = [], isDev2) {
   const tempFilePath = path6.join(config.distTempFolder, "./app.ts");
   fs7.ensureFileSync(tempFilePath);
   const pagesScriptsGlob = config.publicDir + "/scripts/pages/**/*.{js,ts}";
@@ -811,22 +822,22 @@ async function buildClientSideFiles(alpineDataFiles = [], isDev) {
     }
   );
   convertEntryPointsToSingleFile(alpineDataFiles.concat(clientFiles), tempFilePath);
-  if (isDev) writeDevServerClientSideCode(tempFilePath);
+  if (isDev2) writeDevServerClientSideCode(tempFilePath);
   writeSpaClientSideCode(tempFilePath);
   await build({
     entryPoints: [tempFilePath],
     bundle: true,
     outdir: config.distPublicScriptsDir,
-    minify: !isDev,
-    sourcemap: isDev ? "inline" : false
+    minify: !isDev2,
+    sourcemap: isDev2 ? "inline" : false
   });
   const pagesFiles = globSync3(pagesScriptsGlob);
   await build({
     entryPoints: pagesFiles || [],
     bundle: true,
     outdir: config.distPublicScriptsDir + "/pages",
-    minify: !isDev,
-    sourcemap: isDev ? "inline" : false
+    minify: !isDev2,
+    sourcemap: isDev2 ? "inline" : false
   });
   await logSize(config.distPublicDir, "client");
 }
@@ -1001,7 +1012,7 @@ function getComponentDynamicPaths(componentPath) {
   }
   return output;
 }
-async function buildOnLoadFile(componentData, isDev) {
+async function buildOnLoadFile(componentData, isDev2) {
   const onLoadFiles = [];
   const onLoadFileResult = {
     imports: "",
@@ -1039,12 +1050,12 @@ async function buildOnLoadFile(componentData, isDev) {
     platform: "node",
     outdir: config.distDir,
     bundle: true,
-    sourcemap: isDev ? "inline" : false,
+    sourcemap: isDev2 ? "inline" : false,
     external: allPackages,
     jsx: "transform",
-    minify: !isDev,
+    minify: !isDev2,
     plugins: [
-      addDotJS(allPackages, extensions, isDev)
+      addDotJS(allPackages, extensions, isDev2)
     ]
   });
 }

package/dist/src/express.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"express.d.ts","sourceRoot":"","sources":["../../src/express.ts"],"names":[],"mappings":"AAAA,OAAgB,EAAgB,OAAO,EAAqB,MAAM,SAAS,CAAC;AAyC5E,wBAAsB,YAAY;;;GAmHjC;AAiBD,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,gBAAgB,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,iBA6B1F;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GAAG,MAAM,GAAG,KAAK,CAanG;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAE,OAAc,UAQzE"}
+{"version":3,"file":"express.d.ts","sourceRoot":"","sources":["../../src/express.ts"],"names":[],"mappings":"AAAA,OAAgB,EAAgB,OAAO,EAAqB,MAAM,SAAS,CAAC;AAuJ5E,wBAAsB,YAAY;;;GA8BjC;AAiBD,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,gBAAgB,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,iBAyB1F;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GAAG,MAAM,GAAG,KAAK,CAanG;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAE,OAAc,UAQzE"}

package/dist/src/scripts/xpine-build.js

@@ -264,7 +264,7 @@ function getXpineOnLoadFunction(pathName, source, onLoadFileResult) {
       value.imports = importText + "\n" + value.imports;
     }
     if ([ts.SyntaxKind.FirstStatement, ts.SyntaxKind.FunctionDeclaration].includes(child.kind)) {
-      let text = child.getText(source);
+      const text = child.getText(source);
       if (text.includes("xpineOnLoad")) {
         const body = child?.body?.getText(source) || "";
         value.fn = value.fn + "\n" + body ? `(function() ${body})();` : "";
@@ -381,7 +381,7 @@ function transformTSXFiles(componentData, pageConfigFiles) {
 import fs3 from "fs-extra";
 import path4 from "path";
 import builtinModules from "builtin-modules";
-function addDotJS(allPackages2, extensions2, isDev2) {
+function addDotJS(allPackages2, extensions2, isDev3) {
   const allPackagesIncludingNode = allPackages2.concat(builtinModules);
   return {
     name: "add-dot-js",
@@ -399,7 +399,7 @@ function addDotJS(allPackages2, extensions2, isDev2) {
           }
           let outputPath = args.path + (existsAsFile ? "" : "/index") + ".js";
           outputPath = args.path.endsWith(".js") || args.path.endsWith(".mjs") ? args.path : outputPath;
-          return { path: outputPath + (isDev2 ? `?cache=${Date.now()}` : ""), external: true };
+          return { path: outputPath + (isDev3 ? `?cache=${Date.now()}` : ""), external: true };
         }
       });
     }
@@ -446,6 +446,7 @@ var { verify, sign } = jsonwebtoken;
 import requestIP from "request-ip";
 import fs5 from "fs-extra";
 import EventEmitter from "events";
+var isDev = process.env.NODE_ENV === "development";
 var OnInitEmitter = class extends EventEmitter {
 };
 var onInitEmitter = new OnInitEmitter();
@@ -506,19 +507,19 @@ var plugin2 = (opts = {}) => {
     },
     OnceExit(root) {
       root.append([
-        `:root {`,
-        `--active-breakpoint: "default";`,
-        `}`
+        ":root {",
+        '--active-breakpoint: "default";',
+        "}"
       ].join(""));
       const nodeValuesMapped = nodeValues.sort((a, b) => {
         return Number(a.value.replace(/[^0-9]/g, "")) - Number(b.value.replace(/[^0-9]/g, ""));
       }).map(({ breakpoint, value }) => {
         return [
           `@media (min-width: ${value}) {`,
-          `:root {`,
+          ":root {",
           `--active-breakpoint: "${breakpoint}";`,
-          `}`,
-          `}`
+          "}",
+          "}"
         ].join("");
       });
       for (const value of nodeValuesMapped) {
@@ -554,28 +555,28 @@ var packageJson = JSON.parse(fs7.readFileSync(config.packageJsonPath, "utf-8"));
 var allPackages = Object.keys(packageJson.devDependencies).concat(Object.keys(packageJson.dependencies));
 var xpineDistDir = getXPineDistDir();
 async function buildApp(args) {
-  const isDev2 = args?.isDev || false;
+  const isDev3 = args?.isDev || false;
   const removePreviousBuild2 = args?.removePreviousBuild || false;
   const disableTailwind2 = args?.disableTailwind || false;
   try {
     if (removePreviousBuild2) fs7.removeSync(config.distDir);
     const srcDirFiles = globSync3(config.srcDir + "/**/*.{js,ts,tsx,jsx}");
-    const { componentData, dataFiles } = await buildAppFiles(srcDirFiles, isDev2);
+    const { componentData, dataFiles } = await buildAppFiles(srcDirFiles, isDev3);
     const alpineDataFile = await buildAlpineDataFile(componentData, dataFiles);
-    await buildClientSideFiles([alpineDataFile], isDev2);
+    await buildClientSideFiles([alpineDataFile], isDev3);
     fs7.removeSync(config.distTempFolder);
     await buildCSS(disableTailwind2);
     await buildPublicFolderSymlinks();
-    await buildOnLoadFile(componentData, isDev2);
-    if (!isDev2) await triggerXPineOnLoad();
-    if (!isDev2) await buildFilesWithConfigs(componentData);
-    if (!isDev2) context.clear();
+    await buildOnLoadFile(componentData, isDev3);
+    if (!isDev3) await triggerXPineOnLoad();
+    if (!isDev3) await buildFilesWithConfigs(componentData);
+    if (!isDev3) context.clear();
   } catch (err) {
     console.error("Build failed");
     console.error(err);
   }
 }
-async function buildAppFiles(files, isDev2) {
+async function buildAppFiles(files, isDev3) {
   const componentData = [];
   const dataFiles = [];
   const pageConfigFiles = files.filter((file) => {
@@ -590,12 +591,12 @@ async function buildAppFiles(files, isDev2) {
     platform: "node",
     outdir: config.distDir,
     bundle: true,
-    sourcemap: isDev2 ? "inline" : false,
+    sourcemap: isDev3 ? "inline" : false,
     external: allPackages,
     jsx: "transform",
-    minify: !isDev2,
+    minify: !isDev3,
     plugins: [
-      addDotJS(allPackages, extensions, isDev2),
+      addDotJS(allPackages, extensions, isDev3),
       transformTSXFiles(componentData, pageConfigFiles),
       getDataFiles(dataFiles)
     ]
@@ -606,7 +607,7 @@ async function buildAppFiles(files, isDev2) {
     dataFiles
   };
 }
-async function buildClientSideFiles(alpineDataFiles = [], isDev2) {
+async function buildClientSideFiles(alpineDataFiles = [], isDev3) {
   const tempFilePath = path5.join(config.distTempFolder, "./app.ts");
   fs7.ensureFileSync(tempFilePath);
   const pagesScriptsGlob = config.publicDir + "/scripts/pages/**/*.{js,ts}";
@@ -617,22 +618,22 @@ async function buildClientSideFiles(alpineDataFiles = [], isDev2) {
     }
   );
   convertEntryPointsToSingleFile(alpineDataFiles.concat(clientFiles), tempFilePath);
-  if (isDev2) writeDevServerClientSideCode(tempFilePath);
+  if (isDev3) writeDevServerClientSideCode(tempFilePath);
   writeSpaClientSideCode(tempFilePath);
   await build({
     entryPoints: [tempFilePath],
     bundle: true,
     outdir: config.distPublicScriptsDir,
-    minify: !isDev2,
-    sourcemap: isDev2 ? "inline" : false
+    minify: !isDev3,
+    sourcemap: isDev3 ? "inline" : false
   });
   const pagesFiles = globSync3(pagesScriptsGlob);
   await build({
     entryPoints: pagesFiles || [],
     bundle: true,
     outdir: config.distPublicScriptsDir + "/pages",
-    minify: !isDev2,
-    sourcemap: isDev2 ? "inline" : false
+    minify: !isDev3,
+    sourcemap: isDev3 ? "inline" : false
   });
   await logSize(config.distPublicDir, "client");
 }
@@ -807,7 +808,7 @@ function getComponentDynamicPaths(componentPath) {
   }
   return output;
 }
-async function buildOnLoadFile(componentData, isDev2) {
+async function buildOnLoadFile(componentData, isDev3) {
   const onLoadFiles = [];
   const onLoadFileResult = {
     imports: "",
@@ -845,12 +846,12 @@ async function buildOnLoadFile(componentData, isDev2) {
     platform: "node",
     outdir: config.distDir,
     bundle: true,
-    sourcemap: isDev2 ? "inline" : false,
+    sourcemap: isDev3 ? "inline" : false,
     external: allPackages,
     jsx: "transform",
-    minify: !isDev2,
+    minify: !isDev3,
     plugins: [
-      addDotJS(allPackages, extensions, isDev2)
+      addDotJS(allPackages, extensions, isDev3)
     ]
   });
 }
@@ -859,5 +860,5 @@ async function buildOnLoadFile(componentData, isDev2) {
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 var argv = yargs(hideBin(process.argv)).argv;
-var { isDev, removePreviousBuild, disableTailwind } = argv;
-buildApp({ isDev, removePreviousBuild, disableTailwind });
+var { isDev: isDev2, removePreviousBuild, disableTailwind } = argv;
+buildApp({ isDev: isDev2, removePreviousBuild, disableTailwind });

package/dist/src/scripts/xpine-dev.js

@@ -271,7 +271,7 @@ function getXpineOnLoadFunction(pathName, source, onLoadFileResult) {
       value.imports = importText + "\n" + value.imports;
     }
     if ([ts.SyntaxKind.FirstStatement, ts.SyntaxKind.FunctionDeclaration].includes(child.kind)) {
-      let text = child.getText(source);
+      const text = child.getText(source);
       if (text.includes("xpineOnLoad")) {
         const body = child?.body?.getText(source) || "";
         value.fn = value.fn + "\n" + body ? `(function() ${body})();` : "";
@@ -388,7 +388,7 @@ function transformTSXFiles(componentData, pageConfigFiles) {
 import fs3 from "fs-extra";
 import path4 from "path";
 import builtinModules from "builtin-modules";
-function addDotJS(allPackages2, extensions2, isDev) {
+function addDotJS(allPackages2, extensions2, isDev2) {
   const allPackagesIncludingNode = allPackages2.concat(builtinModules);
   return {
     name: "add-dot-js",
@@ -406,7 +406,7 @@ function addDotJS(allPackages2, extensions2, isDev) {
           }
           let outputPath = args.path + (existsAsFile ? "" : "/index") + ".js";
           outputPath = args.path.endsWith(".js") || args.path.endsWith(".mjs") ? args.path : outputPath;
-          return { path: outputPath + (isDev ? `?cache=${Date.now()}` : ""), external: true };
+          return { path: outputPath + (isDev2 ? `?cache=${Date.now()}` : ""), external: true };
         }
       });
     }
@@ -453,6 +453,7 @@ var { verify, sign } = jsonwebtoken;
 import requestIP from "request-ip";
 import fs5 from "fs-extra";
 import EventEmitter from "events";
+var isDev = process.env.NODE_ENV === "development";
 var OnInitEmitter = class extends EventEmitter {
 };
 var onInitEmitter = new OnInitEmitter();
@@ -513,19 +514,19 @@ var plugin2 = (opts = {}) => {
     },
     OnceExit(root) {
       root.append([
-        `:root {`,
-        `--active-breakpoint: "default";`,
-        `}`
+        ":root {",
+        '--active-breakpoint: "default";',
+        "}"
       ].join(""));
       const nodeValuesMapped = nodeValues.sort((a, b) => {
         return Number(a.value.replace(/[^0-9]/g, "")) - Number(b.value.replace(/[^0-9]/g, ""));
       }).map(({ breakpoint, value }) => {
         return [
           `@media (min-width: ${value}) {`,
-          `:root {`,
+          ":root {",
           `--active-breakpoint: "${breakpoint}";`,
-          `}`,
-          `}`
+          "}",
+          "}"
         ].join("");
       });
       for (const value of nodeValuesMapped) {
@@ -561,28 +562,28 @@ var packageJson = JSON.parse(fs7.readFileSync(config.packageJsonPath, "utf-8"));
 var allPackages = Object.keys(packageJson.devDependencies).concat(Object.keys(packageJson.dependencies));
 var xpineDistDir = getXPineDistDir();
 async function buildApp(args) {
-  const isDev = args?.isDev || false;
+  const isDev2 = args?.isDev || false;
   const removePreviousBuild = args?.removePreviousBuild || false;
   const disableTailwind = args?.disableTailwind || false;
   try {
     if (removePreviousBuild) fs7.removeSync(config.distDir);
     const srcDirFiles = globSync3(config.srcDir + "/**/*.{js,ts,tsx,jsx}");
-    const { componentData, dataFiles } = await buildAppFiles(srcDirFiles, isDev);
+    const { componentData, dataFiles } = await buildAppFiles(srcDirFiles, isDev2);
     const alpineDataFile = await buildAlpineDataFile(componentData, dataFiles);
-    await buildClientSideFiles([alpineDataFile], isDev);
+    await buildClientSideFiles([alpineDataFile], isDev2);
     fs7.removeSync(config.distTempFolder);
     await buildCSS(disableTailwind);
     await buildPublicFolderSymlinks();
-    await buildOnLoadFile(componentData, isDev);
-    if (!isDev) await triggerXPineOnLoad();
-    if (!isDev) await buildFilesWithConfigs(componentData);
-    if (!isDev) context.clear();
+    await buildOnLoadFile(componentData, isDev2);
+    if (!isDev2) await triggerXPineOnLoad();
+    if (!isDev2) await buildFilesWithConfigs(componentData);
+    if (!isDev2) context.clear();
   } catch (err) {
     console.error("Build failed");
     console.error(err);
   }
 }
-async function buildAppFiles(files, isDev) {
+async function buildAppFiles(files, isDev2) {
   const componentData = [];
   const dataFiles = [];
   const pageConfigFiles = files.filter((file) => {
@@ -597,12 +598,12 @@ async function buildAppFiles(files, isDev) {
     platform: "node",
     outdir: config.distDir,
     bundle: true,
-    sourcemap: isDev ? "inline" : false,
+    sourcemap: isDev2 ? "inline" : false,
     external: allPackages,
     jsx: "transform",
-    minify: !isDev,
+    minify: !isDev2,
     plugins: [
-      addDotJS(allPackages, extensions, isDev),
+      addDotJS(allPackages, extensions, isDev2),
       transformTSXFiles(componentData, pageConfigFiles),
       getDataFiles(dataFiles)
     ]
@@ -613,7 +614,7 @@ async function buildAppFiles(files, isDev) {
     dataFiles
   };
 }
-async function buildClientSideFiles(alpineDataFiles = [], isDev) {
+async function buildClientSideFiles(alpineDataFiles = [], isDev2) {
   const tempFilePath = path5.join(config.distTempFolder, "./app.ts");
   fs7.ensureFileSync(tempFilePath);
   const pagesScriptsGlob = config.publicDir + "/scripts/pages/**/*.{js,ts}";
@@ -624,22 +625,22 @@ async function buildClientSideFiles(alpineDataFiles = [], isDev) {
     }
   );
   convertEntryPointsToSingleFile(alpineDataFiles.concat(clientFiles), tempFilePath);
-  if (isDev) writeDevServerClientSideCode(tempFilePath);
+  if (isDev2) writeDevServerClientSideCode(tempFilePath);
   writeSpaClientSideCode(tempFilePath);
   await build({
     entryPoints: [tempFilePath],
     bundle: true,
     outdir: config.distPublicScriptsDir,
-    minify: !isDev,
-    sourcemap: isDev ? "inline" : false
+    minify: !isDev2,
+    sourcemap: isDev2 ? "inline" : false
   });
   const pagesFiles = globSync3(pagesScriptsGlob);
   await build({
     entryPoints: pagesFiles || [],
     bundle: true,
     outdir: config.distPublicScriptsDir + "/pages",
-    minify: !isDev,
-    sourcemap: isDev ? "inline" : false
+    minify: !isDev2,
+    sourcemap: isDev2 ? "inline" : false
   });
   await logSize(config.distPublicDir, "client");
 }
@@ -814,7 +815,7 @@ function getComponentDynamicPaths(componentPath) {
   }
   return output;
 }
-async function buildOnLoadFile(componentData, isDev) {
+async function buildOnLoadFile(componentData, isDev2) {
   const onLoadFiles = [];
   const onLoadFileResult = {
     imports: "",
@@ -852,12 +853,12 @@ async function buildOnLoadFile(componentData, isDev) {
     platform: "node",
     outdir: config.distDir,
     bundle: true,
-    sourcemap: isDev ? "inline" : false,
+    sourcemap: isDev2 ? "inline" : false,
     external: allPackages,
     jsx: "transform",
-    minify: !isDev,
+    minify: !isDev2,
     plugins: [
-      addDotJS(allPackages, extensions, isDev)
+      addDotJS(allPackages, extensions, isDev2)
     ]
   });
 }

package/dist/src/static/spa.js

@@ -214,11 +214,14 @@ function safeParseURL(url) {
     return {};
   }
 }
+function getCurrentBreakpoint() {
+  return window.getComputedStyle(document.documentElement).getPropertyValue("--active-breakpoint")?.replace(/[\'\"]/g, "")?.trim() || "";
+}
 function handleBreakpointEvents() {
   let lastSentBreakpoint = "";
   let initial = true;
   return function() {
-    const breakpoint = window.getComputedStyle(document.documentElement).getPropertyValue("--active-breakpoint")?.replace(/[\'\"]/g, "")?.trim() || "";
+    const breakpoint = getCurrentBreakpoint();
     if (breakpoint !== lastSentBreakpoint) {
       const event = new CustomEvent("breakpoint-change", {
         detail: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xpine",
-  "version": "0.0.43",
+  "version": "0.0.44",
   "main": "dist/index.js",
   "dependencies": {
     "@aws-sdk/client-secrets-manager": "^3.758.0",