diff --git a/package.json b/package.json
index 1084992025b..07773fba88f 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,6 @@
 {
   "private": true,
-  "workspaces": [
-    "packages/*"
-  ],
+  "workspaces": ["packages/*"],
   "scripts": {
     "build": "cd packages/react-scripts && node bin/react-scripts.js build",
     "changelog": "lerna-changelog",
@@ -13,10 +11,12 @@
     "publish": "tasks/publish.sh",
     "start": "cd packages/react-scripts && node bin/react-scripts.js start",
     "screencast": "node ./tasks/screencast.js",
-    "screencast:error": "svg-term --cast jyu19xGl88FQ3poMY8Hbmfw8y --out screencast-error.svg --window --at 12000 --no-cursor",
-    "test": "cd packages/react-scripts && node bin/react-scripts.js test --env=jsdom",
-    "format": "prettier --trailing-comma es5 --single-quote --write 'packages/*/*.js' 'packages/*/!(node_modules)/**/*.js'",
-    "precommit": "lint-staged"
+    "screencast:error":
+      "svg-term --cast jyu19xGl88FQ3poMY8Hbmfw8y --out screencast-error.svg --window --at 12000 --no-cursor",
+    "test":
+      "cd packages/react-scripts && node bin/react-scripts.js test --env=jsdom",
+    "format":
+      "prettier --trailing-comma es5 --single-quote --write 'packages/*/*.js' 'packages/*/!(node_modules)/**/*.js'"
   },
   "devDependencies": {
     "eslint": "4.15.0",
@@ -30,14 +30,5 @@
     "prettier": "1.6.1",
     "svg-term-cli": "^2.0.3",
     "tempy": "^0.2.1"
-  },
-  "lint-staged": {
-    "*.js": [
-      "prettier --trailing-comma es5 --single-quote --write",
-      "git add"
-    ],
-    "yarn.lock": [
-      "git rm --cached"
-    ]
   }
 }
diff --git a/packages/confusing-browser-globals/package.json b/packages/confusing-browser-globals/package.json
index 874bec0a52b..f9212a62388 100644
--- a/packages/confusing-browser-globals/package.json
+++ b/packages/confusing-browser-globals/package.json
@@ -16,6 +16,6 @@
     "index.js"
   ],
   "devDependencies": {
-    "jest": "22.4.1"
+    "jest": "^23.6.0"
   }
 }
