xpine 0.0.13 → 0.0.15

package/dist/index.js

@@ -130,8 +130,12 @@ import path2 from "path";
 
 // src/util/require.ts
 import { createRequire } from "module";
-var require2 = createRequire(import.meta.url);
-var require_default = require2;
+var require_default = createRequire(import.meta.url);
+function getXPineDistDir() {
+  const dir = import.meta.dirname;
+  const splitDir = dir.split("/xpine/dist");
+  return splitDir[0] + "/xpine/dist";
+}
 
 // src/util/get-config.ts
 var rootDir = process.cwd();
@@ -197,6 +201,7 @@ var extensions = [".ts", ".tsx"];
 var packageJson = JSON.parse(fs2.readFileSync(config.packageJsonPath, "utf-8"));
 var allPackages = Object.keys(packageJson.devDependencies).concat(Object.keys(packageJson.dependencies));
 var allPackagesIncludingNode = allPackages.concat(builtinModules);
+var xpineDistDir = getXPineDistDir();
 async function buildApp(isDev = false) {
   try {
     const srcDirFiles = globSync(config.srcDir + "/**/*.{js,ts,tsx,jsx}");
@@ -243,7 +248,7 @@ async function buildAppFiles(files, isDev) {
               }
               let outputPath = args.path + (existsAsFile ? "" : "/index") + ".js";
               outputPath = args.path.endsWith(".js") || args.path.endsWith(".mjs") ? args.path : outputPath;
-              return { path: outputPath, external: true };
+              return { path: outputPath + (isDev ? `?cache=${Date.now()}` : ""), external: true };
             }
           });
         }
