@uniformdev/next-app-router-upgrade 0.1.0 → 0.2.0

package/src/edge/vercel.js

@@ -1,360 +1,38 @@
 // Phase 2 on Vercel: turn on edge mode with vercelUniformEdgeMiddleware.
 // The steps follow "Set up edge mode on Vercel" in the docs.
 
-import fs from "node:fs";
-import path from "node:path";
-import ts from "typescript";
+import { migrateEdgeMiddleware, migrateRouteFile as migrateRoutes, planEdge, SDK } from "./common.js";
 
-import { addToBlock } from "../json-text.js";
-import { applyEdits } from "../migrate.js";
-import { listSourceFiles, scriptKind } from "../scan.js";
-
-const SDK = "@uniformdev/next-app-router";
 const VERCEL = `${SDK}/vercel`;
-const EDGE_HEADER = "x-uniform-edge-origin";
 const VERCEL_FUNCTIONS_RANGE = "^3.7.2";
-const DEFAULT_SOURCE = "/((?!api|_next/static|_next/image|favicon.ico|sitemap.xml|robots.txt).*)";
-const MISSING_RULE = `[{ type: "header", key: "${EDGE_HEADER}" }]`;
-const LITE = new Set(["uniformMiddleware"]);
+
+const HOST = {
+  factory: "vercelUniformEdgeMiddleware",
+  module: VERCEL,
+  runtime: true,
+  onRevalidateTags: {
+    name: "expireVercelRuntimeCacheTags",
+    module: VERCEL,
+    description: "Expire the Vercel runtime cache when content is published: onRevalidateTags: expireVercelRuntimeCacheTags.",
+  },
+  packages: [{ name: "@vercel/functions", range: VERCEL_FUNCTIONS_RANGE, description: "vercelUniformEdgeMiddleware needs it." }],
+  reminders: [
+    "If the deployment uses Vercel Deployment Protection, turn on Protection Bypass for Automation in the project settings. Then the edge middleware can fetch the page that it processes.",
+  ],
+};
 
 /**
  * Returns { changes, contents, manual, reminders } for phase 2 on Vercel. Reminders are not code changes.
  * `base` maps absolute paths to the text after phase 1, so that the two phases make one plan.
  */
