@squiz/component-cli-lib 1.2.12 → 1.2.13-alpha.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.env.example +9 -0
- package/.gitlab-ci.yml +2 -3
- package/CHANGELOG.md +11 -419
- package/jest.config.ts +9 -1
- package/jest.integration.config.ts +7 -2
- package/lib/component-dev-folder-structures.integration.spec.js +7 -7
- package/lib/component-dev-folder-structures.integration.spec.js.map +1 -1
- package/lib/component-dev.integration.spec.js +1 -1
- package/lib/component-dev.integration.spec.js.map +1 -1
- package/lib/component-dev.js +16 -9
- package/lib/component-dev.js.map +1 -1
- package/lib/integration-tests/__components__/cmp-format-string/manifest.json +40 -0
- package/lib/integration-tests/helper.d.ts +1 -0
- package/lib/integration-tests/helper.js +47 -1
- package/lib/integration-tests/helper.js.map +1 -1
- package/lib/integration-tests/upload-and-render-component.integration.spec.js +61 -7
- package/lib/integration-tests/upload-and-render-component.integration.spec.js.map +1 -1
- package/lib/upload-component-folder.js +2 -1
- package/lib/upload-component-folder.js.map +1 -1
- package/package.json +12 -11
- package/src/component-dev-folder-structures.integration.spec.ts +13 -7
- package/src/component-dev.integration.spec.ts +1 -1
- package/src/component-dev.ts +28 -16
- package/src/integration-tests/__components__/cmp-format-string/main.js +7 -0
- package/src/integration-tests/__components__/cmp-format-string/manifest.json +41 -0
- package/src/integration-tests/__components__/cmp-static-file-test/main.js +1 -5
- package/src/integration-tests/__components__/invalid-manifest/main.js +0 -4
- package/src/integration-tests/__components__/invalid-upload/main.js +0 -4
- package/src/integration-tests/helper.ts +54 -0
- package/src/integration-tests/upload-and-render-component.integration.spec.ts +68 -7
- package/src/upload-component-folder.ts +2 -1
- package/tsconfig.json +3 -2
- package/tsconfig.tsbuildinfo +1 -1
package/jest.config.ts
CHANGED
|
@@ -2,12 +2,20 @@ import type { Config } from 'jest';
|
|
|
2
2
|
import path from 'path';
|
|
3
3
|
|
|
4
4
|
process.env.DATA_MOUNT_POINT = path.join(__dirname, '..', '..', 'test-components');
|
|
5
|
+
process.env.SQUIZ_REGION = 'au';
|
|
6
|
+
process.env.DEPLOYMENT_ENVIRONMENT = 'dev';
|
|
5
7
|
|
|
6
8
|
// Sync object
|
|
7
9
|
const config: Config = {
|
|
8
10
|
preset: 'ts-jest',
|
|
9
11
|
testEnvironment: 'node',
|
|
10
|
-
|
|
12
|
+
passWithNoTests: true,
|
|
13
|
+
testPathIgnorePatterns: [
|
|
14
|
+
'<rootDir>/lib/',
|
|
15
|
+
'<rootDir>/src/integration-tests',
|
|
16
|
+
'<rootDir>/src/test.ts',
|
|
17
|
+
'.*\\.integration\\.spec\\.ts$',
|
|
18
|
+
],
|
|
11
19
|
maxWorkers: '80%',
|
|
12
20
|
globals: {
|
|
13
21
|
'ts-jest': {
|
|
@@ -1,8 +1,13 @@
|
|
|
1
1
|
import { execSync } from 'child_process';
|
|
2
2
|
import type { Config } from 'jest';
|
|
3
3
|
|
|
4
|
+
import { config as dotEnvConfig } from 'dotenv';
|
|
5
|
+
dotEnvConfig();
|
|
6
|
+
|
|
4
7
|
process.env.CI_COMMIT_SHORT_SHA ??= execSync('git rev-parse --short HEAD', { encoding: 'utf-8' }).trim();
|
|
5
8
|
process.env.CI_COMMIT_REF_NAME ??= execSync('git branch --show-current', { encoding: 'utf-8' }).trim();
|
|
9
|
+
process.env.SQUIZ_REGION = 'au';
|
|
10
|
+
process.env.DEPLOYMENT_ENVIRONMENT = 'dev';
|
|
6
11
|
|
|
7
12
|
// Sync object
|
|
8
13
|
const config: Config = {
|
|
@@ -17,8 +22,8 @@ const config: Config = {
|
|
|
17
22
|
detectOpenHandles: true,
|
|
18
23
|
|
|
19
24
|
globals: {
|
|
20
|
-
BUILD_VERSION:
|
|
21
|
-
BUILD_BRANCH:
|
|
25
|
+
BUILD_VERSION: process.env.CI_COMMIT_SHORT_SHA,
|
|
26
|
+
BUILD_BRANCH: process.env.CI_COMMIT_REF_NAME,
|
|
22
27
|
},
|
|
23
28
|
};
|
|
24
29
|
|
|
@@ -21,8 +21,8 @@ describe('component-dev', () => {
|
|
|
21
21
|
server.close();
|
|
22
22
|
});
|
|
23
23
|
it('should find the component', async () => {
|
|
24
|
-
const response = await request.get(`/r/
|
|
25
|
-
expect(response.text).toEqual('<div>hello - {"something":"hello"}</div>');
|
|
24
|
+
const response = await request.get(`/r/unit-test-components/test-component/1.0.0?_componentSet=set&something=hello`);
|
|
25
|
+
expect(response.text).toEqual('<div>hello - {"_componentSet":"set","something":"hello"}</div>');
|
|
26
26
|
});
|
|
27
27
|
});
|
|
28
28
|
describe('local developer style folders', () => {
|
|
@@ -46,11 +46,11 @@ describe('component-dev', () => {
|
|
|
46
46
|
await promises_1.default.rm(path_1.default.join(fixtureDirectory, componentName), { force: true, recursive: true });
|
|
47
47
|
});
|
|
48
48
|
it('should handle recursing folders to find the component', async () => {
|
|
49
|
-
const response = await request.get(`/r/
|
|
49
|
+
const response = await request.get(`/r/some-namespace/${componentName}/${version}?_componentSet=set`);
|
|
50
50
|
expect(response.text).toEqual('<h1>Hello World</h1>');
|
|
51
|
-
});
|
|
51
|
+
}, 30000);
|
|
52
52
|
it('should handle serving static files from single component directory', async () => {
|
|
53
|
-
const response = await request.get(`/s/
|
|
53
|
+
const response = await request.get(`/s/some-namespace/${componentName}/${version}/static.txt?_componentSet=set-x`);
|
|
54
54
|
expect(response.text).toEqual('hello');
|
|
55
55
|
});
|
|
56
56
|
});
|
|
@@ -65,8 +65,8 @@ describe('component-dev', () => {
|
|
|
65
65
|
server.close();
|
|
66
66
|
});
|
|
67
67
|
it('should find the component', async () => {
|
|
68
|
-
const response = await request.get(`/r/
|
|
69
|
-
expect(response.text).toEqual('<div>hello - {"something":"hello"}</div>');
|
|
68
|
+
const response = await request.get(`/r/unit-test-components/test-component/1.0.0?_componentSet=set&something=hello`);
|
|
69
|
+
expect(response.text).toEqual('<div>hello - {"_componentSet":"set","something":"hello"}</div>');
|
|
70
70
|
});
|
|
71
71
|
});
|
|
72
72
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component-dev-folder-structures.integration.spec.js","sourceRoot":"","sources":["../src/component-dev-folder-structures.integration.spec.ts"],"names":[],"mappings":";;;;;AAAA,0DAAkC;AAClC,gDAAwB;AACxB,2DAA8B;AAE9B,kEAAwD;AACxD,mDAAyD;AAGzD,IAAI,CAAC,UAAU,CAAC,KAAM,CAAC,CAAC;AAExB,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,QAAQ,CAAC,mCAAmC,EAAE,GAAG,EAAE;QACjD,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,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACpG,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,2BAA2B,EAAE,KAAK,IAAI,EAAE;YACzC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"component-dev-folder-structures.integration.spec.js","sourceRoot":"","sources":["../src/component-dev-folder-structures.integration.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,7 @@ describe('component-dev', () => {
|
|
|
19
19
|
server.close();
|
|
20
20
|
});
|
|
21
21
|
it('should fail validation when requesting a function with a missing entry file', async () => {
|
|
22
|
-
const response = await request.get('/r/
|
|
22
|
+
const response = await request.get('/r/unit-test-components/test-component/1.0.3/non-existent-entry-file?_componentSet=set&something=not-used');
|
|
23
23
|
expect(response.body).toEqual({
|
|
24
24
|
message: '"main\'s" entry file "missing-entry-file.js" is inaccessible',
|
|
25
25
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component-dev.integration.spec.js","sourceRoot":"","sources":["../src/component-dev.integration.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;QAEjD,SAAS,CAAC,KAAK,IAAI,EAAE;YACnB,MAAM,GAAG,IAAA,sCAAsB,EAAC,gCAAW,CAAC,sBAAsB,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACpG,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,
|
|
1
|
+
{"version":3,"file":"component-dev.integration.spec.js","sourceRoot":"","sources":["../src/component-dev.integration.spec.ts"],"names":[],"mappings":"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"}
|
package/lib/component-dev.js
CHANGED
|
@@ -9,6 +9,8 @@ const dx_logger_lib_1 = require("@squiz/dx-logger-lib");
|
|
|
9
9
|
const path_1 = __importDefault(require("path"));
|
|
10
10
|
const component_lib_1 = require("@squiz/component-lib");
|
|
11
11
|
const open_1 = __importDefault(require("open"));
|
|
12
|
+
const dx_common_lib_1 = require("@squiz/dx-common-lib");
|
|
13
|
+
const dx_json_schema_lib_1 = require("@squiz/dx-json-schema-lib");
|
|
12
14
|
/**
|
|
13
15
|
* startDevelopmentRender starts a dev-mode render stack for any
|
|
14
16
|
* local directory. This should start an express server on a random unused port
|
|
@@ -20,26 +22,31 @@ const open_1 = __importDefault(require("open"));
|
|
|
20
22
|
*/
|
|
21
23
|
function startDevelopmentRender(componentPath, options) {
|
|
22
24
|
const logger = (0, dx_logger_lib_1.getLogger)({ name: 'component-dev', format: options.loggingFormat || 'human' });
|
|
23
|
-
const rootUrl = `http://localhost:${options.port}`;
|
|
24
25
|
const dataMountPoint = path_1.default.resolve(process.cwd(), componentPath);
|
|
26
|
+
const rootUrl = `http://localhost:${options.port}`;
|
|
25
27
|
const componentRunnerService = new render_runtime_lib_1.ComponentRunnerServiceWithWorkers({
|
|
26
28
|
dataMountPoint,
|
|
27
29
|
shouldCacheResponses: false,
|
|
28
30
|
workerTimeout: 5000,
|
|
29
31
|
}, logger);
|
|
30
|
-
const
|
|
32
|
+
const jsonValidationService = new dx_json_schema_lib_1.JsonValidationService();
|
|
33
|
+
const componentFunctionService = new component_lib_1.ComponentFunctionService(rootUrl, jsonValidationService);
|
|
34
|
+
const componentSetService = new component_lib_1.ComponentSetServiceForLocalDev(logger);
|
|
35
|
+
const manifestService = new component_lib_1.ManifestServiceForDev(dataMountPoint, logger, jsonValidationService);
|
|
36
|
+
const contentItemService = undefined;
|
|
37
|
+
const renderInputService = new render_runtime_lib_1.RenderInputService(componentSetService, manifestService, componentFunctionService, contentItemService, rootUrl);
|
|
31
38
|
const webServer = (0, render_runtime_lib_1.setupRenderRuntimeServer)({
|
|
32
39
|
logger,
|
|
33
40
|
componentRunnerService,
|
|
34
41
|
componentFunctionService,
|
|
35
|
-
componentPreviewService: new render_runtime_lib_1.
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
}
|
|
42
|
+
componentPreviewService: new render_runtime_lib_1.ComponentPreviewService(),
|
|
43
|
+
componentSetService,
|
|
44
|
+
manifestService,
|
|
45
|
+
renderInputService,
|
|
46
|
+
apiKeyService: new dx_common_lib_1.DevelopmentApiKeyService(),
|
|
47
|
+
});
|
|
41
48
|
const server = webServer.listen(options.port, () => {
|
|
42
|
-
logger.info(`Component development webserver started on port ${
|
|
49
|
+
logger.info(`Component development webserver started on port ${rootUrl}`);
|
|
43
50
|
});
|
|
44
51
|
if ((options === null || options === void 0 ? void 0 : options.noBrowser) !== true) {
|
|
45
52
|
(0, open_1.default)(rootUrl);
|
package/lib/component-dev.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"component-dev.js","sourceRoot":"","sources":["../src/component-dev.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"component-dev.js","sourceRoot":"","sources":["../src/component-dev.ts"],"names":[],"mappings":";;;;;;AAAA,kEAKmC;AACnC,wDAAgE;AAChE,gDAAwB;AACxB,wDAAuH;AACvH,gDAAwB;AACxB,wDAAgE;AAChE,kEAAkE;AAElE;;;;;;;;GAQG;AACH,SAAgB,sBAAsB,CACpC,aAAqB,EACrB,OAAuF;IAEvF,MAAM,MAAM,GAAG,IAAA,yBAAS,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,OAAO,CAAC,aAAa,IAAI,OAAO,EAAE,CAAC,CAAC;IAC9F,MAAM,cAAc,GAAG,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,CAAC,CAAC;IAElE,MAAM,OAAO,GAAG,oBAAoB,OAAO,CAAC,IAAI,EAAE,CAAC;IAEnD,MAAM,sBAAsB,GAAG,IAAI,sDAAiC,CAClE;QACE,cAAc;QACd,oBAAoB,EAAE,KAAK;QAC3B,aAAa,EAAE,IAAK;KACrB,EACD,MAAM,CACP,CAAC;IACF,MAAM,qBAAqB,GAAG,IAAI,0CAAqB,EAAE,CAAC;IAC1D,MAAM,wBAAwB,GAAG,IAAI,wCAAwB,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC;IAC9F,MAAM,mBAAmB,GAAG,IAAI,8CAA8B,CAAC,MAAM,CAAC,CAAC;IACvE,MAAM,eAAe,GAAG,IAAI,qCAAqB,CAAC,cAAc,EAAE,MAAM,EAAE,qBAAqB,CAAC,CAAC;IACjG,MAAM,kBAAkB,GAAG,SAAS,CAAC;IACrC,MAAM,kBAAkB,GAAG,IAAI,uCAAkB,CAC/C,mBAAmB,EACnB,eAAe,EACf,wBAAwB,EACxB,kBAAkB,EAClB,OAAO,CACR,CAAC;IACF,MAAM,SAAS,GAAG,IAAA,6CAAwB,EAAC;QACzC,MAAM;QACN,sBAAsB;QACtB,wBAAwB;QACxB,uBAAuB,EAAE,IAAI,4CAAuB,EAAE;QACtD,mBAAmB;QACnB,eAAe;QACf,kBAAkB;QAClB,aAAa,EAAE,IAAI,wCAAwB,EAAE;KAC9C,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE;QACjD,MAAM,CAAC,IAAI,CAAC,mDAAmD,OAAO,EAAE,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;IAEH,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,MAAK,IAAI,EAAE;QAC/B,IAAA,cAAI,EAAC,OAAO,CAAC,CAAC;KACf;IAED,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;AArDD,wDAqDC"}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
{
|
|
2
|
+
"$schema": "http://localhost:3000/schemas/v1.json#",
|
|
3
|
+
"name": "cmp-format-string",
|
|
4
|
+
"version": "1.0.0",
|
|
5
|
+
"mainFunction": "main",
|
|
6
|
+
"displayName": "some-display-name",
|
|
7
|
+
"namespace": "fixtures",
|
|
8
|
+
"description": "some-description",
|
|
9
|
+
"functions": [
|
|
10
|
+
{
|
|
11
|
+
"name": "main",
|
|
12
|
+
"entry": "main.js",
|
|
13
|
+
"input": {
|
|
14
|
+
"type": "object",
|
|
15
|
+
"properties": {
|
|
16
|
+
"text": {
|
|
17
|
+
"type": "string",
|
|
18
|
+
"format": "multi-line"
|
|
19
|
+
}
|
|
20
|
+
},
|
|
21
|
+
"required": ["text"]
|
|
22
|
+
},
|
|
23
|
+
"output": { "responseType": "html" }
|
|
24
|
+
}
|
|
25
|
+
],
|
|
26
|
+
"previews": {
|
|
27
|
+
"test-preview": {
|
|
28
|
+
"functionData": {
|
|
29
|
+
"main": {
|
|
30
|
+
"inputData": {
|
|
31
|
+
"type": "inline",
|
|
32
|
+
"value": {
|
|
33
|
+
"text": "this is a test"
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
}
|
|
@@ -9,6 +9,7 @@ interface Config {
|
|
|
9
9
|
}
|
|
10
10
|
declare const configObj: Config;
|
|
11
11
|
export default configObj;
|
|
12
|
+
export declare const authToken: string;
|
|
12
13
|
export declare const managementService: import("axios").AxiosInstance;
|
|
13
14
|
export declare const managementServiceRoot: import("axios").AxiosInstance;
|
|
14
15
|
export declare const renderService: import("axios").AxiosInstance;
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.deleteContentItem = exports.addContentItem = exports.addComponentSet = exports.deleteComponentSet = exports.removeFile = exports.createFile = exports.getTestComponents = exports.ci_buildBranch = exports.ci_buildVersion = exports.contentService = exports.renderService = exports.managementServiceRoot = exports.managementService = void 0;
|
|
6
|
+
exports.deleteContentItem = exports.addContentItem = exports.addComponentSet = exports.deleteComponentSet = exports.removeFile = exports.createFile = exports.getTestComponents = exports.ci_buildBranch = exports.ci_buildVersion = exports.contentService = exports.renderService = exports.managementServiceRoot = exports.managementService = exports.authToken = void 0;
|
|
7
7
|
const axios_1 = __importDefault(require("axios"));
|
|
8
8
|
const fs_1 = __importDefault(require("fs"));
|
|
9
9
|
const path_1 = __importDefault(require("path"));
|
|
@@ -11,6 +11,7 @@ const promises_1 = __importDefault(require("fs/promises"));
|
|
|
11
11
|
const crypto_1 = require("crypto");
|
|
12
12
|
const dx_common_lib_1 = require("@squiz/dx-common-lib");
|
|
13
13
|
const dotenv_1 = require("dotenv");
|
|
14
|
+
const child_process_1 = require("child_process");
|
|
14
15
|
(0, dotenv_1.config)();
|
|
15
16
|
const configObj = {
|
|
16
17
|
managementServiceUrl: (0, dx_common_lib_1.parseEnvVarForVar)('COMPONENT_MANAGEMENT_SERVICE_URL').replace(/\/+$/, ''),
|
|
@@ -19,18 +20,63 @@ const configObj = {
|
|
|
19
20
|
ci_buildVersion: (0, dx_common_lib_1.parseEnvVarForVar)('CI_COMMIT_SHORT_SHA'),
|
|
20
21
|
ci_buildBranch: (0, dx_common_lib_1.parseEnvVarForVar)('CI_COMMIT_REF_NAME'),
|
|
21
22
|
};
|
|
23
|
+
if (!configObj.ci_buildVersion) {
|
|
24
|
+
configObj.ci_buildVersion = (0, child_process_1.execSync)('git rev-parse --short HEAD', { encoding: 'utf-8' }).trim();
|
|
25
|
+
}
|
|
26
|
+
if (!configObj.ci_buildBranch) {
|
|
27
|
+
configObj.ci_buildBranch = (0, child_process_1.execSync)('git branch --show-current', { encoding: 'utf-8' }).trim();
|
|
28
|
+
}
|
|
22
29
|
exports.default = configObj;
|
|
30
|
+
const DXP_SERVICE_NAME = 'dxpComponents';
|
|
31
|
+
const ALL_PERMISSIONS_ROLE = {
|
|
32
|
+
privileges: [
|
|
33
|
+
'COMPONENT_DEPLOY',
|
|
34
|
+
'COMPONENT_DELETE',
|
|
35
|
+
'COMPONENT_READ',
|
|
36
|
+
'COMPONENT_SET_RULES_READ',
|
|
37
|
+
'COMPONENT_SET_RULES_WRITE',
|
|
38
|
+
'COMPONENT_SET_READ',
|
|
39
|
+
'COMPONENT_SET_WRITE',
|
|
40
|
+
'COMPONENT_SET_ENVIRONMENT_READ',
|
|
41
|
+
'COMPONENT_SET_ENVIRONMENT_WRITE',
|
|
42
|
+
],
|
|
43
|
+
};
|
|
44
|
+
const validToken = {
|
|
45
|
+
organisationId: 'aa',
|
|
46
|
+
permission: '',
|
|
47
|
+
tenant: 'zz',
|
|
48
|
+
tenantId: 'zz',
|
|
49
|
+
userId: 'zz',
|
|
50
|
+
service: {
|
|
51
|
+
[DXP_SERVICE_NAME]: {
|
|
52
|
+
privileges: ALL_PERMISSIONS_ROLE.privileges,
|
|
53
|
+
},
|
|
54
|
+
},
|
|
55
|
+
};
|
|
56
|
+
exports.authToken = `Bearer xxx.${Buffer.from(JSON.stringify(validToken)).toString('base64')}.zzz`;
|
|
23
57
|
exports.managementService = axios_1.default.create({
|
|
24
58
|
baseURL: configObj.managementServiceUrl + '/v1',
|
|
59
|
+
headers: {
|
|
60
|
+
authorization: exports.authToken,
|
|
61
|
+
},
|
|
25
62
|
});
|
|
26
63
|
exports.managementServiceRoot = axios_1.default.create({
|
|
27
64
|
baseURL: configObj.managementServiceUrl,
|
|
65
|
+
headers: {
|
|
66
|
+
authorization: exports.authToken,
|
|
67
|
+
},
|
|
28
68
|
});
|
|
29
69
|
exports.renderService = axios_1.default.create({
|
|
30
70
|
baseURL: configObj.renderServiceUrl,
|
|
71
|
+
headers: {
|
|
72
|
+
authorization: exports.authToken,
|
|
73
|
+
},
|
|
31
74
|
});
|
|
32
75
|
exports.contentService = axios_1.default.create({
|
|
33
76
|
baseURL: configObj.contentServiceUrl,
|
|
77
|
+
headers: {
|
|
78
|
+
authorization: exports.authToken,
|
|
79
|
+
},
|
|
34
80
|
});
|
|
35
81
|
exports.ci_buildVersion = configObj.ci_buildVersion;
|
|
36
82
|
exports.ci_buildBranch = configObj.ci_buildBranch;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../src/integration-tests/helper.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,4CAAoB;AACpB,gDAAwB;AAExB,2DAA8B;AAC9B,mCAAqC;AAErC,wDAAyD;AAEzD,mCAAgC;
|
|
1
|
+
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../../src/integration-tests/helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -75,7 +75,7 @@ describe('uploading a component', () => {
|
|
|
75
75
|
mockConsoleError.mockClear();
|
|
76
76
|
const componentPath = path_1.default.join(__dirname, '/__components__/invalid-manifest');
|
|
77
77
|
await (0, index_1.uploadComponentFolder)(helper_1.managementServiceRoot, helper_1.default.managementServiceUrl, componentPath, testFilesDir);
|
|
78
|
-
expect(mockConsoleError.mock.calls[0][0]).toEqual(cli_color_1.default.red('failed validation: /name pattern must match pattern "^[a-zA-Z0-9_\\-]+$"'));
|
|
78
|
+
expect(mockConsoleError.mock.calls[0][0]).toEqual(cli_color_1.default.red('failed validation: /name: pattern must match pattern "^[a-zA-Z0-9_\\-]+$"'));
|
|
79
79
|
});
|
|
80
80
|
it('Should fail uploading the component that has size more than 100MB', async () => {
|
|
81
81
|
mockConsoleError.mockClear();
|
|
@@ -87,6 +87,60 @@ describe('uploading a component', () => {
|
|
|
87
87
|
(0, helper_1.removeFile)(filePath);
|
|
88
88
|
});
|
|
89
89
|
});
|
|
90
|
+
describe('Deploy a basic component having a input with multiline format', () => {
|
|
91
|
+
beforeAll(async () => {
|
|
92
|
+
await (0, helper_1.deleteComponentSet)(webPath);
|
|
93
|
+
await (0, helper_1.deleteContentItem)(contentItemId);
|
|
94
|
+
for (const componentName of (0, helper_1.getTestComponents)()) {
|
|
95
|
+
try {
|
|
96
|
+
await helper_1.managementService.delete(`/component/${componentName}`);
|
|
97
|
+
}
|
|
98
|
+
catch {
|
|
99
|
+
// no op
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
});
|
|
103
|
+
beforeEach(() => {
|
|
104
|
+
console.error = mockConsoleError;
|
|
105
|
+
console.log = mockConsoleLog;
|
|
106
|
+
});
|
|
107
|
+
afterEach(() => {
|
|
108
|
+
console.error = orgConsoleError;
|
|
109
|
+
});
|
|
110
|
+
it('Should upload the component and return a valid url to preview', async () => {
|
|
111
|
+
var _a;
|
|
112
|
+
const componentPath = path_1.default.join(__dirname, '/__components__/cmp-format-string');
|
|
113
|
+
await (0, index_1.uploadComponentFolder)(helper_1.managementServiceRoot, helper_1.default.managementServiceUrl, componentPath, testFilesDir);
|
|
114
|
+
const uploadedComponent = '<a href="/r/fixtures/cmp-format-string/1.0.0?_previewKey=test-preview">1.0.0</a>';
|
|
115
|
+
const get = await (0, supertest_1.default)(helper_1.default.renderServiceUrl).get('/');
|
|
116
|
+
expect(get.status).toEqual(200);
|
|
117
|
+
expect((_a = get === null || get === void 0 ? void 0 : get.res) === null || _a === void 0 ? void 0 : _a.text).toContain(uploadedComponent);
|
|
118
|
+
});
|
|
119
|
+
it('Should render a component with multi-line format string input', async () => {
|
|
120
|
+
const componentSet = {
|
|
121
|
+
webPath,
|
|
122
|
+
displayName: 'some-display-name',
|
|
123
|
+
description: 'Set description',
|
|
124
|
+
headers: {},
|
|
125
|
+
environmentVariables: {},
|
|
126
|
+
components: {
|
|
127
|
+
'fixtures/cmp-format-string': [{ environmentVariables: {}, version: '1.0.0' }],
|
|
128
|
+
},
|
|
129
|
+
componentVersionRules: {},
|
|
130
|
+
};
|
|
131
|
+
await (0, helper_1.addComponentSet)(componentSet);
|
|
132
|
+
await (0, helper_1.addContentItem)({
|
|
133
|
+
id: contentItemId,
|
|
134
|
+
schemaName: 'fixtures/cmp-format-string/1.0.0/main',
|
|
135
|
+
content: {
|
|
136
|
+
text: 'from-content-item-service',
|
|
137
|
+
},
|
|
138
|
+
});
|
|
139
|
+
const response = await helper_1.renderService.get(`/r/fixtures/cmp-format-string/1.0.0/?_contentItemId=${contentItemId}&_componentSet=${webPath}`);
|
|
140
|
+
expect(response.status).toEqual(200);
|
|
141
|
+
expect(response.data).toEqual(`<div>Input: from-content-item-service</div>`);
|
|
142
|
+
});
|
|
143
|
+
});
|
|
90
144
|
describe('Deploy basic component having a static file', () => {
|
|
91
145
|
// component to deploy for this test
|
|
92
146
|
const componentPath = path_1.default.join(__dirname, '/__components__/cmp-static-file-test');
|
|
@@ -112,7 +166,7 @@ describe('uploading a component', () => {
|
|
|
112
166
|
it('Should upload the component and return a valid url to preview', async () => {
|
|
113
167
|
var _a;
|
|
114
168
|
await (0, index_1.uploadComponentFolder)(helper_1.managementServiceRoot, helper_1.default.managementServiceUrl, componentPath, testFilesDir);
|
|
115
|
-
const uploadedComponent = '<a href="/
|
|
169
|
+
const uploadedComponent = '<a href="/r/smoke-test-components/cmp-static-file-test/1.0.0">1.0.0</a>';
|
|
116
170
|
const get = await (0, supertest_1.default)(helper_1.default.renderServiceUrl).get('/');
|
|
117
171
|
expect(get.status).toEqual(200);
|
|
118
172
|
expect((_a = get === null || get === void 0 ? void 0 : get.res) === null || _a === void 0 ? void 0 : _a.text).toContain(uploadedComponent);
|
|
@@ -140,12 +194,12 @@ describe('uploading a component', () => {
|
|
|
140
194
|
componentVersionRules: {},
|
|
141
195
|
};
|
|
142
196
|
await (0, helper_1.addComponentSet)(componentSet);
|
|
143
|
-
const response = await helper_1.renderService.get(`/r
|
|
197
|
+
const response = await helper_1.renderService.get(`/r/smoke-test-components/cmp-static-file-test/1.0.0/?_componentSet=${webPath}&something=hello`);
|
|
144
198
|
expect(response.status).toEqual(200);
|
|
145
199
|
expect(response.data).toEqual([
|
|
146
200
|
'<div>Input: hello</div>',
|
|
147
201
|
'<div>smoke-test-components/cmp-static-file-test 1.0.0 ',
|
|
148
|
-
`${helper_1.default.renderServiceUrl}/s
|
|
202
|
+
`${helper_1.default.renderServiceUrl}/s/smoke-test-components/cmp-static-file-test/1.0.0/birthday-cake.png?_componentSet=${webPath}</div>`,
|
|
149
203
|
].join(''));
|
|
150
204
|
});
|
|
151
205
|
it('Should render component with content item ID input', async () => {
|
|
@@ -169,13 +223,13 @@ describe('uploading a component', () => {
|
|
|
169
223
|
something: 'from-content-item-service',
|
|
170
224
|
},
|
|
171
225
|
});
|
|
172
|
-
console.log(`/r
|
|
173
|
-
const response = await helper_1.renderService.get(`/r
|
|
226
|
+
console.log(`/r/smoke-test-components/cmp-static-file-test/1.0.0/?_componentSet=${webPath}&_contentItemId=${contentItemId}`);
|
|
227
|
+
const response = await helper_1.renderService.get(`/r/smoke-test-components/cmp-static-file-test/1.0.0/?_componentSet=${webPath}&_contentItemId=${contentItemId}`);
|
|
174
228
|
expect(response.status).toEqual(200);
|
|
175
229
|
expect(response.data).toEqual([
|
|
176
230
|
'<div>Input: from-content-item-service</div>',
|
|
177
231
|
'<div>smoke-test-components/cmp-static-file-test 1.0.0 ',
|
|
178
|
-
`${helper_1.default.renderServiceUrl}/s
|
|
232
|
+
`${helper_1.default.renderServiceUrl}/s/smoke-test-components/cmp-static-file-test/1.0.0/birthday-cake.png?_componentSet=${webPath}</div>`,
|
|
179
233
|
].join(''));
|
|
180
234
|
});
|
|
181
235
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload-and-render-component.integration.spec.js","sourceRoot":"","sources":["../../src/integration-tests/upload-and-render-component.integration.spec.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"upload-and-render-component.integration.spec.js","sourceRoot":"","sources":["../../src/integration-tests/upload-and-render-component.integration.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ const promises_1 = __importDefault(require("fs/promises"));
|
|
|
11
11
|
const path_1 = __importDefault(require("path"));
|
|
12
12
|
const cli_color_1 = __importDefault(require("cli-color"));
|
|
13
13
|
const dx_logger_lib_1 = require("@squiz/dx-logger-lib");
|
|
14
|
+
const dx_json_schema_lib_1 = require("@squiz/dx-json-schema-lib");
|
|
14
15
|
exports.logger = (0, dx_logger_lib_1.getLogger)({ name: 'upload-component', format: 'human' });
|
|
15
16
|
async function uploadComponentFolder(apiClient, componentServiceManagementUrl, folderPath, baseTempDir = '') {
|
|
16
17
|
const tmpDir = await promises_1.default.mkdtemp(path_1.default.resolve(baseTempDir, 'cmp-upload'));
|
|
@@ -45,7 +46,7 @@ async function uploadComponentFolder(apiClient, componentServiceManagementUrl, f
|
|
|
45
46
|
}
|
|
46
47
|
exports.uploadComponentFolder = uploadComponentFolder;
|
|
47
48
|
async function preUploadChecks(apiClient, managementURL, folderPath) {
|
|
48
|
-
const service = new component_lib_1.ManifestServiceForDev(folderPath, exports.logger);
|
|
49
|
+
const service = new component_lib_1.ManifestServiceForDev(folderPath, exports.logger, new dx_json_schema_lib_1.JsonValidationService());
|
|
49
50
|
const manifestPath = path_1.default.join(folderPath, `manifest.json`);
|
|
50
51
|
const result = await service.readManifest(manifestPath);
|
|
51
52
|
await service.assertManifestIsValid(manifestPath, result.getModel());
|
|
@@ -1 +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;AAExB,0DAA8B;AAC9B,wDAAyD;
|
|
1
|
+
{"version":3,"file":"upload-component-folder.js","sourceRoot":"","sources":["../src/upload-component-folder.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@squiz/component-cli-lib",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.13-alpha.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -8,17 +8,17 @@
|
|
|
8
8
|
"lint": "eslint ./src --ext .ts",
|
|
9
9
|
"test": "jest -c jest.config.ts",
|
|
10
10
|
"test:integration": "jest -c jest.integration.config.ts",
|
|
11
|
-
"clean": "rimraf \".tsbuildinfo\" \"./lib\""
|
|
11
|
+
"clean": "rimraf \"tsconfig.tsbuildinfo\" \"./lib\""
|
|
12
12
|
},
|
|
13
13
|
"author": "",
|
|
14
14
|
"license": "ISC",
|
|
15
15
|
"devDependencies": {
|
|
16
16
|
"@types/cli-color": "2.0.2",
|
|
17
|
-
"@types/express": "4.17.
|
|
17
|
+
"@types/express": "4.17.14",
|
|
18
18
|
"@types/jest": "28.1.8",
|
|
19
19
|
"@types/node": "17.0.27",
|
|
20
20
|
"@types/supertest": "2.0.12",
|
|
21
|
-
"dotenv": "16.0.
|
|
21
|
+
"dotenv": "16.0.3",
|
|
22
22
|
"eslint": "8.22.0",
|
|
23
23
|
"jest": "28.1.3",
|
|
24
24
|
"ts-jest": "28.0.8",
|
|
@@ -27,17 +27,18 @@
|
|
|
27
27
|
"typescript": "4.9.3"
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@squiz/component-lib": "1.2.
|
|
31
|
-
"@squiz/component-web-api-lib": "1.2.
|
|
32
|
-
"@squiz/dx-common-lib": "1.2.
|
|
33
|
-
"@squiz/dx-
|
|
34
|
-
"@squiz/
|
|
35
|
-
"@squiz/
|
|
30
|
+
"@squiz/component-lib": "1.2.13-alpha.0",
|
|
31
|
+
"@squiz/component-web-api-lib": "1.2.13-alpha.0",
|
|
32
|
+
"@squiz/dx-common-lib": "1.2.13-alpha.0",
|
|
33
|
+
"@squiz/dx-json-schema-lib": "1.2.13-alpha.0",
|
|
34
|
+
"@squiz/dx-logger-lib": "1.2.13-alpha.0",
|
|
35
|
+
"@squiz/render-runtime-lib": "1.2.13-alpha.0",
|
|
36
|
+
"@squiz/virus-scanner-lib": "1.2.13-alpha.0",
|
|
36
37
|
"archiver": "5.3.1",
|
|
37
38
|
"axios": "0.27.2",
|
|
38
39
|
"cli-color": "^2.0.2",
|
|
39
40
|
"open": "^8.4.0",
|
|
40
41
|
"supertest": "^6.2.3"
|
|
41
42
|
},
|
|
42
|
-
"gitHead": "
|
|
43
|
+
"gitHead": "811fbf59292dd00a2051036f1115cba5781828dd"
|
|
43
44
|
}
|
|
@@ -22,8 +22,10 @@ describe('component-dev', () => {
|
|
|
22
22
|
});
|
|
23
23
|
|
|
24
24
|
it('should find the component', async () => {
|
|
25
|
-
const response = await request.get(
|
|
26
|
-
|
|
25
|
+
const response = await request.get(
|
|
26
|
+
`/r/unit-test-components/test-component/1.0.0?_componentSet=set&something=hello`,
|
|
27
|
+
);
|
|
28
|
+
expect(response.text).toEqual('<div>hello - {"_componentSet":"set","something":"hello"}</div>');
|
|
27
29
|
});
|
|
28
30
|
});
|
|
29
31
|
|
|
@@ -57,12 +59,14 @@ describe('component-dev', () => {
|
|
|
57
59
|
});
|
|
58
60
|
|
|
59
61
|
it('should handle recursing folders to find the component', async () => {
|
|
60
|
-
const response = await request.get(`/r/
|
|
62
|
+
const response = await request.get(`/r/some-namespace/${componentName}/${version}?_componentSet=set`);
|
|
61
63
|
expect(response.text).toEqual('<h1>Hello World</h1>');
|
|
62
|
-
});
|
|
64
|
+
}, 30_000);
|
|
63
65
|
|
|
64
66
|
it('should handle serving static files from single component directory', async () => {
|
|
65
|
-
const response = await request.get(
|
|
67
|
+
const response = await request.get(
|
|
68
|
+
`/s/some-namespace/${componentName}/${version}/static.txt?_componentSet=set-x`,
|
|
69
|
+
);
|
|
66
70
|
expect(response.text).toEqual('hello');
|
|
67
71
|
});
|
|
68
72
|
});
|
|
@@ -78,8 +82,10 @@ describe('component-dev', () => {
|
|
|
78
82
|
server.close();
|
|
79
83
|
});
|
|
80
84
|
it('should find the component', async () => {
|
|
81
|
-
const response = await request.get(
|
|
82
|
-
|
|
85
|
+
const response = await request.get(
|
|
86
|
+
`/r/unit-test-components/test-component/1.0.0?_componentSet=set&something=hello`,
|
|
87
|
+
);
|
|
88
|
+
expect(response.text).toEqual('<div>hello - {"_componentSet":"set","something":"hello"}</div>');
|
|
83
89
|
});
|
|
84
90
|
});
|
|
85
91
|
});
|