@ahmednawaz/crank 0.2.5 → 0.2.6

package/lib/init.js

@@ -187,6 +187,98 @@ module.exports = {
   return stubPath;
 }
 
+const NODE_IMPORT_SPECS = [
+  { re: /import\s+\{\s*createRequire\s*\}\s+from\s+['"]node:module['"]\s*;?/, line: "import { createRequire } from 'node:module'" },
+  { re: /import\s+\{\s*existsSync\s*\}\s+from\s+['"]node:fs['"]\s*;?/, line: "import { existsSync } from 'node:fs'" },
+  { re: /import\s+\{\s*fileURLToPath\s*\}\s+from\s+['"]node:url['"]\s*;?/, line: "import { fileURLToPath } from 'node:url'" }
+];
+
+function hasCrankVitePatch(source) {
+  return (
+    /_crankPluginPath/.test(source) ||
+    /vite-plugin\.cjs/.test(source) ||
+    /Crank Vite plugin/.test(source) ||
+    (/\bcrank\s*\?\s*\[\s*crank\s*\(\s*\)\s*\]/.test(source) && /plugins/.test(source)) ||
+    (/(\bcrank)\s*\(/.test(source) && /plugins/.test(source) && /\.crank\//.test(source))
+  );
+}
+
+/** Drop later duplicate ESM imports of the Node builtins Crank injects. */
+function dedupeCrankNodeImports(source) {
+  let next = source;
+  let changed = false;
+  for (const { re } of NODE_IMPORT_SPECS) {
+    const globalRe = new RegExp(re.source, 'g');
+    const matches = next.match(globalRe);
+    if (!matches || matches.length < 2) continue;
+    let seen = 0;
+    next = next.replace(globalRe, (m) => {
+      seen += 1;
+      if (seen === 1) return m;
+      changed = true;
+      return '';
+    });
+    // Clean blank lines left by removals (keep file readable)
+    next = next.replace(/\n{3,}/g, '\n\n');
+  }
+  return { source: next, changed };
+}
+
+function missingNodeImportLines(source) {
+  return NODE_IMPORT_SPECS.filter(({ re }) => !re.test(source)).map(({ line }) => line);
+}
+
+function ensureCrankInPlugins(source) {
+  if (/\bcrank\s*\?\s*\[\s*crank\s*\(\s*\)\s*\]/.test(source) || /\[\s*\.\.\.\s*\(\s*crank\s*\?/.test(source)) {
+    return { source, changed: false, ok: true };
+  }
+  if (/plugins\s*:\s*\[\s*\]/.test(source)) {
+    return {
+      source: source.replace(/plugins\s*:\s*\[\s*\]/, 'plugins: [...(crank ? [crank()] : [])]'),
+      changed: true,
+      ok: true
+    };
+  }
+  if (/plugins\s*:\s*\[/.test(source)) {
+    return {
+      source: source.replace(/plugins\s*:\s*\[/, 'plugins: [...(crank ? [crank()] : []), '),
+      changed: true,
+      ok: true
+    };
+  }
+  if (/defineConfig\s*\(\s*\{/.test(source)) {
+    return {
+      source: source.replace(
+        /defineConfig\s*\(\s*\{/,
+        'defineConfig({\n  plugins: [...(crank ? [crank()] : [])],'
+      ),
+      changed: true,
+      ok: true
+    };
+  }
+  if (/export\s+default\s+\{/.test(source)) {
+    return {
+      source: source.replace(
+        /export\s+default\s+\{/,
+        'export default {\n  plugins: [...(crank ? [crank()] : [])],'
+      ),
+      changed: true,
+      ok: true
+    };
+  }
+  if (/module\.exports\s*=\s*\{/.test(source)) {
+    return {
+      source: source.replace(
+        /module\.exports\s*=\s*\{/,
+        'module.exports = {\n  plugins: [...(crank ? [crank()] : [])],'
+      ),
+      changed: true,
+      ok: true
+    };
+  }
+  return { source, changed: false, ok: false };
+}
+
 function patchViteConfig(projectRoot) {
   const configPath = findViteConfig(projectRoot);
   const stubPath = writeVitePluginStub(projectRoot);
@@ -196,11 +288,21 @@ function patchViteConfig(projectRoot) {
   }
 
   let source = fs.readFileSync(configPath, 'utf8');
-  if (
-    /vite-plugin\.cjs/.test(source) ||
-    (/(\bcrank)\s*\(/.test(source) && /plugins/.test(source))
-  ) {
-    return { patched: false, reason: 'already-present', file: configPath, plugin: stubPath };
+
+  // Heal configs broken by older Crank versions (duplicate node: imports).
+  const repaired = dedupeCrankNodeImports(source);
+  if (repaired.changed) {
+    source = repaired.source;
+    fs.writeFileSync(configPath, source);
+  }
+
+  if (hasCrankVitePatch(source)) {
+    return {
+      patched: repaired.changed,
+      reason: repaired.changed ? 'repaired-duplicate-imports' : 'already-present',
+      file: configPath,
+      plugin: stubPath
+    };
   }
 
   let relStub = path.relative(path.dirname(configPath), stubPath).replace(/\\/g, '/');
@@ -218,11 +320,8 @@ function patchViteConfig(projectRoot) {
     const crankDecl = isTs
       ? 'let crank: null | (() => unknown) = null'
       : 'let crank = null';
-    const gracefulBlock = `import { createRequire } from 'node:module'
-import { existsSync } from 'node:fs'
-import { fileURLToPath } from 'node:url'
-
-// Crank Vite plugin — graceful load (same pattern as Vizpatch); skip if unavailable
+    const importLines = missingNodeImportLines(source);
+    const gracefulBlock = `${importLines.length ? `${importLines.join('\n')}\n\n` : ''}// Crank Vite plugin — graceful load; skip if unavailable
 ${crankDecl}
 try {
   const _crankPluginPath = fileURLToPath(new URL('${relStub}', import.meta.url))
@@ -233,31 +332,14 @@ try {
 } catch {}
 
 `;
+    // If the file already uses createRequire/existsSync/fileURLToPath without
+    // importing them, missingNodeImportLines still adds the needed imports once.
     if (!/_crankPluginPath/.test(source)) {
       source = gracefulBlock + source;
     }
 
-    if (/plugins\s*:\s*\[\s*\]/.test(source)) {
-      source = source.replace(
-        /plugins\s*:\s*\[\s*\]/,
-        'plugins: [...(crank ? [crank()] : [])]'
-      );
-    } else if (/plugins\s*:\s*\[/.test(source)) {
-      source = source.replace(
-        /plugins\s*:\s*\[/,
-        'plugins: [...(crank ? [crank()] : []), '
-      );
-    } else if (/defineConfig\s*\(\s*\{/.test(source)) {
-      source = source.replace(
-        /defineConfig\s*\(\s*\{/,
-        'defineConfig({\n  plugins: [...(crank ? [crank()] : [])],'
-      );
-    } else if (/export\s+default\s+\{/.test(source)) {
-      source = source.replace(
-        /export\s+default\s+\{/,
-        'export default {\n  plugins: [...(crank ? [crank()] : [])],'
-      );
-    } else {
+    const plugged = ensureCrankInPlugins(source);
+    if (!plugged.ok) {
       return {
         patched: false,
         reason: 'unrecognized-vite-shape',
@@ -265,33 +347,20 @@ try {
         plugin: stubPath
       };
     }
+    source = plugged.source;
   } else {
-    const gracefulBlock = `// Crank Vite plugin — graceful load (same pattern as Vizpatch)
+    const gracefulBlock = `// Crank Vite plugin — graceful load; skip if unavailable
 let crank = null;
 try {
   crank = require('${relStub}').crank;
 } catch {}
 
 `;
-    if (!/vite-plugin\.cjs/.test(source)) {
+    if (!/vite-plugin\.cjs/.test(source) && !/_crankPluginPath/.test(source)) {
       source = gracefulBlock + source;
     }
-    if (/plugins\s*:\s*\[\s*\]/.test(source)) {
-      source = source.replace(
-        /plugins\s*:\s*\[\s*\]/,
-        'plugins: [...(crank ? [crank()] : [])]'
-      );
-    } else if (/plugins\s*:\s*\[/.test(source)) {
-      source = source.replace(
-        /plugins\s*:\s*\[/,
-        'plugins: [...(crank ? [crank()] : []), '
-      );
-    } else if (/module\.exports\s*=\s*\{/.test(source)) {
-      source = source.replace(
-        /module\.exports\s*=\s*\{/,
-        'module.exports = {\n  plugins: [...(crank ? [crank()] : [])],'
-      );
-    } else {
+    const plugged = ensureCrankInPlugins(source);
+    if (!plugged.ok) {
       return {
         patched: false,
         reason: 'unrecognized-vite-shape',
@@ -299,12 +368,27 @@ try {
         plugin: stubPath
       };
     }
+    source = plugged.source;
   }
 
+  // Final safety: never leave duplicate node imports.
+  source = dedupeCrankNodeImports(source).source;
+
   fs.writeFileSync(configPath, source);
   return { patched: true, file: configPath, plugin: stubPath };
 }
 
+/** Repair-only: dedupe node: imports left by older Crank Vite patches (React path). */
+function repairViteConfigDuplicates(projectRoot) {
+  const configPath = findViteConfig(projectRoot);
+  if (!configPath) return { repaired: false, reason: 'no-vite-config' };
+  const source = fs.readFileSync(configPath, 'utf8');
+  const repaired = dedupeCrankNodeImports(source);
+  if (!repaired.changed) return { repaired: false, reason: 'clean', file: configPath };
+  fs.writeFileSync(configPath, repaired.source);
+  return { repaired: true, reason: 'repaired-duplicate-imports', file: configPath };
+}
+
 function writeProjectEnvExample(projectRoot) {
   const dest = path.join(projectRoot, '.env.crank.example');
   const src = path.join(PACKAGE_ROOT, '.env.example');
@@ -536,10 +620,19 @@ function initProject(projectRoot, options = {}) {
     installCrankSkill(projectRoot, results);
   }
 
-  // React apps: install dep + write out inject (Sentry/Clerk-style). Do not patch source here.
+  // React apps: <Crank /> only — do not inject the Vite plugin (avoids duplicating
+  // node: imports when vite.config already has Vizpatch-style loaders).
+  // Still repair duplicate imports left by older Crank versions.
   if (env.hasReact && options.react !== false) {
     writeReactMountHint(projectRoot, env, results);
     results.reactMount = true;
+    if (env.hasVite) {
+      const repaired = repairViteConfigDuplicates(projectRoot);
+      if (repaired.repaired) {
+        results.vite = repaired;
+        results.wrote.push(path.relative(projectRoot, repaired.file));
+      }
+    }
   } else if (env.hasVite && options.vite !== false) {
     const viteResult = patchViteConfig(projectRoot);
     results.vite = viteResult;
@@ -901,6 +994,7 @@ module.exports = {
   writeReplitPlatformGuide,
   writeVitePluginStub,
   patchViteConfig,
+  repairViteConfigDuplicates,
   writeInjectionGuide,
   writeReactMountHint,
   patchReplitConfig,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ahmednawaz/crank",
-  "version": "0.2.5",
-  "description": "Internal Motive UX copy iteration: select UI text → Glean variants → MCP apply. Cursor, Replit, Claude.",
+  "version": "0.2.6",
+  "description": "Internal Motive UX copy iteration: select UI text \u2192 Glean variants \u2192 MCP apply. Cursor, Replit, Claude.",
   "repository": {
     "type": "git",
     "url": "https://github.com/ahmednawaz619/crank.git"
@@ -66,7 +66,8 @@
     "test:resolve": "node scripts/test-resolve-project.js",
     "prepare:publish": "node scripts/prepare-publish.js",
     "verify:deps": "node scripts/verify-deps.js",
-    "publish:team": "node scripts/prepare-publish.js && node scripts/verify-deps.js && npm publish --access public"
+    "publish:team": "node scripts/prepare-publish.js && node scripts/verify-deps.js && npm publish --access public",
+    "test:patch-vite": "node scripts/test-patch-vite.js"
   },
   "engines": {
     "node": ">=18"