Merge 719be1f into 488d0f5

Author: KenAJoh

.changeset/legal-hands-switch.md

@@ -0,0 +1,5 @@
+---
+"@navikt/aksel": patch
+---
+
+CLI: Improvements to v8-tokens codemod.

@navikt/aksel/package.json

@@ -37,6 +37,7 @@
     "axios": "1.13.2",
     "chalk": "4.1.0",
     "cli-progress": "^3.12.0",
+    "clipboardy": "^2.3.0",
     "commander": "10.0.1",
     "enquirer": "^2.3.6",
     "fast-glob": "3.2.11",

@navikt/aksel/src/codemod/codeshift.utils.ts

@@ -21,8 +21,17 @@ type SupportedCodemodExtensions =
  */
 function getDefaultGlob(ext: string): string {
   const defaultExt = "js,ts,jsx,tsx,css,scss,less";
+  const extensions = cleanExtensions(ext ?? defaultExt);
 
-  return `**/*.{${cleanExtensions(ext ?? defaultExt).join(",")}}`;
+  /**
+   * Single-item braces are treated as a literal string by some globbing libraries,
+   * so we only use them when there are multiple extensions
+   */
+  if (extensions.length > 1) {
+    return `**/*.{${extensions.join(",")}}`;
+  }
+
+  return `**/*.${extensions[0]}`;
 }
 
 /**

@navikt/aksel/src/codemod/run-codeshift.ts

@@ -28,15 +28,31 @@ export async function runCodeshift(
     `./transforms/${getMigrationPath(input)}.js`,
   );
 
-  const filepaths = fg.sync([options.glob ?? getDefaultGlob(options?.ext)], {
+  console.info(chalk.greenBright.bold("\nWelcome to Aksel codemods!"));
+  console.info("\nRunning migration:", chalk.green(input));
+
+  const globList = options.glob ?? getDefaultGlob(options?.ext);
+
+  console.info(
+    chalk.gray(
+      `Using glob pattern(s): ${globList}\nWorking directory: ${process.cwd()}\n`,
+    ),
+  );
+
+  const filepaths = fg.sync(globList, {
     cwd: process.cwd(),
     ignore: GLOB_IGNORE_PATTERNS,
+    /**
+     * When globbing, do not follow symlinks to avoid processing files outside the directory.
+     * This is most likely to happen in monorepos where node_modules may contain symlinks to packages
+     * in other parts of the repo.
+     *
+     * While node_modules is already ignored via GLOB_IGNORE_PATTERNS, if user globs upwards (e.g., using '../src/**'),
+     * that ignore-pattern may be ignored, leading to unintended file processing.
+     */
+    followSymbolicLinks: false,
   });
 
-  console.info("\nRunning migration:", chalk.green("input"));
-
-  options?.glob && console.info(`Using glob: ${chalk.green(options.glob)}\n`);
-
   const warning = getWarning(input);
 
   const unsafeExtensions = getIgnoredFileExtensions(input);

@navikt/aksel/src/darkside/index.ts

@@ -1,31 +1,27 @@
 import chalk from "chalk";
 import { Command } from "commander";
-import { validateGit } from "../codemod/validation.js";
-// import figlet from "figlet";
-// import { getMigrationString } from "./migrations.js";
 import { runTooling } from "./run-tooling.js";
 
 const program = new Command();
 
 export function darksideCommand() {
-  program.name(`${chalk.blueBright(`npx @navikt/aksel`)}`);
+  program.name(`${chalk.blueBright(`npx @navikt/aksel v8-tokens`)}`);
 
   program
     .option(
       "-g, --glob [glob]",
       "Globbing pattern, overrides --ext! Run with 'noglob' if using zsh-terminal. ",
     )
+    .option(
+      "-e, --ext [ext]",
+      "File extensions to include, defaults to 'js,ts,jsx,tsx,css,scss,less'",
+    )
     .option("-d, --dry-run", "Dry run, no changes will be made")
     .option("-f, --force", "Forcibly run updates without checking git-changes")
-    .description("Update tool for darkside token updates");
+    .description("Update tool for v8 token updates");
 
   program.parse();
   const options = program.opts();
 
-  /* Makes sure that you don't migrate lots of files while having other uncommitted changes */
-  if (!options.force) {
-    validateGit(options, program);
-  }
-
   runTooling(options as Parameters<typeof runTooling>["0"], program);
 }