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

Adds tailwindcss as explicit dep #356

Merged
merged 1 commit into from
Jan 23, 2025
Merged

Adds tailwindcss as explicit dep #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion opensaas-sh/app_diff/src/analytics/stats.ts.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@
import { stripe } from '../payment/stripe/stripeClient'
-import { listOrders } from '@lemonsqueezy/lemonsqueezy.js';
import { getDailyPageViews, getSources } from './providers/plausibleAnalyticsUtils';
// import { getDailyPageViews, getSources } from './providers/googleAnalyticsUtils;
-// import { getDailyPageViews, getSources } from './providers/googleAnalyticsUtils';
Copy link
Collaborator Author

@infomiho infomiho Jan 23, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

There were some merge conflicts when I applied the patch, so I've accepted the version that doesn't have the

import { paymentProcessor } from '../payment/paymentProcessor';

import.

-import { paymentProcessor } from '../payment/paymentProcessor';
+// import { getDailyPageViews, getSources } from './providers/googleAnalyticsUtils;

export type DailyStatsProps = { dailyStats?: DailyStats; weeklyStats?: DailyStats[]; isLoading?: boolean };

Expand Down
3 changes: 2 additions & 1 deletion template/app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
"tailwind-merge": "^2.2.1",
"vanilla-cookieconsent": "^3.0.1",
"wasp": "file:.wasp/out/sdk/wasp",
"zod": "^3.23.8"
"zod": "^3.23.8",
"tailwindcss": "^3.2.7"
},
"devDependencies": {
"@types/express": "^4.17.13",
Expand Down
Loading