@vercel/microfrontends 0.13.0 → 0.14.0

package/dist/v2/microfrontends/server.cjs

@@ -33,8 +33,8 @@ __export(server_exports, {
   MicrofrontendsServer: () => MicrofrontendsServer
 });
 module.exports = __toCommonJS(server_exports);
-var import_node_fs6 = __toESM(require("fs"), 1);
-var import_node_path7 = require("path");
+var import_node_fs7 = __toESM(require("fs"), 1);
+var import_node_path8 = require("path");
 
 // src/config-v2/overrides/constants.ts
 var OVERRIDES_COOKIE_PREFIX = "vercel-micro-frontends-override";
@@ -381,19 +381,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";
@@ -612,7 +599,6 @@ var MicrofrontendConfigIsomorphic = class {
       validateConfigPaths(c.applications);
       validateConfigDefaultApplication(c.applications);
     }
-    validateConfigOptions(c.options);
     return c;
   }
   static fromEnv({
@@ -888,29 +874,39 @@ function findPackagePath(opts) {
 // src/config-v2/microfrontends/utils/find-default-package.ts
 var import_node_path3 = require("path");
 var import_node_fs3 = require("fs");
+var import_jsonc_parser2 = require("jsonc-parser");
 var import_fast_glob2 = __toESM(require("fast-glob"), 1);
+
+// 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 = import_fast_glob2.default.globSync("**/microfrontends.json", {
-      cwd: repositoryRoot,
-      absolute: true,
-      onlyFiles: true,
-      followSymbolicLinks: false,
-      ignore: ["**/node_modules/**", "**/.git/**"]
-    });
+    const microfrontendsJsonPaths = import_fast_glob2.default.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 = (0, import_node_fs3.readFileSync)(
         microfrontendsJsonPath,
         "utf-8"
       );
-      const microfrontendsJson = JSON.parse(
-        microfrontendsJsonContent
-      );
+      const microfrontendsJson = (0, import_jsonc_parser2.parse)(microfrontendsJsonContent);
       if (isMainConfig(microfrontendsJson) && microfrontendsJson.applications[applicationName]) {
         matchingPaths.push(microfrontendsJsonPath);
       }
@@ -940,7 +936,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;
@@ -992,8 +988,21 @@ function findPackageRoot(startDir) {
   );
 }
 
+// src/config-v2/microfrontends/utils/find-config.ts
+var import_node_fs6 = __toESM(require("fs"), 1);
+var import_node_path6 = require("path");
+function findConfig({ dir }) {
+  for (const filename of CONFIGURATION_FILENAMES) {
+    const maybeConfig = (0, import_node_path6.join)(dir, filename);
+    if (import_node_fs6.default.existsSync(maybeConfig)) {
+      return maybeConfig;
+    }
+  }
+  return null;
+}
+
 // src/config-v2/microfrontends/server/utils/get-output-file-path.ts
-var import_node_path6 = __toESM(require("path"), 1);
+var import_node_path7 = __toESM(require("path"), 1);
 
 // src/config-v2/microfrontends/server/constants.ts
 var MFE_CONFIG_DEFAULT_FILE_PATH = "microfrontends";
@@ -1007,17 +1016,17 @@ function isVercel() {
 // src/config-v2/microfrontends/server/utils/get-output-file-path.ts
 function getOutputFilePath() {
   if (isVercel()) {
-    return import_node_path6.default.join(
+    return import_node_path7.default.join(
       ".vercel",
       MFE_CONFIG_DEFAULT_FILE_PATH,
       MFE_CONFIG_DEFAULT_FILE_NAME
     );
   }
-  return import_node_path6.default.join(MFE_CONFIG_DEFAULT_FILE_PATH, MFE_CONFIG_DEFAULT_FILE_NAME);
+  return import_node_path7.default.join(MFE_CONFIG_DEFAULT_FILE_PATH, MFE_CONFIG_DEFAULT_FILE_NAME);
 }
 
 // src/config-v2/microfrontends/server/validation.ts
-var import_jsonc_parser2 = require("jsonc-parser");
+var import_jsonc_parser3 = require("jsonc-parser");
 var import_ajv = require("ajv");
 
 // src/config/errors.ts
@@ -1170,10 +1179,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"
@@ -1367,7 +1372,7 @@ var SCHEMA = schema_v2_default;
 
 // src/config-v2/microfrontends/server/validation.ts
 function validateSchema(configString) {
-  const parsedConfig = (0, import_jsonc_parser2.parse)(configString);
+  const parsedConfig = (0, import_jsonc_parser3.parse)(configString);
   const ajv = new import_ajv.Ajv();
   const validate = ajv.compile(SCHEMA);
   const isValid = validate(parsedConfig);
@@ -1389,8 +1394,8 @@ var MicrofrontendsServer = class extends Microfrontends {
     pretty: true
   }) {
     const outputPath = getOutputFilePath();
-    import_node_fs6.default.mkdirSync((0, import_node_path7.dirname)(outputPath), { recursive: true });
-    import_node_fs6.default.writeFileSync(
+    import_node_fs7.default.mkdirSync((0, import_node_path8.dirname)(outputPath), { recursive: true });
+    import_node_fs7.default.writeFileSync(
       outputPath,
       JSON.stringify(
         this.config.toSchemaJson(),
@@ -1453,8 +1458,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.
@@ -1476,16 +1481,16 @@ var MicrofrontendsServer = class extends Microfrontends {
     }
     try {
       const packageRoot = findPackageRoot(directory);
-      const packageJsonPath = (0, import_node_path7.join)(packageRoot, "package.json");
+      const packageJsonPath = (0, import_node_path8.join)(packageRoot, "package.json");
       const packageJson = JSON.parse(
-        import_node_fs6.default.readFileSync(packageJsonPath, "utf-8")
+        import_node_fs7.default.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 = (0, import_node_path7.join)(packageRoot, "microfrontends.json");
-      if (import_node_fs6.default.existsSync(maybeConfig)) {
+      const maybeConfig = findConfig({ dir: packageRoot });
+      if (maybeConfig) {
         return MicrofrontendsServer.fromFile({
           filePath: maybeConfig,
           cookies,
@@ -1500,12 +1505,15 @@ var MicrofrontendsServer = class extends Microfrontends {
           repositoryRoot,
           applicationName: packageJson.name
         });
-        return MicrofrontendsServer.fromFile({
-          filePath: (0, import_node_path7.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) {
@@ -1525,7 +1533,7 @@ var MicrofrontendsServer = class extends Microfrontends {
     options
   }) {
     try {
-      const configJson = import_node_fs6.default.readFileSync(filePath, "utf-8");
+      const configJson = import_node_fs7.default.readFileSync(filePath, "utf-8");
       const config = MicrofrontendsServer.validate(configJson);
       if (!isMainConfig(config) && (options == null ? void 0 : options.resolveMainConfig)) {
         const repositoryRoot = findRepositoryRoot();
@@ -1541,9 +1549,15 @@ var MicrofrontendsServer = class extends Microfrontends {
               { type: "config", subtype: "not_found" }
             );
           }
-          const mainConfigPath = (0, import_node_path7.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
           });
         }
@@ -1567,7 +1581,7 @@ var MicrofrontendsServer = class extends Microfrontends {
     overrides
   }) {
     try {
-      const config = import_node_fs6.default.readFileSync(filePath, "utf-8");
+      const config = import_node_fs7.default.readFileSync(filePath, "utf-8");
       const validatedConfig = MicrofrontendsServer.validate(config);
       if (!isMainConfig(validatedConfig)) {
         throw new MicrofrontendError(