Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/easy-papers-hug.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@clerk/dev-cli': patch
---

Add warning regarding Turbopack usage.
58 changes: 49 additions & 9 deletions packages/dev-cli/src/commands/setup.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
import { spawn } from 'node:child_process';
import { existsSync } from 'node:fs';
import { readFile, writeFile } from 'node:fs/promises';
import { join } from 'node:path';
import path, { join } from 'node:path';

import { parse } from 'dotenv';

import { applyCodemod } from '../codemods/index.js';
import { INVALID_INSTANCE_KEYS_ERROR } from '../utils/errors.js';
import { INVALID_INSTANCE_KEYS_ERROR, NULL_ROOT_ERROR } from '../utils/errors.js';
import { getClerkPackages } from '../utils/getClerkPackages.js';
import { getConfiguration } from '../utils/getConfiguration.js';
import { getDependencies } from '../utils/getDependencies.js';
import { getMonorepoRoot } from '../utils/getMonorepoRoot.js';
import { getPackageJSON } from '../utils/getPackageJSON.js';

/**
* Returns `true` if the cwd contains a file named `filename`, otherwise returns `false`.
Expand All @@ -35,11 +36,11 @@ function hasPackage(packages, dependency) {

/**
* Returns a string corresponding to the framework detected in the cwd.
* @returns {Promise<string>}
* @param {{ dependencies?: Record<string, string>, devDependencies?: Record<string, string>}} pkgJSON
* @returns {string}
*/
async function detectFramework() {
const { dependencies, devDependencies } = await getDependencies(join(process.cwd(), 'package.json'));

function detectFramework(pkgJSON) {
const { dependencies, devDependencies } = pkgJSON;
const IS_NEXT = hasPackage(dependencies, 'next');
if (IS_NEXT) {
return 'nextjs';
Expand All @@ -58,6 +59,36 @@ async function detectFramework() {
throw new Error('unable to determine framework');
}

/**
* Returns the output file tracing root for the current working directory.
* @returns {Promise<string | null>}
*/
async function getOutputFileTracingRoot() {
const monorepoRoot = await getMonorepoRoot();
if (!monorepoRoot) {
throw new Error(NULL_ROOT_ERROR);
}
const p1 = path.resolve(monorepoRoot);
const p2 = path.resolve(process.cwd());

const root1 = path.parse(p1).root;
const root2 = path.parse(p2).root;

if (root1 !== root2) return null;

const parts1 = p1.slice(root1.length).split(path.sep);
const parts2 = p2.slice(root2.length).split(path.sep);

const len = Math.min(parts1.length, parts2.length);
const common = [];
for (let i = 0; i < len; i++) {
if (parts1[i] === parts2[i]) common.push(parts1[i]);
else break;
}

return common.length ? path.join(root1, ...common) : root1;
}

/**
* Returns the active instance of the provided `configuration`.
* @param {import('../utils/getConfiguration.js').Configuration} configuration
Expand Down Expand Up @@ -161,7 +192,7 @@ async function importPackageLock() {
* @returns {Promise<void>}
*/
async function linkDependencies() {
const { dependencies } = await getDependencies(join(process.cwd(), 'package.json'));
const { dependencies } = await getPackageJSON(join(process.cwd(), 'package.json'));
if (!dependencies) {
throw new Error('you have no dependencies');
}
Expand Down Expand Up @@ -208,7 +239,9 @@ export async function setup({ js = true, skipInstall = false }) {
const config = await getConfiguration();
const instance = await getInstanceConfiguration(config);

const framework = await detectFramework();
const pkgJSON = await getPackageJSON(join(process.cwd(), 'package.json'));

const framework = detectFramework(pkgJSON);
switch (framework) {
case 'nextjs': {
console.log('Next.js detected, writing environment variables to .env.local...');
Expand All @@ -217,6 +250,13 @@ export async function setup({ js = true, skipInstall = false }) {
CLERK_SECRET_KEY: instance.secretKey,
...(js ? { NEXT_PUBLIC_CLERK_JS_URL: 'http://localhost:4000/npm/clerk.browser.js' } : {}),
});

if (pkgJSON.scripts?.dev && pkgJSON.scripts.dev.includes('--turbo')) {
Copy link
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue

Fix optional chaining as suggested by static analysis.

The static analysis tool correctly identified that pkgJSON.scripts.dev should use optional chaining to prevent potential runtime errors when scripts is undefined.

-      if (pkgJSON.scripts?.dev && pkgJSON.scripts.dev.includes('--turbo')) {
+      if (pkgJSON.scripts?.dev?.includes('--turbo')) {
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
if (pkgJSON.scripts?.dev && pkgJSON.scripts.dev.includes('--turbo')) {
if (pkgJSON.scripts?.dev?.includes('--turbo')) {
🧰 Tools
🪛 Biome (1.9.4)

[error] 254-254: Change to an optional chain.

Unsafe fix: Change to an optional chain.

(lint/complexity/useOptionalChain)

🤖 Prompt for AI Agents
In packages/dev-cli/src/commands/setup.js at line 254, the code accesses
pkgJSON.scripts.dev without optional chaining, which can cause runtime errors if
scripts is undefined. Update the condition to use optional chaining on scripts
as well, changing pkgJSON.scripts.dev to pkgJSON.scripts?.dev to safely handle
cases where scripts might be undefined.

const outputFileTracingRoot = await getOutputFileTracingRoot();
console.warn(
`\n\x1b[43m\x1b[30m Heads up! \x1b[0m Your \`dev\` script is using Turbopack. You will need to set the \`outputFileTracingRoot\` in your \`next.config.mjs\` file to "${outputFileTracingRoot}".\n`,
);
}
break;
}
case 'remix': {
Expand Down
4 changes: 2 additions & 2 deletions packages/dev-cli/src/commands/watch.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import concurrently from 'concurrently';

import { NULL_ROOT_ERROR } from '../utils/errors.js';
import { getClerkPackages } from '../utils/getClerkPackages.js';
import { getDependencies } from '../utils/getDependencies.js';
import { getMonorepoRoot } from '../utils/getMonorepoRoot.js';
import { getPackageJSON } from '../utils/getPackageJSON.js';

/**
* Starts long-running watchers for Clerk dependencies.
Expand All @@ -14,7 +14,7 @@ import { getMonorepoRoot } from '../utils/getMonorepoRoot.js';
* @returns {Promise<import('concurrently').CloseEvent[]>}
*/
export async function watch({ js }) {
const { dependencies, devDependencies } = await getDependencies(join(process.cwd(), 'package.json'));
const { dependencies, devDependencies } = await getPackageJSON(join(process.cwd(), 'package.json'));
const clerkPackages = Object.keys(await getClerkPackages());

const packagesInPackageJSON = [...Object.keys(dependencies ?? {}), ...Object.keys(devDependencies ?? {})];
Expand Down
12 changes: 0 additions & 12 deletions packages/dev-cli/src/utils/getDependencies.js

This file was deleted.

11 changes: 11 additions & 0 deletions packages/dev-cli/src/utils/getPackageJSON.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { readFile } from 'node:fs/promises';

/**
* Gets the contents of the provided package.json.
* @param {string} pathToPackageJSON
* @returns {Promise<{ scripts?: Record<string, string>, dependencies?: Record<string, string>, devDependencies?: Record<string, string>}>}
*/
export async function getPackageJSON(pathToPackageJSON) {
const packageJSON = await readFile(pathToPackageJSON, 'utf-8');
return JSON.parse(packageJSON);
}
Comment on lines +8 to +11
Copy link
Contributor

Choose a reason for hiding this comment

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

🛠️ Refactor suggestion

Add error handling for file operations and JSON parsing.

The function lacks error handling for common failure scenarios such as file not found or invalid JSON syntax. Consider adding try-catch blocks to provide more meaningful error messages.

 export async function getPackageJSON(pathToPackageJSON) {
-  const packageJSON = await readFile(pathToPackageJSON, 'utf-8');
-  return JSON.parse(packageJSON);
+  try {
+    const packageJSON = await readFile(pathToPackageJSON, 'utf-8');
+    return JSON.parse(packageJSON);
+  } catch (error) {
+    if (error.code === 'ENOENT') {
+      throw new Error(`package.json not found at: ${pathToPackageJSON}`);
+    }
+    if (error instanceof SyntaxError) {
+      throw new Error(`Invalid JSON in package.json at: ${pathToPackageJSON}`);
+    }
+    throw error;
+  }
 }
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
export async function getPackageJSON(pathToPackageJSON) {
const packageJSON = await readFile(pathToPackageJSON, 'utf-8');
return JSON.parse(packageJSON);
}
export async function getPackageJSON(pathToPackageJSON) {
try {
const packageJSON = await readFile(pathToPackageJSON, 'utf-8');
return JSON.parse(packageJSON);
} catch (error) {
if (error.code === 'ENOENT') {
throw new Error(`package.json not found at: ${pathToPackageJSON}`);
}
if (error instanceof SyntaxError) {
throw new Error(`Invalid JSON in package.json at: ${pathToPackageJSON}`);
}
throw error;
}
}
🤖 Prompt for AI Agents
In packages/dev-cli/src/utils/getPackageJSON.js around lines 8 to 11, the
function getPackageJSON lacks error handling for file reading and JSON parsing
failures. Wrap the file reading and JSON.parse calls in a try-catch block, and
in the catch block, throw or log a meaningful error message indicating whether
the failure was due to file access issues or invalid JSON syntax.