From d1f4666ab79d8d3aadbd4c607243524e1a7e071b Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Thu, 9 Jun 2022 13:15:20 +0100 Subject: [PATCH] Build dev fixes --- package.json | 2 +- packages/backend-core/package.json | 4 +++- packages/server/package.json | 5 ++++- packages/server/tsconfig.build.json | 3 ++- packages/server/yarn.lock | 8 ++++++++ packages/types/.gitignore | 3 ++- packages/types/package.json | 3 ++- packages/worker/package.json | 4 +++- tsconfig.json | 8 -------- 9 files changed, 25 insertions(+), 15 deletions(-) delete mode 100644 tsconfig.json diff --git a/package.json b/package.json index 84bc584832..94e712127f 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "setup": "node ./hosting/scripts/setup.js && yarn && yarn bootstrap && yarn build && yarn dev", "bootstrap": "lerna link && lerna bootstrap && ./scripts/link-dependencies.sh", "build": "lerna run build", - "build:dev": "tsc --build tsconfig.json --watch --preserveWatchOutput", + "build:dev": "lerna run prebuild && lerna run build:dev --scope @budibase/server --scope @budibase/worker --stream", "release": "lerna publish patch --yes --force-publish && yarn release:pro", "release:develop": "lerna publish prerelease --yes --force-publish --dist-tag develop && yarn release:pro:develop", "release:pro": "bash scripts/pro/release.sh", diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 2cec6d9466..300cdbf626 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -7,7 +7,9 @@ "author": "Budibase", "license": "GPL-3.0", "scripts": { - "build": "rimraf dist/ && tsc -p tsconfig.build.json", + "prebuild": "rimraf dist/", + "build": "tsc -p tsconfig.build.json", + "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput", "test": "jest", "test:watch": "jest --watchAll" }, diff --git a/packages/server/package.json b/packages/server/package.json index d4baa13b02..3c583b7f8e 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -9,7 +9,9 @@ "url": "https://github.com/Budibase/budibase.git" }, "scripts": { - "build": "rimraf dist/ && tsc -p tsconfig.build.json && mv dist/src/* dist/ && rimraf dist/src/", + "prebuild": "rimraf dist/", + "build": "tsc -p tsconfig.build.json && mv dist/src/* dist/ && rimraf dist/src/", + "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput", "debug": "yarn build && node --expose-gc --inspect=9222 dist/index.js", "postbuild": "copyfiles -u 1 src/**/*.svelte dist/ && copyfiles -u 1 src/**/*.hbs dist/ && copyfiles -u 1 src/**/*.json dist/", "test": "jest --coverage --maxWorkers=2", @@ -158,6 +160,7 @@ "@types/redis": "4.0.11", "@types/jest": "27.5.1", "@types/global-agent": "2.1.1", + "@types/node-fetch": "2.6.1", "@typescript-eslint/parser": "5.12.0", "apidoc": "0.50.4", "babel-jest": "27.5.1", diff --git a/packages/server/tsconfig.build.json b/packages/server/tsconfig.build.json index a566853662..cdf11271bf 100644 --- a/packages/server/tsconfig.build.json +++ b/packages/server/tsconfig.build.json @@ -2,7 +2,7 @@ "compilerOptions": { "target": "es6", "module": "commonjs", - "lib": ["es2020"], + "lib": ["es2020", "dom"], "allowJs": true, "strict": true, "noImplicitAny": true, @@ -14,6 +14,7 @@ }, "include": [ "src/**/*", + "specs", "package.json" ], "exclude": [ diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 3f0c6afbcb..76fd4daec2 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -2727,6 +2727,14 @@ "@types/bson" "*" "@types/node" "*" +"@types/node-fetch@2.6.1": + version "2.6.1" + resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.1.tgz#8f127c50481db65886800ef496f20bbf15518975" + integrity sha512-oMqjURCaxoSIsHSr1E47QHzbmzNR5rK8McHuNb11BOM9cHcIK3Avy0s/b2JlXHoQGTYS3NsvWzV1M0iK7l0wbA== + dependencies: + "@types/node" "*" + form-data "^3.0.0" + "@types/node@*", "@types/node@>=12.12.47", "@types/node@>=13.13.4", "@types/node@>=13.7.0": version "17.0.41" resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.41.tgz#1607b2fd3da014ae5d4d1b31bc792a39348dfb9b" diff --git a/packages/types/.gitignore b/packages/types/.gitignore index cc7d9d4dbd..03b460dc6b 100644 --- a/packages/types/.gitignore +++ b/packages/types/.gitignore @@ -1,4 +1,5 @@ node_modules/ dist coverage/ -tsconfig.build.tsbuildinfo \ No newline at end of file +tsconfig.build.tsbuildinfo +tsconfig.tsbuildinfo \ No newline at end of file diff --git a/packages/types/package.json b/packages/types/package.json index 3d4bf34176..96e620194f 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -7,7 +7,8 @@ "author": "Budibase", "license": "GPL-3.0", "scripts": { - "build": "rimraf dist/ && rm -f tsconfig.build.tsbuildinfo && tsc -p tsconfig.build.json" + "prebuild": "rimraf dist/ && rm -f tsconfig.build.tsbuildinfo && rm -rf tsconfig.tsbuildinfo", + "build": "tsc -p tsconfig.build.json" }, "jest": { }, diff --git a/packages/worker/package.json b/packages/worker/package.json index d095193ed6..c38fe3d045 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -12,7 +12,9 @@ "budibase" ], "scripts": { - "build": "rimraf dist/ && rm -f tsconfig.build.tsbuildinfo && tsc -p tsconfig.build.json && mv dist/src/* dist/ && rimraf dist/src/", + "prebuild": "rimraf dist/", + "build": "tsc -p tsconfig.build.json", + "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput", "postbuild": "copyfiles -u 1 src/**/*.hbs dist/", "run:docker": "node dist/index.js", "run:docker:cluster": "pm2-runtime start pm2.config.js", diff --git a/tsconfig.json b/tsconfig.json deleted file mode 100644 index 8a7bd91caa..0000000000 --- a/tsconfig.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "references": [ - { "path": "packages/types/tsconfig.json" }, - { "path": "packages/backend-core/tsconfig.json" }, - { "path": "packages/server/tsconfig.json" }, - { "path": "packages/worker/tsconfig.json" }, - ] -} \ No newline at end of file