@squiz/component-cli-lib 1.2.1-alpha.106 → 1.2.1-alpha.17

package/lib/integration-tests/upload-and-render-component.spec.js

@@ -1,136 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const index_1 = require("../index");
-const helper_1 = __importStar(require("./helper"));
-const cli_color_1 = __importDefault(require("cli-color"));
-const path_1 = __importDefault(require("path"));
-const supertest_1 = __importDefault(require("supertest"));
-const upload_component_folder_1 = require("../upload-component-folder");
-const mockConsoleError = jest.fn();
-const mockConsoleLog = jest.fn();
-const orgConsoleError = console.error;
-const webPath = 'set';
-afterAll(async () => {
-    // clean up the component added by the test
-    await (0, helper_1.deleteComponentSet)(webPath);
-    for (const componentName of (0, helper_1.getTestComponents)()) {
-        try {
-            await helper_1.managementService.delete(`/component/${componentName}`);
-        }
-        catch {
-            // no op
-        }
-    }
-});
-describe('Test isolated test cases', () => {
-    beforeEach(() => {
-        jest.spyOn(upload_component_folder_1.logger, 'error').mockImplementation(mockConsoleError);
-        jest.spyOn(upload_component_folder_1.logger, 'info').mockImplementation(mockConsoleLog);
-    });
-    it('Should fail uploading a component without manifest.json', async () => {
-        mockConsoleError.mockClear();
-        const componentPath = path_1.default.join(__dirname, '/__components__/invalid-upload');
-        await (0, index_1.uploadComponentFolder)(componentPath, helper_1.default.managementServiceUrl, helper_1.default.renderServiceUrl);
-        expect(mockConsoleError.mock.calls[0][0]).toEqual(cli_color_1.default.red('manifest could not be found'));
-    });
-    it('Should fail uploading a component that has invalid manifest.json', async () => {
-        mockConsoleError.mockClear();
-        const componentPath = path_1.default.join(__dirname, '/__components__/invalid-manifest');
-        await (0, index_1.uploadComponentFolder)(componentPath, helper_1.default.managementServiceUrl, helper_1.default.renderServiceUrl);
-        expect(mockConsoleError.mock.calls[0][0]).toEqual(cli_color_1.default.red('/name: pattern must match pattern "^[a-zA-Z0-9_\\-]+$"'));
-    });
-    it('Should fail uploading the component that has size more than 100MB', async () => {
-        mockConsoleError.mockClear();
-        const componentPath = path_1.default.join(__dirname, '/__components__/big-package');
-        const filePath = `${componentPath}/105mb-file`;
-        await (0, helper_1.createFile)(filePath, 105); // Higher limit has been used because compression reduces the size if you use closer to 100MB
-        await (0, index_1.uploadComponentFolder)(componentPath, helper_1.default.managementServiceUrl, helper_1.default.renderServiceUrl);
-        expect(mockConsoleError.mock.calls[0][0]).toEqual(cli_color_1.default.red(['File size exceeds the maximum limit of 100MB'].join('')));
-        (0, helper_1.removeFile)(filePath);
-    });
-});
-describe('Deploy basic component having a static file', () => {
-    // component to deploy for this test
-    const componentPath = path_1.default.join(__dirname, '/__components__/cmp-static-file-test');
-    beforeAll(async () => {
-        await (0, helper_1.deleteComponentSet)(webPath);
-        for (const componentName of (0, helper_1.getTestComponents)()) {
-            try {
-                await helper_1.managementService.delete(`/component/${componentName}`);
-            }
-            catch {
-                // no op
-            }
-        }
-    });
-    beforeEach(() => {
-        console.error = mockConsoleError;
-        console.log = mockConsoleLog;
-    });
-    afterEach(() => {
-        console.error = orgConsoleError;
-    });
-    it('Should upload the component and return a valid url to preview', async () => {
-        var _a, _b;
-        mockConsoleLog.mockClear();
-        console.log(helper_1.default.managementServiceUrl, helper_1.default.renderServiceUrl);
-        await (0, index_1.uploadComponentFolder)(componentPath, helper_1.default.managementServiceUrl, helper_1.default.renderServiceUrl);
-        const url = ((_a = /uploaded location: (.*)/.exec(mockConsoleLog.mock.lastCall)) === null || _a === void 0 ? void 0 : _a[1]) || '';
-        const uploadedComponent = '<a href="/r/set/cmp-static-file-test/1.0.0">1.0.0</a>';
-        const get = await (0, supertest_1.default)(url).get('/');
-        expect(get.status).toEqual(200);
-        expect((_b = get === null || get === void 0 ? void 0 : get.res) === null || _b === void 0 ? void 0 : _b.text).toContain(uploadedComponent);
-    });
-    it('Should fail upload the component with same version', async () => {
-        mockConsoleError.mockClear();
-        await (0, index_1.uploadComponentFolder)(componentPath, helper_1.default.managementServiceUrl, helper_1.default.renderServiceUrl);
-        expect(mockConsoleError.mock.calls[0][0]).toEqual(cli_color_1.default.red('Cannot upload component version, cmp-static-file-test 1.0.0 already exists'));
-    });
-    it('Should render component', async () => {
-        const componentSet = {
-            webPath,
-            displayName: 'Set',
-            description: 'Set description',
-            headers: {},
-            envVars: {},
-            components: {
-                'cmp-static-file-test': [{ envVars: {}, version: '1.0.0' }],
-            },
-        };
-        await (0, helper_1.addComponentSet)(componentSet);
-        const response = await helper_1.renderService.get('/r/set/cmp-static-file-test/1.0.0/?something=hello');
-        expect(response.status).toEqual(200);
-        expect(response.data).toEqual([
-            '<div>Input: hello</div>',
-            '<div>cmp-static-file-test 1.0.0 ',
-            `${helper_1.default.renderServiceUrl}/s/cmp-static-file-test/1.0.0/birthday-cake.png</div>`,
-        ].join(''));
-    });
-});
-//# sourceMappingURL=upload-and-render-component.spec.js.map

