@squiz/component-cli-lib 1.2.1-alpha.99 → 1.2.3

package/.gitlab-ci.yml

@@ -1,22 +1,24 @@
 ---
-# uat target branch only.
+
+.rules:when-production:
+  rules:
+    - if: $CI_DEPLOY_TO_PROD && $CI_COMMIT_REF_NAME == $TARGET_BRANCH_PRODUCTION
+      when: on_success
+
 .rules:when-uat:
   rules:
-    - if: $CI_COMMIT_REF_NAME == $TARGET_BRANCH_UAT
+    - if: $CI_COMMIT_REF_NAME == $TARGET_BRANCH_UAT && $CI_DEPLOY_TO_PROD == null
       when: on_success
-    - when: never
 
 .rules:when-development:
   rules:
-    - if: $CI_COMMIT_REF_NAME == $TARGET_BRANCH_DEVELOPMENT
+    - if: $CI_COMMIT_REF_NAME == $TARGET_BRANCH_DEVELOPMENT && $CI_DEPLOY_TO_PROD == null
       when: on_success
-    - when: never
 
 .rules:when-other-branch:
   rules:
-    - if: $CI_COMMIT_REF_NAME != $TARGET_BRANCH_DEVELOPMENT && $CI_COMMIT_REF_NAME != $TARGET_BRANCH_UAT
+    - if: $CI_COMMIT_REF_NAME != $TARGET_BRANCH_DEVELOPMENT && $CI_COMMIT_REF_NAME != $TARGET_BRANCH_UAT && $CI_COMMIT_REF_NAME != $TARGET_BRANCH_PRODUCTION && $CI_DEPLOY_TO_PROD == null
       when: on_success
-    - when: never
 
 .get-service-urls:
   stage: smoke-test-setup
@@ -45,26 +47,39 @@
         exit 1;
       }
       echo "✔︎"
+    - |2
+      echo -n "Getting 'CONTENT_API_URL' from CloudFormation stack: 'dx-${DEPLOYMENT_LABEL}-cmp' output: 'contentServiceURL'... "
+      CONTENT_API_URL="$(aws --region $AWS_REGION cloudformation describe-stacks --stack-name dx-${DEPLOYMENT_LABEL}-cmp --max-items 1 --query "Stacks[].Outputs[?contains(OutputKey,'contentServiceURL')].OutputValue" --output text)"
+      [[ $CONTENT_API_URL ]] || {
+        echo "✘";
+        echo "CONTENT_API_URL is empty or unset";
+        exit 1;
+      }
+      echo "✔︎"
     - echo "COMPONENT_MANAGEMENT_SERVICE_URL=${COMPONENT_MANAGEMENT_SERVICE_URL}" >> dot.env
     - echo "COMPONENT_RENDER_SERVICE_URL=${COMPONENT_RENDER_SERVICE_URL}" >> dot.env
+    - echo "CONTENT_API_URL=${CONTENT_API_URL}" >> dot.env
     - >2
       echo "COMPONENT_MANAGEMENT_SERVICE_URL now has value: '${COMPONENT_MANAGEMENT_SERVICE_URL}'
       and will be inherited by other jobs via \"dotenv\" artifact"
     - >2
       echo "COMPONENT_RENDER_SERVICE_URL now has value: '${COMPONENT_RENDER_SERVICE_URL}'
       and will be inherited by other jobs via \"dotenv\" artifact"
+    - >2
+      echo "CONTENT_API_URL now has value: '${CONTENT_API_URL}'
+      and will be inherited by other jobs via \"dotenv\" artifact"
   artifacts:
     reports:
       dotenv: dot.env
 
-smoke-test:
+.smoke-test:
   stage: smoke-test
   tags:
     - size/l
   script:
     - export
-    - npm i
-    - npm run bootstrap
+    - npm ci
+    - npm run bootstrap -- --ci
     - npm run clean
     - npm run lint
     - npm run format-code
@@ -77,13 +92,24 @@ smoke-test:
       - runner_system_failure
       - stuck_or_timeout_failure
 
-get-branch-service-urls:
+smoke-test:development:
   extends:
