From 7584350834e6de5b12c97a5bb1b76e851deafada Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Sat, 18 Apr 2020 14:47:46 +0200 Subject: [PATCH] packages/cli: use separate tsconfig for builds to get currect config in tests --- packages/cli/bin/backstage-cli | 2 +- packages/cli/package.json | 2 +- packages/cli/tsconfig.build.json | 8 ++++++++ packages/cli/tsconfig.json | 3 --- 4 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 packages/cli/tsconfig.build.json diff --git a/packages/cli/bin/backstage-cli b/packages/cli/bin/backstage-cli index 5288f913d9..ad5cc09749 100755 --- a/packages/cli/bin/backstage-cli +++ b/packages/cli/bin/backstage-cli @@ -75,7 +75,7 @@ if (!isLocal || process.env.BACKSTAGE_E2E_CLI_TEST) { const cleanupPaths = require('tsconfig-paths').register({ baseUrl, paths }); require('ts-node').register({ - project: path.resolve(__dirname, '../tsconfig.json'), + project: path.resolve(__dirname, '../tsconfig.build.json'), compilerOptions: { module: 'CommonJS', }, diff --git a/packages/cli/package.json b/packages/cli/package.json index c5744a7425..1a1a15b6af 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -18,7 +18,7 @@ "license": "Apache-2.0", "main": "dist", "scripts": { - "build": "backstage-cli build-cache -- tsc", + "build": "backstage-cli build-cache -- tsc --project tsconfig.build.json", "lint": "backstage-cli lint", "test": "backstage-cli test", "test:e2e": "node e2e-test/cli-e2e-test.js", diff --git a/packages/cli/tsconfig.build.json b/packages/cli/tsconfig.build.json new file mode 100644 index 0000000000..116632b612 --- /dev/null +++ b/packages/cli/tsconfig.build.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "exclude": ["**/*.test.*"], + "compilerOptions": { + "outFile": "dist/index.js", + "module": "amd" + } +} diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json index fa3e4a25cd..7b73db2f0f 100644 --- a/packages/cli/tsconfig.json +++ b/packages/cli/tsconfig.json @@ -1,10 +1,7 @@ { "extends": "../../tsconfig.json", "include": ["src"], - "exclude": ["**/*.test.*"], "compilerOptions": { - "outFile": "dist/index.js", - "module": "amd", "baseUrl": "src" } }