From 7a3174dbcb704925fc510a390b7303b949106bda Mon Sep 17 00:00:00 2001 From: Chris Lample Date: Thu, 27 Jul 2023 11:59:19 +0200 Subject: [PATCH] fix: override ts-node module behaviour [gh-768] --- .../e2e/__tests__/fixtures/esm-module/checkly.config.ts | 8 ++++---- .../e2e/__tests__/fixtures/esm-module/checks.check.ts | 9 +++++++++ .../cli/e2e/__tests__/fixtures/esm-module/package.json | 2 +- packages/cli/e2e/__tests__/test.spec.ts | 3 +-- packages/cli/src/services/util.ts | 3 +++ 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/packages/cli/e2e/__tests__/fixtures/esm-module/checkly.config.ts b/packages/cli/e2e/__tests__/fixtures/esm-module/checkly.config.ts index 699d18f5..2db0bdc5 100644 --- a/packages/cli/e2e/__tests__/fixtures/esm-module/checkly.config.ts +++ b/packages/cli/e2e/__tests__/fixtures/esm-module/checkly.config.ts @@ -1,15 +1,15 @@ import { defineConfig } from 'checkly' const config = defineConfig({ - projectName: 'Boilerplate Project', - logicalId: 'boilerplate-project', + projectName: 'Test ECMAScript Module Project', + logicalId: 'test-esm-project', repoUrl: 'https://github.com/checkly/checkly-cli', checks: { - checkMatch: '**/__checks__/**/*.check.ts', + checkMatch: '**/*.check.ts', }, cli: { runLocation: 'eu-west-1', }, }) -export default config \ No newline at end of file +export default config diff --git a/packages/cli/e2e/__tests__/fixtures/esm-module/checks.check.ts b/packages/cli/e2e/__tests__/fixtures/esm-module/checks.check.ts index e69de29b..88fe158d 100644 --- a/packages/cli/e2e/__tests__/fixtures/esm-module/checks.check.ts +++ b/packages/cli/e2e/__tests__/fixtures/esm-module/checks.check.ts @@ -0,0 +1,9 @@ +import { BrowserCheck } from 'checkly/constructs' + +const browserCheck = new BrowserCheck('secret-browser-check', { + name: 'Show SECRET_ENV value', + activated: false, + code: { + content: 'console.info(process.env.SECRET_ENV);', + }, +}) diff --git a/packages/cli/e2e/__tests__/fixtures/esm-module/package.json b/packages/cli/e2e/__tests__/fixtures/esm-module/package.json index c1f38fcc..5f9ccd69 100644 --- a/packages/cli/e2e/__tests__/fixtures/esm-module/package.json +++ b/packages/cli/e2e/__tests__/fixtures/esm-module/package.json @@ -1,5 +1,5 @@ { - "name": "boilerlate-project", + "name": "Test ECMAScript Module Project", "version": "1.0.0", "description": "", "scripts": { diff --git a/packages/cli/e2e/__tests__/test.spec.ts b/packages/cli/e2e/__tests__/test.spec.ts index b030b1d9..30140930 100644 --- a/packages/cli/e2e/__tests__/test.spec.ts +++ b/packages/cli/e2e/__tests__/test.spec.ts @@ -143,7 +143,7 @@ describe('test', () => { expect(result.stdout).toContain('Reached timeout of 0 seconds waiting for check result.') }) - it.only('ESModule project should run successfully', () => { + it('ESModule project should run successfully', () => { const secretEnv = uuid.v4() const result = runChecklyCli({ args: ['test', '-e', `SECRET_ENV=${secretEnv}`, '--verbose'], @@ -152,7 +152,6 @@ describe('test', () => { directory: path.join(__dirname, 'fixtures', 'esm-module'), timeout: 120000, // 2 minutes }) - console.log('GOT ', result) expect(result.stdout).not.toContain('File extension type example') expect(result.stdout).toContain(secretEnv) expect(result.status).toBe(0) diff --git a/packages/cli/src/services/util.ts b/packages/cli/src/services/util.ts index 9a8f1d18..669bded7 100644 --- a/packages/cli/src/services/util.ts +++ b/packages/cli/src/services/util.ts @@ -84,6 +84,9 @@ async function getTsCompiler (): Promise { try { const tsNode = await import('ts-node') tsCompiler = tsNode.register({ + moduleTypes: { + '**/*': 'cjs', + }, compilerOptions: { module: 'CommonJS', },