@vercel/microfrontends 0.13.0 → 0.14.0

package/dist/v2/microfrontends/server.js

@@ -1,6 +1,6 @@
 // src/config-v2/microfrontends/server/index.ts
-import fs4 from "node:fs";
-import { dirname as dirname3, join } from "node:path";
+import fs5 from "node:fs";
+import { dirname as dirname3, join as join2 } from "node:path";
 
 // src/config-v2/overrides/constants.ts
 var OVERRIDES_COOKIE_PREFIX = "vercel-micro-frontends-override";
@@ -347,19 +347,6 @@ var validateConfigDefaultApplication = (applicationConfigsById) => {
     );
   }
 };
-var validateConfigOptions = (options) => {
-  var _a;
-  if ((_a = options == null ? void 0 : options.vercel) == null ? void 0 : _a.previewDeploymentSuffix) {
-    if (!/^[a-zA-Z]{2,}\.[a-zA-Z]{2,}$/.test(
-      options.vercel.previewDeploymentSuffix
-    )) {
-      throw new MicrofrontendError(
-        `Invalid preview deployment suffix: ${options.vercel.previewDeploymentSuffix}. Should have be formatted like "vercel.app".`,
-        { type: "config", subtype: "invalid_preview_deployment_suffix" }
-      );
-    }
-  }
-};
 
 // src/config-v2/microfrontends-config/isomorphic/utils/generate-asset-prefix.ts
 var PREFIX = "vc-ap";
@@ -578,7 +565,6 @@ var MicrofrontendConfigIsomorphic = class {
       validateConfigPaths(c.applications);
       validateConfigDefaultApplication(c.applications);
     }
