From 97b2df677d4d143f0b8bfe57b5b73d7b59d4e28d Mon Sep 17 00:00:00 2001
From: Travis Fischer <fisch0920@gmail.com>
Date: Sat, 2 Mar 2019 11:33:51 -0500
Subject: [PATCH] Merge pull request #129 from danielsogl/refactor/typescript

refactor(typescript): update react deps
---
 .../template/typescript/.gitignore              |  7 +++++++
 .../template/typescript/README.md               |  4 ++--
 .../template/typescript/package.json            | 17 ++++++++---------
 .../template/typescript/src/index.tsx           |  4 ++--
 .../template/typescript/tsconfig.json           |  3 ++-
 5 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/packages/create-freesewing-pattern/template/typescript/.gitignore b/packages/create-freesewing-pattern/template/typescript/.gitignore
index 3b2cf12c901..bfa6a5ea60b 100644
--- a/packages/create-freesewing-pattern/template/typescript/.gitignore
+++ b/packages/create-freesewing-pattern/template/typescript/.gitignore
@@ -1,8 +1,15 @@
 # See https://help.github.com/ignore-files/ for more about ignoring files.
 
+# IDE Stuff
+/.idea
+/.vscode
+
 # dependencies
 node_modules
 
+# testing
+/coverage
+
 # builds
 build
 dist
diff --git a/packages/create-freesewing-pattern/template/typescript/README.md b/packages/create-freesewing-pattern/template/typescript/README.md
index f5286200306..b507ab14d6a 100644
--- a/packages/create-freesewing-pattern/template/typescript/README.md
+++ b/packages/create-freesewing-pattern/template/typescript/README.md
@@ -13,11 +13,11 @@ npm install --save {{name}}
 ## Usage
 
 ```tsx
-import * as React from 'react'
+import React, { Component } from 'react'
 
 import MyComponent from '{{name}}'
 
-class Example extends React.Component {
+class Example extends Component {
   render () {
     return (
       <MyComponent />
diff --git a/packages/create-freesewing-pattern/template/typescript/package.json b/packages/create-freesewing-pattern/template/typescript/package.json
index e43392049c6..f366eef8226 100644
--- a/packages/create-freesewing-pattern/template/typescript/package.json
+++ b/packages/create-freesewing-pattern/template/typescript/package.json
@@ -13,8 +13,8 @@
     "npm": ">=5"
   },
   "scripts": {
-    "test": "cross-env CI=1 react-scripts-ts test --env=jsdom",
-    "test:watch": "react-scripts-ts test --env=jsdom",
+    "test": "cross-env CI=1 react-scripts test --env=jsdom",
+    "test:watch": "react-scripts test --env=jsdom",
     "build": "rollup -c",
     "start": "rollup -c -w",
     "prepare": "{{manager}} run build",
@@ -23,7 +23,6 @@
   },
   "dependencies": {},
   "peerDependencies": {
-    "prop-types": "^15.5.4",
     "react": "^15.0.0 || ^16.0.0",
     "react-dom": "^15.0.0 || ^16.0.0"
   },
@@ -32,13 +31,13 @@
     "@babel/runtime": "^7.0.0",
     "@svgr/rollup": "^2.4.1",
     "@types/jest": "^23.1.5",
-    "@types/react": "^16.3.13",
-    "@types/react-dom": "^16.0.5",
+    "@types/react": "^16.8.0",
+    "@types/react-dom": "^16.8.0",
     "cross-env": "^5.1.4",
     "gh-pages": "^1.2.0",
-    "react": "^16.4.1",
-    "react-dom": "^16.4.1",
-    "react-scripts-ts": "^2.16.0",
+    "react": "^16.8.0",
+    "react-dom": "^16.8.0",
+    "react-scripts": "^2.1.0",
     "rollup": "^0.62.0",
     "rollup-plugin-babel": "^4.0.1",
     "rollup-plugin-commonjs": "^9.1.3",
@@ -47,7 +46,7 @@
     "rollup-plugin-postcss": "^1.6.2",
     "rollup-plugin-typescript2": "^0.17.0",
     "rollup-plugin-url": "^1.4.0",
-    "typescript": "^2.8.3"
+    "typescript": "^3.3.0"
   },
   "files": [
     "dist"
diff --git a/packages/create-freesewing-pattern/template/typescript/src/index.tsx b/packages/create-freesewing-pattern/template/typescript/src/index.tsx
index f114363411f..8d8ae2c995e 100644
--- a/packages/create-freesewing-pattern/template/typescript/src/index.tsx
+++ b/packages/create-freesewing-pattern/template/typescript/src/index.tsx
@@ -2,13 +2,13 @@
  * @class ExampleComponent
  */
 
-import * as React from 'react'
+import React, { Component } from 'react'
 
 import styles from './styles.css'
 
 export type Props = { text: string }
 
-export default class ExampleComponent extends React.Component<Props> {
+export default class ExampleComponent extends Component<Props> {
   render() {
     const {
       text
diff --git a/packages/create-freesewing-pattern/template/typescript/tsconfig.json b/packages/create-freesewing-pattern/template/typescript/tsconfig.json
index 83923ad6a13..a82f99b8186 100644
--- a/packages/create-freesewing-pattern/template/typescript/tsconfig.json
+++ b/packages/create-freesewing-pattern/template/typescript/tsconfig.json
@@ -16,7 +16,8 @@
     "strictNullChecks": true,
     "suppressImplicitAnyIndexErrors": true,
     "noUnusedLocals": true,
-    "noUnusedParameters": true
+    "noUnusedParameters": true,
+    "allowSyntheticDefaultImports": true
   },
   "include": ["src"],
   "exclude": ["node_modules", "build", "dist", "example", "rollup.config.js"]