@vercel/microfrontends 1.0.1-canary.1 → 1.0.1-canary.3

package/dist/experimental/vite.js

@@ -1,8 +1,3 @@
-// src/vite/index.ts
-import { existsSync } from "node:fs";
-import { join as join3 } from "node:path";
-import { cwd } from "node:process";
-
 // src/config/microfrontends/server/index.ts
 import fs5 from "node:fs";
 import { dirname as dirname3, join as join2 } from "node:path";
@@ -241,16 +236,17 @@ var validateConfigPaths = (applicationConfigsById) => {
         const maybeError = validatePathExpression(path5);
         if (maybeError) {
           errors.push(maybeError);
-        }
-        const existing = pathsByApplicationId.get(path5);
-        if (existing) {
-          existing.applications.push(id);
         } else {
-          pathsByApplicationId.set(path5, {
-            applications: [id],
-            matcher: pathToRegexp2(path5),
-            applicationId: id
-          });
+          const existing = pathsByApplicationId.get(path5);
+          if (existing) {
+            existing.applications.push(id);
+          } else {
+            pathsByApplicationId.set(path5, {
+              applications: [id],
+              matcher: pathToRegexp2(path5),
+              applicationId: id
+            });
+          }
         }
       }
     }
@@ -290,26 +286,38 @@ var validateConfigPaths = (applicationConfigsById) => {
 };
 var PATH_DEFAULT_PATTERN = "[^\\/#\\?]+?";
 function validatePathExpression(path5) {
-  const tokens = parsePathRegexp(path5);
-  for (let i = 0; i < tokens.length; i++) {
-    const token = tokens[i];
-    if (token === void 0) {
-      return `token ${i} in ${path5} is undefined, this shouldn't happen`;
-    }
-    if (typeof token !== "string") {
-      if (token.pattern !== PATH_DEFAULT_PATTERN) {
-        return `Path ${path5} cannot use a regular expression wildcard`;
-      }
-      if (token.prefix !== "/") {
-        return `Wildcard :${token.name} must be immediately after a / in ${path5}`;
-      }
-      if (token.suffix) {
-        return `Wildcard suffix on :${token.name} is not allowed. Suffixes are not supported`;
+  try {
+    const tokens = parsePathRegexp(path5);
+    if (/(?<!\\)\{/.test(path5)) {
+      return `Optional paths are not supported: ${path5}`;
+    }
+    if (/(?<!\\|\()\?/.test(path5)) {
+      return `Optional paths are not supported: ${path5}`;
+    }
+    if (/\/[^/]*(?<!\\):[^/]*(?<!\\):[^/]*/.test(path5)) {
+      return `Only one wildcard is allowed per path segment: ${path5}`;
+    }
+    for (let i = 0; i < tokens.length; i++) {
+      const token = tokens[i];
+      if (token === void 0) {
+        return `token ${i} in ${path5} is undefined, this shouldn't happen`;
       }
-      if (token.modifier && i !== tokens.length - 1) {
-        return `Modifier ${token.modifier} is not allowed on wildcard :${token.name} in ${path5}. Modifiers are only allowed in the last path component`;
+      if (typeof token !== "string") {
+        if (token.pattern !== PATH_DEFAULT_PATTERN && // Allows (a|b|c) and ((?!a|b|c).*) regex
+        // Only limited regex is supported for now, due to performance considerations
+        !/^(?<allowed>[\w]+(?:\|[^|()]+)+)$|^\(\?!(?<disallowed>[\w]+(?:\|[^|()]+)+)\)\.\*$/.test(
+          token.pattern
+        )) {
+          return `Path ${path5} cannot use unsupported regular expression wildcard`;
+        }
+        if (token.modifier && i !== tokens.length - 1) {
+          return `Modifier ${token.modifier} is not allowed on wildcard :${token.name} in ${path5}. Modifiers are only allowed in the last path component`;
+        }
       }
     }
+  } catch (e) {
+    const message = e instanceof Error ? e.message : String(e);
+    return `Path ${path5} could not be parsed into regexp: ${message}`;
   }
   return void 0;
 }
@@ -663,12 +671,8 @@ var MicrofrontendConfigIsomorphic = class {
     const skipValidation = opts?.skipValidation ?? [];
     const c = typeof config === "string" ? parse(config) : config;
     if (isMainConfig(c)) {
-      if (!skipValidation.includes("paths")) {
-        validateConfigPaths(c.applications);
-      }
-      if (!skipValidation.includes("defaultApplication")) {
-        validateConfigDefaultApplication(c.applications);
-      }
+      validateConfigPaths(c.applications);
+      validateConfigDefaultApplication(c.applications);
       if (!skipValidation.includes("deprecatedFields")) {
         validateDeprecatedFields(c);
       }
@@ -1663,6 +1667,20 @@ function getApplicationContext(opts) {
   }
 }
 
+// src/vite/detect-framework.ts
+import { existsSync } from "node:fs";
+import { join as join3 } from "node:path";
+import { cwd } from "node:process";
+function detectFramework() {
+  if (existsSync(join3(cwd(), "svelte.config.js"))) {
+    return "sveltekit";
+  }
+  if (existsSync(join3(cwd(), "react-router.config.js")) || existsSync(join3(cwd(), "react-router.config.ts"))) {
+    return "react-router";
+  }
+  return "unknown";
+}
+
 // src/vite/index.ts
 function microfrontends(opts) {
   const { name: fromApp } = getApplicationContext();
@@ -1672,23 +1690,45 @@ function microfrontends(opts) {
     }
   });
   const app = microfrontendsObj.config.getApplication(fromApp);
+  if (app.isDefault() && opts?.basePath) {
+    throw new Error(
+      "`basePath` can not be set for the default microfrontends application."
+    );
+  }
+  if (opts?.basePath && !opts.basePath.startsWith("/")) {
+    throw new Error("`basePath` must start with a `/`");
+  }
   const additionalConfigOptions = {};
+  const framework = detectFramework();
   if (!app.isDefault()) {
     if (opts?.basePath) {
-      additionalConfigOptions.base = `/${opts.basePath}`;
-    } else {
-      const isSvelteKit = existsSync(join3(cwd(), "svelte.config.js"));
-      if (!isSvelteKit) {
-        additionalConfigOptions.experimental = {
-          renderBuiltUrl(filename, { type }) {
-            if (type === "asset") {
-              return `/${app.getAssetPrefix()}/${filename}`;
-            }
-          }
-        };
+      if (framework !== "react-router" || !process.env.VERCEL_ENV) {
+        let basePath = opts.basePath;
+        if (process.env.NODE_ENV === "production" && !basePath.endsWith("/")) {
+          basePath = `${basePath}/`;
+        }
+        additionalConfigOptions.base = basePath;
       }
+    } else if (framework !== "sveltekit") {
+      additionalConfigOptions.experimental = {
+        renderBuiltUrl(filename, { type }) {
+          if (type === "asset") {
+            return `/${app.getAssetPrefix()}/${filename}`;
+          }
+        }
+      };
+    }
+    if (framework === "react-router") {
+      additionalConfigOptions.build = {
+        assetsDir: `./${opts?.basePath ?? app.getAssetPrefix()}`
+      };
     }
   }
+  if (app.development.local.port) {
+    additionalConfigOptions.server = {
+      port: app.development.local.port
+    };
+  }
   return {
     name: "vite-plugin-vercel-microfrontends",
     config: () => {