@akinon/projectzero 2.0.15-beta.0 → 2.0.15

package/CHANGELOG.md

@@ -1,6 +1,10 @@
 # @akinon/projectzero
 
-## 2.0.15-beta.0
+## 2.0.15
+
+### Patch Changes
+
+- 5df7a236: ZERO-4479: Add migrate-page-types codemod (PageProps -> AsyncPageProps/ResolvedPageProps) and integrate into upgrade-to-2
 
 ## 2.0.14
 

package/app-template/CHANGELOG.md

@@ -1,37 +1,36 @@
 # projectzeronext
 
-## 2.0.15-beta.0
-
-### Patch Changes
-
-- Updated dependencies [cbbbfd75]
-  - @akinon/next@2.0.15-beta.0
-  - @akinon/pz-theme@2.0.15-beta.0
-  - @akinon/pz-virtual-try-on@2.0.15-beta.0
-  - @akinon/pz-akifast@2.0.15-beta.0
-  - @akinon/pz-apple-pay@2.0.15-beta.0
-  - @akinon/pz-b2b@2.0.15-beta.0
-  - @akinon/pz-basket-gift-pack@2.0.15-beta.0
-  - @akinon/pz-bkm@2.0.15-beta.0
-  - @akinon/pz-checkout-gift-pack@2.0.15-beta.0
-  - @akinon/pz-click-collect@2.0.15-beta.0
-  - @akinon/pz-credit-payment@2.0.15-beta.0
-  - @akinon/pz-cybersource-uc@2.0.15-beta.0
-  - @akinon/pz-flow-payment@2.0.15-beta.0
-  - @akinon/pz-google-pay@2.0.15-beta.0
-  - @akinon/pz-gpay@2.0.15-beta.0
-  - @akinon/pz-haso@2.0.15-beta.0
-  - @akinon/pz-hepsipay@2.0.15-beta.0
-  - @akinon/pz-masterpass@2.0.15-beta.0
-  - @akinon/pz-masterpass-rest@2.0.15-beta.0
-  - @akinon/pz-multi-basket@2.0.15-beta.0
-  - @akinon/pz-one-click-checkout@2.0.15-beta.0
-  - @akinon/pz-otp@2.0.15-beta.0
-  - @akinon/pz-pay-on-delivery@2.0.15-beta.0
-  - @akinon/pz-saved-card@2.0.15-beta.0
-  - @akinon/pz-similar-products@2.0.15-beta.0
-  - @akinon/pz-tabby-extension@2.0.15-beta.0
-  - @akinon/pz-tamara-extension@2.0.15-beta.0
+## 2.0.15
+
+### Patch Changes
+
+- @akinon/next@2.0.15
+- @akinon/pz-akifast@2.0.15
+- @akinon/pz-apple-pay@2.0.15
+- @akinon/pz-b2b@2.0.15
+- @akinon/pz-basket-gift-pack@2.0.15
+- @akinon/pz-bkm@2.0.15
+- @akinon/pz-checkout-gift-pack@2.0.15
+- @akinon/pz-click-collect@2.0.15
+- @akinon/pz-credit-payment@2.0.15
+- @akinon/pz-cybersource-uc@2.0.15
+- @akinon/pz-flow-payment@2.0.15
+- @akinon/pz-google-pay@2.0.15
+- @akinon/pz-gpay@2.0.15
+- @akinon/pz-haso@2.0.15
+- @akinon/pz-hepsipay@2.0.15
+- @akinon/pz-masterpass@2.0.15
+- @akinon/pz-masterpass-rest@2.0.15
+- @akinon/pz-multi-basket@2.0.15
+- @akinon/pz-one-click-checkout@2.0.15
+- @akinon/pz-otp@2.0.15
+- @akinon/pz-pay-on-delivery@2.0.15
+- @akinon/pz-saved-card@2.0.15
+- @akinon/pz-similar-products@2.0.15
+- @akinon/pz-tabby-extension@2.0.15
+- @akinon/pz-tamara-extension@2.0.15
+- @akinon/pz-theme@2.0.15
+- @akinon/pz-virtual-try-on@2.0.15
 
 ## 2.0.14
 

