From 1abb5f1ea5fd59e182da37312cfbae09404b10f5 Mon Sep 17 00:00:00 2001 From: zomars Date: Wed, 9 Feb 2022 16:59:34 -0700 Subject: [PATCH] Config updates --- apps/web/next.config.js | 2 +- apps/web/package.json | 4 +- apps/web/tsconfig.json | 58 ++++------------------------ package.json | 7 ++-- packages/tsconfig/README.md | 3 ++ packages/tsconfig/base.json | 26 +++++++++++++ packages/tsconfig/nextjs.json | 24 ++++++++++++ packages/tsconfig/package.json | 11 ++++++ packages/tsconfig/react-library.json | 11 ++++++ turbo.json | 3 ++ yarn.lock | 2 +- 11 files changed, 93 insertions(+), 58 deletions(-) create mode 100644 packages/tsconfig/README.md create mode 100644 packages/tsconfig/base.json create mode 100644 packages/tsconfig/nextjs.json create mode 100644 packages/tsconfig/package.json create mode 100644 packages/tsconfig/react-library.json diff --git a/apps/web/next.config.js b/apps/web/next.config.js index 762e55bb10..975a02dc50 100644 --- a/apps/web/next.config.js +++ b/apps/web/next.config.js @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/no-var-requires */ -const withTM = require("@vercel/edge-functions-ui/transpile")(["react-timezone-select"]); +const withTM = require("@vercel/edge-functions-ui/transpile")([]); const { i18n } = require("./next-i18next.config"); // So we can test deploy previews preview diff --git a/apps/web/package.json b/apps/web/package.json index ee3d259696..106e200e05 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -30,7 +30,6 @@ "pre-commit": "lint-staged", "lint": "eslint . --ext .ts,.js,.tsx,.jsx", "lint:fix": "eslint . --ext .ts,.js,.tsx,.jsx --fix", - "prepare": "husky install", "check-changed-files": "ts-node scripts/ts-check-changed-files.ts" }, "engines": { @@ -100,7 +99,7 @@ "react-query": "^3.33.7", "react-router-dom": "^5.2.0", "react-select": "^5.2.1", - "react-timezone-select": "^1.1.15", + "react-timezone-select": "^1.3.1", "react-use-intercom": "1.4.0", "react-virtualized-auto-sizer": "^1.0.6", "react-window": "^1.8.6", @@ -145,7 +144,6 @@ "eslint-plugin-prettier": "^3.4.0", "eslint-plugin-react": "^7.27.1", "eslint-plugin-react-hooks": "^4.3.0", - "husky": "^7.0.1", "jest": "^26.0.0", "lint-staged": "^11.1.2", "mockdate": "^3.0.5", diff --git a/apps/web/tsconfig.json b/apps/web/tsconfig.json index 143f0bcee0..a8423c2525 100644 --- a/apps/web/tsconfig.json +++ b/apps/web/tsconfig.json @@ -1,58 +1,16 @@ { + "extends": "@calcom/tsconfig/nextjs.json", "compilerOptions": { - "target": "es5", - "lib": [ - "dom", - "dom.iterable", - "esnext" - ], "baseUrl": ".", "paths": { - "@components/*": [ - "components/*" - ], - "@lib/*": [ - "lib/*" - ], - "@server/*": [ - "server/*" - ], - "@ee/*": [ - "ee/*" - ] + "@components/*": ["components/*"], + "@lib/*": ["lib/*"], + "@server/*": ["server/*"], + "@ee/*": ["ee/*"] }, - "skipLibCheck": true, - "strict": true, - "strictNullChecks": true, - "forceConsistentCasingInFileNames": true, - "noEmit": true, - "esModuleInterop": true, - "module": "esnext", - "moduleResolution": "node", - "resolveJsonModule": true, - "isolatedModules": true, - "useUnknownInCatchVariables": true, - "jsx": "preserve", "typeRoots": ["./types"], - "types": [ - "@types/jest", - ], - "allowJs": true, - "incremental": true + "types": ["@types/jest"] }, - "include": [ - "next-env.d.ts", - "@types/*.d.ts", - "**/*.ts", - "**/*.tsx" - ], - "exclude": [ - "node_modules" - ], - "ts-node": { - "compilerOptions": { - "module": "CommonJS", - "types": ["node"], - } - } + "include": ["next-env.d.ts", "@types/*.d.ts", "**/*.ts", "**/*.tsx"], + "exclude": ["node_modules"] } diff --git a/package.json b/package.json index 75831a360a..c82594c5b1 100644 --- a/package.json +++ b/package.json @@ -9,12 +9,13 @@ "scripts": { "build": "turbo run build", "clean": "turbo run clean && rm -rf node_modules", + "deploy": "turbo run deploy", "dev": "turbo run dev --parallel", "dx": "turbo run dx", - "lint": "turbo run lint", - "type-check": "turbo run type-check", "format": "prettier --write \"**/*.{ts,tsx,md}\"", - "prepare": "husky install" + "lint": "turbo run lint", + "prepare": "husky install", + "type-check": "turbo run type-check" }, "devDependencies": { "@trivago/prettier-plugin-sort-imports": "2.0.4", diff --git a/packages/tsconfig/README.md b/packages/tsconfig/README.md new file mode 100644 index 0000000000..0da79cf231 --- /dev/null +++ b/packages/tsconfig/README.md @@ -0,0 +1,3 @@ +# `tsconfig` + +These are base shared `tsconfig.json`s from which all other `tsconfig.json`'s inherit from. diff --git a/packages/tsconfig/base.json b/packages/tsconfig/base.json new file mode 100644 index 0000000000..0fcd67ee16 --- /dev/null +++ b/packages/tsconfig/base.json @@ -0,0 +1,26 @@ +{ + "$schema": "https://json.schemastore.org/tsconfig", + "display": "Default", + "compilerOptions": { + "composite": false, + "declaration": true, + "declarationMap": true, + "esModuleInterop": true, + "forceConsistentCasingInFileNames": true, + "inlineSources": false, + "isolatedModules": true, + "moduleResolution": "node", + "noUnusedLocals": false, + "noUnusedParameters": false, + "preserveWatchOutput": true, + "skipLibCheck": true, + "strict": true + }, + "exclude": ["node_modules"], + "ts-node": { + "compilerOptions": { + "module": "CommonJS", + "types": ["node"] + } + } +} diff --git a/packages/tsconfig/nextjs.json b/packages/tsconfig/nextjs.json new file mode 100644 index 0000000000..82d322c751 --- /dev/null +++ b/packages/tsconfig/nextjs.json @@ -0,0 +1,24 @@ +{ + "$schema": "https://json.schemastore.org/tsconfig", + "display": "Next.js", + "extends": "./base.json", + "compilerOptions": { + "target": "es5", + "lib": ["dom", "dom.iterable", "esnext"], + "allowJs": true, + "skipLibCheck": true, + "strict": false, + "forceConsistentCasingInFileNames": true, + "noEmit": true, + "incremental": true, + "esModuleInterop": true, + "module": "esnext", + "resolveJsonModule": true, + "isolatedModules": true, + "jsx": "preserve", + "strictNullChecks": true, + "useUnknownInCatchVariables": true + }, + "include": ["src", "next-env.d.ts"], + "exclude": ["node_modules"] +} diff --git a/packages/tsconfig/package.json b/packages/tsconfig/package.json new file mode 100644 index 0000000000..61926e7f83 --- /dev/null +++ b/packages/tsconfig/package.json @@ -0,0 +1,11 @@ +{ + "name": "@calcom/tsconfig", + "version": "0.0.0", + "private": true, + "main": "index.js", + "files": [ + "base.json", + "nextjs.json", + "react-library.json" + ] +} diff --git a/packages/tsconfig/react-library.json b/packages/tsconfig/react-library.json new file mode 100644 index 0000000000..6d6a7fea97 --- /dev/null +++ b/packages/tsconfig/react-library.json @@ -0,0 +1,11 @@ +{ + "$schema": "https://json.schemastore.org/tsconfig", + "display": "React Library", + "extends": "./base.json", + "compilerOptions": { + "lib": ["ES2015"], + "module": "ESNext", + "target": "ES6", + "jsx": "react-jsx" + } +} diff --git a/turbo.json b/turbo.json index 411ba6900f..22ecaab714 100644 --- a/turbo.json +++ b/turbo.json @@ -6,6 +6,9 @@ "dependsOn": ["^build"], "outputs": ["dist/**", ".next/**"] }, + "deploy": { + "dependsOn": [] + }, "clean": { "cache": false }, diff --git a/yarn.lock b/yarn.lock index 8d10cfa34c..fa533f0b4c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9662,7 +9662,7 @@ react-style-singleton@^2.1.0: invariant "^2.2.4" tslib "^1.0.0" -react-timezone-select@^1.1.15: +react-timezone-select@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/react-timezone-select/-/react-timezone-select-1.3.1.tgz#844fc8825826865d68451426d77902532f472017" integrity sha512-ydNax+6+nJcOOE5lZA4EfkU7wcHz/b/2KK7dEfSUmnUjlHnZKSO/rf1x3SOX8EgNNrWM/Pn8BbPIPqbM0Vu1iQ==