From f55aed2ee524519c0b7c4ba1e337494a1d1dbca5 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 9 Aug 2023 13:31:30 +0100 Subject: [PATCH 1/8] Adding NPM ignore files so that doesn't default to the .gitignore when publishing to NPM. --- packages/backend-core/.npmignore | 7 +++++++ packages/shared-core/.npmignore | 3 +++ 2 files changed, 10 insertions(+) create mode 100644 packages/backend-core/.npmignore create mode 100644 packages/shared-core/.npmignore diff --git a/packages/backend-core/.npmignore b/packages/backend-core/.npmignore new file mode 100644 index 0000000000..d1b8eaa79b --- /dev/null +++ b/packages/backend-core/.npmignore @@ -0,0 +1,7 @@ +node_modules/ +tsconfig.build.json +tsconfig.json +jest.config.ts +jest-testcontainers-config.js +__mocks__ +scripts diff --git a/packages/shared-core/.npmignore b/packages/shared-core/.npmignore new file mode 100644 index 0000000000..4926fbc5fd --- /dev/null +++ b/packages/shared-core/.npmignore @@ -0,0 +1,3 @@ +node_modules/ +tsconfig.build.json +tsconfig.json From ea3f4e8126c661d3a054d667a588de2209976c61 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 9 Aug 2023 12:44:41 +0000 Subject: [PATCH 2/8] Bump version to 2.9.19 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index d506ef3022..8ec6eddf37 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.9.18", + "version": "2.9.19", "npmClient": "yarn", "packages": [ "packages/*" From bfdb7854364f10bbf680ef66e9b451f58bd93fe6 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 9 Aug 2023 16:36:14 +0300 Subject: [PATCH 3/8] Tweak shared-core content to exclude src --- packages/shared-core/.npmignore | 8 +++++--- packages/shared-core/package.json | 10 ++-------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/packages/shared-core/.npmignore b/packages/shared-core/.npmignore index 4926fbc5fd..268f19d4fe 100644 --- a/packages/shared-core/.npmignore +++ b/packages/shared-core/.npmignore @@ -1,3 +1,5 @@ -node_modules/ -tsconfig.build.json -tsconfig.json +* +!dist/* +dist/tsconfig.build.tsbuildinfo +!package.json +!LICENCE \ No newline at end of file diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 4e7d568fcb..b097a46c57 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -2,14 +2,8 @@ "name": "@budibase/shared-core", "version": "0.0.0", "description": "Shared data utils", - "main": "src/index.ts", - "types": "src/index.ts", - "exports": { - ".": { - "import": "./dist/index.js", - "require": "./src/index.ts" - } - }, + "main": "dist/index.js", + "types": "dist/index.d.ts", "author": "Budibase", "license": "GPL-3.0", "scripts": { From 90398ced3e8cac5f046fa35445a482a243d7a553 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 9 Aug 2023 16:37:31 +0300 Subject: [PATCH 4/8] Tweak types npm content --- packages/types/.npmignore | 5 +++++ packages/types/package.json | 10 ++-------- 2 files changed, 7 insertions(+), 8 deletions(-) create mode 100644 packages/types/.npmignore diff --git a/packages/types/.npmignore b/packages/types/.npmignore new file mode 100644 index 0000000000..268f19d4fe --- /dev/null +++ b/packages/types/.npmignore @@ -0,0 +1,5 @@ +* +!dist/* +dist/tsconfig.build.tsbuildinfo +!package.json +!LICENCE \ No newline at end of file diff --git a/packages/types/package.json b/packages/types/package.json index 317342e760..bb0163ae13 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -2,14 +2,8 @@ "name": "@budibase/types", "version": "0.0.0", "description": "Budibase types", - "main": "src/index.ts", - "types": "src/index.ts", - "exports": { - ".": { - "import": "./dist/index.js", - "require": "./src/index.ts" - } - }, + "main": "dist/index.js", + "types": "dist/index.d.ts", "author": "Budibase", "license": "GPL-3.0", "scripts": { From 4c7dfc978e94d80beba303002008026f7990e73e Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 9 Aug 2023 16:41:44 +0300 Subject: [PATCH 5/8] Whitelist .npmignore from backend-core --- packages/backend-core/.npmignore | 11 ++++------- packages/shared-core/.npmignore | 3 +-- packages/types/.npmignore | 3 +-- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/packages/backend-core/.npmignore b/packages/backend-core/.npmignore index d1b8eaa79b..967c7d11da 100644 --- a/packages/backend-core/.npmignore +++ b/packages/backend-core/.npmignore @@ -1,7 +1,4 @@ -node_modules/ -tsconfig.build.json -tsconfig.json -jest.config.ts -jest-testcontainers-config.js -__mocks__ -scripts +* +!dist/* +dist/tsconfig.build.tsbuildinfo +!package.json \ No newline at end of file diff --git a/packages/shared-core/.npmignore b/packages/shared-core/.npmignore index 268f19d4fe..967c7d11da 100644 --- a/packages/shared-core/.npmignore +++ b/packages/shared-core/.npmignore @@ -1,5 +1,4 @@ * !dist/* dist/tsconfig.build.tsbuildinfo -!package.json -!LICENCE \ No newline at end of file +!package.json \ No newline at end of file diff --git a/packages/types/.npmignore b/packages/types/.npmignore index 268f19d4fe..967c7d11da 100644 --- a/packages/types/.npmignore +++ b/packages/types/.npmignore @@ -1,5 +1,4 @@ * !dist/* dist/tsconfig.build.tsbuildinfo -!package.json -!LICENCE \ No newline at end of file +!package.json \ No newline at end of file From b441cbe3ec707acce77ac4219eeae4efd7bbde71 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 9 Aug 2023 17:06:05 +0300 Subject: [PATCH 6/8] Include all dist --- packages/backend-core/.npmignore | 2 +- packages/shared-core/.npmignore | 2 +- packages/types/.npmignore | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/backend-core/.npmignore b/packages/backend-core/.npmignore index 967c7d11da..fb547825eb 100644 --- a/packages/backend-core/.npmignore +++ b/packages/backend-core/.npmignore @@ -1,4 +1,4 @@ * -!dist/* +!dist/**/* dist/tsconfig.build.tsbuildinfo !package.json \ No newline at end of file diff --git a/packages/shared-core/.npmignore b/packages/shared-core/.npmignore index 967c7d11da..fb547825eb 100644 --- a/packages/shared-core/.npmignore +++ b/packages/shared-core/.npmignore @@ -1,4 +1,4 @@ * -!dist/* +!dist/**/* dist/tsconfig.build.tsbuildinfo !package.json \ No newline at end of file diff --git a/packages/types/.npmignore b/packages/types/.npmignore index 967c7d11da..fb547825eb 100644 --- a/packages/types/.npmignore +++ b/packages/types/.npmignore @@ -1,4 +1,4 @@ * -!dist/* +!dist/**/* dist/tsconfig.build.tsbuildinfo !package.json \ No newline at end of file From 9734776953e98f7c01b600dfbb1d17394652c5e7 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 9 Aug 2023 17:20:36 +0300 Subject: [PATCH 7/8] Add required nx dependencies --- packages/backend-core/package.json | 15 +++++++++++++++ packages/shared-core/package.json | 14 ++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 65577cf4d8..04efe7f5c6 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -88,5 +88,20 @@ "ts-node": "10.8.1", "tsconfig-paths": "4.0.0", "typescript": "4.7.3" + }, + "nx": { + "targets": { + "build": { + "dependsOn": [ + { + "projects": [ + "@budibase/shared-core", + "@budibase/types" + ], + "target": "build" + } + ] + } + } } } diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index b097a46c57..382f3fa731 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -20,5 +20,19 @@ "concurrently": "^7.6.0", "rimraf": "3.0.2", "typescript": "4.7.3" + }, + "nx": { + "targets": { + "build": { + "dependsOn": [ + { + "projects": [ + "@budibase/types" + ], + "target": "build" + } + ] + } + } } } From 7c12280fe398bce4ef0b3e2c22ef852d344c0f69 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 9 Aug 2023 14:34:26 +0000 Subject: [PATCH 8/8] Bump version to 2.9.20 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 8ec6eddf37..9d89818cbd 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.9.19", + "version": "2.9.20", "npmClient": "yarn", "packages": [ "packages/*"