@lwrjs/dev-proxy-server 0.15.0-alpha.2 → 0.15.0-alpha.7

package/build/cjs/index.cjs

@@ -25,12 +25,14 @@ var __toModule = (module2) => {
 __markAsModule(exports);
 __export(exports, {
   DEFAULT_PROXY_PORT: () => DEFAULT_PROXY_PORT,
+  addRemoteProxyMiddleware: () => import_middleware.addRemoteProxyMiddleware,
   createProxyServer: () => createProxyServer,
   findProxyConfiguration: () => findProxyConfiguration
 });
 var import_fs = __toModule(require("fs"));
 var import_path = __toModule(require("path"));
 var import_proxy_server = __toModule(require("./proxy-server.cjs"));
+var import_middleware = __toModule(require("./middleware.cjs"));
 var DEFAULT_PROXY_PORT = 4e3;
 function createProxyServer(config) {
   return new import_proxy_server.LwrProxyServer(config);

package/build/cjs/middleware.cjs

@@ -55,12 +55,15 @@ function addLocalProxyMiddleware(app, defaultHost) {
   }));
 }
 function addRemoteProxyMiddleware(app, proxyConfig) {
+  const mobifyRules = process.env.ADD_MOBIFY_PROXY_RULES === "true";
   const {proxyConfigs} = proxyConfig;
   for (const entry of proxyConfigs) {
     const [path, target] = entry;
     const targetHost = target.replace(/^([a-z][a-z0-9+\-.]*):\/\//, "");
+    const pathRewrite = mobifyRules && (path.indexOf("/mobify/proxy") === 0 || path.indexOf("/mobify/caching") === 0) ? {[path]: ""} : void 0;
     app.use(path, (0, import_http_proxy_middleware.default)({
       target,
+      pathRewrite,
       logLevel: resolveLogLevel(import_diagnostics.logger.getLogLevel()),
       logProvider: () => {
         return import_diagnostics.logger;

package/build/es/index.d.ts

@@ -1,6 +1,8 @@
-import type { LwrProxyServerConfig, ProxyConfiguration } from './proxy-server.js';
+import type { LwrProxyServerConfig, LwrProxyConfiguration } from './proxy-server.js';
 import { LwrProxyServer } from './proxy-server.js';
 export declare const DEFAULT_PROXY_PORT = 4000;
+export type { LwrProxyConfiguration } from './proxy-server.js';
+export { addRemoteProxyMiddleware } from './middleware.js';
 /**
  * Creates an Development Proxy Server using the provided `LwrProxyServerConfig` configuration.
  * @param config The configuration for the proxy
@@ -13,7 +15,7 @@ export declare function createProxyServer(config: LwrProxyServerConfig): LwrProx
  *  - ${rootDir}/config/_proxy
  * @param rootDir The root directory of the project
  * @param buildDir The built distribution directory/
- * @returns The found ProxyConfiguration object or undefined if no _proxy object could be found.
+ * @returns The found LwrProxyConfiguration object or undefined if no _proxy object could be found.
  */
-export declare function findProxyConfiguration(rootDir: string, buildDir?: string): ProxyConfiguration | undefined;
+export declare function findProxyConfiguration(rootDir: string, buildDir?: string): LwrProxyConfiguration | undefined;
 //# sourceMappingURL=index.d.ts.map

package/build/es/index.js

@@ -3,6 +3,7 @@ import path from 'path';
 import { LwrProxyServer } from './proxy-server.js';
 // Default Proxy server port
 export const DEFAULT_PROXY_PORT = 4000;
+export { addRemoteProxyMiddleware } from './middleware.js';
 /**
  * Creates an Development Proxy Server using the provided `LwrProxyServerConfig` configuration.
  * @param config The configuration for the proxy
@@ -17,7 +18,7 @@ export function createProxyServer(config) {
  *  - ${rootDir}/config/_proxy
  * @param rootDir The root directory of the project
  * @param buildDir The built distribution directory/
- * @returns The found ProxyConfiguration object or undefined if no _proxy object could be found.
+ * @returns The found LwrProxyConfiguration object or undefined if no _proxy object could be found.
  */
 export function findProxyConfiguration(rootDir, buildDir) {
     const PROXY_CONFIG_ROOT = path.join('config', '_proxy');

package/build/es/middleware.d.ts

@@ -1,5 +1,5 @@
 import type { Application as ExpressApp } from 'express';
-import type { ProxyConfiguration } from './proxy-server.js';
+import type { LwrProxyConfiguration } from './proxy-server.js';
 /**
  * The Proxy middleware responsible for proxying all other requests not configured to external systems.
  * @param app
@@ -11,5 +11,5 @@ export declare function addLocalProxyMiddleware(app: ExpressApp, defaultHost: st
  * @param app
  * @param proxyConfig
  */
-export declare function addRemoteProxyMiddleware(app: ExpressApp, proxyConfig: ProxyConfiguration): void;
+export declare function addRemoteProxyMiddleware(app: ExpressApp, proxyConfig: LwrProxyConfiguration): void;
 //# sourceMappingURL=middleware.d.ts.map

package/build/es/middleware.js

@@ -41,13 +41,21 @@ export function addLocalProxyMiddleware(app, defaultHost) {
  * @param proxyConfig
  */
 export function addRemoteProxyMiddleware(app, proxyConfig) {
+    const mobifyRules = process.env.ADD_MOBIFY_PROXY_RULES === 'true';
     const { proxyConfigs } = proxyConfig;
     for (const entry of proxyConfigs) {
         const [path, target] = entry;
         // remove the scheme from the proxyConfig host.
         const targetHost = target.replace(/^([a-z][a-z0-9+\-.]*):\/\//, '');
+        // TODO: Ask Commerce if this rewrite logic can be removed
+        // Needed for commerce local-dev when running MRT bundles without a configured Cloudflare CDN
+        // Rewrites /mobify/proxy/core and /mobify/caching/core paths (this is what pwa-kit does)
+        const pathRewrite = mobifyRules && (path.indexOf('/mobify/proxy') === 0 || path.indexOf('/mobify/caching') === 0)
+            ? { [path]: '' }
+            : undefined;
         app.use(path, proxy({
             target,
+            pathRewrite,
             logLevel: resolveLogLevel(logger.getLogLevel()),
             logProvider: () => {
                 return logger;

package/build/es/proxy-server.d.ts

@@ -1,9 +1,9 @@
 import { Application as ExpressApp } from 'express';
-export interface ProxyConfiguration {
+export interface LwrProxyConfiguration {
     proxyConfigs: ProxyConfigDefinition[];
 }
 type ProxyConfigDefinition = Array<string>;
-export interface LwrProxyServerConfig extends ProxyConfiguration {
+export interface LwrProxyServerConfig extends LwrProxyConfiguration {
     port: number;
     defaultHost: string;
 }

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.15.0-alpha.2",
+    "version": "0.15.0-alpha.7",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -33,13 +33,13 @@
         "build": "tsc -b"
     },
     "dependencies": {
-        "@lwrjs/diagnostics": "0.15.0-alpha.2",
-        "@lwrjs/shared-utils": "0.15.0-alpha.2",
+        "@lwrjs/diagnostics": "0.15.0-alpha.7",
+        "@lwrjs/shared-utils": "0.15.0-alpha.7",
         "express": "^4.19.2",
         "http-proxy-middleware": "0.21.0"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.15.0-alpha.2"
+        "@lwrjs/types": "0.15.0-alpha.7"
     },
     "engines": {
         "node": ">=18.0.0"
@@ -47,5 +47,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "58fda4341e2aa0f571a63d83f4aa59865e6a54bd"
+    "gitHead": "0477351eee6245818acbcd0c0c16baa1fd446321"
 }