@squiz/component-cli-lib 1.63.1-alpha.6 → 1.63.1

package/package.json

@@ -1,8 +1,12 @@
 {
   "name": "@squiz/component-cli-lib",
-  "version": "1.63.1-alpha.6",
+  "version": "1.63.1",
   "description": "",
   "main": "lib/index.js",
+  "private": false,
+  "publishConfig": {
+    "access": "public"
+  },
   "scripts": {
     "compile": "node build.js && tsc",
     "test": "jest -c jest.config.ts",
@@ -13,13 +17,13 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@squiz/component-lib": "1.63.1-alpha.6",
-    "@squiz/component-web-api-lib": "1.63.1-alpha.6",
-    "@squiz/dx-common-lib": "1.63.1-alpha.6",
-    "@squiz/dx-json-schema-lib": "1.63.1-alpha.6",
-    "@squiz/dx-logger-lib": "1.63.1-alpha.6",
-    "@squiz/dxp-session-lib": "1.63.1-alpha.6",
-    "@squiz/virus-scanner-lib": "1.63.1-alpha.6",
+    "@squiz/component-lib": "1.63.1",
+    "@squiz/component-web-api-lib": "1.63.1-alpha.7",
+    "@squiz/dx-common-lib": "1.63.1",
+    "@squiz/dx-json-schema-lib": "1.63.1-alpha.7",
+    "@squiz/dx-logger-lib": "1.63.1-alpha.7",
+    "@squiz/dxp-session-lib": "1.63.1",
+    "@squiz/virus-scanner-lib": "1.63.1-alpha.7",
     "@types/cli-color": "2.0.2",
     "@types/express": "4.17.17",
     "@types/jest": "28.1.8",
@@ -33,13 +37,12 @@
     "typescript": "4.9.4"
   },
   "dependencies": {
-    "@squiz/render-runtime-lib": "1.63.1-alpha.6",
-    "@squiz/runtime-sandbox-node": "1.63.1-alpha.6",
+    "@squiz/render-runtime-lib": "1.63.1",
+    "@squiz/runtime-sandbox-node": "1.63.1",
     "archiver": "5.3.1",
     "axios": "1.6.0",
     "cli-color": "^2.0.2",
     "open": "^8.4.0",
     "supertest": "^6.2.3"
-  },
-  "gitHead": "0978227a48f6bbb03fd31663ee2e0e68364978ae"
+  }
 }

package/src/component-dev.ts

@@ -1,4 +1,5 @@
 import {
+  ComponentRootUrlResolver,
   ComponentPreviewService,
   ComponentRunnerServiceWithWorkers,
   RenderInputService,
@@ -42,6 +43,7 @@ export function startDevelopmentRender(
   const dataMountPoint = path.resolve(process.cwd(), componentPath);
 
   const rootUrl = `http://localhost:${options.port}`;
+  const componentRootUrlResolver: ComponentRootUrlResolver = () => rootUrl;
 
   const apiKeyService = new DevelopmentApiKeyService();
   const sandbox = new NodeSandbox({
@@ -54,7 +56,7 @@ export function startDevelopmentRender(
     },
   });
   const componentRunnerService = new ComponentRunnerServiceWithWorkers(sandbox, logger, devComponentLogger);
-  const componentFunctionService = new ComponentFunctionService(rootUrl);
+  const componentFunctionService = new ComponentFunctionService();
   const componentSetService = new ComponentSetServiceForLocalDev(logger);
   const manifestService = new ManifestServiceForDev(dataMountPoint, logger);
   const contentItemService = undefined;
@@ -64,7 +66,7 @@ export function startDevelopmentRender(
     manifestService,
     componentFunctionService,
     contentItemService,
-    rootUrl,
+    componentRootUrlResolver,
   );
   const webServer = setupRenderRuntimeServer({
     logger,
@@ -76,6 +78,7 @@ export function startDevelopmentRender(
     renderInputService,
     apiKeyService,
     sandbox,
+    componentRootUrlResolver,
   });
 
   const server = webServer.listen(options.port, () => {

package/src/integration-tests/upload-and-render-page.integration.spec.ts

@@ -65,10 +65,13 @@ describe('PageRenderController- Integration', () => {
       version: DxpSessionVersion.version1,
     });
     const page = await pageRenderService.get(`p/${PAGE_CONTENT_ID}`, {
-      headers: { 'x-dxp-session': mockSession },
+      headers: {
+        'x-dxp-session': mockSession,
+        'x-dxp-service-request-url': 'https://mock.url/__dxp/service/page-render',
+      },
     });
     expect(page.data).toEqual(
-      `<div class="container"><h1>Hello World!</h1><esi:include src="/__dxp/au/components-render/${process.env.TENANT_ID}/r/unit-test-components/test-page-render/1.0.0/main?_componentSet=${COMPONENT_SET_WEB_PATH}&_contentItemId=${COMPONENT_CONTENT_ID}"/><p>Bottom text</p></div>`,
+      `<div class="container"><h1>Hello World!</h1><esi:include src="https://mock.url/__dxp/service/components-render/r/unit-test-components/test-page-render/1.0.0/main?_componentSet=${COMPONENT_SET_WEB_PATH}&_contentItemId=${COMPONENT_CONTENT_ID}"/><p>Bottom text</p></div>`,
     );
   });
 
@@ -169,7 +172,10 @@ describe('PageRenderController- Integration', () => {
       'renders the matching variation for %s',
       async (description: string, session: DxpSession, expectedBody: string, expectedCacheAccess: DxpCacheAccess) => {
         const page = await pageRenderService.get(`p/${PAGE_CONTENT_ID}`, {
-          headers: { 'x-dxp-session': buildDevelopmentSession(session) },
+          headers: {
+            'x-dxp-session': buildDevelopmentSession(session),
+            'x-dxp-service-request-url': 'https://mock.url/__dxp/service/page-render',
+          },
         });
         const dxpCacheAccess = JSON.parse(Buffer.from(page.headers['x-dxp-cache-access'], 'base64').toString());