@squiz/component-cli-lib 1.2.10 → 1.2.12

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.
Files changed (23) hide show
  1. package/CHANGELOG.md +16 -0
  2. package/lib/component-dev-folder-structures.integration.spec.js +17 -2
  3. package/lib/component-dev-folder-structures.integration.spec.js.map +1 -1
  4. package/lib/component-dev.d.ts +1 -0
  5. package/lib/component-dev.integration.spec.js +4 -4
  6. package/lib/component-dev.integration.spec.js.map +1 -1
  7. package/lib/component-dev.js +4 -0
  8. package/lib/component-dev.js.map +1 -1
  9. package/lib/integration-tests/helper.d.ts +2 -2
  10. package/lib/integration-tests/helper.js.map +1 -1
  11. package/lib/integration-tests/upload-and-render-component.integration.spec.js +126 -118
  12. package/lib/integration-tests/upload-and-render-component.integration.spec.js.map +1 -1
  13. package/lib/upload-component-folder.d.ts +2 -1
  14. package/lib/upload-component-folder.js +18 -33
  15. package/lib/upload-component-folder.js.map +1 -1
  16. package/package.json +10 -9
  17. package/src/component-dev-folder-structures.integration.spec.ts +18 -2
  18. package/src/component-dev.integration.spec.ts +5 -4
  19. package/src/component-dev.ts +6 -1
  20. package/src/integration-tests/helper.ts +2 -2
  21. package/src/integration-tests/upload-and-render-component.integration.spec.ts +177 -168
  22. package/src/upload-component-folder.ts +29 -38
  23. package/tsconfig.tsbuildinfo +1 -1
package/CHANGELOG.md CHANGED
@@ -3,6 +3,22 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ ## [1.2.12](https://gitlab.squiz.net/developer-experience/cmp/compare/v1.2.2...v1.2.12) (2022-11-24)
7
+
8
+ **Note:** Version bump only for package @squiz/component-cli-lib
9
+
10
+
11
+
12
+
13
+
14
+ ## [1.2.11](https://gitlab.squiz.net/developer-experience/cmp/compare/v1.2.2...v1.2.11) (2022-11-11)
15
+
16
+ **Note:** Version bump only for package @squiz/component-cli-lib
17
+
18
+
19
+
20
+
21
+
6
22
  ## [1.2.10](https://gitlab.squiz.net/developer-experience/cmp/compare/v1.2.2...v1.2.10) (2022-11-09)
7
23
 
8
24
  **Note:** Version bump only for package @squiz/component-cli-lib
