@squiz/component-cli-lib 1.68.0 → 1.69.0

package/lib/integration-tests/helper.d.ts

@@ -1,3 +1,4 @@
+import axios from 'axios';
 import { ComponentSetWebModelForCreate, Manifest } from '@squiz/component-lib';
 import { ContentApi } from '@squiz/component-web-api-lib';
 interface Config {
@@ -12,12 +13,12 @@ interface Config {
 }
 declare const configObj: Config;
 export default configObj;
-export declare const managementService: import("axios").AxiosInstance;
-export declare const managementServiceRoot: import("axios").AxiosInstance;
-export declare const renderService: import("axios").AxiosInstance;
-export declare const contentService: import("axios").AxiosInstance;
-export declare const pageRenderService: import("axios").AxiosInstance;
-export declare const jobService: import("axios").AxiosInstance;
+export declare const managementService: axios.AxiosInstance;
+export declare const managementServiceRoot: axios.AxiosInstance;
+export declare const renderService: axios.AxiosInstance;
+export declare const contentService: axios.AxiosInstance;
+export declare const pageRenderService: axios.AxiosInstance;
+export declare const jobService: axios.AxiosInstance;
 export declare const ci_buildVersion: string;
 export declare const ci_buildBranch: string;
 export declare function getTestComponents(): Promise<import("@squiz/component-lib").ManifestV1[]>;

package/lib/integration-tests/test-setup.d.ts

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squiz/component-cli-lib",
-  "version": "1.68.0",
+  "version": "1.69.0",
   "description": "",
   "main": "lib/index.js",
   "private": false,
@@ -17,10 +17,10 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@squiz/component-lib": "^1.73.0",
-    "@squiz/component-web-api-lib": "^1.65.0",
-    "@squiz/dx-common-lib": "^1.64.0",
-    "@squiz/dx-json-schema-lib": "^1.68.0",
+    "@squiz/component-lib": "^1.78.1",
+    "@squiz/component-web-api-lib": "^1.65.1",
+    "@squiz/dx-common-lib": "^1.68.3",
+    "@squiz/dx-json-schema-lib": "^1.76.1",
     "@squiz/dx-logger-lib": "^1.64.0",
     "@squiz/dxp-session-lib": "^1.65.0",
     "@squiz/virus-scanner-lib": "^1.64.0",
@@ -37,11 +37,12 @@
     "typescript": "4.9.4"
   },
   "dependencies": {
-    "@squiz/render-runtime-lib": "^1.64.0",
-    "@squiz/edge-dev-render-runtime-lib": "^2.1.0",
-    "@squiz/runtime-sandbox-node": "^1.64.0",
+    "@squiz/edge-dev-render-runtime-lib": "^2.2.0",
+    "@squiz/job-runner-lib": "file:job-runner-lib.tgz",
+    "@squiz/render-runtime-lib": "^1.76.0",
+    "@squiz/runtime-sandbox-node": "^1.64.2",
     "archiver": "5.3.1",
-    "axios": "1.6.0",
+    "axios": "1.7.4",
     "cli-color": "^2.0.2",
     "open": "^8.4.2",
     "supertest": "^6.2.3"

package/src/component-dev-folder-structures.integration.spec.ts

@@ -2,7 +2,7 @@ import supertest from 'supertest';
 import path from 'path';
 import fsp from 'fs/promises';
 
-import { TestHelpers } from '@squiz/render-runtime-lib';
+import { TestHelpers } from '@squiz/render-runtime-lib/test-helpers';
 import { startDevelopmentRender } from './component-dev';
 import { Server } from 'http';
 

package/src/component-dev.integration.spec.ts

@@ -1,4 +1,4 @@
-import { routeTests, TestHelpers } from '@squiz/render-runtime-lib';
+import { routeTests, TestHelpers } from '@squiz/render-runtime-lib/test-helpers';
 import { startDevelopmentRender } from './component-dev';
 import supertest from 'supertest';
 import { Server } from 'http';

package/src/component-edge-dev.ts

@@ -1,9 +1,9 @@
 import {
   ComponentRootUrlResolver,
   ComponentPreviewService,
-  ComponentRunnerServiceWithWorkers,
   RenderInputService,
   setupRenderRuntimeServer,
+  DevelopmentComponentRunnerService,
 } from '@squiz/edge-dev-render-runtime-lib';
 import { getLogger, LoggerOptions } from '@squiz/dx-logger-lib';
 import path from 'path';
@@ -33,7 +33,7 @@ export function startEdgeDevelopmentRender(
   const rootUrl = `http://localhost:${options.port}`;
   const componentRootUrlResolver: ComponentRootUrlResolver = () => rootUrl;
 
-  const componentRunnerService = new ComponentRunnerServiceWithWorkers();
+  const developmentComponentRunnerService = new DevelopmentComponentRunnerService();
   const componentFunctionService = new ComponentFunctionService();
   const componentSetService = new ComponentSetServiceForLocalDev(logger);
   const manifestService = new ManifestServiceForDev(dataMountPoint, logger);
@@ -46,7 +46,7 @@ export function startEdgeDevelopmentRender(
   const webServer = setupRenderRuntimeServer(
     {
       logger,
-      componentRunnerService,
+      developmentComponentRunnerService,
       componentFunctionService,
       componentPreviewService: new ComponentPreviewService(),
       componentSetService,
@@ -60,7 +60,7 @@ export function startEdgeDevelopmentRender(
   );
 
   const server = webServer.listen(options.port, () => {
-    logger.info(`Component development webserver started on port ${rootUrl}`);
+    logger.info(`Edge Component development webserver started on port ${rootUrl}`);
   });
 
   if (options?.noBrowser !== true) {

package/src/integration-tests/service-deployment.integration.spec.ts

@@ -14,25 +14,29 @@ interface HealthInfo {
 }
 
 describe('Verify latest services deployments', () => {
-  it('Should have latest Management API service', async () => {
+  it.skip('Should have latest Management API service', async () => {
     const response: HealthInfo = (await managementServiceRoot.get('/health')).data;
     expect(response.buildVersion).toBe(ci_buildVersion);
     expect(response.buildBranch).toBe(ci_buildBranch);
   });
 
   it('Should return 200 for Management API docs', async () => {
-    const req = await managementService.get('/docs');
+    const req = await managementService.get('/v1/docs', {
+      baseURL: managementService.defaults.baseURL?.replace(/v1\/?/, ''),
+    });
     expect(req.status).toBe(200);
     expect(req.headers['content-type']).toEqual('text/html; charset=utf-8');
   });
 
   it('Should return 200 for Management API docs.json', async () => {
-    const req = await managementService.get('/docs.json');
+    const req = await managementService.get('/v1/docs.json', {
+      baseURL: managementService.defaults.baseURL?.replace(/v1\/?/, ''),
+    });
     expect(req.status).toBe(200);
     expect(req.headers['content-type']).toEqual('application/json; charset=UTF-8');
   });
 
-  it('Should have latest Render Runtime service', async () => {
+  it.skip('Should have latest Render Runtime service', async () => {
     const response: HealthInfo = (await renderService.get('/health')).data;
     expect(response.buildVersion).toBe(ci_buildVersion);
     expect(response.buildBranch).toBe(ci_buildBranch);
@@ -50,7 +54,7 @@ describe('Verify latest services deployments', () => {
     expect(req.headers['content-type']).toEqual('application/json; charset=UTF-8');
   });
 
-  it('Should have latest Content API service', async () => {
+  it.skip('Should have latest Content API service', async () => {
     const response: HealthInfo = (await contentService.get('/health')).data;
     expect(response.buildVersion).toBe(ci_buildVersion);
     expect(response.buildBranch).toBe(ci_buildBranch);

package/src/upload-job.ts

@@ -1,7 +1,7 @@
 import { uploadFile } from '@squiz/virus-scanner-lib';
 
 import { zipDirectory } from '@squiz/dx-common-lib';
-import { ManifestServiceForDev, JobManifestV1Model } from '@squiz/component-lib';
+import { ManifestServiceForDev, JobManifestV1Model } from '@squiz/job-runner-lib';
 import fsp from 'fs/promises';
 import path from 'path';
 import { AxiosInstance } from 'axios';

package/src/utils.spec.ts

@@ -47,7 +47,7 @@ describe('cli lib utils watchAndWaitForUploadAndScanComplete', () => {
   it('should pass if virus scan is successful', async () => {
     jest
       .spyOn(jobService as any, `get`)
-      .mockImplementation(() => Promise.resolve({ data: { status: 'Success' } } as AxiosResponse));
+      .mockImplementation(() => Promise.resolve({ data: { status: 'Success' }, status: 200 } as AxiosResponse));
 
     const res = await watchAndWaitForUploadAndScanComplete(jobService, '/upload-job/status/', '123');
     expect(res).toBeUndefined();
@@ -56,7 +56,7 @@ describe('cli lib utils watchAndWaitForUploadAndScanComplete', () => {
   it('should throw specific error if virus scan is flagged', async () => {
     jest
       .spyOn(jobService as any, `get`)
-      .mockImplementation(() => Promise.resolve({ data: { status: 'Flagged' } } as AxiosResponse));
+      .mockImplementation(() => Promise.resolve({ data: { status: 'Flagged' }, status: 200 } as AxiosResponse));
 
     await expect(async () => {
       await watchAndWaitForUploadAndScanComplete(jobService, '/upload-job/status/', '123');
@@ -66,7 +66,7 @@ describe('cli lib utils watchAndWaitForUploadAndScanComplete', () => {
   it('should throw generic error if virus scan is Error', async () => {
     jest
       .spyOn(jobService as any, `get`)
-      .mockImplementation(() => Promise.resolve({ data: { status: 'Error' } } as AxiosResponse));
+      .mockImplementation(() => Promise.resolve({ data: { status: 'Error' }, status: 200 } as AxiosResponse));
 
     await expect(async () => {
       await watchAndWaitForUploadAndScanComplete(jobService, '/upload-job/status/', '123');
@@ -76,11 +76,11 @@ describe('cli lib utils watchAndWaitForUploadAndScanComplete', () => {
   it('should poll until a result is received', async () => {
     jest
       .spyOn(jobService as any, `get`)
-      .mockImplementationOnce(() => Promise.resolve({ data: { status: 'Scanning' } } as AxiosResponse))
-      .mockImplementationOnce(() => Promise.resolve({ data: { status: 'Scanning' } } as AxiosResponse))
-      .mockImplementationOnce(() => Promise.resolve({ data: { status: 'Scanning' } } as AxiosResponse))
-      .mockImplementationOnce(() => Promise.resolve({ data: { status: 'Scanning' } } as AxiosResponse))
-      .mockImplementationOnce(() => Promise.resolve({ data: { status: 'Success' } } as AxiosResponse));
+      .mockImplementationOnce(() => Promise.resolve({ data: { status: 'Scanning' }, status: 200 } as AxiosResponse))
+      .mockImplementationOnce(() => Promise.resolve({ data: { status: 'Scanning' }, status: 200 } as AxiosResponse))
+      .mockImplementationOnce(() => Promise.resolve({ data: { status: 'Scanning' }, status: 200 } as AxiosResponse))
+      .mockImplementationOnce(() => Promise.resolve({ data: { status: 'Scanning' }, status: 200 } as AxiosResponse))
+      .mockImplementationOnce(() => Promise.resolve({ data: { status: 'Success' }, status: 200 } as AxiosResponse));
 
     const res = await watchAndWaitForUploadAndScanComplete(jobService, '/upload-job/status/', '123');
     expect(res).toBeUndefined();

package/tsconfig.json

@@ -3,6 +3,8 @@
 
   "compilerOptions": {
     "outDir": "lib",
+    "moduleResolution": "node16",
+    "module": "Node16",
     "resolveJsonModule": true,
     "composite": true,
     "rootDir": "./src",