-    validateConfigOptions(c.options);
     return c;
   }
   static fromEnv({
@@ -854,29 +840,39 @@ function findPackagePath(opts) {
 // src/config-v2/microfrontends/utils/find-default-package.ts
 import { dirname as dirname2 } from "node:path";
 import { readFileSync as readFileSync2 } from "node:fs";
+import { parse as parse2 } from "jsonc-parser";
 import fg2 from "fast-glob";
+
+// src/config-v2/constants.ts
+var CONFIGURATION_FILENAMES = [
+  "microfrontends.jsonc",
+  "microfrontends.json"
+];
+
+// src/config-v2/microfrontends/utils/find-default-package.ts
 var configCache2 = {};
 function findDefaultMicrofrontendsPackages({
   repositoryRoot,
   applicationName
 }) {
   try {
-    const microfrontendsJsonPaths = fg2.globSync("**/microfrontends.json", {
-      cwd: repositoryRoot,
-      absolute: true,
-      onlyFiles: true,
-      followSymbolicLinks: false,
-      ignore: ["**/node_modules/**", "**/.git/**"]
-    });
+    const microfrontendsJsonPaths = fg2.globSync(
+      `**/{${CONFIGURATION_FILENAMES.join(",")}}`,
+      {
+        cwd: repositoryRoot,
+        absolute: true,
+        onlyFiles: true,
+        followSymbolicLinks: false,
+        ignore: ["**/node_modules/**", "**/.git/**"]
+      }
+    );
     const matchingPaths = [];
     for (const microfrontendsJsonPath of microfrontendsJsonPaths) {
       const microfrontendsJsonContent = readFileSync2(
         microfrontendsJsonPath,
         "utf-8"
       );
-      const microfrontendsJson = JSON.parse(
-        microfrontendsJsonContent
-      );
+      const microfrontendsJson = parse2(microfrontendsJsonContent);
       if (isMainConfig(microfrontendsJson) && microfrontendsJson.applications[applicationName]) {
         matchingPaths.push(microfrontendsJsonPath);
       }
@@ -906,7 +902,7 @@ function findDefaultMicrofrontendsPackage(opts) {
   const result = findDefaultMicrofrontendsPackages(opts);
   if (!result) {
     throw new Error(
-      `Error trying to resolve the main microfrontends.json configuration`
+      `Error trying to resolve the main microfrontends configuration`
     );
   }
   configCache2[cacheKey] = result;
@@ -958,6 +954,19 @@ function findPackageRoot(startDir) {
   );
 }
 
+// src/config-v2/microfrontends/utils/find-config.ts
+import fs4 from "node:fs";
+import { join } from "node:path";
+function findConfig({ dir }) {
+  for (const filename of CONFIGURATION_FILENAMES) {
+    const maybeConfig = join(dir, filename);
+    if (fs4.existsSync(maybeConfig)) {
+      return maybeConfig;
+    }
+  }
+  return null;
+}
+
 // src/config-v2/microfrontends/server/utils/get-output-file-path.ts
 import path4 from "node:path";
 
@@ -983,7 +992,7 @@ function getOutputFilePath() {
 }
 
 // src/config-v2/microfrontends/server/validation.ts
-import { parse as parse2 } from "jsonc-parser";
+import { parse as parse3 } from "jsonc-parser";
 import { Ajv } from "ajv";
 
 // src/config/errors.ts
@@ -1136,10 +1145,6 @@ var schema_v2_default = {
     VercelOptions: {
       type: "object",
       properties: {
-        previewDeploymentSuffix: {
-          type: "string",
-          description: "If your team uses a custom Preview Deployment Suffix, please specify it here. See https://vercel.com/docs/deployments/preview-deployment-suffix. The default is `vercel.app`."
-        },
         teamSlug: {
           type: "string",
           description: "Team slug for the Vercel team"
@@ -1333,7 +1338,7 @@ var SCHEMA = schema_v2_default;
 
 // src/config-v2/microfrontends/server/validation.ts
 function validateSchema(configString) {
-  const parsedConfig = parse2(configString);
+  const parsedConfig = parse3(configString);
   const ajv = new Ajv();
   const validate = ajv.compile(SCHEMA);
   const isValid = validate(parsedConfig);
@@ -1355,8 +1360,8 @@ var MicrofrontendsServer = class extends Microfrontends {
     pretty: true
   }) {
     const outputPath = getOutputFilePath();
-    fs4.mkdirSync(dirname3(outputPath), { recursive: true });
-    fs4.writeFileSync(
+    fs5.mkdirSync(dirname3(outputPath), { recursive: true });
+    fs5.writeFileSync(
       outputPath,
       JSON.stringify(
         this.config.toSchemaJson(),
@@ -1419,8 +1424,8 @@ var MicrofrontendsServer = class extends Microfrontends {
     return config;
   }
   /**
-   * Looks up the configuration by inferring the package root and looking for a microfrontends.json file. If a file is not found,
-   * it will look for a package in the repository with a microfrontends.json file that contains the current application
+   * Looks up the configuration by inferring the package root and looking for a microfrontends config file. If a file is not found,
+   * it will look for a package in the repository with a microfrontends file that contains the current application
    * and use that configuration.
    *
    * This can return either a Child or Main configuration.
@@ -1442,16 +1447,16 @@ var MicrofrontendsServer = class extends Microfrontends {
     }
     try {
       const packageRoot = findPackageRoot(directory);
-      const packageJsonPath = join(packageRoot, "package.json");
+      const packageJsonPath = join2(packageRoot, "package.json");
       const packageJson = JSON.parse(
-        fs4.readFileSync(packageJsonPath, "utf-8")
+        fs5.readFileSync(packageJsonPath, "utf-8")
       );
       if (!packageJson.name) {
         throw new Error(`No name found in package.json at ${packageJsonPath}`);
       }
       const configMeta = meta ?? { fromApp: packageJson.name };
-      const maybeConfig = join(packageRoot, "microfrontends.json");
-      if (fs4.existsSync(maybeConfig)) {
+      const maybeConfig = findConfig({ dir: packageRoot });
+      if (maybeConfig) {
         return MicrofrontendsServer.fromFile({
           filePath: maybeConfig,
           cookies,
@@ -1466,12 +1471,15 @@ var MicrofrontendsServer = class extends Microfrontends {
           repositoryRoot,
           applicationName: packageJson.name
         });
-        return MicrofrontendsServer.fromFile({
-          filePath: join(defaultPackage, "microfrontends.json"),
-          cookies,
-          meta: configMeta,
-          options
-        });
+        const maybeConfigFromDefault = findConfig({ dir: defaultPackage });
+        if (maybeConfigFromDefault) {
+          return MicrofrontendsServer.fromFile({
+            filePath: maybeConfigFromDefault,
+            cookies,
+            meta: configMeta,
+            options
+          });
+        }
       }
       throw new Error("Unable to infer");
     } catch (e) {
@@ -1491,7 +1499,7 @@ var MicrofrontendsServer = class extends Microfrontends {
     options
   }) {
     try {
-      const configJson = fs4.readFileSync(filePath, "utf-8");
+      const configJson = fs5.readFileSync(filePath, "utf-8");
       const config = MicrofrontendsServer.validate(configJson);
       if (!isMainConfig(config) && (options == null ? void 0 : options.resolveMainConfig)) {
         const repositoryRoot = findRepositoryRoot();
@@ -1507,9 +1515,15 @@ var MicrofrontendsServer = class extends Microfrontends {
               { type: "config", subtype: "not_found" }
             );
           }
-          const mainConfigPath = join(packagePath, "microfrontends.json");
+          const maybeConfig = findConfig({ dir: packagePath });
+          if (!maybeConfig) {
+            throw new MicrofrontendError(
+              `Could not find microfrontends configuration in ${packagePath}`,
+              { type: "config", subtype: "not_found" }
+            );
+          }
           return MicrofrontendsServer.fromMainConfigFile({
-            filePath: mainConfigPath,
+            filePath: maybeConfig,
             overrides: cookies ? parseOverrides(cookies) : void 0
           });
         }
@@ -1533,7 +1547,7 @@ var MicrofrontendsServer = class extends Microfrontends {
     overrides
   }) {
     try {
-      const config = fs4.readFileSync(filePath, "utf-8");
+      const config = fs5.readFileSync(filePath, "utf-8");
       const validatedConfig = MicrofrontendsServer.validate(config);
       if (!isMainConfig(validatedConfig)) {
         throw new MicrofrontendError(