package/lib/component-dev-folder-structures.integration.spec.js CHANGED
@@ -14,7 +14,7 @@ describe('component-dev', () => {
14
14
  let server;
15
15
  let request;
16
16
  beforeAll(async () => {
17
- server = (0, component_dev_1.startDevelopmentRender)(render_runtime_lib_1.TestHelpers.getTestComponentFolder(), { port: 0 });
17
+ server = (0, component_dev_1.startDevelopmentRender)(render_runtime_lib_1.TestHelpers.getTestComponentFolder(), { port: 0, noBrowser: true });
18
18
  request = (0, supertest_1.default)(server);
19
19
  });
20
20
  afterAll(async () => {
@@ -36,7 +36,7 @@ describe('component-dev', () => {
36
36
  version = createdVersion;
37
37
  fixtureDirectory = createdFixtureDirectory;
38
38
  componentName = createdName;
39
- server = (0, component_dev_1.startDevelopmentRender)(fixtureDirectory, { port: 0 });
39
+ server = (0, component_dev_1.startDevelopmentRender)(fixtureDirectory, { port: 0, noBrowser: true });
40
40
  request = (0, supertest_1.default)(server);
41
41
  });
42
42
  afterAll(async () => {
@@ -54,5 +54,20 @@ describe('component-dev', () => {
54
54
  expect(response.text).toEqual('hello');
55
55
  });
56
56
  });
57
+ describe('It should pass a simple test and not launch the browser if the -nb flag is present', () => {
58
+ let server;
59
+ let request;
60
+ beforeAll(async () => {
61
+ server = (0, component_dev_1.startDevelopmentRender)(render_runtime_lib_1.TestHelpers.getTestComponentFolder(), { port: 0, noBrowser: true });
62
+ request = (0, supertest_1.default)(server);
63
+ });
64
+ afterAll(async () => {
65
+ server.close();
66
+ });
67
+ it('should find the component', async () => {
68
+ const response = await request.get(`/r/set/unit-test-components/test-component/1.0.0?something=hello`);
69
+ expect(response.text).toEqual('<div>hello - {"something":"hello"}</div>');
70
+ });
71
+ });
57
72
  });
58
73
  //# sourceMappingURL=component-dev-folder-structures.integration.spec.js.map
package/lib/component-dev-folder-structures.integration.spec.js.map CHANGED
@@ -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":"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"}
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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"}
package/lib/component-dev.d.ts CHANGED
@@ -12,4 +12,5 @@ import { LoggerOptions } from '@squiz/dx-logger-lib';
12
12
  export declare function startDevelopmentRender(componentPath: string, options: {
13
13
  port: number;
14
14
  loggingFormat?: LoggerOptions['format'];
15
+ noBrowser?: boolean;
15
16
  }): import("http").Server;
package/lib/component-dev.integration.spec.js CHANGED
@@ -12,7 +12,7 @@ describe('component-dev', () => {
12
12
  let server;
13
13
  let request;
14
14
  beforeAll(async () => {
15
- server = (0, component_dev_1.startDevelopmentRender)(render_runtime_lib_1.TestHelpers.getTestComponentFolder(), { port: 0 });
15
+ server = (0, component_dev_1.startDevelopmentRender)(render_runtime_lib_1.TestHelpers.getTestComponentFolder(), { port: 0, noBrowser: true });
16
16
  request = (0, supertest_1.default)(server);
17
17
  });
18
18
  afterAll(async () => {
@@ -26,7 +26,7 @@ describe('component-dev', () => {
26
26
  expect(response.statusCode).toEqual(500);
27
27
  });
28
28
  describe('definition routes', () => {
29
- const server = (0, component_dev_1.startDevelopmentRender)(render_runtime_lib_1.TestHelpers.getTestComponentFolder(), { port: 0 });
29
+ const server = (0, component_dev_1.startDevelopmentRender)(render_runtime_lib_1.TestHelpers.getTestComponentFolder(), { port: 0, noBrowser: true });
30
30
  const request = () => (0, supertest_1.default)(server);
31
31
  render_runtime_lib_1.routeTests.definition(request, 'http://localhost:0');
32
32
  afterAll(() => {
@@ -34,7 +34,7 @@ describe('component-dev', () => {
34
34
  });
35
35
  });
36
36
  describe('static routes', () => {
37
- const server = (0, component_dev_1.startDevelopmentRender)(render_runtime_lib_1.TestHelpers.getTestComponentFolder(), { port: 0 });
37
+ const server = (0, component_dev_1.startDevelopmentRender)(render_runtime_lib_1.TestHelpers.getTestComponentFolder(), { port: 0, noBrowser: true });
38
38
  const request = () => (0, supertest_1.default)(server);
39
39
  render_runtime_lib_1.routeTests.static(request);
40
40
  afterAll(() => {
@@ -42,7 +42,7 @@ describe('component-dev', () => {
42
42
  });
43
43
  });
44
44
  describe('render routes', () => {
45
- const server = (0, component_dev_1.startDevelopmentRender)(render_runtime_lib_1.TestHelpers.getTestComponentFolder(), { port: 0 });
45
+ const server = (0, component_dev_1.startDevelopmentRender)(render_runtime_lib_1.TestHelpers.getTestComponentFolder(), { port: 0, noBrowser: true });
46
46
  const request = () => (0, supertest_1.default)(server);
47
47
  render_runtime_lib_1.routeTests.render(request, 'http://localhost:0');
48
48
  afterAll(() => {
package/lib/component-dev.integration.spec.js.map CHANGED
@@ -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;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;QAEH,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;YAC7B,+BAAU,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
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
@@ -8,6 +8,7 @@ const render_runtime_lib_1 = require("@squiz/render-runtime-lib");
8
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
+ const open_1 = __importDefault(require("open"));
11
12
  /**
12
13
  * startDevelopmentRender starts a dev-mode render stack for any
13
14
  * local directory. This should start an express server on a random unused port
@@ -40,6 +41,9 @@ function startDevelopmentRender(componentPath, options) {
40
41
  const server = webServer.listen(options.port, () => {
41
42
  logger.info(`Component development webserver started on port ${options.port}`);
42
43
  });
44
+ if ((options === null || options === void 0 ? void 0 : options.noBrowser) !== true) {
45
+ (0, open_1.default)(rootUrl);
46
+ }
43
47
  server.on('close', async () => {
44
48
  await componentRunnerService.stop();
45
49
  });
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,kEAImC;AACnC,wDAAgE;AAChE,gDAAwB;AACxB,wDAAuH;AAEvH;;;;;;;;GAQG;AACH,SAAgB,sBAAsB,CACpC,aAAqB,EACrB,OAAkE;IAElE,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,wBAAwB,GAAG,IAAI,wCAAwB,CAAC,OAAO,CAAC,CAAC;IACvE,MAAM,SAAS,GAAG,IAAA,6CAAwB,EACxC;QACE,MAAM;QACN,sBAAsB;QACtB,wBAAwB;QACxB,uBAAuB,EAAE,IAAI,oDAA+B,CAAC,sBAAsB,EAAE,wBAAwB,EAAE;YAC7G,OAAO;SACR,CAAC;QACF,mBAAmB,EAAE,IAAI,8CAA8B,CAAC,MAAM,CAAC;QAC/D,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;AAxCD,wDAwCC"}
1
+ {"version":3,"file":"component-dev.js","sourceRoot":"","sources":["../src/component-dev.ts"],"names":[],"mappings":";;;;;;AAAA,kEAImC;AACnC,wDAAgE;AAChE,gDAAwB;AACxB,wDAAuH;AACvH,gDAAwB;AAExB;;;;;;;;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,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,wBAAwB,GAAG,IAAI,wCAAwB,CAAC,OAAO,CAAC,CAAC;IACvE,MAAM,SAAS,GAAG,IAAA,6CAAwB,EACxC;QACE,MAAM;QACN,sBAAsB;QACtB,wBAAwB;QACxB,uBAAuB,EAAE,IAAI,oDAA+B,CAAC,sBAAsB,EAAE,wBAAwB,EAAE;YAC7G,OAAO;SACR,CAAC;QACF,mBAAmB,EAAE,IAAI,8CAA8B,CAAC,MAAM,CAAC;QAC/D,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,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;AA5CD,wDA4CC"}
package/lib/integration-tests/helper.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { ComponentSetWebModel } from '@squiz/component-lib';
1
+ import { ComponentSetWebModelForCreate } from '@squiz/component-lib';
2
2
  import { ContentApi } from '@squiz/component-web-api-lib';
3
3
  interface Config {
4
4
  managementServiceUrl: string;
@@ -19,6 +19,6 @@ export declare function getTestComponents(): string[];
19
19
  export declare function createFile(filePath: string, sizeInMB: number): Promise<void>;
20
20
  export declare function removeFile(filePath: string): void;
21
21
  export declare function deleteComponentSet(webPath: string): Promise<void>;
22
- export declare function addComponentSet(componentSet: ComponentSetWebModel): Promise<void>;
22
+ export declare function addComponentSet(componentSet: ComponentSetWebModelForCreate): Promise<void>;
23
23
  export declare function addContentItem(contentItem: ContentApi.ContentItemWebModel): Promise<void>;
24
24
  export declare function deleteContentItem(contentItemId: string): Promise<void>;
package/lib/integration-tests/helper.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"helper.js","sourceRoot":"","sources":["../../src/integration-tests/helper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"helper.js","sourceRoot":"","sources":["../../src/integration-tests/helper.ts"],"names":[],"mappings":"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"}
package/lib/integration-tests/upload-and-render-component.integration.spec.js CHANGED
@@ -37,139 +37,147 @@ const crypto_1 = require("crypto");
37
37
  const mockConsoleError = jest.fn();
38
38
  const mockConsoleLog = jest.fn();
39
39
  const orgConsoleError = console.error;
40
- const webPath = 'set';
40
+ const webPath = 'set-' + (0, crypto_1.randomUUID)();
41
41
  const contentItemId = (0, crypto_1.randomUUID)();
42
42
  const testFilesDir = path_1.default.resolve(__dirname, 'test-files');
43
- beforeAll(async () => {
44
- await promises_1.default.rm(testFilesDir, { force: true, recursive: true });
45
- await promises_1.default.mkdir(testFilesDir);
46
- });
47
- afterAll(async () => {
48
- // clean up the component added by the test
49
- await (0, helper_1.deleteComponentSet)(webPath);
50
- await (0, helper_1.deleteContentItem)(contentItemId);
51
- for (const componentName of (0, helper_1.getTestComponents)()) {
52
- try {
53
- await helper_1.managementService.delete(`/component/smoke-test-components/${componentName}`);
54
- }
55
- catch {
56
- // no op
57
- }
58
- }
59
- // clean up the test componnet files
60
- await promises_1.default.rm(testFilesDir, { force: true, recursive: true });
61
- });
62
- describe('Test isolated test cases', () => {
63
- beforeEach(() => {
64
- jest.spyOn(upload_component_folder_1.logger, 'error').mockImplementation(mockConsoleError);
65
- jest.spyOn(upload_component_folder_1.logger, 'info').mockImplementation(mockConsoleLog);
66
- });
67
- it('Should fail uploading a component without manifest.json', async () => {
68
- mockConsoleError.mockClear();
69
- const componentPath = path_1.default.join(__dirname, '/__components__/invalid-upload');
70
- await (0, index_1.uploadComponentFolder)(componentPath, helper_1.default.managementServiceUrl + '/v1', helper_1.default.renderServiceUrl, testFilesDir);
71
- expect(mockConsoleError.mock.calls[0][0]).toEqual(cli_color_1.default.red('manifest could not be found'));
72
- });
73
- it('Should fail uploading a component that has invalid manifest.json', async () => {
74
- mockConsoleError.mockClear();
75
- const componentPath = path_1.default.join(__dirname, '/__components__/invalid-manifest');
76
- await (0, index_1.uploadComponentFolder)(componentPath, helper_1.default.managementServiceUrl + '/v1', helper_1.default.renderServiceUrl, testFilesDir);
77
- expect(mockConsoleError.mock.calls[0][0]).toEqual(cli_color_1.default.red('failed validation: /name pattern must match pattern "^[a-zA-Z0-9_\\-]+$"'));
78
- });
79
- it('Should fail uploading the component that has size more than 100MB', async () => {
80
- mockConsoleError.mockClear();
81
- const componentPath = path_1.default.join(__dirname, '/__components__/big-package');
82
- const filePath = `${componentPath}/105mb-file`;
83
- await (0, helper_1.createFile)(filePath, 105); // Higher limit has been used because compression reduces the size if you use closer to 100MB
84
- await (0, index_1.uploadComponentFolder)(componentPath, helper_1.default.managementServiceUrl + '/v1', helper_1.default.renderServiceUrl, testFilesDir);
85
- expect(mockConsoleError.mock.calls[0][0]).toEqual(cli_color_1.default.red(['File size exceeds the maximum limit of 100MB'].join('')));
86
- (0, helper_1.removeFile)(filePath);
87
- });
88
- });
89
- describe('Deploy basic component having a static file', () => {
90
- // component to deploy for this test
91
- const componentPath = path_1.default.join(__dirname, '/__components__/cmp-static-file-test');
43
+ describe('uploading a component', () => {
92
44
  beforeAll(async () => {
45
+ await promises_1.default.rm(testFilesDir, { force: true, recursive: true });
46
+ await promises_1.default.mkdir(testFilesDir);
47
+ });
48
+ afterAll(async () => {
49
+ // clean up the component added by the test
93
50
  await (0, helper_1.deleteComponentSet)(webPath);
94
51
  await (0, helper_1.deleteContentItem)(contentItemId);
95
52
  for (const componentName of (0, helper_1.getTestComponents)()) {
96
53
  try {
97
- await helper_1.managementService.delete(`/component/${componentName}`);
54
+ await helper_1.managementService.delete(`/component/smoke-test-components/${componentName}`);
98
55
  }
99
56
  catch {
100
57
  // no op
101
58
  }
102
59
  }
60
+ // clean up the test componnet files
61
+ await promises_1.default.rm(testFilesDir, { force: true, recursive: true });
103
62
  });
104
- beforeEach(() => {
105
- console.error = mockConsoleError;
106
- console.log = mockConsoleLog;
107
- });
108
- afterEach(() => {
109
- console.error = orgConsoleError;
110
- });
111
- it('Should upload the component and return a valid url to preview', async () => {
112
- var _a;
113
- await (0, index_1.uploadComponentFolder)(componentPath, helper_1.default.managementServiceUrl + '/v1', helper_1.default.renderServiceUrl, testFilesDir);
114
- const uploadedComponent = '<a href="/preview/smoke-test-components/cmp-static-file-test/1.0.0">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 fail upload the component with same version', async () => {
120
- mockConsoleError.mockClear();
121
- await (0, index_1.uploadComponentFolder)(componentPath, helper_1.default.managementServiceUrl + '/v1', helper_1.default.renderServiceUrl, testFilesDir);
122
- expect(mockConsoleError.mock.calls[0][0]).toEqual(cli_color_1.default.red('Cannot upload component version, smoke-test-components/cmp-static-file-test 1.0.0 already exists'));
123
- });
124
- it('Should render component', async () => {
125
- const componentSet = {
126
- webPath,
127
- displayName: 'Set',
128
- description: 'Set description',
129
- headers: {},
130
- environmentVariables: {},
131
- components: {
132
- 'smoke-test-components/cmp-static-file-test': [{ environmentVariables: {}, version: '1.0.0' }],
133
- },
134
- componentVersionRules: {},
135
- };
136
- await (0, helper_1.addComponentSet)(componentSet);
137
- const response = await helper_1.renderService.get('/r/set/smoke-test-components/cmp-static-file-test/1.0.0/?something=hello');
138
- expect(response.status).toEqual(200);
139
- expect(response.data).toEqual([
140
- '<div>Input: hello</div>',
141
- '<div>smoke-test-components/cmp-static-file-test 1.0.0 ',
142
- `${helper_1.default.renderServiceUrl}/s/set/smoke-test-components/cmp-static-file-test/1.0.0/birthday-cake.png</div>`,
143
- ].join(''));
63
+ describe('Test isolated test cases', () => {
64
+ beforeEach(() => {
65
+ jest.spyOn(upload_component_folder_1.logger, 'error').mockImplementation(mockConsoleError);
66
+ jest.spyOn(upload_component_folder_1.logger, 'info').mockImplementation(mockConsoleLog);
67
+ });
68
+ it('Should fail uploading a component without manifest.json', async () => {
69
+ mockConsoleError.mockClear();
70
+ const componentPath = path_1.default.join(__dirname, '/__components__/invalid-upload');
71
+ await (0, index_1.uploadComponentFolder)(helper_1.managementServiceRoot, helper_1.default.managementServiceUrl, componentPath, testFilesDir);
72
+ expect(mockConsoleError.mock.calls[0][0]).toEqual(cli_color_1.default.red('manifest could not be found'));
73
+ });
74
+ it('Should fail uploading a component that has invalid manifest.json', async () => {
75
+ mockConsoleError.mockClear();
76
+ const componentPath = path_1.default.join(__dirname, '/__components__/invalid-manifest');
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_\\-]+$"'));
79
+ });
80
+ it('Should fail uploading the component that has size more than 100MB', async () => {
81
+ mockConsoleError.mockClear();
82
+ const componentPath = path_1.default.join(__dirname, '/__components__/big-package');
83
+ const filePath = `${componentPath}/105mb-file`;
84
+ await (0, helper_1.createFile)(filePath, 105); // Higher limit has been used because compression reduces the size if you use closer to 100MB
85
+ await (0, index_1.uploadComponentFolder)(helper_1.managementServiceRoot, helper_1.default.managementServiceUrl, componentPath, testFilesDir);
86
+ expect(mockConsoleError.mock.calls[0][0]).toEqual(cli_color_1.default.red(['File size exceeds the maximum limit of 100MB'].join('')));
87
+ (0, helper_1.removeFile)(filePath);
88
+ });
144
89
  });
145
- it('Should render component with content item ID input', async () => {
146
- const componentSet = {
147
- webPath,
148
- displayName: 'Set',
149
- description: 'Set description',
150
- headers: {},
151
- environmentVariables: {},
152
- components: {
153
- 'smoke-test-components/cmp-static-file-test': [{ environmentVariables: {}, version: '1.0.0' }],
154
- },
155
- componentVersionRules: {},
156
- };
157
- await (0, helper_1.addComponentSet)(componentSet);
158
- // add a component item for the test
159
- await (0, helper_1.addContentItem)({
160
- id: contentItemId,
161
- schemaName: 'smoke-test-components/cmp-static-file-test/1.0.0/main',
162
- content: {
163
- something: 'from-content-item-service',
164
- },
90
+ describe('Deploy basic component having a static file', () => {
91
+ // component to deploy for this test
92
+ const componentPath = path_1.default.join(__dirname, '/__components__/cmp-static-file-test');
93
+ beforeAll(async () => {
94
+ await (0, helper_1.deleteComponentSet)(webPath);
95
+ await (0, helper_1.deleteContentItem)(contentItemId);
96
+ for (const componentName of (0, helper_1.getTestComponents)()) {
97
+ try {
98
+ await helper_1.managementService.delete(`/component/${componentName}`);
99
+ }
100
+ catch {
101
+ // no op
102
+ }
103
+ }
104
+ });
105
+ beforeEach(() => {
106
+ console.error = mockConsoleError;
107
+ console.log = mockConsoleLog;
108
+ });
109
+ afterEach(() => {
110
+ console.error = orgConsoleError;
111
+ });
112
+ it('Should upload the component and return a valid url to preview', async () => {
113
+ var _a;
114
+ await (0, index_1.uploadComponentFolder)(helper_1.managementServiceRoot, helper_1.default.managementServiceUrl, componentPath, testFilesDir);
115
+ const uploadedComponent = '<a href="/preview/smoke-test-components/cmp-static-file-test/1.0.0">1.0.0</a>';
116
+ const get = await (0, supertest_1.default)(helper_1.default.renderServiceUrl).get('/');
117
+ expect(get.status).toEqual(200);
118
+ expect((_a = get === null || get === void 0 ? void 0 : get.res) === null || _a === void 0 ? void 0 : _a.text).toContain(uploadedComponent);
119
+ });
120
+ it('Should fail upload the component with same version', async () => {
121
+ mockConsoleError.mockClear();
122
+ await (0, index_1.uploadComponentFolder)(helper_1.managementServiceRoot, helper_1.default.managementServiceUrl, componentPath, testFilesDir);
123
+ expect(mockConsoleError.mock.calls[0][0]).toEqual(cli_color_1.default.red('Cannot upload component version, smoke-test-components/cmp-static-file-test 1.0.0 already exists'));
124
+ });
125
+ it('Should render component', async () => {
126
+ const componentSet = {
127
+ webPath,
128
+ displayName: 'some-display-name',
129
+ description: 'Set description',
130
+ headers: {},
131
+ environmentVariables: {},
132
+ components: {
133
+ 'smoke-test-components/cmp-static-file-test': [
134
+ {
135
+ environmentVariables: {},
136
+ version: '1.0.0',
137
+ },
138
+ ],
139
+ },
140
+ componentVersionRules: {},
141
+ };
142
+ await (0, helper_1.addComponentSet)(componentSet);
143
+ const response = await helper_1.renderService.get(`/r/${webPath}/smoke-test-components/cmp-static-file-test/1.0.0/?something=hello`);
144
+ expect(response.status).toEqual(200);
145
+ expect(response.data).toEqual([
146
+ '<div>Input: hello</div>',
147
+ '<div>smoke-test-components/cmp-static-file-test 1.0.0 ',
148
+ `${helper_1.default.renderServiceUrl}/s/${webPath}/smoke-test-components/cmp-static-file-test/1.0.0/birthday-cake.png</div>`,
149
+ ].join(''));
150
+ });
151
+ it('Should render component with content item ID input', async () => {
152
+ const componentSet = {
153
+ webPath,
154
+ displayName: 'some-display-name',
155
+ description: 'Set description',
156
+ headers: {},
157
+ environmentVariables: {},
158
+ components: {
159
+ 'smoke-test-components/cmp-static-file-test': [{ environmentVariables: {}, version: '1.0.0' }],
160
+ },
161
+ componentVersionRules: {},
162
+ };
163
+ await (0, helper_1.addComponentSet)(componentSet);
164
+ // add a component item for the test
165
+ await (0, helper_1.addContentItem)({
166
+ id: contentItemId,
167
+ schemaName: 'smoke-test-components/cmp-static-file-test/1.0.0/main',
168
+ content: {
169
+ something: 'from-content-item-service',
170
+ },
171
+ });
172
+ console.log(`/r/${webPath}/smoke-test-components/cmp-static-file-test/1.0.0/?_contentItemId=` + contentItemId);
173
+ const response = await helper_1.renderService.get(`/r/${webPath}/smoke-test-components/cmp-static-file-test/1.0.0/?_contentItemId=` + contentItemId);
174
+ expect(response.status).toEqual(200);
175
+ expect(response.data).toEqual([
176
+ '<div>Input: from-content-item-service</div>',
177
+ '<div>smoke-test-components/cmp-static-file-test 1.0.0 ',
178
+ `${helper_1.default.renderServiceUrl}/s/${webPath}/smoke-test-components/cmp-static-file-test/1.0.0/birthday-cake.png</div>`,
179
+ ].join(''));
165
180
  });
166
- const response = await helper_1.renderService.get('/r/set/smoke-test-components/cmp-static-file-test/1.0.0/?_contentItemId=' + contentItemId);
167
- expect(response.status).toEqual(200);
168
- expect(response.data).toEqual([
169
- '<div>Input: from-content-item-service</div>',
170
- '<div>smoke-test-components/cmp-static-file-test 1.0.0 ',
171
- `${helper_1.default.renderServiceUrl}/s/set/smoke-test-components/cmp-static-file-test/1.0.0/birthday-cake.png</div>`,
172
- ].join(''));
173
181
  });
174
182
  });
175
183
  //# sourceMappingURL=upload-and-render-component.integration.spec.js.map
package/lib/integration-tests/upload-and-render-component.integration.spec.js.map CHANGED
@@ -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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"}
package/lib/upload-component-folder.d.ts CHANGED
@@ -1,3 +1,4 @@
1
+ import { AxiosInstance } from 'axios';
1
2
  import { Logger } from '@squiz/dx-logger-lib';
2
3
  export declare const logger: Logger;
3
- export declare function uploadComponentFolder(folderPath: string, componentServiceManagementUrl: string, componentRenderServiceUrl: string, baseTempDir?: string): Promise<void>;
4
+ export declare function uploadComponentFolder(apiClient: AxiosInstance, componentServiceManagementUrl: string, folderPath: string, baseTempDir?: string): Promise<void>;
package/lib/upload-component-folder.js CHANGED
@@ -9,28 +9,21 @@ const dx_common_lib_1 = require("@squiz/dx-common-lib");
9
9
  const component_lib_1 = require("@squiz/component-lib");
10
10
  const promises_1 = __importDefault(require("fs/promises"));
11
11
  const path_1 = __importDefault(require("path"));
12
- const axios_1 = __importDefault(require("axios"));
13
12
  const cli_color_1 = __importDefault(require("cli-color"));
14
13
  const dx_logger_lib_1 = require("@squiz/dx-logger-lib");
15
14
  exports.logger = (0, dx_logger_lib_1.getLogger)({ name: 'upload-component', format: 'human' });
16
- async function uploadComponentFolder(folderPath, componentServiceManagementUrl, componentRenderServiceUrl, baseTempDir = '') {
15
+ async function uploadComponentFolder(apiClient, componentServiceManagementUrl, folderPath, baseTempDir = '') {
17
16
  const tmpDir = await promises_1.default.mkdtemp(path_1.default.resolve(baseTempDir, 'cmp-upload'));
18
17
  try {
19
- const axiosInstance = axios_1.default.create({
20
- baseURL: componentServiceManagementUrl,
21
- headers: {
22
- 'content-type': 'application/json',
23
- },
24
- });
25
- await preUploadChecks(folderPath, componentRenderServiceUrl);
18
+ await preUploadChecks(apiClient, componentServiceManagementUrl, folderPath);
26
19
  exports.logger.info('Initial scanning');
27
20
  const zip = await (0, dx_common_lib_1.zipDirectory)(folderPath, tmpDir);
28
- const initialUpload = await handleResponse(axiosInstance.post('upload-component'));
21
+ const initialUpload = await handleResponse(apiClient.post('/v1/upload-component', {}, { baseURL: componentServiceManagementUrl }));
29
22
  exports.logger.info(`deployment id: ${initialUpload.id} status: transferring`);
30
23
  await (0, virus_scanner_lib_1.uploadFile)(initialUpload, zip);
31
- await watchAndWaitForUploadAndScanComplete(initialUpload.id, axiosInstance);
24
+ await watchAndWaitForUploadAndScanComplete(apiClient, componentServiceManagementUrl, initialUpload.id);
32
25
  exports.logger.info(`deployment id: ${initialUpload.id} status: deploying component folder`);
33
- const result = await handleResponse(axiosInstance.post(`upload-component/next/${initialUpload.id}`));
26
+ const result = await handleResponse(apiClient.post(`/v1/upload-component/next/${initialUpload.id}`, {}, { baseURL: componentServiceManagementUrl }));
34
27
  await promises_1.default.rm(tmpDir, { force: true, recursive: true });
35
28
  if (result.status === 'successful') {
36
29
  exports.logger.info(`deployment id: ${initialUpload.id} status: ${cli_color_1.default.green('success')}`);
@@ -51,38 +44,30 @@ async function uploadComponentFolder(folderPath, componentServiceManagementUrl,
51
44
  }
52
45
  }
53
46
  exports.uploadComponentFolder = uploadComponentFolder;
54
- async function preUploadChecks(folderPath, renderService) {
47
+ async function preUploadChecks(apiClient, managementURL, folderPath) {
55
48
  const service = new component_lib_1.ManifestServiceForDev(folderPath, exports.logger);
56
49
  const manifestPath = path_1.default.join(folderPath, `manifest.json`);
57
50
  const result = await service.readManifest(manifestPath);
58
51
  await service.assertManifestIsValid(manifestPath, result.getModel());
59
- if (await checkIfVersionExists(result, renderService)) {
52
+ if (await checkIfVersionExists(apiClient, managementURL, result)) {
60
53
  throw new Error(`Cannot upload component version, ${result.getName()} ${result.getVersion()} already exists`);
61
54
  }
62
55
  }
63
- async function checkIfVersionExists(inputManifest, renderService) {
64
- const axiosInstance = axios_1.default.create({
65
- baseURL: renderService,
56
+ async function checkIfVersionExists(apiClient, managementURL, inputManifest) {
57
+ const response = await apiClient.get(`/v1/component/${inputManifest.getName()}/${inputManifest.getVersion()}`, {
58
+ validateStatus: null,
59
+ baseURL: managementURL,
66
60
  });
67
- try {
68
- const response = await axiosInstance.get(`d/${inputManifest.getName()}/${inputManifest.getVersion()}/manifest.json`);
69
- if (response.status === 200) {
70
- return true;
71
- }
72
- throw new Error(`Unexpected response code ${response.status}`);
61
+ if (response.status === 200) {
62
+ return true;
73
63
  }
74
- catch (error) {
75
- if (isAxiosError(error)) {
76
- const { response } = error;
77
- if ((response === null || response === void 0 ? void 0 : response.status) === 404) {
78
- return false;
79
- }
80
- }
81
- throw error;
64
+ else if (response.status === 404) {
65
+ return false;
82
66
  }
67
+ throw new Error(`Unexpected response code ${response.status}`);
83
68
  }
84
- async function watchAndWaitForUploadAndScanComplete(id, axiosInstance) {
85
- const poll = () => handleResponse(axiosInstance.get('upload-component/status/' + id));
69
+ async function watchAndWaitForUploadAndScanComplete(apiClient, managementURL, id) {
70
+ const poll = () => handleResponse(apiClient.get('/v1/upload-component/status/' + id, { baseURL: managementURL }));
86
71
  return new Promise((resolve, reject) => {
87
72
  const recurse = () => poll().then(async (req) => {
88
73
  if (req.status == 'Success') {