-export function planVercelEdge(root, { base = new Map() } = {}) {
-  const read = (file) => base.get(file) ?? fs.readFileSync(file, "utf8");
-  const changes = [];
-  const contents = new Map();
-  const manual = [];
-  const save = (file, text, fileChanges) => {
-    if (text !== read(file)) contents.set(file, text);
-    changes.push(...fileChanges);
-  };
-
-  // Step 1: @vercel/functions.
-  const pkgFile = path.join(root, "package.json");
-  const pkgText = read(pkgFile);
-  const pkg = JSON.parse(pkgText);
-  if (!pkg.dependencies?.["@vercel/functions"] && !pkg.devDependencies?.["@vercel/functions"]) {
-    save(pkgFile, addToBlock(pkgText, "dependencies", "@vercel/functions", VERCEL_FUNCTIONS_RANGE), [
-      { file: "package.json", rule: "edge-vercel-functions", description: `Add @vercel/functions ${VERCEL_FUNCTIONS_RANGE}. vercelUniformEdgeMiddleware needs it.` },
-    ]);
-  }
-
-  // Step 2: the middleware.
-  const middleware = findMiddlewareFile(root);
-  if (!middleware) {
-    manual.push("No middleware.ts was found. Add middleware.ts with vercelUniformEdgeMiddleware, as in the docs.");
-  } else if (/^proxy\./.test(path.basename(middleware))) {
-    manual.push(
-      `${path.relative(root, middleware)}: edge mode needs middleware.ts with runtime "experimental-edge" (vercel/next.js#82344). Rename the file to middleware.ts, and then run the migration again.`
-    );
-  } else {
-    const result = migrateMiddleware(root, middleware, read(middleware));
-    save(middleware, result.text, result.changes);
-    manual.push(...result.manual);
-  }
-
-  // Steps 3 and 4: static params and the preview route, in all source files.
-  for (const file of listSourceFiles(root)) {
-    if (file === middleware) continue;
-    const text = read(file);
-    if (!text.includes(SDK)) continue;
-    const result = migrateRouteFile(root, file, text);
-    if (result.changes.length || result.manual.length) {
-      save(file, result.text, result.changes);
-      manual.push(...result.manual);
-    }
-  }
-
-  const reminders = [
-    "In Uniform, make sure that a webhook sends manifest.published, composition.*, entry.*, projectmap.node.* and redirect.* to /api/preview. The migration cannot check this.",
-  ];
-  return { changes, contents, manual, reminders };
-}
-
-function findMiddlewareFile(root) {
-  for (const dir of ["", "src"]) {
-    for (const name of ["middleware", "proxy"]) {
-      for (const ext of [".ts", ".js", ".mts", ".mjs", ".tsx", ".jsx"]) {
-        const file = path.join(root, dir, name + ext);
-        if (fs.existsSync(file)) return file;
-      }
-    }
-  }
-  return undefined;
-}
-
-function parse(file, text) {
-  return ts.createSourceFile(file, text, ts.ScriptTarget.Latest, true, scriptKind(file));
+export function planVercelEdge(root, { base } = {}) {
+  return planEdge(root, { base, host: HOST });
 }
 
-function sdkImports(sf) {
-  const locals = new Map();
-  for (const statement of sf.statements) {
-    if (!ts.isImportDeclaration(statement) || !ts.isStringLiteral(statement.moduleSpecifier)) continue;
-    const module = statement.moduleSpecifier.text;
-    if (!module.startsWith(SDK)) continue;
-    const bindings = statement.importClause?.namedBindings;
-    if (bindings && ts.isNamedImports(bindings)) {
-      for (const element of bindings.elements) {
-        locals.set(element.name.text, { module, imported: (element.propertyName ?? element.name).text, element, statement });
-      }
-    }
-  }
-  return locals;
-}
-
-// The middleware file
-
 export function migrateMiddleware(root, file, text) {
-  const sf = parse(file, text);
-  const rel = path.relative(root, file);
-  const lineOf = (node) => sf.getLineAndCharacterOfPosition(node.getStart(sf)).line + 1;
-  const edits = [];
-  const changes = [];
-  const manual = [];
-  const record = (node, description) => changes.push({ file: rel, line: node ? lineOf(node) : undefined, rule: "edge-middleware", description });
-
-  const locals = sdkImports(sf);
-  const usesEdge = [...locals.values()].some((info) => info.module === VERCEL && info.imported === "vercelUniformEdgeMiddleware");
-  const lite = [...locals.entries()].find(([, info]) => info.module === `${SDK}/middleware` && LITE.has(info.imported));
-  const handle = [...locals.entries()].find(([, info]) => info.module === `${SDK}/middleware` && info.imported === "handleUniformRoute");
-
-  if (!usesEdge && lite) {
-    const [local, info] = lite;
-    // Swap the factory only when each reference is a call: uniformMiddleware({ ... }).
-    const references = [];
-    let other = false;
-    const visit = (node) => {
-      if (ts.isIdentifier(node) && node.text === local && node !== info.element.name && !ts.isImportSpecifier(node.parent)) {
-        if (ts.isCallExpression(node.parent) && node.parent.expression === node) references.push(node);
-        else other = true;
-      }
-      ts.forEachChild(node, visit);
-    };
-    visit(sf);
-
-    if (other || !references.length) {
-      manual.push(`${rel}: ${local} is used in a way that the migration cannot change. Replace it with vercelUniformEdgeMiddleware from ${VERCEL}.`);
-    } else {
-      for (const reference of references) {
-        edits.push({ start: reference.getStart(sf), end: reference.end, text: "vercelUniformEdgeMiddleware" });
-        record(reference, `Replace ${local}(...) with vercelUniformEdgeMiddleware(...). It accepts the same options.`);
-      }
-      edits.push(...replaceImport(sf, info, "vercelUniformEdgeMiddleware", VERCEL));
-    }
-  } else if (!usesEdge && handle) {
-    manual.push(
-      `${rel}: the middleware calls handleUniformRoute in a custom function. Replace it with vercelUniformEdgeMiddleware(options)(request, event), or with handleUniformEdgeRoute. The migration does not change custom middleware.`
-    );
-  } else if (!usesEdge) {
-    manual.push(`${rel}: the middleware does not use uniformMiddleware. Add vercelUniformEdgeMiddleware, as in the docs.`);
-  }
-
-  // export const config = { matcher, runtime }
-  const config = findExportedConst(sf, "config");
-  if (!config) {
-    const block = `\nexport const config = {\n  matcher: [\n    {\n      source: "${DEFAULT_SOURCE}",\n      missing: ${MISSING_RULE},\n    },\n  ],\n  runtime: "experimental-edge",\n};\n`;
-    edits.push({ start: text.length, end: text.length, text: (text.endsWith("\n") ? "" : "\n") + block });
-    record(undefined, "Add the middleware config: the default matcher of the docs with the missing header rule, and runtime \"experimental-edge\". Before, the middleware ran on all paths.");
-  } else if (!ts.isObjectLiteralExpression(config)) {
-    manual.push(`${rel}: the middleware config is not an object literal. Add missing: ${MISSING_RULE} to each matcher, and runtime: "experimental-edge".`);
-  } else {
-    const matcher = findProperty(config, "matcher");
-    if (!matcher) {
-      edits.push(insertProperty(sf, config, `matcher: [{ source: "${DEFAULT_SOURCE}", missing: ${MISSING_RULE} }]`));
-      record(config, "Add a matcher with the missing header rule.");
-    } else if (ts.isPropertyAssignment(matcher)) {
-      const value = matcher.initializer;
-      if (ts.isStringLiteral(value) || ts.isNoSubstitutionTemplateLiteral(value)) {
-        edits.push({ start: value.getStart(sf), end: value.end, text: `[{ source: ${value.getText(sf)}, missing: ${MISSING_RULE} }]` });
-        record(matcher, "Change the matcher to an object with the missing header rule.");
-      } else if (ts.isArrayLiteralExpression(value)) {
-        for (const element of value.elements) {
-          if (ts.isStringLiteral(element) || ts.isNoSubstitutionTemplateLiteral(element)) {
-            edits.push({ start: element.getStart(sf), end: element.end, text: `{ source: ${element.getText(sf)}, missing: ${MISSING_RULE} }` });
-            record(element, "Add the missing header rule to the matcher.");
-          } else if (ts.isObjectLiteralExpression(element)) {
-            const missing = findProperty(element, "missing");
-            if (!missing) {
-              edits.push(insertProperty(sf, element, `missing: ${MISSING_RULE}`));
-              record(element, "Add the missing header rule to the matcher.");
-            } else if (!missing.getText(sf).includes(EDGE_HEADER)) {
-              if (ts.isPropertyAssignment(missing) && ts.isArrayLiteralExpression(missing.initializer)) {
-                edits.push(insertArrayElement(sf, missing.initializer, `{ type: "header", key: "${EDGE_HEADER}" }`));
-                record(missing, "Add the edge origin header to the missing rules of the matcher.");
-              } else {
-                manual.push(`${rel}:${lineOf(missing)}: add { type: "header", key: "${EDGE_HEADER}" } to the missing rules.`);
-              }
-            }
-          } else {
-            manual.push(`${rel}:${lineOf(element)}: add missing: ${MISSING_RULE} to this matcher.`);
-          }
-        }
-      } else {
-        manual.push(`${rel}:${lineOf(matcher)}: the matcher is not a literal. Add missing: ${MISSING_RULE} to each matcher.`);
-      }
-    }
-
-    const runtime = findProperty(config, "runtime");
-    if (!runtime) {
-      edits.push(insertProperty(sf, config, 'runtime: "experimental-edge"'));
-      record(config, 'Add runtime: "experimental-edge". The edge middleware needs the edge runtime.');
-    } else if (!/["'`](experimental-)?edge["'`]/.test(runtime.getText(sf))) {
-      manual.push(`${rel}:${lineOf(runtime)}: set runtime to "experimental-edge". The edge middleware needs the edge runtime (vercel/next.js#82344).`);
-    }
-  }
-
-  return { text: applyEdits(text, mergeInsertions(edits)), changes, manual };
+  return migrateEdgeMiddleware(root, file, text, HOST);
 }
 
-function findExportedConst(sf, name) {
-  for (const statement of sf.statements) {
-    if (!ts.isVariableStatement(statement)) continue;
-    if (!statement.modifiers?.some((m) => m.kind === ts.SyntaxKind.ExportKeyword)) continue;
-    for (const declaration of statement.declarationList.declarations) {
-      if (ts.isIdentifier(declaration.name) && declaration.name.text === name) {
-        let value = declaration.initializer;
-        while (value && (ts.isSatisfiesExpression?.(value) || ts.isAsExpression(value) || ts.isParenthesizedExpression(value))) value = value.expression;
-        return value;
-      }
-    }
-  }
-  return undefined;
-}
-
-function findProperty(object, name) {
-  return object.properties.find((p) => p.name && (ts.isIdentifier(p.name) || ts.isStringLiteral(p.name)) && p.name.text === name);
-}
-
-// Route files: createUniformStaticParams and createPreviewPOSTRouteHandler
-
 export function migrateRouteFile(root, file, text) {
-  const sf = parse(file, text);
-  const rel = path.relative(root, file);
-  const lineOf = (node) => sf.getLineAndCharacterOfPosition(node.getStart(sf)).line + 1;
-  const edits = [];
-  const changes = [];
-  const manual = [];
-  const locals = sdkImports(sf);
-  const isCall = (node, imported) =>
-    ts.isCallExpression(node) && ts.isIdentifier(node.expression) && locals.get(node.expression.text)?.imported === imported;
-  let needsExpireImport = false;
-  const hasExpireImport = [...locals.values()].some((info) => info.imported === "expireVercelRuntimeCacheTags");
-
-  const visit = (node) => {
-    if (isCall(node, "createUniformStaticParams")) {
-      const options = node.arguments[0];
-      if (options && ts.isObjectLiteralExpression(options)) {
-        const edgeMode = findProperty(options, "edgeMode");
-        if (!edgeMode) {
-          edits.push(insertProperty(sf, options, "edgeMode: [true, false]"));
-          changes.push({ file: rel, line: lineOf(node), rule: "edge-static-params", description: "Add edgeMode: [true, false], so that the build prebuilds both edge mode values." });
-        } else if (!/\btrue\b/.test(edgeMode.getText(sf))) {
-          manual.push(`${rel}:${lineOf(edgeMode)}: add true to the edgeMode option of createUniformStaticParams.`);
-        }
-      } else {
-        manual.push(`${rel}:${lineOf(node)}: add edgeMode: [true, false] to the options of createUniformStaticParams.`);
-      }
-    }
-
-    if (isCall(node, "createPreviewPOSTRouteHandler")) {
-      const options = node.arguments[0];
-      if (!options) {
-        const open = sf.getFullText().indexOf("(", node.expression.end);
-        edits.push({ start: open + 1, end: node.arguments.end, text: "{ onRevalidateTags: expireVercelRuntimeCacheTags }" });
-        changes.push({ file: rel, line: lineOf(node), rule: "edge-preview-route", description: "Expire the Vercel runtime cache when content is published: onRevalidateTags: expireVercelRuntimeCacheTags." });
-        needsExpireImport = true;
-      } else if (ts.isObjectLiteralExpression(options)) {
-        const existing = findProperty(options, "onRevalidateTags");
-        if (!existing) {
-          edits.push(insertProperty(sf, options, "onRevalidateTags: expireVercelRuntimeCacheTags"));
-          changes.push({ file: rel, line: lineOf(node), rule: "edge-preview-route", description: "Expire the Vercel runtime cache when content is published: onRevalidateTags: expireVercelRuntimeCacheTags." });
-          needsExpireImport = true;
-        } else if (!existing.getText(sf).includes("expireVercelRuntimeCacheTags")) {
-          manual.push(`${rel}:${lineOf(existing)}: you have your own onRevalidateTags. Also call expireVercelRuntimeCacheTags(tags) from ${VERCEL} in it.`);
-        }
-      } else {
-        manual.push(`${rel}:${lineOf(node)}: add onRevalidateTags: expireVercelRuntimeCacheTags to the options of createPreviewPOSTRouteHandler.`);
-      }
-    }
-    ts.forEachChild(node, visit);
-  };
-  visit(sf);
-
-  if (needsExpireImport && !hasExpireImport) edits.push(...addNamedImport(sf, "expireVercelRuntimeCacheTags", VERCEL));
-  return { text: applyEdits(text, mergeInsertions(edits)), changes, manual };
-}
-
-// Text edits
-
-/** Inserts `property` as the last property of `object`, in the style of the object. */
-function insertProperty(sf, object, property) {
-  const text = sf.getFullText();
-  const props = object.properties;
-  if (!props.length) {
-    return { start: object.getStart(sf) + 1, end: object.end - 1, text: ` ${property} ` };
-  }
-  const last = props[props.length - 1];
-  let at = last.end;
-  const comma = /^\s*,/.exec(text.slice(at));
-  const trailingComma = Boolean(comma);
-  if (comma) at += comma[0].length;
-  const multiline = text.slice(object.getStart(sf), object.end).includes("\n");
-  if (!multiline) return { start: at, end: at, text: `${trailingComma ? "" : ","} ${property}${trailingComma ? "," : ""}` };
-  const indent = /([ \t]*)$/.exec(text.slice(0, last.getStart(sf)))[1];
-  return { start: at, end: at, text: `${trailingComma ? "" : ","}\n${indent}${property}${trailingComma ? "," : ""}` };
-}
-
-function insertArrayElement(sf, array, element) {
-  const fake = { properties: array.elements, getStart: (s) => array.getStart(s), end: array.end };
-  return insertProperty(sf, fake, element);
-}
-
-/** Replaces the import of `info` with `name` from `module`. */
-function replaceImport(sf, info, name, module) {
-  const statement = info.statement;
-  const named = statement.importClause.namedBindings;
-  const quote = statement.moduleSpecifier.getText(sf)[0];
-  const line = `import { ${name} } from ${quote}${module}${quote};`;
-  if (named.elements.length === 1 && !statement.importClause.name) {
-    return [{ start: statement.getStart(sf), end: statement.end, text: line }];
-  }
-  // Remove the specifier, and add the new import after the statement.
-  const elements = [...named.elements];
-  const i = elements.indexOf(info.element);
-  const removal =
-    i < elements.length - 1
-      ? { start: info.element.getStart(sf), end: elements[i + 1].getStart(sf), text: "" }
-      : { start: elements[i - 1].end, end: info.element.end, text: "" };
-  return [removal, { start: statement.end, end: statement.end, text: `\n${line}` }];
-}
-
-/** Adds `import { name } from module`, or adds `name` to an existing import from the module. */
-function addNamedImport(sf, name, module) {
-  const imports = sf.statements.filter(ts.isImportDeclaration);
-  const existing = imports.find((s) => ts.isStringLiteral(s.moduleSpecifier) && s.moduleSpecifier.text === module && s.importClause?.namedBindings && ts.isNamedImports(s.importClause.namedBindings));
-  if (existing) {
-    const elements = existing.importClause.namedBindings.elements;
-    const last = elements[elements.length - 1];
-    return [{ start: last.end, end: last.end, text: `, ${name}` }];
-  }
-  const quote = imports[0]?.moduleSpecifier.getText(sf)[0] ?? '"';
-  const line = `import { ${name} } from ${quote}${module}${quote};`;
-  const after = imports[imports.length - 1];
-  if (after) return [{ start: after.end, end: after.end, text: `\n${line}` }];
-  return [{ start: 0, end: 0, text: `${line}\n` }];
-}
-
-/** Joins insertions at the same position, so that applyEdits accepts them. */
-function mergeInsertions(edits) {
-  const out = [];
-  for (const edit of [...edits].sort((a, b) => a.start - b.start || a.end - b.end)) {
-    const previous = out[out.length - 1];
-    if (previous && previous.start === edit.start && previous.end === previous.start && edit.end === edit.start) {
-      previous.text += edit.text;
-    } else out.push({ ...edit });
-  }
-  return out;
+  return migrateRoutes(root, file, text, { onRevalidateTags: HOST.onRevalidateTags });
 }

package/src/migrate.js

@@ -6,6 +6,7 @@ import fs from "node:fs";
 import path from "node:path";
 import ts from "typescript";
 
+import { COMPOSITION_METADATA, findClientContextIssues } from "./client-context.js";
 import { TARGET_VERSION } from "./report.js";
 import { addToBlock, setValueInBlock } from "./json-text.js";
 import { REMOVED_EXPORTS } from "./rules.js";
@@ -14,7 +15,7 @@ import { listSourceFiles, scriptKind } from "./scan.js";
 const SDK = "@uniformdev/next-app-router";
 // These packages have their own version line. The registry check also finds such packages.
 const SEPARATE_VERSION_LINE = new Set(["@uniformdev/toolbar-react", "@uniformdev/context-edge"]);
-// 20.82.0 installed this version of @vercel/functions as a dependency of the SDK.
+// The stable SDK (20.82 to 20.85) installs this version of @vercel/functions as a dependency.
 const VERCEL_FUNCTIONS_RANGE = "^3.7.2";
 const DEFAULT_DATA_CLIENT = "DefaultDataClient";
 
@@ -102,7 +103,7 @@ export function migratePackageJson(text, { importsVercelFunctions, packageManage
     out = addToBlock(out, "dependencies", "@vercel/functions", VERCEL_FUNCTIONS_RANGE);
     changes.push({
       rule: "vercel-functions-transitive",
-      description: `Add @vercel/functions ${VERCEL_FUNCTIONS_RANGE} to dependencies. Version 20.82 installed it for you.`,
+      description: `Add @vercel/functions ${VERCEL_FUNCTIONS_RANGE} to dependencies. The stable SDK installs it for you.`,
     });
   }
 
@@ -219,9 +220,8 @@ export function migrateSourceFile(root, file, text) {
   };
   visit(sf);
 
-  if (!removals.length) return { text, changes: [], importsVercelFunctions };
-
-  const edits = editsForRemovals(sf, removals);
+  const edits = [...editsForRemovals(sf, removals), ...editsForClientContext(sf, sdkLocals, record)];
+  if (!edits.length) return { text, changes: [], importsVercelFunctions };
 
   // Remove the imports of removed exports that the changes leave without a reference.
   const removedRanges = edits.map((edit) => [edit.start, edit.end]);
@@ -238,6 +238,36 @@ export function migrateSourceFile(root, file, text) {
   return { text: applyEdits(text, edits), changes, importsVercelFunctions };
 }
 
+// The SDK now sends the composition metadata of the page composition to the Context, so the
+// compositionMetadata argument of useInitUniformContext and its prop have no effect.
+function editsForClientContext(sf, sdkLocals, record) {
+  const text = sf.getFullText();
+  const { hookArguments, props } = findClientContextIssues(sf, sdkLocals);
+  const edits = [];
+  for (const { call, argument, removable } of hookArguments) {
+    if (!removable) continue;
+    let end = argument.end;
+    const comma = /^\s*,/.exec(text.slice(end));
+    if (comma) end += comma[0].length;
+    edits.push({ start: call.arguments[0].end, end, text: "" });
+    record(argument, "context-composition-metadata", "Remove the compositionMetadata argument of useInitUniformContext. The SDK sends the metadata of the page composition.");
+  }
+
+  const removedRanges = edits.map((edit) => [edit.start, edit.end]);
+  const byPattern = new Map();
+  for (const { element, pattern, fn, name } of props) {
+    if (name !== COMPOSITION_METADATA || !ts.isIdentifier(element.name)) continue;
+    if (hasReference(fn, element.name.text, element, removedRanges, sf)) continue;
+    if (!byPattern.has(pattern)) byPattern.set(pattern, new Set());
+    byPattern.get(pattern).add(element);
+    record(element, "context-composition-metadata", "Remove the compositionMetadata prop. ClientContextComponentProps no longer has it.");
+  }
+  for (const [pattern, elements] of byPattern) {
+    edits.push(...editsForListRemoval(sf, pattern.elements, elements, () => ({ start: pattern.getStart(sf), end: pattern.end, text: "{}" })));
+  }
+  return edits;
+}
+
 function propertyName(name) {
   if (ts.isIdentifier(name) || ts.isStringLiteral(name)) return name.text;
   return undefined;
@@ -253,14 +283,14 @@ function isServerConfigObject(node, isConfigFile) {
   return false;
 }
 
-// True when `local` has a reference in the file outside the import and outside the removed ranges.
-function hasReference(sf, local, importElement, removedRanges) {
+// True when `local` has a reference in `scope` outside its declaration and outside the removed ranges.
+function hasReference(scope, local, declaration, removedRanges, sf = scope) {
   let found = false;
   const inside = (pos) => removedRanges.some(([start, end]) => pos >= start && pos < end);
   const visit = (node) => {
     if (found) return;
     if (ts.isImportDeclaration(node)) return;
-    if (ts.isIdentifier(node) && node.text === local && node !== importElement.name && !inside(node.getStart(sf))) {
+    if (ts.isIdentifier(node) && node.text === local && node !== declaration.name && !inside(node.getStart(sf))) {
       // Skip the name part of a property access (x.local) and property names ({ local: x }).
       const parent = node.parent;
       const isMemberName = (ts.isPropertyAccessExpression(parent) && parent.name === node) || (ts.isPropertyAssignment(parent) && parent.name === node);
@@ -268,7 +298,7 @@ function hasReference(sf, local, importElement, removedRanges) {
     }
     ts.forEachChild(node, visit);
   };
-  visit(sf);
+  visit(scope);
   return found;
 }
 

package/src/report.js

@@ -1,7 +1,7 @@
 const ORDER = { error: 0, warning: 1, info: 2 };
 const LABEL = { error: "CODE CHANGE NEEDED", warning: "REVIEW", info: "NOTE" };
 
-export const TARGET_VERSION = "20.81.1-alpha.25.sha-f076f9b857";
+export const TARGET_VERSION = "20.81.1-alpha.41.sha-adcf82dedd";
 
 export function verdict(findings, { strict = false } = {}) {
   const errors = findings.filter((f) => f.severity === "error").length;

package/src/rules.js

@@ -1,5 +1,5 @@
-// Each rule describes one change between @uniformdev/next-app-router 20.82 and the
-// developer preview (20.81.1-alpha.25). "error" rules fail to compile or break at
+// Each rule describes one change between the stable @uniformdev/next-app-router (20.82 to 20.85)
+// and the developer preview (20.81.1-alpha.41). "error" rules fail to compile or break at
 // runtime. "warning" rules change behavior. "info" rules need no change.
 
 const DOCS = "https://docs.uniform.app/docs/sdk/nextjs-app-router";
@@ -78,6 +78,21 @@ export const RULES = {
     title: "Next.js version is lower than 16.0.7",
     docs: `${DOCS}#prerequisites`,
   },
+  "context-composition-metadata": {
+    severity: "error",
+    title: "compositionMetadata in a custom client context component",
+    docs: `${DOCS}/client-context`,
+  },
+  "context-storage-options": {
+    severity: "error",
+    title: "Visitor data option of 20.85 that the developer preview does not have",
+    docs: `${DOCS}/client-context`,
+  },
+  "uniform-context-props": {
+    severity: "error",
+    title: "UniformContext with result or children (changed after alpha.25)",
+    docs: `${DOCS}/client-context`,
+  },
   "vercel-functions-transitive": {
     severity: "error",
     title: "@vercel/functions is imported but not a dependency",
@@ -148,6 +163,11 @@ export const RULES = {
     title: "@uniformdev/context-edge is no longer necessary",
     docs: `${UPGRADE}#step-1-install-the-packages`,
   },
+  "playground-path": {
+    severity: "info",
+    title: "The middleware accepts processPlaygroundPath",
+    docs: `${DOCS}/preview`,
+  },
   "redirect-status": {
     severity: "info",
     title: "Uniform redirects now come from the page (308 or 307)",