From 4befddc726ffe95e14647e2247a7ed2dd0d11ea6 Mon Sep 17 00:00:00 2001
From: Alejandro Lembke Barrientos <aleleba@hotmail.com>
Date: Sat, 4 Mar 2023 01:07:57 +0000
Subject: [PATCH] PR-264673: fixing the conflict with cypress and jest.

---
 jest.config.js    | 18 +++++++++---------
 package-lock.json |  4 ++--
 package.json      |  2 +-
 tsconfig.json     |  5 +++--
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/jest.config.js b/jest.config.js
index 665d194..b223c23 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -6,12 +6,12 @@ const aliases = pathsToModuleNameMapper(compilerOptions.paths, {
 });
    
 module.exports = {
-    setupFilesAfterEnv: ['<rootDir>/setupTest.ts'],
-    testPathIgnorePatterns: ['/node_modules/', '\\.cy.(js|jsx|ts|tsx)$'],
-    testEnvironment: 'jsdom',
-    moduleNameMapper: {
-      ...aliases,
-      '\\.(jpg|ico|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '<rootDir>/src/__mocks__/fileMock.ts',
-      '\\.(css|sass|scss|less)$': 'identity-obj-proxy'
-    },
-  };
\ No newline at end of file
+  setupFilesAfterEnv: ['<rootDir>/setupTest.ts'],
+  testPathIgnorePatterns: ['/node_modules/', '\\.cy.(js|jsx|ts|tsx)$'],
+  testEnvironment: 'jsdom',
+  moduleNameMapper: {
+    ...aliases,
+    '\\.(jpg|ico|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '<rootDir>/src/__mocks__/fileMock.ts',
+    '\\.(css|sass|scss|less)$': 'identity-obj-proxy'
+  },
+};
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 1bcf368..8b14cad 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@aleleba/create-react-component-library",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@aleleba/create-react-component-library",
-      "version": "1.2.0",
+      "version": "1.2.1",
       "license": "MIT",
       "bin": {
         "create-react-component-library": "bin/cli.js"
diff --git a/package.json b/package.json
index c265abf..af131ff 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aleleba/create-react-component-library",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "A starter kit for create a React component Library with storybook",
   "bin": "./bin/cli.js",
   "main": "dist/index.js",
diff --git a/tsconfig.json b/tsconfig.json
index 2d44cd3..a930929 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -37,11 +37,12 @@
       }
     },
     "include": [
-      "**/*"
+      "."
     ],
     "exclude": [
      "node_modules",
      "dist",
-     "PRNameGenerator.ts"
+     "PRNameGenerator.ts",
+     "cypress.config.ts"
     ]
 }
\ No newline at end of file