@clerk/upgrade 2.0.0-snapshot.v20251204143242 → 2.0.0-snapshot.v20251208202852

package/dist/codemods/transform-align-experimental-unstable-prefixes.cjs

@@ -0,0 +1,400 @@
+const SPECIFIC_RENAMES = {
+  experimental_createTheme: 'createTheme',
+  __experimental_createTheme: 'createTheme',
+  experimental__simple: 'simple',
+  __experimental_simple: 'simple',
+  __unstable__createClerkClient: 'createClerkClient',
+  __unstable_invokeMiddlewareOnAuthStateChange: '__internal_invokeMiddlewareOnAuthStateChange',
+  __unstable__environment: '__internal_environment',
+  __unstable__updateProps: '__internal_updateProps',
+  __unstable__setEnvironment: '__internal_setEnvironment',
+  __unstable__onBeforeRequest: '__internal_onBeforeRequest',
+  __unstable__onAfterResponse: '__internal_onAfterResponse',
+  __unstable__onBeforeSetActive: '__internal_onBeforeSetActive',
+  __unstable__onAfterSetActive: '__internal_onAfterSetActive'
+};
+const REMOVED_PROPS = new Set(['__unstable_manageBillingUrl', '__unstable_manageBillingLabel', '__unstable_manageBillingMembersLimit', 'experimental__forceOauthFirst']);
+const UI_THEME_NAMES = new Set(['createTheme', 'simple', 'experimental_createTheme', '__experimental_createTheme', 'experimental__simple', '__experimental_simple']);
+const UI_THEME_SOURCE = '@clerk/ui/themes/experimental';
+const UI_LEGACY_SOURCES = new Set(['@clerk/ui', '@clerk/ui/themes', UI_THEME_SOURCE]);
+const CHROME_CLIENT_NAMES = new Set(['__unstable__createClerkClient', 'createClerkClient']);
+const CHROME_BACKGROUND_SOURCE = '@clerk/chrome-extension/background';
+const CHROME_LEGACY_SOURCE = '@clerk/chrome-extension';
+module.exports = function transformAlignExperimentalUnstablePrefixes({
+  source
+}, {
+  jscodeshift: j
+}) {
+  const root = j(source);
+  let dirty = false;
+  const maybeRename = name => {
+    if (!name || REMOVED_PROPS.has(name)) {
+      return null;
+    }
+    return SPECIFIC_RENAMES[name] ?? null;
+  };
+  const renameIdentifier = node => {
+    const newName = maybeRename(node.name);
+    if (newName && newName !== node.name) {
+      node.name = newName;
+      dirty = true;
+    }
+  };
+  const renameLiteral = node => {
+    if (typeof node.value !== 'string') {
+      return;
+    }
+    const newName = maybeRename(node.value);
+    if (newName && newName !== node.value) {
+      node.value = newName;
+      dirty = true;
+    }
+  };
+  const getPropertyName = key => {
+    if (j.Identifier.check(key)) {
+      return key.name;
+    }
+    if (j.Literal.check(key)) {
+      return key.value;
+    }
+    if (j.StringLiteral && j.StringLiteral.check(key)) {
+      return key.value;
+    }
+    return null;
+  };
+  const renamePropertyKey = (key, computed = false) => {
+    if (REMOVED_PROPS.has(getPropertyName(key))) {
+      return null;
+    }
+    if (j.Identifier.check(key)) {
+      const newName = maybeRename(key.name);
+      if (newName && newName !== key.name) {
+        key.name = newName;
+        dirty = true;
+      }
+      return key;
+    }
+    if (!computed && (j.Literal.check(key) || j.StringLiteral && j.StringLiteral.check(key))) {
+      const newName = maybeRename(key.value);
+      if (newName && newName !== key.value) {
+        key.value = newName;
+        dirty = true;
+      }
+      return key;
+    }
+    return key;
+  };
+  const mergeImportSpecifiers = (targetImport, specifiers) => {
+    const existingKeys = new Set((targetImport.node.specifiers || []).map(spec => `${spec.local ? spec.local.name : spec.imported?.name ?? spec.imported?.value ?? ''}`));
+    specifiers.forEach(spec => {
+      const key = spec.local ? spec.local.name : spec.imported?.name;
+      if (!existingKeys.has(key)) {
+        targetImport.node.specifiers = targetImport.node.specifiers || [];
+        targetImport.node.specifiers.push(spec);
+        existingKeys.add(key);
+        dirty = true;
+      }
+    });
+  };
+  root.find(j.ImportSpecifier).forEach(path => {
+    const imported = path.node.imported;
+    if (j.Identifier.check(imported)) {
+      const originalImportedName = imported.name;
+      renameIdentifier(imported);
+      if ((!path.node.local || path.node.local.name === originalImportedName) && imported.name !== originalImportedName) {
+        path.node.local = j.identifier(imported.name);
+        dirty = true;
+      }
+    }
+    if (path.node.local) {
+      renameIdentifier(path.node.local);
+    }
+  });
+  root.find(j.ExportSpecifier).forEach(path => {
+    if (j.Identifier.check(path.node.exported)) {
+      renameIdentifier(path.node.exported);
+    }
+    if (j.Identifier.check(path.node.local)) {
+      renameIdentifier(path.node.local);
+    }
+  });
+  const handleMemberExpression = path => {
+    const {
+      node
+    } = path;
+    if (!node.computed && j.Identifier.check(node.property)) {
+      renameIdentifier(node.property);
+    } else if (node.computed && (j.Literal.check(node.property) || j.StringLiteral && j.StringLiteral.check(node.property))) {
+      renameLiteral(node.property);
+    }
+  };
+  root.find(j.MemberExpression).forEach(handleMemberExpression);
+  if (j.OptionalMemberExpression) {
+    root.find(j.OptionalMemberExpression).forEach(handleMemberExpression);
+  }
+  root.find(j.Property).forEach(path => {
+    const {
+      node
+    } = path;
+    const propName = getPropertyName(node.key);
+    if (propName && REMOVED_PROPS.has(propName) && !node.computed) {
+      path.prune();
+      dirty = true;
+      return;
+    }
+    renamePropertyKey(node.key, node.computed);
+    if (j.Identifier.check(node.value)) {
+      renameIdentifier(node.value);
+    }
+  });
+  root.find(j.ObjectPattern).forEach(path => {
+    path.node.properties.forEach(prop => {
+      if (!prop) {
+        return;
+      }
+      const keyName = getPropertyName(prop.key);
+      if (keyName && REMOVED_PROPS.has(keyName) && !prop.computed) {
+        return;
+      }
+      if (prop.key) {
+        renamePropertyKey(prop.key, prop.computed);
+      }
+      if (prop.value && j.Identifier.check(prop.value)) {
+        renameIdentifier(prop.value);
+      }
+    });
+  });
+  root.find(j.Identifier).forEach(path => {
+    renameIdentifier(path.node);
+  });
+  root.find(j.JSXOpeningElement).forEach(path => {
+    const attributes = path.node.attributes || [];
+    path.node.attributes = attributes.filter(attr => {
+      if (!j.JSXAttribute.check(attr) || !j.JSXIdentifier.check(attr.name)) {
+        return true;
+      }
+      const name = attr.name.name;
+      if (REMOVED_PROPS.has(name)) {
+        dirty = true;
+        return false;
+      }
+      const newName = maybeRename(name);
+      if (newName && newName !== name) {
+        attr.name.name = newName;
+        dirty = true;
+      }
+      return true;
+    });
+  });
+  const normalizeUiThemeSpecifier = spec => {
+    if (!j.ImportSpecifier.check(spec)) {
+      return null;
+    }
+    const importedName = spec.imported?.name ?? spec.imported?.value;
+    if (!importedName || !UI_THEME_NAMES.has(importedName)) {
+      return null;
+    }
+    const newImportedName = maybeRename(importedName) || importedName;
+    const newImported = j.identifier(newImportedName);
+    const newLocal = spec.local && spec.local.name !== importedName ? j.identifier(spec.local.name) : j.identifier(newImportedName);
+    return j.importSpecifier(newImported, newLocal.name === newImported.name ? null : newLocal);
+  };
+  root.find(j.ImportDeclaration).forEach(path => {
+    const source = path.node.source?.value;
+    if (!UI_LEGACY_SOURCES.has(source) && source !== CHROME_LEGACY_SOURCE) {
+      return;
+    }
+    if (UI_LEGACY_SOURCES.has(source)) {
+      const specifiers = path.node.specifiers || [];
+      const moveSpecifiers = [];
+      const remainingSpecifiers = [];
+      specifiers.forEach(spec => {
+        const normalized = normalizeUiThemeSpecifier(spec);
+        if (normalized) {
+          moveSpecifiers.push(normalized);
+          return;
+        }
+        remainingSpecifiers.push(spec);
+      });
+      if (source === UI_THEME_SOURCE) {
+        if (moveSpecifiers.length) {
+          path.node.specifiers = moveSpecifiers.concat(remainingSpecifiers.filter(spec => !moveSpecifiers.some(m => m.imported.name === spec.imported?.name)));
+          dirty = true;
+        }
+        return;
+      }
+      if (moveSpecifiers.length) {
+        const targetImport = root.find(j.ImportDeclaration, {
+          source: {
+            value: UI_THEME_SOURCE
+          }
+        }).at(0);
+        if (targetImport.size() > 0) {
+          mergeImportSpecifiers(targetImport.get(), moveSpecifiers);
+        } else {
+          const newImport = j.importDeclaration(moveSpecifiers, j.literal(UI_THEME_SOURCE));
+          j(path).insertAfter(newImport);
+          dirty = true;
+        }
+        if (remainingSpecifiers.length) {
+          path.node.specifiers = remainingSpecifiers;
+        } else {
+          j(path).remove();
+        }
+      }
+    }
+    if (source === CHROME_LEGACY_SOURCE) {
+      const specifiers = path.node.specifiers || [];
+      const moveSpecifiers = [];
+      const remainingSpecifiers = [];
+      specifiers.forEach(spec => {
+        if (!j.ImportSpecifier.check(spec)) {
+          remainingSpecifiers.push(spec);
+          return;
+        }
+        const importedName = spec.imported?.name ?? spec.imported?.value;
+        if (!CHROME_CLIENT_NAMES.has(importedName)) {
+          remainingSpecifiers.push(spec);
+          return;
+        }
+        const newImportedName = maybeRename(importedName) || importedName;
+        const newImported = j.identifier(newImportedName);
+        const newLocal = spec.local && spec.local.name !== importedName ? j.identifier(spec.local.name) : j.identifier(newImportedName);
+        moveSpecifiers.push(j.importSpecifier(newImported, newLocal.name === newImported.name ? null : newLocal));
+      });
+      if (moveSpecifiers.length) {
+        const targetImport = root.find(j.ImportDeclaration, {
+          source: {
+            value: CHROME_BACKGROUND_SOURCE
+          }
+        }).at(0);
+        if (targetImport.size() > 0) {
+          mergeImportSpecifiers(targetImport.get(), moveSpecifiers);
+        } else {
+          const newImport = j.importDeclaration(moveSpecifiers, j.literal(CHROME_BACKGROUND_SOURCE));
+          j(path).insertAfter(newImport);
+          dirty = true;
+        }
+        if (remainingSpecifiers.length) {
+          path.node.specifiers = remainingSpecifiers;
+        } else {
+          j(path).remove();
+        }
+      }
+    }
+  });
+  root.find(j.VariableDeclarator, {
+    init: {
+      callee: {
+        name: 'require'
+      }
+    }
+  }).filter(path => {
+    const arg = path.node.init.arguments?.[0];
+    return arg && (j.Literal.check(arg) || j.StringLiteral && j.StringLiteral.check(arg)) && UI_LEGACY_SOURCES.has(arg.value);
+  }).forEach(path => {
+    const id = path.node.id;
+    if (!j.ObjectPattern.check(id)) {
+      return;
+    }
+    const moveProps = [];
+    const keepProps = [];
+    id.properties.forEach(prop => {
+      if (!prop || !prop.key) {
+        return;
+      }
+      const keyName = getPropertyName(prop.key);
+      if (!keyName) {
+        keepProps.push(prop);
+        return;
+      }
+      if (!UI_THEME_NAMES.has(keyName)) {
+        keepProps.push(prop);
+        return;
+      }
+      const renamed = maybeRename(keyName) || keyName;
+      const keyIdentifier = j.identifier(renamed);
+      const valueIdentifier = prop.value && j.Identifier.check(prop.value) && prop.value.name !== keyName ? j.identifier(prop.value.name) : j.identifier(renamed);
+      const newProp = j.property('init', keyIdentifier, valueIdentifier);
+      newProp.shorthand = keyIdentifier.name === valueIdentifier.name;
+      moveProps.push(newProp);
+    });
+    if (!moveProps.length) {
+      return;
+    }
+    const parentDecl = path.parent.node;
+    const kind = parentDecl.kind || 'const';
+    const newDeclarator = j.variableDeclarator(j.objectPattern(moveProps), j.callExpression(j.identifier('require'), [j.literal(UI_THEME_SOURCE)]));
+    const newDeclaration = j.variableDeclaration(kind, [newDeclarator]);
+    j(path.parent).insertAfter(newDeclaration);
+    dirty = true;
+    if (keepProps.length) {
+      id.properties = keepProps;
+    } else {
+      j(path).remove();
+    }
+  });
+  root.find(j.VariableDeclarator, {
+    init: {
+      callee: {
+        name: 'require'
+      }
+    }
+  }).filter(path => {
+    const arg = path.node.init.arguments?.[0];
+    return arg && (j.Literal.check(arg) || j.StringLiteral && j.StringLiteral.check(arg)) && arg.value === CHROME_LEGACY_SOURCE;
+  }).forEach(path => {
+    const id = path.node.id;
+    if (!j.ObjectPattern.check(id)) {
+      return;
+    }
+    const moveProps = [];
+    const keepProps = [];
+    id.properties.forEach(prop => {
+      if (!prop || !prop.key) {
+        return;
+      }
+      const keyName = getPropertyName(prop.key);
+      if (!keyName || !CHROME_CLIENT_NAMES.has(keyName)) {
+        keepProps.push(prop);
+        return;
+      }
+      const renamed = maybeRename(keyName) || keyName;
+      const keyIdentifier = j.identifier(renamed);
+      const valueIdentifier = prop.value && j.Identifier.check(prop.value) && prop.value.name !== keyName ? j.identifier(prop.value.name) : j.identifier(renamed);
+      const newProp = j.property('init', keyIdentifier, valueIdentifier);
+      newProp.shorthand = keyIdentifier.name === valueIdentifier.name;
+      moveProps.push(newProp);
+    });
+    if (!moveProps.length) {
+      return;
+    }
+    const parentDecl = path.parent.node;
+    const kind = parentDecl.kind || 'const';
+    const newDeclarator = j.variableDeclarator(j.objectPattern(moveProps), j.callExpression(j.identifier('require'), [j.literal(CHROME_BACKGROUND_SOURCE)]));
+    const newDeclaration = j.variableDeclaration(kind, [newDeclarator]);
+    j(path.parent).insertAfter(newDeclaration);
+    dirty = true;
+    if (keepProps.length) {
+      id.properties = keepProps;
+    } else {
+      j(path).remove();
+    }
+  });
+  root.find(j.ObjectExpression).forEach(path => {
+    const props = path.node.properties || [];
+    path.node.properties = props.filter(prop => {
+      if (!prop || !prop.key) {
+        return true;
+      }
+      const propName = getPropertyName(prop.key);
+      if (propName && REMOVED_PROPS.has(propName) && !prop.computed) {
+        dirty = true;
+        return false;
+      }
+      return true;
+    });
+  });
+  return dirty ? root.toSource() : undefined;
+};
+module.exports.parser = 'tsx';

