edge-functions 2.7.1 → 2.7.2

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+### [2.7.2](https://github.com/aziontech/vulcan/compare/v2.7.1...v2.7.2) (2024-05-10)
+
+
+### Bug Fixes
+
+* vite with typescript and react.js ([#326](https://github.com/aziontech/vulcan/issues/326)) ([7b8a235](https://github.com/aziontech/vulcan/commit/7b8a235ef3fbaf45b2035d99212ba42bf21fdb2d))
+
+### [2.7.2-stage.1](https://github.com/aziontech/vulcan/compare/v2.7.1...v2.7.2-stage.1) (2024-05-09)
+
+
+### Bug Fixes
+
+* react with vite ([d1eb167](https://github.com/aziontech/vulcan/commit/d1eb1676df781eca28271da29a0fbdfe1e4676a3))
+* react/vue with vite (preset) ([#325](https://github.com/aziontech/vulcan/issues/325)) ([976bb2e](https://github.com/aziontech/vulcan/commit/976bb2e23a8ccd5ffce5ffb85fb7ea812f4be5d6))
+* vite/vue with ts ([5446750](https://github.com/aziontech/vulcan/commit/54467505644c34f60330e14074786ddda6169fea))
+
 ### [2.7.1](https://github.com/aziontech/vulcan/compare/v2.7.0...v2.7.1) (2024-05-08)
 
 

package/README.md

@@ -40,7 +40,7 @@ Table:
 | Simple Js Esm                        | ✅      |
 | Simple Ts Esm                        | ✅      |
 
-Last test run date: 05/08/24 02:51:13 AM
+Last test run date: 05/10/24 02:55:23 AM
 ## Quick Installation
 
 For those who just want to use Vulcan in their project without contributing to the development, you can install it directly from npm.

package/lib/presets/custom/react/deliver/prebuild.js

@@ -1,6 +1,15 @@
-import { exec, getPackageManager, generateManifest } from '#utils';
+import {
+  exec,
+  getPackageManager,
+  generateManifest,
+  copyDirectory,
+} from '#utils';
+import { lstat, readFile, rm } from 'fs/promises';
+import { join } from 'path';
 
 const packageManager = await getPackageManager();
+const edgeStorageDir = '.edge/storage';
+const defaultViteOutDir = 'dist';
 
 const manifest = {
   origin: [
@@ -39,15 +48,88 @@ const manifest = {
   },
 };
 
+/**
+ * Check if the vite.config file exists.
+ * @returns {boolean} True if the file exists, false otherwise.
+ */
+async function viteConfigExists() {
+  const files = ['./vite.config.js', './vite.config.ts'];
+  const checks = files.map(async (file) => {
+    try {
+      await lstat(file);
+      return true;
+    } catch (err) {
+      return false;
+    }
+  });
+
+  const results = await Promise.all(checks);
+  return results.includes(true);
+}
+
+/**
+ * Read vite.config build output
+ * @returns {object} The parsed configuration object or null if the file doesn't exist.
+ */
+async function readViteBuildOutput() {
+  try {
+    const isTypescript = await lstat('./vite.config.ts').then(
+      () => true,
+      () => false,
+    );
+    const pathConfigFile = join(
+      process.cwd(),
+      isTypescript ? 'vite.config.ts' : 'vite.config.js',
+    );
+    const configFileContent = await readFile(pathConfigFile, 'utf-8');
+    const defineConfig = configFileContent.match(/defineConfig\(([\s\S]*)\)/);
+    if (!defineConfig) {
+      throw new Error('defineConfig not found');
+    }
+    const buildConfig = defineConfig[1].match(/build: *({[\s\S]*?}),/);
+    // eslint-disable-next-line no-eval
+    const buildConfigObject = eval(`(${buildConfig[1]})`);
+    return Promise.resolve({ build: buildConfigObject });
+  } catch (err) {
+    return null;
+  }
+}
+
 /**
  * Runs custom prebuild actions
  */
 async function prebuild() {
-  await exec(
-    `BUILD_PATH="./.edge/storage" ${packageManager} run build`,
-    'React',
-    true,
-  );
+  const npmArgsForward = packageManager === 'npm' ? '--' : '';
+
+  let outDir = defaultViteOutDir;
+  const destPath = edgeStorageDir;
+
+  const isViteProject = await viteConfigExists();
+
+  if (isViteProject) {
+    await exec(
+      `${packageManager} run build ${npmArgsForward}`,
+      'Vue/Vite',
+      true,
+    );
+
+    const config = await readViteBuildOutput();
+
+    if (config?.build?.outDir) {
+      outDir = config.build.outDir;
+    }
+
+    copyDirectory(outDir, destPath);
+    rm(outDir, { recursive: true, force: true });
+  }
+
+  if (!isViteProject) {
+    await exec(
+      `BUILD_PATH="./.edge/storage" ${packageManager} run build`,
+      'React',
+      true,
+    );
+  }
   await generateManifest(manifest);
 }
 

package/lib/presets/custom/vue/deliver/prebuild.js

@@ -5,6 +5,7 @@ import {
   generateManifest,
 } from '#utils';
 import { lstat, readFile, rm } from 'fs/promises';
+import { join } from 'path';
 
 const packageManager = await getPackageManager();
 const edgeStorageDir = '.edge/storage';
@@ -48,31 +49,50 @@ const manifest = {
 };
 
 /**
- * Check if the vite.config.js file exists.
+ * Check if the vite.config file exists.
  * @returns {boolean} True if the file exists, false otherwise.
  */
 async function viteConfigExists() {
-  try {
-    await lstat('./vite.config.js');
-    return true;
-  } catch (err) {
-    return false;
-  }
-}
+  const files = ['./vite.config.js', './vite.config.ts'];
+  const checks = files.map(async (file) => {
+    try {
+      await lstat(file);
+      return true;
+    } catch (err) {
+      return false;
+    }
+  });
 
+  const results = await Promise.all(checks);
+  return results.includes(true);
+}
 /**
- * Read and parse the vite.config.js file.
+ * Read vite.config build output
  * @returns {object} The parsed configuration object or null if the file doesn't exist.
  */
-async function readViteConfig() {
+async function readViteBuildOutput() {
   try {
-    const configFileContent = await readFile('./vite.config.js', 'utf-8');
-    return JSON.parse(configFileContent.replace(/^module.exports = /, ''));
+    const isTypescript = await lstat('./vite.config.ts').then(
+      () => true,
+      () => false,
+    );
+    const pathConfigFile = join(
+      process.cwd(),
+      isTypescript ? 'vite.config.ts' : 'vite.config.js',
+    );
+    const configFileContent = await readFile(pathConfigFile, 'utf-8');
+    const defineConfig = configFileContent.match(/defineConfig\(([\s\S]*)\)/);
+    if (!defineConfig) {
+      throw new Error('defineConfig not found');
+    }
+    const buildConfig = defineConfig[1].match(/build: *({[\s\S]*?}),/);
+    // eslint-disable-next-line no-eval
+    const buildConfigObject = eval(`(${buildConfig[1]})`);
+    return Promise.resolve({ build: buildConfigObject });
   } catch (err) {
     return null;
   }
 }
-
 /**
  * Runs custom prebuild actions.
  */
@@ -91,7 +111,7 @@ async function prebuild() {
       true,
     );
 
-    const config = await readViteConfig();
+    const config = await readViteBuildOutput();
 
     if (config?.build?.outDir) {
       outDir = config.build.outDir;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "edge-functions",
   "type": "module",
-  "version": "2.7.1",
+  "version": "2.7.2",
   "description": "Tool to launch and build JavaScript/Frameworks. This tool automates polyfills for Edge Computing and assists in creating Workers, notably for the Azion platform.",
   "main": "lib/main.js",
   "bin": {