diff --git a/packages/react-dev-utils/package.json b/packages/react-dev-utils/package.json
index 48197f822c3..799ae7965a4 100644
--- a/packages/react-dev-utils/package.json
+++ b/packages/react-dev-utils/package.json
@@ -62,7 +62,7 @@
     "text-table": "0.2.0"
   },
   "devDependencies": {
-    "jest": "22.4.1"
+    "jest": "^23.6.0"
   },
   "scripts": {
     "test": "jest"
diff --git a/packages/react-error-overlay/package.json b/packages/react-error-overlay/package.json
index f6b45a1d5e8..80fb0c416fe 100644
--- a/packages/react-error-overlay/package.json
+++ b/packages/react-error-overlay/package.json
@@ -50,7 +50,7 @@
     "eslint-plugin-react": "7.7.0",
     "flow-bin": "^0.63.1",
     "html-entities": "1.2.1",
-    "jest": "22.4.1",
+    "jest": "^23.6.0",
     "jest-fetch-mock": "1.2.1",
     "object-assign": "4.1.1",
     "promise": "8.0.1",
diff --git a/packages/react-scripts/README.md b/packages/react-scripts/README.md
index f2a2994f00c..8a1ce5035d5 100644
--- a/packages/react-scripts/README.md
+++ b/packages/react-scripts/README.md
@@ -1,6 +1,14 @@
-# react-scripts
+# byted-react-scripts
 
-This package includes scripts and configuration used by [Create React App](https://github.com/facebook/create-react-app).<br>
+__usage:__
+
+```sh
+create-react-app --scripts-version=byted-react-scripts dirname
+```
+
+
+
+This package includes scripts and configuration forked from [Create React App](https://github.com/facebook/create-react-app).<br>
 Please refer to its documentation:
 
 * [Getting Started](https://github.com/facebook/create-react-app/blob/master/README.md#getting-started) – How to create a new app.
diff --git a/packages/react-scripts/bin/react-scripts.js b/packages/react-scripts/bin/react-scripts.js
index 9ad5fccff88..7030eec0214 100755
--- a/packages/react-scripts/bin/react-scripts.js
+++ b/packages/react-scripts/bin/react-scripts.js
@@ -57,9 +57,6 @@ switch (script) {
   }
   default:
     console.log('Unknown script "' + script + '".');
-    console.log('Perhaps you need to update react-scripts?');
-    console.log(
-      'See: https://github.com/facebook/create-react-app/blob/master/packages/react-scripts/template/README.md#updating-to-new-releases'
-    );
+    console.log('Perhaps you need to update byted-react-scripts?');
     break;
 }
diff --git a/packages/react-scripts/config/env.js b/packages/react-scripts/config/env.js
index 7565cecd001..1e9316d0ca8 100644
--- a/packages/react-scripts/config/env.js
+++ b/packages/react-scripts/config/env.js
@@ -30,7 +30,7 @@ var dotenvFiles = [
   // since normally you expect tests to produce the same
   // results for everyone
   NODE_ENV !== 'test' && `${paths.dotenv}.local`,
-  paths.dotenv,
+  paths.dotenv
 ].filter(Boolean);
 
 // Load environment variables from .env* files. Suppress warnings using silent
@@ -42,7 +42,7 @@ dotenvFiles.forEach(dotenvFile => {
   if (fs.existsSync(dotenvFile)) {
     require('dotenv-expand')(
       require('dotenv').config({
-        path: dotenvFile,
+        path: dotenvFile
       })
     );
   }
@@ -84,7 +84,7 @@ function getClientEnvironment(publicUrl) {
         // For example, <img src={process.env.PUBLIC_URL + '/img/logo.png'} />.
         // This should only be used as an escape hatch. Normally you would put
         // images into the `src` and `import` them in code to get their paths.
-        PUBLIC_URL: publicUrl,
+        PUBLIC_URL: publicUrl
       }
     );
   // Stringify all values so we can feed into Webpack DefinePlugin
@@ -92,7 +92,7 @@ function getClientEnvironment(publicUrl) {
     'process.env': Object.keys(raw).reduce((env, key) => {
       env[key] = JSON.stringify(raw[key]);
       return env;
-    }, {}),
+    }, {})
   };
 
   return { raw, stringified };
diff --git a/packages/react-scripts/config/jest/typescriptTransform.js b/packages/react-scripts/config/jest/typescriptTransform.js
new file mode 100644
index 00000000000..9b138ac8ecb
--- /dev/null
+++ b/packages/react-scripts/config/jest/typescriptTransform.js
@@ -0,0 +1,7 @@
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+'use strict';
+
+const tsJestPreprocessor = require('ts-jest/preprocessor');
+
+module.exports = tsJestPreprocessor;
diff --git a/packages/react-scripts/config/paths.js b/packages/react-scripts/config/paths.js
index d7f55b6f638..d1179209193 100644
--- a/packages/react-scripts/config/paths.js
+++ b/packages/react-scripts/config/paths.js
@@ -13,6 +13,9 @@ const fs = require('fs');
 const url = require('url');
 const findMonorepo = require('react-dev-utils/workspaceUtils').findMonorepo;
 
+const LANG = process.env.DEV_LANG || 'javascript';
+const EXT = LANG === 'javascript' ? '.js' : '.tsx';
+
 // Make sure any symlinks in the project folder are resolved:
 // https://github.com/facebook/create-react-app/issues/637
 const appDirectory = fs.realpathSync(process.cwd());
@@ -54,12 +57,15 @@ module.exports = {
   appBuild: resolveApp('build'),
   appPublic: resolveApp('public'),
   appHtml: resolveApp('public/index.html'),
-  appIndexJs: resolveApp('src/index.js'),
+  appIndexJs: resolveApp(`src/index${EXT}`),
   appPackageJson: resolveApp('package.json'),
   appSrc: resolveApp('src'),
-  testsSetup: resolveApp('src/setupTests.js'),
+  testsSetup: resolveApp(`src/setupTests${EXT}`),
   appNodeModules: resolveApp('node_modules'),
   publicUrl: getPublicUrl(resolveApp('package.json')),
+  appTsConfig: resolveApp('tsconfig.json'),
+  appTsProdConfig: resolveApp('tsconfig.prod.json'),
+  appTsLint: resolveApp('tslint.json'),
   servedPath: getServedPath(resolveApp('package.json')),
 };
 
@@ -75,12 +81,16 @@ module.exports = {
   appBuild: resolveApp('build'),
   appPublic: resolveApp('public'),
   appHtml: resolveApp('public/index.html'),
-  appIndexJs: resolveApp('src/index.js'),
+  appIndexJs: resolveApp(`src/index${EXT}`),
   appPackageJson: resolveApp('package.json'),
   appSrc: resolveApp('src'),
-  testsSetup: resolveApp('src/setupTests.js'),
+  testsSetup: resolveApp(`src/setupTests${EXT}`),
   appNodeModules: resolveApp('node_modules'),
   publicUrl: getPublicUrl(resolveApp('package.json')),
+  appTsConfig: resolveApp('tsconfig.json'),
+  appTsTestConfig: resolveApp('tsconfig.test.json'),
+  appTsProdConfig: resolveApp('tsconfig.prod.json'),
+  appTsLint: resolveApp('tslint.json'),
   servedPath: getServedPath(resolveApp('package.json')),
   // These properties only exist before ejecting:
   ownPath: resolveOwn('.'),
@@ -100,11 +110,15 @@ if (useTemplate) {
     appBuild: resolveOwn('../../build'),
     appPublic: resolveOwn('template/public'),
     appHtml: resolveOwn('template/public/index.html'),
-    appIndexJs: resolveOwn('template/src/index.js'),
+    appIndexJs: resolveOwn(`template/src/index${EXT}`),
     appPackageJson: resolveOwn('package.json'),
     appSrc: resolveOwn('template/src'),
-    testsSetup: resolveOwn('template/src/setupTests.js'),
+    testsSetup: resolveOwn(`template/src/setupTests${EXT}`),
     appNodeModules: resolveOwn('node_modules'),
+    appTsConfig: resolveOwn('template/tsconfig.json'),
+    appTsProdConfig: resolveOwn('template/tsconfig.prod.json'),
+    appTsLint: resolveOwn('template/tslint.json'),
+    appTsTestConfig: resolveOwn('template/tsconfig.test.json'),
     publicUrl: getPublicUrl(resolveOwn('package.json')),
     servedPath: getServedPath(resolveOwn('package.json')),
     // These properties only exist before ejecting:
diff --git a/packages/react-scripts/config/webpack.config.dev.js b/packages/react-scripts/config/webpack.config.dev.js
index 7a1b66803bc..f45efae1897 100644
--- a/packages/react-scripts/config/webpack.config.dev.js
+++ b/packages/react-scripts/config/webpack.config.dev.js
@@ -8,6 +8,7 @@
 // @remove-on-eject-end
 'use strict';
 
+const LANG = process.env.DEV_LANG;
 const autoprefixer = require('autoprefixer');
 const path = require('path');
 const webpack = require('webpack');
@@ -20,7 +21,8 @@ const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
 const getCSSModuleLocalIdent = require('react-dev-utils/getCSSModuleLocalIdent');
 const getClientEnvironment = require('./env');
 const paths = require('./paths');
-
+const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
+const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
 // Webpack uses `publicPath` to determine where the app is being served from.
 // In development, we always serve from the root. This makes config easier.
 const publicPath = '/';
@@ -34,16 +36,24 @@ const env = getClientEnvironment(publicUrl);
 // Options for PostCSS as we reference these options twice
 // Adds vendor prefixing based on your specified browser support in
 // package.json
+const postCSSLoaderPlugins = [
+  require('postcss-flexbugs-fixes'),
+  autoprefixer({
+    flexbox: 'no-2009'
+  })
+];
+if (env.raw.REACT_APP_REM_UNIT) {
+  postCSSLoaderPlugins.push(
+    require('postcss-px2rem')({
+      remUnit: env.raw.REACT_APP_REM_UNIT
+    })
+  );
+}
 const postCSSLoaderOptions = {
   // Necessary for external CSS imports to work
   // https://github.com/facebook/create-react-app/issues/2677
   ident: 'postcss',
-  plugins: () => [
-    require('postcss-flexbugs-fixes'),
-    autoprefixer({
-      flexbox: 'no-2009',
-    }),
-  ],
+  plugins: postCSSLoaderPlugins
 };
 
 // style files regexes
@@ -58,12 +68,12 @@ const getStyleLoaders = (cssOptions, preProcessor) => {
     require.resolve('style-loader'),
     {
       loader: require.resolve('css-loader'),
-      options: cssOptions,
+      options: cssOptions
     },
     {
       loader: require.resolve('postcss-loader'),
-      options: postCSSLoaderOptions,
-    },
+      options: postCSSLoaderOptions
+    }
   ];
   if (preProcessor) {
     loaders.push(require.resolve(preProcessor));
@@ -96,7 +106,7 @@ module.exports = {
     // require.resolve('webpack/hot/dev-server'),
     require.resolve('react-dev-utils/webpackHotDevClient'),
     // Finally, this is your app's code:
-    paths.appIndexJs,
+    paths.appIndexJs
     // We include the app code last so that if there is a runtime error during
     // initialization, it doesn't blow up the WebpackDevServer client, and
     // changing JS code would still trigger a refresh.
@@ -114,7 +124,7 @@ module.exports = {
     publicPath: publicPath,
     // Point sourcemap entries to original disk location (format as URL on Windows)
     devtoolModuleFilenameTemplate: info =>
-      path.resolve(info.absoluteResourcePath).replace(/\\/g, '/'),
+      path.resolve(info.absoluteResourcePath).replace(/\\/g, '/')
   },
   resolve: {
     // This allows you to set a fallback for where Webpack should look for modules.
@@ -131,7 +141,21 @@ module.exports = {
     // https://github.com/facebook/create-react-app/issues/290
     // `web` extension prefixes have been added for better support
     // for React Native Web.
-    extensions: ['.web.js', '.mjs', '.js', '.json', '.web.jsx', '.jsx'],
+    extensions:
+      LANG === 'typescript'
+        ? [
+            '.mjs',
+            '.web.ts',
+            '.ts',
+            '.web.tsx',
+            '.tsx',
+            '.web.js',
+            '.js',
+            '.json',
+            '.web.jsx',
+            '.jsx'
+          ]
+        : ['.web.js', '.mjs', '.js', '.json', '.web.jsx', '.jsx'],
     alias: {
       // @remove-on-eject-begin
       // Resolve Babel runtime relative to react-scripts.
@@ -144,7 +168,7 @@ module.exports = {
       // @remove-on-eject-end
       // Support React Native Web
       // https://www.smashingmagazine.com/2016/08/a-glimpse-into-the-future-with-react-native-for-web/
-      'react-native': 'react-native-web',
+      'react-native': 'react-native-web'
     },
     plugins: [
       // Prevents users from importing files from outside of src/ (or node_modules/).
@@ -152,8 +176,12 @@ module.exports = {
       // To fix this, we prevent you from importing files out of src/ -- if you'd like to,
       // please link the files into your node_modules/ and let module-resolution kick in.
       // Make sure your source files are compiled, as they will not be processed in any way.
-      new ModuleScopePlugin(paths.appSrc, [paths.appPackageJson]),
-    ],
+      new ModuleScopePlugin(paths.appSrc, [paths.appPackageJson])
+    ].concat(
+      LANG === 'typescript'
+        ? [new TsconfigPathsPlugin({ configFile: paths.appTsConfig })]
+        : []
+    )
   },
   module: {
     strictExportPresence: true,
@@ -167,23 +195,27 @@ module.exports = {
         test: /\.(js|jsx|mjs)$/,
         enforce: 'pre',
         use: [
-          {
-            options: {
-              formatter: eslintFormatter,
-              eslintPath: require.resolve('eslint'),
-              baseConfig: {
-                extends: [require.resolve('eslint-config-react-app')],
-              },
-              // @remove-on-eject-begin
-              ignore: false,
-              useEslintrc: false,
-              // @remove-on-eject-end
-            },
-            loader: require.resolve('eslint-loader'),
-          },
+          LANG === 'javascript'
+            ? {
+                options: {
+                  formatter: eslintFormatter,
+                  eslintPath: require.resolve('eslint'),
+                  baseConfig: {
+                    extends: [require.resolve('eslint-config-react-app')]
+                  },
+                  // @remove-on-eject-begin
+                  ignore: false,
+                  useEslintrc: false
+                  // @remove-on-eject-end
+                },
+                loader: require.resolve('eslint-loader')
+              }
+            : {
+                loader: require.resolve('source-map-loader')
+              }
         ],
         include: paths.srcPaths,
-        exclude: [/[/\\\\]node_modules[/\\\\]/],
+        exclude: [/[/\\\\]node_modules[/\\\\]/]
       },
       {
         // "oneOf" will traverse all following loaders until one will
@@ -198,8 +230,8 @@ module.exports = {
             loader: require.resolve('url-loader'),
             options: {
               limit: 10000,
-              name: 'static/media/[name].[hash:8].[ext]',
-            },
+              name: 'static/media/[name].[hash:8].[ext]'
+            }
           },
           // Process application JS with Babel.
           // The preset includes JSX, Flow, and some ESnext features.
@@ -218,26 +250,44 @@ module.exports = {
                   babelrc: false,
                   // @remove-on-eject-end
                   presets: [require.resolve('babel-preset-react-app')],
-                  plugins: [
-                    [
-                      require.resolve('babel-plugin-named-asset-import'),
-                      {
-                        loaderMap: {
-                          svg: {
-                            ReactComponent: 'svgr/webpack![path]',
-                          },
-                        },
-                      },
-                    ],
-                  ],
                   // This is a feature of `babel-loader` for webpack (not Babel itself).
                   // It enables caching results in ./node_modules/.cache/babel-loader/
                   // directory for faster rebuilds.
                   cacheDirectory: true,
-                  highlightCode: true,
-                },
+                  highlightCode: true
+                }
+              }
+            ]
+          },
+          {
+            test: /\.(ts|tsx)$/,
+            include: paths.srcPaths,
+            exclude: [/[/\\\\]node_modules[/\\\\]/],
+            use: [
+              // This loader parallelizes code compilation, it is optional but
+              // improves compile time on larger projects
+              // require.resolve('thread-loader'),
+              {
+                loader: require.resolve('babel-loader'),
+                options: {
+                  // @remove-on-eject-begin
+                  babelrc: false,
+                  // @remove-on-eject-end
+                  presets: [require.resolve('babel-preset-react-app')],
+                  // This is a feature of `babel-loader` for webpack (not Babel itself).
+                  // It enables caching results in ./node_modules/.cache/babel-loader/
+                  // directory for faster rebuilds.
+                  cacheDirectory: true,
+                  highlightCode: true
+                }
               },
-            ],
+              {
+                loader: 'ts-loader',
+                options: {
+                  transpileOnly: true
+                }
+              }
+            ]
           },
           // Process any JS outside of the app with Babel.
           // Unlike the application JS, we only compile the standard ES features.
@@ -253,13 +303,13 @@ module.exports = {
                   babelrc: false,
                   compact: false,
                   presets: [
-                    require.resolve('babel-preset-react-app/dependencies'),
+                    require.resolve('babel-preset-react-app/dependencies')
                   ],
                   cacheDirectory: true,
-                  highlightCode: true,
-                },
-              },
-            ],
+                  highlightCode: true
+                }
+              }
+            ]
           },
           // "postcss" loader applies autoprefixer to our CSS.
           // "css" loader resolves paths in CSS and adds assets as dependencies.
@@ -271,8 +321,8 @@ module.exports = {
             test: cssRegex,
             exclude: cssModuleRegex,
             use: getStyleLoaders({
-              importLoaders: 1,
-            }),
+              importLoaders: 1
+            })
           },
           // Adds support for CSS Modules (https://github.com/css-modules/css-modules)
           // using the extension .module.css