package/dist/codemods/transform-appearance-layout-to-options.cjs

@@ -0,0 +1,65 @@
+const isStringLiteral = node => node && node.type === 'Literal' && typeof node.value === 'string' || node && node.type === 'StringLiteral' && typeof node.value === 'string';
+const getPropertyName = key => {
+  if (!key) {
+    return null;
+  }
+  if (key.type === 'Identifier') {
+    return key.name;
+  }
+  if (isStringLiteral(key)) {
+    return key.value;
+  }
+  return null;
+};
+module.exports = function transformAppearanceLayoutToOptions({
+  source
+}, {
+  jscodeshift: j
+}) {
+  const root = j(source);
+  let dirty = false;
+  const renameLayoutKey = prop => {
+    const keyName = getPropertyName(prop?.key);
+    if (!prop || keyName !== 'layout') {
+      return false;
+    }
+    if (prop.computed && !isStringLiteral(prop.key)) {
+      return false;
+    }
+    if (j.Identifier.check(prop.key)) {
+      prop.key.name = 'options';
+    } else if (isStringLiteral(prop.key)) {
+      prop.key.value = 'options';
+    } else {
+      prop.key = j.identifier('options');
+      prop.computed = false;
+    }
+    return true;
+  };
+  root.find(j.JSXAttribute, {
+    name: {
+      name: 'appearance'
+    }
+  }).forEach(path => {
+    const {
+      value
+    } = path.node;
+    if (!value || !j.JSXExpressionContainer.check(value)) {
+      return;
+    }
+    const expression = value.expression;
+    if (j.ObjectExpression.check(expression)) {
+      let changed = false;
+      (expression.properties || []).forEach(prop => {
+        if (renameLayoutKey(prop)) {
+          changed = true;
+        }
+      });
+      if (changed) {
+        dirty = true;
+      }
+    }
+  });
+  return dirty ? root.toSource() : undefined;
+};
+module.exports.parser = 'tsx';