package/app-template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "projectzeronext",
-  "version": "2.0.15-beta.0",
+  "version": "2.0.15",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -24,33 +24,33 @@
     "test:middleware": "jest middleware-matcher.test.ts --bail"
   },
   "dependencies": {
-    "@akinon/next": "2.0.15-beta.0",
-    "@akinon/pz-akifast": "2.0.15-beta.0",
-    "@akinon/pz-apple-pay": "2.0.15-beta.0",
-    "@akinon/pz-b2b": "2.0.15-beta.0",
-    "@akinon/pz-basket-gift-pack": "2.0.15-beta.0",
-    "@akinon/pz-bkm": "2.0.15-beta.0",
-    "@akinon/pz-checkout-gift-pack": "2.0.15-beta.0",
-    "@akinon/pz-click-collect": "2.0.15-beta.0",
-    "@akinon/pz-credit-payment": "2.0.15-beta.0",
-    "@akinon/pz-cybersource-uc": "2.0.15-beta.0",
-    "@akinon/pz-flow-payment": "2.0.15-beta.0",
-    "@akinon/pz-google-pay": "2.0.15-beta.0",
-    "@akinon/pz-gpay": "2.0.15-beta.0",
-    "@akinon/pz-haso": "2.0.15-beta.0",
-    "@akinon/pz-hepsipay": "2.0.15-beta.0",
-    "@akinon/pz-masterpass": "2.0.15-beta.0",
-    "@akinon/pz-masterpass-rest": "2.0.15-beta.0",
-    "@akinon/pz-multi-basket": "2.0.15-beta.0",
-    "@akinon/pz-one-click-checkout": "2.0.15-beta.0",
-    "@akinon/pz-otp": "2.0.15-beta.0",
-    "@akinon/pz-pay-on-delivery": "2.0.15-beta.0",
-    "@akinon/pz-saved-card": "2.0.15-beta.0",
-    "@akinon/pz-similar-products": "2.0.15-beta.0",
-    "@akinon/pz-tabby-extension": "2.0.15-beta.0",
-    "@akinon/pz-tamara-extension": "2.0.15-beta.0",
-    "@akinon/pz-theme": "2.0.15-beta.0",
-    "@akinon/pz-virtual-try-on": "2.0.15-beta.0",
+    "@akinon/next": "2.0.15",
+    "@akinon/pz-akifast": "2.0.15",
+    "@akinon/pz-apple-pay": "2.0.15",
+    "@akinon/pz-b2b": "2.0.15",
+    "@akinon/pz-basket-gift-pack": "2.0.15",
+    "@akinon/pz-bkm": "2.0.15",
+    "@akinon/pz-checkout-gift-pack": "2.0.15",
+    "@akinon/pz-click-collect": "2.0.15",
+    "@akinon/pz-credit-payment": "2.0.15",
+    "@akinon/pz-cybersource-uc": "2.0.15",
+    "@akinon/pz-flow-payment": "2.0.15",
+    "@akinon/pz-google-pay": "2.0.15",
+    "@akinon/pz-gpay": "2.0.15",
+    "@akinon/pz-haso": "2.0.15",
+    "@akinon/pz-hepsipay": "2.0.15",
+    "@akinon/pz-masterpass": "2.0.15",
+    "@akinon/pz-masterpass-rest": "2.0.15",
+    "@akinon/pz-multi-basket": "2.0.15",
+    "@akinon/pz-one-click-checkout": "2.0.15",
+    "@akinon/pz-otp": "2.0.15",
+    "@akinon/pz-pay-on-delivery": "2.0.15",
+    "@akinon/pz-saved-card": "2.0.15",
+    "@akinon/pz-similar-products": "2.0.15",
+    "@akinon/pz-tabby-extension": "2.0.15",
+    "@akinon/pz-tamara-extension": "2.0.15",
+    "@akinon/pz-theme": "2.0.15",
+    "@akinon/pz-virtual-try-on": "2.0.15",
     "@hookform/resolvers": "2.9.0",
     "@next/third-parties": "16.2.6",
     "@react-google-maps/api": "2.17.1",
@@ -74,7 +74,7 @@
     "yup": "0.32.11"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "2.0.15-beta.0",
+    "@akinon/eslint-plugin-projectzero": "2.0.15",
     "@semantic-release/changelog": "6.0.2",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",

package/codemods/migrate-page-types/index.js

@@ -0,0 +1,75 @@
+/**
+ * migrate-page-types: rewrites `PageProps<T>` from `@akinon/next/types` into
+ * `AsyncPageProps<T>` / `ResolvedPageProps<T>` across a brand's `src/`.
+ *
+ * Why: `@next/codemod next-async-request-api` updates the call sites
+ * (`await props.params`, `use(props.params)`), but the @akinon/next legacy
+ * `PageProps<T>` type is still sync and clashes with Next 16's internal
+ * `.next/types/.../page.ts` validator. Manually fixing every brand on every
+ * upgrade is the same change repeated — this codemod automates it.
+ *
+ * Usage:
+ *   cd <brand-root>
+ *   npx @akinon/projectzero codemod --codemod=migrate-page-types [--dry-run]
+ *
+ * Or via the upgrade-to-2 chain (no flag needed).
+ */
+
+const path = require('path');
+const fs = require('fs');
+const jscodeshift = require('jscodeshift/src/Runner');
+
+function log(msg) {
+  const ts = new Date().toISOString().replace('T', ' ').slice(0, 19);
+  console.log(`[${ts}] [migrate-page-types] ${msg}`);
+}
+
+const transform = () => {
+  const workingDir = path.resolve(process.cwd());
+  const dryRun = process.argv.includes('--dry-run');
+
+  log(`starting in ${workingDir}${dryRun ? ' (DRY RUN)' : ''}`);
+
+  const srcDir = path.join(workingDir, 'src');
+  if (!fs.existsSync(srcDir)) {
+    log('No src/ directory found, nothing to migrate.');
+    return Promise.resolve();
+  }
+
+  const transformPath = path.resolve(__dirname, 'transform.js');
+
+  return jscodeshift
+    .run(transformPath, [srcDir], {
+      verbose: 0,
+      dry: Boolean(dryRun),
+      print: Boolean(dryRun),
+      extensions: 'ts,tsx',
+      parser: 'tsx',
+      ignorePattern: '**/node_modules/**',
+      silent: true
+    })
+    .then(
+      (stats) => {
+        log(
+          `${stats.ok} changed, ${stats.nochange} unchanged, ${stats.error} errored`
+        );
+        log('done');
+      },
+      (err) => {
+        log(`FAILED: ${err.message}`);
+        throw err;
+      }
+    );
+};
+
+module.exports = { transform };
+
+if (require.main === module) {
+  const result = transform();
+  if (result && typeof result.then === 'function') {
+    result.catch((err) => {
+      console.error(err);
+      process.exit(1);
+    });
+  }
+}

package/codemods/migrate-page-types/transform.js

@@ -0,0 +1,169 @@
+/**
+ * jscodeshift transform: rewrite `PageProps<T>` from `@akinon/next/types`
+ * into `AsyncPageProps<T>` or `ResolvedPageProps<T>` per usage context.
+ *
+ * Heuristic per occurrence:
+ *   - Enclosing function is `generateMetadata` → AsyncPageProps
+ *   - Body uses `await props.params` / `await props.searchParams` or
+ *     `use(props.params)` / `use(props.searchParams)` → AsyncPageProps
+ *   - Otherwise (destructured params accessed synchronously, typical Page
+ *     wrapped in `withSegmentDefaults`) → ResolvedPageProps
+ *
+ * Import is rewritten: PageProps removed, AsyncPageProps / ResolvedPageProps
+ * added as needed, sorted alphabetically (matches prettier output).
+ */
+
+const TARGET_IMPORT = '@akinon/next/types';
+
+function getEnclosingFunction(path) {
+  let cur = path;
+  while (cur.parent) {
+    cur = cur.parent;
+    const t = cur.node && cur.node.type;
+    if (
+      t === 'FunctionDeclaration' ||
+      t === 'FunctionExpression' ||
+      t === 'ArrowFunctionExpression'
+    ) {
+      return cur;
+    }
+  }
+  return null;
+}
+
+function getFunctionName(fnPath) {
+  const node = fnPath.node;
+  if (node.id && node.id.name) return node.id.name;
+  let p = fnPath.parent;
+  while (p) {
+    const t = p.node && p.node.type;
+    if (t === 'VariableDeclarator' && p.node.id && p.node.id.name) {
+      return p.node.id.name;
+    }
+    if (
+      t === 'Property' ||
+      t === 'ObjectProperty' ||
+      t === 'MethodDefinition'
+    ) {
+      const key = p.node.key;
+      if (key && key.name) return key.name;
+    }
+    if (
+      t === 'FunctionDeclaration' ||
+      t === 'FunctionExpression' ||
+      t === 'ArrowFunctionExpression'
+    ) {
+      break;
+    }
+    p = p.parent;
+  }
+  return null;
+}
+
+function bodyUsesAsyncResolve(fnPath, j) {
+  let found = false;
+  const isParamsMember = (node) =>
+    node &&
+    node.type === 'MemberExpression' &&
+    node.property &&
+    (node.property.name === 'params' ||
+      node.property.name === 'searchParams');
+
+  j(fnPath)
+    .find(j.AwaitExpression)
+    .forEach((awaitPath) => {
+      if (isParamsMember(awaitPath.node.argument)) found = true;
+    });
+  j(fnPath)
+    .find(j.CallExpression, { callee: { name: 'use' } })
+    .forEach((callPath) => {
+      const arg = callPath.node.arguments && callPath.node.arguments[0];
+      if (isParamsMember(arg)) found = true;
+    });
+  return found;
+}
+
+function transform(fileInfo, api) {
+  const j = api.jscodeshift;
+  const root = j(fileInfo.source);
+
+  const akinonImports = root.find(j.ImportDeclaration, {
+    source: { value: TARGET_IMPORT }
+  });
+
+  if (akinonImports.length === 0) return null;
+
+  let hasPageProps = false;
+  akinonImports.forEach((imp) => {
+    const specs = imp.node.specifiers || [];
+    if (
+      specs.some(
+        (s) =>
+          s.type === 'ImportSpecifier' &&
+          s.imported &&
+          s.imported.name === 'PageProps'
+      )
+    ) {
+      hasPageProps = true;
+    }
+  });
+
+  if (!hasPageProps) return null;
+
+  let usedAsync = false;
+  let usedResolved = false;
+
+  root
+    .find(j.TSTypeReference, {
+      typeName: { type: 'Identifier', name: 'PageProps' }
+    })
+    .forEach((path) => {
+      const fnPath = getEnclosingFunction(path);
+      let target = 'AsyncPageProps';
+      if (fnPath) {
+        const fnName = getFunctionName(fnPath);
+        if (fnName === 'generateMetadata') {
+          target = 'AsyncPageProps';
+        } else if (bodyUsesAsyncResolve(fnPath, j)) {
+          target = 'AsyncPageProps';
+        } else {
+          target = 'ResolvedPageProps';
+        }
+      }
+      path.node.typeName = j.identifier(target);
+      if (target === 'AsyncPageProps') usedAsync = true;
+      else usedResolved = true;
+    });
+
+  akinonImports.forEach((imp) => {
+    const specs = imp.node.specifiers || [];
+    const existingNames = new Set(
+      specs
+        .filter((s) => s.type === 'ImportSpecifier' && s.imported)
+        .map((s) => s.imported.name)
+    );
+    const next = specs.filter(
+      (s) =>
+        !(
+          s.type === 'ImportSpecifier' &&
+          s.imported &&
+          s.imported.name === 'PageProps'
+        )
+    );
+    if (usedAsync && !existingNames.has('AsyncPageProps')) {
+      next.push(j.importSpecifier(j.identifier('AsyncPageProps')));
+    }
+    if (usedResolved && !existingNames.has('ResolvedPageProps')) {
+      next.push(j.importSpecifier(j.identifier('ResolvedPageProps')));
+    }
+    next.sort((a, b) => {
+      if (a.type !== 'ImportSpecifier' || b.type !== 'ImportSpecifier') return 0;
+      return a.imported.name.localeCompare(b.imported.name);
+    });
+    imp.node.specifiers = next;
+  });
+
+  return root.toSource({ quote: 'single' });
+}
+
+module.exports = transform;

package/codemods/upgrade-to-2/index.js

@@ -11,8 +11,9 @@
  *   6.  Run migrate-auth-v5 codemod (next-auth v4 -> v5)
  *   7.  Run sentry-9 codemod (only when @sentry/nextjs is present)
  *   8.  Run migrate-eslint codemod (ESLint v9 flat config)
- *   9.  yarn build (validation)
- *   10. Summary report
+ *   9.  Run migrate-page-types codemod (PageProps -> Async/Resolved)
+ *   10. yarn build (validation)
+ *   11. Summary report
  *
  * Out of scope in this first version:
  *   - Tailwind v3 -> v4 migration (run manually with @tailwindcss/upgrade)
@@ -32,6 +33,7 @@
  *     --skip-auth           Do not run migrate-auth-v5
  *     --skip-sentry         Do not run sentry-9 (auto-skipped if not needed)
  *     --skip-eslint         Do not run migrate-eslint
+ *     --skip-page-types     Do not run migrate-page-types
  *     --skip-install        Do not run yarn install
  *     --skip-build          Do not run yarn build
  *     --interactive         Pause for confirmation after each step
@@ -46,6 +48,7 @@ const readline = require('readline');
 const AUTH_CODEMOD = path.resolve(__dirname, '..', 'migrate-auth-v5');
 const SENTRY_CODEMOD = path.resolve(__dirname, '..', 'sentry-9');
 const ESLINT_CODEMOD = path.resolve(__dirname, '..', 'migrate-eslint');
+const PAGE_TYPES_CODEMOD = path.resolve(__dirname, '..', 'migrate-page-types');
 
 const TARGET_MATRIX = {
   dependencies: {
@@ -134,6 +137,7 @@ function parseArgs(argv) {
     skipAuth: argv.includes('--skip-auth'),
     skipSentry: argv.includes('--skip-sentry'),
     skipEslint: argv.includes('--skip-eslint'),
+    skipPageTypes: argv.includes('--skip-page-types'),
     skipInstall: argv.includes('--skip-install'),
     skipBuild: argv.includes('--skip-build'),
     interactive: argv.includes('--interactive'),
@@ -154,7 +158,7 @@ function writePackageJson(cwd, pkg) {
 }
 
 function stepPreflight(cwd, flags) {
-  logStep('[1/10] Preflight', 'starting');
+  logStep('[1/11] Preflight', 'starting');
 
   const pkg = readPackageJson(cwd);
   if (!pkg) {
@@ -188,19 +192,19 @@ function stepPreflight(cwd, flags) {
   log(`  Current: next@${currentNext} react@${currentReact} next-auth@${currentAuth} @akinon/next@${currentAkinon}`);
   log(`  Target:  next@${TARGET_MATRIX.dependencies.next} react@${TARGET_MATRIX.dependencies.react} next-auth@${TARGET_MATRIX.dependencies['next-auth']} @akinon/next@${TARGET_MATRIX.dependencies['@akinon/next']}`);
 
-  logStep('[1/10] Preflight', 'ok');
+  logStep('[1/11] Preflight', 'ok');
 }
 
 function stepBackup(cwd, flags) {
   if (flags.skipBackup) {
-    logStep('[2/10] Backup branch', 'skipped');
+    logStep('[2/11] Backup branch', 'skipped');
     return null;
   }
   const today = new Date().toISOString().slice(0, 10).replace(/-/g, '');
   const branchName = `pre-upgrade-2-${today}`;
 
   if (flags.dryRun) {
-    logStep('[2/10] Backup branch', `[DRY] git branch ${branchName}`);
+    logStep('[2/11] Backup branch', `[DRY] git branch ${branchName}`);
     return branchName;
   }
 
@@ -210,7 +214,7 @@ function stepBackup(cwd, flags) {
     { cwd, encoding: 'utf-8' }
   );
   if (existing.status === 0) {
-    logStep('[2/10] Backup branch', `already exists: ${branchName}`);
+    logStep('[2/11] Backup branch', `already exists: ${branchName}`);
     return branchName;
   }
 
@@ -221,7 +225,7 @@ function stepBackup(cwd, flags) {
   if (result.status !== 0) {
     throw new Error(`Failed to create backup branch ${branchName}`);
   }
-  logStep('[2/10] Backup branch', `created ${branchName}`);
+  logStep('[2/11] Backup branch', `created ${branchName}`);
   return branchName;
 }
 
@@ -319,7 +323,7 @@ function pinNextScriptsToWebpack(pkg) {
 
 function stepBump(cwd, flags) {
   if (flags.skipBump) {
-    logStep('[3/10] Bump deps', 'skipped');
+    logStep('[3/11] Bump deps', 'skipped');
     return { hasSentry: false, changes: [] };
   }
 
@@ -367,16 +371,16 @@ function stepBump(cwd, flags) {
   allChanges.push(...scriptChanges);
 
   if (allChanges.length === 0) {
-    logStep('[3/10] Bump deps', 'already at target, no changes');
+    logStep('[3/11] Bump deps', 'already at target, no changes');
     return { hasSentry, changes: [] };
   }
 
   if (flags.dryRun) {
-    logStep('[3/10] Bump deps', `[DRY] ${allChanges.length} changes`);
+    logStep('[3/11] Bump deps', `[DRY] ${allChanges.length} changes`);
     allChanges.forEach((c) => log(`  - ${c}`));
   } else {
     writePackageJson(cwd, pkg);
-    logStep('[3/10] Bump deps', `${allChanges.length} changes applied`);
+    logStep('[3/11] Bump deps', `${allChanges.length} changes applied`);
     if (flags.verbose) allChanges.forEach((c) => log(`  - ${c}`));
   }
 
@@ -385,28 +389,28 @@ function stepBump(cwd, flags) {
 
 function stepNextCodemod(cwd, flags) {
   if (flags.skipNextCodemod) {
-    logStep('[5/10] Next codemod', 'skipped');
+    logStep('[5/11] Next codemod', 'skipped');
     return { ok: true };
   }
   const cmd = flags.dryRun
     ? 'npx --yes @next/codemod@latest upgrade latest --verbose'
     : 'npx --yes @next/codemod@latest upgrade latest';
-  logStep('[5/10] Next codemod', `running ${cmd}`);
+  logStep('[5/11] Next codemod', `running ${cmd}`);
   const result = runCommand(cmd, { cwd, dryRun: false, verbose: flags.verbose });
   if (result.status !== 0) {
-    logStep('[5/10] Next codemod', `FAILED (exit ${result.status})`);
+    logStep('[5/11] Next codemod', `FAILED (exit ${result.status})`);
     return { ok: false };
   }
-  logStep('[5/10] Next codemod', 'ok');
+  logStep('[5/11] Next codemod', 'ok');
   return { ok: true };
 }
 
 function stepAuthCodemod(cwd, flags) {
   if (flags.skipAuth) {
-    logStep('[6/10] Auth codemod', 'skipped');
+    logStep('[6/11] Auth codemod', 'skipped');
     return { ok: true };
   }
-  logStep('[6/10] Auth codemod', 'running migrate-auth-v5');
+  logStep('[6/11] Auth codemod', 'running migrate-auth-v5');
   try {
     const prevArgv = process.argv;
     process.argv = [
@@ -426,21 +430,21 @@ function stepAuthCodemod(cwd, flags) {
       return result.then(
         () => {
           finish();
-          logStep('[6/10] Auth codemod', 'ok');
+          logStep('[6/11] Auth codemod', 'ok');
           return { ok: true };
         },
         (err) => {
           finish();
-          logStep('[6/10] Auth codemod', `FAILED: ${err.message}`);
+          logStep('[6/11] Auth codemod', `FAILED: ${err.message}`);
           return { ok: false };
         }
       );
     }
     finish();
-    logStep('[6/10] Auth codemod', 'ok');
+    logStep('[6/11] Auth codemod', 'ok');
     return { ok: true };
   } catch (err) {
-    logStep('[6/10] Auth codemod', `FAILED: ${err.message}`);
+    logStep('[6/11] Auth codemod', `FAILED: ${err.message}`);
     return { ok: false };
   }
 }
@@ -448,34 +452,34 @@ function stepAuthCodemod(cwd, flags) {
 function stepSentryCodemod(cwd, flags, hasSentry) {
   if (flags.skipSentry || !hasSentry) {
     const reason = flags.skipSentry ? 'skipped' : 'no @sentry/nextjs, skipping';
-    logStep('[7/10] Sentry codemod', reason);
+    logStep('[7/11] Sentry codemod', reason);
     return { ok: true };
   }
   if (flags.dryRun) {
-    logStep('[7/10] Sentry codemod', '[DRY] would run sentry-9');
+    logStep('[7/11] Sentry codemod', '[DRY] would run sentry-9');
     return { ok: true };
   }
-  logStep('[7/10] Sentry codemod', 'running sentry-9');
+  logStep('[7/11] Sentry codemod', 'running sentry-9');
   try {
     const savedCwd = process.cwd();
     process.chdir(cwd);
     const codemod = require(SENTRY_CODEMOD);
     codemod.transform();
     process.chdir(savedCwd);
-    logStep('[7/10] Sentry codemod', 'ok');
+    logStep('[7/11] Sentry codemod', 'ok');
     return { ok: true };
   } catch (err) {
-    logStep('[7/10] Sentry codemod', `FAILED: ${err.message}`);
+    logStep('[7/11] Sentry codemod', `FAILED: ${err.message}`);
     return { ok: false };
   }
 }
 
 function stepEslintCodemod(cwd, flags) {
   if (flags.skipEslint) {
-    logStep('[8/10] ESLint codemod', 'skipped');
+    logStep('[8/11] ESLint codemod', 'skipped');
     return { ok: true };
   }
-  logStep('[8/10] ESLint codemod', 'running migrate-eslint');
+  logStep('[8/11] ESLint codemod', 'running migrate-eslint');
   try {
     const prevArgv = process.argv;
     process.argv = [
@@ -489,24 +493,68 @@ function stepEslintCodemod(cwd, flags) {
     codemod.transform();
     process.chdir(savedCwd);
     process.argv = prevArgv;
-    logStep('[8/10] ESLint codemod', 'ok');
+    logStep('[8/11] ESLint codemod', 'ok');
     return { ok: true };
   } catch (err) {
-    logStep('[8/10] ESLint codemod', `FAILED: ${err.message}`);
+    logStep('[8/11] ESLint codemod', `FAILED: ${err.message}`);
+    return { ok: false };
+  }
+}
+
+function stepPageTypesCodemod(cwd, flags) {
+  if (flags.skipPageTypes) {
+    logStep('[9/11] Page types codemod', 'skipped');
+    return { ok: true };
+  }
+  logStep('[9/11] Page types codemod', 'running migrate-page-types');
+  try {
+    const prevArgv = process.argv;
+    process.argv = [
+      process.argv[0],
+      process.argv[1],
+      ...(flags.dryRun ? ['--dry-run'] : [])
+    ];
+    const savedCwd = process.cwd();
+    process.chdir(cwd);
+    const codemod = require(PAGE_TYPES_CODEMOD);
+    const result = codemod.transform();
+    const finish = () => {
+      process.chdir(savedCwd);
+      process.argv = prevArgv;
+    };
+    if (result && typeof result.then === 'function') {
+      return result.then(
+        () => {
+          finish();
+          logStep('[9/11] Page types codemod', 'ok');
+          return { ok: true };
+        },
+        (err) => {
+          finish();
+          logStep('[9/11] Page types codemod', `FAILED: ${err.message}`);
+          return { ok: false };
+        }
+      );
+    }
+    finish();
+    logStep('[9/11] Page types codemod', 'ok');
+    return { ok: true };
+  } catch (err) {
+    logStep('[9/11] Page types codemod', `FAILED: ${err.message}`);
     return { ok: false };
   }
 }
 
 function stepInstall(cwd, flags) {
   if (flags.skipInstall) {
-    logStep('[4/10] yarn install', 'skipped');
+    logStep('[4/11] yarn install', 'skipped');
     return { ok: true };
   }
   if (flags.dryRun) {
-    logStep('[4/10] yarn install', '[DRY] yarn clean && yarn');
+    logStep('[4/11] yarn install', '[DRY] yarn clean && yarn');
     return { ok: true };
   }
-  logStep('[4/10] yarn install', 'running yarn clean && yarn');
+  logStep('[4/11] yarn install', 'running yarn clean && yarn');
   const clean = runCommand('yarn clean', {
     cwd,
     dryRun: false,
@@ -521,33 +569,33 @@ function stepInstall(cwd, flags) {
     verbose: flags.verbose
   });
   if (install.status !== 0) {
-    logStep('[4/10] yarn install', `FAILED (exit ${install.status})`);
+    logStep('[4/11] yarn install', `FAILED (exit ${install.status})`);
     return { ok: false };
   }
-  logStep('[4/10] yarn install', 'ok');
+  logStep('[4/11] yarn install', 'ok');
   return { ok: true };
 }
 
 function stepBuild(cwd, flags) {
   if (flags.skipBuild) {
-    logStep('[9/10] yarn build', 'skipped');
+    logStep('[10/11] yarn build', 'skipped');
     return { ok: true };
   }
   if (flags.dryRun) {
-    logStep('[9/10] yarn build', '[DRY] yarn build');
+    logStep('[10/11] yarn build', '[DRY] yarn build');
     return { ok: true };
   }
-  logStep('[9/10] yarn build', 'running');
+  logStep('[10/11] yarn build', 'running');
   const result = runCommand('yarn build', {
     cwd,
     dryRun: false,
     verbose: flags.verbose
   });
   if (result.status !== 0) {
-    logStep('[9/10] yarn build', `FAILED (exit ${result.status})`);
+    logStep('[10/11] yarn build', `FAILED (exit ${result.status})`);
     return { ok: false };
   }
-  logStep('[9/10] yarn build', 'ok');
+  logStep('[10/11] yarn build', 'ok');
   return { ok: true };
 }
 
@@ -559,7 +607,7 @@ function countTodoMarkers(cwd) {
 }
 
 function stepReport(cwd, results) {
-  logStep('[10/10] Report', 'summary');
+  logStep('[11/11] Report', 'summary');
   const pkg = readPackageJson(cwd) || {};
   const todoCount = countTodoMarkers(cwd);
 
@@ -572,6 +620,7 @@ function stepReport(cwd, results) {
   console.log(`  Auth codemod:    ${results.authCodemod ? 'ok' : 'FAILED'}`);
   console.log(`  Sentry codemod:  ${results.sentryCodemod ? 'ok' : results.sentrySkippedReason || 'FAILED'}`);
   console.log(`  ESLint codemod:  ${results.eslintCodemod ? 'ok' : 'FAILED'}`);
+  console.log(`  Page types:      ${results.pageTypesCodemod ? 'ok' : 'FAILED'}`);
   console.log(`  Build:           ${results.build ? 'ok' : 'FAILED'}`);
   console.log('');
   console.log(`  Versions after:`);
@@ -618,7 +667,7 @@ async function transform() {
       results.preflight = true;
       await maybePause(flags, 'preflight');
     } else {
-      logStep('[1/10] Preflight', 'skipped');
+      logStep('[1/11] Preflight', 'skipped');
       results.preflight = true;
     }
 
@@ -652,6 +701,14 @@ async function transform() {
     results.eslintCodemod = stepEslintCodemod(cwd, flags).ok;
     await maybePause(flags, 'eslint-codemod');
 
+    const pageTypesResult = stepPageTypesCodemod(cwd, flags);
+    const pageTypesAwaited =
+      pageTypesResult && typeof pageTypesResult.then === 'function'
+        ? await pageTypesResult
+        : pageTypesResult;
+    results.pageTypesCodemod = pageTypesAwaited.ok;
+    await maybePause(flags, 'page-types-codemod');
+
     results.build = stepBuild(cwd, flags).ok;
   } catch (err) {
     log(`FATAL: ${err.message}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akinon/projectzero",
-  "version": "2.0.15-beta.0",
+  "version": "2.0.15",
   "private": false,
   "description": "CLI tool to manage your Project Zero Next project",
   "bin": {