@vercel/microfrontends 1.4.1 → 1.5.0-canary.0

package/dist/utils/mfe-port.js

@@ -159,17 +159,27 @@ function hasGitDirectory(dir) {
 function hasPnpmWorkspaces(dir) {
   return fs.existsSync(path.join(dir, "pnpm-workspace.yaml"));
 }
+function hasPackageJson(dir) {
+  return fs.existsSync(path.join(dir, "package.json"));
+}
 function findRepositoryRoot(startDir) {
   if (process.env.NX_WORKSPACE_ROOT) {
     return process.env.NX_WORKSPACE_ROOT;
   }
   let currentDir = startDir || process.cwd();
+  let lastPackageJsonDir = null;
   while (currentDir !== path.parse(currentDir).root) {
     if (hasGitDirectory(currentDir) || hasPnpmWorkspaces(currentDir)) {
       return currentDir;
     }
+    if (hasPackageJson(currentDir)) {
+      lastPackageJsonDir = currentDir;
+    }
     currentDir = path.dirname(currentDir);
   }
+  if (lastPackageJsonDir) {
+    return lastPackageJsonDir;
+  }
   throw new Error(
     `Could not find the root of the repository for ${startDir}. Please ensure that the directory is part of a Git repository. If you suspect that this should work, please file an issue to the Vercel team.`
   );
@@ -565,33 +575,6 @@ var validateConfigDefaultApplication = (applicationConfigsById) => {
     );
   }
 };
-var validateDeprecatedFields = (config) => {
-  const errors = [];
-  for (const [applicationId, application] of Object.entries(
-    config.applications
-  )) {
-    if (application.development?.localPort) {
-      errors.push(
-        `Application '${applicationId}' cannot contain deprecated field 'development.localPort'. Use 'developement.local' instead.`
-      );
-    }
-    if (application.projectId) {
-      errors.push(
-        `Application '${applicationId}' cannot contain deprecated field 'projectId'. If the application ID matches the Vercel project name, then please remove the 'projectId' field. Otherwise, either update the application ID / Vercel project name to match, or set the 'packageName' field to the name of the package.json name.`
-      );
-    }
-  }
-  if (errors.length) {
-    throw new MicrofrontendError(
-      `Microfrontends configuration file errors:
-- ${errors.join("\n- ")}`,
-      {
-        type: "config",
-        subtype: "depcrecated_field"
-      }
-    );
-  }
-};
 
 // src/config/microfrontends-config/isomorphic/utils/generate-asset-prefix.ts
 var PREFIX = "vc-ap";
