v1.20.0-stage.15

README.md

@@ -211,7 +211,6 @@ const config = {
     entry: './src/index.js',
     preset: 'react',
     polyfills: true,
-    worker: true,
   },
   domain: {
     name: 'example.com',
@@ -302,7 +301,6 @@ const config = defineConfig({
       },
     },
     polyfills: true,
-    worker: true,
     extend: (config) => {
       // Customize bundler configuration
       return {
@@ -394,7 +392,6 @@ export default defineConfig({
     // Other build configurations
     entry: './src/index.ts',
     polyfills: true,
-    worker: true,
     memoryFS: {
       injectionDirs: ['./src/inject'],
       removePathPrefix: './src',

packages/config/README.md

@@ -313,7 +313,6 @@ Type definition for the build configuration.
 - `preset?: string | AzionBuildPreset` - The preset to be used, can be a string or an AzionBuildPreset object.
 - `entry?: string | string[] | Record<string, string>` - The entry file, can be a string, an array of strings, or an object.
 - `polyfills?: boolean` - Whether to include polyfills.
-- `worker?: boolean` - Whether to build a worker.
 - `extend?: (context: T) => T` - Function to extend the bundler configuration.
 - `memoryFS?: { injectionDirs: string[], removePathPrefix: string }` - In-memory file system configuration.
 
@@ -371,7 +370,6 @@ Type definition for the build configuration.
 - `setup: BundlerSetup` - Bundler configuration.
 - \*`bundler?: 'webpack' | 'esbuild'` - The bundler to be used.
 - `polyfills?: boolean` - Whether to include polyfills.
-- `worker?: boolean` - Whether to build a worker.
 - `extend?: (context: T) => T` - Function to extend the bundler configuration.
 - `memoryFS?: { injectionDirs: string[], removePathPrefix: string }` - In-memory file system configuration.
 

packages/config/src/configProcessor/helpers/schema.ts

@@ -492,10 +492,6 @@ const azionConfigSchema = {
               type: 'boolean',
               errorMessage: "The 'build.polyfills' must be a boolean",
             },
-            worker: {
-              type: 'boolean',
-              errorMessage: "The 'build.worker' must be a boolean",
-            },
             extend: {
               instanceof: 'Function',
               errorMessage: "The 'build.extend' must be a function",

packages/config/src/types.ts

@@ -321,7 +321,6 @@ export interface AzionBuild<T extends WebpackConfig | ESBuildConfig | unknown =
   bundler?: 'webpack' | 'esbuild';
   preset?: PresetInput;
   polyfills?: boolean;
-  worker?: boolean;
   extend?: (context: T) => T;
   memoryFS?: {
     injectionDirs: string[];

packages/presets/src/presets/astro/prebuild.ts

@@ -1,27 +1,46 @@
 import { copyDirectory, exec, getPackageManager } from 'azion/utils/node';
-import { readFile } from 'fs/promises';
-
-/**
- * Runs custom prebuild actions for Astro
- */
-async function prebuild() {
-  const packageManager = await getPackageManager();
-  const newOutDir = '.edge/storage';
-  let outDir = 'dist';
-
-  // check if an output path is specified in config file
-  const configFileContent = await readFile('./astro.config.mjs', 'utf-8');
-  const attributeMatch = Array.from(configFileContent.matchAll(/outDir:(.*)\n/g), (match) => match)[0];
-  if (attributeMatch) {
-    outDir = attributeMatch[1].trim();
+import { constants } from 'fs';
+import { access, readFile } from 'fs/promises';
+
+const CONFIG_FILES = ['astro.config.ts', 'astro.config.mjs', 'astro.config.js', 'astro.config.cjs'] as const;
+
+async function getAstroOutDir(): Promise<string> {
+  for (const configFile of CONFIG_FILES) {
+    try {
+      await access(configFile, constants.F_OK);
+      const configContent = await readFile(configFile, 'utf-8');
+
+      // Regex supports: outDir: 'path', outDir:"path", outDir: `path`
+      const outDirMatch = configContent.match(/outDir\s*:\s*['"`]([^'"`]+)['"`]/);
+
+      if (outDirMatch && outDirMatch[1]) {
+        return outDirMatch[1].trim();
+      }
+
+      break;
+    } catch {
+      continue;
+    }
   }
 
-  await exec(`${packageManager} run build`, {
-    scope: 'Astro',
-    verbose: true,
-  });
+  return 'dist'; // Default Astro output directory
+}
+
+async function prebuild(): Promise<void> {
+  try {
+    const [packageManager, outDir] = await Promise.all([getPackageManager(), getAstroOutDir()]);
+
+    const newOutDir = '.edge/storage';
 
-  copyDirectory(outDir, newOutDir);
+    await exec(`${packageManager} run build`, {
+      scope: 'Astro',
+      verbose: true,
+    });
+
+    copyDirectory(outDir, newOutDir);
+  } catch (error) {
+    throw new Error(`Error during Astro prebuild: ${error instanceof Error ? error.message : String(error)}`);
+  }
 }
 
 export default prebuild;