@@ -322,13 +327,13 @@ async function buildClientSideFiles(alpineDataFiles = [], isDev) {
   await logSize(config.distPublicDir, "client");
 }
 function writeDevServerClientSideCode(tempFilePath) {
-  const devServerPath = path3.join(import.meta.dirname, "../static/dev-server.js");
+  const devServerPath = path3.join(xpineDistDir, "./src/static/dev-server.js");
   const content = fs2.readFileSync(devServerPath, "utf-8");
   fs2.appendFileSync(tempFilePath, `
 ` + content);
 }
 function writeSpaClientSideCode(tempFilePath) {
-  const spaPath = path3.join(import.meta.dirname, "../static/spa.js");
+  const spaPath = path3.join(xpineDistDir, "./src/static/spa.js");
   const content = fs2.readFileSync(spaPath, "utf-8");
   fs2.appendFileSync(tempFilePath, `
 ` + content);
@@ -448,6 +453,7 @@ async function loadSecretsManagerSecrets() {
     Object.keys(secretValue).forEach((key) => {
       process.env[key] = secretValue[key];
     });
+    client.destroy();
   } catch (err) {
     console.error(`Could not load secret: ${process.env.SECRET_NAME}`);
     return null;
@@ -458,9 +464,9 @@ async function loadSecretsManagerSecrets() {
 await setupEnv();
 async function runDevServer() {
   process.env.NODE_ENV = "development";
-  const startServer = await import(config.serverDistAppPath + `?cache=${Date.now()}`);
+  const startServer = (await import(config.serverDistAppPath + `?cache=${Date.now()}`)).default;
   await buildApp(true);
-  let appServer = await startServer.default();
+  let appServer = await startServer();
   const watcher = chokidar.watch(config.srcDir, {
     ignoreInitial: true,
     // Ignore map and prisma files
@@ -469,10 +475,10 @@ async function runDevServer() {
   watcher.on("all", async (event, path6) => {
     const shouldReloadServer = path6.startsWith(config.serverDir) && !path6.startsWith(config.runDir) || ["add", "unlink"].includes(event) && path6.startsWith(config.pagesDir);
     if (shouldReloadServer) {
-      appServer.server.close();
+      await appServer.server.close();
       await buildApp(true);
-      const startServer2 = await import(config.serverDistAppPath + `?cache=${Date.now()}`);
-      appServer = await startServer2.default();
+      const startServer2 = (await import(config.serverDistAppPath + `?cache=${Date.now()}`)).default;
+      appServer = await startServer2();
       return;
     }
     await buildApp(true);

package/dist/src/scripts/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/scripts/build.ts"],"names":[],"mappings":"AAsBA,wBAAsB,QAAQ,CAAC,KAAK,UAAQ,iBAa3C;AA4LD,wBAAsB,QAAQ,kBAW7B;AAGD,wBAAsB,yBAAyB,kBAgB9C;AAOD,wBAAsB,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,GAAG,QAAQ,GAAG,KAAK,EAAE,eAAe,WAAkB,iBAahH"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/scripts/build.ts"],"names":[],"mappings":"AAyBA,wBAAsB,QAAQ,CAAC,KAAK,UAAQ,iBAa3C;AA4LD,wBAAsB,QAAQ,kBAW7B;AAGD,wBAAsB,yBAAyB,kBAgB9C;AAOD,wBAAsB,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,GAAG,QAAQ,GAAG,KAAK,EAAE,eAAe,WAAkB,iBAahH"}

package/dist/src/scripts/runDevServer.d.ts

@@ -0,0 +1,2 @@
+export declare function runDevServer(): Promise<void>;
+//# sourceMappingURL=runDevServer.d.ts.map

package/dist/src/scripts/runDevServer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"runDevServer.d.ts","sourceRoot":"","sources":["../../../src/scripts/runDevServer.ts"],"names":[],"mappings":"AAYA,wBAAsB,YAAY,kBAiDjC"}

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

@@ -125,8 +125,12 @@ import path2 from "path";
 
 // src/util/require.ts
 import { createRequire } from "module";
-var require2 = createRequire(import.meta.url);
-var require_default = require2;
+var require_default = createRequire(import.meta.url);
+function getXPineDistDir() {
+  const dir = import.meta.dirname;
+  const splitDir = dir.split("/xpine/dist");
+  return splitDir[0] + "/xpine/dist";
+}
 
 // src/util/get-config.ts
 var rootDir = process.cwd();
@@ -192,6 +196,7 @@ var extensions = [".ts", ".tsx"];
 var packageJson = JSON.parse(fs2.readFileSync(config.packageJsonPath, "utf-8"));
 var allPackages = Object.keys(packageJson.devDependencies).concat(Object.keys(packageJson.dependencies));
 var allPackagesIncludingNode = allPackages.concat(builtinModules);
+var xpineDistDir = getXPineDistDir();
 async function buildApp(isDev = false) {
   try {
     const srcDirFiles = globSync(config.srcDir + "/**/*.{js,ts,tsx,jsx}");
@@ -238,7 +243,7 @@ async function buildAppFiles(files, isDev) {
               }
               let outputPath = args.path + (existsAsFile ? "" : "/index") + ".js";
               outputPath = args.path.endsWith(".js") || args.path.endsWith(".mjs") ? args.path : outputPath;
-              return { path: outputPath, external: true };
+              return { path: outputPath + (isDev ? `?cache=${Date.now()}` : ""), external: true };
             }
           });
         }
@@ -317,13 +322,13 @@ async function buildClientSideFiles(alpineDataFiles = [], isDev) {
   await logSize(config.distPublicDir, "client");
 }
 function writeDevServerClientSideCode(tempFilePath) {
-  const devServerPath = path3.join(import.meta.dirname, "../static/dev-server.js");
+  const devServerPath = path3.join(xpineDistDir, "./src/static/dev-server.js");
   const content = fs2.readFileSync(devServerPath, "utf-8");
   fs2.appendFileSync(tempFilePath, `
 ` + content);
 }
 function writeSpaClientSideCode(tempFilePath) {
-  const spaPath = path3.join(import.meta.dirname, "../static/spa.js");
+  const spaPath = path3.join(xpineDistDir, "./src/static/spa.js");
   const content = fs2.readFileSync(spaPath, "utf-8");
   fs2.appendFileSync(tempFilePath, `
 ` + content);

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

@@ -132,8 +132,12 @@ import path2 from "path";
 
 // src/util/require.ts
 import { createRequire } from "module";
-var require2 = createRequire(import.meta.url);
-var require_default = require2;
+var require_default = createRequire(import.meta.url);
+function getXPineDistDir() {
+  const dir = import.meta.dirname;
+  const splitDir = dir.split("/xpine/dist");
+  return splitDir[0] + "/xpine/dist";
+}
 
 // src/util/get-config.ts
 var rootDir = process.cwd();
@@ -199,6 +203,7 @@ var extensions = [".ts", ".tsx"];
 var packageJson = JSON.parse(fs2.readFileSync(config.packageJsonPath, "utf-8"));
 var allPackages = Object.keys(packageJson.devDependencies).concat(Object.keys(packageJson.dependencies));
 var allPackagesIncludingNode = allPackages.concat(builtinModules);
+var xpineDistDir = getXPineDistDir();
 async function buildApp(isDev = false) {
   try {
     const srcDirFiles = globSync(config.srcDir + "/**/*.{js,ts,tsx,jsx}");
@@ -245,7 +250,7 @@ async function buildAppFiles(files, isDev) {
               }
               let outputPath = args.path + (existsAsFile ? "" : "/index") + ".js";
               outputPath = args.path.endsWith(".js") || args.path.endsWith(".mjs") ? args.path : outputPath;
-              return { path: outputPath, external: true };
+              return { path: outputPath + (isDev ? `?cache=${Date.now()}` : ""), external: true };
             }
           });
         }
@@ -324,13 +329,13 @@ async function buildClientSideFiles(alpineDataFiles = [], isDev) {
   await logSize(config.distPublicDir, "client");
 }
 function writeDevServerClientSideCode(tempFilePath) {
-  const devServerPath = path3.join(import.meta.dirname, "../static/dev-server.js");
+  const devServerPath = path3.join(xpineDistDir, "./src/static/dev-server.js");
   const content = fs2.readFileSync(devServerPath, "utf-8");
   fs2.appendFileSync(tempFilePath, `
 ` + content);
 }
 function writeSpaClientSideCode(tempFilePath) {
-  const spaPath = path3.join(import.meta.dirname, "../static/spa.js");
+  const spaPath = path3.join(xpineDistDir, "./src/static/spa.js");
   const content = fs2.readFileSync(spaPath, "utf-8");
   fs2.appendFileSync(tempFilePath, `
 ` + content);
@@ -450,6 +455,7 @@ async function loadSecretsManagerSecrets() {
     Object.keys(secretValue).forEach((key) => {
       process.env[key] = secretValue[key];
     });
+    client.destroy();
   } catch (err) {
     console.error(`Could not load secret: ${process.env.SECRET_NAME}`);
     return null;
@@ -460,9 +466,9 @@ async function loadSecretsManagerSecrets() {
 await setupEnv();
 async function runDevServer() {
   process.env.NODE_ENV = "development";
-  const startServer = await import(config.serverDistAppPath + `?cache=${Date.now()}`);
+  const startServer = (await import(config.serverDistAppPath + `?cache=${Date.now()}`)).default;
   await buildApp(true);
-  let appServer = await startServer.default();
+  let appServer = await startServer();
   const watcher = chokidar.watch(config.srcDir, {
     ignoreInitial: true,
     // Ignore map and prisma files
@@ -471,10 +477,10 @@ async function runDevServer() {
   watcher.on("all", async (event, path6) => {
     const shouldReloadServer = path6.startsWith(config.serverDir) && !path6.startsWith(config.runDir) || ["add", "unlink"].includes(event) && path6.startsWith(config.pagesDir);
     if (shouldReloadServer) {
-      appServer.server.close();
+      await appServer.server.close();
       await buildApp(true);
-      const startServer2 = await import(config.serverDistAppPath + `?cache=${Date.now()}`);
-      appServer = await startServer2.default();
+      const startServer2 = (await import(config.serverDistAppPath + `?cache=${Date.now()}`)).default;
+      appServer = await startServer2();
       return;
     }
     await buildApp(true);

package/dist/src/util/require.d.ts

@@ -1,3 +1,4 @@
-declare const require: NodeJS.Require;
-export default require;
+declare const _default: NodeJS.Require;
+export default _default;
+export declare function getXPineDistDir(): string;
 //# sourceMappingURL=require.d.ts.map

package/dist/src/util/require.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"require.d.ts","sourceRoot":"","sources":["../../../src/util/require.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,OAAO,gBAAiC,CAAC;AAE/C,eAAe,OAAO,CAAC"}
+{"version":3,"file":"require.d.ts","sourceRoot":"","sources":["../../../src/util/require.ts"],"names":[],"mappings":";AAEA,wBAA8C;AAE9C,wBAAgB,eAAe,WAI9B"}

package/package.json

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