@squiz/component-cli-lib 1.2.11 → 1.2.13-alpha.0

package/lib/upload-component-folder.js

@@ -9,28 +9,22 @@ const dx_common_lib_1 = require("@squiz/dx-common-lib");
 const component_lib_1 = require("@squiz/component-lib");
 const promises_1 = __importDefault(require("fs/promises"));
 const path_1 = __importDefault(require("path"));
-const axios_1 = __importDefault(require("axios"));
 const cli_color_1 = __importDefault(require("cli-color"));
 const dx_logger_lib_1 = require("@squiz/dx-logger-lib");
+const dx_json_schema_lib_1 = require("@squiz/dx-json-schema-lib");
 exports.logger = (0, dx_logger_lib_1.getLogger)({ name: 'upload-component', format: 'human' });
-async function uploadComponentFolder(folderPath, componentServiceManagementUrl, componentRenderServiceUrl, baseTempDir = '') {
+async function uploadComponentFolder(apiClient, componentServiceManagementUrl, folderPath, baseTempDir = '') {
     const tmpDir = await promises_1.default.mkdtemp(path_1.default.resolve(baseTempDir, 'cmp-upload'));
     try {
-        const axiosInstance = axios_1.default.create({
-            baseURL: componentServiceManagementUrl,
-            headers: {
-                'content-type': 'application/json',
-            },
-        });
-        await preUploadChecks(folderPath, componentRenderServiceUrl);
+        await preUploadChecks(apiClient, componentServiceManagementUrl, folderPath);
         exports.logger.info('Initial scanning');
         const zip = await (0, dx_common_lib_1.zipDirectory)(folderPath, tmpDir);
-        const initialUpload = await handleResponse(axiosInstance.post('upload-component'));
+        const initialUpload = await handleResponse(apiClient.post('/v1/upload-component', {}, { baseURL: componentServiceManagementUrl }));
         exports.logger.info(`deployment id: ${initialUpload.id} status: transferring`);
         await (0, virus_scanner_lib_1.uploadFile)(initialUpload, zip);
-        await watchAndWaitForUploadAndScanComplete(initialUpload.id, axiosInstance);
+        await watchAndWaitForUploadAndScanComplete(apiClient, componentServiceManagementUrl, initialUpload.id);
         exports.logger.info(`deployment id: ${initialUpload.id} status: deploying component folder`);
-        const result = await handleResponse(axiosInstance.post(`upload-component/next/${initialUpload.id}`));
+        const result = await handleResponse(apiClient.post(`/v1/upload-component/next/${initialUpload.id}`, {}, { baseURL: componentServiceManagementUrl }));
         await promises_1.default.rm(tmpDir, { force: true, recursive: true });
         if (result.status === 'successful') {
             exports.logger.info(`deployment id: ${initialUpload.id} status: ${cli_color_1.default.green('success')}`);
@@ -51,38 +45,30 @@ async function uploadComponentFolder(folderPath, componentServiceManagementUrl,
     }
 }
 exports.uploadComponentFolder = uploadComponentFolder;
-async function preUploadChecks(folderPath, renderService) {
-    const service = new component_lib_1.ManifestServiceForDev(folderPath, exports.logger);
+async function preUploadChecks(apiClient, managementURL, folderPath) {
+    const service = new component_lib_1.ManifestServiceForDev(folderPath, exports.logger, new dx_json_schema_lib_1.JsonValidationService());
     const manifestPath = path_1.default.join(folderPath, `manifest.json`);
     const result = await service.readManifest(manifestPath);
     await service.assertManifestIsValid(manifestPath, result.getModel());
-    if (await checkIfVersionExists(result, renderService)) {
+    if (await checkIfVersionExists(apiClient, managementURL, result)) {
         throw new Error(`Cannot upload component version, ${result.getName()} ${result.getVersion()} already exists`);
     }
 }
-async function checkIfVersionExists(inputManifest, renderService) {
-    const axiosInstance = axios_1.default.create({
-        baseURL: renderService,
+async function checkIfVersionExists(apiClient, managementURL, inputManifest) {
+    const response = await apiClient.get(`/v1/component/${inputManifest.getName()}/${inputManifest.getVersion()}`, {
+        validateStatus: null,
+        baseURL: managementURL,
     });
-    try {
-        const response = await axiosInstance.get(`d/${inputManifest.getName()}/${inputManifest.getVersion()}/manifest.json`);
-        if (response.status === 200) {
-            return true;
-        }
-        throw new Error(`Unexpected response code ${response.status}`);
+    if (response.status === 200) {
+        return true;
     }
-    catch (error) {
-        if (isAxiosError(error)) {
-            const { response } = error;
-            if ((response === null || response === void 0 ? void 0 : response.status) === 404) {
-                return false;
-            }
-        }
-        throw error;
+    else if (response.status === 404) {
+        return false;
     }
+    throw new Error(`Unexpected response code ${response.status}`);
 }
-async function watchAndWaitForUploadAndScanComplete(id, axiosInstance) {
-    const poll = () => handleResponse(axiosInstance.get('upload-component/status/' + id));
+async function watchAndWaitForUploadAndScanComplete(apiClient, managementURL, id) {
+    const poll = () => handleResponse(apiClient.get('/v1/upload-component/status/' + id, { baseURL: managementURL }));
     return new Promise((resolve, reject) => {
         const recurse = () => poll().then(async (req) => {
             if (req.status == 'Success') {

package/lib/upload-component-folder.js.map

@@ -1 +1 @@
-{"version":3,"file":"upload-component-folder.js","sourceRoot":"","sources":["../src/upload-component-folder.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAkE;AAElE,wDAAoD;AACpD,wDAAuE;AACvE,2DAA8B;AAC9B,gDAAwB;AACxB,kDAAwE;AACxE,0DAA8B;AAC9B,wDAAyD;AAE5C,QAAA,MAAM,GAAW,IAAA,yBAAS,EAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;AAEhF,KAAK,UAAU,qBAAqB,CACzC,UAAkB,EAClB,6BAAqC,EACrC,yBAAiC,EACjC,cAAsB,EAAE;IAExB,MAAM,MAAM,GAAG,MAAM,kBAAG,CAAC,OAAO,CAAC,cAAI,CAAC,OAAO,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC;IAE1E,IAAI;QACF,MAAM,aAAa,GAAG,eAAK,CAAC,MAAM,CAAC;YACjC,OAAO,EAAE,6BAA6B;YACtC,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;aACnC;SACF,CAAC,CAAC;QAEH,MAAM,eAAe,CAAC,UAAU,EAAE,yBAAyB,CAAC,CAAC;QAC7D,cAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAChC,MAAM,GAAG,GAAG,MAAM,IAAA,4BAAY,EAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAEnD,MAAM,aAAa,GAAG,MAAM,cAAc,CAAM,aAAa,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC;QAExF,cAAM,CAAC,IAAI,CAAC,kBAAkB,aAAa,CAAC,EAAE,uBAAuB,CAAC,CAAC;QACvE,MAAM,IAAA,8BAAU,EAAC,aAAa,EAAE,GAAG,CAAC,CAAC;QAErC,MAAM,oCAAoC,CAAC,aAAa,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC;QAE5E,cAAM,CAAC,IAAI,CAAC,kBAAkB,aAAa,CAAC,EAAE,qCAAqC,CAAC,CAAC;QACrF,MAAM,MAAM,GAAG,MAAM,cAAc,CAAM,aAAa,CAAC,IAAI,CAAC,yBAAyB,aAAa,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAE1G,MAAM,kBAAG,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAEvD,IAAI,MAAM,CAAC,MAAM,KAAK,YAAY,EAAE;YAClC,cAAM,CAAC,IAAI,CAAC,kBAAkB,aAAa,CAAC,EAAE,YAAY,mBAAK,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;YACpF,cAAM,CAAC,IAAI,CAAC,sBAAsB,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;SACxD;aAAM;YACL,cAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE,mBAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;SACjE;KACF;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,kBAAG,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAEvD,IAAI,CAAC,YAAY,KAAK,EAAE;YACtB,cAAM,CAAC,KAAK,CAAC,mBAAK,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;SACpC;aAAM;YACL,MAAM,CAAC,CAAC;SACT;KACF;AACH,CAAC;AA/CD,sDA+CC;AAED,KAAK,UAAU,eAAe,CAAC,UAAkB,EAAE,aAAqB;IACtE,MAAM,OAAO,GAAG,IAAI,qCAAqB,CAAC,UAAU,EAAE,cAAM,CAAC,CAAC;IAC9D,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;IAE5D,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;IACxD,MAAM,OAAO,CAAC,qBAAqB,CAAC,YAAY,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IAErE,IAAI,MAAM,oBAAoB,CAAC,MAAM,EAAE,aAAa,CAAC,EAAE;QACrD,MAAM,IAAI,KAAK,CAAC,oCAAoC,MAAM,CAAC,OAAO,EAAE,IAAI,MAAM,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;KAC/G;AACH,CAAC;AAED,KAAK,UAAU,oBAAoB,CAAC,aAAuB,EAAE,aAAqB;IAChF,MAAM,aAAa,GAAG,eAAK,CAAC,MAAM,CAAC;QACjC,OAAO,EAAE,aAAa;KACvB,CAAC,CAAC;IAEH,IAAI;QACF,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,GAAG,CACtC,KAAK,aAAa,CAAC,OAAO,EAAE,IAAI,aAAa,CAAC,UAAU,EAAE,gBAAgB,CAC3E,CAAC;QACF,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE;YAC3B,OAAO,IAAI,CAAC;SACb;QACD,MAAM,IAAI,KAAK,CAAC,4BAA4B,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;KAChE;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE;YACvB,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;YAC3B,IAAI,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,MAAK,GAAG,EAAE;gBAC5B,OAAO,KAAK,CAAC;aACd;SACF;QACD,MAAM,KAAK,CAAC;KACb;AACH,CAAC;AAED,KAAK,UAAU,oCAAoC,CAAC,EAAU,EAAE,aAA4B;IAC1F,MAAM,IAAI,GAAG,GAAG,EAAE,CAAC,cAAc,CAAa,aAAa,CAAC,GAAG,CAAC,0BAA0B,GAAG,EAAE,CAAC,CAAC,CAAC;IAElG,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,OAAO,GAAG,GAAG,EAAE,CACnB,IAAI,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YACxB,IAAI,GAAG,CAAC,MAAM,IAAI,SAAS,EAAE;gBAC3B,OAAO,EAAE,CAAC;aACX;iBAAM,IAAI,GAAG,CAAC,MAAM,IAAI,SAAS,EAAE;gBAClC,MAAM,CAAC,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC,CAAC;aACzD;iBAAM,IAAI,GAAG,CAAC,MAAM,IAAI,OAAO,EAAE;gBAChC,MAAM,CAAC,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC,CAAC;aAC9C;iBAAM;gBACL,UAAU,CAAC,KAAK,IAAI,EAAE;oBACpB,MAAM,OAAO,EAAE,CAAC;gBAClB,CAAC,EAAE,IAAI,CAAC,CAAC;aACV;QACH,CAAC,CAAC,CAAC;QAEL,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,cAAc,CAAI,aAAwC;IACvE,IAAI;QACF,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC;QACrC,OAAO,QAAQ,CAAC,IAAI,CAAC;KACtB;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,WAAW,CAAC,KAAK,CAAC,CAAC;KAC1B;AACH,CAAC;AAED,SAAS,WAAW,CAAC,KAAU;IAC7B,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IAC3B,IAAI,CAAC,QAAQ,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;QACrC,OAAO,KAAK,CAAC;KACd;IACD,MAAM,OAAO,GAAI,QAAQ,CAAC,IAAY,CAAC,OAAO,CAAC;IAC/C,IAAI,OAAO,EAAE;QACX,OAAO,IAAI,KAAK,CAAC,4BAA4B,QAAQ,CAAC,MAAM,cAAc,OAAO,EAAE,CAAC,CAAC;KACtF;SAAM;QACL,OAAO,IAAI,KAAK,CAAC,4BAA4B,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;KAClE;AACH,CAAC;AAED,SAAS,YAAY,CAAC,KAAU;IAC9B,OAAO,KAAK,IAAI,KAAK,CAAC,YAAY,KAAK,IAAI,CAAC;AAC9C,CAAC"}
+{"version":3,"file":"upload-component-folder.js","sourceRoot":"","sources":["../src/upload-component-folder.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squiz/component-cli-lib",
-  "version": "1.2.11",
+  "version": "1.2.13-alpha.0",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -8,36 +8,37 @@
     "lint": "eslint ./src --ext .ts",
     "test": "jest -c jest.config.ts",
     "test:integration": "jest -c jest.integration.config.ts",
-    "clean": "rimraf \".tsbuildinfo\" \"./lib\""
+    "clean": "rimraf \"tsconfig.tsbuildinfo\" \"./lib\""
   },
   "author": "",
   "license": "ISC",
   "devDependencies": {
     "@types/cli-color": "2.0.2",
-    "@types/express": "4.17.13",
+    "@types/express": "4.17.14",
     "@types/jest": "28.1.8",
     "@types/node": "17.0.27",
     "@types/supertest": "2.0.12",
-    "dotenv": "16.0.2",
+    "dotenv": "16.0.3",
     "eslint": "8.22.0",
     "jest": "28.1.3",
     "ts-jest": "28.0.8",
     "ts-loader": "9.3.1",
     "ts-node": "10.9.1",
-    "typescript": "4.7.4"
+    "typescript": "4.9.3"
   },
   "dependencies": {
-    "@squiz/component-lib": "1.2.11",
-    "@squiz/component-web-api-lib": "1.2.11",
-    "@squiz/dx-common-lib": "1.2.11",
-    "@squiz/dx-logger-lib": "1.2.11",
-    "@squiz/render-runtime-lib": "1.2.11",
-    "@squiz/virus-scanner-lib": "1.2.11",
+    "@squiz/component-lib": "1.2.13-alpha.0",
+    "@squiz/component-web-api-lib": "1.2.13-alpha.0",
+    "@squiz/dx-common-lib": "1.2.13-alpha.0",
+    "@squiz/dx-json-schema-lib": "1.2.13-alpha.0",
+    "@squiz/dx-logger-lib": "1.2.13-alpha.0",
+    "@squiz/render-runtime-lib": "1.2.13-alpha.0",
+    "@squiz/virus-scanner-lib": "1.2.13-alpha.0",
     "archiver": "5.3.1",
     "axios": "0.27.2",
     "cli-color": "^2.0.2",
     "open": "^8.4.0",
     "supertest": "^6.2.3"
   },
-  "gitHead": "518ba2388f1f52bb5e457d54885b61feee0b4744"
+  "gitHead": "811fbf59292dd00a2051036f1115cba5781828dd"
 }

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

@@ -13,7 +13,7 @@ describe('component-dev', () => {
     let server: Server;
     let request: supertest.SuperTest<supertest.Test>;
     beforeAll(async () => {
-      server = startDevelopmentRender(TestHelpers.getTestComponentFolder(), { port: 0 });
+      server = startDevelopmentRender(TestHelpers.getTestComponentFolder(), { port: 0, noBrowser: true });
       request = supertest(server);
     });
 
@@ -22,8 +22,10 @@ describe('component-dev', () => {
     });
 
     it('should find the component', async () => {
-      const response = await request.get(`/r/set/unit-test-components/test-component/1.0.0?something=hello`);
-      expect(response.text).toEqual('<div>hello - {"something":"hello"}</div>');
+      const response = await request.get(
+        `/r/unit-test-components/test-component/1.0.0?_componentSet=set&something=hello`,
+      );
+      expect(response.text).toEqual('<div>hello - {"_componentSet":"set","something":"hello"}</div>');
     });
   });
 
@@ -45,7 +47,7 @@ describe('component-dev', () => {
       fixtureDirectory = createdFixtureDirectory;
       componentName = createdName;
 
-      server = startDevelopmentRender(fixtureDirectory, { port: 0 });
+      server = startDevelopmentRender(fixtureDirectory, { port: 0, noBrowser: true });
       request = supertest(server);
     });
     afterAll(async () => {
@@ -57,12 +59,14 @@ describe('component-dev', () => {
     });
 
     it('should handle recursing folders to find the component', async () => {
-      const response = await request.get(`/r/set/some-namespace/${componentName}/${version}/`);
+      const response = await request.get(`/r/some-namespace/${componentName}/${version}?_componentSet=set`);
       expect(response.text).toEqual('<h1>Hello World</h1>');
-    });
+    }, 30_000);
 
     it('should handle serving static files from single component directory', async () => {
-      const response = await request.get(`/s/set-x/some-namespace/${componentName}/${version}/static.txt`);
+      const response = await request.get(
+        `/s/some-namespace/${componentName}/${version}/static.txt?_componentSet=set-x`,
+      );
       expect(response.text).toEqual('hello');
     });
   });
@@ -78,8 +82,10 @@ describe('component-dev', () => {
       server.close();
     });
     it('should find the component', async () => {
-      const response = await request.get(`/r/set/unit-test-components/test-component/1.0.0?something=hello`);
-      expect(response.text).toEqual('<div>hello - {"something":"hello"}</div>');
+      const response = await request.get(
+        `/r/unit-test-components/test-component/1.0.0?_componentSet=set&something=hello`,
+      );
+      expect(response.text).toEqual('<div>hello - {"_componentSet":"set","something":"hello"}</div>');
     });
   });
 });

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

@@ -11,7 +11,7 @@ describe('component-dev', () => {
     let request: supertest.SuperTest<supertest.Test>;
 
     beforeAll(async () => {
-      server = startDevelopmentRender(TestHelpers.getTestComponentFolder(), { port: 0 });
+      server = startDevelopmentRender(TestHelpers.getTestComponentFolder(), { port: 0, noBrowser: true });
       request = supertest(server);
     });
 
@@ -21,7 +21,7 @@ describe('component-dev', () => {
 
     it('should fail validation when requesting a function with a missing entry file', async () => {
       const response = await request.get(
-        '/r/set/unit-test-components/test-component/1.0.3/non-existent-entry-file?something=not-used',
+        '/r/unit-test-components/test-component/1.0.3/non-existent-entry-file?_componentSet=set&something=not-used',
       );
 
       expect(response.body).toEqual({
@@ -31,7 +31,7 @@ describe('component-dev', () => {
     });
 
     describe('definition routes', () => {
-      const server = startDevelopmentRender(TestHelpers.getTestComponentFolder(), { port: 0 });
+      const server = startDevelopmentRender(TestHelpers.getTestComponentFolder(), { port: 0, noBrowser: true });
       const request = () => supertest(server);
       routeTests.definition(request, 'http://localhost:0');
       afterAll(() => {
@@ -40,7 +40,7 @@ describe('component-dev', () => {
     });
 
     describe('static routes', () => {
-      const server = startDevelopmentRender(TestHelpers.getTestComponentFolder(), { port: 0 });
+      const server = startDevelopmentRender(TestHelpers.getTestComponentFolder(), { port: 0, noBrowser: true });
       const request = () => supertest(server);
       routeTests.static(request);
       afterAll(() => {
@@ -49,7 +49,7 @@ describe('component-dev', () => {
     });
 
     describe('render routes', () => {
-      const server = startDevelopmentRender(TestHelpers.getTestComponentFolder(), { port: 0 });
+      const server = startDevelopmentRender(TestHelpers.getTestComponentFolder(), { port: 0, noBrowser: true });
       const request = () => supertest(server);
       routeTests.render(request, 'http://localhost:0');
       afterAll(() => {

package/src/component-dev.ts

@@ -1,12 +1,15 @@
 import {
-  ComponentPreviewWithDataService,
+  ComponentPreviewService,
   ComponentRunnerServiceWithWorkers,
+  RenderInputService,
   setupRenderRuntimeServer,
 } from '@squiz/render-runtime-lib';
 import { getLogger, LoggerOptions } from '@squiz/dx-logger-lib';
 import path from 'path';
 import { ComponentFunctionService, ComponentSetServiceForLocalDev, ManifestServiceForDev } from '@squiz/component-lib';
 import open from 'open';
+import { DevelopmentApiKeyService } from '@squiz/dx-common-lib';
+import { JsonValidationService } from '@squiz/dx-json-schema-lib';
 
 /**
  * startDevelopmentRender starts a dev-mode render stack for any
@@ -22,9 +25,10 @@ export function startDevelopmentRender(
   options: { port: number; loggingFormat?: LoggerOptions['format']; noBrowser?: boolean },
 ) {
   const logger = getLogger({ name: 'component-dev', format: options.loggingFormat || 'human' });
-  const rootUrl = `http://localhost:${options.port}`;
   const dataMountPoint = path.resolve(process.cwd(), componentPath);
 
+  const rootUrl = `http://localhost:${options.port}`;
+
   const componentRunnerService = new ComponentRunnerServiceWithWorkers(
     {
       dataMountPoint,
@@ -33,23 +37,31 @@ export function startDevelopmentRender(
     },
     logger,
   );
-  const componentFunctionService = new ComponentFunctionService(rootUrl);
-  const webServer = setupRenderRuntimeServer(
-    {
-      logger,
-      componentRunnerService,
-      componentFunctionService,
-      componentPreviewService: new ComponentPreviewWithDataService(componentRunnerService, componentFunctionService, {
-        rootUrl,
-      }),
-      componentSetService: new ComponentSetServiceForLocalDev(logger),
-      manifestService: new ManifestServiceForDev(dataMountPoint, logger),
-    },
-    { rootUrl },
+  const jsonValidationService = new JsonValidationService();
+  const componentFunctionService = new ComponentFunctionService(rootUrl, jsonValidationService);
+  const componentSetService = new ComponentSetServiceForLocalDev(logger);
+  const manifestService = new ManifestServiceForDev(dataMountPoint, logger, jsonValidationService);
+  const contentItemService = undefined;
+  const renderInputService = new RenderInputService(
+    componentSetService,
+    manifestService,
+    componentFunctionService,
+    contentItemService,
+    rootUrl,
   );
+  const webServer = setupRenderRuntimeServer({
+    logger,
+    componentRunnerService,
+    componentFunctionService,
+    componentPreviewService: new ComponentPreviewService(),
+    componentSetService,
+    manifestService,
+    renderInputService,
+    apiKeyService: new DevelopmentApiKeyService(),
+  });
 
   const server = webServer.listen(options.port, () => {
-    logger.info(`Component development webserver started on port ${options.port}`);
+    logger.info(`Component development webserver started on port ${rootUrl}`);
   });
 
   if (options?.noBrowser !== true) {

package/src/integration-tests/__components__/cmp-format-string/main.js

@@ -0,0 +1,7 @@
+/**
+ * @param {object} input
+ * @param {ComponentInfo} info
+ */
+module.exports = async function (input, info) {
+  return `<div>Input: ${input.text}</div>`;
+};

package/src/integration-tests/__components__/cmp-format-string/manifest.json

@@ -0,0 +1,41 @@
+{
+  "$schema": "http://localhost:3000/schemas/v1.json#",
+
+  "name": "cmp-format-string",
+  "version": "1.0.0",
+  "mainFunction": "main",
+  "displayName": "some-display-name",
+  "namespace": "fixtures",
+  "description": "some-description",
+  "functions": [
+    {
+      "name": "main",
+      "entry": "main.js",
+      "input": {
+        "type": "object",
+        "properties": {
+          "text": {
+            "type": "string",
+            "format": "multi-line"
+          }
+        },
+        "required": ["text"]
+      },
+      "output": { "responseType": "html" }
+    }
+  ],
+  "previews": {
+    "test-preview": {
+      "functionData": {
+        "main": {
+          "inputData": {
+            "type": "inline",
+            "value": {
+              "text": "this is a test"
+            }
+          }
+        }
+      }
+    }
+  }
+}

package/src/integration-tests/__components__/cmp-static-file-test/main.js

@@ -1,10 +1,6 @@
-/**
- * @param {object} input
- * @param {ComponentInfo} info
- */
 module.exports = async function (input, info) {
   return (
     `<div>Input: ${input.something}</div>` +
-    `<div>${info.ctx.componentName} ${info.ctx.version} ${info.ctx.getStaticResourceUrl('birthday-cake.png')}</div>`
+    `<div>${info.componentName} ${info.version} ${info.ctx.getStaticResourceUrl('birthday-cake.png')}</div>`
   );
 };

package/src/integration-tests/__components__/invalid-manifest/main.js

@@ -1,7 +1,3 @@
-/**
- * @param {object} input
- * @param {ComponentInfo} info
- */
 module.exports = async function (input, info) {
   return '<div>test</div>';
 };

package/src/integration-tests/__components__/invalid-upload/main.js

@@ -1,7 +1,3 @@
-/**
- * @param {object} input
- * @param {ComponentInfo} info
- */
 module.exports = async function (input, info) {
   return '<div>test</div>';
 };

package/src/integration-tests/helper.ts

@@ -8,6 +8,7 @@ import { ComponentSetWebModelForCreate } from '@squiz/component-lib';
 import { parseEnvVarForVar } from '@squiz/dx-common-lib';
 import { ContentApi } from '@squiz/component-web-api-lib';
 import { config } from 'dotenv';
+import { execSync } from 'child_process';
 
 config();
 
@@ -27,22 +28,75 @@ const configObj: Config = {
   ci_buildBranch: parseEnvVarForVar('CI_COMMIT_REF_NAME'),
 };
 
+if (!configObj.ci_buildVersion) {
+  configObj.ci_buildVersion = execSync('git rev-parse --short HEAD', { encoding: 'utf-8' }).trim();
+}
+
+if (!configObj.ci_buildBranch) {
+  configObj.ci_buildBranch = execSync('git branch --show-current', { encoding: 'utf-8' }).trim();
+}
+
 export default configObj;
 
+const DXP_SERVICE_NAME = 'dxpComponents';
+const ALL_PERMISSIONS_ROLE = {
+  privileges: [
+    'COMPONENT_DEPLOY',
+    'COMPONENT_DELETE',
+    'COMPONENT_READ',
+    'COMPONENT_SET_RULES_READ',
+    'COMPONENT_SET_RULES_WRITE',
+
+    'COMPONENT_SET_READ',
+    'COMPONENT_SET_WRITE',
+
+    'COMPONENT_SET_ENVIRONMENT_READ',
+    'COMPONENT_SET_ENVIRONMENT_WRITE',
+  ],
+};
+
+const validToken = {
+  organisationId: 'aa',
+  permission: '',
+  tenant: 'zz',
+  tenantId: 'zz',
+  userId: 'zz',
+
+  service: {
+    [DXP_SERVICE_NAME]: {
+      privileges: ALL_PERMISSIONS_ROLE.privileges,
+    },
+  },
+};
+
+export const authToken = `Bearer xxx.${Buffer.from(JSON.stringify(validToken)).toString('base64')}.zzz`;
+
 export const managementService = axios.create({
   baseURL: configObj.managementServiceUrl + '/v1',
+  headers: {
+    authorization: authToken,
+  },
 });
 
 export const managementServiceRoot = axios.create({
   baseURL: configObj.managementServiceUrl,
+  headers: {
+    authorization: authToken,
+  },
 });
 
 export const renderService = axios.create({
   baseURL: configObj.renderServiceUrl,
+  headers: {
+    authorization: authToken,
+  },
 });
 
 export const contentService = axios.create({
   baseURL: configObj.contentServiceUrl,
+  headers: {
+    authorization: authToken,
+  },
 });
 
 export const ci_buildVersion = configObj.ci_buildVersion;