@salesforce/ui-bundle 12.3.9 → 12.3.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,4 +1,4 @@
1
- const version = "12.3.9";
1
+ const version = "12.3.10";
2
2
  export {
3
3
  version
4
4
  };
@@ -1 +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;AAyBnE;;GAEG;AACH,MAAM,WAAW,YAAY;IAE5B,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB,cAAc,CAAC,EAAE,CAAC,cAAc,EAAE,OAAO,KAAK,IAAI,CAAC;IACnD;;;;;;;;;;OAUG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CACjB;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;AAkvBnB;;;;;;;;;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"}
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;AAyBnE;;GAEG;AACH,MAAM,WAAW,YAAY;IAE5B,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB,cAAc,CAAC,EAAE,CAAC,cAAc,EAAE,OAAO,KAAK,IAAI,CAAC;IACnD;;;;;;;;;;OAUG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CACjB;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;AAmvBnB;;;;;;;;;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"}
@@ -70,7 +70,7 @@ class UIBundleProxyHandler {
70
70
  return;
71
71
  }
72
72
  if (match.type === "api") {
73
- await this.handleSalesforceApi(req, res, match.path);
73
+ await this.handleSalesforceApi(req, res, match.path, match.myDomain);
74
74
  return;
75
75
  }
76
76
  if (match.type === "gql") {
@@ -258,14 +258,14 @@ class UIBundleProxyHandler {
258
258
  const data = await response.json();
259
259
  return data.frontdoor_uri ?? null;
260
260
  }
261
- async handleSalesforceApi(req, res, apiPath) {
261
+ async handleSalesforceApi(req, res, apiPath, myDomain) {
262
262
  try {
263
263
  if (!this.orgInfo) {
264
264
  this.sendNoOrgError(res);
265
265
  return;
266
266
  }
267
267
  const url = new URL(req.url ?? "/", `http://${req.headers.host}`);
268
- let targetUrl = `${this.orgInfo.instanceUrl}${apiPath}${url.search}`;
268
+ let targetUrl = `${getApiHost(this.orgInfo, myDomain)}${apiPath}${url.search}`;
269
269
  if (this.options?.debug) {
270
270
  console.log(`[ui-bundle-proxy] Forwarding to Salesforce: ${targetUrl}`);
271
271
  }
@@ -292,7 +292,7 @@ class UIBundleProxyHandler {
292
292
  if (this.options?.debug) {
293
293
  console.log("[ui-bundle-proxy] Token refreshed, retrying request");
294
294
  }
295
- targetUrl = `${updatedOrgInfo.instanceUrl}${apiPath}${url.search}`;
295
+ targetUrl = `${getApiHost(updatedOrgInfo, myDomain)}${apiPath}${url.search}`;
296
296
  response = await fetch(targetUrl, {
297
297
  method: req.method,
298
298
  headers: {
@@ -525,6 +525,9 @@ function createProxyHandler(manifest, orgInfo, target, basePath, options) {
525
525
  function injectLivePreviewScript(html) {
526
526
  return UIBundleProxyHandler.injectLivePreviewScript(html);
527
527
  }
528
+ function getApiHost(orgInfo, myDomain) {
529
+ return myDomain ? orgInfo.rawInstanceUrl : orgInfo.instanceUrl;
530
+ }
528
531
  function getFilteredHeaders(headers) {
529
532
  const filtered = {};
530
533
  const hopByHopHeaders = /* @__PURE__ */ new Set([
@@ -16,6 +16,7 @@ interface RedirectRouteMatch {
16
16
  interface ApiRouteMatch {
17
17
  type: "api";
18
18
  path: string;
19
+ myDomain?: boolean;
19
20
  }
20
21
  /**
21
22
  * Match URL path against routing rules
@@ -1 +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,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,CA6EnB;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"}
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,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;IAIb,QAAQ,CAAC,EAAE,OAAO,CAAC;CACnB;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,CA2FnB;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"}
@@ -8,21 +8,25 @@ function normalizeRoute(route) {
8
8
  }
9
9
  function matchRoute(pathname, basePath, rewrites, redirects) {
10
10
  const base = (basePath || "").replace(/\/$/, "");
11
+ const versionedDataPrefix = `^${base}/services/data/v\\d{2}\\.\\d`;
12
+ if (pathname.startsWith(`${base}/gql/endpoint`)) {
13
+ return { type: "gql" };
14
+ }
15
+ const graphqlDataRegex = new RegExp(`${versionedDataPrefix}/graphql`);
16
+ if (graphqlDataRegex.test(pathname)) {
17
+ return { type: "api", path: pathname.slice(base.length), myDomain: true };
18
+ }
11
19
  const services = [
12
- "graphql",
13
20
  "ui-api",
14
21
  "connect/cms/delivery",
15
22
  "connect/file/upload/config",
16
23
  "connect/proxy/ui-telemetry",
17
24
  "chatter/users"
18
25
  ].join("|");
19
- const servicesDataRegex = new RegExp(`^${base}/services/data/v\\d{2}\\.\\d/(${services})`);
26
+ const servicesDataRegex = new RegExp(`${versionedDataPrefix}/(${services})`);
20
27
  if (servicesDataRegex.test(pathname) || pathname.startsWith(`${base}/services/apexrest`)) {
21
28
  return { type: "api", path: pathname.slice(base.length) };
22
29
  }
23
- if (pathname.startsWith(`${base}/gql/endpoint`)) {
24
- return { type: "gql" };
25
- }
26
30
  if (pathname.startsWith(`${base}/chatter/handlers/file/body`)) {
27
31
  return { type: "file-upload" };
28
32
  }
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@salesforce/ui-bundle",
3
3
  "description": "Core package for Salesforce UI Bundles",
4
- "version": "12.3.9",
4
+ "version": "12.3.10",
5
5
  "license": "SEE LICENSE IN LICENSE.txt",
6
6
  "type": "module",
7
7
  "main": "./dist/index.js",
@@ -39,7 +39,7 @@
39
39
  },
40
40
  "dependencies": {
41
41
  "@salesforce/core": "^8.23.4",
42
- "@salesforce/platform-sdk": "^12.3.9",
42
+ "@salesforce/platform-sdk": "^12.3.10",
43
43
  "micromatch": "^4.0.8",
44
44
  "path-to-regexp": "^8.4.2"
45
45
  },