Merge remote-tracking branch 'origin/master' into natasha/b2b-auth

Signed-off-by: Mike Lewis <mtlewis@users.noreply.github.com>

packages/backend-common/src/discovery/SingleHostDiscovery.ts

@@ -37,7 +37,7 @@ export class SingleHostDiscovery implements PluginEndpointDiscovery {
    * for the internal one.
    *
    * The basePath defaults to `/api`, meaning the default full internal
-   * path for the `catalog` plugin will be `http://localhost:7000/api/catalog`.
+   * path for the `catalog` plugin will be `http://localhost:7007/api/catalog`.
    */
   static fromConfig(config: Config, options?: { basePath?: string }) {
     const basePath = options?.basePath ?? '/api';

packages/backend-common/src/service/lib/ServiceBuilderImpl.ts

@@ -40,7 +40,7 @@ import {
 } from './config';
 import { createHttpServer, createHttpsServer } from './hostFactory';
 
-export const DEFAULT_PORT = 7000;
+export const DEFAULT_PORT = 7007;
 // '' is express default, which listens to all interfaces
 const DEFAULT_HOST = '';
 // taken from the helmet source code - don't seem to be exported

packages/backend-common/src/service/lib/config.ts

@@ -63,8 +63,8 @@ type CustomOrigin = (
  * @example
  * ```json
  * {
- *   baseUrl: "http://localhost:7000",
- *   listen: "0.0.0.0:7000"
+ *   baseUrl: "http://localhost:7007",
+ *   listen: "0.0.0.0:7007"
  * }
  * ```
  */

packages/backend-common/src/service/types.ts

@@ -34,7 +34,7 @@ export type ServiceBuilder = {
    *
    * If no port is specified, the service will first look for an environment
    * variable named PORT and use that if present, otherwise it picks a default
-   * port (7000).
+   * port (7007).
    *
    * @param port - The port to listen on
    */