@wix/astro 1.0.25 → 1.0.26

package/build/index.js

@@ -6012,18 +6012,18 @@ var require_chokidar = __commonJS({
       return str;
     };
     var normalizePathToUnix = (path4) => toUnix(sysPath.normalize(toUnix(path4)));
-    var normalizeIgnored = (cwd2 = EMPTY_STR) => (path4) => {
+    var normalizeIgnored = (cwd = EMPTY_STR) => (path4) => {
       if (typeof path4 !== STRING_TYPE) return path4;
-      return normalizePathToUnix(sysPath.isAbsolute(path4) ? path4 : sysPath.join(cwd2, path4));
+      return normalizePathToUnix(sysPath.isAbsolute(path4) ? path4 : sysPath.join(cwd, path4));
     };
-    var getAbsolutePath = (path4, cwd2) => {
+    var getAbsolutePath = (path4, cwd) => {
       if (sysPath.isAbsolute(path4)) {
         return path4;
       }
       if (path4.startsWith(BANG)) {
-        return BANG + sysPath.join(cwd2, path4.slice(1));
+        return BANG + sysPath.join(cwd, path4.slice(1));
       }
-      return sysPath.join(cwd2, path4);
+      return sysPath.join(cwd, path4);
     };
     var undef = (opts, key) => opts[key] === void 0;
     var DirEntry = class {
@@ -6224,12 +6224,12 @@ var require_chokidar = __commonJS({
        * @returns {FSWatcher} for chaining
        */
       add(paths_, _origAdd, _internal) {
-        const { cwd: cwd2, disableGlobbing } = this.options;
+        const { cwd, disableGlobbing } = this.options;
         this.closed = false;
         let paths = unifyPaths(paths_);
-        if (cwd2) {
+        if (cwd) {
           paths = paths.map((path4) => {
-            const absPath = getAbsolutePath(path4, cwd2);
+            const absPath = getAbsolutePath(path4, cwd);
             if (disableGlobbing || !isGlob(path4)) {
               return absPath;
             }
@@ -6276,10 +6276,10 @@ var require_chokidar = __commonJS({
       unwatch(paths_) {
         if (this.closed) return this;
         const paths = unifyPaths(paths_);
-        const { cwd: cwd2 } = this.options;
+        const { cwd } = this.options;
         paths.forEach((path4) => {
           if (!sysPath.isAbsolute(path4) && !this._closers.has(path4)) {
-            if (cwd2) path4 = sysPath.join(cwd2, path4);
+            if (cwd) path4 = sysPath.join(cwd, path4);
             path4 = sysPath.resolve(path4);
           }
           this._closePath(path4);
@@ -6522,11 +6522,11 @@ var require_chokidar = __commonJS({
       _isIgnored(path4, stats) {
         if (this.options.atomic && DOT_RE.test(path4)) return true;
         if (!this._userIgnored) {
-          const { cwd: cwd2 } = this.options;
+          const { cwd } = this.options;
           const ign = this.options.ignored;
-          const ignored = ign && ign.map(normalizeIgnored(cwd2));
+          const ignored = ign && ign.map(normalizeIgnored(cwd));
           const paths = arrify(ignored).filter((path5) => typeof path5 === STRING_TYPE && !isGlob(path5)).map((path5) => path5 + SLASH_GLOBSTAR);
-          const list = this._getGlobIgnored().map(normalizeIgnored(cwd2)).concat(ignored, paths);
+          const list = this._getGlobIgnored().map(normalizeIgnored(cwd)).concat(ignored, paths);
           this._userIgnored = anymatch(list, void 0, ANYMATCH_OPTS);
         }
         return this._userIgnored([path4, stats]);
@@ -6759,8 +6759,8 @@ var require_path = __commonJS({
       return filepath.replace(/\\/g, "/");
     }
     exports.unixify = unixify;
-    function makeAbsolute(cwd2, filepath) {
-      return path4.resolve(cwd2, filepath);
+    function makeAbsolute(cwd, filepath) {
+      return path4.resolve(cwd, filepath);
     }
     exports.makeAbsolute = makeAbsolute;
     function removeLeadingDotSegment(entry) {
@@ -11711,12 +11711,11 @@ async function buildBackofficeComponent({
   codegenDir,
   component,
   entryFileName,
-  injectRoute,
-  rootDir
+  injectRoute
 }) {
   const directory = join3(codegenDir, component.manifest.compId);
   await outputDir(directory);
-  const entryFilePath = join3(rootDir, component.directory, entryFileName);
+  const entryFilePath = join3(component.directory, entryFileName);
   const entrypoint = join3(directory, `entry.astro`);
   const HocEntrypoint = join3(directory, `wrapper.tsx`);
   await writeFile2(
@@ -11758,13 +11757,12 @@ import { join as join4 } from "path";
 async function buildServicePluginComponent({
   codegenDir,
   component,
-  injectRoute,
-  rootDir
+  injectRoute
 }) {
   const directory = join4(codegenDir, component.manifest.compId);
   await outputDir(directory);
   const entrypoint = join4(directory, `entry.ts`);
-  const entryFilePath = join4(rootDir, component.directory, "plugin.ts");
+  const entryFilePath = join4(component.directory, "plugin.ts");
   await writeFile3(
     entrypoint,
     defaultOutdent`
@@ -11788,13 +11786,12 @@ import { join as join5 } from "path";
 async function buildWebhookComponent({
   codegenDir,
   component,
-  injectRoute,
-  rootDir
+  injectRoute
 }) {
   const directory = join5(codegenDir, component.manifest.compId);
   await outputDir(directory);
   const entrypoint = join5(directory, `entry.ts`);
-  const entryFilePath = join5(rootDir, component.directory, "event.ts");
+  const entryFilePath = join5(component.directory, "event.ts");
   await writeFile4(
     entrypoint,
     defaultOutdent`
@@ -11818,7 +11815,6 @@ async function buildComponents({
   isDev,
   model
 }) {
-  const { rootDir } = model;
   const injectRoute = isDev ? () => null : originalInjectRoute;
   const backofficeCodegenDir = join6(extensionsDir, "backoffice");
   const webhooksCodegenDir = join6(extensionsDir, "webhooks");
@@ -11836,8 +11832,7 @@ async function buildComponents({
           codegenDir: backofficeCodegenDir,
           component,
           entryFileName: "widget.tsx",
-          injectRoute,
-          rootDir
+          injectRoute
         });
         break;
       }
@@ -11849,8 +11844,7 @@ async function buildComponents({
           codegenDir: backofficeCodegenDir,
           component,
           entryFileName: "modal.tsx",
-          injectRoute,
-          rootDir
+          injectRoute
         });
         break;
       }
@@ -11862,8 +11856,7 @@ async function buildComponents({
           codegenDir: backofficeCodegenDir,
           component,
           entryFileName: "page.tsx",
-          injectRoute,
-          rootDir
+          injectRoute
         });
         break;
       }
@@ -11874,8 +11867,7 @@ async function buildComponents({
         await buildServicePluginComponent({
           codegenDir: servicePluginsCodegenDir,
           component,
-          injectRoute,
-          rootDir
+          injectRoute
         });
         break;
       }
@@ -11886,8 +11878,7 @@ async function buildComponents({
         await buildServicePluginComponent({
           codegenDir: servicePluginsCodegenDir,
           component,
-          injectRoute,
-          rootDir
+          injectRoute
         });
         break;
       }
@@ -11898,8 +11889,7 @@ async function buildComponents({
         await buildServicePluginComponent({
           codegenDir: servicePluginsCodegenDir,
           component,
-          injectRoute,
-          rootDir
+          injectRoute
         });
         break;
       }
@@ -11910,8 +11900,7 @@ async function buildComponents({
         await buildServicePluginComponent({
           codegenDir: servicePluginsCodegenDir,
           component,
-          injectRoute,
-          rootDir
+          injectRoute
         });
         break;
       }
@@ -11922,8 +11911,7 @@ async function buildComponents({
         await buildServicePluginComponent({
           codegenDir: servicePluginsCodegenDir,
           component,
-          injectRoute,
-          rootDir
+          injectRoute
         });
         break;
       }
@@ -11934,8 +11922,7 @@ async function buildComponents({
         await buildServicePluginComponent({
           codegenDir: servicePluginsCodegenDir,
           component,
-          injectRoute,
-          rootDir
+          injectRoute
         });
         break;
       }
@@ -11946,8 +11933,7 @@ async function buildComponents({
         await buildWebhookComponent({
           codegenDir: webhooksCodegenDir,
           component,
-          injectRoute,
-          rootDir
+          injectRoute
         });
         break;
       }
@@ -11958,7 +11944,6 @@ async function buildComponents({
 // src/utils/createProjectModel.ts
 init_esm_shims();
 import { join as join7 } from "path";
-import { cwd } from "process";
 
 // ../../node_modules/globby/index.js
 init_esm_shims();
@@ -12233,26 +12218,26 @@ var ignoreFilesGlobOptions = {
 };
 var GITIGNORE_FILES_PATTERN = "**/.gitignore";
 var applyBaseToPattern = (pattern, base) => isNegativePattern(pattern) ? "!" + path3.posix.join(base, pattern.slice(1)) : path3.posix.join(base, pattern);
-var parseIgnoreFile = (file, cwd2) => {
-  const base = slash(path3.relative(cwd2, path3.dirname(file.filePath)));
+var parseIgnoreFile = (file, cwd) => {
+  const base = slash(path3.relative(cwd, path3.dirname(file.filePath)));
   return file.content.split(/\r?\n/).filter((line) => line && !line.startsWith("#")).map((pattern) => applyBaseToPattern(pattern, base));
 };
-var toRelativePath2 = (fileOrDirectory, cwd2) => {
-  cwd2 = slash(cwd2);
+var toRelativePath2 = (fileOrDirectory, cwd) => {
+  cwd = slash(cwd);
   if (path3.isAbsolute(fileOrDirectory)) {
-    if (slash(fileOrDirectory).startsWith(cwd2)) {
-      return path3.relative(cwd2, fileOrDirectory);
+    if (slash(fileOrDirectory).startsWith(cwd)) {
+      return path3.relative(cwd, fileOrDirectory);
     }
-    throw new Error(`Path ${fileOrDirectory} is not in cwd ${cwd2}`);
+    throw new Error(`Path ${fileOrDirectory} is not in cwd ${cwd}`);
   }
   return fileOrDirectory;
 };
-var getIsIgnoredPredicate = (files, cwd2) => {
-  const patterns = files.flatMap((file) => parseIgnoreFile(file, cwd2));
+var getIsIgnoredPredicate = (files, cwd) => {
+  const patterns = files.flatMap((file) => parseIgnoreFile(file, cwd));
   const ignores = (0, import_ignore.default)().add(patterns);
   return (fileOrDirectory) => {
     fileOrDirectory = toPath(fileOrDirectory);
-    fileOrDirectory = toRelativePath2(fileOrDirectory, cwd2);
+    fileOrDirectory = toRelativePath2(fileOrDirectory, cwd);
     return fileOrDirectory ? ignores.ignores(slash(fileOrDirectory)) : false;
   };
 };
@@ -12263,9 +12248,9 @@ var normalizeOptions = (options = {}) => ({
   ignore: [...options.ignore ?? [], ...defaultIgnoredDirectories]
 });
 var isIgnoredByIgnoreFiles = async (patterns, options) => {
-  const { cwd: cwd2, suppressErrors, deep, ignore } = normalizeOptions(options);
+  const { cwd, suppressErrors, deep, ignore } = normalizeOptions(options);
   const paths = await (0, import_fast_glob.default)(patterns, {
-    cwd: cwd2,
+    cwd,
     suppressErrors,
     deep,
     ignore,
@@ -12277,12 +12262,12 @@ var isIgnoredByIgnoreFiles = async (patterns, options) => {
       content: await fsPromises2.readFile(filePath, "utf8")
     }))
   );
-  return getIsIgnoredPredicate(files, cwd2);
+  return getIsIgnoredPredicate(files, cwd);
 };
 var isIgnoredByIgnoreFilesSync = (patterns, options) => {
-  const { cwd: cwd2, suppressErrors, deep, ignore } = normalizeOptions(options);
+  const { cwd, suppressErrors, deep, ignore } = normalizeOptions(options);
   const paths = import_fast_glob.default.sync(patterns, {
-    cwd: cwd2,
+    cwd,
     suppressErrors,
     deep,
     ignore,
@@ -12292,7 +12277,7 @@ var isIgnoredByIgnoreFilesSync = (patterns, options) => {
     filePath,
     content: fs2.readFileSync(filePath, "utf8")
   }));
-  return getIsIgnoredPredicate(files, cwd2);
+  return getIsIgnoredPredicate(files, cwd);
 };
 
 // ../../node_modules/globby/index.js
@@ -12301,41 +12286,41 @@ var assertPatternsInput = (patterns) => {
     throw new TypeError("Patterns must be a string or an array of strings");
   }
 };
-var normalizePathForDirectoryGlob = (filePath, cwd2) => {
+var normalizePathForDirectoryGlob = (filePath, cwd) => {
   const path4 = isNegativePattern(filePath) ? filePath.slice(1) : filePath;
-  return nodePath.isAbsolute(path4) ? path4 : nodePath.join(cwd2, path4);
+  return nodePath.isAbsolute(path4) ? path4 : nodePath.join(cwd, path4);
 };
 var getDirectoryGlob = ({ directoryPath, files, extensions }) => {
   const extensionGlob = extensions?.length > 0 ? `.${extensions.length > 1 ? `{${extensions.join(",")}}` : extensions[0]}` : "";
   return files ? files.map((file) => nodePath.posix.join(directoryPath, `**/${nodePath.extname(file) ? file : `${file}${extensionGlob}`}`)) : [nodePath.posix.join(directoryPath, `**${extensionGlob ? `/*${extensionGlob}` : ""}`)];
 };
 var directoryToGlob = async (directoryPaths, {
-  cwd: cwd2 = process3.cwd(),
+  cwd = process3.cwd(),
   files,
   extensions
 } = {}) => {
   const globs = await Promise.all(
-    directoryPaths.map(async (directoryPath) => await isDirectory(normalizePathForDirectoryGlob(directoryPath, cwd2)) ? getDirectoryGlob({ directoryPath, files, extensions }) : directoryPath)
+    directoryPaths.map(async (directoryPath) => await isDirectory(normalizePathForDirectoryGlob(directoryPath, cwd)) ? getDirectoryGlob({ directoryPath, files, extensions }) : directoryPath)
   );
   return globs.flat();
 };
 var directoryToGlobSync = (directoryPaths, {
-  cwd: cwd2 = process3.cwd(),
+  cwd = process3.cwd(),
   files,
   extensions
-} = {}) => directoryPaths.flatMap((directoryPath) => isDirectorySync(normalizePathForDirectoryGlob(directoryPath, cwd2)) ? getDirectoryGlob({ directoryPath, files, extensions }) : directoryPath);
+} = {}) => directoryPaths.flatMap((directoryPath) => isDirectorySync(normalizePathForDirectoryGlob(directoryPath, cwd)) ? getDirectoryGlob({ directoryPath, files, extensions }) : directoryPath);
 var toPatternsArray = (patterns) => {
   patterns = [...new Set([patterns].flat())];
   assertPatternsInput(patterns);
   return patterns;
 };
-var checkCwdOption = (cwd2) => {
-  if (!cwd2) {
+var checkCwdOption = (cwd) => {
+  if (!cwd) {
     return;
   }
   let stat;
   try {
-    stat = fs3.statSync(cwd2);
+    stat = fs3.statSync(cwd);
   } catch {
     return;
   }
@@ -12415,17 +12400,17 @@ var convertNegativePatterns = (patterns, options) => {
   }
   return tasks;
 };
-var normalizeExpandDirectoriesOption = (options, cwd2) => ({
-  ...cwd2 ? { cwd: cwd2 } : {},
+var normalizeExpandDirectoriesOption = (options, cwd) => ({
+  ...cwd ? { cwd } : {},
   ...Array.isArray(options) ? { files: options } : options
 });
 var generateTasks = async (patterns, options) => {
   const globTasks = convertNegativePatterns(patterns, options);
-  const { cwd: cwd2, expandDirectories } = options;
+  const { cwd, expandDirectories } = options;
   if (!expandDirectories) {
     return globTasks;
   }
-  const directoryToGlobOptions = normalizeExpandDirectoriesOption(expandDirectories, cwd2);
+  const directoryToGlobOptions = normalizeExpandDirectoriesOption(expandDirectories, cwd);
   return Promise.all(
     globTasks.map(async (task) => {
       let { patterns: patterns2, options: options2 } = task;
@@ -12434,7 +12419,7 @@ var generateTasks = async (patterns, options) => {
         options2.ignore
       ] = await Promise.all([
         directoryToGlob(patterns2, directoryToGlobOptions),
-        directoryToGlob(options2.ignore, { cwd: cwd2 })
+        directoryToGlob(options2.ignore, { cwd })
       ]);
       return { patterns: patterns2, options: options2 };
     })
@@ -12442,15 +12427,15 @@ var generateTasks = async (patterns, options) => {
 };
 var generateTasksSync = (patterns, options) => {
   const globTasks = convertNegativePatterns(patterns, options);
-  const { cwd: cwd2, expandDirectories } = options;
+  const { cwd, expandDirectories } = options;
   if (!expandDirectories) {
     return globTasks;
   }
-  const directoryToGlobSyncOptions = normalizeExpandDirectoriesOption(expandDirectories, cwd2);
+  const directoryToGlobSyncOptions = normalizeExpandDirectoriesOption(expandDirectories, cwd);
   return globTasks.map((task) => {
     let { patterns: patterns2, options: options2 } = task;
     patterns2 = directoryToGlobSync(patterns2, directoryToGlobSyncOptions);
-    options2.ignore = directoryToGlobSync(options2.ignore, { cwd: cwd2 });
+    options2.ignore = directoryToGlobSync(options2.ignore, { cwd });
     return { patterns: patterns2, options: options2 };
   });
 };
@@ -16508,8 +16493,11 @@ var source_default = chalk;
 // src/utils/loadEnvVars.ts
 import { loadEnv } from "vite";
 var wixClientIdEnvVar = "WIX_CLIENT_ID";
-function loadEnvVars(logger) {
-  const env2 = loadEnv("production", process.cwd(), "");
+function loadEnvVars({
+  logger,
+  rootDir
+}) {
+  const env2 = loadEnv("production", rootDir, "");
   const appId = env2[wixClientIdEnvVar];
   if (appId == null) {
     logger.error(
@@ -16538,9 +16526,11 @@ function loadEnvVars(logger) {
 }
 
 // src/utils/createProjectModel.ts
-async function createProjectModel(logger) {
-  const rootDir = cwd();
-  const { appId, env: env2 } = loadEnvVars(logger);
+async function createProjectModel({
+  logger,
+  rootDir
+}) {
+  const { appId, env: env2 } = loadEnvVars({ logger, rootDir });
   const componentsPaths = await globby(
     pathToGlobby(join7(EXTENSIONS_DIR, "*")),
     {
@@ -16550,7 +16540,8 @@ async function createProjectModel(logger) {
   );
   const components = [];
   const unknownComponents = [];
-  for (const componentPath of componentsPaths) {
+  for (const componentRelativePath of componentsPaths) {
+    const componentPath = join7(rootDir, componentRelativePath);
     const extensionManifest = await readExtensionManifest(componentPath);
     const knownManifest = parseKnownExtensionManifest(extensionManifest);
     if (knownManifest != null) {
@@ -16880,10 +16871,10 @@ var createIntegration = (options = {
   return {
     hooks: {
       async "astro:build:done"({ logger }) {
-        const model = await createProjectModel(logger);
+        const rootDir = fileURLToPath5(_config.root);
+        const model = await createProjectModel({ logger, rootDir });
         const appManifest = generateAppManifest(model);
         const outDir = fileURLToPath5(_config.outDir);
-        const rootDir = fileURLToPath5(_config.root);
         const appManifestPath = join8(outDir, "_wix/app-manifest.json");
         await writeJson(appManifestPath, appManifest, { spaces: 2 });
         await writeJson(
@@ -16910,7 +16901,7 @@ var createIntegration = (options = {
         const codegenDir = fileURLToPath5(codegenDirURL);
         const rootDir = fileURLToPath5(config2.root);
         const extensionsDir = join8(codegenDir, "extensions");
-        const model = await createProjectModel(logger);
+        const model = await createProjectModel({ logger, rootDir });
         injectScript(
           "before-hydration",
           defaultOutdent`
@@ -17041,7 +17032,7 @@ var createIntegration = (options = {
             ignoreInitial: true,
             useFsEvents: false
           }).on("all", async () => {
-            const model2 = await createProjectModel(logger);
+            const model2 = await createProjectModel({ logger, rootDir });
             await removeUnusedCodegenFiles({ extensionsDir, model: model2 });
             await buildComponents({
               extensionsDir,
@@ -17053,9 +17044,10 @@ var createIntegration = (options = {
         }
       },
       "astro:server:setup": ({ logger, server }) => {
+        const rootDir = fileURLToPath5(_config.root);
         server.middlewares.use(async (req, res, next) => {
           if (req.url === "/_wix/app-manifest.json") {
-            const model = await createProjectModel(logger);
+            const model = await createProjectModel({ logger, rootDir });
             const appManifest = generateAppManifest(model);
             res.setHeader("Content-Type", "application/json");
             res.end(JSON.stringify(appManifest));