From 15f879ebb08ea01b22ee39e09ffacc002cae0ae6 Mon Sep 17 00:00:00 2001 From: Ahmad <103906421+ahmadk953@users.noreply.github.com> Date: Thu, 23 Jan 2025 22:01:17 -0500 Subject: [PATCH 01/10] Change to ioredis and Update Caching --- cache-handler.mjs | 35 ++++----- next.config.ts | 1 + package.json | 2 +- sentry.server.config.ts | 2 +- yarn.lock | 155 +++++++++++++++++++--------------------- 5 files changed, 91 insertions(+), 104 deletions(-) diff --git a/cache-handler.mjs b/cache-handler.mjs index dbb5905..eb3247f 100644 --- a/cache-handler.mjs +++ b/cache-handler.mjs @@ -1,15 +1,16 @@ import { CacheHandler } from '@neshca/cache-handler'; import createLruHandler from '@neshca/cache-handler/local-lru'; import createRedisHandler from '@neshca/cache-handler/redis-stack'; -import { createClient } from 'redis'; +import Redis from 'ioredis'; CacheHandler.onCreation(async () => { + /** @type {import("@neshca/cache-handler").Handler | null} */ + let handler; + let client; try { - client = createClient({ - url: process.env.REDIS_URL, - }); + client = new Redis(`${process.env.REDIS_URL}`); client.on('error', (error) => { if (typeof process.env.NEXT_PRIVATE_DEBUG_CACHE !== 'undefined') { @@ -26,6 +27,11 @@ CacheHandler.onCreation(async () => { await client.connect(); console.info('Redis client connected.'); + + handler = createRedisHandler({ + client, + timeoutMs: 1000, + }); } catch (error) { console.warn('Failed to connect Redis client:', error); @@ -40,25 +46,14 @@ CacheHandler.onCreation(async () => { 'Failed to quit the Redis client after failing to connect.' ); }); + + handler = createLruHandler(); + console.warn( + 'Falling back to LRU handler because Redis client is not available.' + ); } } - /** @type {import("@neshca/cache-handler").Handler | null} */ - let handler; - - if (client?.isReady) { - handler = await createRedisHandler({ - client, - keyPrefix: 'tasko:', - timeoutMs: 1000, - }); - } else { - handler = createLruHandler(); - console.warn( - 'Falling back to LRU handler because Redis client is not available.' - ); - } - return { handlers: [handler], }; diff --git a/next.config.ts b/next.config.ts index 2045ae2..a5779ec 100644 --- a/next.config.ts +++ b/next.config.ts @@ -55,6 +55,7 @@ const nextConfig: NextConfig = { process.env.NODE_ENV === 'production' ? require.resolve('./cache-handler.mjs') : undefined, + cacheMaxMemorySize: process.env.NODE_ENV === 'production' ? 0 : undefined, }; const withMDX = createMDX({}); diff --git a/package.json b/package.json index bcc5648..28bb1f5 100644 --- a/package.json +++ b/package.json @@ -48,6 +48,7 @@ "clsx": "^2.1.1", "date-fns": "^4.1.0", "dompurify": "^3.2.3", + "ioredis": "^5.4.2", "lodash": "^4.17.21", "lucide-react": "^0.473.0", "next": "^15.1.6", @@ -55,7 +56,6 @@ "react": "^19.0.0", "react-day-picker": "^9.5.0", "react-dom": "^19.0.0", - "redis": "^4.7.0", "sharp": "^0.33.5", "sonner": "^1.7.2", "stripe": "^17.4.0", diff --git a/sentry.server.config.ts b/sentry.server.config.ts index f5f46cc..387ec5c 100644 --- a/sentry.server.config.ts +++ b/sentry.server.config.ts @@ -9,7 +9,7 @@ Sentry.init({ integrations: [ Sentry.redisIntegration({ - cachePrefixes: ['tasko:'], + cachePrefixes: [''], }), ], diff --git a/yarn.lock b/yarn.lock index dfdc6eb..f130515 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1554,6 +1554,13 @@ __metadata: languageName: node linkType: hard +"@ioredis/commands@npm:^1.1.1": + version: 1.2.0 + resolution: "@ioredis/commands@npm:1.2.0" + checksum: 10c0/a5d3c29dd84d8a28b7c67a441ac1715cbd7337a7b88649c0f17c345d89aa218578d2b360760017c48149ef8a70f44b051af9ac0921a0622c2b479614c4f65b36 + languageName: node + linkType: hard + "@isaacs/cliui@npm:^8.0.2": version: 8.0.2 resolution: "@isaacs/cliui@npm:8.0.2" @@ -3653,62 +3660,6 @@ __metadata: languageName: node linkType: hard -"@redis/bloom@npm:1.2.0": - version: 1.2.0 - resolution: "@redis/bloom@npm:1.2.0" - peerDependencies: - "@redis/client": ^1.0.0 - checksum: 10c0/7dde8e67188164e96226c8a5c78ebd2801f1662947371e78fb95fb180c1e9ddff8d237012eb5e9182775be61cb546f67f759927cdaee0d178d863ee290e1fb27 - languageName: node - linkType: hard - -"@redis/client@npm:1.6.0": - version: 1.6.0 - resolution: "@redis/client@npm:1.6.0" - dependencies: - cluster-key-slot: "npm:1.1.2" - generic-pool: "npm:3.9.0" - yallist: "npm:4.0.0" - checksum: 10c0/c80a01b4f72d32284515dac6d1aefe0e9c881d08b8db33281f87b51650c1c116b18074a29ca81599d15dccb37b29eef9b26a75a5755150ae27d163e680c34bf6 - languageName: node - linkType: hard - -"@redis/graph@npm:1.1.1": - version: 1.1.1 - resolution: "@redis/graph@npm:1.1.1" - peerDependencies: - "@redis/client": ^1.0.0 - checksum: 10c0/64199db2cb3669c4911af8aba3b7116c4c2c1df37ca74b2a65555e62c863935a0cea74bc41bd92acf2e551074eb2a30c75f54a9f439b40e0f9bb67fc5fb66614 - languageName: node - linkType: hard - -"@redis/json@npm:1.0.7": - version: 1.0.7 - resolution: "@redis/json@npm:1.0.7" - peerDependencies: - "@redis/client": ^1.0.0 - checksum: 10c0/cef473711d66f7568a16edbd728acca7d237cfeaa15e0326b5b628dfab4afc0c76c7354e7f8efad6ecc64a1cb774e4aa060ee46497b633e18ba0a2f0aace1cc4 - languageName: node - linkType: hard - -"@redis/search@npm:1.2.0": - version: 1.2.0 - resolution: "@redis/search@npm:1.2.0" - peerDependencies: - "@redis/client": ^1.0.0 - checksum: 10c0/01d57ac10d2c5698e04e4a2f945440db3087e8834643ca950c099879dbcd77526604ca6f5c2ee883dfd4b337b0a24cb7d81ac56845aa83f89a4f161362a08dc6 - languageName: node - linkType: hard - -"@redis/time-series@npm:1.1.0": - version: 1.1.0 - resolution: "@redis/time-series@npm:1.1.0" - peerDependencies: - "@redis/client": ^1.0.0 - checksum: 10c0/503d0d5cbc9113d26666bb7b4dea57619badbcdfeee0369abf647250f26c5482ed5827c83f88f9f0cf22e021e3e7cb562459669d733fac05652972e208d6ba0f - languageName: node - linkType: hard - "@rollup/plugin-commonjs@npm:28.0.1": version: 28.0.1 resolution: "@rollup/plugin-commonjs@npm:28.0.1" @@ -5771,7 +5722,7 @@ __metadata: languageName: node linkType: hard -"cluster-key-slot@npm:1.1.2": +"cluster-key-slot@npm:1.1.2, cluster-key-slot@npm:^1.1.0": version: 1.1.2 resolution: "cluster-key-slot@npm:1.1.2" checksum: 10c0/d7d39ca28a8786e9e801eeb8c770e3c3236a566625d7299a47bb71113fb2298ce1039596acb82590e598c52dbc9b1f088c8f587803e697cb58e1867a95ff94d3 @@ -6154,6 +6105,13 @@ __metadata: languageName: node linkType: hard +"denque@npm:^2.1.0": + version: 2.1.0 + resolution: "denque@npm:2.1.0" + checksum: 10c0/f9ef81aa0af9c6c614a727cb3bd13c5d7db2af1abf9e6352045b86e85873e629690f6222f4edd49d10e4ccf8f078bbeec0794fafaf61b659c0589d0c511ec363 + languageName: node + linkType: hard + "deprecation@npm:^2.0.0": version: 2.3.1 resolution: "deprecation@npm:2.3.1" @@ -7526,13 +7484,6 @@ __metadata: languageName: node linkType: hard -"generic-pool@npm:3.9.0": - version: 3.9.0 - resolution: "generic-pool@npm:3.9.0" - checksum: 10c0/6b314d0d71170d5cbaf7162c423f53f8d6556b2135626a65bcdc03c089840b0a2f59eeb2d907939b8200e945eaf71ceb6630426f22d2128a1d242aec4b232aa7 - languageName: node - linkType: hard - "gensync@npm:^1.0.0-beta.2": version: 1.0.0-beta.2 resolution: "gensync@npm:1.0.0-beta.2" @@ -8057,6 +8008,23 @@ __metadata: languageName: node linkType: hard +"ioredis@npm:^5.4.2": + version: 5.4.2 + resolution: "ioredis@npm:5.4.2" + dependencies: + "@ioredis/commands": "npm:^1.1.1" + cluster-key-slot: "npm:^1.1.0" + debug: "npm:^4.3.4" + denque: "npm:^2.1.0" + lodash.defaults: "npm:^4.2.0" + lodash.isarguments: "npm:^3.1.0" + redis-errors: "npm:^1.2.0" + redis-parser: "npm:^3.0.0" + standard-as-callback: "npm:^2.1.0" + checksum: 10c0/e59d2cceb43ed74b487d7b50fa91b93246e734e5d4835c7e62f64e44da072f12ab43b044248012e6f8b76c61a7c091a2388caad50e8ad69a8ce5515a730b23b8 + languageName: node + linkType: hard + "ip-address@npm:^9.0.5": version: 9.0.5 resolution: "ip-address@npm:9.0.5" @@ -9281,6 +9249,20 @@ __metadata: languageName: node linkType: hard +"lodash.defaults@npm:^4.2.0": + version: 4.2.0 + resolution: "lodash.defaults@npm:4.2.0" + checksum: 10c0/d5b77aeb702caa69b17be1358faece33a84497bcca814897383c58b28a2f8dfc381b1d9edbec239f8b425126a3bbe4916223da2a576bb0411c2cefd67df80707 + languageName: node + linkType: hard + +"lodash.isarguments@npm:^3.1.0": + version: 3.1.0 + resolution: "lodash.isarguments@npm:3.1.0" + checksum: 10c0/5e8f95ba10975900a3920fb039a3f89a5a79359a1b5565e4e5b4310ed6ebe64011e31d402e34f577eca983a1fc01ff86c926e3cbe602e1ddfc858fdd353e62d8 + languageName: node + linkType: hard + "lodash.isplainobject@npm:^4.0.6": version: 4.0.6 resolution: "lodash.isplainobject@npm:4.0.6" @@ -11425,17 +11407,19 @@ __metadata: languageName: node linkType: hard -"redis@npm:^4.7.0": - version: 4.7.0 - resolution: "redis@npm:4.7.0" +"redis-errors@npm:^1.0.0, redis-errors@npm:^1.2.0": + version: 1.2.0 + resolution: "redis-errors@npm:1.2.0" + checksum: 10c0/5b316736e9f532d91a35bff631335137a4f974927bb2fb42bf8c2f18879173a211787db8ac4c3fde8f75ed6233eb0888e55d52510b5620e30d69d7d719c8b8a7 + languageName: node + linkType: hard + +"redis-parser@npm:^3.0.0": + version: 3.0.0 + resolution: "redis-parser@npm:3.0.0" dependencies: - "@redis/bloom": "npm:1.2.0" - "@redis/client": "npm:1.6.0" - "@redis/graph": "npm:1.1.1" - "@redis/json": "npm:1.0.7" - "@redis/search": "npm:1.2.0" - "@redis/time-series": "npm:1.1.0" - checksum: 10c0/a05632a58adbcaa4566238073cd6d00ed008522d2ef015a31aaef200c184a4eff4fa007c514eda91dda1e1205350b5901d0c7b58824dbfa593feb81a0087bf4d + redis-errors: "npm:^1.0.0" + checksum: 10c0/ee16ac4c7b2a60b1f42a2cdaee22b005bd4453eb2d0588b8a4939718997ae269da717434da5d570fe0b05030466eeb3f902a58cf2e8e1ca058bf6c9c596f632f languageName: node linkType: hard @@ -12221,6 +12205,13 @@ __metadata: languageName: node linkType: hard +"standard-as-callback@npm:^2.1.0": + version: 2.1.0 + resolution: "standard-as-callback@npm:2.1.0" + checksum: 10c0/012677236e3d3fdc5689d29e64ea8a599331c4babe86956bf92fc5e127d53f85411c5536ee0079c52c43beb0026b5ce7aa1d834dd35dd026e82a15d1bcaead1f + languageName: node + linkType: hard + "std-env@npm:^3.7.0": version: 3.8.0 resolution: "std-env@npm:3.8.0" @@ -12662,6 +12653,7 @@ __metadata: eslint-config-prettier: "npm:^10.0.1" eslint-plugin-react-compiler: "npm:^19.0.0-beta-55955c9-20241229" fluid-tailwind: "npm:^1.0.4" + ioredis: "npm:^5.4.2" jest: "npm:^29.7.0" jest-environment-jsdom: "npm:^29.7.0" jest-junit: "npm:^16.0.0" @@ -12676,7 +12668,6 @@ __metadata: react: "npm:^19.0.0" react-day-picker: "npm:^9.5.0" react-dom: "npm:^19.0.0" - redis: "npm:^4.7.0" sharp: "npm:^0.33.5" sonner: "npm:^1.7.2" stripe: "npm:^17.4.0" @@ -13630,13 +13621,6 @@ __metadata: languageName: node linkType: hard -"yallist@npm:4.0.0, yallist@npm:^4.0.0": - version: 4.0.0 - resolution: "yallist@npm:4.0.0" - checksum: 10c0/2286b5e8dbfe22204ab66e2ef5cc9bbb1e55dfc873bbe0d568aa943eb255d131890dfd5bf243637273d31119b870f49c18fcde2c6ffbb7a7a092b870dc90625a - languageName: node - linkType: hard - "yallist@npm:^3.0.2": version: 3.1.1 resolution: "yallist@npm:3.1.1" @@ -13644,6 +13628,13 @@ __metadata: languageName: node linkType: hard +"yallist@npm:^4.0.0": + version: 4.0.0 + resolution: "yallist@npm:4.0.0" + checksum: 10c0/2286b5e8dbfe22204ab66e2ef5cc9bbb1e55dfc873bbe0d568aa943eb255d131890dfd5bf243637273d31119b870f49c18fcde2c6ffbb7a7a092b870dc90625a + languageName: node + linkType: hard + "yallist@npm:^5.0.0": version: 5.0.0 resolution: "yallist@npm:5.0.0" From 5ef2a3c67fa7fd636a750ac71661e18a7caeebfb Mon Sep 17 00:00:00 2001 From: Ahmad <103906421+ahmadk953@users.noreply.github.com> Date: Sat, 25 Jan 2025 23:05:01 -0500 Subject: [PATCH 02/10] Switch to Custom Cache Handler --- cache-handler.mjs | 85 +++++++++++++++++----------------------------- instrumentation.ts | 8 ----- package.json | 1 - yarn.lock | 18 ++-------- 4 files changed, 34 insertions(+), 78 deletions(-) diff --git a/cache-handler.mjs b/cache-handler.mjs index eb3247f..574309e 100644 --- a/cache-handler.mjs +++ b/cache-handler.mjs @@ -1,62 +1,41 @@ -import { CacheHandler } from '@neshca/cache-handler'; -import createLruHandler from '@neshca/cache-handler/local-lru'; -import createRedisHandler from '@neshca/cache-handler/redis-stack'; -import Redis from 'ioredis'; +import Redis from 'ioredis' -CacheHandler.onCreation(async () => { - /** @type {import("@neshca/cache-handler").Handler | null} */ - let handler; +const redis = new Redis(`${process.env.REDIS_URL}`) - let client; - - try { - client = new Redis(`${process.env.REDIS_URL}`); - - client.on('error', (error) => { - if (typeof process.env.NEXT_PRIVATE_DEBUG_CACHE !== 'undefined') { - console.error('Redis client error:', error); - } - }); - } catch (error) { - console.warn('Failed to create Redis client:', error); +export default class CacheHandler { + constructor(options) { + this.options = options } - if (client) { - try { - console.info('Connecting Redis client...'); + async get(key) { + const data = await redis.get(key) + return data ? JSON.parse(data) : null + } - await client.connect(); - console.info('Redis client connected.'); + async set(key, data, ctx) { + const cacheData = { + value: data, + lastModified: Date.now(), + tags: ctx.tags, + } + await redis.set(key, JSON.stringify(cacheData)) + } - handler = createRedisHandler({ - client, - timeoutMs: 1000, - }); - } catch (error) { - console.warn('Failed to connect Redis client:', error); - - console.warn('Disconnecting the Redis client...'); - client - .disconnect() - .then(() => { - console.info('Redis client disconnected.'); - }) - .catch(() => { - console.warn( - 'Failed to quit the Redis client after failing to connect.' - ); - }); - - handler = createLruHandler(); - console.warn( - 'Falling back to LRU handler because Redis client is not available.' - ); + async revalidateTag(tags) { + tags = [tags].flat() + const keys = await redis.keys('*') + for (const key of keys) { + const value = await redis.get(key) + if (value) { + const parsed = JSON.parse(value) + if (parsed.tags.some(tag => tags.includes(tag))) { + await redis.del(key) + } + } } } - return { - handlers: [handler], - }; -}); - -export default CacheHandler; + resetRequestCache() { + // Implement request-specific cache reset if needed + } +} \ No newline at end of file diff --git a/instrumentation.ts b/instrumentation.ts index dab2871..964f937 100644 --- a/instrumentation.ts +++ b/instrumentation.ts @@ -3,14 +3,6 @@ import * as Sentry from '@sentry/nextjs'; export async function register() { if (process.env.NEXT_RUNTIME === 'nodejs') { await import('./sentry.server.config'); - - const { registerInitialCache } = await import( - '@neshca/cache-handler/instrumentation' - ); - - const CacheHandler = (await import('./cache-handler.mjs')).default; - - await registerInitialCache(CacheHandler); } if (process.env.NEXT_RUNTIME === 'edge') { diff --git a/package.json b/package.json index 178f1ac..4daed9c 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,6 @@ "@liveblocks/react": "^2.16.1", "@mdx-js/loader": "^3.1.0", "@mdx-js/react": "^3.1.0", - "@neshca/cache-handler": "^1.9.0", "@next/mdx": "^15.1.6", "@prisma/client": "^6.2.1", "@prisma/extension-accelerate": "^1.2.1", diff --git a/yarn.lock b/yarn.lock index 5cce0c5..7b2e28d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2012,19 +2012,6 @@ __metadata: languageName: node linkType: hard -"@neshca/cache-handler@npm:^1.9.0": - version: 1.9.0 - resolution: "@neshca/cache-handler@npm:1.9.0" - dependencies: - cluster-key-slot: "npm:1.1.2" - lru-cache: "npm:10.4.3" - peerDependencies: - next: ">= 13.5.1 < 15" - redis: ">= 4.6" - checksum: 10c0/883360e0979181448c8a81886d69e3460d3ea60283ceaaf1941a8bc8255cb1dedf5ba448951cf0cabf9969381a4481777d3c408cd7a5537e7e4d0c13f89544a4 - languageName: node - linkType: hard - "@next/env@npm:15.1.6": version: 15.1.6 resolution: "@next/env@npm:15.1.6" @@ -5722,7 +5709,7 @@ __metadata: languageName: node linkType: hard -"cluster-key-slot@npm:1.1.2, cluster-key-slot@npm:^1.1.0": +"cluster-key-slot@npm:^1.1.0": version: 1.1.2 resolution: "cluster-key-slot@npm:1.1.2" checksum: 10c0/d7d39ca28a8786e9e801eeb8c770e3c3236a566625d7299a47bb71113fb2298ce1039596acb82590e598c52dbc9b1f088c8f587803e697cb58e1867a95ff94d3 @@ -9311,7 +9298,7 @@ __metadata: languageName: node linkType: hard -"lru-cache@npm:10.4.3, lru-cache@npm:^10.0.1, lru-cache@npm:^10.2.0": +"lru-cache@npm:^10.0.1, lru-cache@npm:^10.2.0": version: 10.4.3 resolution: "lru-cache@npm:10.4.3" checksum: 10c0/ebd04fbca961e6c1d6c0af3799adcc966a1babe798f685bb84e6599266599cd95d94630b10262f5424539bc4640107e8a33aa28585374abf561d30d16f4b39fb @@ -12609,7 +12596,6 @@ __metadata: "@mdx-js/loader": "npm:^3.1.0" "@mdx-js/react": "npm:^3.1.0" "@microsoft/eslint-formatter-sarif": "npm:^3.1.0" - "@neshca/cache-handler": "npm:^1.9.0" "@next/eslint-plugin-next": "npm:15.1.6" "@next/mdx": "npm:^15.1.6" "@prisma/client": "npm:^6.2.1" From 20055c396123c28f5527194c7557348ac3a0d0fa Mon Sep 17 00:00:00 2001 From: Ahmad <103906421+ahmadk953@users.noreply.github.com> Date: Sat, 25 Jan 2025 23:55:00 -0500 Subject: [PATCH 03/10] Added Error Handling to Cache --- cache-handler.mjs | 53 ++++++++++++++++++++++++++++------------------- lib/redis.ts | 13 ++++++++++++ 2 files changed, 45 insertions(+), 21 deletions(-) create mode 100644 lib/redis.ts diff --git a/cache-handler.mjs b/cache-handler.mjs index 574309e..d024d1c 100644 --- a/cache-handler.mjs +++ b/cache-handler.mjs @@ -1,41 +1,52 @@ -import Redis from 'ioredis' - -const redis = new Redis(`${process.env.REDIS_URL}`) +import { redis } from '@/lib/redis'; export default class CacheHandler { constructor(options) { - this.options = options + this.options = options; } async get(key) { - const data = await redis.get(key) - return data ? JSON.parse(data) : null + try { + const data = await redis.get(key); + return data ? JSON.parse(data) : null; + } catch (error) { + console.error('Cache Get Error:', error); + return null; + } } async set(key, data, ctx) { - const cacheData = { - value: data, - lastModified: Date.now(), - tags: ctx.tags, + try { + const cacheData = { + value: data, + lastModified: Date.now(), + tags: ctx.tags, + }; + await redis.set(key, JSON.stringify(cacheData)); + } catch (error) { + console.error('Cache Set Error:', error); } - await redis.set(key, JSON.stringify(cacheData)) } async revalidateTag(tags) { - tags = [tags].flat() - const keys = await redis.keys('*') - for (const key of keys) { - const value = await redis.get(key) - if (value) { - const parsed = JSON.parse(value) - if (parsed.tags.some(tag => tags.includes(tag))) { - await redis.del(key) + try { + tags = [tags].flat(); + const keys = await redis.keys('*'); + for (const key of keys) { + const value = await redis.get(key); + if (value) { + const parsed = JSON.parse(value); + if (parsed.tags.some((tag) => tags.includes(tag))) { + await redis.del(key); + } } } + } catch (error) { + console.error('Cache RevalidateTag Error:', error); } } resetRequestCache() { - // Implement request-specific cache reset if needed + // TODO: Implement request-specific cache reset if needed } -} \ No newline at end of file +} diff --git a/lib/redis.ts b/lib/redis.ts new file mode 100644 index 0000000..bc0e1fe --- /dev/null +++ b/lib/redis.ts @@ -0,0 +1,13 @@ +import Redis from 'ioredis'; + +let redis; + +if (!redis) { + redis = new Redis(process.env.REDIS_URL); + + redis.on('error', (err) => { + console.error('Redis Client Error:', err); + }); +} + +export default redis; From e0be79f5fd776d3da2d73d97045f425803096359 Mon Sep 17 00:00:00 2001 From: Ahmad <103906421+ahmadk953@users.noreply.github.com> Date: Sun, 26 Jan 2025 00:05:50 -0500 Subject: [PATCH 04/10] Updated Types for Redis and Fixed Compile Errors --- lib/redis.ts | 2 +- package.json | 1 + yarn.lock | 12 +++++++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/redis.ts b/lib/redis.ts index bc0e1fe..6076321 100644 --- a/lib/redis.ts +++ b/lib/redis.ts @@ -3,7 +3,7 @@ import Redis from 'ioredis'; let redis; if (!redis) { - redis = new Redis(process.env.REDIS_URL); + redis = new Redis(process.env.REDIS_URL!); redis.on('error', (err) => { console.error('Redis Client Error:', err); diff --git a/package.json b/package.json index 4daed9c..91e65fa 100644 --- a/package.json +++ b/package.json @@ -81,6 +81,7 @@ "@testing-library/react": "^16.2.0", "@types/compression": "^1.7.5", "@types/dompurify": "^3", + "@types/ioredis": "^5.0.0", "@types/jest": "^29.5.14", "@types/lodash": "^4.17.14", "@types/mdx": "^2.0.13", diff --git a/yarn.lock b/yarn.lock index 7b2e28d..9ab9b3c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4325,6 +4325,15 @@ __metadata: languageName: node linkType: hard +"@types/ioredis@npm:^5.0.0": + version: 5.0.0 + resolution: "@types/ioredis@npm:5.0.0" + dependencies: + ioredis: "npm:*" + checksum: 10c0/e52ce4239f0334701fc95fb5aaf1753d75f7582099fdf152743192f49d9ee4a88478b339d015e50cb5e111e38925846cf20668355f4046af7855021d2be181f0 + languageName: node + linkType: hard + "@types/istanbul-lib-coverage@npm:*, @types/istanbul-lib-coverage@npm:^2.0.0, @types/istanbul-lib-coverage@npm:^2.0.1": version: 2.0.6 resolution: "@types/istanbul-lib-coverage@npm:2.0.6" @@ -7995,7 +8004,7 @@ __metadata: languageName: node linkType: hard -"ioredis@npm:^5.4.2": +"ioredis@npm:*, ioredis@npm:^5.4.2": version: 5.4.2 resolution: "ioredis@npm:5.4.2" dependencies: @@ -12618,6 +12627,7 @@ __metadata: "@testing-library/react": "npm:^16.2.0" "@types/compression": "npm:^1.7.5" "@types/dompurify": "npm:^3" + "@types/ioredis": "npm:^5.0.0" "@types/jest": "npm:^29.5.14" "@types/lodash": "npm:^4.17.14" "@types/mdx": "npm:^2.0.13" From e9b6d285917ab0b104cd7cedd6bafb6b355ba8ce Mon Sep 17 00:00:00 2001 From: Ahmad <103906421+ahmadk953@users.noreply.github.com> Date: Sun, 26 Jan 2025 00:11:30 -0500 Subject: [PATCH 05/10] Updated Types and Fixed Imports --- cache-handler.mjs | 2 +- lib/redis.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cache-handler.mjs b/cache-handler.mjs index d024d1c..a6debc3 100644 --- a/cache-handler.mjs +++ b/cache-handler.mjs @@ -1,4 +1,4 @@ -import { redis } from '@/lib/redis'; +import redis from './lib/redis' export default class CacheHandler { constructor(options) { diff --git a/lib/redis.ts b/lib/redis.ts index 6076321..a91fa6a 100644 --- a/lib/redis.ts +++ b/lib/redis.ts @@ -1,6 +1,6 @@ import Redis from 'ioredis'; -let redis; +let redis: Redis | null = null; if (!redis) { redis = new Redis(process.env.REDIS_URL!); From e55fe00bad6f06554cdd13df7d3402f9a8f20452 Mon Sep 17 00:00:00 2001 From: Ahmad <103906421+ahmadk953@users.noreply.github.com> Date: Sun, 26 Jan 2025 15:44:15 -0500 Subject: [PATCH 06/10] Fixed Cache Handler --- cache-handler.mjs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/cache-handler.mjs b/cache-handler.mjs index a6debc3..76b1b07 100644 --- a/cache-handler.mjs +++ b/cache-handler.mjs @@ -1,4 +1,4 @@ -import redis from './lib/redis' +import redis from './lib/redis.ts'; export default class CacheHandler { constructor(options) { @@ -20,7 +20,7 @@ export default class CacheHandler { const cacheData = { value: data, lastModified: Date.now(), - tags: ctx.tags, + tags: ctx.tags || [], }; await redis.set(key, JSON.stringify(cacheData)); } catch (error) { @@ -34,9 +34,12 @@ export default class CacheHandler { const keys = await redis.keys('*'); for (const key of keys) { const value = await redis.get(key); - if (value) { + if (value && tags.length > 0) { const parsed = JSON.parse(value); - if (parsed.tags.some((tag) => tags.includes(tag))) { + if ( + Array.isArray(parsed.tags) && + parsed.tags.some((tag) => tags.includes(tag)) + ) { await redis.del(key); } } From 4e1528d63f6198fe0d69a9952820b1cd9e394716 Mon Sep 17 00:00:00 2001 From: Ahmad <103906421+ahmadk953@users.noreply.github.com> Date: Sun, 26 Jan 2025 15:49:23 -0500 Subject: [PATCH 07/10] Fix Compile Issues --- cache-handler.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cache-handler.mjs b/cache-handler.mjs index 76b1b07..b08a544 100644 --- a/cache-handler.mjs +++ b/cache-handler.mjs @@ -1,4 +1,4 @@ -import redis from './lib/redis.ts'; +import redis from './lib/redis'; export default class CacheHandler { constructor(options) { From 80d0f53c70b73fc98a66794ea1f53e54423eef42 Mon Sep 17 00:00:00 2001 From: Ahmad <103906421+ahmadk953@users.noreply.github.com> Date: Sun, 26 Jan 2025 15:54:53 -0500 Subject: [PATCH 08/10] Fix Compile Issues --- cache-handler.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cache-handler.mjs b/cache-handler.mjs index b08a544..9e93ca1 100644 --- a/cache-handler.mjs +++ b/cache-handler.mjs @@ -1,4 +1,4 @@ -import redis from './lib/redis'; +import redis from './lib/redis.js'; export default class CacheHandler { constructor(options) { From 5b578ff9b5f4585daf1df9936252f8609daa61a3 Mon Sep 17 00:00:00 2001 From: Ahmad <103906421+ahmadk953@users.noreply.github.com> Date: Sun, 26 Jan 2025 16:13:41 -0500 Subject: [PATCH 09/10] Fix Compile Issues (once and for all) --- cache-handler.mjs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/cache-handler.mjs b/cache-handler.mjs index 9e93ca1..b1958d3 100644 --- a/cache-handler.mjs +++ b/cache-handler.mjs @@ -1,4 +1,14 @@ -import redis from './lib/redis.js'; +import Redis from 'ioredis'; + +let redis; + +if (!redis) { + redis = new Redis(process.env.REDIS_URL); + + redis.on('error', (err) => { + console.error('Redis Client Error:', err); + }); +} export default class CacheHandler { constructor(options) { From a021efce67182555303ddaeedac782fb974392a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 26 Jan 2025 23:38:15 +0000 Subject: [PATCH 10/10] Bump tailwindcss from 3.4.17 to 4.0.0 Bumps [tailwindcss](https://github.com/tailwindlabs/tailwindcss/tree/HEAD/packages/tailwindcss) from 3.4.17 to 4.0.0. - [Release notes](https://github.com/tailwindlabs/tailwindcss/releases) - [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/next/CHANGELOG.md) - [Commits](https://github.com/tailwindlabs/tailwindcss/commits/v4.0.0/packages/tailwindcss) --- updated-dependencies: - dependency-name: tailwindcss dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 270 +++------------------------------------------------ 2 files changed, 15 insertions(+), 257 deletions(-) diff --git a/package.json b/package.json index 91e65fa..52a5ee8 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ "prettier": "^3.4.2", "prettier-plugin-tailwindcss": "^0.6.11", "prisma": "^6.2.1", - "tailwindcss": "^3.4.16", + "tailwindcss": "^4.0.0", "ts-node": "^10.9.2", "typescript": "^5.7.3" }, diff --git a/yarn.lock b/yarn.lock index 9ab9b3c..fcaf2bc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -60,13 +60,6 @@ __metadata: languageName: node linkType: hard -"@alloc/quick-lru@npm:^5.2.0": - version: 5.2.0 - resolution: "@alloc/quick-lru@npm:5.2.0" - checksum: 10c0/7b878c48b9d25277d0e1a9b8b2f2312a314af806b4129dc902f2bc29ab09b58236e53964689feec187b28c80d2203aff03829754773a707a8a5987f1b7682d92 - languageName: node - linkType: hard - "@ampproject/remapping@npm:^2.2.0": version: 2.3.0 resolution: "@ampproject/remapping@npm:2.3.0" @@ -1834,7 +1827,7 @@ __metadata: languageName: node linkType: hard -"@jridgewell/gen-mapping@npm:^0.3.2, @jridgewell/gen-mapping@npm:^0.3.5": +"@jridgewell/gen-mapping@npm:^0.3.5": version: 0.3.8 resolution: "@jridgewell/gen-mapping@npm:0.3.8" dependencies: @@ -5052,13 +5045,6 @@ __metadata: languageName: node linkType: hard -"any-promise@npm:^1.0.0": - version: 1.3.0 - resolution: "any-promise@npm:1.3.0" - checksum: 10c0/60f0298ed34c74fef50daab88e8dab786036ed5a7fad02e012ab57e376e0a0b4b29e83b95ea9b5e7d89df762f5f25119b83e00706ecaccb22cfbacee98d74889 - languageName: node - linkType: hard - "anymatch@npm:^3.0.3, anymatch@npm:~3.1.2": version: 3.1.3 resolution: "anymatch@npm:3.1.3" @@ -5089,13 +5075,6 @@ __metadata: languageName: node linkType: hard -"arg@npm:^5.0.2": - version: 5.0.2 - resolution: "arg@npm:5.0.2" - checksum: 10c0/ccaf86f4e05d342af6666c569f844bec426595c567d32a8289715087825c2ca7edd8a3d204e4d2fb2aa4602e09a57d0c13ea8c9eea75aac3dbb4af5514e6800e - languageName: node - linkType: hard - "argparse@npm:^1.0.7": version: 1.0.10 resolution: "argparse@npm:1.0.10" @@ -5547,13 +5526,6 @@ __metadata: languageName: node linkType: hard -"camelcase-css@npm:^2.0.1": - version: 2.0.1 - resolution: "camelcase-css@npm:2.0.1" - checksum: 10c0/1a1a3137e8a781e6cbeaeab75634c60ffd8e27850de410c162cce222ea331cd1ba5364e8fb21c95e5ca76f52ac34b81a090925ca00a87221355746d049c6e273 - languageName: node - linkType: hard - "camelcase@npm:^5.3.1": version: 5.3.1 resolution: "camelcase@npm:5.3.1" @@ -5644,7 +5616,7 @@ __metadata: languageName: node linkType: hard -"chokidar@npm:^3.5.3, chokidar@npm:^3.6.0": +"chokidar@npm:^3.5.3": version: 3.6.0 resolution: "chokidar@npm:3.6.0" dependencies: @@ -5798,13 +5770,6 @@ __metadata: languageName: node linkType: hard -"commander@npm:^4.0.0": - version: 4.1.1 - resolution: "commander@npm:4.1.1" - checksum: 10c0/84a76c08fe6cc08c9c93f62ac573d2907d8e79138999312c92d4155bc2325d487d64d13f669b2000c9f8caf70493c1be2dac74fec3c51d5a04f8bc3ae1830bab - languageName: node - linkType: hard - "commondir@npm:^1.0.1": version: 1.0.1 resolution: "commondir@npm:1.0.1" @@ -6161,13 +6126,6 @@ __metadata: languageName: node linkType: hard -"didyoumean@npm:^1.2.2": - version: 1.2.2 - resolution: "didyoumean@npm:1.2.2" - checksum: 10c0/95d0b53d23b851aacff56dfadb7ecfedce49da4232233baecfeecb7710248c4aa03f0aa8995062f0acafaf925adf8536bd7044a2e68316fd7d411477599bc27b - languageName: node - linkType: hard - "diff-sequences@npm:^29.6.3": version: 29.6.3 resolution: "diff-sequences@npm:29.6.3" @@ -6182,13 +6140,6 @@ __metadata: languageName: node linkType: hard -"dlv@npm:^1.1.3": - version: 1.1.3 - resolution: "dlv@npm:1.1.3" - checksum: 10c0/03eb4e769f19a027fd5b43b59e8a05e3fd2100ac239ebb0bf9a745de35d449e2f25cfaf3aa3934664551d72856f4ae8b7822016ce5c42c2d27c18ae79429ec42 - languageName: node - linkType: hard - "doctrine@npm:^2.1.0": version: 2.1.0 resolution: "doctrine@npm:2.1.0" @@ -8968,15 +8919,6 @@ __metadata: languageName: node linkType: hard -"jiti@npm:^1.21.6": - version: 1.21.7 - resolution: "jiti@npm:1.21.7" - bin: - jiti: bin/jiti.js - checksum: 10c0/77b61989c758ff32407cdae8ddc77f85e18e1a13fc4977110dbd2e05fc761842f5f71bce684d9a01316e1c4263971315a111385759951080bbfe17cbb5de8f7a - languageName: node - linkType: hard - "js-cookie@npm:3.0.5": version: 3.0.5 resolution: "js-cookie@npm:3.0.5" @@ -9192,13 +9134,6 @@ __metadata: languageName: node linkType: hard -"lilconfig@npm:^3.0.0, lilconfig@npm:^3.1.3": - version: 3.1.3 - resolution: "lilconfig@npm:3.1.3" - checksum: 10c0/f5604e7240c5c275743561442fbc5abf2a84ad94da0f5adc71d25e31fa8483048de3dcedcb7a44112a942fed305fd75841cdf6c9681c7f640c63f1049e9a5dcc - languageName: node - linkType: hard - "lines-and-columns@npm:^1.1.6": version: 1.2.4 resolution: "lines-and-columns@npm:1.2.4" @@ -10167,18 +10102,7 @@ __metadata: languageName: node linkType: hard -"mz@npm:^2.7.0": - version: 2.7.0 - resolution: "mz@npm:2.7.0" - dependencies: - any-promise: "npm:^1.0.0" - object-assign: "npm:^4.0.1" - thenify-all: "npm:^1.0.0" - checksum: 10c0/103114e93f87362f0b56ab5b2e7245051ad0276b646e3902c98397d18bb8f4a77f2ea4a2c9d3ad516034ea3a56553b60d3f5f78220001ca4c404bd711bd0af39 - languageName: node - linkType: hard - -"nanoid@npm:^3.3.6, nanoid@npm:^3.3.7, nanoid@npm:^3.3.8": +"nanoid@npm:^3.3.6, nanoid@npm:^3.3.8": version: 3.3.8 resolution: "nanoid@npm:3.3.8" bin: @@ -10380,20 +10304,13 @@ __metadata: languageName: node linkType: hard -"object-assign@npm:^4.0.1, object-assign@npm:^4.1.1": +"object-assign@npm:^4.1.1": version: 4.1.1 resolution: "object-assign@npm:4.1.1" checksum: 10c0/1f4df9945120325d041ccf7b86f31e8bcc14e73d29171e37a7903050e96b81323784ec59f93f102ec635bcf6fa8034ba3ea0a8c7e69fa202b87ae3b6cec5a414 languageName: node linkType: hard -"object-hash@npm:^3.0.0": - version: 3.0.0 - resolution: "object-hash@npm:3.0.0" - checksum: 10c0/a06844537107b960c1c8b96cd2ac8592a265186bfa0f6ccafe0d34eabdb526f6fa81da1f37c43df7ed13b12a4ae3457a16071603bcd39d8beddb5f08c37b0f47 - languageName: node - linkType: hard - "object-inspect@npm:^1.13.3": version: 1.13.3 resolution: "object-inspect@npm:1.13.3" @@ -10737,14 +10654,7 @@ __metadata: languageName: node linkType: hard -"pify@npm:^2.3.0": - version: 2.3.0 - resolution: "pify@npm:2.3.0" - checksum: 10c0/551ff8ab830b1052633f59cb8adc9ae8407a436e06b4a9718bcb27dc5844b83d535c3a8512b388b6062af65a98c49bdc0dd523d8b2617b188f7c8fee457158dc - languageName: node - linkType: hard - -"pirates@npm:^4.0.1, pirates@npm:^4.0.4": +"pirates@npm:^4.0.4": version: 4.0.6 resolution: "pirates@npm:4.0.6" checksum: 10c0/00d5fa51f8dded94d7429700fb91a0c1ead00ae2c7fd27089f0c5b63e6eca36197fe46384631872690a66f390c5e27198e99006ab77ae472692ab9c2ca903f36 @@ -10774,59 +10684,6 @@ __metadata: languageName: node linkType: hard -"postcss-import@npm:^15.1.0": - version: 15.1.0 - resolution: "postcss-import@npm:15.1.0" - dependencies: - postcss-value-parser: "npm:^4.0.0" - read-cache: "npm:^1.0.0" - resolve: "npm:^1.1.7" - peerDependencies: - postcss: ^8.0.0 - checksum: 10c0/518aee5c83ea6940e890b0be675a2588db68b2582319f48c3b4e06535a50ea6ee45f7e63e4309f8754473245c47a0372632378d1d73d901310f295a92f26f17b - languageName: node - linkType: hard - -"postcss-js@npm:^4.0.1": - version: 4.0.1 - resolution: "postcss-js@npm:4.0.1" - dependencies: - camelcase-css: "npm:^2.0.1" - peerDependencies: - postcss: ^8.4.21 - checksum: 10c0/af35d55cb873b0797d3b42529514f5318f447b134541844285c9ac31a17497297eb72296902967911bb737a75163441695737300ce2794e3bd8c70c13a3b106e - languageName: node - linkType: hard - -"postcss-load-config@npm:^4.0.2": - version: 4.0.2 - resolution: "postcss-load-config@npm:4.0.2" - dependencies: - lilconfig: "npm:^3.0.0" - yaml: "npm:^2.3.4" - peerDependencies: - postcss: ">=8.0.9" - ts-node: ">=9.0.0" - peerDependenciesMeta: - postcss: - optional: true - ts-node: - optional: true - checksum: 10c0/3d7939acb3570b0e4b4740e483d6e555a3e2de815219cb8a3c8fc03f575a6bde667443aa93369c0be390af845cb84471bf623e24af833260de3a105b78d42519 - languageName: node - linkType: hard - -"postcss-nested@npm:^6.2.0": - version: 6.2.0 - resolution: "postcss-nested@npm:6.2.0" - dependencies: - postcss-selector-parser: "npm:^6.1.1" - peerDependencies: - postcss: ^8.2.14 - checksum: 10c0/7f9c3f2d764191a39364cbdcec350f26a312431a569c9ef17408021424726b0d67995ff5288405e3724bb7152a4c92f73c027e580ec91e798800ed3c52e2bc6e - languageName: node - linkType: hard - "postcss-selector-parser@npm:6.0.10": version: 6.0.10 resolution: "postcss-selector-parser@npm:6.0.10" @@ -10837,17 +10694,7 @@ __metadata: languageName: node linkType: hard -"postcss-selector-parser@npm:^6.1.1, postcss-selector-parser@npm:^6.1.2": - version: 6.1.2 - resolution: "postcss-selector-parser@npm:6.1.2" - dependencies: - cssesc: "npm:^3.0.0" - util-deprecate: "npm:^1.0.2" - checksum: 10c0/523196a6bd8cf660bdf537ad95abd79e546d54180f9afb165a4ab3e651ac705d0f8b8ce6b3164fb9e3279ce482c5f751a69eb2d3a1e8eb0fd5e82294fb3ef13e - languageName: node - linkType: hard - -"postcss-value-parser@npm:^4.0.0, postcss-value-parser@npm:^4.2.0": +"postcss-value-parser@npm:^4.2.0": version: 4.2.0 resolution: "postcss-value-parser@npm:4.2.0" checksum: 10c0/f4142a4f56565f77c1831168e04e3effd9ffcc5aebaf0f538eee4b2d465adfd4b85a44257bb48418202a63806a7da7fe9f56c330aebb3cac898e46b4cbf49161 @@ -10865,17 +10712,6 @@ __metadata: languageName: node linkType: hard -"postcss@npm:^8.4.47": - version: 8.4.49 - resolution: "postcss@npm:8.4.49" - dependencies: - nanoid: "npm:^3.3.7" - picocolors: "npm:^1.1.1" - source-map-js: "npm:^1.2.1" - checksum: 10c0/f1b3f17aaf36d136f59ec373459f18129908235e65dbdc3aee5eef8eba0756106f52de5ec4682e29a2eab53eb25170e7e871b3e4b52a8f1de3d344a514306be3 - languageName: node - linkType: hard - "postcss@npm:^8.5.1": version: 8.5.1 resolution: "postcss@npm:8.5.1" @@ -11327,15 +11163,6 @@ __metadata: languageName: node linkType: hard -"read-cache@npm:^1.0.0": - version: 1.0.0 - resolution: "read-cache@npm:1.0.0" - dependencies: - pify: "npm:^2.3.0" - checksum: 10c0/90cb2750213c7dd7c80cb420654344a311fdec12944e81eb912cd82f1bc92aea21885fa6ce442e3336d9fccd663b8a7a19c46d9698e6ca55620848ab932da814 - languageName: node - linkType: hard - "readdirp@npm:~3.6.0": version: 3.6.0 resolution: "readdirp@npm:3.6.0" @@ -11610,7 +11437,7 @@ __metadata: languageName: node linkType: hard -"resolve@npm:^1.1.7, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.4, resolve@npm:^1.22.8": +"resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.4, resolve@npm:^1.22.8": version: 1.22.10 resolution: "resolve@npm:1.22.10" dependencies: @@ -11649,7 +11476,7 @@ __metadata: languageName: node linkType: hard -"resolve@patch:resolve@npm%3A^1.1.7#optional!builtin, resolve@patch:resolve@npm%3A^1.19.0#optional!builtin, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin, resolve@patch:resolve@npm%3A^1.22.8#optional!builtin": +"resolve@patch:resolve@npm%3A^1.19.0#optional!builtin, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin, resolve@patch:resolve@npm%3A^1.22.8#optional!builtin": version: 1.22.10 resolution: "resolve@patch:resolve@npm%3A1.22.10#optional!builtin::version=1.22.10&hash=c3c19d" dependencies: @@ -12452,24 +12279,6 @@ __metadata: languageName: node linkType: hard -"sucrase@npm:^3.35.0": - version: 3.35.0 - resolution: "sucrase@npm:3.35.0" - dependencies: - "@jridgewell/gen-mapping": "npm:^0.3.2" - commander: "npm:^4.0.0" - glob: "npm:^10.3.10" - lines-and-columns: "npm:^1.1.6" - mz: "npm:^2.7.0" - pirates: "npm:^4.0.1" - ts-interface-checker: "npm:^0.1.9" - bin: - sucrase: bin/sucrase - sucrase-node: bin/sucrase-node - checksum: 10c0/ac85f3359d2c2ecbf5febca6a24ae9bf96c931f05fde533c22a94f59c6a74895e5d5f0e871878dfd59c2697a75ebb04e4b2224ef0bfc24ca1210735c2ec191ef - languageName: node - linkType: hard - "supports-color@npm:^7.1.0": version: 7.2.0 resolution: "supports-color@npm:7.2.0" @@ -12530,36 +12339,10 @@ __metadata: languageName: node linkType: hard -"tailwindcss@npm:^3.4.16": - version: 3.4.17 - resolution: "tailwindcss@npm:3.4.17" - dependencies: - "@alloc/quick-lru": "npm:^5.2.0" - arg: "npm:^5.0.2" - chokidar: "npm:^3.6.0" - didyoumean: "npm:^1.2.2" - dlv: "npm:^1.1.3" - fast-glob: "npm:^3.3.2" - glob-parent: "npm:^6.0.2" - is-glob: "npm:^4.0.3" - jiti: "npm:^1.21.6" - lilconfig: "npm:^3.1.3" - micromatch: "npm:^4.0.8" - normalize-path: "npm:^3.0.0" - object-hash: "npm:^3.0.0" - picocolors: "npm:^1.1.1" - postcss: "npm:^8.4.47" - postcss-import: "npm:^15.1.0" - postcss-js: "npm:^4.0.1" - postcss-load-config: "npm:^4.0.2" - postcss-nested: "npm:^6.2.0" - postcss-selector-parser: "npm:^6.1.2" - resolve: "npm:^1.22.8" - sucrase: "npm:^3.35.0" - bin: - tailwind: lib/cli.js - tailwindcss: lib/cli.js - checksum: 10c0/cc42c6e7fdf88a5507a0d7fea37f1b4122bec158977f8c017b2ae6828741f9e6f8cb90282c6bf2bd5951fd1220a53e0a50ca58f5c1c00eb7f5d9f8b80dc4523c +"tailwindcss@npm:^4.0.0": + version: 4.0.0 + resolution: "tailwindcss@npm:4.0.0" + checksum: 10c0/418b1cb02c46f5064bdd4931d8bb030e5c2a986744226dc282b47ecd4b95d1eb919a6f35a68cac948fbf3224fd976feafd9476e289cb5774062f6a3b2a49606e languageName: node linkType: hard @@ -12668,7 +12451,7 @@ __metadata: sonner: "npm:^1.7.2" stripe: "npm:^17.4.0" tailwind-merge: "npm:^2.6.0" - tailwindcss: "npm:^3.4.16" + tailwindcss: "npm:^4.0.0" tailwindcss-animate: "npm:^1.0.7" ts-node: "npm:^10.9.2" typescript: "npm:^5.7.3" @@ -12697,24 +12480,6 @@ __metadata: languageName: node linkType: hard -"thenify-all@npm:^1.0.0": - version: 1.6.0 - resolution: "thenify-all@npm:1.6.0" - dependencies: - thenify: "npm:>= 3.1.0 < 4" - checksum: 10c0/9b896a22735e8122754fe70f1d65f7ee691c1d70b1f116fda04fea103d0f9b356e3676cb789506e3909ae0486a79a476e4914b0f92472c2e093d206aed4b7d6b - languageName: node - linkType: hard - -"thenify@npm:>= 3.1.0 < 4": - version: 3.3.1 - resolution: "thenify@npm:3.3.1" - dependencies: - any-promise: "npm:^1.0.0" - checksum: 10c0/f375aeb2b05c100a456a30bc3ed07ef03a39cbdefe02e0403fb714b8c7e57eeaad1a2f5c4ecfb9ce554ce3db9c2b024eba144843cd9e344566d9fcee73b04767 - languageName: node - linkType: hard - "tiny-invariant@npm:^1.0.6": version: 1.3.3 resolution: "tiny-invariant@npm:1.3.3" @@ -12806,13 +12571,6 @@ __metadata: languageName: node linkType: hard -"ts-interface-checker@npm:^0.1.9": - version: 0.1.13 - resolution: "ts-interface-checker@npm:0.1.13" - checksum: 10c0/232509f1b84192d07b81d1e9b9677088e590ac1303436da1e92b296e9be8e31ea042e3e1fd3d29b1742ad2c959e95afe30f63117b8f1bc3a3850070a5142fea7 - languageName: node - linkType: hard - "ts-node@npm:^10.9.2": version: 10.9.2 resolution: "ts-node@npm:10.9.2" @@ -13638,7 +13396,7 @@ __metadata: languageName: node linkType: hard -"yaml@npm:^2.0.0, yaml@npm:^2.3.4, yaml@npm:^2.4.5": +"yaml@npm:^2.0.0, yaml@npm:^2.4.5": version: 2.7.0 resolution: "yaml@npm:2.7.0" bin: