fix(qwik): handle additional use cases in migrate-v2 (#7337)

closes #7194

Author: dmitry-stepanenko

packages/qwik/src/cli/migrate-v2/run-migration.ts

@@ -44,10 +44,13 @@ export async function runV2Migration(app: AppCommand) {
       [['qwikCityPlan', 'qwikRouterConfig']],
       '@qwik-city-plan' // using old name, package name will be updated in the next step
     );
+    replaceImportInFiles([['jsxs', 'jsx']], '@builder.io/qwik/jsx-runtime');
 
     replacePackage('@qwik-city-plan', '@qwik-router-config', true);
     replacePackage('@builder.io/qwik-city', '@qwik.dev/router');
     replacePackage('@builder.io/qwik-react', '@qwik.dev/react');
+    // jsx-runtime contains re-exports from "core"
+    replacePackage('@builder.io/qwik/jsx-runtime', '@qwik.dev/core');
     // "@builder.io/qwik" should be the last one because it's name is a substring of the package names above
     replacePackage('@builder.io/qwik', '@qwik.dev/core');
 

packages/qwik/src/cli/migrate-v2/update-dependencies.ts

@@ -8,15 +8,22 @@ import { log, spinner } from '@clack/prompts';
 export async function updateDependencies() {
   // TODO(migrate-v2): rely on workspaceRoot instead?
   const packageJson = await readPackageJson(process.cwd());
-  const devDependencies = (packageJson.devDependencies ??= {});
-  const dependencies = (packageJson.dependencies ??= {});
 
   const version = getPackageTag();
 
+  const dependencyNames = [
+    'dependencies',
+    'devDependencies',
+    'peerDependencies',
+    'optionalDependencies',
+  ] as const;
+
   for (const name of packageNames) {
-    if (dependencies[name] || devDependencies[name]) {
-      delete dependencies[name];
-      devDependencies[name] = version;
+    for (const propName of dependencyNames) {
+      const prop = packageJson[propName];
+      if (prop && prop[name]) {
+        prop[name] = version;
+      }
     }
   }
 

packages/qwik/src/cli/types.ts

@@ -70,6 +70,8 @@ export interface IntegrationPackageJson {
   scripts?: { [k: string]: string };
   dependencies?: { [k: string]: string };
   devDependencies?: { [k: string]: string };
+  peerDependencies?: { [k: string]: string };
+  optionalDependencies?: { [k: string]: string };
   engines?: { node: string };
   private?: boolean;
   files?: string[];