Merge pull request #12 from ilyasudakov/develop

Fix Jest and Prettier issues w/ TypeScript project

Author: ilyasudakov

.prettierignore

@@ -5,4 +5,5 @@ node_modules/
 internals/generators/
 bin/typescript/
 package-lock.json
-package.json
+package.json
+src/setupTests.ts

bin/setup.js

@@ -125,11 +125,9 @@ function copyTypeScriptFiles() {
       shell.cp('bin/typescript/webpack.prod.ts', 'webpack.prod.ts');
       shell.cp('bin/typescript/.eslintrc.js', '.eslintrc.js');
       shell.cp('bin/typescript/App.tsx', 'src/components/App.tsx');
-      shell.cp('bin/typescript/App.test.js', 'src/components/App.test.js');
-      shell.cp(
-        'bin/typescript/jest.config.js',
-        'jest.config.js',
-      );
+      shell.cp('bin/typescript/App.test.tsx', 'src/components/App.test.tsx');
+      shell.cp('bin/typescript/jest.config.js', 'jest.config.js');
+      shell.cp('bin/typescript/setupTests.ts', 'src/setupTests.ts');
       shell.cp('bin/typescript/index.tsx', 'src/index.tsx');
       resolve();
     } catch (err) {
@@ -143,6 +141,8 @@ function removeOldWebpackConfigs() {
     try {
       shell.rm('-rf', 'webpack.config.js');
       shell.rm('-rf', 'src/components/App.jsx');
+      shell.rm('-rf', 'src/components/App.test.js');
+      shell.rm('-rf', 'src/setupTests.js');
       shell.rm('-rf', 'src/index.js');
       resolve();
     } catch (err) {

bin/typescript/App.test.js renamed to bin/typescript/App.test.tsx

@@ -1,9 +1,9 @@
 import { render } from '@testing-library/react';
-import { App } from './App.tsx';
+import { App } from './App';
 
 describe('App component', () => {
   test('renders', () => {
     const { getByText } = render(<App />);
-    expect(getByText('App')).toBeInTheDocument();
+    expect(getByText('MyApp')).toBeInTheDocument();
   });
 });

bin/typescript/jest.config.js

@@ -6,8 +6,5 @@ module.exports = {
   testRegex: '(/__tests__/.*|(\\.|/)(test|spec))\\.tsx?$',
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
   testPathIgnorePatterns: ['/node_modules/', '/public/'],
-  setupFilesAfterEnv: [
-    './src/setupTests.js',
-    '@testing-library/jest-dom/extend-expect',
-  ],
+  setupFilesAfterEnv: ['./src/setupTests.ts'],
 };

bin/typescript/setupTests.ts

@@ -0,0 +1 @@
+import '@testing-library/jest-dom/extend-expect';

readme.md

@@ -56,10 +56,6 @@ You can run commands bellow manually, or they will run automatically with pre-co
 
 ## Future Features
 
-### In Testing
-
-- TypeScript
-
 ### Maybe?
 
 - React DnD