@@ -281,8 +331,8 @@ module.exports = {
             use: getStyleLoaders({
               importLoaders: 1,
               modules: true,
-              getLocalIdent: getCSSModuleLocalIdent,
-            }),
+              getLocalIdent: getCSSModuleLocalIdent
+            })
           },
           // Opt-in support for SASS (using .scss or .sass extensions).
           // Chains the sass-loader with the css-loader and the style-loader
@@ -292,7 +342,7 @@ module.exports = {
           {
             test: sassRegex,
             exclude: sassModuleRegex,
-            use: getStyleLoaders({ importLoaders: 2 }, 'sass-loader'),
+            use: getStyleLoaders({ importLoaders: 2 }, 'sass-loader')
           },
           // Adds support for CSS Modules, but using SASS
           // using the extension .module.scss or .module.sass
@@ -302,15 +352,33 @@ module.exports = {
               {
                 importLoaders: 2,
                 modules: true,
-                getLocalIdent: getCSSModuleLocalIdent,
+                getLocalIdent: getCSSModuleLocalIdent
               },
               'sass-loader'
-            ),
+            )
+          },
+          {
+            test: /\.less$/,
+            exclude: sassModuleRegex,
+            use: getStyleLoaders({ importLoaders: 2 }, 'less-loader')
+          },
+          // Adds support for CSS Modules, but using SASS
+          // using the extension .module.scss or .module.sass
+          {
+            test: /\.module\.less$/,
+            use: getStyleLoaders(
+              {
+                importLoaders: 2,
+                modules: true,
+                getLocalIdent: getCSSModuleLocalIdent
+              },
+              'less-loader'
+            )
           },
           // The GraphQL loader preprocesses GraphQL queries in .graphql files.
           {
             test: /\.(graphql)$/,
-            loader: 'graphql-tag/loader',
+            loader: 'graphql-tag/loader'
           },
           // "file" loader makes sure those assets get served by WebpackDevServer.
           // When you `import` an asset, you get its (virtual) filename.
@@ -325,14 +393,14 @@ module.exports = {
             exclude: [/\.(js|jsx|mjs)$/, /\.html$/, /\.json$/],
             loader: require.resolve('file-loader'),
             options: {
-              name: 'static/media/[name].[hash:8].[ext]',
-            },
-          },
-        ],
-      },
+              name: 'static/media/[name].[hash:8].[ext]'
+            }
+          }
+        ]
+      }
       // ** STOP ** Are you adding a new loader?
       // Make sure to add the new loader(s) before the "file" loader.
-    ],
+    ]
   },
   plugins: [
     // Makes some environment variables available in index.html.
@@ -343,7 +411,7 @@ module.exports = {
     // Generates an `index.html` file with the <script> injected.
     new HtmlWebpackPlugin({
       inject: true,
-      template: paths.appHtml,
+      template: paths.appHtml
     }),
     // Add module names to factory functions so they appear in browser profiler.
     new webpack.NamedModulesPlugin(),
@@ -366,8 +434,20 @@ module.exports = {
     // solution that requires the user to opt into importing specific locales.
     // https://github.com/jmblog/how-to-optimize-momentjs-with-webpack
     // You can remove this if you don't use Moment.js:
-    new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
-  ],
+    new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/)
+  ].concat(
+    LANG === 'typescript'
+      ? // Perform type checking and linting in a separate process to speed up compilation
+        [
+          new ForkTsCheckerWebpackPlugin({
+            async: false,
+            watch: paths.appSrc,
+            tsconfig: paths.appTsConfig,
+            tslint: paths.appTsLint
+          })
+        ]
+      : []
+  ),
   // Some libraries import Node modules but don't use them in the browser.
   // Tell Webpack to provide empty mocks for them so importing them works.
   node: {
@@ -375,12 +455,12 @@ module.exports = {
     fs: 'empty',
     net: 'empty',
     tls: 'empty',
-    child_process: 'empty',
+    child_process: 'empty'
   },
   // Turn off performance hints during development because we don't do any
   // splitting or minification in interest of speed. These warnings become
   // cumbersome.
   performance: {
-    hints: false,
-  },
+    hints: false
+  }
 };
diff --git a/packages/react-scripts/config/webpack.config.prod.js b/packages/react-scripts/config/webpack.config.prod.js
index c8d1f3b13d9..301bec273ac 100644
--- a/packages/react-scripts/config/webpack.config.prod.js
+++ b/packages/react-scripts/config/webpack.config.prod.js
@@ -8,6 +8,7 @@
 // @remove-on-eject-end
 'use strict';
 
+const LANG = process.env.DEV_LANG;
 const autoprefixer = require('autoprefixer');
 const path = require('path');
 const webpack = require('webpack');
@@ -19,9 +20,12 @@ const InterpolateHtmlPlugin = require('react-dev-utils/InterpolateHtmlPlugin');
 const SWPrecacheWebpackPlugin = require('sw-precache-webpack-plugin');
 const eslintFormatter = require('react-dev-utils/eslintFormatter');
 const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
+const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
 const getCSSModuleLocalIdent = require('react-dev-utils/getCSSModuleLocalIdent');
 const paths = require('./paths');
 const getClientEnvironment = require('./env');
+const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
+const ModuleConcatenationPlugin = webpack.optimize.ModuleConcatenationPlugin;
 
 // Webpack uses `publicPath` to determine where the app is being served from.
 // It requires a trailing slash, or the file assets will get an incorrect path.
@@ -59,17 +63,33 @@ const extractTextPluginOptions = shouldUseRelativeAssetPaths
 // Options for PostCSS as we reference these options twice
 // Adds vendor prefixing based on your specified browser support in
 // package.json
+const postCSSLoaderPlugins = [
+  require('postcss-flexbugs-fixes'),
+  autoprefixer({
+    flexbox: 'no-2009'
+  }),
+  require('postcss-url')({
+    url: function(asset) {
+      if (asset.url.charAt(0) === '/') {
+        return publicUrl + asset.url;
+      }
+      return asset.url;
+    }
+  })
+];
+if (env.raw.REACT_APP_REM_UNIT) {
+  postCSSLoaderPlugins.push(
+    require('postcss-px2rem')({
+      remUnit: env.raw.REACT_APP_REM_UNIT
+    })
+  );
+}
 const postCSSLoaderOptions = {
   // Necessary for external CSS imports to work
   // https://github.com/facebook/create-react-app/issues/2677
   ident: 'postcss',
-  plugins: () => [
-    require('postcss-flexbugs-fixes'),
-    autoprefixer({
-      flexbox: 'no-2009',
-    }),
-  ],
-  sourceMap: shouldUseSourceMap,
+  plugins: postCSSLoaderPlugins,
+  sourceMap: shouldUseSourceMap
 };
 
 // style files regexes
@@ -83,19 +103,19 @@ const getStyleLoaders = (cssOptions, preProcessor) => {
   const loaders = [
     {
       loader: require.resolve('css-loader'),
-      options: cssOptions,
+      options: cssOptions
     },
     {
       loader: require.resolve('postcss-loader'),
-      options: postCSSLoaderOptions,
-    },
+      options: postCSSLoaderOptions
+    }
   ];
   if (preProcessor) {
     loaders.push({
       loader: require.resolve(preProcessor),
       options: {
-        sourceMap: shouldUseSourceMap,
-      },
+        sourceMap: shouldUseSourceMap
+      }
     });
   }
   return ExtractTextPlugin.extract(
@@ -104,10 +124,10 @@ const getStyleLoaders = (cssOptions, preProcessor) => {
         fallback: {
           loader: require.resolve('style-loader'),
           options: {
-            hmr: false,
-          },
+            hmr: false
+          }
         },
-        use: loaders,
+        use: loaders
       },
       extractTextPluginOptions
     )