package/lib/integration-tests/upload-and-render-component.spec.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"upload-and-render-component.spec.js","sourceRoot":"","sources":["../../src/integration-tests/upload-and-render-component.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oCAAiD;AACjD,mDAQkB;AAClB,0DAA8B;AAC9B,gDAAwB;AACxB,0DAAkC;AAClC,wEAAoD;AAGpD,MAAM,gBAAgB,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;AACnC,MAAM,cAAc,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;AAEjC,MAAM,eAAe,GAAG,OAAO,CAAC,KAAK,CAAC;AACtC,MAAM,OAAO,GAAG,KAAK,CAAC;AAEtB,QAAQ,CAAC,KAAK,IAAI,EAAE;IAClB,2CAA2C;IAC3C,MAAM,IAAA,2BAAkB,EAAC,OAAO,CAAC,CAAC;IAElC,KAAK,MAAM,aAAa,IAAI,IAAA,0BAAiB,GAAE,EAAE;QAC/C,IAAI;YACF,MAAM,0BAAiB,CAAC,MAAM,CAAC,cAAc,aAAa,EAAE,CAAC,CAAC;SAC/D;QAAC,MAAM;YACN,QAAQ;SACT;KACF;AACH,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;IACxC,UAAU,CAAC,GAAG,EAAE;QACd,IAAI,CAAC,KAAK,CAAC,gCAAM,EAAE,OAAO,CAAC,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;QACjE,IAAI,CAAC,KAAK,CAAC,gCAAM,EAAE,MAAM,CAAC,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC;IAChE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yDAAyD,EAAE,KAAK,IAAI,EAAE;QACvE,gBAAgB,CAAC,SAAS,EAAE,CAAC;QAC7B,MAAM,aAAa,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,gCAAgC,CAAC,CAAC;QAC7E,MAAM,IAAA,6BAAqB,EAAC,aAAa,EAAE,gBAAS,CAAC,oBAAoB,EAAE,gBAAS,CAAC,gBAAgB,CAAC,CAAC;QACvG,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,mBAAK,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC,CAAC;IAC9F,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kEAAkE,EAAE,KAAK,IAAI,EAAE;QAChF,gBAAgB,CAAC,SAAS,EAAE,CAAC;QAC7B,MAAM,aAAa,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,kCAAkC,CAAC,CAAC;QAC/E,MAAM,IAAA,6BAAqB,EAAC,aAAa,EAAE,gBAAS,CAAC,oBAAoB,EAAE,gBAAS,CAAC,gBAAgB,CAAC,CAAC;QACvG,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAC/C,mBAAK,CAAC,GAAG,CAAC,wDAAwD,CAAC,CACpE,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mEAAmE,EAAE,KAAK,IAAI,EAAE;QACjF,gBAAgB,CAAC,SAAS,EAAE,CAAC;QAC7B,MAAM,aAAa,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,6BAA6B,CAAC,CAAC;QAC1E,MAAM,QAAQ,GAAG,GAAG,aAAa,aAAa,CAAC;QAC/C,MAAM,IAAA,mBAAU,EAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,6FAA6F;QAC9H,MAAM,IAAA,6BAAqB,EAAC,aAAa,EAAE,gBAAS,CAAC,oBAAoB,EAAE,gBAAS,CAAC,gBAAgB,CAAC,CAAC;QACvG,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAC/C,mBAAK,CAAC,GAAG,CAAC,CAAC,8CAA8C,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CACrE,CAAC;QACF,IAAA,mBAAU,EAAC,QAAQ,CAAC,CAAC;IACvB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,6CAA6C,EAAE,GAAG,EAAE;IAC3D,oCAAoC;IACpC,MAAM,aAAa,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,sCAAsC,CAAC,CAAC;IAEnF,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,MAAM,IAAA,2BAAkB,EAAC,OAAO,CAAC,CAAC;QAClC,KAAK,MAAM,aAAa,IAAI,IAAA,0BAAiB,GAAE,EAAE;YAC/C,IAAI;gBACF,MAAM,0BAAiB,CAAC,MAAM,CAAC,cAAc,aAAa,EAAE,CAAC,CAAC;aAC/D;YAAC,MAAM;gBACN,QAAQ;aACT;SACF;IACH,CAAC,CAAC,CAAC;IAEH,UAAU,CAAC,GAAG,EAAE;QACd,OAAO,CAAC,KAAK,GAAG,gBAAgB,CAAC;QACjC,OAAO,CAAC,GAAG,GAAG,cAAc,CAAC;IAC/B,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,OAAO,CAAC,KAAK,GAAG,eAAe,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+DAA+D,EAAE,KAAK,IAAI,EAAE;;QAC7E,cAAc,CAAC,SAAS,EAAE,CAAC;QAC3B,OAAO,CAAC,GAAG,CAAC,gBAAS,CAAC,oBAAoB,EAAE,gBAAS,CAAC,gBAAgB,CAAC,CAAC;QAExE,MAAM,IAAA,6BAAqB,EAAC,aAAa,EAAE,gBAAS,CAAC,oBAAoB,EAAE,gBAAS,CAAC,gBAAgB,CAAC,CAAC;QAEvG,MAAM,GAAG,GAAG,CAAA,MAAA,yBAAyB,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,0CAAG,CAAC,CAAC,KAAI,EAAE,CAAC;QACpF,MAAM,iBAAiB,GAAG,uDAAuD,CAAC;QAClF,MAAM,GAAG,GAAG,MAAM,IAAA,mBAAS,EAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAE1C,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAChC,MAAM,CAAC,MAAC,GAAW,aAAX,GAAG,uBAAH,GAAG,CAAU,GAAG,0CAAE,IAAI,CAAC,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;QAClE,gBAAgB,CAAC,SAAS,EAAE,CAAC;QAC7B,MAAM,IAAA,6BAAqB,EAAC,aAAa,EAAE,gBAAS,CAAC,oBAAoB,EAAE,gBAAS,CAAC,gBAAgB,CAAC,CAAC;QACvG,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAC/C,mBAAK,CAAC,GAAG,CAAC,4EAA4E,CAAC,CACxF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;QACvC,MAAM,YAAY,GAAyB;YACzC,OAAO;YACP,WAAW,EAAE,KAAK;YAClB,WAAW,EAAE,iBAAiB;YAC9B,OAAO,EAAE,EAAE;YACX,OAAO,EAAE,EAAE;YACX,UAAU,EAAE;gBACV,sBAAsB,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;aAC5D;SACF,CAAC;QAEF,MAAM,IAAA,wBAAe,EAAC,YAAY,CAAC,CAAC;QAEpC,MAAM,QAAQ,GAAG,MAAM,sBAAa,CAAC,GAAG,CAAC,oDAAoD,CAAC,CAAC;QAC/F,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACrC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAC3B;YACE,yBAAyB;YACzB,kCAAkC;YAClC,GAAG,gBAAS,CAAC,gBAAgB,uDAAuD;SACrF,CAAC,IAAI,CAAC,EAAE,CAAC,CACX,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/lib/upload-component-folder.d.ts

@@ -1,3 +0,0 @@
-import { Logger } from '@squiz/dx-logger-lib';
-export declare const logger: Logger;
-export declare function uploadComponentFolder(folderPath: string, componentServiceManagementUrl: string, componentRenderServiceUrl: string): Promise<void>;

package/lib/upload-component-folder.js

@@ -1,128 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.uploadComponentFolder = exports.logger = void 0;
-const virus_scanner_lib_1 = require("@squiz/virus-scanner-lib");
-const component_lib_1 = require("@squiz/component-lib");
-const dx_common_lib_1 = require("@squiz/dx-common-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");
-exports.logger = (0, dx_logger_lib_1.getLogger)({ name: 'upload-component', format: 'human' });
-async function uploadComponentFolder(folderPath, componentServiceManagementUrl, componentRenderServiceUrl) {
-    const tmpDir = path_1.default.resolve(await promises_1.default.mkdtemp('cmp-upload'));
-    try {
-        const axiosInstance = axios_1.default.create({
-            baseURL: componentServiceManagementUrl,
-            headers: {
-                'content-type': 'application/json',
-            },
-        });
-        await preUploadChecks(folderPath, componentRenderServiceUrl);
-        exports.logger.info('Initial scanning');
-        const zip = await (0, dx_common_lib_1.zipDirectory)(folderPath, tmpDir);
-        const initialUpload = await handleResponse(axiosInstance.post('upload-component'));
-        exports.logger.info(`deployment id: ${initialUpload.id} status: transferring`);
-        await (0, virus_scanner_lib_1.uploadFile)(initialUpload, zip);
-        await watchAndWaitForUploadAndScanComplete(initialUpload.id, axiosInstance);
-        exports.logger.info(`deployment id: ${initialUpload.id} status: deploying component folder`);
-        const result = await handleResponse(axiosInstance.post(`upload-component/next/${initialUpload.id}`));
-        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')}`);
-            exports.logger.info(`uploaded location: ${result.accessLink}`);
-        }
-        else {
-            exports.logger.error('failed for an unknown reason', cli_color_1.default.red(result));
-        }
-    }
-    catch (e) {
-        await promises_1.default.rm(tmpDir, { force: true, recursive: true });
-        if (e instanceof Error) {
-            exports.logger.error(cli_color_1.default.red(e.message));
-        }
-        else {
-            throw e;
-        }
-    }
-}
-exports.uploadComponentFolder = uploadComponentFolder;
-async function preUploadChecks(folderPath, renderService) {
-    const result = await (0, component_lib_1.loadManifest)(path_1.default.join(folderPath, `manifest.json`));
-    if (await checkIfVersionExists(result, renderService)) {
-        throw new Error(`Cannot upload component version, ${result.name} ${result.version} already exists`);
-    }
-}
-async function checkIfVersionExists(inputManifest, renderService) {
-    const axiosInstance = axios_1.default.create({
-        baseURL: renderService,
-    });
-    try {
-        const response = await axiosInstance.get(`d/${inputManifest.name}/${inputManifest.version}/manifest.json`);
-        if (response.status === 200) {
-            return true;
-        }
-        throw new Error(`Unexpected response code ${response.status}`);
-    }
-    catch (error) {
-        if (isAxiosError(error)) {
-            const { response } = error;
-            if ((response === null || response === void 0 ? void 0 : response.status) === 404) {
-                return false;
-            }
-        }
-        throw error;
-    }
-}
-async function watchAndWaitForUploadAndScanComplete(id, axiosInstance) {
-    const poll = () => handleResponse(axiosInstance.get('upload-component/status/' + id));
-    return new Promise((resolve, reject) => {
-        const recurse = () => poll().then(async (req) => {
-            if (req.status == 'Success') {
-                resolve();
-            }
-            else if (req.status == 'Flagged') {
-                reject(new Error('upload has been flagged as a virus'));
-            }
-            else if (req.status == 'Error') {
-                reject(new Error('there has been an error'));
-            }
-            else {
-                setTimeout(async () => {
-                    await recurse();
-                }, 1000);
-            }
-        });
-        recurse();
-    });
-}
-async function handleResponse(axiosInstance) {
-    try {
-        const response = await axiosInstance;
-        return response.data;
-    }
-    catch (error) {
-        throw handleError(error);
-    }
-}
-function handleError(error) {
-    const { response } = error;
-    if (!response || !isAxiosError(error)) {
-        return error;
-    }
-    const message = response.data.message;
-    if (message) {
-        return new Error(`Unexpected response code ${response.status}. message: ${message}`);
-    }
-    else {
-        return new Error(`Unexpected response code ${response.status}.`);
-    }
-}
-function isAxiosError(error) {
-    return error && error.isAxiosError === true;
-}
-//# sourceMappingURL=upload-component-folder.js.map

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

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

