fix(nextjs): fix issues with migration

nrwl · Jun 27, 2024 · 820eae4 · 820eae4
1 parent 55ab7eb
commit 820eae4
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 26 deletions.
diff --git a/packages/next/src/generators/convert-to-inferred/convert-to-inferred.spec.ts b/packages/next/src/generators/convert-to-inferred/convert-to-inferred.spec.ts
@@ -1,21 +1,18 @@
 import {
   addProjectConfiguration,
-  joinPathFragments,
-  readNxJson,
-  readProjectConfiguration,
-  updateNxJson,
-  updateProjectConfiguration,
-  writeJson,
   type ExpandedPluginConfiguration,
+  joinPathFragments,
   type ProjectConfiguration,
   type ProjectGraph,
+  readNxJson,
+  readProjectConfiguration,
   type Tree,
+  writeJson,
 } from '@nx/devkit';
 import { TempFs } from '@nx/devkit/internal-testing-utils';
 import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
 import { join } from 'node:path';
 import { getRelativeProjectJsonSchemaPath } from 'nx/src/generators/utils/project-configuration';
-import type { NextPluginOptions } from '../../plugins/plugin';
 import { convertToInferred } from './convert-to-inferred';
 
 let fs: TempFs;

diff --git a/packages/next/src/generators/convert-to-inferred/convert-to-inferred.ts b/packages/next/src/generators/convert-to-inferred/convert-to-inferred.ts
@@ -37,7 +37,7 @@ export async function convertToInferred(tree: Tree, options: Schema) {
         executors: ['@nx/next:server'],
         postTargetTransformer: servePosTargetTransformer(migrationLogs),
         targetPluginOptionMapper: (targetName) => ({
-          startTargetName: targetName,
+          devTargetName: targetName,
         }),
       },
     ],

diff --git a/packages/next/src/generators/convert-to-inferred/lib/build-post-target-transformer.ts b/packages/next/src/generators/convert-to-inferred/lib/build-post-target-transformer.ts
@@ -122,13 +122,15 @@ function handlePropertiesFromTargetOptions(
     delete options.watch;
   }
 
-  if ('experimentalAppOnly' in options) {
-    options['experimental-app-only'] = options['experimentalAppOnly'];
+  if ('experimentalAppOnly' in options && options['experimentalAppOnly']) {
+    options['args'] ??= [];
+    options['args'].push('--experimental-app-only');
     delete options.experimentalAppOnly;
   }
 
   if ('experimentalBuildMode' in options) {
-    options['experimental-build-mode'] = options['experimentalBuildMode'];
+    options['args'] ??= [];
+    options['args'].push('--experimental-build-mode');
     delete options.experimentalBuildMode;
   }
 }
diff --git a/packages/next/src/generators/convert-to-inferred/lib/update-next-config.spec.ts b/packages/next/src/generators/convert-to-inferred/lib/update-next-config.spec.ts
@@ -75,14 +75,14 @@ describe('UpdateNextConfig', () => {
                       with: "./environments/environment.prod.ts"
                   }
               ],
+              assets: [
+                  {
+                      input: "./assets",
+                      output: "./public/assets",
+                      glob: "**/*"
+                  }
+              ],
           },
-          assets: [
-              {
-                  input: "./assets",
-                  output: "./public/assets",
-                  glob: "**/*"
-              }
-          ],
       };
       const plugins = [
           // Add more Next.js plugins to this list if needed.
@@ -233,14 +233,14 @@ describe('UpdateNextConfig', () => {
               // Set this to true if you would like to use SVGR
               // See: https://github.com/gregberge/svgr
               svgr: false,
+              assets: [
+                  {
+                      input: "./assets",
+                      output: "./public/assets",
+                      glob: "**/*"
+                  }
+              ],
           },
-          assets: [
-              {
-                  input: "./assets",
-                  output: "./public/assets",
-                  glob: "**/*"
-              }
-          ],
       };
       const plugins = [
           // Add more Next.js plugins to this list if needed.

diff --git a/packages/next/src/generators/convert-to-inferred/lib/update-next-config.ts b/packages/next/src/generators/convert-to-inferred/lib/update-next-config.ts
@@ -83,7 +83,7 @@ export function updateNextConfig(
           };
         });
 
-        nextConfigObject['properties'].push(
+        nxConfigObject['properties'].push(
           createPropertyAssignment(
             'assets',
             createArrayLiteralExpression(assetsProperty)