@@ -696,20 +679,12 @@ var Host = class {
 var LocalHost = class extends Host {
   constructor({
     appName,
-    localPort,
     local
   }) {
-    if (localPort && local) {
-      throw new Error(
-        `Microfrontends configuration error: '${appName}' has both the 'development.local' and 'development.localPort' fields set. Please remove the 'development.localPort' field and ensure the 'development.local' field has the correct port.`
-      );
-    }
     let protocol;
     let host;
     let port;
-    if (localPort) {
-      port = localPort;
-    } else if (typeof local === "number") {
+    if (typeof local === "number") {
       port = local;
     } else if (typeof local === "string") {
       if (/^\d+$/.test(local)) {
@@ -751,7 +726,6 @@ var Application = class {
     this.development = {
       local: new LocalHost({
         appName: name,
-        localPort: app.development?.localPort,
         local: app.development?.local
       }),
       fallback: app.development?.fallback ? new Host(app.development.fallback) : void 0
@@ -759,7 +733,6 @@ var Application = class {
     if (app.development?.fallback) {
       this.fallback = new Host(app.development.fallback);
     }
-    this.projectId = app.projectId;
     this.packageName = app.packageName;
     this.overrides = overrides?.environment ? {
       environment: new Host(overrides.environment)
@@ -823,11 +796,10 @@ var DEFAULT_LOCAL_PROXY_PORT = 3024;
 var MicrofrontendConfigIsomorphic = class {
   constructor({
     config,
-    overrides,
-    opts
+    overrides
   }) {
     this.childApplications = {};
-    MicrofrontendConfigIsomorphic.validate(config, opts);
+    MicrofrontendConfigIsomorphic.validate(config);
     const disableOverrides = config.options?.disableOverrides ?? false;
     this.overrides = overrides && !disableOverrides ? overrides : void 0;
     let defaultApplication;
@@ -862,14 +834,10 @@ var MicrofrontendConfigIsomorphic = class {
       overrides
     };
   }
-  static validate(config, opts) {
-    const skipValidation = opts?.skipValidation ?? [];
+  static validate(config) {
     const c = typeof config === "string" ? parse2(config) : config;
     validateConfigPaths(c.applications);
     validateConfigDefaultApplication(c.applications);
-    if (!skipValidation.includes("deprecatedFields")) {
-      validateDeprecatedFields(c);
-    }
     return c;
   }
   static fromEnv({
@@ -1050,7 +1018,9 @@ var schema_default = {
           description: "Mapping of application names to the routes that they host. Only needs to be defined in the application that owns the primary microfrontend domain"
         }
       },
-      required: ["applications"],
+      required: [
+        "applications"
+      ],
       additionalProperties: false
     },
     Options: {
@@ -1089,11 +1059,6 @@ var schema_default = {
     DefaultApplication: {
       type: "object",
       properties: {
-        projectId: {
-          type: "string",
-          description: "Vercel project ID, only required if the application name / id is different to the Vercel project name.",
-          deprecated: "Instead, the application id should match the Vercel project name. `packageName` can optionally\nbe set to the name of the package.json (if it is different from the project name)."
-        },
         packageName: {
           type: "string",
           description: "The name used to run the application, e.g. the `name` field in the `package.json`.\n\nThis is used by the local proxy to map the application config to the locally running app.\n\nThis is only necessary when the application name does not match the `name` used in `package.json`."
@@ -1103,21 +1068,21 @@ var schema_default = {
           description: "Development configuration for the default application."
         }
       },
-      required: ["development"],
+      required: [
+        "development"
+      ],
       additionalProperties: false
     },
     DefaultDevelopment: {
       type: "object",
       properties: {
         local: {
-          type: ["number", "string"],
+          type: [
+            "number",
+            "string"
+          ],
           description: "A local port number or host string that this application runs on when it is running locally. If passing a string, include the protocol (optional), host (required) and port (optional). For example: `https://this.ismyhost:8080`. If omitted, the protocol defaults to HTTP. If omitted, the port defaults to a unique, but stable (based on the application name) number.\n\nExamples of valid values:\n- 8080\n- my.localhost.me\n- my.localhost.me:8080\n- https://my.localhost.me\n- https://my.localhost.me:8080"
         },
-        localPort: {
-          type: "number",
-          description: "The local port number that this application runs on when it is running locally. Common values include `80` for HTTP and `443` for HTTPS. If omitted, the port defaults to a unique, but stable (based on the application name) number.",
-          deprecated: "Please set the port with the 'local' field instead."
-        },
         task: {
           type: "string",
           description: "Optional task to run when starting the development server. Should reference a script in the package.json of the application."
@@ -1127,17 +1092,14 @@ var schema_default = {
           description: "Fallback for local development, could point to any environment. This is required for the default app. This value is used as the fallback for child apps as well if they do not have a fallback.\n\nIf passing a string, include the protocol (optional), host (required) and port (optional). For example: `https://this.ismyhost:8080`. If omitted, the protocol defaults to HTTPS. If omitted, the port defaults to `80` for HTTP and `443` for HTTPS."
         }
       },
-      required: ["fallback"],
+      required: [
+        "fallback"
+      ],
       additionalProperties: false
     },
     ChildApplication: {
       type: "object",
       properties: {
-        projectId: {
-          type: "string",
-          description: "Vercel project ID, only required if the application name / id is different to the Vercel project name.",
-          deprecated: "Instead, the application id should match the Vercel project name. `packageName` can optionally\nbe set to the name of the package.json (if it is different from the project name)."
-        },
         packageName: {
           type: "string",
           description: "The name used to run the application, e.g. the `name` field in the `package.json`.\n\nThis is used by the local proxy to map the application config to the locally running app.\n\nThis is only necessary when the application name does not match the `name` used in `package.json`."
@@ -1151,21 +1113,21 @@ var schema_default = {
           description: "Groups of path expressions that are routed to this application."
         }
       },
-      required: ["routing"],
+      required: [
+        "routing"
+      ],
       additionalProperties: false
     },
     ChildDevelopment: {
       type: "object",
       properties: {
         local: {
-          type: ["number", "string"],
+          type: [
+            "number",
+            "string"
+          ],
           description: "A local port number or host string that this application runs on when it is running locally. If passing a string, include the protocol (optional), host (required) and port (optional). For example: `https://this.ismyhost:8080`. If omitted, the protocol defaults to HTTP. If omitted, the port defaults to a unique, but stable (based on the application name) number.\n\nExamples of valid values:\n- 8080\n- my.localhost.me\n- my.localhost.me:8080\n- https://my.localhost.me\n- https://my.localhost.me:8080"
         },
-        localPort: {
-          type: "number",
-          description: "The local port number that this application runs on when it is running locally. Common values include `80` for HTTP and `443` for HTTPS. If omitted, the port defaults to a unique, but stable (based on the application name) number.",
-          deprecated: "Please set the port with the 'local' field instead."
-        },
         task: {
           type: "string",
           description: "Optional task to run when starting the development server. Should reference a script in the package.json of the application."
@@ -1201,7 +1163,9 @@ var schema_default = {
           }
         }
       },
-      required: ["paths"],
+      required: [
+        "paths"
+      ],
       additionalProperties: false
     }
   }