fix(react-native): fix svg-mock path in generated jest config (#7248)

nrwl · Oct 5, 2021 · 6caba47 · 6caba47
1 parent 711e80e
commit 6caba47
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/packages/react-native/svg-mock.js → ...ges/react-native/plugins/jest/svg-mock.ts b/packages/react-native/svg-mock.js → ...ges/react-native/plugins/jest/svg-mock.ts
diff --git a/packages/react-native/src/generators/application/files/app/src/app/App.spec.tsx.template b/packages/react-native/src/generators/application/files/app/src/app/App.spec.tsx.template
@@ -1,10 +1,9 @@
-import 'react-native';
-import React from 'react';
+import * as React from 'react';
 import { render } from '@testing-library/react-native';
 
 import App from './App';
 
-it('renders correctly', () => {
+test('renders correctly', () => {
   const { getByTestId } = render(<App />);
   expect(getByTestId('heading')).toHaveTextContent('Welcome');
 });
diff --git a/packages/react-native/src/migrations/update-12-10-0/add-react-native-svg-12-10-0.spec.ts b/packages/react-native/src/migrations/update-12-10-0/add-react-native-svg-12-10-0.spec.ts
@@ -58,7 +58,7 @@ describe('Add react-native-svg to dev dependencies', () => {
 
     const jestConfig = tree.read('apps/products/jest.config.js', 'utf-8');
     expect(jestConfig).toContain(
-      `moduleNameMapper: {'\\.svg': require.resolve('@nrwl/react-native/src/utils/svg-mock.js')},`
+      `moduleNameMapper: {'\\.svg': '@nrwl/react-native/plugins/jest/svg-mock'},`
     );
   });
 

diff --git a/packages/react-native/src/migrations/update-12-10-0/add-react-native-svg-12-10-0.ts b/packages/react-native/src/migrations/update-12-10-0/add-react-native-svg-12-10-0.ts
@@ -67,7 +67,7 @@ function mockSvgInJestConfig(host: Tree, project: ProjectConfiguration) {
       jestConfigPath,
       contents.replace(
         /,([^,]*)$/,
-        `, moduleNameMapper: {'\\.svg': require.resolve('@nrwl/react-native/src/utils/svg-mock.js')}, $1`
+        `, moduleNameMapper: {'\\.svg': '@nrwl/react-native/plugins/jest/svg-mock'}, $1`
       )
     );
   } catch {

diff --git a/packages/react-native/src/utils/add-jest.ts b/packages/react-native/src/utils/add-jest.ts
@@ -28,7 +28,7 @@ export async function addJest(
   moduleFileExtensions: ['ts', 'js', 'html', 'tsx', 'jsx'],
   setupFilesAfterEnv: ['<rootDir>/test-setup.ts'],
   moduleNameMapper: {
-    '\\.svg': require.resolve('@nrwl/react-native/src/svg-mock.js'),
+    '\\.svg': '@nrwl/react-native/plugins/jest/svg-mock'
   },
   transform: {
     '\\\\.(js|ts|tsx)$': require.resolve('react-native/jest/preprocessor.js'),