From d5f834a3b642cc9c78e020aeb1ca7f61d69ed5d5 Mon Sep 17 00:00:00 2001
From: Katerina Skroumpelou <mandarini@users.noreply.github.com>
Date: Fri, 2 Dec 2022 17:42:18 +0200
Subject: [PATCH] fix(bundling): pass nxext options to our executor (#13587)

---
 docs/generated/packages/vite.json             | 5 -----
 packages/vite/src/executors/build/schema.d.ts | 1 -
 packages/vite/src/executors/build/schema.json | 5 -----
 packages/vite/src/utils/generator-utils.ts    | 9 +++++++++
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/docs/generated/packages/vite.json b/docs/generated/packages/vite.json
index 8327d70ddc17c..89d64261c7acb 100644
--- a/docs/generated/packages/vite.json
+++ b/docs/generated/packages/vite.json
@@ -224,11 +224,6 @@
             "description": "Base public path when served in development or production.",
             "alias": "baseHref"
           },
-          "proxyConfig": {
-            "type": "string",
-            "description": "Path to the proxy configuration file.",
-            "x-completion-type": "file"
-          },
           "configFile": {
             "type": "string",
             "description": "The name of the Vite.js configuration file.",
diff --git a/packages/vite/src/executors/build/schema.d.ts b/packages/vite/src/executors/build/schema.d.ts
index 3007bc2fecd33..d9d511db551db 100644
--- a/packages/vite/src/executors/build/schema.d.ts
+++ b/packages/vite/src/executors/build/schema.d.ts
@@ -2,7 +2,6 @@ import type { FileReplacement } from '../../plugins/rollup-replace-files.plugin'
 export interface ViteBuildExecutorOptions {
   outputPath: string;
   base?: string;
-  proxyConfig?: string;
   configFile?: string;
   fileReplacements?: FileReplacement[];
   sourcemap?: boolean | 'inline' | 'hidden';
diff --git a/packages/vite/src/executors/build/schema.json b/packages/vite/src/executors/build/schema.json
index 08f8300b51184..bd76fdcaecd92 100644
--- a/packages/vite/src/executors/build/schema.json
+++ b/packages/vite/src/executors/build/schema.json
@@ -22,11 +22,6 @@
       "description": "Base public path when served in development or production.",
       "alias": "baseHref"
     },
-    "proxyConfig": {
-      "type": "string",
-      "description": "Path to the proxy configuration file.",
-      "x-completion-type": "file"
-    },
     "configFile": {
       "type": "string",
       "description": "The name of the Vite.js configuration file.",
diff --git a/packages/vite/src/utils/generator-utils.ts b/packages/vite/src/utils/generator-utils.ts
index 53b6b49824f0e..d5c755d15614f 100644
--- a/packages/vite/src/utils/generator-utils.ts
+++ b/packages/vite/src/utils/generator-utils.ts
@@ -138,6 +138,12 @@ export function addOrChangeBuildTarget(
   };
 
   if (targets[target]) {
+    buildOptions.fileReplacements = targets[target].options.fileReplacements;
+
+    if (target === '@nxext/vite:build') {
+      buildOptions.base = targets[target].options.baseHref;
+      buildOptions.sourcemap = targets[target].options.sourcemaps;
+    }
     targets[target].options = {
       ...buildOptions,
     };
@@ -179,6 +185,9 @@ export function addOrChangeServeTarget(
   };
 
   if (targets[target]) {
+    if (target === '@nxext/vite:dev') {
+      serveOptions.proxyConfig = targets[target].options.proxyConfig;
+    }
     targets[target].options = {
       ...serveOptions,
     };