package/src/component-dev.spec.ts

@@ -1,111 +0,0 @@
-import path from 'path';
-import fsp from 'fs/promises';
-
-import { routeTests, TestHelpers } from '@squiz/render-runtime-lib';
-import { startDevelopmentRender } from './component-dev';
-import supertest from 'supertest';
-
-jest.setTimeout(20_000);
-
-describe('component-dev', () => {
-  describe('production style folder structure', () => {
-    let doStopStack: Awaited<ReturnType<typeof startDevelopmentRender>>;
-
-    beforeAll(async () => {
-      doStopStack = await startDevelopmentRender(path.join(__dirname, '../../../test-components'), { port: 0 });
-    });
-
-    afterAll(async () => {
-      await doStopStack();
-    });
-
-    it('should find the component', async () => {
-      const testServer = 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: Awaited<ReturnType<typeof startDevelopmentRender>>;
-    let version: string;
-    let componentName: string;
-    let fixtureDirectory: string;
-
-    beforeAll(async () => {
-      const {
-        fixtureDirectory: ceratedFixtureDirectory,
-        version: createdVersion,
-        componentName: createdName,
-      } = await TestHelpers.ComponentFixture.setupFullComponentDirectory('<h1>Hello World</h1>');
-
-      version = createdVersion;
-      fixtureDirectory = ceratedFixtureDirectory;
-      componentName = createdName;
-
-      doStopStack = await startDevelopmentRender(fixtureDirectory, { port: 0 });
-    });
-
-    afterAll(async () => {
-      await doStopStack();
-      await fsp.rm(path.join(fixtureDirectory, componentName), { force: true, recursive: true });
-    });
-
-    it('should handle recursing folders to find the component', async () => {
-      const testServer = 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 = TestHelpers.getTestServer();
-      const response = await testServer.get(`/s/${componentName}/${version}/static.txt`);
-      expect(response.text).toEqual('hello');
-    });
-  });
-
-  describe('accessing local dev routes', () => {
-    let stopServer: Awaited<ReturnType<typeof startDevelopmentRender>>;
-    const port = 3006;
-    const url = `http://localhost:${port}`;
-    const request = supertest(url);
-
-    beforeAll(async () => {
-      const compDir = path.join(__dirname, '../', '../../test-components');
-
-      stopServer = await startDevelopmentRender(compDir, {
-        port: port,
-      });
-    });
-
-    afterAll(async () => {
-      await stopServer();
-    });
-
-    describe('definition routes', () => {
-      routeTests.definition(url, url);
-    });
-
-    describe('static routes', () => {
-      routeTests.static(url);
-    });
-
-    describe('render routes', () => {
-      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',
-        });
-      });
-    });
-  });
-});