@@ -137,9 +157,7 @@ module.exports = {
     publicPath: publicPath,
     // Point sourcemap entries to original disk location (format as URL on Windows)
     devtoolModuleFilenameTemplate: info =>
-      path
-        .relative(paths.appSrc, info.absoluteResourcePath)
-        .replace(/\\/g, '/'),
+      path.relative(paths.appSrc, info.absoluteResourcePath).replace(/\\/g, '/')
   },
   resolve: {
     // This allows you to set a fallback for where Webpack should look for modules.
@@ -156,7 +174,21 @@ module.exports = {
     // https://github.com/facebook/create-react-app/issues/290
     // `web` extension prefixes have been added for better support
     // for React Native Web.
-    extensions: ['.web.js', '.mjs', '.js', '.json', '.web.jsx', '.jsx'],
+    extensions:
+      LANG === 'typescript'
+        ? [
+            '.mjs',
+            '.web.ts',
+            '.ts',
+            '.web.tsx',
+            '.tsx',
+            '.web.js',
+            '.js',
+            '.json',
+            '.web.jsx',
+            '.jsx'
+          ]
+        : ['.web.js', '.mjs', '.js', '.json', '.web.jsx', '.jsx'],
     alias: {
       // @remove-on-eject-begin
       // Resolve Babel runtime relative to react-scripts.
@@ -169,7 +201,7 @@ module.exports = {
       // @remove-on-eject-end
       // Support React Native Web
       // https://www.smashingmagazine.com/2016/08/a-glimpse-into-the-future-with-react-native-for-web/
-      'react-native': 'react-native-web',
+      'react-native': 'react-native-web'
     },
     plugins: [
       // Prevents users from importing files from outside of src/ (or node_modules/).
@@ -177,8 +209,12 @@ module.exports = {
       // To fix this, we prevent you from importing files out of src/ -- if you'd like to,
       // please link the files into your node_modules/ and let module-resolution kick in.
       // Make sure your source files are compiled, as they will not be processed in any way.
-      new ModuleScopePlugin(paths.appSrc, [paths.appPackageJson]),
-    ],
+      new ModuleScopePlugin(paths.appSrc, [paths.appPackageJson])
+    ].concat(
+      LANG === 'typescript'
+        ? [new TsconfigPathsPlugin({ configFile: paths.appTsProdConfig })]
+        : []
+    )
   },
   module: {
     strictExportPresence: true,
@@ -192,25 +228,27 @@ module.exports = {
         test: /\.(js|jsx|mjs)$/,
         enforce: 'pre',
         use: [
-          {
-            options: {
-              formatter: eslintFormatter,
-              eslintPath: require.resolve('eslint'),
-              // TODO: consider separate config for production,
-              // e.g. to enable no-console and no-debugger only in production.
-              baseConfig: {
-                extends: [require.resolve('eslint-config-react-app')],
-              },
-              // @remove-on-eject-begin
-              ignore: false,
-              useEslintrc: false,
-              // @remove-on-eject-end
-            },
-            loader: require.resolve('eslint-loader'),
-          },
+          LANG === 'javascript'
+            ? {
+                options: {
+                  formatter: eslintFormatter,
+                  eslintPath: require.resolve('eslint'),
+                  baseConfig: {
+                    extends: [require.resolve('eslint-config-react-app')]
+                  },
+                  // @remove-on-eject-begin
+                  ignore: false,
+                  useEslintrc: false
+                  // @remove-on-eject-end
+                },
+                loader: require.resolve('eslint-loader')
+              }
+            : {
+                loader: require.resolve('source-map-loader')
+              }
         ],
         include: paths.srcPaths,
-        exclude: [/[/\\\\]node_modules[/\\\\]/],
+        exclude: [/[/\\\\]node_modules[/\\\\]/]
       },
       {
         // "oneOf" will traverse all following loaders until one will
@@ -224,8 +262,8 @@ module.exports = {
             loader: require.resolve('url-loader'),
             options: {
               limit: 10000,
-              name: 'static/media/[name].[hash:8].[ext]',
-            },
+              name: 'static/media/[name].[hash:8].[ext]'
+            }
           },
           // Process application JS with Babel.
           // The preset includes JSX, Flow, and some ESnext features.
@@ -244,23 +282,38 @@ module.exports = {
                   babelrc: false,
                   // @remove-on-eject-end
                   presets: [require.resolve('babel-preset-react-app')],
-                  plugins: [
-                    [
-                      require.resolve('babel-plugin-named-asset-import'),
-                      {
-                        loaderMap: {
-                          svg: {
-                            ReactComponent: 'svgr/webpack![path]',
-                          },
-                        },
-                      },
-                    ],
-                  ],
                   compact: true,
-                  highlightCode: true,
-                },
+                  highlightCode: true
+                }
+              }
+            ]
+          },
+          {
+            test: /\.(ts|tsx)$/,
+            include: paths.srcPaths,
+            exclude: [/[/\\\\]node_modules[/\\\\]/],
+            use: [
+              {
+                loader: require.resolve('babel-loader'),
+                options: {
+                  // @remove-on-eject-begin
+                  babelrc: false,
+                  // @remove-on-eject-end
+                  presets: [require.resolve('babel-preset-react-app')],
+                  // This is a feature of `babel-loader` for webpack (not Babel itself).
+                  // It enables caching results in ./node_modules/.cache/babel-loader/
+                  // directory for faster rebuilds.
+                  cacheDirectory: true,
+                  highlightCode: true
+                }
               },
-            ],
+              {
+                loader: 'ts-loader',
+                options: {
+                  transpileOnly: true
+                }
+              }
+            ]
           },
           // Process any JS outside of the app with Babel.
           // Unlike the application JS, we only compile the standard ES features.
@@ -276,13 +329,13 @@ module.exports = {
                   babelrc: false,
                   compact: false,
                   presets: [
-                    require.resolve('babel-preset-react-app/dependencies'),
+                    require.resolve('babel-preset-react-app/dependencies')
                   ],
                   cacheDirectory: true,
-                  highlightCode: true,
-                },
-              },
-            ],
+                  highlightCode: true
+                }
+              }
+            ]
           },
           // The notation here is somewhat confusing.
           // "postcss" loader applies autoprefixer to our CSS.
@@ -303,8 +356,8 @@ module.exports = {
             loader: getStyleLoaders({
               importLoaders: 1,
               minimize: true,
-              sourceMap: shouldUseSourceMap,
-            }),
+              sourceMap: shouldUseSourceMap
+            })
             // Note: this won't work without `new ExtractTextPlugin()` in `plugins`.
           },
           // Adds support for CSS Modules (https://github.com/css-modules/css-modules)
@@ -316,8 +369,8 @@ module.exports = {
               minimize: true,
               sourceMap: shouldUseSourceMap,
               modules: true,
-              getLocalIdent: getCSSModuleLocalIdent,
-            }),
+              getLocalIdent: getCSSModuleLocalIdent
+            })
             // Note: this won't work without `new ExtractTextPlugin()` in `plugins`.
           },
           // Opt-in support for SASS. The logic here is somewhat similar
@@ -332,10 +385,10 @@ module.exports = {
               {
                 importLoaders: 2,
                 minimize: true,
-                sourceMap: shouldUseSourceMap,
+                sourceMap: shouldUseSourceMap
               },
               'sass-loader'
-            ),
+            )
             // Note: this won't work without `new ExtractTextPlugin()` in `plugins`.
           },
           // Adds support for CSS Modules, but using SASS
@@ -348,16 +401,34 @@ module.exports = {
                 minimize: true,
                 sourceMap: shouldUseSourceMap,
                 modules: true,
-                getLocalIdent: getCSSModuleLocalIdent,
+                getLocalIdent: getCSSModuleLocalIdent
               },
               'sass-loader'
-            ),
+            )
             // Note: this won't work without `new ExtractTextPlugin()` in `plugins`.
           },
+          {
+            test: /\.less$/,
+            exclude: sassModuleRegex,
+            use: getStyleLoaders({ importLoaders: 2 }, 'less-loader')
+          },
+          // Adds support for CSS Modules, but using SASS
+          // using the extension .module.scss or .module.sass
+          {
+            test: /\.module\.less$/,
+            use: getStyleLoaders(
+              {
+                importLoaders: 2,
+                modules: true,
+                getLocalIdent: getCSSModuleLocalIdent
+              },
+              'less-loader'
+            )
+          },
           // The GraphQL loader preprocesses GraphQL queries in .graphql files.
           {
             test: /\.(graphql)$/,
-            loader: 'graphql-tag/loader',
+            loader: 'graphql-tag/loader'
           },
           // "file" loader makes sure assets end up in the `build` folder.
           // When you `import` an asset, you get its filename.
@@ -371,14 +442,14 @@ module.exports = {
             // by webpacks internal loaders.
             exclude: [/\.(js|jsx|mjs)$/, /\.html$/, /\.json$/],
             options: {
-              name: 'static/media/[name].[hash:8].[ext]',
-            },
-          },
+              name: 'static/media/[name].[hash:8].[ext]'
+            }
+          }
           // ** STOP ** Are you adding a new loader?
           // Make sure to add the new loader(s) before the "file" loader.
-        ],
-      },
-    ],
+        ]
+      }
+    ]
   },
   plugins: [
     // Makes some environment variables available in index.html.
@@ -401,8 +472,8 @@ module.exports = {
         keepClosingSlash: true,
         minifyJS: true,
         minifyCSS: true,
-        minifyURLs: true,
-      },
+        minifyURLs: true
+      }
     }),
     // Makes some environment variables available to the JS code, for example:
     // if (process.env.NODE_ENV === 'production') { ... }. See `./env.js`.
@@ -418,7 +489,7 @@ module.exports = {
           // into invalid ecma 5 code. This is why the 'compress' and 'output'
           // sections only apply transformations that are ecma 5 safe
           // https://github.com/facebook/create-react-app/pull/4234
-          ecma: 8,
+          ecma: 8
         },
         compress: {
           ecma: 5,
@@ -427,36 +498,36 @@ module.exports = {
           // https://github.com/facebook/create-react-app/issues/2376
           // Pending further investigation:
           // https://github.com/mishoo/UglifyJS2/issues/2011
-          comparisons: false,
+          comparisons: false
         },
         mangle: {
-          safari10: true,
+          safari10: true
         },
         output: {
           ecma: 5,
           comments: false,
           // Turned on because emoji and regex is not minified properly using default
           // https://github.com/facebook/create-react-app/issues/2488
-          ascii_only: true,
-        },
+          ascii_only: true
+        }
       },
       // Use multi-process parallel running to improve the build speed
       // Default number of concurrent runs: os.cpus().length - 1
       parallel: true,
       // Enable file caching
       cache: true,
-      sourceMap: shouldUseSourceMap,
+      sourceMap: shouldUseSourceMap
     }),
     // Note: this won't work without ExtractTextPlugin.extract(..) in `loaders`.
     new ExtractTextPlugin({
-      filename: cssFilename,
+      filename: cssFilename
     }),
     // Generate a manifest file which contains a mapping of all asset filenames
     // to their corresponding output file so that tools can pick it up without
     // having to parse `index.html`.
     new ManifestPlugin({
       fileName: 'asset-manifest.json',
-      publicPath: publicPath,
+      publicPath: publicPath
     }),
     // Generate a service worker script that will precache, and keep up to date,
     // the HTML & assets that are part of the Webpack build.
@@ -481,7 +552,7 @@ module.exports = {
       },
       minify: true,
       // Don't precache sourcemaps (they're large) and build asset manifest:
-      staticFileGlobsIgnorePatterns: [/\.map$/, /asset-manifest\.json$/],
+      staticFileGlobsIgnorePatterns: [/\.map$/, /asset-manifest\.json$/]
       // `navigateFallback` and `navigateFallbackWhitelist` are disabled by default; see
       // https://github.com/facebook/create-react-app/blob/master/packages/react-scripts/template/README.md#service-worker-considerations
       // navigateFallback: publicUrl + '/index.html',
@@ -493,7 +564,24 @@ module.exports = {
     // https://github.com/jmblog/how-to-optimize-momentjs-with-webpack
     // You can remove this if you don't use Moment.js:
     new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
-  ],
+    new ModuleConcatenationPlugin()
+  ]
+    .concat(
+      LANG === 'typescript'
+        ? [
+            new ForkTsCheckerWebpackPlugin({
+              async: false,
+              tsconfig: paths.appTsProdConfig,
+              tslint: paths.appTsLint
+            })
+          ]
+        : []
+    )
+    .concat(
+      process.argv.slice(1).indexOf('--size') !== -1
+        ? [new require('webpack-bundle-analyzer').BundleAnalyzerPlugin()]
+        : []
+    ),
   // Some libraries import Node modules but don't use them in the browser.
   // Tell Webpack to provide empty mocks for them so importing them works.
   node: {
@@ -501,6 +589,6 @@ module.exports = {
     fs: 'empty',
     net: 'empty',
     tls: 'empty',
-    child_process: 'empty',
-  },
+    child_process: 'empty'
+  }
 };
diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
index e61fcade8bf..1fc9f90fd4e 100644
--- a/packages/react-scripts/package.json
+++ b/packages/react-scripts/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "react-scripts",
-  "version": "1.1.0",
+  "name": "byted-react-scripts",
+  "version": "2.1.7",
   "description": "Configuration and scripts for Create React App.",
   "repository": "facebook/create-react-app",
   "license": "MIT",
@@ -18,25 +18,24 @@
     "utils"
   ],
   "bin": {
-    "react-scripts": "./bin/react-scripts.js"
+    "byted-react-scripts": "./bin/react-scripts.js"
   },
   "dependencies": {
     "@babel/core": "7.0.0-beta.46",
     "@babel/runtime": "7.0.0-beta.46",
     "autoprefixer": "7.2.5",
     "babel-core": "7.0.0-bridge.0",
-    "babel-eslint": "8.2.2",
+    "babel-eslint": "8.2.6",
     "babel-jest": "22.4.1",
     "babel-loader": "8.0.0-beta.0",
-    "babel-plugin-named-asset-import": "^0.1.0",
-    "babel-preset-react-app": "^3.1.1",
+    "babel-preset-react-app": "4.0.0-next.66cc7a90",
     "case-sensitive-paths-webpack-plugin": "2.1.1",
     "chalk": "2.3.0",
     "css-loader": "0.28.9",
     "dotenv": "5.0.0",
     "dotenv-expand": "4.2.0",
-    "eslint": "4.15.0",
-    "eslint-config-react-app": "^2.1.0",
+    "eslint": "4.19.1",
+    "eslint-config-react-app": "3.0.0-next.66cc7a90",
     "eslint-loader": "1.9.0",
     "eslint-plugin-flowtype": "2.41.0",
     "eslint-plugin-import": "2.8.0",
@@ -44,28 +43,42 @@
     "eslint-plugin-react": "7.7.0",
     "extract-text-webpack-plugin": "3.0.2",
     "file-loader": "1.1.6",
+    "fork-ts-checker-webpack-plugin": "^0.2.8",
     "fs-extra": "5.0.0",
     "graphql": "0.12.3",
     "graphql-tag": "2.6.1",
     "html-webpack-plugin": "2.30.1",
     "identity-obj-proxy": "3.0.0",
-    "jest": "22.4.1",
+    "inquirer": "^6.0.0",
+    "jest": "^23.6.0",
+    "less-loader": "^4.1.0",
     "loader-utils": "^1.1.0",
     "object-assign": "4.1.1",
     "postcss-flexbugs-fixes": "3.2.0",
     "postcss-loader": "2.0.10",
+    "postcss-px2rem": "^0.3.0",
+    "postcss-url": "^7.3.2",
     "promise": "8.0.1",
     "raf": "3.4.0",
-    "react-dev-utils": "^5.0.0",
+    "react-dev-utils": "6.0.0-next.66cc7a90",
     "resolve": "1.6.0",
     "sass-loader": "7.0.1",
+    "source-map-loader": "^0.2.1",
     "style-loader": "0.19.1",
     "svgr": "1.8.1",
     "sw-precache-webpack-plugin": "0.11.4",
     "thread-loader": "1.1.2",
-    "uglifyjs-webpack-plugin": "1.1.6",
+    "ts-jest": "22.0.1",
+    "ts-loader": "^2.0.0",
+    "tsconfig-paths-webpack-plugin": "^2.0.0",
+    "tslint": "^5.7.0",
+    "tslint-config-prettier": "^1.10.0",
+    "tslint-react": "^3.2.0",
+    "typescript": "latest",
+    "uglifyjs-webpack-plugin": "^1.1.8",
     "url-loader": "0.6.2",
     "webpack": "3.10.0",
+    "webpack-bundle-analyzer": "^2.13.1",
     "webpack-dev-server": "2.11.0",
     "webpack-manifest-plugin": "1.3.2",
     "whatwg-fetch": "2.0.3"
diff --git a/packages/react-scripts/scripts/init.js b/packages/react-scripts/scripts/init.js
index ac695d167d9..c1a1902f998 100644
--- a/packages/react-scripts/scripts/init.js
+++ b/packages/react-scripts/scripts/init.js
@@ -21,6 +21,7 @@ const execSync = require('child_process').execSync;
 const spawn = require('react-dev-utils/crossSpawn');
 const { defaultBrowsers } = require('react-dev-utils/browsersHelper');
 const os = require('os');
+const makeDotEnvFile = require('./utils/createDotEnv').makeDotEnvFile;
 
 function isInGitRepository() {
   try {
@@ -53,7 +54,7 @@ function tryGitInit(appPath) {
 
     execSync('git add -A', { stdio: 'ignore' });
     execSync('git commit -m "Initial commit from Create React App"', {
-      stdio: 'ignore',
+      stdio: 'ignore'
     });
     return true;
   } catch (e) {
@@ -81,168 +82,231 @@ module.exports = function(
   originalDirectory,
   template
 ) {
-  const ownPackageName = require(path.join(__dirname, '..', 'package.json'))
-    .name;
-  const ownPath = path.join(appPath, 'node_modules', ownPackageName);
-  const appPackage = require(path.join(appPath, 'package.json'));
-  const useYarn = fs.existsSync(path.join(appPath, 'yarn.lock'));
-
-  // Copy over some of the devDependencies
-  appPackage.dependencies = appPackage.dependencies || {};
-
-  // Setup the script rules
-  appPackage.scripts = {
-    start: 'react-scripts start',
-    build: 'react-scripts build',
-    test: 'react-scripts test --env=jsdom',
-    eject: 'react-scripts eject',
-  };
-
-  appPackage.browserslist = defaultBrowsers;
-
-  fs.writeFileSync(
-    path.join(appPath, 'package.json'),
-    JSON.stringify(appPackage, null, 2) + os.EOL
-  );
+  require('inquirer')
+    .prompt([
+      {
+        type: 'list',
+        name: 'type',
+        message: 'Choose your develop language:',
+        default: 'javascript',
+        choices: ['javascript', 'typescript']
+      }
+    ])
+    .then(answer => {
+      const languageType = answer.type;
+      const ownPackageName = require(path.join(__dirname, '..', 'package.json'))
+        .name;
+      const ownPath = path.join(appPath, 'node_modules', ownPackageName);
+      const appPackage = require(path.join(appPath, 'package.json'));
+      const useYarn = fs.existsSync(path.join(appPath, 'yarn.lock'));
 
-  const readmeExists = fs.existsSync(path.join(appPath, 'README.md'));
-  if (readmeExists) {
-    fs.renameSync(
-      path.join(appPath, 'README.md'),
-      path.join(appPath, 'README.old.md')
-    );
-  }
+      // Copy over some of the devDependencies
+      appPackage.dependencies = appPackage.dependencies || {};
 
-  // Copy the files for the user
-  const templatePath = template
-    ? path.resolve(originalDirectory, template)
-    : path.join(ownPath, 'template');
-  if (fs.existsSync(templatePath)) {
-    fs.copySync(templatePath, appPath);
-  } else {
-    console.error(
-      `Could not locate supplied template: ${chalk.green(templatePath)}`
-    );
-    return;
-  }
+      // Setup the script rules
+      // 用 env 传值避免各种 require 文件还要传
+      appPackage.scripts = {
+        start: 'byted-react-scripts start',
+        build: 'byted-react-scripts build',
+        test: 'byted-react-scripts test --env=jsdom',
+        eject: 'byted-react-scripts eject',
+        size: 'byted-react-scripts build --size'
+      };
 
-  // Rename gitignore after the fact to prevent npm from renaming it to .npmignore
-  // See: https://github.com/npm/npm/issues/1862
-  try {
-    fs.moveSync(
-      path.join(appPath, 'gitignore'),
-      path.join(appPath, '.gitignore'),
-      []
-    );
-  } catch (err) {
-    // Append if there's already a `.gitignore` file there
-    if (err.code === 'EEXIST') {
-      const data = fs.readFileSync(path.join(appPath, 'gitignore'));
-      fs.appendFileSync(path.join(appPath, '.gitignore'), data);
-      fs.unlinkSync(path.join(appPath, 'gitignore'));
-    } else {
-      throw err;
-    }
-  }
+      appPackage.browserslist = defaultBrowsers;
 
-  let command;
-  let args;
+      fs.writeFileSync(
+        path.join(appPath, 'package.json'),
+        JSON.stringify(appPackage, null, 2) + os.EOL
+      );
 
-  if (useYarn) {
-    command = 'yarnpkg';
-    args = ['add'];
-  } else {
-    command = 'npm';
-    args = ['install', '--save', verbose && '--verbose'].filter(e => e);
-  }
-  args.push('react', 'react-dom');
+      const readmeExists = fs.existsSync(path.join(appPath, 'README.md'));
+      if (readmeExists) {
+        fs.renameSync(
+          path.join(appPath, 'README.md'),
+          path.join(appPath, 'README.old.md')
+        );
+      }
 
-  // Install additional template dependencies, if present
-  const templateDependenciesPath = path.join(
-    appPath,
-    '.template.dependencies.json'
-  );
-  if (fs.existsSync(templateDependenciesPath)) {
-    const templateDependencies = require(templateDependenciesPath).dependencies;
-    args = args.concat(
-      Object.keys(templateDependencies).map(key => {
-        return `${key}@${templateDependencies[key]}`;
-      })
-    );
-    fs.unlinkSync(templateDependenciesPath);
-  }
+      // Copy the files for the user
+      const templatePath = template
+        ? path.resolve(originalDirectory, template)
+        : path.join(ownPath, 'template');
+      if (fs.existsSync(templatePath)) {
+        fs.copySync(templatePath, appPath);
+        const jsTplPath = path.resolve(appPath, '_js');
+        const tsTplPath = path.resolve(appPath, '_ts');
+        if (languageType === 'javascript') {
+          fs.copySync(jsTplPath, appPath);
+        } else {
+          fs.copySync(tsTplPath, appPath);
+        }
+        fs.removeSync(tsTplPath);
+        fs.removeSync(jsTplPath);
+        makeDotEnvFile(appPath, languageType);
+      } else {
+        console.error(
+          `Could not locate supplied template: ${chalk.green(templatePath)}`
+        );
+        return;
+      }
 
-  // Install react and react-dom for backward compatibility with old CRA cli
-  // which doesn't install react and react-dom along with react-scripts
-  // or template is presetend (via --internal-testing-template)
-  if (!isReactInstalled(appPackage) || template) {
-    console.log(`Installing react and react-dom using ${command}...`);
-    console.log();
-
-    const proc = spawn.sync(command, args, { stdio: 'inherit' });
-    if (proc.status !== 0) {
-      console.error(`\`${command} ${args.join(' ')}\` failed`);
-      return;
-    }
-  }
+      // Rename gitignore after the fact to prevent npm from renaming it to .npmignore
+      // See: https://github.com/npm/npm/issues/1862
+      ['gitignore', 'eslintrc.json'].forEach(filename => {
+        const fullFilename = path.join(appPath, filename);
+        const fullDotFilename = path.join(appPath, `.${filename}`);
+        try {
+          if (!fs.existsSync(fullFilename)) {
+            return;
+          }
+          fs.moveSync(fullFilename, fullDotFilename, []);
+        } catch (err) {
+          // Append if there's already a `.gitignore` file there
+          if (err.code === 'EEXIST') {
+            const data = fs.readFileSync(path.join(appPath, filename));
+            fs.appendFileSync(path.join(appPath, `.${filename}`), data);
+            fs.unlinkSync(path.join(appPath, filename));
+          } else {
+            throw err;
+          }
+        }
+      });
 
-  if (tryGitInit(appPath)) {
-    console.log();
-    console.log('Initialized a git repository.');
-  }
+      let command;
+      let args;
 
-  // Display the most elegant way to cd.
-  // This needs to handle an undefined originalDirectory for
-  // backward compatibility with old global-cli's.
-  let cdpath;
-  if (originalDirectory && path.join(originalDirectory, appName) === appPath) {
-    cdpath = appName;
-  } else {
-    cdpath = appPath;
-  }
+      if (useYarn) {
+        command = 'yarnpkg';
+        args = ['add'];
+      } else {
+        command = 'npm';
+        args = ['install', '--save', verbose && '--verbose'].filter(e => e);
+      }
 
-  // Change displayed command to yarn instead of yarnpkg
-  const displayedCommand = useYarn ? 'yarn' : 'npm';
-
-  console.log();
-  console.log(`Success! Created ${appName} at ${appPath}`);
-  console.log('Inside that directory, you can run several commands:');
-  console.log();
-  console.log(chalk.cyan(`  ${displayedCommand} start`));
-  console.log('    Starts the development server.');
-  console.log();
-  console.log(
-    chalk.cyan(`  ${displayedCommand} ${useYarn ? '' : 'run '}build`)
-  );
-  console.log('    Bundles the app into static files for production.');
-  console.log();
-  console.log(chalk.cyan(`  ${displayedCommand} test`));
-  console.log('    Starts the test runner.');
-  console.log();
-  console.log(
-    chalk.cyan(`  ${displayedCommand} ${useYarn ? '' : 'run '}eject`)
-  );
-  console.log(
-    '    Removes this tool and copies build dependencies, configuration files'
-  );
-  console.log(
-    '    and scripts into the app directory. If you do this, you can’t go back!'
-  );
-  console.log();
-  console.log('We suggest that you begin by typing:');
-  console.log();
-  console.log(chalk.cyan('  cd'), cdpath);
-  console.log(`  ${chalk.cyan(`${displayedCommand} start`)}`);
-  if (readmeExists) {
-    console.log();
-    console.log(
-      chalk.yellow(
-        'You had a `README.md` file, we renamed it to `README.old.md`'
-      )
-    );
-  }
-  console.log();
-  console.log('Happy hacking!');
+      const devDeps = [];
+      const deps = ['react', 'react-dom'];
+      if (languageType === 'typescript') {
+        // Install dev dependencies
+        devDeps.push(
+          '@types/node',
+          '@types/react',
+          '@types/react-dom',
+          '@types/jest',
+          'tslint'
+        );
+      } else {
+        devDeps.push('eslint-config-byted');
+      }
+
+      console.log(
+        `Installing ${devDeps.join(', ')} as dev dependencies ${command}...`
+      );
+      console.log();
+
+      const devProc = spawn.sync(command, args.concat('-D').concat(devDeps), {
+        stdio: 'inherit'
+      });
+      if (devProc.status !== 0) {
+        console.error(
+          `\`${command} ${args.concat(devDeps).join(' ')}\` failed`
+        );
+        return;
+      }
+
+      // Install additional template dependencies, if present
+      const templateDependenciesPath = path.join(
+        appPath,
+        '.template.dependencies.json'
+      );
+      if (fs.existsSync(templateDependenciesPath)) {
+        const templateDependencies = require(templateDependenciesPath)
+          .dependencies;
+        args = args.concat(
+          Object.keys(templateDependencies).map(key => {
+            return `${key}@${templateDependencies[key]}`;
+          })
+        );
+        fs.unlinkSync(templateDependenciesPath);
+      }
+
+      // Install react and react-dom for backward compatibility with old CRA cli
+      // which doesn't install react and react-dom along with react-scripts
+      // or template is presetend (via --internal-testing-template)
+      if (!isReactInstalled(appPackage) || template) {
+        console.log(`Installing react and react-dom using ${command}...`);
+        console.log();
+
+        const proc = spawn.sync(command, args.concat(deps), {
+          stdio: 'inherit'
+        });
+        if (proc.status !== 0) {
+          console.error(`\`${command} ${args.concat(deps).join(' ')}\` failed`);
+          return;
+        }
+      }
+
+      if (tryGitInit(appPath)) {
+        console.log();
+        console.log('Initialized a git repository.');
+      }
+
+      // Display the most elegant way to cd.
+      // This needs to handle an undefined originalDirectory for
+      // backward compatibility with old global-cli's.
+      let cdpath;
+      if (
+        originalDirectory &&
+        path.join(originalDirectory, appName) === appPath
+      ) {
+        cdpath = appName;
+      } else {
+        cdpath = appPath;
+      }
+
+      // Change displayed command to yarn instead of yarnpkg
+      const displayedCommand = useYarn ? 'yarn' : 'npm';
+
+      console.log();
+      console.log(`Success! Created ${appName} at ${appPath}`);
+      console.log('Inside that directory, you can run several commands:');
+      console.log();
+      console.log(chalk.cyan(`  ${displayedCommand} start`));
+      console.log('    Starts the development server.');
+      console.log();
+      console.log(
+        chalk.cyan(`  ${displayedCommand} ${useYarn ? '' : 'run '}build`)
+      );
+      console.log('    Bundles the app into static files for production.');
+      console.log();
+      console.log(chalk.cyan(`  ${displayedCommand} test`));
+      console.log('    Starts the test runner.');
+      console.log();
+      console.log(
+        chalk.cyan(`  ${displayedCommand} ${useYarn ? '' : 'run '}eject`)
+      );
+      console.log(
+        '    Removes this tool and copies build dependencies, configuration files'
+      );
+      console.log(
+        '    and scripts into the app directory. If you do this, you can’t go back!'
+      );
+      console.log();
+      console.log('We suggest that you begin by typing:');
+      console.log();
+      console.log(chalk.cyan('  cd'), cdpath);
+      console.log(`  ${chalk.cyan(`${displayedCommand} start`)}`);
+      if (readmeExists) {
+        console.log();
+        console.log(
+          chalk.yellow(
+            'You had a `README.md` file, we renamed it to `README.old.md`'
+          )
+        );
+      }
+      console.log();
+      console.log('Happy hacking!');
+    });
 };
 
 function isReactInstalled(appPackage) {
diff --git a/packages/react-scripts/scripts/utils/createDotEnv.js b/packages/react-scripts/scripts/utils/createDotEnv.js
new file mode 100644
index 00000000000..905681a4c3e
--- /dev/null
+++ b/packages/react-scripts/scripts/utils/createDotEnv.js
@@ -0,0 +1,41 @@
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+
+exports.makeDotEnvFile = function(appPath, lang) {
+  const envLocal = [
+    'NODE_PATH=src',
+    'GENERATE_SOURCEMAP=true',
+    'REACT_APP_IS_DEBUG=true'
+  ];
+
+  const envProd = [
+    'NODE_PATH=src',
+    'GENERATE_SOURCEMAP=false',
+    'REACT_APP_IS_DEBUG=false'
+  ];
+  const devLang = 'DEV_LANG=' + lang;
+  const envLocalPath = path.resolve(appPath, '.env');
+  const envProdPath = path.resolve(appPath, '.env.production');
+
+  if (fs.existsSync(envLocalPath)) {
+    fs.removeSync(envLocalPath);
+  }
+
+  if (fs.existsSync(envProdPath)) {
+    fs.removeSync(envProdPath);
+  }
+
+  fs.writeFile(envLocalPath, envLocal.concat([devLang]).join('\n'), 'utf8', function(err){
+    if (err) {
+      console.error(err);
+    }
+  });
+
+  fs.writeFile(envProdPath, envProd.concat([devLang]).join('\n'), 'utf8', function(err){
+    if (err) {
+      console.error(err);
+    }
+  });
+}
\ No newline at end of file
diff --git a/packages/react-scripts/scripts/utils/createJestConfig.js b/packages/react-scripts/scripts/utils/createJestConfig.js
index 593d17090a7..389ce4f7af0 100644
--- a/packages/react-scripts/scripts/utils/createJestConfig.js
+++ b/packages/react-scripts/scripts/utils/createJestConfig.js
@@ -11,12 +11,13 @@ const fs = require('fs');
 const path = require('path');
 const chalk = require('chalk');
 const paths = require('../../config/paths');
+const USE_TS = process.env.DEV_LANG === 'typescript';
 
 module.exports = (resolve, rootDir, srcRoots) => {
   // Use this instead of `paths.testsSetup` to avoid putting
   // an absolute filename into configuration after ejecting.
   const setupTestsFile = fs.existsSync(paths.testsSetup)
-    ? '<rootDir>/src/setupTests.js'
+    ? `<rootDir>/src/setupTests.${USE_TS ? 'tsx' : 'js'}`
     : undefined;
 
   const toRelRootDir = f => '<rootDir>/' + path.relative(rootDir || '', f);
@@ -24,12 +25,12 @@ module.exports = (resolve, rootDir, srcRoots) => {
   // TODO: I don't know if it's safe or not to just use / as path separator
   // in Jest configs. We need help from somebody with Windows to determine this.
   const config = {
-    collectCoverageFrom: ['src/**/*.{js,jsx,mjs}'],
+    collectCoverageFrom: [`src/**/*.{js,jsx,mjs,${USE_TS ? 'ts,tsx' : ''}`],
     setupFiles: [resolve('config/polyfills.js')],
     setupTestFrameworkScriptFile: setupTestsFile,
     testMatch: [
-      '**/__tests__/**/*.{js,jsx,mjs}',
-      '**/?(*.)(spec|test).{js,jsx,mjs}',
+      '**/__tests__/**/*.(j|t|mj)s?(x)',
+      '**/?(*.)(spec|test).(j|t|mj)s?(x)',
     ],
     // where to search for files/tests
     roots: srcRoots.map(toRelRootDir),
@@ -39,12 +40,13 @@ module.exports = (resolve, rootDir, srcRoots) => {
       '^.+\\.(js|jsx|mjs)$': resolve('config/jest/babelTransform.js'),
       '^.+\\.css$': resolve('config/jest/cssTransform.js'),
       '^.+\\.(graphql)$': resolve('config/jest/graphqlTransform.js'),
+      '^.+\\.tsx?$': resolve('config/jest/typescriptTransform.js'),
       '^(?!.*\\.(js|jsx|mjs|css|json|graphql)$)': resolve(
         'config/jest/fileTransform.js'
       ),
     },
     transformIgnorePatterns: [
-      '[/\\\\]node_modules[/\\\\].+\\.(js|jsx|mjs)$',
+      '[/\\\\]node_modules[/\\\\].+\\.(js|jsx|mjs|ts|tsx)$',
       '^.+\\.module\\.css$',
     ],
     moduleNameMapper: {
@@ -52,6 +54,10 @@ module.exports = (resolve, rootDir, srcRoots) => {
       '^.+\\.module\\.css$': 'identity-obj-proxy',
     },
     moduleFileExtensions: [
+      'web.ts',
+      'ts',
+      'web.tsx',
+      'tsx',
       'web.js',
       'mjs',
       'js',
@@ -60,6 +66,11 @@ module.exports = (resolve, rootDir, srcRoots) => {
       'jsx',
       'node',
     ],
+    globals: {
+      'ts-jest': {
+        tsConfigFile: paths.appTsTestConfig,
+      },
+    },
   };
   if (rootDir) {
     config.rootDir = rootDir;
@@ -74,6 +85,7 @@ module.exports = (resolve, rootDir, srcRoots) => {
     'resetModules',
     'snapshotSerializers',
     'watchPathIgnorePatterns',
+    'moduleNameMapper',
   ];
   if (overrides) {
     supportedKeys.forEach(key => {
@@ -94,7 +106,7 @@ module.exports = (resolve, rootDir, srcRoots) => {
               chalk.bold('setupTestFrameworkScriptFile') +
               ' in your package.json.\n\n' +
               'Remove it from Jest configuration, and put the initialization code in ' +
-              chalk.bold('src/setupTests.js') +
+              chalk.bold(`src/setupTests.${USE_TS ? 'tsx' : 'js'}`) +
               '.\nThis file will be loaded automatically.\n'
           )
         );
diff --git a/packages/react-scripts/template/_js/eslintrc.json b/packages/react-scripts/template/_js/eslintrc.json
new file mode 100644
index 00000000000..8ba958c0f00
--- /dev/null
+++ b/packages/react-scripts/template/_js/eslintrc.json
@@ -0,0 +1,8 @@
+{
+  "extends": "byted/strict",
+  "rules": {
+    "import/extensions": "off",
+    "import/no-extraneous-dependencies": "off",
+    "import/no-unresolved": "off"
+  }
+}
diff --git a/packages/react-scripts/template/_js/jsconfig.json b/packages/react-scripts/template/_js/jsconfig.json
new file mode 100644
index 00000000000..fe118fa17a3
--- /dev/null
+++ b/packages/react-scripts/template/_js/jsconfig.json
@@ -0,0 +1,14 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "baseUrl": "src",
+    "paths": {
+    }
+  },
+  "exclude": [
+    "node_modules",
+    "build",
+    "examples",
+    "public"
+  ]
+}
diff --git a/packages/react-scripts/template/src/App.css b/packages/react-scripts/template/_js/src/App.css
similarity index 100%
rename from packages/react-scripts/template/src/App.css
rename to packages/react-scripts/template/_js/src/App.css
diff --git a/packages/react-scripts/template/src/App.js b/packages/react-scripts/template/_js/src/App.js
similarity index 100%
rename from packages/react-scripts/template/src/App.js
rename to packages/react-scripts/template/_js/src/App.js
diff --git a/packages/react-scripts/template/src/App.test.js b/packages/react-scripts/template/_js/src/App.test.js
similarity index 100%
rename from packages/react-scripts/template/src/App.test.js
rename to packages/react-scripts/template/_js/src/App.test.js
diff --git a/packages/react-scripts/template/src/index.css b/packages/react-scripts/template/_js/src/index.css
similarity index 100%
rename from packages/react-scripts/template/src/index.css
rename to packages/react-scripts/template/_js/src/index.css
diff --git a/packages/react-scripts/template/src/index.js b/packages/react-scripts/template/_js/src/index.js
similarity index 100%
rename from packages/react-scripts/template/src/index.js
rename to packages/react-scripts/template/_js/src/index.js
diff --git a/packages/react-scripts/template/src/logo.svg b/packages/react-scripts/template/_js/src/logo.svg
similarity index 100%
rename from packages/react-scripts/template/src/logo.svg
rename to packages/react-scripts/template/_js/src/logo.svg
diff --git a/packages/react-scripts/template/src/serviceWorker.js b/packages/react-scripts/template/_js/src/serviceWorker.js
similarity index 100%
rename from packages/react-scripts/template/src/serviceWorker.js
rename to packages/react-scripts/template/_js/src/serviceWorker.js
diff --git a/packages/react-scripts/template/_ts/src/App.css b/packages/react-scripts/template/_ts/src/App.css
new file mode 100644
index 00000000000..92f956e8040
--- /dev/null
+++ b/packages/react-scripts/template/_ts/src/App.css
@@ -0,0 +1,32 @@
+.App {
+  text-align: center;
+}
+
+.App-logo {
+  animation: App-logo-spin infinite 20s linear;
+  height: 40vmin;
+}
+
+.App-header {
+  background-color: #282c34;
+  min-height: 100vh;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  font-size: calc(10px + 2vmin);
+  color: white;
+}
+
+.App-link {
+  color: #61dafb;
+}
+
+@keyframes App-logo-spin {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}
diff --git a/packages/react-scripts/template/_ts/src/App.test.tsx b/packages/react-scripts/template/_ts/src/App.test.tsx
new file mode 100644
index 00000000000..e0f09ab57a4
--- /dev/null
+++ b/packages/react-scripts/template/_ts/src/App.test.tsx
@@ -0,0 +1,9 @@
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
+import App from './App';
+
+it('renders without crashing', () => {
+  const div = document.createElement('div');
+  ReactDOM.render(<App />, div);
+  ReactDOM.unmountComponentAtNode(div);
+});
diff --git a/packages/react-scripts/template/_ts/src/App.tsx b/packages/react-scripts/template/_ts/src/App.tsx
new file mode 100644
index 00000000000..2e100893039
--- /dev/null
+++ b/packages/react-scripts/template/_ts/src/App.tsx
@@ -0,0 +1,28 @@
+import * as React from 'react';
+import * as logo from './logo.svg';
+import './App.css';
+
+class App extends React.Component {
+  render() {
+    return (
+      <div className="App">
+        <header className="App-header">
+          <img src={logo} className="App-logo" alt="logo" />
+          <p>
+            Edit <code>src/App.js</code> and save to reload.
+          </p>
+          <a
+            className="App-link"
+            href="https://reactjs.org"
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            Learn React
+          </a>
+        </header>
+      </div>
+    );
+  }
+}
+
+export default App;
diff --git a/packages/react-scripts/template/_ts/src/index.css b/packages/react-scripts/template/_ts/src/index.css
new file mode 100644
index 00000000000..cee5f348fb9
--- /dev/null
+++ b/packages/react-scripts/template/_ts/src/index.css
@@ -0,0 +1,14 @@
+body {
+  margin: 0;
+  padding: 0;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen",
+    "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
+    sans-serif;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+code {
+  font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New",
+    monospace;
+}
diff --git a/packages/react-scripts/template/_ts/src/index.tsx b/packages/react-scripts/template/_ts/src/index.tsx
new file mode 100644
index 00000000000..3d4514056de
--- /dev/null
+++ b/packages/react-scripts/template/_ts/src/index.tsx
@@ -0,0 +1,12 @@
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
+import './index.css';
+import App from './App';
+import * as serviceWorker from './serviceWorker';
+
+ReactDOM.render(<App />, document.getElementById('root'));
+
+// If you want your app to work offline and load faster, you can change
+// unregister() to register() below. Note this comes with some pitfalls.
+// Learn more about service workers: http://bit.ly/CRA-PWA
+serviceWorker.unregister();
diff --git a/packages/react-scripts/template/_ts/src/logo.svg b/packages/react-scripts/template/_ts/src/logo.svg
new file mode 100644
index 00000000000..6b60c1042f5
--- /dev/null
+++ b/packages/react-scripts/template/_ts/src/logo.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3">
+    <g fill="#61DAFB">
+        <path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/>
+        <circle cx="420.9" cy="296.5" r="45.7"/>
+        <path d="M520.5 78.1z"/>
+    </g>
+</svg>
diff --git a/packages/react-scripts/template/_ts/src/serviceWorker.ts b/packages/react-scripts/template/_ts/src/serviceWorker.ts
new file mode 100644
index 00000000000..cf6f8af4711
--- /dev/null
+++ b/packages/react-scripts/template/_ts/src/serviceWorker.ts
@@ -0,0 +1,135 @@
+// In production, we register a service worker to serve assets from local cache.
+
+// This lets the app load faster on subsequent visits in production, and gives
+// it offline capabilities. However, it also means that developers (and users)
+// will only see deployed updates on the "N+1" visit to a page, since previously
+// cached resources are updated in the background.
+
+// To learn more about the benefits of this model, read https://goo.gl/KwvDNy.
+// This link also includes instructions on opting out of this behavior.
+
+const isLocalhost = Boolean(
+  window.location.hostname === 'localhost' ||
+    // [::1] is the IPv6 localhost address.
+    window.location.hostname === '[::1]' ||
+    // 127.0.0.1/8 is considered localhost for IPv4.
+    window.location.hostname.match(
+      /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
+    )
+);
+
+export function register(config: any) {
+  if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
+    // The URL constructor is available in all browsers that support SW.
+    const publicUrl = new URL((process.env as any).PUBLIC_URL, (window as any).location);
+    if (publicUrl.origin !== window.location.origin) {
+      // Our service worker won't work if PUBLIC_URL is on a different origin
+      // from what our page is served on. This might happen if a CDN is used to
+      // serve assets; see https://github.com/facebook/create-react-app/issues/2374
+      return;
+    }
+
+    window.addEventListener('load', () => {
+      const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;
+
+      if (isLocalhost) {
+        // This is running on localhost. Let's check if a service worker still exists or not.
+        checkValidServiceWorker(swUrl, config);
+
+        // Add some additional logging to localhost, pointing developers to the
+        // service worker/PWA documentation.
+        navigator.serviceWorker.ready.then(() => {
+          // tslint:disable-next-line:no-console
+          console.log(
+            'This web app is being served cache-first by a service ' +
+              'worker. To learn more, visit https://goo.gl/SC7cgQ'
+          );
+        });
+      } else {
+        // Is not local host. Just register service worker
+        registerValidSW(swUrl, config);
+      }
+    });
+  }
+}
+
+function registerValidSW(swUrl, config) {
+  navigator.serviceWorker
+    .register(swUrl)
+    .then(registration => {
+      registration.onupdatefound = () => {
+        const installingWorker = registration.installing;
+        if (!installingWorker) {
+          return;
+        }
+        installingWorker.onstatechange = () => {
+          if (installingWorker.state === 'installed') {
+            if (navigator.serviceWorker.controller) {
+              // At this point, the old content will have been purged and
+              // the fresh content will have been added to the cache.
+              // It's the perfect time to display a "New content is
+              // available; please refresh." message in your web app.
+              // tslint:disable-next-line:no-console
+              console.log('New content is available; please refresh.');
+
+              // Execute callback
+              if (config.onUpdate) {
+                config.onUpdate(registration);
+              }
+            } else {
+              // At this point, everything has been precached.
+              // It's the perfect time to display a
+              // "Content is cached for offline use." message.
+              // tslint:disable-next-line:no-console
+              console.log('Content is cached for offline use.');
+
+              // Execute callback
+              if (config.onSuccess) {
+                config.onSuccess(registration);
+              }
+            }
+          }
+        };
+      };
+    })
+    .catch(error => {
+      // tslint:disable-next-line:no-console
+      console.error('Error during service worker registration:', error);
+    });
+}
+
+function checkValidServiceWorker(swUrl: any, config: any) {
+  // Check if the service worker can be found. If it can't reload the page.
+  fetch(swUrl)
+    .then(response => {
+      // Ensure service worker exists, and that we really are getting a JS file.
+      if (
+        response.status === 404 || response && response.headers &&
+        (response.headers.get('content-type') || '').indexOf('javascript') === -1
+      ) {
+        // No service worker found. Probably a different app. Reload the page.
+        navigator.serviceWorker.ready.then(registration => {
+          registration.unregister().then(() => {
+            window.location.reload();
+          });
+        });
+      } else {
+        // Service worker found. Proceed as normal.
+        registerValidSW(swUrl, config);
+      }
+    })
+    .catch(() => {
+      // tslint:disable-next-line:no-console
+      console.log(
+        'No internet connection found. App is running in offline mode.'
+      );
+    });
+}
+
+export function unregister() {
+  if ('serviceWorker' in navigator) {
+    navigator.serviceWorker.ready.then(registration => {
+      registration.unregister();
+    });
+  }
+}
diff --git a/packages/react-scripts/template/_ts/tsconfig.json b/packages/react-scripts/template/_ts/tsconfig.json
new file mode 100644
index 00000000000..f5ee7c4965a
--- /dev/null
+++ b/packages/react-scripts/template/_ts/tsconfig.json
@@ -0,0 +1,38 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "outDir": "build",
+    "module": "esnext",
+    "target": "es5",
+    "lib": ["es6", "dom"],
+    "sourceMap": true,
+    "allowJs": false,
+    "jsx": "preserve",
+    "moduleResolution": "node",
+    "rootDir": "src",
+    "forceConsistentCasingInFileNames": true,
+    "noImplicitReturns": true,
+    "noImplicitThis": true,
+    "noImplicitAny": false,
+    "strictNullChecks": true,
+    "suppressImplicitAnyIndexErrors": true,
+    "noUnusedLocals": true
+  },
+  "exclude": [
+    "node_modules",
+    "public",
+    "build",
+    "scripts",
+    "acceptance-tests",
+    "webpack",
+    "jest",
+    "src/setupTests.ts"
+  ],
+  "awesomeTypescriptLoaderOptions": {
+    "useTranspileModule": true,
+    "transpileOnly": true,
+    "forceIsolatedModules": true,
+    "useBabel": true,
+    "useCache": true
+  }
+}
diff --git a/packages/react-scripts/template/_ts/tsconfig.prod.json b/packages/react-scripts/template/_ts/tsconfig.prod.json
new file mode 100644
index 00000000000..4144216dd1a
--- /dev/null
+++ b/packages/react-scripts/template/_ts/tsconfig.prod.json
@@ -0,0 +1,3 @@
+{
+  "extends": "./tsconfig.json"
+}
\ No newline at end of file
diff --git a/packages/react-scripts/template/_ts/tsconfig.test.json b/packages/react-scripts/template/_ts/tsconfig.test.json
new file mode 100644
index 00000000000..90bde08a972
--- /dev/null
+++ b/packages/react-scripts/template/_ts/tsconfig.test.json
@@ -0,0 +1,7 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "module": "commonjs",
+    "jsx": "react"
+  }
+}
\ No newline at end of file
diff --git a/packages/react-scripts/template/_ts/tslint.json b/packages/react-scripts/template/_ts/tslint.json
new file mode 100644
index 00000000000..f18249264a6
--- /dev/null
+++ b/packages/react-scripts/template/_ts/tslint.json
@@ -0,0 +1,13 @@
+{
+  "extends": ["tslint:recommended", "tslint-react", "tslint-config-prettier"],
+  "linterOptions": {
+    "exclude": [
+      "config/**/*.js",
+      "node_modules/**/*.ts"
+    ]
+  },
+  "rules": {
+    "ordered-imports": false,
+    "member-access": false
+  }
+}
diff --git a/packages/react-scripts/template/_ts/typings/index.d.ts b/packages/react-scripts/template/_ts/typings/index.d.ts
new file mode 100644
index 00000000000..5ed5931fcc9
--- /dev/null
+++ b/packages/react-scripts/template/_ts/typings/index.d.ts
@@ -0,0 +1,4 @@
+declare module '*.svg' {
+  const value: string;
+  export = value;
+}
diff --git a/packages/react-scripts/template/gitignore b/packages/react-scripts/template/gitignore
index f4917854e95..d7afbcaa524 100644
--- a/packages/react-scripts/template/gitignore
+++ b/packages/react-scripts/template/gitignore
@@ -1,4 +1,248 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# Created by https://www.gitignore.io/api/node,reactnative
+
+### Node ###
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Typescript v1 declaration files
+typings/
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+
+
+### ReactNative ###
+# React Native Stack Base
+### ReactNative.macOS Stack ###
+*.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### ReactNative.Xcode Stack ###
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
+build/
+DerivedData/
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata/
+
+## Other
+*.moved-aside
+*.xccheckout
+*.xcscmblueprint
+
+### ReactNative.Android Stack ###
+# Built application files
+*.apk
+*.ap_
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+.gradle/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# Intellij
+*.iml
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/dictionaries
+.idea/libraries
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
+
+### ReactNative.Linux Stack ###
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+### ReactNative.Gradle Stack ###
+.gradle
+**/build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache
+
+# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
+# gradle/wrapper/gradle-wrapper.properties
+
+### ReactNative.Buck Stack ###
+buck-out/
+.buckconfig.local
+.buckd/
+.buckversion
+.fakebuckversion
+
+### ReactNative.Node Stack ###
+# Logs
+
+# Runtime data
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+
+# Coverage directory used by tools like istanbul
+
+# nyc test coverage
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+
+# Bower dependency directory (https://bower.io/)
+
+# node-waf configuration
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+
+# Dependency directories
+
+# Typescript v1 declaration files
+
+# Optional npm cache directory
+
+# Optional eslint cache
+
+# Optional REPL history
+
+# Output of 'npm pack'
+
+# Yarn Integrity file
+
+# dotenv environment variables file
+
+
+
+# End of https://www.gitignore.io/api/node,reactnative
+# See https://help.github.com/ignore-files/ for more about ignoring files.
 
 # dependencies
 /node_modules
@@ -8,6 +252,8 @@
 
 # production
 /build
+/falcon
+/output
 
 # misc
 .DS_Store
@@ -19,3 +265,6 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+
+# walle escomplex rule tempdir
+/_cplx_report_