Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: version platform libraries npm package #15257

Merged
merged 5 commits into from
May 30, 2024
Merged

chore: version platform libraries npm package #15257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5db6dde
wip
ThyMinimalDev May 29, 2024
9a80260
Merge branch 'main' into version-platform-libraries
ThyMinimalDev May 30, 2024
30a2db0
fix: watch mode and eslint slow
ThyMinimalDev May 30, 2024
57b731e
update yarn lock
ThyMinimalDev May 30, 2024
e5d9628
Regenerated yarn.lock file for this branch
emrysal May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .eslintignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
node_modules
apps/api/v2/dist
packages/platform/**/dist/*
Comment on lines +2 to +3
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

eslint in vscode was slow because it was checking dist folders

**/**/node_modules
**/**/.next
**/**/public
Expand Down
6 changes: 3 additions & 3 deletions apps/api/v2/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"build": "yarn dev:build && nest build",
"format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
"start": "nest start",
"dev:build:watch": "yarn workspace @calcom/platform-constants build:watch & yarn workspace @calcom/platform-utils build:watch & yarn workspace @calcom/platform-types build:watch & yarn workspace @calcom/platform-libraries build:watch",
"dev:build": "yarn workspace @calcom/platform-constants build && yarn workspace @calcom/platform-utils build && yarn workspace @calcom/platform-types build && yarn workspace @calcom/platform-libraries build",
"dev:build:watch": "yarn workspace @calcom/platform-constants build:watch & yarn workspace @calcom/platform-utils build:watch & yarn workspace @calcom/platform-types build:watch",
"dev:build": "yarn workspace @calcom/platform-constants build && yarn workspace @calcom/platform-utils build && yarn workspace @calcom/platform-types build",
Comment on lines +12 to +13
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed build of platform libraries since we use npm package now

"dev": "yarn dev:build && docker-compose up -d && yarn copy-swagger-module && yarn start --watch",
"start:debug": "nest start --debug --watch",
"start:prod": "node ./dist/apps/api/v2/src/main.js",
Expand All @@ -25,7 +25,7 @@
},
"dependencies": {
"@calcom/platform-constants": "*",
"@calcom/platform-libraries": "*",
"@calcom/platform-libraries": "0.0.2",
"@calcom/platform-types": "*",
"@calcom/platform-utils": "*",
"@calcom/prisma": "*",
Expand Down
24 changes: 18 additions & 6 deletions apps/api/v2/swagger/documentation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2104,17 +2104,20 @@
"type": "boolean"
},
"slotInterval": {
"type": "number"
"type": "number",
"minimum": 0
},
"minimumBookingNotice": {
"type": "number",
"minimum": 0
},
"beforeEventBuffer": {
"type": "number"
"type": "number",
"minimum": 0
},
"afterEventBuffer": {
"type": "number"
"type": "number",
"minimum": 0
}
},
"required": [
Expand Down Expand Up @@ -2798,6 +2801,12 @@
"$ref": "#/components/schemas/EventTypeLocation"
}
},
"bookingFields": {
"type": "array",
"items": {
"$ref": "#/components/schemas/BookingField"
}
},
"disableGuests": {
"type": "boolean"
},
Expand All @@ -2806,13 +2815,16 @@
"minimum": 0
},
"beforeEventBuffer": {
"type": "number"
"type": "number",
"minimum": 0
},
"afterEventBuffer": {
"type": "number"
"type": "number",
"minimum": 0
},
"slotInterval": {
"type": "number"
"type": "number",
"minimum": 0
}
}
},
Expand Down
21 changes: 8 additions & 13 deletions apps/api/v2/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"paths": {
"@/*": ["./src/*"],
"@prisma/client/*": ["@calcom/prisma/client/*"],
"@calcom/platform-libraries": ["../../../packages/platform/libraries/index.ts"],
"@calcom/platform-constants": ["../../../packages/platform/constants/index.ts"],
"@calcom/platform-types": ["../../../packages/platform/types/index.ts"],
"@calcom/platform-utils": ["../../../packages/platform/utils/index.ts"]
Expand All @@ -27,17 +26,13 @@
"forceConsistentCasingInFileNames": false,
"noFallthroughCasesInSwitch": false
},
"watchOptions": {
"watchFile": "fixedPollingInterval",
"watchDirectory": "useFsEvents",
"fallbackPolling": "dynamicPriority",
"synchronousWatchDirectory": true,
"excludeDirectories": ["**/node_modules", "dist"]
},
"exclude": ["./dist", "./node_modules", "next-i18next.config.js"],
"include": [
"./**/*.ts",
"../../../packages/types/*.d.ts",
"../../../packages/platform/libraries/**/*.ts",
"../../../packages/platform/libraries/**/*.d.ts",
"../../../packages/platform/constants/**/*.ts",
"../../../packages/platform/constants/**/*.d.ts",
"../../../packages/platform/types/**/*.ts",
"../../../packages/platform/types/**/*.d.ts",
"../../../packages/platform/utils/**/*.ts",
"../../../packages/platform/utils/**/*.d.ts"
]
"include": ["./**/*.ts", "../../../packages/types/*.d.ts"]
}
1 change: 1 addition & 0 deletions packages/platform/atoms/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"publish": "rm -rf dist && yarn build && npm publish --access public"
},
"devDependencies": {
"@calcom/platform-libraries": "0.0.2",
"@rollup/plugin-node-resolve": "^15.0.1",
"@types/node": "^20.3.1",
"@types/react": "18.0.26",
Expand Down
1 change: 0 additions & 1 deletion packages/platform/atoms/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"@calcom/dayjs/*": ["../../dayjs/*"],
"@calcom/platform-constants": ["../constants/index.ts"],
"@calcom/platform-types": ["../types/index.ts"],
"@calcom/platform-libraries": ["../libraries/index.ts"],
"@calcom/platform-utils": ["../constants/index.ts"],
"@calcom/trpc": ["../../trpc"],
"@calcom/app-store": ["../../app-store"],
Expand Down
2 changes: 0 additions & 2 deletions packages/platform/atoms/vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ export default defineConfig({
"@calcom/dayjs",
"@calcom/platform-constants",
"@calcom/platform-types",
"@calcom/platform-libraries",
"@calcom/platform-utils",
],
},
Expand Down Expand Up @@ -49,7 +48,6 @@ export default defineConfig({
"@calcom/dayjs": path.resolve(__dirname, "../../dayjs"),
"@calcom/platform-constants": path.resolve(__dirname, "../constants/index.ts"),
"@calcom/platform-types": path.resolve(__dirname, "../types/index.ts"),
"@calcom/platform-libraries": path.resolve(__dirname, "../libraries/index.ts"),
"@calcom/platform-utils": path.resolve(__dirname, "../constants/index.ts"),
"@calcom/web/public/static/locales/en/common.json": path.resolve(
__dirname,
Expand Down
5 changes: 3 additions & 2 deletions packages/platform/libraries/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@
"dist"
],
"scripts": {
"build": "yarn vite build && sed -i'' -e 's/const CACHE = new lruCache\\.LRUCache({ max: 1e3 });/const CACHE = new lruCache({ max: 1e3 });/g' ./dist/index.cjs",
"build:watch": "yarn vite build --watch"
"build": "yarn vite build",
"build:watch": "yarn vite build --watch",
"publish": "rm -rf dist && yarn build && npm publish --access public"
},
"dependencies": {
"@calcom/core": "*",
Expand Down
Loading
Loading