From a580643f4813fd9394a848e288e75f2844f686bb Mon Sep 17 00:00:00 2001
From: mainframev <vgenaev@gmail.com>
Date: Fri, 25 Oct 2024 12:52:42 +0200
Subject: [PATCH] chore(workspace-plguin): update cypress-component
 configuration to have typeRoots

---
 .../files/tsconfig.cy.json__tmpl__                         | 1 +
 .../cypress-component-configuration/index.spec.ts          | 4 ++++
 .../generators/cypress-component-configuration/index.ts    | 5 +++--
 .../cypress-component-configuration/lib/add-files.ts       | 7 +++++--
 .../src/generators/migrate-converged-pkg/index.spec.ts     | 1 +
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/tools/workspace-plugin/src/generators/cypress-component-configuration/files/tsconfig.cy.json__tmpl__ b/tools/workspace-plugin/src/generators/cypress-component-configuration/files/tsconfig.cy.json__tmpl__
index a307d1565f4ae7..317d49643bc4f3 100644
--- a/tools/workspace-plugin/src/generators/cypress-component-configuration/files/tsconfig.cy.json__tmpl__
+++ b/tools/workspace-plugin/src/generators/cypress-component-configuration/files/tsconfig.cy.json__tmpl__
@@ -3,6 +3,7 @@
   "compilerOptions":{
     "isolatedModules":false,
     "types":["node", "cypress", "cypress-real-events"],
+    "typeRoots":["<%= options.offsetFromRoot %>node_modules", "<%= options.offsetFromRoot %>node_modules/@types"],
     "lib":["ES2019", "dom"]
   },
   "include":["**/*.cy.ts", "**/*.cy.tsx"]
diff --git a/tools/workspace-plugin/src/generators/cypress-component-configuration/index.spec.ts b/tools/workspace-plugin/src/generators/cypress-component-configuration/index.spec.ts
index 44f97aac0f3edc..5450a811076b14 100644
--- a/tools/workspace-plugin/src/generators/cypress-component-configuration/index.spec.ts
+++ b/tools/workspace-plugin/src/generators/cypress-component-configuration/index.spec.ts
@@ -56,6 +56,10 @@ describe(`cypress-component-configuration`, () => {
             "ES2019",
             "dom",
           ],
+          "typeRoots": Array [
+            "../node_modules",
+            "../node_modules/@types",
+          ],
           "types": Array [
             "node",
             "cypress",
diff --git a/tools/workspace-plugin/src/generators/cypress-component-configuration/index.ts b/tools/workspace-plugin/src/generators/cypress-component-configuration/index.ts
index 9e0b3467dbe437..a45a53ec88b01c 100644
--- a/tools/workspace-plugin/src/generators/cypress-component-configuration/index.ts
+++ b/tools/workspace-plugin/src/generators/cypress-component-configuration/index.ts
@@ -1,4 +1,4 @@
-import { Tree, formatFiles, names, joinPathFragments } from '@nx/devkit';
+import { Tree, formatFiles, names, joinPathFragments, offsetFromRoot } from '@nx/devkit';
 
 import { getProjectConfig, printUserLogs, UserLog } from '../../utils';
 
@@ -22,7 +22,8 @@ export default async function (tree: Tree, schema: CypressComponentConfiguration
     return;
   }
 
-  addFiles(tree, normalizedOptions);
+  // @ts-expect-error TODO: remove offsetFromRoot after migration to ts 5.5
+  addFiles(tree, { ...normalizedOptions, offsetFromRoot: offsetFromRoot(tree.root) });
 
   await formatFiles(tree);
 }
diff --git a/tools/workspace-plugin/src/generators/cypress-component-configuration/lib/add-files.ts b/tools/workspace-plugin/src/generators/cypress-component-configuration/lib/add-files.ts
index e30cd17afdfcb3..0197388b79ac5f 100644
--- a/tools/workspace-plugin/src/generators/cypress-component-configuration/lib/add-files.ts
+++ b/tools/workspace-plugin/src/generators/cypress-component-configuration/lib/add-files.ts
@@ -5,10 +5,13 @@ import { PackageJson, TsConfig } from '../../../types';
 import { getProjectConfig } from '../../../utils';
 import { uniqueArray } from './utils';
 
-type Options = ReturnType<typeof getProjectConfig>;
+type Options = ReturnType<typeof getProjectConfig & { offsertFromRoot: string }>;
 
 export function addFiles(tree: Tree, options: Options) {
-  generateFiles(tree, joinPathFragments(__dirname, '../files'), options.projectConfig.root, { tmpl: '' });
+  generateFiles(tree, joinPathFragments(__dirname, '../files'), options.projectConfig.root, {
+    tmpl: '',
+    options,
+  });
 
   updateJson(tree, options.paths.tsconfig.main, (json: TsConfig) => {
     json.references?.push({
diff --git a/tools/workspace-plugin/src/generators/migrate-converged-pkg/index.spec.ts b/tools/workspace-plugin/src/generators/migrate-converged-pkg/index.spec.ts
index 05fa1678e3b7af..8e3989eabbd793 100644
--- a/tools/workspace-plugin/src/generators/migrate-converged-pkg/index.spec.ts
+++ b/tools/workspace-plugin/src/generators/migrate-converged-pkg/index.spec.ts
@@ -781,6 +781,7 @@ describe('migrate-converged-pkg generator', () => {
           isolatedModules: false,
           lib: ['ES2019', 'dom'],
           types: ['node', 'cypress', 'cypress-real-events'],
+          typeRoots: ['../node_modules', '../node_modules/@types'],
         },
         include: ['**/*.cy.ts', '**/*.cy.tsx'],
       });