@salesforce/ui-bundle 1.122.2 → 1.126.0

package/dist/package.json.js

@@ -1,4 +1,4 @@
-const version = "1.122.2";
+const version = "1.126.0";
 export {
   version
 };

package/dist/proxy/handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../src/proxy/handler.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAIjE,OAAO,KAAK,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAG9D;;GAEG;AACH,eAAO,MAAM,2BAA2B,uBAAuB,CAAC;AAEhE;;GAEG;AACH,eAAO,MAAM,qBAAqB,gCAAgC,CAAC;AA6BnE;;GAEG;AACH,MAAM,WAAW,YAAY;IAE5B,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB,cAAc,CAAC,EAAE,CAAC,cAAc,EAAE,OAAO,KAAK,IAAI,CAAC;CACnD;AAED;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG,CAC1B,GAAG,EAAE,eAAe,EACpB,GAAG,EAAE,cAAc,EACnB,IAAI,CAAC,EAAE,MAAM,IAAI,KACb,OAAO,CAAC,IAAI,CAAC,CAAC;AAmmBnB;;;;;;;;;GASG;AACH,wBAAgB,kBAAkB,CACjC,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,CAAC,EAAE,OAAO,EACjB,MAAM,CAAC,EAAE,MAAM,EACf,QAAQ,CAAC,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,YAAY,GACpB,YAAY,CAGd;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE5D"}
+{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../src/proxy/handler.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAIjE,OAAO,KAAK,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAG9D;;GAEG;AACH,eAAO,MAAM,2BAA2B,uBAAuB,CAAC;AAEhE;;GAEG;AACH,eAAO,MAAM,qBAAqB,gCAAgC,CAAC;AAyBnE;;GAEG;AACH,MAAM,WAAW,YAAY;IAE5B,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB,cAAc,CAAC,EAAE,CAAC,cAAc,EAAE,OAAO,KAAK,IAAI,CAAC;CACnD;AAED;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG,CAC1B,GAAG,EAAE,eAAe,EACpB,GAAG,EAAE,cAAc,EACnB,IAAI,CAAC,EAAE,MAAM,IAAI,KACb,OAAO,CAAC,IAAI,CAAC,CAAC;AAslBnB;;;;;;;;;GASG;AACH,wBAAgB,kBAAkB,CACjC,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,CAAC,EAAE,OAAO,EACjB,MAAM,CAAC,EAAE,MAAM,EACf,QAAQ,CAAC,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,YAAY,GACpB,YAAY,CAGd;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE5D"}

package/dist/proxy/handler.js

@@ -6,8 +6,6 @@ import "node:fs/promises";
 const UIBUNDLE_HEALTH_CHECK_PARAM = "sfProxyHealthCheck";
 const UIBUNDLE_PROXY_HEADER = "X-Salesforce-UIBundle-Proxy";
 const LIGHTNING_OUT_SINGLE_ACCESS_PATH = "/services/oauth2/singleaccess";
-const SALESFORCE_API_PREFIXES = ["/services/", "/lwr/apex/"];
-const SALESFORCE_FILE_UPLOAD_PREFIX = "/chatter/handlers/file/body";
 const AUTH_FAILED_RESPONSE = {
   error: "AUTHENTICATION_FAILED",
   message: "Authentication failed. Please re-authenticate to your Salesforce org.",
@@ -51,7 +49,7 @@ class UIBundleProxyHandler {
     );
     if (match) {
       if (match.type === "api") {
-        await this.handleSalesforceApi(req, res);
+        await this.handleSalesforceApi(req, res, match.path);
         return;
       }
       if (match.type === "gql") {
@@ -83,13 +81,6 @@ class UIBundleProxyHandler {
         return;
       }
     }
-    if (pathname.startsWith(SALESFORCE_FILE_UPLOAD_PREFIX)) {
-      await this.handleFileUpload(req, res);
-      return;
-    } else if (SALESFORCE_API_PREFIXES.some((prefix) => pathname.startsWith(prefix))) {
-      await this.handleSalesforceApi(req, res);
-      return;
-    }
     if (next) {
       next();
     } else {
@@ -232,18 +223,13 @@ class UIBundleProxyHandler {
     const data = await response.json();
     return data.frontdoor_uri ?? null;
   }
-  async handleSalesforceApi(req, res) {
+  async handleSalesforceApi(req, res, apiPath) {
     try {
       if (!this.orgInfo) {
         this.sendNoOrgError(res);
         return;
       }
       const url = new URL(req.url ?? "/", `http://${req.headers.host}`);
-      let pathIndex = url.pathname.indexOf("/lwr/apex/v");
-      if (pathIndex === -1) {
-        pathIndex = url.pathname.indexOf("/services/data/v");
-      }
-      const apiPath = url.pathname.substring(pathIndex);
       let targetUrl = `${this.orgInfo.instanceUrl}${apiPath}${url.search}`;
       if (this.options?.debug) {
         console.log(`[ui-bundle-proxy] Forwarding to Salesforce: ${targetUrl}`);
@@ -271,7 +257,7 @@ class UIBundleProxyHandler {
         if (this.options?.debug) {
           console.log("[ui-bundle-proxy] Token refreshed, retrying request");
         }
-        targetUrl = `${updatedOrgInfo.instanceUrl}${url.pathname}${url.search}`;
+        targetUrl = `${updatedOrgInfo.instanceUrl}${apiPath}${url.search}`;
         response = await fetch(targetUrl, {
           method: req.method,
           headers: {

package/dist/proxy/routing.d.ts

@@ -1,9 +1,21 @@
 import { RedirectRule, RewriteRule } from '../app/index';
-export interface RouteMatch {
-    type: "rewrite" | "redirect" | "api" | "gql" | "file-upload";
-    target?: string;
-    statusCode?: number;
-    params?: Record<string, string>;
+export type RouteMatch = GeneralRouteMatch | ApiRouteMatch | RewriteRouteMatch | RedirectRouteMatch;
+interface GeneralRouteMatch {
+    type: "gql" | "file-upload";
+}
+interface RewriteRouteMatch {
+    type: "rewrite";
+    target: string;
+    params: Record<string, string>;
+}
+interface RedirectRouteMatch {
+    type: "redirect";
+    target: string;
+    statusCode: 301 | 302 | 307 | 308;
+}
+interface ApiRouteMatch {
+    type: "api";
+    path: string;
 }
 /**
  * Match URL path against routing rules
@@ -32,4 +44,5 @@ export declare function matchesPattern(path: string, patterns: string[] | undefi
  * @returns Modified pathname with trailing slash applied according to rules
  */
 export declare function applyTrailingSlash(pathname: string, trailingSlash?: "always" | "never" | "auto"): string;
+export {};
 //# sourceMappingURL=routing.d.ts.map

package/dist/proxy/routing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../src/proxy/routing.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE9D,MAAM,WAAW,UAAU;IAC1B,IAAI,EAAE,SAAS,GAAG,UAAU,GAAG,KAAK,GAAG,KAAK,GAAG,aAAa,CAAC;IAC7D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC;AASD;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CACzB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,MAAM,EACjB,QAAQ,CAAC,EAAE,WAAW,EAAE,EACxB,SAAS,CAAC,EAAE,YAAY,EAAE,GACxB,UAAU,GAAG,IAAI,CAqEnB;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,SAAS,GAAG,OAAO,CAMpF;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CACjC,QAAQ,EAAE,MAAM,EAChB,aAAa,CAAC,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,GACzC,MAAM,CAiBR"}
+{"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../src/proxy/routing.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE9D,MAAM,MAAM,UAAU,GAAG,iBAAiB,GAAG,aAAa,GAAG,iBAAiB,GAAG,kBAAkB,CAAC;AAEpG,UAAU,iBAAiB;IAC1B,IAAI,EAAE,KAAK,GAAG,aAAa,CAAC;CAC5B;AAED,UAAU,iBAAiB;IAC1B,IAAI,EAAE,SAAS,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC/B;AAED,UAAU,kBAAkB;IAC3B,IAAI,EAAE,UAAU,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;CAClC;AAED,UAAU,aAAa;IACtB,IAAI,EAAE,KAAK,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACb;AASD;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CACzB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,MAAM,EACjB,QAAQ,CAAC,EAAE,WAAW,EAAE,EACxB,SAAS,CAAC,EAAE,YAAY,EAAE,GACxB,UAAU,GAAG,IAAI,CA4EnB;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,SAAS,GAAG,OAAO,CAMpF;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CACjC,QAAQ,EAAE,MAAM,EAChB,aAAa,CAAC,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,GACzC,MAAM,CAiBR"}

package/dist/proxy/routing.js

@@ -7,16 +7,22 @@ function normalizeRoute(route) {
   });
 }
 function matchRoute(pathname, basePath, rewrites, redirects) {
-  const servicesRegex = new RegExp(
-    `^${basePath || ""}/services/data/v\\d{2}\\.\\d/(graphql|ui-api|connect/file/upload/config)`
-  );
-  if (servicesRegex.test(pathname) || pathname.startsWith(`${basePath || ""}/lwr/apex/v`)) {
-    return { type: "api" };
+  const base = basePath || "";
+  const services = [
+    "graphql",
+    "ui-api",
+    "connect/file/upload/config",
+    "connect/proxy/ui-telemetry",
+    "chatter/users"
+  ].join("|");
+  const servicesDataRegex = new RegExp(`^${base}/services/data/v\\d{2}\\.\\d/(${services})`);
+  if (servicesDataRegex.test(pathname) || pathname.startsWith(`${base}/services/apexrest`)) {
+    return { type: "api", path: pathname.slice(base.length) };
   }
-  if (pathname.startsWith(`${basePath || ""}/gql/endpoint`)) {
+  if (pathname.startsWith(`${base}/gql/endpoint`)) {
     return { type: "gql" };
   }
-  if (pathname.startsWith(`${basePath || ""}/chatter/handlers/file/body`)) {
+  if (pathname.startsWith(`${base}/chatter/handlers/file/body`)) {
     return { type: "file-upload" };
   }
   if (redirects) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/ui-bundle",
   "description": "Core package for Salesforce UI Bundles",
-  "version": "1.122.2",
+  "version": "1.126.0",
   "license": "SEE LICENSE IN LICENSE.txt",
   "type": "module",
   "main": "./dist/index.js",
@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "@salesforce/core": "^8.23.4",
-    "@salesforce/sdk-data": "^1.122.2",
+    "@salesforce/sdk-data": "^1.126.0",
     "micromatch": "^4.0.8",
     "path-to-regexp": "^8.3.0"
   },