@wix/astro 1.0.9 → 1.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/astro",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "devDependencies": {
     "@wix/dashboard": "^1.3.35",
     "@wix/sdk": "^1.15.17",
@@ -42,5 +42,5 @@
       ]
     }
   },
-  "falconPackageHash": "b251cbdb69f32089c9cf5f43829ea7ff50cd2e9047db782ba373ae5f"
+  "falconPackageHash": "65862338b634d01a1ba6e654863433d3994fd23e9232010e19a045d6"
 }

package/src/index.ts

@@ -1,4 +1,5 @@
 import { join } from 'node:path';
+import { fileURLToPath } from 'node:url';
 import type { AstroConfig, AstroIntegration } from 'astro';
 import { envField, passthroughImageService } from 'astro/config';
 import chokidar from 'chokidar';
@@ -27,15 +28,15 @@ const createIntegration = (): AstroIntegration => {
         model ??= await createProjectModel(logger);
         const appManifest = generateAppManifest(model);
 
-        const appManifestPath = join(
-          _config.outDir.pathname,
-          '_wix/app-manifest.json'
-        );
+        const outDir = fileURLToPath(_config.outDir);
+        const rootDir = fileURLToPath(_config.outDir);
+
+        const appManifestPath = join(outDir, '_wix/app-manifest.json');
 
         await writeJson(appManifestPath, appManifest, { spaces: 2 });
 
         await writeJson(
-          join(_config.root.pathname, GIT_IGNORED_DIR, 'build-metadata.json'),
+          join(rootDir, GIT_IGNORED_DIR, 'build-metadata.json'),
           await resolveBuildMetadata(appManifestPath, _config),
           { spaces: 2 }
         );
@@ -53,7 +54,9 @@ const createIntegration = (): AstroIntegration => {
         logger,
         updateConfig,
       }) {
-        const { pathname: codegenDir } = createCodegenDir();
+        const codegenDirURL = createCodegenDir();
+        const codegenDir = fileURLToPath(codegenDirURL);
+        const rootDir = fileURLToPath(config.outDir);
 
         model ??= await createProjectModel(logger);
 
@@ -169,7 +172,7 @@ const createIntegration = (): AstroIntegration => {
 
           chokidar
             .watch([EXTENSIONS_DIR], {
-              cwd: config.root.pathname,
+              cwd: rootDir,
               ignoreInitial: true,
               useFsEvents: false,
             })
@@ -215,7 +218,7 @@ const createIntegration = (): AstroIntegration => {
 
           chokidar
             .watch([EXTENSIONS_DIR], {
-              cwd: config.root.pathname,
+              cwd: rootDir,
               ignoreInitial: true,
               useFsEvents: false,
             })
@@ -260,7 +263,7 @@ const createIntegration = (): AstroIntegration => {
 
           chokidar
             .watch([EXTENSIONS_DIR], {
-              cwd: config.root.pathname,
+              cwd: rootDir,
               ignoreInitial: true,
               useFsEvents: false,
             })

package/src/utils/resolveBuildMetadata.ts

@@ -1,3 +1,4 @@
+import { fileURLToPath } from 'node:url';
 import type { AstroConfig } from 'astro';
 import { pathExists } from './fs-utils.js';
 
@@ -5,7 +6,6 @@ interface BuildMetadata {
   appManifestPath: string;
   clientDir: string;
   outDir: string;
-  // In SSG (static site generation) mode, there is no `serverDir`, only the client side output.
   serverDir?: string;
 }
 
@@ -13,18 +13,25 @@ export async function resolveBuildMetadata(
   appManifestPath: string,
   config: AstroConfig
 ): Promise<BuildMetadata> {
-  const clientDir = (await pathExists(config.build.client.pathname))
-    ? config.build.client.pathname
-    : config.outDir.pathname;
+  const outDir = fileURLToPath(config.outDir);
+  const buildClientDir = fileURLToPath(config.build.client);
+  const buildServerDir = fileURLToPath(config.build.server);
+
+  // When there are only static assets, everything is under the out dir.
+  // When there are static and server, the output is in the appropriate folders
+  const clientDir = (await pathExists(buildClientDir))
+    ? buildClientDir
+    : outDir;
 
-  const serverDir = (await pathExists(config.build.server.pathname))
-    ? config.build.server.pathname
+  // In SSG (static site generation) mode, there is no `serverDir`, only the client side output.
+  const serverDir = (await pathExists(buildServerDir))
+    ? buildServerDir
     : undefined;
 
   return {
     appManifestPath,
     clientDir,
-    outDir: config.outDir.pathname,
+    outDir,
     serverDir,
   };
 }