From eeb0daa98aebb76818caf7a3c9dd101c5733c343 Mon Sep 17 00:00:00 2001 From: adrinr Date: Mon, 17 Apr 2023 14:20:36 +0100 Subject: [PATCH] Update builds to exclude the package.json --- packages/backend-core/tsconfig.build.json | 10 +++------- packages/cli/tsconfig.json | 19 +++++-------------- packages/server/tsconfig.build.json | 8 +++----- packages/server/tsconfig.json | 2 +- packages/shared-core/tsconfig-base.build.json | 2 +- packages/shared-core/tsconfig-cjs.build.json | 2 +- packages/shared-core/tsconfig.build.json | 2 +- packages/worker/tsconfig.json | 11 +++-------- qa-core/tsconfig.json | 16 +++++----------- 9 files changed, 23 insertions(+), 49 deletions(-) diff --git a/packages/backend-core/tsconfig.build.json b/packages/backend-core/tsconfig.build.json index 12f8255a7c..bfbed31e23 100644 --- a/packages/backend-core/tsconfig.build.json +++ b/packages/backend-core/tsconfig.build.json @@ -10,15 +10,11 @@ "incremental": true, "sourceMap": true, "declaration": true, - "types": [ "node", "jest" ], + "types": ["node", "jest"], "outDir": "dist", "skipLibCheck": true }, - "include": [ - "**/*.js", - "**/*.ts", - "package.json" - ], + "include": ["**/*.js", "**/*.ts"], "exclude": [ "node_modules", "dist", @@ -26,4 +22,4 @@ "**/*.spec.js", "__mocks__" ] -} \ No newline at end of file +} diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json index b60cb7eed3..0fa0bd8f5a 100644 --- a/packages/cli/tsconfig.json +++ b/packages/cli/tsconfig.json @@ -8,23 +8,14 @@ "paths": { "@budibase/types": ["../types/src"], "@budibase/backend-core": ["../backend-core/src"], - "@budibase/backend-core/*": ["../backend-core/*"], + "@budibase/backend-core/*": ["../backend-core/*"] } }, "ts-node": { "require": ["tsconfig-paths/register"], "swc": true }, - "references": [ - { "path": "../types" }, - { "path": "../backend-core" }, - ], - "include": [ - "src/**/*", - "package.json" - ], - "exclude": [ - "node_modules", - "dist" - ] -} \ No newline at end of file + "references": [{ "path": "../types" }, { "path": "../backend-core" }], + "include": ["src/**/*"], + "exclude": ["node_modules", "dist"] +} diff --git a/packages/server/tsconfig.build.json b/packages/server/tsconfig.build.json index 9289b6f9da..136de776dd 100644 --- a/packages/server/tsconfig.build.json +++ b/packages/server/tsconfig.build.json @@ -8,13 +8,11 @@ "esModuleInterop": true, "resolveJsonModule": true, "incremental": true, - "types": [ "node", "jest" ], - "outDir": "dist", + "types": ["node", "jest"], + "outDir": "dist/src", "skipLibCheck": true }, - "include": [ - "src/**/*" - ], + "include": ["src/**/*"], "exclude": [ "node_modules", "dist", diff --git a/packages/server/tsconfig.json b/packages/server/tsconfig.json index 5f4ee1a701..7b2353d2db 100644 --- a/packages/server/tsconfig.json +++ b/packages/server/tsconfig.json @@ -23,6 +23,6 @@ { "path": "../shared-core" }, { "path": "../../../budibase-pro/packages/pro" } ], - "include": ["src/**/*", "specs", "package.json"], + "include": ["src/**/*", "specs"], "exclude": ["node_modules", "dist"] } diff --git a/packages/shared-core/tsconfig-base.build.json b/packages/shared-core/tsconfig-base.build.json index 9715eb06cf..6930e3cb99 100644 --- a/packages/shared-core/tsconfig-base.build.json +++ b/packages/shared-core/tsconfig-base.build.json @@ -14,7 +14,7 @@ "outDir": "dist", "skipLibCheck": true }, - "include": ["**/*.js", "**/*.ts", "package.json"], + "include": ["**/*.js", "**/*.ts"], "exclude": [ "node_modules", "dist", diff --git a/packages/shared-core/tsconfig-cjs.build.json b/packages/shared-core/tsconfig-cjs.build.json index 9b479b7b34..45e81e575c 100644 --- a/packages/shared-core/tsconfig-cjs.build.json +++ b/packages/shared-core/tsconfig-cjs.build.json @@ -2,7 +2,7 @@ "extends": "./tsconfig-base.build.json", "compilerOptions": { "module": "commonjs", - "outDir": "dist/cjs", + "outDir": "dist/cjs/src", "target": "es2015" } } diff --git a/packages/shared-core/tsconfig.build.json b/packages/shared-core/tsconfig.build.json index 4d3c9fc2e0..2a00a44dfe 100644 --- a/packages/shared-core/tsconfig.build.json +++ b/packages/shared-core/tsconfig.build.json @@ -2,7 +2,7 @@ "extends": "./tsconfig-base.build.json", "compilerOptions": { "module": "esnext", - "outDir": "dist/mjs", + "outDir": "dist/mjs/src", "target": "esnext" } } diff --git a/packages/worker/tsconfig.json b/packages/worker/tsconfig.json index 3c8500d248..0a5063574a 100644 --- a/packages/worker/tsconfig.json +++ b/packages/worker/tsconfig.json @@ -21,11 +21,6 @@ { "path": "../backend-core" }, { "path": "../../../budibase-pro/packages/pro" } ], - "include": [ - "src/**/*", - "package.json" - ], - "exclude": [ - "dist" - ] -} \ No newline at end of file + "include": ["src/**/*"], + "exclude": ["dist"] +} diff --git a/qa-core/tsconfig.json b/qa-core/tsconfig.json index 8cd0c30d46..227f60bd6f 100644 --- a/qa-core/tsconfig.json +++ b/qa-core/tsconfig.json @@ -16,7 +16,7 @@ "@budibase/types": ["../packages/types/src"], "@budibase/backend-core": ["../packages/backend-core/src"], "@budibase/backend-core/*": ["../packages/backend-core/*"], - "@budibase/server/*": ["../packages/server/src/*"], + "@budibase/server/*": ["../packages/server/src/*"] } }, "ts-node": { @@ -24,14 +24,8 @@ }, "references": [ { "path": "../packages/types" }, - { "path": "../packages/backend-core" }, + { "path": "../packages/backend-core" } ], - "include": [ - "src/**/*", - "package.json" - ], - "exclude": [ - "node_modules", - "dist" - ] -} \ No newline at end of file + "include": ["src/**/*"], + "exclude": ["node_modules", "dist"] +}