From 7573320cf024ca9fab9486369119eb6a64c42e58 Mon Sep 17 00:00:00 2001 From: sriram veeraghanta Date: Tue, 24 Dec 2024 18:39:04 +0530 Subject: [PATCH] fix: swaping dev dependencies with dependencies due to cjs build, moving etl package --- packages/etl/package.json | 142 ++++++++++++++++++------------------- packages/etl/tsconfig.json | 48 +++++-------- silo/package.json | 10 +-- silo/tsconfig.json | 14 ++-- silo/tsup.config.ts | 9 +++ 5 files changed, 111 insertions(+), 112 deletions(-) create mode 100644 silo/tsup.config.ts diff --git a/packages/etl/package.json b/packages/etl/package.json index a05c3f0067..40dea2e112 100644 --- a/packages/etl/package.json +++ b/packages/etl/package.json @@ -1,73 +1,73 @@ { - "name": "@plane/etl", - "version": "0.24.1", - "repository": "https://github.com/makeplane/plane-ee", - "author": "Plane Engineering", - "license": "AGPL", - "private": true, - "files": [ - "dist/**/*" - ], - "exports": { - "./asana": { - "types": "./dist/asana/index.d.ts", - "default": "./dist/asana/index.js" - }, - "./core": { - "types": "./dist/core/index.d.ts", - "default": "./dist/core/index.js" - }, - "./github": { - "types": "./dist/github/index.d.ts", - "default": "./dist/github/index.js" - }, - "./gitlab": { - "types": "./dist/gitlab/index.d.ts", - "default": "./dist/gitlab/index.js" - }, - "./jira": { - "types": "./dist/jira/index.d.ts", - "default": "./dist/jira/index.js" - }, - "./jira-server": { - "types": "./dist/jira-server/index.d.ts", - "default": "./dist/jira-server/index.js" - }, - "./linear": { - "types": "./dist/linear/index.d.ts", - "default": "./dist/linear/index.js" - }, - "./slack": { - "types": "./dist/slack/index.d.ts", - "default": "./dist/slack/index.js" - } - }, - "scripts": { - "build": "tsup src/*/index.ts --format cjs --dts", - "dev": "tsup src/*/index.ts --format cjs --dts --watch", - "lint": "eslint src --ext .ts ", - "lint:errors": "eslint src --ext .ts --quiet" - }, - "dependencies": { - "@linear/sdk": "^37.0.0", - "@octokit/auth-app": "^7.1.0", - "@octokit/rest": "^21.0.2", - "@plane/constants": "*", - "@plane/sdk": "*", - "asana": "^3.0.11", - "axios": "^1.7.2", - "csv-string": "^4.1.1", - "jira.js": "^4.0.1", - "marked": "^15.0.4", - "tsup": "^8.3.5", - "turndown": "^7.2.0", - "zod": "^3.24.1" - }, - "devDependencies": { - "@octokit/openapi-webhooks-types": "^8.3.0", - "@plane/eslint-config": "*", - "@plane/typescript-config": "*", - "@types/marked": "^6.0.0", - "@types/turndown": "^5.0.5" - } + "name": "@plane/etl", + "version": "0.24.1", + "repository": "https://github.com/makeplane/plane-ee", + "author": "Plane Engineering", + "license": "AGPL", + "private": true, + "files": [ + "dist/**/*" + ], + "exports": { + "./asana": { + "types": "./dist/asana/index.d.ts", + "default": "./dist/asana/index.js" + }, + "./core": { + "types": "./dist/core/index.d.ts", + "default": "./dist/core/index.js" + }, + "./github": { + "types": "./dist/github/index.d.ts", + "default": "./dist/github/index.js" + }, + "./gitlab": { + "types": "./dist/gitlab/index.d.ts", + "default": "./dist/gitlab/index.js" + }, + "./jira": { + "types": "./dist/jira/index.d.ts", + "default": "./dist/jira/index.js" + }, + "./jira-server": { + "types": "./dist/jira-server/index.d.ts", + "default": "./dist/jira-server/index.js" + }, + "./linear": { + "types": "./dist/linear/index.d.ts", + "default": "./dist/linear/index.js" + }, + "./slack": { + "types": "./dist/slack/index.d.ts", + "default": "./dist/slack/index.js" + } + }, + "scripts": { + "build": "rm -rf dist && tsup --minify", + "dev": "tsup --watch", + "lint": "eslint src --ext .ts ", + "lint:errors": "eslint src --ext .ts --quiet" + }, + "dependencies": { + "@linear/sdk": "^37.0.0", + "@octokit/auth-app": "^7.1.0", + "@octokit/rest": "^21.0.2", + "@plane/constants": "*", + "@plane/sdk": "*", + "asana": "^3.0.11", + "axios": "^1.7.2", + "csv-string": "^4.1.1", + "jira.js": "^4.0.1", + "marked": "^15.0.4", + "tsup": "^8.3.5", + "turndown": "^7.2.0", + "zod": "^3.24.1" + }, + "devDependencies": { + "@octokit/openapi-webhooks-types": "^8.3.0", + "@plane/eslint-config": "*", + "@plane/typescript-config": "*", + "@types/marked": "^6.0.0", + "@types/turndown": "^5.0.5" + } } diff --git a/packages/etl/tsconfig.json b/packages/etl/tsconfig.json index 002d7b1d2c..c8bd9d2eef 100644 --- a/packages/etl/tsconfig.json +++ b/packages/etl/tsconfig.json @@ -1,31 +1,21 @@ { - "extends": "@plane/typescript-config/base.json", - "compilerOptions": { - "esModuleInterop": true, - "module": "ESNext", - "target": "ESNext", - "moduleResolution": "Bundler", - "allowJs": true, - "resolveJsonModule": true, - "lib": [ - "ESNext" - ], - "sourceMap": true, - "rootDir": "./src", - "outDir": "./dist", - "baseUrl": ".", - "paths": { - "@/*": [ - "src/*" - ] - } - }, - "include": [ - "src/**/*" - ], - "exclude": [ - "dist", - "build", - "node_modules" - ] + "extends": "@plane/typescript-config/base.json", + "compilerOptions": { + "esModuleInterop": true, + "module": "ESNext", + "target": "ESNext", + "moduleResolution": "Bundler", + "allowJs": true, + "resolveJsonModule": true, + "lib": ["ESNext"], + "sourceMap": true, + "rootDir": "./src", + "outDir": "./dist", + "baseUrl": ".", + "paths": { + "@/*": ["src/*"] + } + }, + "include": ["src/**/*"], + "exclude": ["dist", "build", "node_modules"] } diff --git a/silo/package.json b/silo/package.json index 19219516cd..a7c4f9e9c0 100644 --- a/silo/package.json +++ b/silo/package.json @@ -8,17 +8,16 @@ "scripts": { "dev": "turbo run develop", "develop": "nodemon --config \"./nodemon.json\"/", - "build": "tsup src/start.ts --format cjs --dts", - "start": "node dist/start.cjs -p 8080", + "build": "rm -rf dist && tsup --minify", + "start": "node dist/start.cjs", "format": "prettier --write \"**/*.{ts,tsx,md}\"", "lint": "eslint . --ext .ts", "db:generate": "drizzle-kit generate", "db:migrate": "drizzle-kit migrate" }, - "devDependencies": { + "dependencies": { "@linear/sdk": "^30.0.0", "@octokit/openapi-webhooks-types": "^8.3.0", - "@plane/etl": "*", "@plane/sdk": "*", "@sentry/node": "^8.27.0", "@sentry/profiling-node": "^8.27.0", @@ -41,9 +40,10 @@ "winston": "^3.14.2", "zod": "^3.23.8" }, - "dependencies": { + "devDependencies": { "@plane/eslint-config": "*", "@plane/typescript-config": "*", + "@plane/etl": "*", "@t3-oss/env-core": "^0.11.1", "@types/adm-zip": "^0.5.5", "@types/amqplib": "^0.10.5", diff --git a/silo/tsconfig.json b/silo/tsconfig.json index aab2d62655..cf94af66b7 100644 --- a/silo/tsconfig.json +++ b/silo/tsconfig.json @@ -1,18 +1,18 @@ { "extends": "@plane/typescript-config/base.json", "compilerOptions": { + "target": "ESNext", + "module": "ESNext", + "moduleResolution": "Bundler", + "experimentalDecorators": true, + "esModuleInterop": true, + "sourceMap": true, "outDir": "./dist", "rootDir": "./src", "baseUrl": ".", "paths": { "@/*": ["./src/*"] - }, - "module": "ESNext", - "moduleResolution": "Bundler", - "target": "ESNext", - "experimentalDecorators": true, - "esModuleInterop": true, - "sourceMap": true + } }, "include": ["src/**/*"], "exclude": ["dist", "build", "node_modules"] diff --git a/silo/tsup.config.ts b/silo/tsup.config.ts new file mode 100644 index 0000000000..a5b00d03af --- /dev/null +++ b/silo/tsup.config.ts @@ -0,0 +1,9 @@ +import { defineConfig, Options } from "tsup"; + +export default defineConfig((options: Options) => ({ + entry: ["src/start.ts"], + format: ["cjs", "esm"], + dts: true, + clean: false, + ...options, +}));