-    - .rules:when-other-branch
-    - .get-service-urls
-  environment:
-    name: non-production-development
-    url: components.dev.dx.squiz.cloud
+    - .smoke-test
+    - .rules:when-development
+
+smoke-test:uat:
+  extends:
+    - .smoke-test
+    - .rules:when-uat
+
+# TODO: Do we need this running for feature branches?
+# get-branch-service-urls:
+#   extends:
+#     - .rules:when-other-branch
+#     - .get-service-urls
+#   environment:
+#     name: non-production-development
+#     url: components.dev.dx.squiz.cloud
 
 get-development-service-urls:
   extends:
@@ -100,14 +126,3 @@ get-uat-service-urls:
   environment:
     name: non-production-development
     url: components.dev.dx.squiz.cloud
-
-get-production-service-urls:
-  extends:
-    - .get-service-urls
-  environment:
-    name: production
-    url: components.prod.dx.squiz.cloud
-  rules:
-    - if: $CI_DEPLOY_TO_PROD && $CI_COMMIT_REF_NAME == $TARGET_BRANCH_PRODUCTION
-      when: manual
-    - when: never

package/CHANGELOG.md

@@ -3,6 +3,94 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.3](https://gitlab.squiz.net/developer-experience/cmp/compare/v1.2.2...v1.2.3) (2022-10-10)
+
+**Note:** Version bump only for package @squiz/component-cli-lib
+
+
+
+
+
+## [1.2.2](https://gitlab.squiz.net/developer-experience/cmp/compare/v1.2.1...v1.2.2) (2022-09-26)
+
+**Note:** Version bump only for package @squiz/component-cli-lib
+
+
+
+
+
+## [1.2.1](https://gitlab.squiz.net/developer-experience/cmp/compare/v1.2.1-alpha.90...v1.2.1) (2022-09-23)
+
+**Note:** Version bump only for package @squiz/component-cli-lib
+
+
+
+
+
+## [1.2.1-alpha.107](https://gitlab.squiz.net/developer-experience/cmp/compare/v1.2.1-alpha.90...v1.2.1-alpha.107) (2022-09-21)
+
+**Note:** Version bump only for package @squiz/component-cli-lib
+
+
+
+
+
+## [1.2.1-alpha.106](https://gitlab.squiz.net/developer-experience/cmp/compare/v1.2.1-alpha.90...v1.2.1-alpha.106) (2022-09-02)
+
+**Note:** Version bump only for package @squiz/component-cli-lib
+
+
+
+
+
+## [1.2.1-alpha.105](https://gitlab.squiz.net/developer-experience/cmp/compare/v1.2.1-alpha.90...v1.2.1-alpha.105) (2022-08-26)
+
+**Note:** Version bump only for package @squiz/component-cli-lib
+
+
+
+
+
+## [1.2.1-alpha.104](https://gitlab.squiz.net/developer-experience/cmp/compare/v1.2.1-alpha.90...v1.2.1-alpha.104) (2022-08-23)
+
+**Note:** Version bump only for package @squiz/component-cli-lib
+
+
+
+
+
+## [1.2.1-alpha.103](https://gitlab.squiz.net/developer-experience/cmp/compare/v1.2.1-alpha.90...v1.2.1-alpha.103) (2022-08-23)
+
+**Note:** Version bump only for package @squiz/component-cli-lib
+
+
+
+
+
+## [1.2.1-alpha.102](https://gitlab.squiz.net/developer-experience/cmp/compare/v1.2.1-alpha.90...v1.2.1-alpha.102) (2022-08-23)
+
+**Note:** Version bump only for package @squiz/component-cli-lib
+
+
+
+
+
+## [1.2.1-alpha.101](https://gitlab.squiz.net/developer-experience/cmp/compare/v1.2.1-alpha.90...v1.2.1-alpha.101) (2022-08-19)
+
+**Note:** Version bump only for package @squiz/component-cli-lib
+
+
+
+
+
+## [1.2.1-alpha.100](https://gitlab.squiz.net/developer-experience/cmp/compare/v1.2.1-alpha.90...v1.2.1-alpha.100) (2022-08-18)
+
+**Note:** Version bump only for package @squiz/component-cli-lib
+
+
+
+
+
 ## [1.2.1-alpha.99](https://gitlab.squiz.net/developer-experience/cmp/compare/v1.2.1-alpha.90...v1.2.1-alpha.99) (2022-08-18)
 
 **Note:** Version bump only for package @squiz/component-cli-lib

package/jest.config.ts

@@ -1,4 +1,7 @@
 import type { Config } from 'jest';
+import path from 'path';
+
+process.env.DATA_MOUNT_POINT = path.join(__dirname, '..', '..', 'test-components');
 
 // Sync object
 const config: Config = {

package/jest.integration.config.ts

@@ -1,5 +1,9 @@
+import { execSync } from 'child_process';
 import type { Config } from 'jest';
 
+process.env.CI_COMMIT_SHORT_SHA ??= execSync('git rev-parse --short HEAD', { encoding: 'utf-8' }).trim();
+process.env.CI_COMMIT_REF_NAME ??= execSync('git branch --show-current', { encoding: 'utf-8' }).trim();
+
 // Sync object
 const config: Config = {
   preset: 'ts-jest',

package/lib/component-dev-folder-structures.spec.d.ts

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

package/lib/component-dev-folder-structures.spec.js

@@ -0,0 +1,58 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const supertest_1 = __importDefault(require("supertest"));
+const path_1 = __importDefault(require("path"));
+const promises_1 = __importDefault(require("fs/promises"));
+const render_runtime_lib_1 = require("@squiz/render-runtime-lib");
+const component_dev_1 = require("./component-dev");
+jest.setTimeout(20000);
+describe('component-dev', () => {
+    describe('production style folder structure', () => {
+        let server;
+        let request;
+        beforeAll(async () => {
+            server = (0, component_dev_1.startDevelopmentRender)(render_runtime_lib_1.TestHelpers.getTestComponentFolder(), { port: 0 });
+            request = (0, supertest_1.default)(server);
+        });
+        afterAll(async () => {
+            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('<h1>hello</h1>');
+        });
+    });
+    describe('local developer style folders', () => {
+        let version;
+        let componentName;
+        let fixtureDirectory;
+        let server;
+        let request;
+        beforeAll(async () => {
+            const { fixtureDirectory: createdFixtureDirectory, version: createdVersion, componentName: createdName, } = await render_runtime_lib_1.TestHelpers.ComponentFixture.setupFullComponentDirectory('<h1>Hello World</h1>');
+            version = createdVersion;
+            fixtureDirectory = createdFixtureDirectory;
+            componentName = createdName;
+            server = (0, component_dev_1.startDevelopmentRender)(fixtureDirectory, { port: 0 });
+            request = (0, supertest_1.default)(server);
+        });
+        afterAll(async () => {
+            server.close();
+        });
+        afterAll(async () => {
+            await promises_1.default.rm(path_1.default.join(fixtureDirectory, componentName), { force: true, recursive: true });
+        });
+        it('should handle recursing folders to find the component', async () => {
+            const response = await request.get(`/r/set/some-namespace/${componentName}/${version}/`);
+            expect(response.text).toEqual('<h1>Hello World</h1>');
+        });
+        it('should handle serving static files from single component directory', async () => {
+            const response = await request.get(`/s/some-namespace/${componentName}/${version}/static.txt`);
+            expect(response.text).toEqual('hello');
+        });
+    });
+});
+//# sourceMappingURL=component-dev-folder-structures.spec.js.map

package/lib/component-dev-folder-structures.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"component-dev-folder-structures.spec.js","sourceRoot":"","sources":["../src/component-dev-folder-structures.spec.ts"],"names":[],"mappings":"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"}

package/lib/component-dev.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+import { LoggerOptions } from '@squiz/dx-logger-lib';
 /**
  * startDevelopmentRender starts a dev-mode render stack for any
  * local directory. This should start an express server on a random unused port
@@ -10,4 +12,5 @@
 export declare function startDevelopmentRender(componentPath: string, options: {
     port: number;
     previewFile?: string;
-}): Promise<() => Promise<void>>;
+    loggingFormat?: LoggerOptions['format'];
+}): import("http").Server;

package/lib/component-dev.js

@@ -7,6 +7,7 @@ exports.startDevelopmentRender = void 0;
 const render_runtime_lib_1 = require("@squiz/render-runtime-lib");
 const dx_logger_lib_1 = require("@squiz/dx-logger-lib");
 const path_1 = __importDefault(require("path"));
+const component_lib_1 = require("@squiz/component-lib");
 /**
  * startDevelopmentRender starts a dev-mode render stack for any
  * local directory. This should start an express server on a random unused port
@@ -16,25 +17,30 @@ const path_1 = __importDefault(require("path"));
  * @param {object} options - Additional configuration for the dev stack
  * @returns a function to stop the render stack
  */
-async function startDevelopmentRender(componentPath, options) {
-    const logger = (0, dx_logger_lib_1.getLogger)({ name: 'component-dev', format: 'human' });
-    await (0, render_runtime_lib_1.startRenderStack)({
-        logger: logger,
-        webserver: {
-            port: options.port,
-            rootUrl: `http://localhost:${options.port}`,
-            shouldRunMigrations: false,
-        },
-        componentRunner: {
-            // Considering the component path will be passed in from CLI
-            // We need to generate the path from the calling directory
-            dataMountPoint: path_1.default.resolve(process.cwd(), componentPath),
-            localDevMode: true,
-            previewFile: options.previewFile,
-            workerTimeout: 20000,
-        },
+function startDevelopmentRender(componentPath, options) {
+    const logger = (0, dx_logger_lib_1.getLogger)({ name: 'component-dev', format: options.loggingFormat || 'human' });
+    const rootUrl = `http://localhost:${options.port}`;
+    const dataMountPoint = path_1.default.resolve(process.cwd(), componentPath);
+    const componentRunnerService = new render_runtime_lib_1.ComponentRunnerServiceWithWorkers({
+        dataMountPoint,
+        shouldCacheResponses: false,
+        workerTimeout: 5000,
+    }, logger);
+    const webServer = (0, render_runtime_lib_1.setupRenderRuntimeServer)({
+        logger,
+        componentRunnerService,
+        componentSetService: new component_lib_1.ComponentSetServiceForLocalDev(logger),
+        componentFunctionService: new component_lib_1.ComponentFunctionService(rootUrl),
+        componentPreviewService: new render_runtime_lib_1.ComponentPreviewService(options.previewFile),
+        manifestService: new component_lib_1.ManifestServiceForDev(dataMountPoint, logger),
+    }, { rootUrl });
+    const server = webServer.listen(options.port, () => {
+        logger.info(`Component development webserver started on port ${options.port}`);
     });
-    return () => (0, render_runtime_lib_1.stopRenderStack)();
+    server.on('close', async () => {
+        await componentRunnerService.stop();
+    });
+    return server;
 }
 exports.startDevelopmentRender = startDevelopmentRender;
 //# sourceMappingURL=component-dev.js.map

package/lib/component-dev.js.map

@@ -1 +1 @@
-{"version":3,"file":"component-dev.js","sourceRoot":"","sources":["../src/component-dev.ts"],"names":[],"mappings":";;;;;;AAAA,kEAA8E;AAC9E,wDAAiD;AACjD,gDAAwB;AAExB;;;;;;;;GAQG;AACI,KAAK,UAAU,sBAAsB,CAAC,aAAqB,EAAE,OAA+C;IACjH,MAAM,MAAM,GAAG,IAAA,yBAAS,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;IACrE,MAAM,IAAA,qCAAgB,EAAC;QACrB,MAAM,EAAE,MAAM;QACd,SAAS,EAAE;YACT,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,OAAO,EAAE,oBAAoB,OAAO,CAAC,IAAI,EAAE;YAC3C,mBAAmB,EAAE,KAAK;SAC3B;QACD,eAAe,EAAE;YACf,4DAA4D;YAC5D,0DAA0D;YAC1D,cAAc,EAAE,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,CAAC;YAC1D,YAAY,EAAE,IAAI;YAClB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,aAAa,EAAE,KAAM;SACtB;KACF,CAAC,CAAC;IAEH,OAAO,GAAG,EAAE,CAAC,IAAA,oCAAe,GAAE,CAAC;AACjC,CAAC;AApBD,wDAoBC"}
+{"version":3,"file":"component-dev.js","sourceRoot":"","sources":["../src/component-dev.ts"],"names":[],"mappings":";;;;;;AAAA,kEAImC;AACnC,wDAAgE;AAChE,gDAAwB;AACxB,wDAAuH;AAEvH;;;;;;;;GAQG;AACH,SAAgB,sBAAsB,CACpC,aAAqB,EACrB,OAAwF;IAExF,MAAM,MAAM,GAAG,IAAA,yBAAS,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,OAAO,CAAC,aAAa,IAAI,OAAO,EAAE,CAAC,CAAC;IAC9F,MAAM,OAAO,GAAG,oBAAoB,OAAO,CAAC,IAAI,EAAE,CAAC;IACnD,MAAM,cAAc,GAAG,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,CAAC,CAAC;IAElE,MAAM,sBAAsB,GAAG,IAAI,sDAAiC,CAClE;QACE,cAAc;QACd,oBAAoB,EAAE,KAAK;QAC3B,aAAa,EAAE,IAAK;KACrB,EACD,MAAM,CACP,CAAC;IACF,MAAM,SAAS,GAAG,IAAA,6CAAwB,EACxC;QACE,MAAM;QACN,sBAAsB;QACtB,mBAAmB,EAAE,IAAI,8CAA8B,CAAC,MAAM,CAAC;QAC/D,wBAAwB,EAAE,IAAI,wCAAwB,CAAC,OAAO,CAAC;QAC/D,uBAAuB,EAAE,IAAI,4CAAuB,CAAC,OAAO,CAAC,WAAW,CAAC;QACzE,eAAe,EAAE,IAAI,qCAAqB,CAAC,cAAc,EAAE,MAAM,CAAC;KACnE,EACD,EAAE,OAAO,EAAE,CACZ,CAAC;IAEF,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE;QACjD,MAAM,CAAC,IAAI,CAAC,mDAAmD,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IACjF,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,IAAI,EAAE;QAC5B,MAAM,sBAAsB,CAAC,IAAI,EAAE,CAAC;IACtC,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC;AArCD,wDAqCC"}

package/lib/component-dev.spec.js

@@ -3,87 +3,50 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = __importDefault(require("path"));
-const promises_1 = __importDefault(require("fs/promises"));
 const render_runtime_lib_1 = require("@squiz/render-runtime-lib");
 const component_dev_1 = require("./component-dev");
 const supertest_1 = __importDefault(require("supertest"));
 jest.setTimeout(20000);
 describe('component-dev', () => {
-    describe('production style folder structure', () => {
-        let doStopStack;
-        beforeAll(async () => {
-            doStopStack = await (0, component_dev_1.startDevelopmentRender)(path_1.default.join(__dirname, '../../../test-components'), { port: 0 });
-        });
-        afterAll(async () => {
-            await doStopStack();
-        });
-        it('should find the component', async () => {
-            const testServer = render_runtime_lib_1.TestHelpers.getTestServer();
-            const response = await testServer.get(`/r/set/test-component/1.0.0?something=hello`);
-            expect(response.text).toEqual('<h1>hello</h1>');
-        });
-    });
-    describe('local developer style folders', () => {
-        let doStopStack;
-        let version;
-        let componentName;
-        let fixtureDirectory;
+    describe('accessing local dev routes', () => {
+        let server;
+        let request;
         beforeAll(async () => {
-            const { fixtureDirectory: ceratedFixtureDirectory, version: createdVersion, componentName: createdName, } = await render_runtime_lib_1.TestHelpers.ComponentFixture.setupFullComponentDirectory('<h1>Hello World</h1>');
-            version = createdVersion;
-            fixtureDirectory = ceratedFixtureDirectory;
-            componentName = createdName;
-            doStopStack = await (0, component_dev_1.startDevelopmentRender)(fixtureDirectory, { port: 0 });
+            server = (0, component_dev_1.startDevelopmentRender)(render_runtime_lib_1.TestHelpers.getTestComponentFolder(), { port: 0 });
+            request = (0, supertest_1.default)(server);
         });
         afterAll(async () => {
-            await doStopStack();
-            await promises_1.default.rm(path_1.default.join(fixtureDirectory, componentName), { force: true, recursive: true });
-        });
-        it('should handle recursing folders to find the component', async () => {
-            const testServer = render_runtime_lib_1.TestHelpers.getTestServer();
-            const response = await testServer.get(`/r/set/${componentName}/${version}/`);
-            expect(response.text).toEqual('<h1>Hello World</h1>');
-        });
-        it('should handle serving static files from single component directory', async () => {
-            const testServer = render_runtime_lib_1.TestHelpers.getTestServer();
-            const response = await testServer.get(`/s/${componentName}/${version}/static.txt`);
-            expect(response.text).toEqual('hello');
+            server.close();
         });
-    });
-    describe('accessing local dev routes', () => {
-        let stopServer;
-        const port = 3006;
-        const url = `http://localhost:${port}`;
-        const request = (0, supertest_1.default)(url);
-        beforeAll(async () => {
-            const compDir = path_1.default.join(__dirname, '../', '../../test-components');
-            stopServer = await (0, component_dev_1.startDevelopmentRender)(compDir, {
-                port: port,
+        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');
+            expect(response.body).toEqual({
+                message: '"main\'s" entry file "missing-entry-file.js" is inaccessible',
             });
-        });
-        afterAll(async () => {
-            await stopServer();
+            expect(response.statusCode).toEqual(500);
         });
         describe('definition routes', () => {
-            render_runtime_lib_1.routeTests.definition(url, url);
+            const server = (0, component_dev_1.startDevelopmentRender)(render_runtime_lib_1.TestHelpers.getTestComponentFolder(), { port: 0 });
+            const request = () => (0, supertest_1.default)(server);
+            render_runtime_lib_1.routeTests.definition(request, 'http://localhost:0');
+            afterAll(() => {
+                server.close();
+            });
         });
         describe('static routes', () => {
-            render_runtime_lib_1.routeTests.static(url);
+            const server = (0, component_dev_1.startDevelopmentRender)(render_runtime_lib_1.TestHelpers.getTestComponentFolder(), { port: 0 });
+            const request = () => (0, supertest_1.default)(server);
+            render_runtime_lib_1.routeTests.static(request);
+            afterAll(() => {
+                server.close();
+            });
         });
         describe('render routes', () => {
-            render_runtime_lib_1.routeTests.render(url, url);
-        });
-        describe('GET /r/set/test-component/1.0.1', () => {
-            //
-            // this scenario is different to the 'production' tests
-            // this is should 500 in prod and 404 locally
-            it('should fail validation if trying to render a component with an invalid schema', async () => {
-                const response = await request.get('/r/set/test-component/1.0.1?something=not-used');
-                expect(response.statusCode).toEqual(404);
-                expect(response.body).toEqual({
-                    message: 'manifest could not be found',
-                });
+            const server = (0, component_dev_1.startDevelopmentRender)(render_runtime_lib_1.TestHelpers.getTestComponentFolder(), { port: 0 });
+            const request = () => (0, supertest_1.default)(server);
+            render_runtime_lib_1.routeTests.render(request, 'http://localhost:0');
+            afterAll(() => {
+                server.close();
             });
         });
     });

package/lib/component-dev.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"component-dev.spec.js","sourceRoot":"","sources":["../src/component-dev.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"component-dev.spec.js","sourceRoot":"","sources":["../src/component-dev.spec.ts"],"names":[],"mappings":";;;;;AAAA,kEAAoE;AACpE,mDAAyD;AACzD,0DAAkC;AAGlC,IAAI,CAAC,UAAU,CAAC,KAAM,CAAC,CAAC;AAExB,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;QAC1C,IAAI,MAAc,CAAC;QACnB,IAAI,OAA4C,CAAC;QACjD,SAAS,CAAC,KAAK,IAAI,EAAE;YACnB,MAAM,GAAG,IAAA,sCAAsB,EAAC,gCAAW,CAAC,sBAAsB,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;YACnF,OAAO,GAAG,IAAA,mBAAS,EAAC,MAAM,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,KAAK,IAAI,EAAE;YAClB,MAAM,CAAC,KAAK,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6EAA6E,EAAE,KAAK,IAAI,EAAE;YAC3F,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,CAChC,6FAA6F,CAC9F,CAAC;YAEF,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;gBAC5B,OAAO,EAAE,8DAA8D;aACxE,CAAC,CAAC;YACH,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;YACjC,MAAM,MAAM,GAAG,IAAA,sCAAsB,EAAC,gCAAW,CAAC,sBAAsB,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;YACzF,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,IAAA,mBAAS,EAAC,MAAM,CAAC,CAAC;YACxC,+BAAU,CAAC,UAAU,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;YACrD,QAAQ,CAAC,GAAG,EAAE;gBACZ,MAAM,CAAC,KAAK,EAAE,CAAC;YACjB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;YAC7B,MAAM,MAAM,GAAG,IAAA,sCAAsB,EAAC,gCAAW,CAAC,sBAAsB,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;YACzF,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,IAAA,mBAAS,EAAC,MAAM,CAAC,CAAC;YACxC,+BAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAC3B,QAAQ,CAAC,GAAG,EAAE;gBACZ,MAAM,CAAC,KAAK,EAAE,CAAC;YACjB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;YAC7B,MAAM,MAAM,GAAG,IAAA,sCAAsB,EAAC,gCAAW,CAAC,sBAAsB,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;YACzF,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,IAAA,mBAAS,EAAC,MAAM,CAAC,CAAC;YACxC,+BAAU,CAAC,MAAM,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;YACjD,QAAQ,CAAC,GAAG,EAAE;gBACZ,MAAM,CAAC,KAAK,EAAE,CAAC;YACjB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/lib/integration-tests/__components__/big-package/manifest.json

@@ -2,7 +2,10 @@
     "$schema": "http://localhost:3000/schemas/v1.json#",
     "name": "big-package",
     "version": "1.0.2",
-    "main-function": "render-json",
+    "mainFunction": "render-json",
+    "namespace": "smoke-test-components",
+    "displayName": "some-displayName",
+    "description": "some-description",
     "functions": [
         {
             "name": "render-json",
@@ -17,7 +20,7 @@
                 "required": ["something"]
             },
             "output": {
-                "response-type": "json",
+                "responseType": "json",
                 "definition": {
                     "properties": {
                         "my-prop": {

package/lib/integration-tests/__components__/cmp-static-file-test/manifest.json

@@ -2,7 +2,10 @@
     "$schema": "http://localhost:3000/schemas/v1.json#",
     "name": "cmp-static-file-test",
     "version": "1.0.0",
-    "main-function": "main",
+    "mainFunction": "main",
+    "namespace": "smoke-test-components",
+    "displayName": "some-displayName",
+    "description": "some-description",
     "functions": [
         {
             "entry": "main.js",
@@ -17,8 +20,8 @@
                 "required": ["something"]
             },
             "output": {
-                "response-type": "html",
-                "static-files": [
+                "responseType": "html",
+                "staticFiles": [
                     {
                         "location": "header",
                         "file": {
@@ -30,7 +33,7 @@
             }
         }
     ],
-    "static-files": {
-        "location-root": "public"
+    "staticFiles": {
+        "locationRoot": "public"
     }
 }

package/lib/integration-tests/__components__/invalid-manifest/manifest.json

@@ -2,7 +2,10 @@
     "$schema": "http://localhost:3000/schemas/v1.json#",
     "name": "invalid-manifes@t",
     "version": "1.0.0",
-    "main-function": "main",
+    "mainFunction": "main",
+    "namespace": "smoke-test-components",
+    "displayName": "some-displayName",
+    "description": "some-description",
     "functions": [
         {
             "entry": "main.js",
@@ -17,7 +20,7 @@
                 "required": ["something"]
             },
             "output": {
-                "response-type": "html"
+                "responseType": "html"
             }
         }
     ]

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

@@ -1,15 +1,21 @@
+import { ComponentSetWebModel } from '@squiz/component-lib';
 interface Config {
     managementServiceUrl: string;
     renderServiceUrl: string;
+    contentServiceUrl: string;
     ci_buildVersion: string;
     ci_buildBranch: string;
 }
 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 ci_buildVersion: string;
 export declare const ci_buildBranch: string;
 export declare function getTestComponents(): string[];
 export declare function createFile(filePath: string, sizeInMB: number): Promise<void>;
 export declare function removeFile(filePath: string): void;
+export declare function deleteComponentSet(webPath: string): Promise<void>;
+export declare function addComponentSet(componentSet: ComponentSetWebModel): Promise<void>;