From 73b45a9f5ec4d60f5664b34b90f2d3101559a0eb Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Tue, 29 Apr 2025 09:53:11 -0700 Subject: [PATCH] Replaced __dirname usage. --- pnpm-workspace.yaml | 10 ++++++++++ scripts/build-geo.mjs | 2 +- scripts/check-lang.mjs | 2 +- scripts/copy-db-files.mjs | 7 ++----- scripts/download-country-names.mjs | 6 ++---- scripts/download-language-names.mjs | 7 ++----- scripts/format-lang.mjs | 7 ++----- scripts/merge-messages.mjs | 2 +- scripts/set-routes-manifest.mjs | 4 ++-- scripts/update-tracker.mjs | 5 +---- src/components/hooks/index.ts | 1 + 11 files changed, 25 insertions(+), 28 deletions(-) create mode 100644 pnpm-workspace.yaml diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml new file mode 100644 index 00000000..5e236fb7 --- /dev/null +++ b/pnpm-workspace.yaml @@ -0,0 +1,10 @@ +packages: + - '**' +ignoredBuiltDependencies: + - cypress + - esbuild + - sharp +onlyBuiltDependencies: + - '@prisma/client' + - '@prisma/engines' + - prisma diff --git a/scripts/build-geo.mjs b/scripts/build-geo.mjs index 27a2cb0d..c5f634b4 100644 --- a/scripts/build-geo.mjs +++ b/scripts/build-geo.mjs @@ -21,7 +21,7 @@ if (process.env.MAXMIND_LICENSE_KEY) { `?edition_id=${db}&license_key=${process.env.MAXMIND_LICENSE_KEY}&suffix=tar.gz`; } -const dest = path.resolve(__dirname, '../geo'); +const dest = path.resolve(process.cwd(), 'geo'); if (!fs.existsSync(dest)) { fs.mkdirSync(dest); diff --git a/scripts/check-lang.mjs b/scripts/check-lang.mjs index 74a386c8..7db34d45 100644 --- a/scripts/check-lang.mjs +++ b/scripts/check-lang.mjs @@ -7,7 +7,7 @@ import { createRequire } from "module"; const require = createRequire(import.meta.url); const messages = require('../src/lang/en-US.json'); const ignore = require('../lang-ignore.json'); -const dir = path.resolve(__dirname, '../lang'); +const dir = path.resolve(process.cwd(), 'lang'); const files = fs.readdirSync(dir); const keys = Object.keys(messages).sort(); const filter = process.argv?.[2]; diff --git a/scripts/copy-db-files.mjs b/scripts/copy-db-files.mjs index d9418db6..c787d179 100644 --- a/scripts/copy-db-files.mjs +++ b/scripts/copy-db-files.mjs @@ -2,11 +2,8 @@ import 'dotenv/config'; import fse from 'fs-extra'; import path from 'node:path'; -import url from 'node:url'; import del from 'del'; -const __dirname = path.dirname(url.fileURLToPath(import.meta.url)); - function getDatabaseType(url = process.env.DATABASE_URL) { const type = process.env.DATABASE_TYPE || (url && url.split(':')[0]); @@ -25,8 +22,8 @@ if (!databaseType || !['mysql', 'postgresql'].includes(databaseType)) { console.log(`Database type detected: ${databaseType}`); -const src = path.resolve(__dirname, `../db/${databaseType}`); -const dest = path.resolve(__dirname, '../prisma'); +const src = path.resolve(process.cwd(), `db/${databaseType}`); +const dest = path.resolve(process.cwd(), 'prisma'); del.sync(dest); diff --git a/scripts/download-country-names.mjs b/scripts/download-country-names.mjs index 51fbafef..419ba9e5 100644 --- a/scripts/download-country-names.mjs +++ b/scripts/download-country-names.mjs @@ -5,10 +5,8 @@ import https from 'https'; import chalk from 'chalk'; import url from "node:url"; -const __dirname = path.dirname(url.fileURLToPath(import.meta.url)); - -const src = path.resolve(__dirname, '../src/lang'); -const dest = path.resolve(__dirname, '../public/intl/country'); +const src = path.resolve(process.cwd(), 'src/lang'); +const dest = path.resolve(process.cwd(), 'public/intl/country'); const files = fs.readdirSync(src); const getUrl = locale => diff --git a/scripts/download-language-names.mjs b/scripts/download-language-names.mjs index a434bf01..4c263593 100644 --- a/scripts/download-language-names.mjs +++ b/scripts/download-language-names.mjs @@ -3,12 +3,9 @@ import fs from 'fs-extra'; import path from 'node:path'; import https from 'https'; import chalk from 'chalk'; -import url from "node:url"; -const __dirname = path.dirname(url.fileURLToPath(import.meta.url)); - -const src = path.resolve(__dirname, '../src/lang'); -const dest = path.resolve(__dirname, '../public/intl/language'); +const src = path.resolve(process.cwd(), 'src/lang'); +const dest = path.resolve(process.cwd(), 'public/intl/language'); const files = fs.readdirSync(src); const getUrl = locale => diff --git a/scripts/format-lang.mjs b/scripts/format-lang.mjs index 587dd02a..a6f0863b 100644 --- a/scripts/format-lang.mjs +++ b/scripts/format-lang.mjs @@ -1,15 +1,12 @@ import path from 'node:path'; -import url from 'node:url'; import fs from 'fs-extra'; import del from 'del'; import prettier from 'prettier'; import { createRequire } from 'module'; -const __dirname = path.dirname(url.fileURLToPath(import.meta.url)); - const require = createRequire(import.meta.url); -const src = path.resolve(__dirname, '../src/lang'); -const dest = path.resolve(__dirname, '../build/messages'); +const src = path.resolve(process.cwd(), 'src/lang'); +const dest = path.resolve(process.cwd(), 'build/messages'); const files = fs.readdirSync(src); del.sync([path.join(dest)]); diff --git a/scripts/merge-messages.mjs b/scripts/merge-messages.mjs index 9225ab89..c9f3b921 100644 --- a/scripts/merge-messages.mjs +++ b/scripts/merge-messages.mjs @@ -6,7 +6,7 @@ import messages from '../build/extracted-messages.json'; import { createRequire } from "module"; const require = createRequire(import.meta.url); -const dest = path.resolve(__dirname, '../src/lang'); +const dest = path.resolve(process.cwd(), 'src/lang'); const files = fs.readdirSync(dest); const keys = Object.keys(messages).sort(); diff --git a/scripts/set-routes-manifest.mjs b/scripts/set-routes-manifest.mjs index ba165808..2738970d 100644 --- a/scripts/set-routes-manifest.mjs +++ b/scripts/set-routes-manifest.mjs @@ -3,8 +3,8 @@ import 'dotenv/config'; import fs from 'node:fs'; import path from 'node:path'; -const routesManifestPath = path.resolve(__dirname, '../.next/routes-manifest.json'); -const originalPath = path.resolve(__dirname, '../.next/routes-manifest-orig.json'); +const routesManifestPath = path.resolve(process.cwd(), '.next/routes-manifest.json'); +const originalPath = path.resolve(process.cwd(), '.next/routes-manifest-orig.json'); const originalManifest = require(originalPath); const API_PATH = '/api/:path*'; diff --git a/scripts/update-tracker.mjs b/scripts/update-tracker.mjs index 458ae494..0091e8bd 100644 --- a/scripts/update-tracker.mjs +++ b/scripts/update-tracker.mjs @@ -2,14 +2,11 @@ import 'dotenv/config'; import fs from 'node:fs'; import path from 'node:path'; -import url from "node:url"; - -const __dirname = path.dirname(url.fileURLToPath(import.meta.url)); const endPoint = process.env.COLLECT_API_ENDPOINT; if (endPoint) { - const file = path.resolve(__dirname, '../public/script.js'); + const file = path.resolve(process.cwd(), 'public/script.js'); const tracker = fs.readFileSync(file); diff --git a/src/components/hooks/index.ts b/src/components/hooks/index.ts index 6f738838..357227cd 100644 --- a/src/components/hooks/index.ts +++ b/src/components/hooks/index.ts @@ -1,3 +1,4 @@ +'use client'; export * from './queries/useActiveUsersQuery'; export * from './queries/useEventDataEventsQuery'; export * from './queries/useEventDataPropertiesQuery';