npm - xpine - Versions diffs - 0.0.21 → 0.0.22 - Mend

xpine 0.0.21 → 0.0.22

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (40) hide show

package/TODO +0 -2
package/dist/index.js +184 -80
package/dist/src/build/esbuild/addDotJS.d.ts +5 -0
package/dist/src/build/esbuild/addDotJS.d.ts.map +1 -0
package/dist/src/build/esbuild/getDataFiles.d.ts +5 -0
package/dist/src/build/esbuild/getDataFiles.d.ts.map +1 -0
package/dist/src/build/esbuild/transformTSXFiles.d.ts +6 -0
package/dist/src/build/esbuild/transformTSXFiles.d.ts.map +1 -0
package/dist/src/express.d.ts +3 -0
package/dist/src/express.d.ts.map +1 -1
package/dist/src/runDevServer.d.ts.map +1 -1
package/dist/src/scripts/build.d.ts +5 -1
package/dist/src/scripts/build.d.ts.map +1 -1
package/dist/src/scripts/xpine-build.js +110 -65
package/dist/src/scripts/xpine-dev.js +148 -68
package/dist/src/static/spa.js +2 -1
package/dist/src/util/config-file.d.ts +6 -0
package/dist/src/util/config-file.d.ts.map +1 -0
package/dist/src/util/constants.d.ts +3 -0
package/dist/src/util/constants.d.ts.map +1 -0
package/dist/src/util/get-config.d.ts.map +1 -1
package/dist/src/util/postcss/remove-layers.d.ts +1 -1
package/dist/src/util/regex.d.ts +11 -0
package/dist/src/util/regex.d.ts.map +1 -0
package/dist/src/util/require.d.ts.map +1 -1
package/dist/types.d.ts +31 -2
package/dist/types.d.ts.map +1 -1
package/eslint.config.mjs +27 -0
package/package.json +18 -4
package/tests/e2e/alpine.spec.ts +14 -0
package/tests/e2e/app-build.spec.ts +73 -0
package/tests/e2e/spa.spec.ts +23 -0
package/tests/e2e/tests-examples/demo-todo-app.spec.ts +437 -0
package/tests/eslint.config.mjs +27 -0
package/tests/package-lock.json +8941 -0
package/tests/package.json +89 -0
package/tests/playwright.config.ts +81 -0
package/tests/tsconfig.json +46 -0
package/tests/xpine.config.mjs +1 -0
package/types.ts +34 -2

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

@@ -123,6 +123,10 @@ var require_default = createRequire(import.meta.url);
 function getXPineDistDir() {
   const dir = import.meta.dirname;
   const splitDir = dir.split("/xpine/dist");
+  if (splitDir.length === 1) {
+    const splitDirSingle = dir.split("/xpine/");
+    return splitDirSingle[0] + "/xpine/dist";
+  }
   return splitDir[0] + "/xpine/dist";
 }
@@ -205,26 +209,55 @@ var remove_layers_default = plugin;
 // src/build/esbuild/transformTSXFiles.ts
 import fs2 from "fs-extra";
 import ts2 from "typescript";
-import path3 from "path";
 // src/util/regex.ts
 var regex_default = {
   dotTsx: /.tsx/,
   hasLetters: /[A-Za-z0-9]/g,
-  configFile: /\+config\.[tj]s/g,
+  configFile: /\+config\.[tj]sx?/g,
   dynamicRoutes: /(\[)(.*?)(\])/g,
   isDynamicRoute: /\[(.*)\]/g,
   endsWithTSX: /\.tsx$/,
   endsWithJSX: /\.jsx$/
 };
