mirror/formbricks
1
0
Fork 0
mirror of https://github.com/formbricks/formbricks.git synced 2026-01-04 09:29:42 -06:00
Code Issues Packages Projects Releases 116 Wiki Activity

fix: types resolution (#2563)

Browse Source
This commit is contained in:
Anshuman Pandey
2024-05-06 14:07:18 +05:30
committed by GitHub
parent a9a09f3d24
commit bc28936b2a
8 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
apps/demo/pages/app/index.tsx
View File

@@ -2,7 +2,7 @@ import Image from "next/image";
import { useRouter } from "next/router";
import { useEffect, useState } from "react";
import formbricksApp from "@formbricks/js/app";
import formbricks from "@formbricks/js/app";
import { SurveySwitch } from "../../components/SurveySwitch";
import fbsetup from "../../public/fb-setup.png";
@@ -38,7 +38,7 @@ export default function AppPage({}) {
const userId = "THIS-IS-A-VERY-LONG-USER-ID-FOR-TESTING";
const userInitAttributes = { language: "de", "Init Attribute 1": "eight", "Init Attribute 2": "two" };
formbricksApp.init({
formbricks.init({
environmentId: process.env.NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID,
apiHost: process.env.NEXT_PUBLIC_FORMBRICKS_API_HOST,
userId,
@@ -48,7 +48,7 @@ export default function AppPage({}) {
// Connect next.js router to Formbricks
if (process.env.NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID && process.env.NEXT_PUBLIC_FORMBRICKS_API_HOST) {
const handleRouteChange = formbricksApp?.registerRouteChange;
const handleRouteChange = formbricks?.registerRouteChange;
router.events.on("routeChangeComplete", handleRouteChange);
return () => {
@@ -61,7 +61,7 @@ export default function AppPage({}) {
<div className="h-screen bg-white px-12 py-6 dark:bg-slate-800">
<div className="flex flex-col justify-between md:flex-row">
<div className="flex items-center gap-2">
<SurveySwitch value="app" formbricks={formbricksApp} />
<SurveySwitch value="app" formbricks={formbricks} />
<div>
<h1 className="text-2xl font-bold text-slate-900 dark:text-white">
Formbricks In-product Survey Demo App
@@ -126,7 +126,7 @@ export default function AppPage({}) {
<button
className="my-4 rounded-lg bg-slate-500 px-6 py-3 text-white hover:bg-slate-700 dark:bg-slate-700 dark:hover:bg-slate-600"
onClick={() => {
formbricksApp.reset();
formbricks.reset();
}}>
Reset
</button>
@@ -141,7 +141,7 @@ export default function AppPage({}) {
<button
className="mb-4 rounded-lg bg-slate-800 px-6 py-3 text-white hover:bg-slate-700 dark:bg-slate-700 dark:hover:bg-slate-600"
onClick={() => {
formbricksApp.track("Code Action");
formbricks.track("Code Action");
}}>
Code Action
</button>
@@ -185,7 +185,7 @@ export default function AppPage({}) {
<div>
<button
onClick={() => {
formbricksApp.setAttribute("Plan", "Free");
formbricks.setAttribute("Plan", "Free");
}}
className="mb-4 rounded-lg bg-slate-800 px-6 py-3 text-white hover:bg-slate-700 dark:bg-slate-700 dark:hover:bg-slate-600">
Set Plan to &apos;Free&apos;
@@ -208,7 +208,7 @@ export default function AppPage({}) {
<div>
<button
onClick={() => {
formbricksApp.setAttribute("Plan", "Paid");
formbricks.setAttribute("Plan", "Paid");
}}
className="mb-4 rounded-lg bg-slate-800 px-6 py-3 text-white hover:bg-slate-700 dark:bg-slate-700 dark:hover:bg-slate-600">
Set Plan to &apos;Paid&apos;
@@ -231,7 +231,7 @@ export default function AppPage({}) {
<div>
<button
onClick={() => {
formbricksApp.setEmail("test@web.com");
formbricks.setEmail("test@web.com");
}}
className="mb-4 rounded-lg bg-slate-800 px-6 py-3 text-white hover:bg-slate-700 dark:bg-slate-700 dark:hover:bg-slate-600">
Set Email

16
apps/demo/pages/website/index.tsx
View File

@@ -2,7 +2,7 @@ import Image from "next/image";
import { useRouter } from "next/router";
import { useEffect, useState } from "react";
import formbricksWebsite from "@formbricks/js/website";
import formbricks from "@formbricks/js/website";
import { SurveySwitch } from "../../components/SurveySwitch";
import fbsetup from "../../public/fb-setup.png";
@@ -39,7 +39,7 @@ export default function AppPage({}) {
language: "de",
};
formbricksWebsite.init({
formbricks.init({
environmentId: process.env.NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID,
apiHost: process.env.NEXT_PUBLIC_FORMBRICKS_API_HOST,
attributes: defaultAttributes,
@@ -48,7 +48,7 @@ export default function AppPage({}) {
// Connect next.js router to Formbricks
if (process.env.NEXT_PUBLIC_FORMBRICKS_ENVIRONMENT_ID && process.env.NEXT_PUBLIC_FORMBRICKS_API_HOST) {
const handleRouteChange = formbricksWebsite?.registerRouteChange;
const handleRouteChange = formbricks?.registerRouteChange;
router.events.on("routeChangeComplete", handleRouteChange);
return () => {
@@ -61,7 +61,7 @@ export default function AppPage({}) {
<div className="h-screen bg-white px-12 py-6 dark:bg-slate-800">
<div className="flex flex-col items-center justify-between md:flex-row">
<div className="flex items-center gap-2">
<SurveySwitch value="website" formbricks={formbricksWebsite} />
<SurveySwitch value="website" formbricks={formbricks} />
<div>
<h1 className="text-2xl font-bold text-slate-900 dark:text-white">
Formbricks Website Survey Demo App
@@ -126,7 +126,7 @@ export default function AppPage({}) {
<button
className="my-4 rounded-lg bg-slate-500 px-6 py-3 text-white hover:bg-slate-700 dark:bg-slate-700 dark:hover:bg-slate-600"
onClick={() => {
formbricksWebsite.reset();
formbricks.reset();
}}>
Reset
</button>
@@ -141,7 +141,7 @@ export default function AppPage({}) {
<button
className="mb-4 rounded-lg bg-slate-800 px-6 py-3 text-white hover:bg-slate-700 dark:bg-slate-700 dark:hover:bg-slate-600"
onClick={() => {
formbricksWebsite.track("New Session");
formbricks.track("New Session");
}}>
Track New Session
</button>
@@ -159,7 +159,7 @@ export default function AppPage({}) {
<button
className="mb-4 rounded-lg bg-slate-800 px-6 py-3 text-white hover:bg-slate-700 dark:bg-slate-700 dark:hover:bg-slate-600"
onClick={() => {
formbricksWebsite.track("Exit Intent");
formbricks.track("Exit Intent");
}}>
Track Exit Intent
</button>
@@ -177,7 +177,7 @@ export default function AppPage({}) {
<button
className="mb-4 rounded-lg bg-slate-800 px-6 py-3 text-white hover:bg-slate-700 dark:bg-slate-700 dark:hover:bg-slate-600"
onClick={() => {
formbricksWebsite.track("50% Scroll");
formbricks.track("50% Scroll");
}}>
Track 50% Scroll
</button>

2
packages/js-core/app.vite.config.ts
View File

@@ -26,7 +26,7 @@ const config = () => {
plugins: [
dts({
rollupTypes: true,
bundledPackages: ["@formbricks/api"],
bundledPackages: ["@formbricks/api", "@formbricks/types"],
}),
],
});

3
packages/js-core/tsconfig.json
View File

@@ -2,6 +2,9 @@
"extends": "@formbricks/tsconfig/js-library.json",
"include": ["src", "package.json", "../types/surveys.d.ts"],
"compilerOptions": {
"strict": true,
"module": "ESNext",
"moduleResolution": "Bundler",
"allowImportingTsExtensions": true,
"resolveJsonModule": true,
"isolatedModules": true,

2
packages/js-core/website.vite.config.ts
View File

@@ -26,7 +26,7 @@ const config = () => {
plugins: [
dts({
rollupTypes: true,
bundledPackages: ["@formbricks/api"],
bundledPackages: ["@formbricks/api", "@formbricks/types"],
}),
],
});

2
packages/js/tsconfig.json
View File

@@ -2,7 +2,9 @@
"extends": "@formbricks/tsconfig/js-library.json",
"include": ["src", "package.json"],
"compilerOptions": {
"strict": true,
"module": "ESNext",
"moduleResolution": "Bundler",
"declaration": true,
"allowImportingTsExtensions": true,
"resolveJsonModule": true,

13
packages/types/attributes.ts
View File

@@ -1,15 +1,12 @@
import { z } from "zod";
import { ZId } from "./environment";
export const ZAttributes = z.record(z.string());
export type TAttributes = z.infer<typeof ZAttributes>;
export const ZAttributeUpdateInput = z.object({
environmentId: ZId,
environmentId: z.string().cuid2(),
userId: z.string(),
attributes: ZAttributes,
attributes: z.record(z.string()),
});
export type TAttributeUpdateInput = z.infer<typeof ZAttributeUpdateInput>;
export const ZAttributes = z.record(z.string());
export type TAttributes = z.infer<typeof ZAttributes>;

4
packages/types/js.ts
View File

@@ -135,7 +135,7 @@ export const ZJsWebsiteConfigInput = z.object({
environmentId: z.string().cuid(),
apiHost: z.string(),
errorHandler: z.function().args(z.any()).returns(z.void()).optional(),
attributes: ZAttributes.optional(),
attributes: z.record(z.string()).optional(),
});
export type TJsWebsiteConfigInput = z.infer<typeof ZJsWebsiteConfigInput>;
@@ -145,7 +145,7 @@ export const ZJsAppConfigInput = z.object({
apiHost: z.string(),
errorHandler: z.function().args(z.any()).returns(z.void()).optional(),
userId: z.string(),
attributes: ZAttributes.optional(),
attributes: z.record(z.string()).optional(),
});
export type TJsAppConfigInput = z.infer<typeof ZJsAppConfigInput>;