package/src/component-dev.ts

@@ -1,34 +0,0 @@
-import { startRenderStack, stopRenderStack } from '@squiz/render-runtime-lib';
-import { getLogger } from '@squiz/dx-logger-lib';
-import path from 'path';
-
-/**
- * startDevelopmentRender starts a dev-mode render stack for any
- * local directory. This should start an express server on a random unused port
- * which can be accessed for viewing the component in development.
- *
- * @param {string} componentPath - The directory with the component to be rendered
- * @param {object} options - Additional configuration for the dev stack
- * @returns a function to stop the render stack
- */
-export async function startDevelopmentRender(componentPath: string, options: { port: number; previewFile?: string }) {
-  const logger = getLogger({ name: 'component-dev', format: 'human' });
-  await 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.resolve(process.cwd(), componentPath),
-      localDevMode: true,
-      previewFile: options.previewFile,
-      workerTimeout: 20_000,
-    },
-  });
-
-  return () => stopRenderStack();
-}

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

@@ -1,33 +0,0 @@
-{
-  "$schema": "http://localhost:3000/schemas/v1.json#",
-
-  "name": "big-package",
-  "version": "1.0.2",
-  "main-function": "render-json",
-  "functions": [
-    {
-      "name": "render-json",
-      "entry": "render-json.js",
-      "input": {
-        "type": "object",
-        "properties": {
-          "something": {
-            "type": "string"
-          }
-        },
-        "required": ["something"]
-      },
-      "output": {
-        "response-type": "json",
-        "definition": {
-          "properties": {
-            "my-prop": {
-              "type": "string"
-            }
-          },
-          "required": ["my-prop"]
-        }
-      }
-    }
-  ]
-}

