Skip to content

[pull] main from calcom:main #1172

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

Merged
pull merged 2 commits into from
Mar 11, 2026
Merged

[pull] main from calcom:main #1172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c589399
fix(app-store-cli): incorrect type annotation (#28319)
romitg2 Mar 11, 2026
d3dad19
fixup (#28365)
Ryukemeister Mar 11, 2026
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
7 changes: 3 additions & 4 deletions packages/app-store-cli/src/build.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ import { spawnSync } from "node:child_process";
import fs from "node:fs";
import path from "node:path";
import process from "node:process";
import type { AppMeta } from "@calcom/types/App";
import { AppMetaSchema } from "@calcom/types/AppMetaSchema";
import { AppMetaSchema, type AppMetaType } from "@calcom/types/AppMetaSchema";
import chokidar from "chokidar";
// eslint-disable-next-line no-restricted-imports
import { debounce } from "lodash";
Expand Down Expand Up @@ -39,7 +38,7 @@ const getVariableName = (appName: string) => appName.replace(/[-./]/g, "_");
// INFO: Handle stripe separately as it's an old app with different dirName than slug/appId
const getAppId = (app: { name: string }) => (app.name === "stripepayment" ? "stripe" : app.name);

type App = Partial<AppMeta> & {
type App = Partial<AppMetaType> & {
name: string;
path: string;
};
Expand Down Expand Up @@ -82,7 +81,7 @@ function generateFiles() {
for (let i = 0; i < appDirs.length; i++) {
const configPath = path.join(APP_STORE_PATH, appDirs[i].path, "config.json");
const metadataPath = path.join(APP_STORE_PATH, appDirs[i].path, "_metadata.ts");
let app: AppMetaSchema;
let app: Partial<AppMetaType>;

if (fs.existsSync(configPath)) {
try {
Expand Down
2 changes: 1 addition & 1 deletion packages/platform/atoms/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"dev-off": "git checkout -- package.json vite.config.ts"
},
"devDependencies": {
"@calcom/i18n": "workspace:*",
"@rollup/plugin-node-resolve": "15.0.1",
"@tailwindcss/cli": "4.1.16",
"@tailwindcss/postcss": "4.1.15",
Expand Down Expand Up @@ -78,7 +79,6 @@
},
"types": "./dist/index.d.ts",
"dependencies": {
"@calcom/i18n": "workspace:*",
"@radix-ui/react-dialog-atoms": "npm:@radix-ui/react-dialog@1.0.4",
"@radix-ui/react-popover-atoms": "npm:@radix-ui/react-popover@1.0.6",
"@radix-ui/react-slot": "1.1.2",
Expand Down
Loading