fix(ud): Better support for non-standard vite configs (#1825)

Author: Tobbe

packages/cli/src/commands/setup/deploy/__tests__/netlify.test.js

@@ -246,4 +246,131 @@ describe('netlify with --ud', () => {
       })"
     `)
   })
+
+  it('handles arrow-function wrapped defineConfig with destructured mode arg', async () => {
+    vol.fromJSON({
+      '/cedar-app/web/vite.config.ts': [
+        "import dns from 'node:dns'",
+        '',
+        "import { defineConfig } from 'vite'",
+        '',
+        "import { cedar, cedarUniversalDeployPlugin } from '@cedarjs/vite'",
+        '',
+        "dns.setDefaultResultOrder('verbatim')",
+        '',
+        'export default defineConfig(({ mode }) => ({',
+        '  plugins: [cedar({ mode }), cedarUniversalDeployPlugin()],',
+        '  test: {',
+        "    environment: 'jsdom',",
+        '  },',
+        '}))',
+      ].join('\n'),
+    })
+
+    await handler({ force: true, ud: true })
+
+    const filesystem = vol.toJSON()
+
+    expect(filesystem['/cedar-app/web/vite.config.ts']).toMatchInlineSnapshot(`
+      "import dns from 'node:dns'
+
+      import netlifyCompat from '@universal-deploy/netlify/vite'
+      import netlify from '@netlify/vite-plugin'
+      import { defineConfig } from 'vite'
+
+      import { cedar, cedarUniversalDeployPlugin } from '@cedarjs/vite'
+
+      dns.setDefaultResultOrder('verbatim')
+
+      export default defineConfig(({ mode }) => ({
+        plugins: [
+          netlify({ build: { enabled: true } }),
+          netlifyCompat(),
+          cedar({ mode }),
+          cedarUniversalDeployPlugin(),
+        ],
+        test: {
+          environment: 'jsdom',
+        },
+      }))"
+    `)
+  })
+
+  it('handles arrow function with explicit block body and return statement', async () => {
+    vol.fromJSON({
+      '/cedar-app/web/vite.config.ts': [
+        "import { defineConfig } from 'vite'",
+        '',
+        "import { cedar, cedarUniversalDeployPlugin } from '@cedarjs/vite'",
+        '',
+        'export default defineConfig(({ mode }) => {',
+        '  return {',
+        '    plugins: [cedar({ mode }), cedarUniversalDeployPlugin()],',
+        '  }',
+        '})',
+      ].join('\n'),
+    })
+
+    await handler({ force: true, ud: true })
+
+    const filesystem = vol.toJSON()
+
+    expect(filesystem['/cedar-app/web/vite.config.ts']).toMatchInlineSnapshot(`
+      "import netlifyCompat from '@universal-deploy/netlify/vite'
+      import netlify from '@netlify/vite-plugin'
+      import { defineConfig } from 'vite'
+
+      import { cedar, cedarUniversalDeployPlugin } from '@cedarjs/vite'
+
+      export default defineConfig(({ mode }) => {
+        return {
+          plugins: [
+            netlify({ build: { enabled: true } }),
+            netlifyCompat(),
+            cedar({ mode }),
+            cedarUniversalDeployPlugin(),
+          ],
+        }
+      })"
+    `)
+  })
+
+  it('handles regular function expression with return statement', async () => {
+    vol.fromJSON({
+      '/cedar-app/web/vite.config.ts': [
+        "import { defineConfig } from 'vite'",
+        '',
+        "import { cedar, cedarUniversalDeployPlugin } from '@cedarjs/vite'",
+        '',
+        'export default defineConfig(function ({ mode }) {',
+        '  return {',
+        '    plugins: [cedar({ mode }), cedarUniversalDeployPlugin()],',
+        '  }',
+        '})',
+      ].join('\n'),
+    })
+
+    await handler({ force: true, ud: true })
+
+    const filesystem = vol.toJSON()
+
+    expect(filesystem['/cedar-app/web/vite.config.ts']).toMatchInlineSnapshot(`
+      "import netlifyCompat from '@universal-deploy/netlify/vite'
+      import netlify from '@netlify/vite-plugin'
+      import { defineConfig } from 'vite'
+
+      import { cedar, cedarUniversalDeployPlugin } from '@cedarjs/vite'
+
+      export default defineConfig(function ({ mode }) {
+        return {
+          plugins: [
+            netlify({ build: { enabled: true } }),
+            netlifyCompat(),
+            cedar({ mode }),
+            cedarUniversalDeployPlugin(),
+          ],
+        }
+      })"
+    `)
+  })
 })

packages/cli/src/commands/setup/deploy/helpers/index.js

@@ -139,6 +139,51 @@ function posToIndex(str, line, column) {
   return index + column
 }
 
+/**
+ * Unwraps the config object from a `defineConfig(...)` call argument.
+ *
+ * Handles both direct object and arrow/function wrappers:
+ *   defineConfig({...})                    → ObjectExpression
+ *   defineConfig(({ mode }) => ({...}))    → ObjectExpression   (arrow, implicit return)
+ *   defineConfig(() => { return {...} })   → ObjectExpression   (arrow, explicit return)
+ *   defineConfig(function() { return {} }) → ObjectExpression   (function expression)
+ *
+ * @param {object} arg - A babel AST node.
+ * @returns The inner ObjectExpression, or `null` if not found.
+ */
+function resolveConfigObject(arg) {
+  if (t.isObjectExpression(arg)) {
+    return arg
+  }
+
+  if (t.isArrowFunctionExpression(arg)) {
+    // Implicit return: ({...})
+    if (t.isObjectExpression(arg.body)) {
+      return arg.body
+    }
+    // Block body with explicit return: { return {...} }
+    if (t.isBlockStatement(arg.body)) {
+      const returnStmt = arg.body.body.find((s) => t.isReturnStatement(s))
+      if (returnStmt && t.isObjectExpression(returnStmt.argument)) {
+        return returnStmt.argument
+      }
+    }
+    return null
+  }
+
+  if (t.isFunctionExpression(arg)) {
+    if (t.isBlockStatement(arg.body)) {
+      const returnStmt = arg.body.body.find((s) => t.isReturnStatement(s))
+      if (returnStmt && t.isObjectExpression(returnStmt.argument)) {
+        return returnStmt.argument
+      }
+    }
+    return null
+  }
+
+  return null
+}
+
 /**
  * Inserts plugin call expressions before `cedar()` in the `plugins` array
  * of `defineConfig({...})` inside a vite config file.
@@ -175,8 +220,8 @@ export function insertPluginsBeforeCedar({ content, pluginCodes }) {
     return null
   }
 
-  const configArg = defaultExport.declaration.arguments[0]
-  if (!t.isObjectExpression(configArg)) {
+  const configArg = resolveConfigObject(defaultExport.declaration.arguments[0])
+  if (!configArg) {
     return null
   }