package/src/integration-tests/__components__/big-package/render-json.js

@@ -1,5 +0,0 @@
-module.exports = async function () {
-  return {
-    'my-prop': 'test value for my-prop',
-  };
-};

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

@@ -1,10 +0,0 @@
-/**
- * @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>`
-  );
-};

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

@@ -1,40 +0,0 @@
-{
-  "$schema": "http://localhost:3000/schemas/v1.json#",
-
-  "name": "cmp-static-file-test",
-  "version": "1.0.0",
-  "main-function": "main",
-
-  "functions": [
-    {
-      "entry": "main.js",
-      "name": "main",
-      "input": {
-        "type": "object",
-        "properties": {
-          "something": {
-            "type": "string"
-          }
-        },
-        "required": ["something"]
-      },
-      "output": {
-        "response-type": "html",
-
-        "static-files": [
-          {
-            "location": "header",
-            "file": {
-              "filepath": "static-library-file.js",
-              "type": "js"
-            }
-          }
-        ]
-      }
-    }
-  ],
-
-  "static-files": {
-    "location-root": "public"
-  }
-}

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

@@ -1 +0,0 @@
-const name = 'foo';

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

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

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

@@ -1,26 +0,0 @@
-{
-  "$schema": "http://localhost:3000/schemas/v1.json#",
-
-  "name": "invalid-manifes@t",
-  "version": "1.0.0",
-  "main-function": "main",
-
-  "functions": [
-    {
-      "entry": "main.js",
-      "name": "main",
-      "input": {
-        "type": "object",
-        "properties": {
-          "something": {
-            "type": "string"
-          }
-        },
-        "required": ["something"]
-      },
-      "output": {
-        "response-type": "html"
-      }
-    }
-  ]
-}

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

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

package/src/integration-tests/helper.ts

@@ -1,75 +0,0 @@
-import axios from 'axios';
-import fs from 'fs';
-import path from 'path';
-
-import fsp from 'fs/promises';
-import { randomBytes } from 'crypto';
-import { ComponentSetWebModel } from '@squiz/component-lib';
-import { parseEnvVarForVar } from '@squiz/dx-common-lib';
-import { config } from 'dotenv';
-
-config();
-
-interface Config {
-  managementServiceUrl: string;
-  renderServiceUrl: string;
-  ci_buildVersion: string;
-  ci_buildBranch: string;
-}
-
-const configObj: Config = {
-  managementServiceUrl: parseEnvVarForVar('COMPONENT_MANAGEMENT_SERVICE_URL').replace(/\/+$/, ''),
-  renderServiceUrl: parseEnvVarForVar('COMPONENT_RENDER_SERVICE_URL').replace(/\/+$/, ''),
-  ci_buildVersion: parseEnvVarForVar('CI_COMMIT_SHORT_SHA'),
-  ci_buildBranch: parseEnvVarForVar('CI_COMMIT_REF_NAME'),
-};
-
-export default configObj;
-
-export const managementService = axios.create({
-  baseURL: configObj.managementServiceUrl,
-});
-
-export const renderService = axios.create({
-  baseURL: configObj.renderServiceUrl,
-});
-
-export const ci_buildVersion = configObj.ci_buildVersion;
-export const ci_buildBranch = configObj.ci_buildBranch;
-
-export function getTestComponents(): string[] {
-  const componets = [];
-  const componentsDir = path.join(__dirname, '/__components__/');
-  const files = fs.readdirSync(componentsDir);
-  for (const file of files) {
-    const stat = fs.statSync(path.join(componentsDir, file));
-    if (stat.isDirectory() && file.substring(0, 4) === 'cmp-') {
-      componets.push(file);
-    }
-  }
-  return componets;
-}
-export async function createFile(filePath: string, sizeInMB: number) {
-  const content = randomBytes(sizeInMB * 1000000);
-  await fsp.writeFile(`${filePath}`, content);
-}
-
-export function removeFile(filePath: string) {
-  fsp.unlink(filePath);
-}
-
-export async function deleteComponentSet(webPath: string) {
-  try {
-    await managementService.delete(`/component-set/${webPath}`);
-  } catch (error) {
-    // no ops
-  }
-}
-
-export async function addComponentSet(componentSet: ComponentSetWebModel) {
-  try {
-    await managementService.post(`/component-set`, componentSet);
-  } catch (error) {
-    //no ops
-  }
-}