From f535f669af4dd36d33310aceb6db76a462afec4f Mon Sep 17 00:00:00 2001
From: Nicholas Cunningham <ndcunningham@gmail.com>
Date: Thu, 31 Aug 2023 19:10:56 -0600
Subject: [PATCH] fix(vite): Update typings and fix when converting lib to vite

---
 .../files/common/tsconfig.lib.json__tmpl__        | 10 +++++-----
 .../library/files/vite/tsconfig.lib.json__tmpl__  | 12 ++++++------
 .../src/generators/configuration/configuration.ts | 15 +++++++++++++++
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/packages/react/src/generators/library/files/common/tsconfig.lib.json__tmpl__ b/packages/react/src/generators/library/files/common/tsconfig.lib.json__tmpl__
index ab874ef7e8a137..af9eb0fd1f41bc 100644
--- a/packages/react/src/generators/library/files/common/tsconfig.lib.json__tmpl__
+++ b/packages/react/src/generators/library/files/common/tsconfig.lib.json__tmpl__
@@ -4,11 +4,11 @@
     "outDir": "<%= offsetFromRoot %>dist/out-tsc",
     "types": ["node"]
   },
-  "files": [<% if (style === 'styled-jsx') { %>
-    "<%= offsetFromRoot %>node_modules/@nx/react/typings/styled-jsx.d.ts",<% } %>
-    "<%= offsetFromRoot %>node_modules/@nx/react/typings/cssmodule.d.ts",
-    "<%= offsetFromRoot %>node_modules/@nx/react/typings/image.d.ts"
-  ],
+  "types": [
+    <% if (style === 'styled-jsx') { %>"@nx/react/typings/styled-jsx.d.ts",<% } %>
+    "@nx/react/typings/cssmodule.d.ts",
+    "@nx/react/typings/image.d.ts"
+    ],
   "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts", "src/**/*.spec.tsx", "src/**/*.test.tsx", "src/**/*.spec.js", "src/**/*.test.js", "src/**/*.spec.jsx", "src/**/*.test.jsx"],
   "include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx"]
 }
diff --git a/packages/react/src/generators/library/files/vite/tsconfig.lib.json__tmpl__ b/packages/react/src/generators/library/files/vite/tsconfig.lib.json__tmpl__
index 9916347319516e..73418113aff6c9 100644
--- a/packages/react/src/generators/library/files/vite/tsconfig.lib.json__tmpl__
+++ b/packages/react/src/generators/library/files/vite/tsconfig.lib.json__tmpl__
@@ -4,11 +4,11 @@
     "outDir": "<%= offsetFromRoot %>dist/out-tsc",
     "types": ["node"]
   },
-  "files": [<% if (style === 'styled-jsx') { %>
-    "<%= offsetFromRoot %>node_modules/@nx/react/typings/styled-jsx.d.ts",<% } %>
-    "<%= offsetFromRoot %>node_modules/@nx/react/typings/cssmodule.d.ts",
-    "<%= offsetFromRoot %>node_modules/@nx/react/typings/image.d.ts"
-  ],
+  "types": [
+    <% if (style === 'styled-jsx') { %>"@nx/react/typings/styled-jsx.d.ts",<% } %>
+    "@nx/react/typings/cssmodule.d.ts",
+    "@nx/react/typings/image.d.ts"
+    ],
   "exclude": ["**/*.spec.ts", "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx", "**/*.spec.js", "**/*.test.js", "**/*.spec.jsx", "**/*.test.jsx"],
-  "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
+  "include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx"]
 }
diff --git a/packages/vite/src/generators/configuration/configuration.ts b/packages/vite/src/generators/configuration/configuration.ts
index 5c7439f94c7f44..c0820daa744155 100644
--- a/packages/vite/src/generators/configuration/configuration.ts
+++ b/packages/vite/src/generators/configuration/configuration.ts
@@ -2,9 +2,11 @@ import {
   convertNxGenerator,
   formatFiles,
   GeneratorCallback,
+  joinPathFragments,
   readProjectConfiguration,
   runTasksInSerial,
   Tree,
+  updateJson,
 } from '@nx/devkit';
 
 import {
@@ -174,6 +176,19 @@ export async function viteConfigurationGenerator(
     }
   }
 
+  if (projectType === 'library') {
+    // update tsconfig.lib.json to include vite/client
+    updateJson(tree, joinPathFragments(root, 'tsconfig.lib.json'), (json) => {
+      return {
+        ...json,
+        compilerOptions: {
+          ...json.compilerOptions,
+          types: [...json.compilerOptions.types, 'vite/client'],
+        },
+      };
+    });
+  }
+
   createOrEditViteConfig(tree, schema, false, projectAlreadyHasViteTargets);
 
   if (schema.includeVitest) {