package/dist/codemods/transform-clerk-react-v6.cjs

@@ -42,16 +42,18 @@ module.exports = function transformClerkReactV6({
       }
       if (legacySpecifiers.length > 0 && nonLegacySpecifiers.length > 0) {
         // Mixed import: keep non-legacy on targetPackage, emit a new import for legacy hooks
-        node.specifiers = nonLegacySpecifiers;
-        node.source = j.literal(targetPackage);
+        // Use replaceWith to avoid formatting issues with insertAfter
+        const mainImport = j.importDeclaration(nonLegacySpecifiers, j.stringLiteral(targetPackage));
         if (importKind) {
-          node.importKind = importKind;
+          mainImport.importKind = importKind;
         }
-        const legacyImportDecl = j.importDeclaration(legacySpecifiers, j.literal(`${targetPackage}/legacy`));
+        // Preserve leading comments/whitespace from original import
+        mainImport.comments = node.comments;
+        const legacyImport = j.importDeclaration(legacySpecifiers, j.stringLiteral(`${targetPackage}/legacy`));
         if (importKind) {
-          legacyImportDecl.importKind = importKind;
+          legacyImport.importKind = importKind;
         }
-        j(path).insertAfter(legacyImportDecl);
+        j(path).replaceWith([mainImport, legacyImport]);
         dirtyFlag = true;
         return;
       }
@@ -127,6 +129,12 @@ module.exports = function transformClerkReactV6({
       dirtyFlag = true;
     });
   });