+// src/util/config-file.ts
+import path3 from "path";
+function sourcePathToDistPath(sourcePath) {
+  return sourcePath?.replace(config.srcDir, config.distDir)?.replace(/\.ts$/, ".js")?.replace(/\.tsx$/, ".js");
+}
+function getConfigFiles(pathName, pageConfigFiles, returnDistPaths = true) {
+  const configs = [];
+  for (const configFile of pageConfigFiles) {
+    const result = path3.relative(pathName, configFile)?.replace(regex_default.configFile, "");
+    const hasLetters = result.match(regex_default.hasLetters);
+    if (!hasLetters) {
+      configs.push(returnDistPaths ? sourcePathToDistPath(configFile) : configFile);
+    }
+  }
+  if (!configs.length) return null;
+  return configs.sort((a, b) => b.length - a.length);
+}
+async function getCompleteConfig(configFiles, cacheKey) {
+  let config2 = {};
+  for (const configFile of configFiles) {
+    config2 = {
+      ...(await import(configFile + `?cache=${cacheKey}`)).default,
+      ...config2
+    };
+  }
+  return config2;
+}
+function isAConfigFile(pathName) {
+  return !!pathName.match(regex_default.configFile);
+}
 // src/build/esbuild/transformTSXFiles.ts
 function transformTSXFiles(componentData, pageConfigFiles) {
   return {
     name: "transform-tsx-files",
     setup(build2) {
-      build2.onLoad({ filter: regex_default.dotTsx }, (args) => {
-        const configFile = getConfigFile(args.path, pageConfigFiles);
+      build2.onLoad({ filter: regex_default.dotTsx }, async (args) => {
         const content = fs2.readFileSync(args.path, "utf-8");
         const source = ts2.createSourceFile(
           args.path,
@@ -238,7 +271,7 @@ function transformTSXFiles(componentData, pageConfigFiles) {
           ...args,
           contents: `${htmlImportStart}${cleanedContent.fullContent}`,
           clientContent: cleanedContent.clientContent,
-          configFile
+          configFiles: isAConfigFile(args?.path) ? null : getConfigFiles(args.path, pageConfigFiles)
         });
         return {
           contents: newContent,
@@ -248,16 +281,6 @@ function transformTSXFiles(componentData, pageConfigFiles) {
     }
   };
 }
-function getConfigFile(pathName, pageConfigFiles) {
-  const configs = [];
-  for (const configFile of pageConfigFiles) {
-    const result = path3.relative(pathName, configFile)?.replace(regex_default.configFile, "");
-    const hasLetters = result.match(regex_default.hasLetters);
-    if (!hasLetters) configs.push(configFile);
-  }
-  const configToUse = configs.sort((a, b) => b.length - a.length)?.[0];
-  return configToUse;
-}
 // src/build/esbuild/addDotJS.ts
 import fs3 from "fs-extra";
@@ -309,13 +332,18 @@ function getDataFiles(dataFiles) {
   };
 }
+// src/util/constants.ts
+var doctypeHTML = "<!DOCTYPE html>";
+var staticComment = "<!-- static -->";
 // src/scripts/build.ts
 var extensions = [".ts", ".tsx"];
 var packageJson = JSON.parse(fs5.readFileSync(config.packageJsonPath, "utf-8"));
 var allPackages = Object.keys(packageJson.devDependencies).concat(Object.keys(packageJson.dependencies));
 var xpineDistDir = getXPineDistDir();
-async function buildApp(isDev = false) {
+async function buildApp(isDev = false, removePreviousBuild = false) {
   try {
+    if (removePreviousBuild) fs5.removeSync(config.distDir);
     const srcDirFiles = globSync(config.srcDir + "/**/*.{js,ts,tsx,jsx}");
     const { componentData, dataFiles } = await buildAppFiles(srcDirFiles, isDev);
     const alpineDataFile = await buildAlpineDataFile(componentData, dataFiles);
@@ -323,7 +351,7 @@ async function buildApp(isDev = false) {
     fs5.removeSync(config.distTempFolder);
     await buildCSS();
     await buildPublicFolderSymlinks();
-    if (!isDev) await buildStaticFiles(componentData);
+    if (!isDev) await buildFilesWithConfigs(componentData);
   } catch (err) {
     console.error("Build failed");
     console.error(err);
@@ -393,14 +421,12 @@ async function buildClientSideFiles(alpineDataFiles = [], isDev) {
 function writeDevServerClientSideCode(tempFilePath) {
   const devServerPath = path5.join(xpineDistDir, "./src/static/dev-server.js");
   const content = fs5.readFileSync(devServerPath, "utf-8");
-  fs5.appendFileSync(tempFilePath, `
-` + content);
+  fs5.appendFileSync(tempFilePath, "\n" + content);
 }
 function writeSpaClientSideCode(tempFilePath) {
   const spaPath = path5.join(xpineDistDir, "./src/static/spa.js");
   const content = fs5.readFileSync(spaPath, "utf-8");
-  fs5.appendFileSync(tempFilePath, `
-` + content);
+  fs5.appendFileSync(tempFilePath, "\n" + content);
 }
 async function buildAlpineDataFile(componentData, dataFiles) {
   const output = {
@@ -489,55 +515,71 @@ async function logSize(pathName, type, validExtensions = [".js", ".css"]) {
   }, 0);
   console.info(`[${totalSize.toFixed(3)} MB] Built ${type}`);
 }
-async function buildStaticFiles(componentData) {
-  const componentsWithConfigs = componentData.filter((item) => item.configFile);
+async function buildFilesWithConfigs(componentData) {
+  const now = Date.now();
+  const componentsWithConfigs = componentData.filter((item) => item.configFiles);
   for (const component of componentsWithConfigs) {
-    const config2 = (await import(sourcePathToDistPath(component.configFile) + `?cache=${Date.now()}`)).default;
-    const shouldBeStatic = config2?.staticPaths;
-    if (shouldBeStatic) {
-      let componentFileName = component.path.split("/").pop().replace(regex_default.endsWithJSX, "").replace(regex_default.endsWithTSX, "");
-      const isDynamicRoute = component.path.match(regex_default.isDynamicRoute);
-      if (isDynamicRoute) {
-        componentFileName = component.path.split("/").filter((dir) => dir.match(regex_default.isDynamicRoute)).join("/").replace(regex_default.endsWithJSX, "").replace(regex_default.endsWithTSX, "");
-      }
-      const builtComponentPath = sourcePathToDistPath(component.path);
-      const componentDynamicPaths = getComponentDynamicPaths(componentFileName);
-      const componentFn = (await import(builtComponentPath + `?cache=${Date.now()}`)).default;
-      const outputPath = componentDynamicPaths?.length ? componentDynamicPaths.reduce((total, current) => {
-        return total.replace(`/[${current}]`, "");
-      }, path5.dirname(builtComponentPath)) : path5.dirname(builtComponentPath);
-      if (typeof shouldBeStatic === "boolean") {
-        try {
-          const staticComponentOutput = await componentFn();
-          fs5.writeFileSync(path5.join(outputPath, "./index.html"), staticComponentOutput);
-        } catch (err) {
-          console.error(err);
-          console.log("Could not build static component", component.path);
-        }
-      } else if (typeof shouldBeStatic === "function") {
-        const dynamicPaths = await shouldBeStatic();
-        for (const dynamicPath of dynamicPaths) {
-          try {
-            const staticComponentOutput = await componentFn({
-              params: {
-                ...componentDynamicPaths?.length ? dynamicPath : {}
-              }
-            });
-            const updatedOutDir = path5.join(outputPath, `./${componentDynamicPaths.map((key) => dynamicPath[key]).join("/")}`);
-            fs5.ensureDirSync(updatedOutDir);
-            fs5.writeFileSync(path5.join(updatedOutDir, `./index.html`), staticComponentOutput);
-          } catch (err) {
-            console.log("Could not build static component", component.path);
-            console.error(err);
+    let config2 = await getCompleteConfig(component.configFiles, now);
+    const builtComponentPath = sourcePathToDistPath(component.path);
+    const componentImport = await import(builtComponentPath + `?cache=${Date.now()}`);
+    if (componentImport?.config) {
+      config2 = {
+        ...config2,
+        ...componentImport.config
+      };
+    }
+    if (config2?.staticPaths) buildStaticFiles(config2, component, componentImport, builtComponentPath);
+  }
+}
+async function buildStaticFiles(config2, component, componentImport, builtComponentPath) {
+  if (!config2?.staticPaths) return;
+  let componentFileName = component.path.split("/").pop().replace(regex_default.endsWithJSX, "").replace(regex_default.endsWithTSX, "");
+  const isDynamicRoute = component.path.match(regex_default.isDynamicRoute);
+  if (isDynamicRoute) {
+    componentFileName = component.path.split("/").filter((dir) => dir.match(regex_default.isDynamicRoute)).join("/").replace(regex_default.endsWithJSX, "").replace(regex_default.endsWithTSX, "");
+  }
+  const componentDynamicPaths = getComponentDynamicPaths(componentFileName);
+  const componentFn = componentImport.default;
+  const outputPath = componentDynamicPaths?.length ? componentDynamicPaths.reduce((total, current) => {
+    return total.replace(`/[${current}]`, "");
+  }, path5.dirname(builtComponentPath)) : path5.dirname(builtComponentPath);
+  if (typeof config2?.staticPaths === "boolean") {
+    try {
+      const req = { params: {} };
+      const data = config2?.data ? await config2.data(req) : null;
+      const staticComponentOutput = await componentFn({ data });
+      fs5.writeFileSync(
+        path5.join(outputPath, "./index.html"),
+        doctypeHTML + (config2?.wrapper ? await config2.wrapper({ req, children: staticComponentOutput, config: config2, data }) : staticComponentOutput) + staticComment
+      );
+    } catch (err) {
+      console.error(err);
+      console.log("Could not build static component", component.path);
+    }
+  } else if (typeof config2?.staticPaths === "function") {
+    const dynamicPaths = await config2.staticPaths();
+    for (const dynamicPath of dynamicPaths) {
+      try {
+        const req = {
+          params: {
+            ...componentDynamicPaths?.length ? dynamicPath : {}
           }
-        }
+        };
+        const data = config2?.data ? await config2.data(req) : null;
+        const staticComponentOutput = await componentFn({ req, data });
+        const updatedOutDir = path5.join(outputPath, `./${componentDynamicPaths.map((key) => dynamicPath[key]).join("/")}`);
+        fs5.ensureDirSync(updatedOutDir);
+        fs5.writeFileSync(
+          path5.join(updatedOutDir, "./index.html"),
+          doctypeHTML + (config2?.wrapper ? await config2.wrapper({ req, children: staticComponentOutput, config: config2, data }) : staticComponentOutput) + staticComment
+        );
+      } catch (err) {
+        console.log("Could not build static component", component.path);
+        console.error(err);
       }
     }
   }
 }
-function sourcePathToDistPath(sourcePath) {
-  return sourcePath.replace(config.srcDir, config.distDir).replace(/\.ts$/, ".js").replace(/\.tsx$/, ".js");
-}
 function getComponentDynamicPaths(componentPath) {
   const matches = [...componentPath.matchAll(regex_default.dynamicRoutes)];
   if (!matches?.length) return null;
@@ -549,4 +591,7 @@ function getComponentDynamicPaths(componentPath) {
 }
 // src/scripts/xpine-build.ts
-buildApp();
+import yargs from "yargs";
+import { hideBin } from "yargs/helpers";
+var argv = yargs(hideBin(process.argv)).argv;
+buildApp(argv?.isDev || false, argv?.removePreviousBuild || false);

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

@@ -130,6 +130,10 @@ var require_default = createRequire(import.meta.url);
 function getXPineDistDir() {
   const dir = import.meta.dirname;
   const splitDir = dir.split("/xpine/dist");
+  if (splitDir.length === 1) {
+    const splitDirSingle = dir.split("/xpine/");
+    return splitDirSingle[0] + "/xpine/dist";
+  }
   return splitDir[0] + "/xpine/dist";
 }
@@ -212,26 +216,55 @@ var remove_layers_default = plugin;
 // src/build/esbuild/transformTSXFiles.ts
 import fs2 from "fs-extra";
 import ts2 from "typescript";
-import path3 from "path";
 // src/util/regex.ts
 var regex_default = {
   dotTsx: /.tsx/,
   hasLetters: /[A-Za-z0-9]/g,
-  configFile: /\+config\.[tj]s/g,
+  configFile: /\+config\.[tj]sx?/g,
   dynamicRoutes: /(\[)(.*?)(\])/g,
   isDynamicRoute: /\[(.*)\]/g,
   endsWithTSX: /\.tsx$/,
   endsWithJSX: /\.jsx$/
 };
+// src/util/config-file.ts
+import path3 from "path";
+function sourcePathToDistPath(sourcePath) {
+  return sourcePath?.replace(config.srcDir, config.distDir)?.replace(/\.ts$/, ".js")?.replace(/\.tsx$/, ".js");
+}
+function getConfigFiles(pathName, pageConfigFiles, returnDistPaths = true) {
+  const configs = [];
+  for (const configFile of pageConfigFiles) {
+    const result = path3.relative(pathName, configFile)?.replace(regex_default.configFile, "");
+    const hasLetters = result.match(regex_default.hasLetters);
+    if (!hasLetters) {
+      configs.push(returnDistPaths ? sourcePathToDistPath(configFile) : configFile);
+    }
+  }
+  if (!configs.length) return null;
+  return configs.sort((a, b) => b.length - a.length);
+}
+async function getCompleteConfig(configFiles, cacheKey) {
+  let config2 = {};
+  for (const configFile of configFiles) {
+    config2 = {
+      ...(await import(configFile + `?cache=${cacheKey}`)).default,
+      ...config2
+    };
+  }
+  return config2;
+}
+function isAConfigFile(pathName) {
+  return !!pathName.match(regex_default.configFile);
+}
 // src/build/esbuild/transformTSXFiles.ts
 function transformTSXFiles(componentData, pageConfigFiles) {
   return {
     name: "transform-tsx-files",
     setup(build2) {
-      build2.onLoad({ filter: regex_default.dotTsx }, (args) => {
-        const configFile = getConfigFile(args.path, pageConfigFiles);
+      build2.onLoad({ filter: regex_default.dotTsx }, async (args) => {
         const content = fs2.readFileSync(args.path, "utf-8");
         const source = ts2.createSourceFile(
           args.path,
@@ -245,7 +278,7 @@ function transformTSXFiles(componentData, pageConfigFiles) {
           ...args,
           contents: `${htmlImportStart}${cleanedContent.fullContent}`,
           clientContent: cleanedContent.clientContent,
-          configFile
+          configFiles: isAConfigFile(args?.path) ? null : getConfigFiles(args.path, pageConfigFiles)
         });
         return {
           contents: newContent,
@@ -255,16 +288,6 @@ function transformTSXFiles(componentData, pageConfigFiles) {
     }
   };
 }
-function getConfigFile(pathName, pageConfigFiles) {
-  const configs = [];
-  for (const configFile of pageConfigFiles) {
-    const result = path3.relative(pathName, configFile)?.replace(regex_default.configFile, "");
-    const hasLetters = result.match(regex_default.hasLetters);
-    if (!hasLetters) configs.push(configFile);
-  }
-  const configToUse = configs.sort((a, b) => b.length - a.length)?.[0];
-  return configToUse;
-}
 // src/build/esbuild/addDotJS.ts
 import fs3 from "fs-extra";
@@ -316,13 +339,18 @@ function getDataFiles(dataFiles) {
   };
 }
+// src/util/constants.ts
+var doctypeHTML = "<!DOCTYPE html>";
+var staticComment = "<!-- static -->";
 // src/scripts/build.ts
 var extensions = [".ts", ".tsx"];
 var packageJson = JSON.parse(fs5.readFileSync(config.packageJsonPath, "utf-8"));
 var allPackages = Object.keys(packageJson.devDependencies).concat(Object.keys(packageJson.dependencies));
 var xpineDistDir = getXPineDistDir();
-async function buildApp(isDev = false) {
+async function buildApp(isDev = false, removePreviousBuild = false) {
   try {
+    if (removePreviousBuild) fs5.removeSync(config.distDir);
     const srcDirFiles = globSync(config.srcDir + "/**/*.{js,ts,tsx,jsx}");
     const { componentData, dataFiles } = await buildAppFiles(srcDirFiles, isDev);
     const alpineDataFile = await buildAlpineDataFile(componentData, dataFiles);
@@ -330,7 +358,7 @@ async function buildApp(isDev = false) {
     fs5.removeSync(config.distTempFolder);
     await buildCSS();
     await buildPublicFolderSymlinks();
-    if (!isDev) await buildStaticFiles(componentData);
+    if (!isDev) await buildFilesWithConfigs(componentData);
   } catch (err) {
     console.error("Build failed");
     console.error(err);
@@ -400,14 +428,12 @@ async function buildClientSideFiles(alpineDataFiles = [], isDev) {
 function writeDevServerClientSideCode(tempFilePath) {
   const devServerPath = path5.join(xpineDistDir, "./src/static/dev-server.js");
   const content = fs5.readFileSync(devServerPath, "utf-8");
-  fs5.appendFileSync(tempFilePath, `
-` + content);
+  fs5.appendFileSync(tempFilePath, "\n" + content);
 }
 function writeSpaClientSideCode(tempFilePath) {
   const spaPath = path5.join(xpineDistDir, "./src/static/spa.js");
   const content = fs5.readFileSync(spaPath, "utf-8");
-  fs5.appendFileSync(tempFilePath, `
-` + content);
+  fs5.appendFileSync(tempFilePath, "\n" + content);
 }
 async function buildAlpineDataFile(componentData, dataFiles) {
   const output = {
@@ -496,55 +522,71 @@ async function logSize(pathName, type, validExtensions = [".js", ".css"]) {
   }, 0);
   console.info(`[${totalSize.toFixed(3)} MB] Built ${type}`);
 }
-async function buildStaticFiles(componentData) {
-  const componentsWithConfigs = componentData.filter((item) => item.configFile);
+async function buildFilesWithConfigs(componentData) {
+  const now = Date.now();
+  const componentsWithConfigs = componentData.filter((item) => item.configFiles);
   for (const component of componentsWithConfigs) {
-    const config2 = (await import(sourcePathToDistPath(component.configFile) + `?cache=${Date.now()}`)).default;
-    const shouldBeStatic = config2?.staticPaths;
-    if (shouldBeStatic) {
-      let componentFileName = component.path.split("/").pop().replace(regex_default.endsWithJSX, "").replace(regex_default.endsWithTSX, "");
-      const isDynamicRoute = component.path.match(regex_default.isDynamicRoute);
-      if (isDynamicRoute) {
-        componentFileName = component.path.split("/").filter((dir) => dir.match(regex_default.isDynamicRoute)).join("/").replace(regex_default.endsWithJSX, "").replace(regex_default.endsWithTSX, "");
-      }
-      const builtComponentPath = sourcePathToDistPath(component.path);
-      const componentDynamicPaths = getComponentDynamicPaths(componentFileName);
-      const componentFn = (await import(builtComponentPath + `?cache=${Date.now()}`)).default;
-      const outputPath = componentDynamicPaths?.length ? componentDynamicPaths.reduce((total, current) => {
-        return total.replace(`/[${current}]`, "");
-      }, path5.dirname(builtComponentPath)) : path5.dirname(builtComponentPath);
-      if (typeof shouldBeStatic === "boolean") {
-        try {
-          const staticComponentOutput = await componentFn();
-          fs5.writeFileSync(path5.join(outputPath, "./index.html"), staticComponentOutput);
-        } catch (err) {
-          console.error(err);
-          console.log("Could not build static component", component.path);
-        }
-      } else if (typeof shouldBeStatic === "function") {
-        const dynamicPaths = await shouldBeStatic();
-        for (const dynamicPath of dynamicPaths) {
-          try {
-            const staticComponentOutput = await componentFn({
-              params: {
-                ...componentDynamicPaths?.length ? dynamicPath : {}
-              }
-            });
-            const updatedOutDir = path5.join(outputPath, `./${componentDynamicPaths.map((key) => dynamicPath[key]).join("/")}`);
-            fs5.ensureDirSync(updatedOutDir);
-            fs5.writeFileSync(path5.join(updatedOutDir, `./index.html`), staticComponentOutput);
-          } catch (err) {
-            console.log("Could not build static component", component.path);
-            console.error(err);
+    let config2 = await getCompleteConfig(component.configFiles, now);
+    const builtComponentPath = sourcePathToDistPath(component.path);
+    const componentImport = await import(builtComponentPath + `?cache=${Date.now()}`);
+    if (componentImport?.config) {
+      config2 = {
+        ...config2,
+        ...componentImport.config
+      };
+    }
+    if (config2?.staticPaths) buildStaticFiles(config2, component, componentImport, builtComponentPath);
+  }
+}
+async function buildStaticFiles(config2, component, componentImport, builtComponentPath) {
+  if (!config2?.staticPaths) return;
+  let componentFileName = component.path.split("/").pop().replace(regex_default.endsWithJSX, "").replace(regex_default.endsWithTSX, "");
+  const isDynamicRoute = component.path.match(regex_default.isDynamicRoute);
+  if (isDynamicRoute) {
+    componentFileName = component.path.split("/").filter((dir) => dir.match(regex_default.isDynamicRoute)).join("/").replace(regex_default.endsWithJSX, "").replace(regex_default.endsWithTSX, "");
+  }
+  const componentDynamicPaths = getComponentDynamicPaths(componentFileName);
+  const componentFn = componentImport.default;
+  const outputPath = componentDynamicPaths?.length ? componentDynamicPaths.reduce((total, current) => {
+    return total.replace(`/[${current}]`, "");
+  }, path5.dirname(builtComponentPath)) : path5.dirname(builtComponentPath);
+  if (typeof config2?.staticPaths === "boolean") {
+    try {
+      const req = { params: {} };
+      const data = config2?.data ? await config2.data(req) : null;
+      const staticComponentOutput = await componentFn({ data });
+      fs5.writeFileSync(
+        path5.join(outputPath, "./index.html"),
+        doctypeHTML + (config2?.wrapper ? await config2.wrapper({ req, children: staticComponentOutput, config: config2, data }) : staticComponentOutput) + staticComment
+      );
+    } catch (err) {
+      console.error(err);
+      console.log("Could not build static component", component.path);
+    }
+  } else if (typeof config2?.staticPaths === "function") {
+    const dynamicPaths = await config2.staticPaths();
+    for (const dynamicPath of dynamicPaths) {
+      try {
+        const req = {
+          params: {
+            ...componentDynamicPaths?.length ? dynamicPath : {}
           }
-        }
+        };
+        const data = config2?.data ? await config2.data(req) : null;
+        const staticComponentOutput = await componentFn({ req, data });
+        const updatedOutDir = path5.join(outputPath, `./${componentDynamicPaths.map((key) => dynamicPath[key]).join("/")}`);
+        fs5.ensureDirSync(updatedOutDir);
+        fs5.writeFileSync(
+          path5.join(updatedOutDir, "./index.html"),
+          doctypeHTML + (config2?.wrapper ? await config2.wrapper({ req, children: staticComponentOutput, config: config2, data }) : staticComponentOutput) + staticComment
+        );
+      } catch (err) {
+        console.log("Could not build static component", component.path);
+        console.error(err);
       }
     }
   }
 }
-function sourcePathToDistPath(sourcePath) {
-  return sourcePath.replace(config.srcDir, config.distDir).replace(/\.ts$/, ".js").replace(/\.tsx$/, ".js");
-}
 function getComponentDynamicPaths(componentPath) {
   const matches = [...componentPath.matchAll(regex_default.dynamicRoutes)];
   if (!matches?.length) return null;
@@ -593,6 +635,7 @@ async function loadSecretsManagerSecrets() {
 await setupEnv();
 async function runDevServer() {
   process.env.NODE_ENV = "development";
+  const rebuildEmitter = createRebuildEmitter();
   await buildApp(true);
   const startServer = (await import(config.serverDistAppPath + `?cache=${Date.now()}`)).default;
   let appServer = await startServer();
@@ -604,15 +647,21 @@ async function runDevServer() {
   watcher.on("all", async (event, path8) => {
     const shouldReloadServer = path8.startsWith(config.serverDir) && !path8.startsWith(config.runDir) || ["add", "unlink"].includes(event) && path8.startsWith(config.pagesDir);
     if (shouldReloadServer) {
-      await appServer.server.close();
-      await buildApp(true);
-      const startServer2 = (await import(config.serverDistAppPath + `?cache=${Date.now()}`)).default;
-      appServer = await startServer2();
+      await asyncServerClose(appServer.server);
+      rebuildEmitter.emit("rebuild-server");
       return;
     }
     await buildApp(true);
     refreshEmitter.emit("refresh");
   });
+  rebuildEmitter.on("done", async () => {
+    await rebuildServer();
+  });
+  async function rebuildServer() {
+    await buildApp(true);
+    const startServer2 = (await import(config.serverDistAppPath + `?cache=${Date.now()}`)).default;
+    appServer = await startServer2();
+  }
   const wsApp = express();
   const wsServer = http.createServer(wsApp);
   expressWs(wsApp, wsServer);
@@ -632,6 +681,37 @@ async function runDevServer() {
     console.info(`Dev server listening on port ${wsPort}`);
   });
 }
+function asyncServerClose(server) {
+  return new Promise((resolve, reject) => {
+    server.close();
+    resolve(true);
+  });
+}
+function createRebuildEmitter(delay = 500) {
+  class RebuildEmitter extends EventEmitter {
+  }
+  ;
+  const rebuildEmitter = new RebuildEmitter();
+  let start = 0;
+  let hasEmitted = false;
+  rebuildEmitter.on("rebuild-server", () => {
+    hasEmitted = false;
+    trigger();
+  });
+  function trigger() {
+    start = Date.now();
+    const interval = setInterval(() => {
+      if (hasEmitted) return;
+      const now = Date.now();
+      if (now - start >= delay) {
+        rebuildEmitter.emit("done");
+        clearInterval(interval);
+        hasEmitted = true;
+      }
+    }, 100);
+  }
+  return rebuildEmitter;
+}
 // src/scripts/xpine-dev.ts
 runDevServer();

package/dist/src/static/spa.js CHANGED Viewed

@@ -6,7 +6,8 @@ async function replaceDocumentContentsWithLinkResponse() {
   }
 }
 async function updatePageOnLinkClick(e) {
-  const targetHref = e?.target?.getAttribute("href");
+  e.preventDefault();
+  const targetHref = e?.target?.closest("a")?.getAttribute("href");
   if (!targetHref) return;
   if (isExternalURL(targetHref) && !e?.target?.getAttribute("data-spa-crossorigin")) return;
   e.preventDefault();

package/dist/src/util/config-file.d.ts ADDED Viewed

@@ -0,0 +1,6 @@
+import { ConfigFile } from '../../types';
+export declare function sourcePathToDistPath(sourcePath: string): string;
+export declare function getConfigFiles(pathName: string, pageConfigFiles: string[], returnDistPaths?: boolean): string[] | null;
+export declare function getCompleteConfig(configFiles: string[], cacheKey: string | number): Promise<ConfigFile>;
+export declare function isAConfigFile(pathName: string): boolean;
+//# sourceMappingURL=config-file.d.ts.map

package/dist/src/util/config-file.d.ts.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"config-file.d.ts","sourceRoot":"","sources":["../../../src/util/config-file.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,UAEtD;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,EAAE,eAAe,GAAE,OAAc,GAAG,MAAM,EAAE,GAAG,IAAI,CAY5H;AAED,wBAAsB,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,uBASvF;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,WAE7C"}

package/dist/src/util/constants.d.ts ADDED Viewed

@@ -0,0 +1,3 @@
+export declare const doctypeHTML = "<!DOCTYPE html>";
+export declare const staticComment = "<!-- static -->";
+//# sourceMappingURL=constants.d.ts.map

package/dist/src/util/constants.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/util/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW,oBAAoB,CAAC;AAC7C,eAAO,MAAM,aAAa,oBAAoB,CAAC"}

package/dist/src/util/get-config.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"get-config.d.ts","sourceRoot":"","sources":["../../../src/util/get-config.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAI1C,wBAAgB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,UAGzC;~~AAoDD~~,eAAO,MAAM,MAAM,EAAE,WAGpB,CAAC"}
1	+ {"version":3,"file":"get-config.d.ts","sourceRoot":"","sources":["../../../src/util/get-config.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAI1C,wBAAgB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,UAGzC;AAuDD,eAAO,MAAM,MAAM,EAAE,WAGpB,CAAC"}

package/dist/src/util/postcss/remove-layers.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { PluginCreator } from "postcss";
+import { PluginCreator } from 'postcss';
 declare namespace plugin {
     interface Options {
     }

package/dist/src/util/regex.d.ts ADDED Viewed

@@ -0,0 +1,11 @@
+declare const _default: {
+    dotTsx: RegExp;
+    hasLetters: RegExp;
+    configFile: RegExp;
+    dynamicRoutes: RegExp;
+    isDynamicRoute: RegExp;
+    endsWithTSX: RegExp;
+    endsWithJSX: RegExp;
+};
+export default _default;
+//# sourceMappingURL=regex.d.ts.map

package/dist/src/util/regex.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"regex.d.ts","sourceRoot":"","sources":["../../../src/util/regex.ts"],"names":[],"mappings":";;;;;;;;;AAAA,wBAQE"}