-  return dirtyFlag ? root.toSource() : undefined;
+  if (!dirtyFlag) {
+    return undefined;
+  }
+  let result = root.toSource();
+  // Fix double semicolons that can occur when recast reprints directive prologues (e.g., "use client";)
+  result = result.replace(/^(['"`][^'"`]+['"`]);;/gm, '$1;');
+  return result;
 };
 module.exports.parser = 'tsx';

package/dist/codemods/transform-remove-deprecated-appearance-props.cjs

@@ -0,0 +1,109 @@
+const VARIABLE_RENAMES = {
+  colorText: 'colorForeground',
+  colorTextSecondary: 'colorMutedForeground',
+  colorInputText: 'colorInputForeground',
+  colorInputBackground: 'colorInput',
+  colorTextOnPrimaryBackground: 'colorPrimaryForeground',
+  spacingUnit: 'spacing'
+};
+const isStringLiteral = node => node && node.type === 'Literal' && typeof node.value === 'string' || node && node.type === 'StringLiteral' && typeof node.value === 'string';
+const getKeyName = key => {
+  if (!key) {
+    return null;
+  }
+  if (key.type === 'Identifier') {
+    return key.name;
+  }
+  if (isStringLiteral(key)) {
+    return key.value;
+  }
+  return null;
+};
+module.exports = function transformRemoveDeprecatedAppearanceProps({
+  source
+}, {
+  jscodeshift: j
+}) {
+  const root = j(source);
+  let dirty = false;
+  const renamePropertyKey = (prop, newName) => {
+    if (j.Identifier.check(prop.key)) {
+      prop.key.name = newName;
+    } else if (isStringLiteral(prop.key)) {
+      prop.key.value = newName;
+    } else {
+      prop.key = j.identifier(newName);
+      prop.computed = false;
+    }
+    dirty = true;
+  };
+  const maybeRenameBaseTheme = prop => {
+    if (!prop || prop.computed) {
+      return;
+    }
+    if (getKeyName(prop.key) === 'baseTheme') {
+      renamePropertyKey(prop, 'theme');
+    }
+  };
+  const maybeRenameVariableKey = prop => {
+    if (!prop || prop.computed) {
+      return;
+    }
+    const keyName = getKeyName(prop.key);
+    const newName = VARIABLE_RENAMES[keyName];
+    if (newName) {
+      renamePropertyKey(prop, newName);
+    }
+  };
+  const transformAppearanceObject = objExpr => {
+    const props = objExpr.properties || [];
+    props.forEach(prop => {
+      if (!prop || !prop.key) {
+        return;
+      }
+      maybeRenameBaseTheme(prop);
+      if (getKeyName(prop.key) === 'variables' && j.ObjectExpression.check(prop.value)) {
+        (prop.value.properties || []).forEach(maybeRenameVariableKey);
+      }
+    });
+  };
+  const findObjectForIdentifier = identifier => {
+    if (!identifier || !j.Identifier.check(identifier)) {
+      return null;
+    }
+    const name = identifier.name;
+    const decl = root.find(j.VariableDeclarator, {
+      id: {
+        type: 'Identifier',
+        name
+      }
+    }).filter(p => j.ObjectExpression.check(p.node.init)).at(0);
+    if (decl.size() === 0) {
+      return null;
+    }
+    return decl.get().node.init;
+  };
+  root.find(j.JSXAttribute, {
+    name: {
+      name: 'appearance'
+    }
+  }).forEach(path => {
+    const {
+      value
+    } = path.node;
+    if (!value || !j.JSXExpressionContainer.check(value)) {
+      return;
+    }
+    const expr = value.expression;
+    if (j.ObjectExpression.check(expr)) {
+      transformAppearanceObject(expr);
+    } else if (j.Identifier.check(expr)) {
+      const obj = findObjectForIdentifier(expr);
+      if (obj) {
+        transformAppearanceObject(obj);
+      }
+    }
+  });
+  return dirty ? root.toSource() : undefined;
+};
+module.exports.parser = 'tsx';

package/dist/codemods/transform-remove-deprecated-props.cjs

@@ -22,8 +22,9 @@ const ORGANIZATION_SWITCHER_RENAMES = new Map([['afterSwitchOrganizationUrl', 'a
 module.exports = function transformDeprecatedProps({
   source
 }, {
-  jscodeshift: j
-}, options = {}) {
+  jscodeshift: j,
+  stats
+}) {
   const root = j(source);
   let dirty = false;
   const {
@@ -39,19 +40,17 @@ module.exports = function transformDeprecatedProps({
     if (COMPONENTS_WITH_HIDE_SLUG.has(canonicalName)) {
       if (removeJsxAttribute(j, jsxNode, 'hideSlug')) {
         dirty = true;
+        stats('hideSlugRemoved');
       }
     }
     if (COMPONENTS_WITH_USER_BUTTON_REMOVALS.has(canonicalName)) {
-      let removedCount = 0;
-      for (const attrName of COMPONENTS_WITH_USER_BUTTON_REMOVALS.get(canonicalName)) {
+      const propsToRemove = COMPONENTS_WITH_USER_BUTTON_REMOVALS.get(canonicalName);
+      for (const attrName of propsToRemove) {
         if (removeJsxAttribute(j, jsxNode, attrName)) {
           dirty = true;
-          removedCount += 1;
+          stats('userbuttonAfterSignOutPropsRemoved');
         }
       }
-      if (removedCount > 0 && options.clerkUpgradeStats) {
-        options.clerkUpgradeStats.userbuttonAfterSignOutPropsRemoved = (options.clerkUpgradeStats.userbuttonAfterSignOutPropsRemoved || 0) + removedCount;
-      }
     }
     if (COMPONENT_RENAMES.has(canonicalName)) {
       const renameMap = COMPONENT_RENAMES.get(canonicalName);
@@ -101,7 +100,7 @@ module.exports = function transformDeprecatedProps({
   if (renameObjectProperties(root, j, 'activeSessions', 'signedInSessions')) {
     dirty = true;
   }
-  if (transformSetActiveBeforeEmit(root, j)) {
+  if (transformSetActiveBeforeEmit(root, j, stats)) {
     dirty = true;
   }
   if (renameTypeReferences(root, j, 'ClerkMiddlewareAuthObject', 'ClerkMiddlewareSessionAuthObject')) {
@@ -324,7 +323,7 @@ function renameTSPropertySignatures(root, j, oldName, newName) {
   });
   return changed;
 }
-function transformSetActiveBeforeEmit(root, j) {
+function transformSetActiveBeforeEmit(root, j, stats) {
   let changed = false;
   root.find(j.CallExpression).filter(path => isSetActiveCall(path.node.callee)).forEach(path => {
     const [args0] = path.node.arguments;
@@ -348,6 +347,7 @@ function transformSetActiveBeforeEmit(root, j) {
     const navigateProp = j.objectProperty(j.identifier('navigate'), buildNavigateArrowFunction(j, originalValue));
     args0.properties.splice(beforeEmitIndex, 1, navigateProp);
     changed = true;
+    stats('beforeEmitTransformed');
   });
   return changed;
 }
@@ -378,8 +378,8 @@ function getPropertyValueExpression(valueNode) {
 }
 function buildNavigateArrowFunction(j, originalExpression) {
   const paramIdentifier = j.identifier('params');
-  const calleeExpression = clone(originalExpression);
-  const callExpression = j.callExpression(calleeExpression, [j.memberExpression(paramIdentifier, j.identifier('session'))]);
+  // No need to clone - we're moving the expression from beforeEmit to navigate
+  const callExpression = j.callExpression(originalExpression, [j.memberExpression(paramIdentifier, j.identifier('session'))]);
   return j.arrowFunctionExpression([paramIdentifier], callExpression);
 }
 function renameTypeReferences(root, j, oldName, newName) {