From fd73bd34e00cdaadca649a07b3637a1e3577721a Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomas.horrobin@stepstone.com>
Date: Mon, 15 Oct 2018 19:12:24 +0100
Subject: [PATCH 01/42] added basic wasm for development mode

---
 .../react-scripts/config/webpack.config.dev.js    | 15 +++++++++++++++
 packages/react-scripts/package.json               |  4 +++-
 packages/react-scripts/template/Cargo.toml        | 10 ++++++++++
 packages/react-scripts/template/gitignore         |  3 +++
 packages/react-scripts/template/src/App.js        |  8 ++++++++
 packages/react-scripts/template/src/lib.rs        |  4 ++++
 6 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 packages/react-scripts/template/Cargo.toml
 create mode 100644 packages/react-scripts/template/src/lib.rs

diff --git a/packages/react-scripts/config/webpack.config.dev.js b/packages/react-scripts/config/webpack.config.dev.js
index 29c7a8621f2..d271a82b2d9 100644
--- a/packages/react-scripts/config/webpack.config.dev.js
+++ b/packages/react-scripts/config/webpack.config.dev.js
@@ -297,6 +297,21 @@ module.exports = {
               sourceMaps: false,
             },
           },
+          {
+            test: /\.rs$/,
+            use: [
+              {
+                loader: 'wasm-loader',
+              },
+              {
+                loader: 'rust-native-wasm-loader',
+                options: {
+                  release: true,
+                  gc: true,
+                },
+              },
+            ],
+          },
           // "postcss" loader applies autoprefixer to our CSS.
           // "css" loader resolves paths in CSS and adds assets as dependencies.
           // "style" loader turns CSS into JS modules that inject <style> tags.
diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
index 8c2ec3c5c76..22e458ed846 100644
--- a/packages/react-scripts/package.json
+++ b/packages/react-scripts/package.json
@@ -66,7 +66,9 @@
     "webpack": "4.19.1",
     "webpack-dev-server": "3.1.9",
     "webpack-manifest-plugin": "2.0.4",
-    "workbox-webpack-plugin": "3.6.2"
+    "workbox-webpack-plugin": "3.6.2",
+    "rust-native-wasm-loader": "^0.8.1",
+    "wasm-loader": "^1.3.0"
   },
   "devDependencies": {
     "react": "^16.3.2",
diff --git a/packages/react-scripts/template/Cargo.toml b/packages/react-scripts/template/Cargo.toml
new file mode 100644
index 00000000000..d4a4f31948c
--- /dev/null
+++ b/packages/react-scripts/template/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "add"
+version = "0.1.0"
+authors = ["Thomas Horrobin <thomas.horrobin@stepstone.com>"]
+edition = "2018"
+
+[lib]
+crate-type = ["cdylib"]
+
+[dependencies]
diff --git a/packages/react-scripts/template/gitignore b/packages/react-scripts/template/gitignore
index f4917854e95..af98afdcd82 100644
--- a/packages/react-scripts/template/gitignore
+++ b/packages/react-scripts/template/gitignore
@@ -19,3 +19,6 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+
+/target
+**/*.rs.bk
diff --git a/packages/react-scripts/template/src/App.js b/packages/react-scripts/template/src/App.js
index 7e261ca47e6..4cd202560d6 100644
--- a/packages/react-scripts/template/src/App.js
+++ b/packages/react-scripts/template/src/App.js
@@ -1,8 +1,16 @@
 import React, { Component } from 'react';
 import logo from './logo.svg';
 import './App.css';
+import loadAdd from './lib.rs';
 
 class App extends Component {
+  constructor() {
+    super();
+    loadAdd().then(result => {
+      const addtwo = result.instance.exports['addtwo'];
+      alert(`return value was ${addtwo(2)}`);
+    });
+  }
   render() {
     return (
       <div className="App">
diff --git a/packages/react-scripts/template/src/lib.rs b/packages/react-scripts/template/src/lib.rs
new file mode 100644
index 00000000000..9a46f425601
--- /dev/null
+++ b/packages/react-scripts/template/src/lib.rs
@@ -0,0 +1,4 @@
+#[no_mangle]
+pub fn addtwo(a: i32) -> i32 {
+    a + 2
+}

From c5599dcd532f37afc9fe165f1e062df4dd965a08 Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomas.horrobin@stepstone.com>
Date: Mon, 15 Oct 2018 22:06:05 +0100
Subject: [PATCH 02/42] added prod and dev build targets

---
 packages/react-scripts/scripts/build.js       |  3 +++
 .../scripts/utils/rustCompiler.js             |  8 ++++++
 packages/react-scripts/template/src/App.js    | 25 +++++++++++++++----
 3 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 packages/react-scripts/scripts/utils/rustCompiler.js

diff --git a/packages/react-scripts/scripts/build.js b/packages/react-scripts/scripts/build.js
index a9f6b87e2d0..e1c2cbccc49 100644
--- a/packages/react-scripts/scripts/build.js
+++ b/packages/react-scripts/scripts/build.js
@@ -62,6 +62,9 @@ if (!checkRequiredFiles([paths.appHtml, paths.appIndexJs])) {
 const argv = process.argv.slice(2);
 const writeStatsJson = argv.indexOf('--stats') !== -1;
 
+const compileRust = require('./utils/rustCompiler');
+compileRust();
+
 // We require that you explictly set browsers and do not fall back to
 // browserslist defaults.
 const { checkBrowsers } = require('react-dev-utils/browsersHelper');
diff --git a/packages/react-scripts/scripts/utils/rustCompiler.js b/packages/react-scripts/scripts/utils/rustCompiler.js
new file mode 100644
index 00000000000..268412d1fab
--- /dev/null
+++ b/packages/react-scripts/scripts/utils/rustCompiler.js
@@ -0,0 +1,8 @@
+const execSync = require('child_process').execSync;
+
+module.exports = () => {
+  execSync(
+    'rustc +nightly --target wasm32-unknown-unknown -O --crate-type=cdylib src/lib.rs -o public/app.big.wasm && wasm-gc public/app.big.wasm public/app.wasm'
+    // 'rustc +nightly --target wasm32-unknown-unknown -O --crate-type=cdylib src/lib.rs -o public/app.big.wasm && wasm-gc public/app.big.wasm public/app.wasm && rm public/app.big.wasm'
+  );
+};
diff --git a/packages/react-scripts/template/src/App.js b/packages/react-scripts/template/src/App.js
index 4cd202560d6..609f2dea298 100644
--- a/packages/react-scripts/template/src/App.js
+++ b/packages/react-scripts/template/src/App.js
@@ -1,15 +1,30 @@
 import React, { Component } from 'react';
 import logo from './logo.svg';
 import './App.css';
-import loadAdd from './lib.rs';
 
 class App extends Component {
   constructor() {
     super();
-    loadAdd().then(result => {
-      const addtwo = result.instance.exports['addtwo'];
-      alert(`return value was ${addtwo(2)}`);
-    });
+    switch (process.env.NODE_ENV) {
+      case 'production':
+        fetch('app.wasm')
+          .then(response => response.arrayBuffer())
+          .then(bytes => WebAssembly.instantiate(bytes, {}))
+          .then(result => {
+            const addtwo = result.instance.exports['addtwo'];
+            alert(`return value was ${addtwo(3)}`);
+          });
+        break;
+      case 'development':
+        import loadAdd from './lib.rs';
+        loadAdd().then(result => {
+          const addtwo = result.instance.exports['addtwo'];
+          alert(`return value was ${addtwo(2)}`);
+        });
+        break;
+      default:
+        break;
+    }
   }
   render() {
     return (

From 64b6e3eb7404800ed4aba90569d3056d274b9371 Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomasroberthorrobin@gmail.com>
Date: Tue, 16 Oct 2018 17:29:30 +0100
Subject: [PATCH 03/42] added package.json for scripts file

---
 packages/react-scripts/package.json | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
index 22e458ed846..aeea58e427c 100644
--- a/packages/react-scripts/package.json
+++ b/packages/react-scripts/package.json
@@ -1,14 +1,14 @@
 {
-  "name": "react-scripts",
-  "version": "2.0.5",
-  "description": "Configuration and scripts for Create React App.",
-  "repository": "facebook/create-react-app",
+  "name": "react-scripts-rust",
+  "version": "2.0.0",
+  "description": "Configuration and scripts for using Rust with Create React App",
+  "repository": "thomashorrobin/create-react-app-rust",
   "license": "MIT",
   "engines": {
     "node": ">=6"
   },
   "bugs": {
-    "url": "https://github.com/facebook/create-react-app/issues"
+    "url": "https://github.com/thomashorrobin/create-react-app-rust/issues"
   },
   "files": [
     "bin",
@@ -66,9 +66,7 @@
     "webpack": "4.19.1",
     "webpack-dev-server": "3.1.9",
     "webpack-manifest-plugin": "2.0.4",
-    "workbox-webpack-plugin": "3.6.2",
-    "rust-native-wasm-loader": "^0.8.1",
-    "wasm-loader": "^1.3.0"
+    "workbox-webpack-plugin": "3.6.2"
   },
   "devDependencies": {
     "react": "^16.3.2",

From d9c190df96b4378d26f824881a84a1f01558506d Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomasroberthorrobin@gmail.com>
Date: Tue, 16 Oct 2018 17:44:07 +0100
Subject: [PATCH 04/42] updated readmes

---
 README.md                        | 9 +++++----
 packages/react-scripts/README.md | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index dae86042b51..df439b77182 100644
--- a/README.md
+++ b/README.md
@@ -1,17 +1,17 @@
-# Create React App [![Build Status](https://travis-ci.org/facebook/create-react-app.svg?branch=master)](https://travis-ci.org/facebook/create-react-app)
+# Create React App (Rust) [![Build Status](https://travis-ci.org/facebook/create-react-app.svg?branch=master)](https://travis-ci.org/facebook/create-react-app)
 
-Create React apps with no build configuration.
+Create React apps with support for WebAssembly/Rust with no build configuration.
 
 - [Creating an App](#creating-an-app) – How to create a new app.
 - [User Guide](https://github.com/facebook/create-react-app/blob/master/packages/react-scripts/template/README.md) – How to develop apps bootstrapped with Create React App.
 
-Create React App works on macOS, Windows, and Linux.<br>
+Create React App works on macOS, Windows, and Linux. However Rust tools may behave diferently on Windows in certain cercumstances.<br>
 If something doesn’t work, please [file an issue](https://github.com/facebook/create-react-app/issues/new).
 
 ## Quick Overview
 
 ```sh
-npx create-react-app my-app
+npx create-react-app my-app --scripts-version react-scripts-rust
 cd my-app
 npm start
 ```
@@ -79,6 +79,7 @@ my-app
     ├── App.css
     ├── App.js
     ├── App.test.js
+    ├── lib.rs
     ├── index.css
     ├── index.js
     ├── logo.svg
diff --git a/packages/react-scripts/README.md b/packages/react-scripts/README.md
index 357131f0e80..1b301344e4e 100644
--- a/packages/react-scripts/README.md
+++ b/packages/react-scripts/README.md
@@ -1,7 +1,7 @@
-# react-scripts
+# react-scripts-rust
 
-This package includes scripts and configuration used by [Create React App](https://github.com/facebook/create-react-app).<br>
+This package includes scripts and configuration used by [Create React App (Rust)](https://github.com/thomashorrobin/create-react-app-rust).<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.
+- [Getting Started](https://github.com/thomashorrobin/create-react-app-rust/blob/rust/README.md) – How to create a new app.
 - [User Guide](https://github.com/facebook/create-react-app/blob/master/packages/react-scripts/template/README.md) – How to develop apps bootstrapped with Create React App.

From d9cf8659d6091fcde30d3426c0e0854b141b688e Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomasroberthorrobin@gmail.com>
Date: Tue, 16 Oct 2018 17:55:15 +0100
Subject: [PATCH 05/42] updated readme

---
 packages/react-scripts/README.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/react-scripts/README.md b/packages/react-scripts/README.md
index 1b301344e4e..7075728d269 100644
--- a/packages/react-scripts/README.md
+++ b/packages/react-scripts/README.md
@@ -5,3 +5,14 @@ Please refer to its documentation:
 
 - [Getting Started](https://github.com/thomashorrobin/create-react-app-rust/blob/rust/README.md) – How to create a new app.
 - [User Guide](https://github.com/facebook/create-react-app/blob/master/packages/react-scripts/template/README.md) – How to develop apps bootstrapped with Create React App.
+
+
+## Quick Overview
+
+```sh
+npx create-react-app my-app --scripts-version react-scripts-rust
+cd my-app
+npm start
+```
+
+After the project has loaded in Chrome any changes in `src/lib.rs` should result in an instant update in the browser.

From 076015a4a5a8de91dde796c1724c59672947f6a5 Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomasroberthorrobin@gmail.com>
Date: Tue, 16 Oct 2018 18:21:05 +0100
Subject: [PATCH 06/42] fixed importing bug

---
 packages/react-scripts/template/src/App.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-scripts/template/src/App.js b/packages/react-scripts/template/src/App.js
index 609f2dea298..322a7690644 100644
--- a/packages/react-scripts/template/src/App.js
+++ b/packages/react-scripts/template/src/App.js
@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import logo from './logo.svg';
 import './App.css';
+import loadAdd from './lib.rs';
 
 class App extends Component {
   constructor() {
@@ -16,7 +17,6 @@ class App extends Component {
           });
         break;
       case 'development':
-        import loadAdd from './lib.rs';
         loadAdd().then(result => {
           const addtwo = result.instance.exports['addtwo'];
           alert(`return value was ${addtwo(2)}`);

From 786440870013dc3505694a26f66787d85cec502f Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomas.horrobin@stepstone.com>
Date: Tue, 16 Oct 2018 18:47:17 +0100
Subject: [PATCH 07/42] added missing node packages

---
 packages/react-scripts/package.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
index aeea58e427c..c0c016fc56b 100644
--- a/packages/react-scripts/package.json
+++ b/packages/react-scripts/package.json
@@ -59,10 +59,12 @@
     "react-app-polyfill": "^0.1.3",
     "react-dev-utils": "^6.0.5",
     "resolve": "1.8.1",
+    "rust-native-wasm-loader": "^0.8.1",
     "sass-loader": "7.1.0",
     "style-loader": "0.23.0",
     "terser-webpack-plugin": "1.1.0",
     "url-loader": "1.1.1",
+    "wasm-loader": "^1.3.0",
     "webpack": "4.19.1",
     "webpack-dev-server": "3.1.9",
     "webpack-manifest-plugin": "2.0.4",

From 884e091e5d7f4dd0178b04c3cda96c8aba12aadf Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomasroberthorrobin@gmail.com>
Date: Tue, 16 Oct 2018 19:12:44 +0100
Subject: [PATCH 08/42] deployed

---
 packages/react-scripts/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
index c0c016fc56b..3272f867906 100644
--- a/packages/react-scripts/package.json
+++ b/packages/react-scripts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-scripts-rust",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Configuration and scripts for using Rust with Create React App",
   "repository": "thomashorrobin/create-react-app-rust",
   "license": "MIT",

From a6c10c462b71a1e2af5393eb55adb5a9e9b7bd9b Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomasroberthorrobin@gmail.com>
Date: Wed, 17 Oct 2018 13:22:04 +0100
Subject: [PATCH 09/42] added err handling for rm cmd (Windows issue)

---
 packages/react-scripts/package.json                 |  2 +-
 .../react-scripts/scripts/utils/rustCompiler.js     | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
index 3272f867906..c182f5a0c73 100644
--- a/packages/react-scripts/package.json
+++ b/packages/react-scripts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-scripts-rust",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Configuration and scripts for using Rust with Create React App",
   "repository": "thomashorrobin/create-react-app-rust",
   "license": "MIT",
diff --git a/packages/react-scripts/scripts/utils/rustCompiler.js b/packages/react-scripts/scripts/utils/rustCompiler.js
index 268412d1fab..9ba07775217 100644
--- a/packages/react-scripts/scripts/utils/rustCompiler.js
+++ b/packages/react-scripts/scripts/utils/rustCompiler.js
@@ -1,8 +1,13 @@
 const execSync = require('child_process').execSync;
 
 module.exports = () => {
-  execSync(
-    'rustc +nightly --target wasm32-unknown-unknown -O --crate-type=cdylib src/lib.rs -o public/app.big.wasm && wasm-gc public/app.big.wasm public/app.wasm'
-    // 'rustc +nightly --target wasm32-unknown-unknown -O --crate-type=cdylib src/lib.rs -o public/app.big.wasm && wasm-gc public/app.big.wasm public/app.wasm && rm public/app.big.wasm'
-  );
+  try {
+    execSync(
+      'rustc +nightly --target wasm32-unknown-unknown -O --crate-type=cdylib src/lib.rs -o public/app.big.wasm && wasm-gc public/app.big.wasm public/app.wasm && rm public/app.big.wasm'
+    );
+  } catch (error) {
+    execSync(
+      'rustc +nightly --target wasm32-unknown-unknown -O --crate-type=cdylib src/lib.rs -o public/app.big.wasm && wasm-gc public/app.big.wasm public/app.wasm'
+    );
+  }
 };

From 9b6799faf8bef6f8c33151d12fb532692ca80e8d Mon Sep 17 00:00:00 2001
From: Ran Yitzhaki <ranyitz@users.noreply.github.com>
Date: Wed, 17 Oct 2018 03:14:33 +0300
Subject: [PATCH 10/42] Remove dot from the end of the link (#5449)

---
 packages/react-scripts/template/src/serviceWorker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-scripts/template/src/serviceWorker.js b/packages/react-scripts/template/src/serviceWorker.js
index 012c322dd2c..0bece46ae65 100644
--- a/packages/react-scripts/template/src/serviceWorker.js
+++ b/packages/react-scripts/template/src/serviceWorker.js
@@ -8,7 +8,7 @@
 // resources are updated in the background.
 
 // To learn more about the benefits of this model and instructions on how to
-// opt-in, read http://bit.ly/CRA-PWA.
+// opt-in, read http://bit.ly/CRA-PWA
 
 const isLocalhost = Boolean(
   window.location.hostname === 'localhost' ||

From c51f5056508ef40e74df047b75b44485eb3ebdab Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomasroberthorrobin@gmail.com>
Date: Wed, 17 Oct 2018 18:44:36 +0100
Subject: [PATCH 11/42] added comments and PowerShell specific cmd

---
 packages/react-scripts/scripts/utils/rustCompiler.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/react-scripts/scripts/utils/rustCompiler.js b/packages/react-scripts/scripts/utils/rustCompiler.js
index 9ba07775217..272f0ed3708 100644
--- a/packages/react-scripts/scripts/utils/rustCompiler.js
+++ b/packages/react-scripts/scripts/utils/rustCompiler.js
@@ -1,13 +1,15 @@
 const execSync = require('child_process').execSync;
 
 module.exports = () => {
+  // first build app.big.wasm and then optimize to app.wasm with wasm-gc
   try {
     execSync(
       'rustc +nightly --target wasm32-unknown-unknown -O --crate-type=cdylib src/lib.rs -o public/app.big.wasm && wasm-gc public/app.big.wasm public/app.wasm && rm public/app.big.wasm'
     );
   } catch (error) {
+    // on Windoze sometimes 'rm' is not reliable. if it fails try with this
     execSync(
-      'rustc +nightly --target wasm32-unknown-unknown -O --crate-type=cdylib src/lib.rs -o public/app.big.wasm && wasm-gc public/app.big.wasm public/app.wasm'
+      'Remove-File ./public/app.big.wasm'
     );
   }
 };

From c7301b3d5172a44a26be69bb4a14c9c62cd75a21 Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomasroberthorrobin@gmail.com>
Date: Wed, 17 Oct 2018 18:50:44 +0100
Subject: [PATCH 12/42] renamed file

---
 packages/react-scripts/scripts/build.js                         | 2 +-
 .../scripts/utils/{rustCompiler.js => rustUtils.js}             | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename packages/react-scripts/scripts/utils/{rustCompiler.js => rustUtils.js} (100%)

diff --git a/packages/react-scripts/scripts/build.js b/packages/react-scripts/scripts/build.js
index e1c2cbccc49..6c47534d9a3 100644
--- a/packages/react-scripts/scripts/build.js
+++ b/packages/react-scripts/scripts/build.js
@@ -62,7 +62,7 @@ if (!checkRequiredFiles([paths.appHtml, paths.appIndexJs])) {
 const argv = process.argv.slice(2);
 const writeStatsJson = argv.indexOf('--stats') !== -1;
 
-const compileRust = require('./utils/rustCompiler');
+const compileRust = require('./utils/rustUtils');
 compileRust();
 
 // We require that you explictly set browsers and do not fall back to
diff --git a/packages/react-scripts/scripts/utils/rustCompiler.js b/packages/react-scripts/scripts/utils/rustUtils.js
similarity index 100%
rename from packages/react-scripts/scripts/utils/rustCompiler.js
rename to packages/react-scripts/scripts/utils/rustUtils.js

From 1ed2ba88b61f9dfb26b61f0c82e8751c1eae84a0 Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomasroberthorrobin@gmail.com>
Date: Wed, 17 Oct 2018 21:00:57 +0100
Subject: [PATCH 13/42] restructured rustUtils

---
 packages/react-scripts/scripts/build.js       |  4 +--
 .../react-scripts/scripts/utils/rustUtils.js  | 26 ++++++++++---------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/packages/react-scripts/scripts/build.js b/packages/react-scripts/scripts/build.js
index 6c47534d9a3..75238659122 100644
--- a/packages/react-scripts/scripts/build.js
+++ b/packages/react-scripts/scripts/build.js
@@ -62,8 +62,8 @@ if (!checkRequiredFiles([paths.appHtml, paths.appIndexJs])) {
 const argv = process.argv.slice(2);
 const writeStatsJson = argv.indexOf('--stats') !== -1;
 
-const compileRust = require('./utils/rustUtils');
-compileRust();
+const rustUtils = require('./utils/rustUtils');
+rustUtils.build();
 
 // We require that you explictly set browsers and do not fall back to
 // browserslist defaults.
diff --git a/packages/react-scripts/scripts/utils/rustUtils.js b/packages/react-scripts/scripts/utils/rustUtils.js
index 272f0ed3708..0b004532649 100644
--- a/packages/react-scripts/scripts/utils/rustUtils.js
+++ b/packages/react-scripts/scripts/utils/rustUtils.js
@@ -1,15 +1,17 @@
 const execSync = require('child_process').execSync;
 
-module.exports = () => {
-  // first build app.big.wasm and then optimize to app.wasm with wasm-gc
-  try {
-    execSync(
-      'rustc +nightly --target wasm32-unknown-unknown -O --crate-type=cdylib src/lib.rs -o public/app.big.wasm && wasm-gc public/app.big.wasm public/app.wasm && rm public/app.big.wasm'
-    );
-  } catch (error) {
-    // on Windoze sometimes 'rm' is not reliable. if it fails try with this
-    execSync(
-      'Remove-File ./public/app.big.wasm'
-    );
+module.exports = { 
+  build: () => {
+    // first build app.big.wasm and then optimize to app.wasm with wasm-gc
+    try {
+      execSync(
+        'rustc +nightly --target wasm32-unknown-unknown -O --crate-type=cdylib src/lib.rs -o public/app.big.wasm && wasm-gc public/app.big.wasm public/app.wasm && rm public/app.big.wasm'
+      );
+    } catch (error) {
+      // on Windoze sometimes 'rm' is not reliable. if it fails try with this
+      execSync(
+        'Remove-File ./public/app.big.wasm'
+      );
+    }
   }
-};
+}

From ce7e2a2ed9bb5f2e1e56ce6495fc1d25a5a68493 Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomasroberthorrobin@gmail.com>
Date: Wed, 17 Oct 2018 21:33:46 +0100
Subject: [PATCH 14/42] added rust setup code

---
 packages/react-scripts/scripts/init.js           |  8 ++++++++
 .../react-scripts/scripts/utils/rustUtils.js     | 16 +++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/packages/react-scripts/scripts/init.js b/packages/react-scripts/scripts/init.js
index 8ec24967528..c36e1f5d3fa 100644
--- a/packages/react-scripts/scripts/init.js
+++ b/packages/react-scripts/scripts/init.js
@@ -197,6 +197,14 @@ module.exports = function(
     console.log('Initialized a git repository.');
   }
 
+  const rustUtils = require('./utils/rustUtils');
+
+  if (!rustUtils.isRustInstalled()) {
+    rustUtils.installRust();
+  }
+
+  rustUtils.installRustWebAssemblyTools();
+
   // Display the most elegant way to cd.
   // This needs to handle an undefined originalDirectory for
   // backward compatibility with old global-cli's.
diff --git a/packages/react-scripts/scripts/utils/rustUtils.js b/packages/react-scripts/scripts/utils/rustUtils.js
index 0b004532649..a4a9d133973 100644
--- a/packages/react-scripts/scripts/utils/rustUtils.js
+++ b/packages/react-scripts/scripts/utils/rustUtils.js
@@ -13,5 +13,19 @@ module.exports = {
         'Remove-File ./public/app.big.wasm'
       );
     }
-  }
+  },
+  isRustInstalled: () => {
+    try {
+      execSync('rustup -v');
+      return true;
+    } catch (error) {
+      return false;
+    }
+  },
+  installRustWebAssemblyTools: () => {
+    execSync('rustup default nightly && rustup update nightly && rustup target add wasm32-unknown-unknown --toolchain nightly && cargo install --force --git https://github.com/alexcrichton/wasm-gc');
+  },
+  installRust: () => {
+    execSync('curl https://sh.rustup.rs -sSf | sh');
+  },
 }

From 3d548c46a1836b6a616439fd2ae392a0ff936034 Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomas.horrobin@stepstone.com>
Date: Thu, 18 Oct 2018 15:18:08 +0100
Subject: [PATCH 15/42] removed code that would install rustup

---
 packages/react-scripts/scripts/init.js            |  5 ++++-
 packages/react-scripts/scripts/utils/rustUtils.js | 15 ++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/react-scripts/scripts/init.js b/packages/react-scripts/scripts/init.js
index c36e1f5d3fa..4a318bd9f35 100644
--- a/packages/react-scripts/scripts/init.js
+++ b/packages/react-scripts/scripts/init.js
@@ -200,7 +200,10 @@ module.exports = function(
   const rustUtils = require('./utils/rustUtils');
 
   if (!rustUtils.isRustInstalled()) {
-    rustUtils.installRust();
+    console.error(
+      'please install rust https://www.rust-lang.org/en-US/install.html'
+    );
+    return;
   }
 
   rustUtils.installRustWebAssemblyTools();
diff --git a/packages/react-scripts/scripts/utils/rustUtils.js b/packages/react-scripts/scripts/utils/rustUtils.js
index a4a9d133973..2565b96eb77 100644
--- a/packages/react-scripts/scripts/utils/rustUtils.js
+++ b/packages/react-scripts/scripts/utils/rustUtils.js
@@ -1,6 +1,6 @@
 const execSync = require('child_process').execSync;
 
-module.exports = { 
+module.exports = {
   build: () => {
     // first build app.big.wasm and then optimize to app.wasm with wasm-gc
     try {
@@ -9,9 +9,7 @@ module.exports = {
       );
     } catch (error) {
       // on Windoze sometimes 'rm' is not reliable. if it fails try with this
-      execSync(
-        'Remove-File ./public/app.big.wasm'
-      );
+      execSync('Remove-File ./public/app.big.wasm');
     }
   },
   isRustInstalled: () => {
@@ -23,9 +21,8 @@ module.exports = {
     }
   },
   installRustWebAssemblyTools: () => {
-    execSync('rustup default nightly && rustup update nightly && rustup target add wasm32-unknown-unknown --toolchain nightly && cargo install --force --git https://github.com/alexcrichton/wasm-gc');
-  },
-  installRust: () => {
-    execSync('curl https://sh.rustup.rs -sSf | sh');
+    execSync(
+      'rustup default nightly && rustup update nightly && rustup target add wasm32-unknown-unknown --toolchain nightly && cargo install --force --git https://github.com/alexcrichton/wasm-gc'
+    );
   },
-}
+};

From 727ba8ac21cfe077fd0f242805d5220f168eed73 Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomasroberthorrobin@gmail.com>
Date: Thu, 18 Oct 2018 19:12:02 +0100
Subject: [PATCH 16/42] improved errors

---
 packages/react-scripts/scripts/init.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/react-scripts/scripts/init.js b/packages/react-scripts/scripts/init.js
index 4a318bd9f35..82e105fdb27 100644
--- a/packages/react-scripts/scripts/init.js
+++ b/packages/react-scripts/scripts/init.js
@@ -200,8 +200,11 @@ module.exports = function(
   const rustUtils = require('./utils/rustUtils');
 
   if (!rustUtils.isRustInstalled()) {
-    console.error(
-      'please install rust https://www.rust-lang.org/en-US/install.html'
+    console.log(
+      chalk.bold.red('rust not installed')
+    );
+    console.log(
+      'install rust from here https://www.rust-lang.org/en-US/install.html'
     );
     return;
   }

From 91192caacd6a87a7b428ba0ae8bf533d05353f3b Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomas.horrobin@stepstone.com>
Date: Fri, 19 Oct 2018 11:25:41 +0100
Subject: [PATCH 17/42] renamed lib.rs to App.rs

---
 README.md                                     |  2 +-
 .../react-scripts/scripts/utils/rustUtils.js  |  2 +-
 packages/react-scripts/template/README.md     | 35 ++++++++++---------
 packages/react-scripts/template/src/App.js    |  2 +-
 .../template/src/{lib.rs => App.rs}           |  0
 5 files changed, 21 insertions(+), 20 deletions(-)
 rename packages/react-scripts/template/src/{lib.rs => App.rs} (100%)

diff --git a/README.md b/README.md
index df439b77182..ddf0455f0e5 100644
--- a/README.md
+++ b/README.md
@@ -79,7 +79,7 @@ my-app
     ├── App.css
     ├── App.js
     ├── App.test.js
-    ├── lib.rs
+    ├── App.rs
     ├── index.css
     ├── index.js
     ├── logo.svg
diff --git a/packages/react-scripts/scripts/utils/rustUtils.js b/packages/react-scripts/scripts/utils/rustUtils.js
index 2565b96eb77..86147ff3624 100644
--- a/packages/react-scripts/scripts/utils/rustUtils.js
+++ b/packages/react-scripts/scripts/utils/rustUtils.js
@@ -5,7 +5,7 @@ module.exports = {
     // first build app.big.wasm and then optimize to app.wasm with wasm-gc
     try {
       execSync(
-        'rustc +nightly --target wasm32-unknown-unknown -O --crate-type=cdylib src/lib.rs -o public/app.big.wasm && wasm-gc public/app.big.wasm public/app.wasm && rm public/app.big.wasm'
+        'rustc +nightly --target wasm32-unknown-unknown -O --crate-type=cdylib src/App.rs -o public/app.big.wasm && wasm-gc public/app.big.wasm public/app.wasm && rm public/app.big.wasm'
       );
     } catch (error) {
       // on Windoze sometimes 'rm' is not reliable. if it fails try with this
diff --git a/packages/react-scripts/template/README.md b/packages/react-scripts/template/README.md
index 395038bb3a5..890f7ca57df 100644
--- a/packages/react-scripts/template/README.md
+++ b/packages/react-scripts/template/README.md
@@ -143,6 +143,7 @@ my-app/
     App.css
     App.js
     App.test.js
+    App.rs
     index.css
     index.js
     logo.svg
@@ -1905,12 +1906,12 @@ If you do decide to opt-in to service worker registration, please take the
 following into account:
 
 1. After the initial caching is done, the [service worker lifecycle](https://developers.google.com/web/fundamentals/primers/service-workers/lifecycle)
-controls when updated content ends up being shown to users. In order to guard against
-[race conditions with lazy-loaded content](https://github.com/facebook/create-react-app/issues/3613#issuecomment-353467430),
-the default behavior is to conservatively keep the updated service worker in the "[waiting](https://developers.google.com/web/fundamentals/primers/service-workers/lifecycle#waiting)"
-state. This means that users will end up seeing older content until they close (reloading is not
-enough) their existing, open tabs. See [this blog post](https://jeffy.info/2018/10/10/sw-in-c-r-a.html)
-for more details about this behavior.
+   controls when updated content ends up being shown to users. In order to guard against
+   [race conditions with lazy-loaded content](https://github.com/facebook/create-react-app/issues/3613#issuecomment-353467430),
+   the default behavior is to conservatively keep the updated service worker in the "[waiting](https://developers.google.com/web/fundamentals/primers/service-workers/lifecycle#waiting)"
+   state. This means that users will end up seeing older content until they close (reloading is not
+   enough) their existing, open tabs. See [this blog post](https://jeffy.info/2018/10/10/sw-in-c-r-a.html)
+   for more details about this behavior.
 
 1. Users aren't always familiar with offline-first web apps. It can be useful to
    [let the user know](https://developers.google.com/web/fundamentals/instant-and-offline/offline-ux#inform_the_user_when_the_app_is_ready_for_offline_consumption)
@@ -2459,19 +2460,19 @@ Note that in order to support routers that use HTML5 `pushState` API, you may wa
 
 You can adjust various development and production settings by setting environment variables in your shell or with [.env](#adding-development-environment-variables-in-env).
 
-| Variable             |      Development       |     Production     | Usage                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
+|       Variable       |      Development       |     Production     | Usage                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
 | :------------------: | :--------------------: | :----------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| BROWSER              |   :white_check_mark:   |        :x:         | By default, Create React App will open the default system browser, favoring Chrome on macOS. Specify a [browser](https://github.com/sindresorhus/opn#app) to override this behavior, or set it to `none` to disable it completely. If you need to customize the way the browser is launched, you can specify a node script instead. Any arguments passed to `npm start` will also be passed to this script, and the url where your app is served will be the last argument. Your script's file name must have the `.js` extension.                                                                                                                                       |
-| HOST                 |   :white_check_mark:   |        :x:         | By default, the development web server binds to `localhost`. You may use this variable to specify a different host.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| PORT                 |   :white_check_mark:   |        :x:         | By default, the development web server will attempt to listen on port 3000 or prompt you to attempt the next available port. You may use this variable to specify a different port.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| HTTPS                |   :white_check_mark:   |        :x:         | When set to `true`, Create React App will run the development server in `https` mode.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
-| PUBLIC_URL           |          :x:           | :white_check_mark: | Create React App assumes your application is hosted at the serving web server's root or a subpath as specified in [`package.json` (`homepage`)](#building-for-relative-paths). Normally, Create React App ignores the hostname. You may use this variable to force assets to be referenced verbatim to the url you provide (hostname included). This may be particularly useful when using a CDN to host your application.                                                                                                                                                                                                                                               |
-| CI                   | :large_orange_diamond: | :white_check_mark: | When set to `true`, Create React App treats warnings as failures in the build. It also makes the test runner non-watching. Most CIs set this flag by default.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
-| REACT_EDITOR         |   :white_check_mark:   |        :x:         | When an app crashes in development, you will see an error overlay with clickable stack trace. When you click on it, Create React App will try to determine the editor you are using based on currently running processes, and open the relevant source file. You can [send a pull request to detect your editor of choice](https://github.com/facebook/create-react-app/issues/2636). Setting this environment variable overrides the automatic detection. If you do it, make sure your systems [PATH](<https://en.wikipedia.org/wiki/PATH_(variable)>) environment variable points to your editor’s bin folder. You can also set it to `none` to disable it completely. |
+|       BROWSER        |   :white_check_mark:   |        :x:         | By default, Create React App will open the default system browser, favoring Chrome on macOS. Specify a [browser](https://github.com/sindresorhus/opn#app) to override this behavior, or set it to `none` to disable it completely. If you need to customize the way the browser is launched, you can specify a node script instead. Any arguments passed to `npm start` will also be passed to this script, and the url where your app is served will be the last argument. Your script's file name must have the `.js` extension.                                                                                                                                       |
+|         HOST         |   :white_check_mark:   |        :x:         | By default, the development web server binds to `localhost`. You may use this variable to specify a different host.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
+|         PORT         |   :white_check_mark:   |        :x:         | By default, the development web server will attempt to listen on port 3000 or prompt you to attempt the next available port. You may use this variable to specify a different port.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
+|        HTTPS         |   :white_check_mark:   |        :x:         | When set to `true`, Create React App will run the development server in `https` mode.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
+|      PUBLIC_URL      |          :x:           | :white_check_mark: | Create React App assumes your application is hosted at the serving web server's root or a subpath as specified in [`package.json` (`homepage`)](#building-for-relative-paths). Normally, Create React App ignores the hostname. You may use this variable to force assets to be referenced verbatim to the url you provide (hostname included). This may be particularly useful when using a CDN to host your application.                                                                                                                                                                                                                                               |
+|          CI          | :large_orange_diamond: | :white_check_mark: | When set to `true`, Create React App treats warnings as failures in the build. It also makes the test runner non-watching. Most CIs set this flag by default.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
+|     REACT_EDITOR     |   :white_check_mark:   |        :x:         | When an app crashes in development, you will see an error overlay with clickable stack trace. When you click on it, Create React App will try to determine the editor you are using based on currently running processes, and open the relevant source file. You can [send a pull request to detect your editor of choice](https://github.com/facebook/create-react-app/issues/2636). Setting this environment variable overrides the automatic detection. If you do it, make sure your systems [PATH](<https://en.wikipedia.org/wiki/PATH_(variable)>) environment variable points to your editor’s bin folder. You can also set it to `none` to disable it completely. |
 | CHOKIDAR_USEPOLLING  |   :white_check_mark:   |        :x:         | When set to `true`, the watcher runs in polling mode, as necessary inside a VM. Use this option if `npm start` isn't detecting changes.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-| GENERATE_SOURCEMAP   |          :x:           | :white_check_mark: | When set to `false`, source maps are not generated for a production build. This solves OOM issues on some smaller machines.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
-| NODE_PATH            |   :white_check_mark:   | :white_check_mark: | Same as [`NODE_PATH` in Node.js](https://nodejs.org/api/modules.html#modules_loading_from_the_global_folders), but only relative folders are allowed. Can be handy for emulating a monorepo setup by setting `NODE_PATH=src`.                                                                                                                                                                                                                                                                                                                                                                                                                                            |
-| INLINE_RUNTIME_CHUNK |          :x:           | :white_check_mark: | By default, Create React App will embed the runtime script into `index.html` during the production build. When set to `false`, the script will not be embedded and will be imported as usual. This is normally required when dealing with CSP.                                                                                                                                                                                                                                                                                                                                                                                                                       |
+|  GENERATE_SOURCEMAP  |          :x:           | :white_check_mark: | When set to `false`, source maps are not generated for a production build. This solves OOM issues on some smaller machines.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
+|      NODE_PATH       |   :white_check_mark:   | :white_check_mark: | Same as [`NODE_PATH` in Node.js](https://nodejs.org/api/modules.html#modules_loading_from_the_global_folders), but only relative folders are allowed. Can be handy for emulating a monorepo setup by setting `NODE_PATH=src`.                                                                                                                                                                                                                                                                                                                                                                                                                                            |
+| INLINE_RUNTIME_CHUNK |          :x:           | :white_check_mark: | By default, Create React App will embed the runtime script into `index.html` during the production build. When set to `false`, the script will not be embedded and will be imported as usual. This is normally required when dealing with CSP.                                                                                                                                                                                                                                                                                                                                                                                                                           |
 
 ## Troubleshooting
 
diff --git a/packages/react-scripts/template/src/App.js b/packages/react-scripts/template/src/App.js
index 322a7690644..d95bae3bd3e 100644
--- a/packages/react-scripts/template/src/App.js
+++ b/packages/react-scripts/template/src/App.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import logo from './logo.svg';
 import './App.css';
-import loadAdd from './lib.rs';
+import loadAdd from './App.rs';
 
 class App extends Component {
   constructor() {
diff --git a/packages/react-scripts/template/src/lib.rs b/packages/react-scripts/template/src/App.rs
similarity index 100%
rename from packages/react-scripts/template/src/lib.rs
rename to packages/react-scripts/template/src/App.rs

From 1de3d236a8e26e5e36df357786aac790687b2512 Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomas.horrobin@stepstone.com>
Date: Fri, 19 Oct 2018 13:45:14 +0100
Subject: [PATCH 18/42] changed rust smoke test cmd

---
 packages/react-scripts/scripts/utils/rustUtils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-scripts/scripts/utils/rustUtils.js b/packages/react-scripts/scripts/utils/rustUtils.js
index 86147ff3624..6ddd64cdf2d 100644
--- a/packages/react-scripts/scripts/utils/rustUtils.js
+++ b/packages/react-scripts/scripts/utils/rustUtils.js
@@ -14,7 +14,7 @@ module.exports = {
   },
   isRustInstalled: () => {
     try {
-      execSync('rustup -v');
+      execSync('rustup show');
       return true;
     } catch (error) {
       return false;

From 5a5cbb57ecc6a32111e2a350b72a9ed237872c26 Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomas.horrobin@stepstone.com>
Date: Fri, 19 Oct 2018 14:06:55 +0100
Subject: [PATCH 19/42] removed not working windows specific code

---
 packages/react-scripts/scripts/utils/rustUtils.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/react-scripts/scripts/utils/rustUtils.js b/packages/react-scripts/scripts/utils/rustUtils.js
index 6ddd64cdf2d..1c484c69e97 100644
--- a/packages/react-scripts/scripts/utils/rustUtils.js
+++ b/packages/react-scripts/scripts/utils/rustUtils.js
@@ -7,10 +7,7 @@ module.exports = {
       execSync(
         'rustc +nightly --target wasm32-unknown-unknown -O --crate-type=cdylib src/App.rs -o public/app.big.wasm && wasm-gc public/app.big.wasm public/app.wasm && rm public/app.big.wasm'
       );
-    } catch (error) {
-      // on Windoze sometimes 'rm' is not reliable. if it fails try with this
-      execSync('Remove-File ./public/app.big.wasm');
-    }
+    } catch (error) {}
   },
   isRustInstalled: () => {
     try {

From 466936b78ed34fb6c348921fde41e885b06b8548 Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomas.horrobin@stepstone.com>
Date: Fri, 19 Oct 2018 14:20:41 +0100
Subject: [PATCH 20/42] added fix for brocken rust

---
 packages/react-scripts/template/Cargo.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/react-scripts/template/Cargo.toml b/packages/react-scripts/template/Cargo.toml
index d4a4f31948c..5e91c518759 100644
--- a/packages/react-scripts/template/Cargo.toml
+++ b/packages/react-scripts/template/Cargo.toml
@@ -6,5 +6,6 @@ edition = "2018"
 
 [lib]
 crate-type = ["cdylib"]
+path = "src/App.rs"
 
 [dependencies]

From 6b9bec82123ce9e9890c896ebe4dd0b7df76e7eb Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomas.horrobin@stepstone.com>
Date: Fri, 19 Oct 2018 14:28:24 +0100
Subject: [PATCH 21/42] renamed ruction to allighn with hellorust

---
 packages/react-scripts/template/src/App.js | 8 ++++----
 packages/react-scripts/template/src/App.rs | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/react-scripts/template/src/App.js b/packages/react-scripts/template/src/App.js
index d95bae3bd3e..f0df9da1d03 100644
--- a/packages/react-scripts/template/src/App.js
+++ b/packages/react-scripts/template/src/App.js
@@ -12,14 +12,14 @@ class App extends Component {
           .then(response => response.arrayBuffer())
           .then(bytes => WebAssembly.instantiate(bytes, {}))
           .then(result => {
-            const addtwo = result.instance.exports['addtwo'];
-            alert(`return value was ${addtwo(3)}`);
+            const add_one = result.instance.exports['add_one'];
+            alert(`return value was ${add_one(3)}`);
           });
         break;
       case 'development':
         loadAdd().then(result => {
-          const addtwo = result.instance.exports['addtwo'];
-          alert(`return value was ${addtwo(2)}`);
+          const add_one = result.instance.exports['add_one'];
+          alert(`return value was ${add_one(2)}`);
         });
         break;
       default:
diff --git a/packages/react-scripts/template/src/App.rs b/packages/react-scripts/template/src/App.rs
index 9a46f425601..b3cd5c42148 100644
--- a/packages/react-scripts/template/src/App.rs
+++ b/packages/react-scripts/template/src/App.rs
@@ -1,4 +1,4 @@
 #[no_mangle]
-pub fn addtwo(a: i32) -> i32 {
-    a + 2
+pub extern "C" fn add_one(x: i32) -> i32 {
+    x + 1
 }

From 354d70bfbe6158e3752f33da85149e79206ccb70 Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomasroberthorrobin@gmail.com>
Date: Fri, 19 Oct 2018 15:31:20 +0100
Subject: [PATCH 22/42] deployed

---
 packages/react-scripts/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
index c182f5a0c73..f84d12ed461 100644
--- a/packages/react-scripts/package.json
+++ b/packages/react-scripts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-scripts-rust",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "Configuration and scripts for using Rust with Create React App",
   "repository": "thomashorrobin/create-react-app-rust",
   "license": "MIT",

From 4d932297e4affb625738ed3597880c19102745d1 Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomasroberthorrobin@gmail.com>
Date: Sun, 21 Oct 2018 13:07:33 +0100
Subject: [PATCH 23/42] deployed

---
 packages/react-scripts/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
index f84d12ed461..59ab264d150 100644
--- a/packages/react-scripts/package.json
+++ b/packages/react-scripts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-scripts-rust",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "Configuration and scripts for using Rust with Create React App",
   "repository": "thomashorrobin/create-react-app-rust",
   "license": "MIT",

From ea80e9b9d6904b6007834dca5c725290d8385d33 Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomasroberthorrobin@gmail.com>
Date: Sun, 21 Oct 2018 13:28:47 +0100
Subject: [PATCH 24/42] added better logging

---
 packages/react-scripts/scripts/init.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/react-scripts/scripts/init.js b/packages/react-scripts/scripts/init.js
index 82e105fdb27..b58ae2b7983 100644
--- a/packages/react-scripts/scripts/init.js
+++ b/packages/react-scripts/scripts/init.js
@@ -199,7 +199,9 @@ module.exports = function(
 
   const rustUtils = require('./utils/rustUtils');
 
-  if (!rustUtils.isRustInstalled()) {
+  if (rustUtils.isRustInstalled()) {
+    console.log('rust installed 👍');
+  } else {
     console.log(
       chalk.bold.red('rust not installed')
     );

From 8a1461719c00f89f1f4e9c7b3ed9ef79c9209563 Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomasroberthorrobin@gmail.com>
Date: Sun, 21 Oct 2018 13:33:10 +0100
Subject: [PATCH 25/42] deployed

---
 packages/react-scripts/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
index 59ab264d150..48d7420e1fd 100644
--- a/packages/react-scripts/package.json
+++ b/packages/react-scripts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-scripts-rust",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "Configuration and scripts for using Rust with Create React App",
   "repository": "thomashorrobin/create-react-app-rust",
   "license": "MIT",

From c8d0e3e2d8b4c575183ba7692c7734c19cc63666 Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomasroberthorrobin@gmail.com>
Date: Sun, 21 Oct 2018 14:11:38 +0100
Subject: [PATCH 26/42] removed wasm-gc

---
 packages/react-scripts/scripts/utils/rustUtils.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/react-scripts/scripts/utils/rustUtils.js b/packages/react-scripts/scripts/utils/rustUtils.js
index 1c484c69e97..06fd42ab09b 100644
--- a/packages/react-scripts/scripts/utils/rustUtils.js
+++ b/packages/react-scripts/scripts/utils/rustUtils.js
@@ -5,7 +5,7 @@ module.exports = {
     // first build app.big.wasm and then optimize to app.wasm with wasm-gc
     try {
       execSync(
-        'rustc +nightly --target wasm32-unknown-unknown -O --crate-type=cdylib src/App.rs -o public/app.big.wasm && wasm-gc public/app.big.wasm public/app.wasm && rm public/app.big.wasm'
+        'rustc +nightly --target wasm32-unknown-unknown -O --crate-type=cdylib src/App.rs -o public/app.wasm'
       );
     } catch (error) {}
   },
@@ -19,7 +19,7 @@ module.exports = {
   },
   installRustWebAssemblyTools: () => {
     execSync(
-      'rustup default nightly && rustup update nightly && rustup target add wasm32-unknown-unknown --toolchain nightly && cargo install --force --git https://github.com/alexcrichton/wasm-gc'
+      'rustup default nightly && rustup update nightly && rustup target add wasm32-unknown-unknown --toolchain nightly'
     );
   },
 };

From 3e89909032c8da325801712b461eb910e4c6bb1d Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomasroberthorrobin@gmail.com>
Date: Sun, 21 Oct 2018 14:19:05 +0100
Subject: [PATCH 27/42] deployed

---
 packages/react-scripts/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
index 48d7420e1fd..db8ec8afd05 100644
--- a/packages/react-scripts/package.json
+++ b/packages/react-scripts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-scripts-rust",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "Configuration and scripts for using Rust with Create React App",
   "repository": "thomashorrobin/create-react-app-rust",
   "license": "MIT",

From bcfb6dc990e10ec932e897393de45f852858b09e Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomasroberthorrobin@gmail.com>
Date: Sun, 21 Oct 2018 23:58:15 +0100
Subject: [PATCH 28/42] abstracted wasm loading App.rs

---
 packages/react-scripts/template/src/App.js    | 25 ++++---------------
 .../react-scripts/template/src/wasmLoader.js  | 17 +++++++++++++
 2 files changed, 22 insertions(+), 20 deletions(-)
 create mode 100644 packages/react-scripts/template/src/wasmLoader.js

diff --git a/packages/react-scripts/template/src/App.js b/packages/react-scripts/template/src/App.js
index f0df9da1d03..94d371f6356 100644
--- a/packages/react-scripts/template/src/App.js
+++ b/packages/react-scripts/template/src/App.js
@@ -1,30 +1,15 @@
 import React, { Component } from 'react';
 import logo from './logo.svg';
 import './App.css';
-import loadAdd from './App.rs';
+import { loadWasm } from "./wasmLoader";
 
 class App extends Component {
   constructor() {
     super();
-    switch (process.env.NODE_ENV) {
-      case 'production':
-        fetch('app.wasm')
-          .then(response => response.arrayBuffer())
-          .then(bytes => WebAssembly.instantiate(bytes, {}))
-          .then(result => {
-            const add_one = result.instance.exports['add_one'];
-            alert(`return value was ${add_one(3)}`);
-          });
-        break;
-      case 'development':
-        loadAdd().then(result => {
-          const add_one = result.instance.exports['add_one'];
-          alert(`return value was ${add_one(2)}`);
-        });
-        break;
-      default:
-        break;
-    }
+    loadWasm(result => {
+      const add_one = result.instance.exports['add_one'];
+      alert(`return value was ${add_one(3)}`);
+    });
   }
   render() {
     return (
diff --git a/packages/react-scripts/template/src/wasmLoader.js b/packages/react-scripts/template/src/wasmLoader.js
new file mode 100644
index 00000000000..9b65ced3e5c
--- /dev/null
+++ b/packages/react-scripts/template/src/wasmLoader.js
@@ -0,0 +1,17 @@
+import rustFile from './App.rs';
+
+export function loadWasm(handleResultObjectPromise) {
+    switch (process.env.NODE_ENV) {
+      case 'production':
+        fetch('app.wasm')
+          .then(response => response.arrayBuffer())
+          .then(bytes => WebAssembly.instantiate(bytes, {}))
+          .then(handleResultObjectPromise);
+        break;
+      case 'development':
+        rustFile().then(handleResultObjectPromise);
+        break;
+      default:
+        break;
+    }
+}
\ No newline at end of file

From 48dce00b401427a37cc9b0670d4aad9df24207d8 Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomasroberthorrobin@gmail.com>
Date: Mon, 22 Oct 2018 00:16:11 +0100
Subject: [PATCH 29/42] deployed

---
 packages/react-scripts/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
index edf9d7713ed..f5979a4290b 100644
--- a/packages/react-scripts/package.json
+++ b/packages/react-scripts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-scripts-rust",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "description": "Configuration and scripts for using Rust with Create React App",
   "repository": "thomashorrobin/create-react-app-rust",
   "license": "MIT",

From 88da42d70f22fea69b347a0c2498ee1f8710f657 Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomasroberthorrobin@gmail.com>
Date: Mon, 22 Oct 2018 12:01:56 +0100
Subject: [PATCH 30/42] added stdout and stderr to execSync calls

---
 packages/react-scripts/scripts/utils/rustUtils.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/react-scripts/scripts/utils/rustUtils.js b/packages/react-scripts/scripts/utils/rustUtils.js
index 06fd42ab09b..fa0ff8e0d90 100644
--- a/packages/react-scripts/scripts/utils/rustUtils.js
+++ b/packages/react-scripts/scripts/utils/rustUtils.js
@@ -5,7 +5,8 @@ module.exports = {
     // first build app.big.wasm and then optimize to app.wasm with wasm-gc
     try {
       execSync(
-        'rustc +nightly --target wasm32-unknown-unknown -O --crate-type=cdylib src/App.rs -o public/app.wasm'
+        'rustc +nightly --target wasm32-unknown-unknown -O --crate-type=cdylib src/App.rs -o public/app.wasm',
+        { stdio: 'inherit' }
       );
     } catch (error) {}
   },
@@ -19,7 +20,8 @@ module.exports = {
   },
   installRustWebAssemblyTools: () => {
     execSync(
-      'rustup default nightly && rustup update nightly && rustup target add wasm32-unknown-unknown --toolchain nightly'
+      'rustup default nightly && rustup update nightly && rustup target add wasm32-unknown-unknown --toolchain nightly',
+      { stdio: 'inherit' }
     );
   },
 };

From 0240b66338992457dea513e190250fdc1ee5c004 Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomasroberthorrobin@gmail.com>
Date: Mon, 22 Oct 2018 15:36:01 +0100
Subject: [PATCH 31/42] readded wasm-gc

---
 packages/react-scripts/scripts/build.js        |  6 +++---
 .../react-scripts/scripts/utils/rustUtils.js   | 18 +++++++++++++++---
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/packages/react-scripts/scripts/build.js b/packages/react-scripts/scripts/build.js
index 670a2db230a..0003f015724 100644
--- a/packages/react-scripts/scripts/build.js
+++ b/packages/react-scripts/scripts/build.js
@@ -43,6 +43,7 @@ const formatWebpackMessages = require('react-dev-utils/formatWebpackMessages');
 const printHostingInstructions = require('react-dev-utils/printHostingInstructions');
 const FileSizeReporter = require('react-dev-utils/FileSizeReporter');
 const printBuildError = require('react-dev-utils/printBuildError');
+const rustUtils = require('./utils/rustUtils');
 
 const measureFileSizesBeforeBuild =
   FileSizeReporter.measureFileSizesBeforeBuild;
@@ -64,9 +65,6 @@ if (!checkRequiredFiles([paths.appHtml, paths.appIndexJs])) {
 const argv = process.argv.slice(2);
 const writeStatsJson = argv.indexOf('--stats') !== -1;
 
-const rustUtils = require('./utils/rustUtils');
-rustUtils.build();
-
 // We require that you explicitly set browsers and do not fall back to
 // browserslist defaults.
 const { checkBrowsers } = require('react-dev-utils/browsersHelper');
@@ -82,6 +80,8 @@ checkBrowsers(paths.appPath, isInteractive)
     fs.emptyDirSync(paths.appBuild);
     // Merge with the public folder
     copyPublicFolder();
+    // compile Rust to wasm
+    rustUtils.build();
     // Start the webpack build
     return build(previousFileSizes);
   })
diff --git a/packages/react-scripts/scripts/utils/rustUtils.js b/packages/react-scripts/scripts/utils/rustUtils.js
index fa0ff8e0d90..ae6e80a27b3 100644
--- a/packages/react-scripts/scripts/utils/rustUtils.js
+++ b/packages/react-scripts/scripts/utils/rustUtils.js
@@ -1,14 +1,26 @@
 const execSync = require('child_process').execSync;
+const chalk = require('chalk');
 
 module.exports = {
   build: () => {
-    // first build app.big.wasm and then optimize to app.wasm with wasm-gc
     try {
+      // first build app.wasm and then optimize with wasm-gc
       execSync(
-        'rustc +nightly --target wasm32-unknown-unknown -O --crate-type=cdylib src/App.rs -o public/app.wasm',
+        'rustc +nightly --target wasm32-unknown-unknown -O --crate-type=cdylib src/App.rs -o build/app.wasm',
         { stdio: 'inherit' }
       );
-    } catch (error) {}
+      try {
+        // check to see if wasm-gc is installed and if not install it
+        execSync('wasm-gc');
+      } catch (err) {
+        execSync('cargo install wasm-gc', { stdio: 'inherit' });
+      } finally {
+        // think of this like running --gc-sections on the app.wasm file
+        execSync('wasm-gc build/app.wasm', { stdio: 'inherit' });
+      }
+    } catch (error) {
+      console.log(chalk.bold.red('error compiling rust'));
+    }
   },
   isRustInstalled: () => {
     try {

From b1542e72df31715c7c3cc3bb3d44f1ebbec88a75 Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomasroberthorrobin@gmail.com>
Date: Tue, 23 Oct 2018 23:54:56 +0100
Subject: [PATCH 32/42] updated READMEs to give greater guidance to end users

---
 README.md                           | 7 +++++++
 packages/react-scripts/README.md    | 6 ++++++
 packages/react-scripts/package.json | 2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5d108ba7826..08ff163bec4 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,13 @@ If something doesn’t work, please [file an issue](https://github.com/facebook/
 
 ## Quick Overview
 
+If you haven't already you'll need to install Rust and source it into your current context
+```sh
+curl https://sh.rustup.rs -sSf | sh
+source $HOME/.cargo/env
+```
+
+Then you can run the tool with `npx`
 ```sh
 npx create-react-app my-app --scripts-version react-scripts-rust
 cd my-app
diff --git a/packages/react-scripts/README.md b/packages/react-scripts/README.md
index 7075728d269..8ab6e0084cd 100644
--- a/packages/react-scripts/README.md
+++ b/packages/react-scripts/README.md
@@ -9,6 +9,12 @@ Please refer to its documentation:
 
 ## Quick Overview
 
+First install Rust if you haven't already
+```sh
+curl https://sh.rustup.rs -sSf | sh
+source $HOME/.cargo/env
+```
+Then you can run the tool with `npx`
 ```sh
 npx create-react-app my-app --scripts-version react-scripts-rust
 cd my-app
diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
index f5979a4290b..f9f1e9c86ad 100644
--- a/packages/react-scripts/package.json
+++ b/packages/react-scripts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-scripts-rust",
-  "version": "2.0.7",
+  "version": "2.0.10",
   "description": "Configuration and scripts for using Rust with Create React App",
   "repository": "thomashorrobin/create-react-app-rust",
   "license": "MIT",

From 3751c993cb6c7a996a7415c340fe4d31e21f09a8 Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomasroberthorrobin@gmail.com>
Date: Wed, 24 Oct 2018 13:02:20 +0100
Subject: [PATCH 33/42] added rust-toolchain

---
 packages/react-scripts/package.json               | 2 +-
 packages/react-scripts/scripts/utils/rustUtils.js | 2 +-
 packages/react-scripts/template/rust-toolchain    | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 packages/react-scripts/template/rust-toolchain

diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
index f9f1e9c86ad..cbe96172f18 100644
--- a/packages/react-scripts/package.json
+++ b/packages/react-scripts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-scripts-rust",
-  "version": "2.0.10",
+  "version": "2.0.12",
   "description": "Configuration and scripts for using Rust with Create React App",
   "repository": "thomashorrobin/create-react-app-rust",
   "license": "MIT",
diff --git a/packages/react-scripts/scripts/utils/rustUtils.js b/packages/react-scripts/scripts/utils/rustUtils.js
index ae6e80a27b3..f4b9a754474 100644
--- a/packages/react-scripts/scripts/utils/rustUtils.js
+++ b/packages/react-scripts/scripts/utils/rustUtils.js
@@ -32,7 +32,7 @@ module.exports = {
   },
   installRustWebAssemblyTools: () => {
     execSync(
-      'rustup default nightly && rustup update nightly && rustup target add wasm32-unknown-unknown --toolchain nightly',
+      'rustup target add wasm32-unknown-unknown --toolchain nightly',
       { stdio: 'inherit' }
     );
   },
diff --git a/packages/react-scripts/template/rust-toolchain b/packages/react-scripts/template/rust-toolchain
new file mode 100644
index 00000000000..07ade694b1a
--- /dev/null
+++ b/packages/react-scripts/template/rust-toolchain
@@ -0,0 +1 @@
+nightly
\ No newline at end of file

From 8fe0b9f9c4f7c37b64d5d28c4198c6e797245877 Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomasroberthorrobin@gmail.com>
Date: Wed, 24 Oct 2018 13:15:46 +0100
Subject: [PATCH 34/42] add install for wasm-gc

---
 packages/react-scripts/package.json              |  2 +-
 .../react-scripts/scripts/utils/rustUtils.js     | 16 ++++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
index cbe96172f18..2a37cfcfece 100644
--- a/packages/react-scripts/package.json
+++ b/packages/react-scripts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-scripts-rust",
-  "version": "2.0.12",
+  "version": "2.0.13",
   "description": "Configuration and scripts for using Rust with Create React App",
   "repository": "thomashorrobin/create-react-app-rust",
   "license": "MIT",
diff --git a/packages/react-scripts/scripts/utils/rustUtils.js b/packages/react-scripts/scripts/utils/rustUtils.js
index f4b9a754474..964d042c107 100644
--- a/packages/react-scripts/scripts/utils/rustUtils.js
+++ b/packages/react-scripts/scripts/utils/rustUtils.js
@@ -6,18 +6,9 @@ module.exports = {
     try {
       // first build app.wasm and then optimize with wasm-gc
       execSync(
-        'rustc +nightly --target wasm32-unknown-unknown -O --crate-type=cdylib src/App.rs -o build/app.wasm',
+        'rustc +nightly --target wasm32-unknown-unknown -O --crate-type=cdylib src/App.rs -o build/app.wasm && wasm-gc build/app.wasm',
         { stdio: 'inherit' }
       );
-      try {
-        // check to see if wasm-gc is installed and if not install it
-        execSync('wasm-gc');
-      } catch (err) {
-        execSync('cargo install wasm-gc', { stdio: 'inherit' });
-      } finally {
-        // think of this like running --gc-sections on the app.wasm file
-        execSync('wasm-gc build/app.wasm', { stdio: 'inherit' });
-      }
     } catch (error) {
       console.log(chalk.bold.red('error compiling rust'));
     }
@@ -31,6 +22,11 @@ module.exports = {
     }
   },
   installRustWebAssemblyTools: () => {
+    try {
+      execSync('cargo install wasm-gc', { stdio: 'inherit' });
+    } catch {
+      console.log(`${chalk.bold.red('error installing wasm-gc')} please install manually ${chalk.red('cargo install wasm-gc')}')`);
+    }
     execSync(
       'rustup target add wasm32-unknown-unknown --toolchain nightly',
       { stdio: 'inherit' }

From c789fe22db99319853fc79221e6c52709f9e46e1 Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomasroberthorrobin@gmail.com>
Date: Sat, 27 Oct 2018 04:20:53 +0100
Subject: [PATCH 35/42] moved to using factorial as an example instead of add
 one

---
 packages/react-scripts/template/src/App.js | 5 +++--
 packages/react-scripts/template/src/App.rs | 9 +++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/react-scripts/template/src/App.js b/packages/react-scripts/template/src/App.js
index 94d371f6356..78d124c0f22 100644
--- a/packages/react-scripts/template/src/App.js
+++ b/packages/react-scripts/template/src/App.js
@@ -7,8 +7,9 @@ class App extends Component {
   constructor() {
     super();
     loadWasm(result => {
-      const add_one = result.instance.exports['add_one'];
-      alert(`return value was ${add_one(3)}`);
+      const calculateFactorial = result.instance.exports['fact'];
+      const x = 5;
+      alert(`the factorial of ${ x } is ${ calculateFactorial(x) }`);
     });
   }
   render() {
diff --git a/packages/react-scripts/template/src/App.rs b/packages/react-scripts/template/src/App.rs
index b3cd5c42148..6a732dde862 100644
--- a/packages/react-scripts/template/src/App.rs
+++ b/packages/react-scripts/template/src/App.rs
@@ -1,4 +1,9 @@
 #[no_mangle]
-pub extern "C" fn add_one(x: i32) -> i32 {
-    x + 1
+pub extern "C" fn fact(mut n: u32) -> u32 {
+    let mut result = 1;
+    while n > 0 {
+        result = result * n;
+        n = n - 1;
+    }
+    result
 }

From 3794637bc3e54634d175efb1434f75fd19b4181a Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomasroberthorrobin@gmail.com>
Date: Sat, 27 Oct 2018 04:39:23 +0100
Subject: [PATCH 36/42] deployed

---
 packages/react-scripts/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
index 2a37cfcfece..634c8ea79ee 100644
--- a/packages/react-scripts/package.json
+++ b/packages/react-scripts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-scripts-rust",
-  "version": "2.0.13",
+  "version": "2.0.14",
   "description": "Configuration and scripts for using Rust with Create React App",
   "repository": "thomashorrobin/create-react-app-rust",
   "license": "MIT",

From 2e4855a208d99c2c9cf97a86a734ca85409cad5f Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomasroberthorrobin@gmail.com>
Date: Sat, 27 Oct 2018 19:18:13 +0100
Subject: [PATCH 37/42] improved info on the splash page in the template

added explicit note in app template reminding users they can save src/App.rs and have the app update automatically in the browser
---
 packages/react-scripts/package.json        | 2 +-
 packages/react-scripts/template/src/App.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
index 634c8ea79ee..e0d5fa8add8 100644
--- a/packages/react-scripts/package.json
+++ b/packages/react-scripts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-scripts-rust",
-  "version": "2.0.14",
+  "version": "2.0.15",
   "description": "Configuration and scripts for using Rust with Create React App",
   "repository": "thomashorrobin/create-react-app-rust",
   "license": "MIT",
diff --git a/packages/react-scripts/template/src/App.js b/packages/react-scripts/template/src/App.js
index 78d124c0f22..25c43654d1b 100644
--- a/packages/react-scripts/template/src/App.js
+++ b/packages/react-scripts/template/src/App.js
@@ -18,7 +18,7 @@ class App extends Component {
         <header className="App-header">
           <img src={logo} className="App-logo" alt="logo" />
           <p>
-            Edit <code>src/App.js</code> and save to reload.
+            Edit <code>src/App.js</code> or <code>src/App.rs</code> and save to reload.
           </p>
           <a
             className="App-link"

From aded15ed137ef9c0d397bcb5353976efee64c7b5 Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomasroberthorrobin@gmail.com>
Date: Sat, 27 Oct 2018 20:03:49 +0100
Subject: [PATCH 38/42] use command-exists instead of manually checking if cmd
 is avalible

this commit replaces old code that was designed to determine if things like rustup or wasm-gc were installed
the new implementation uses the npm package command-exists, which gives us better async, errs, etc
---
 packages/react-scripts/package.json           |  3 ++-
 .../react-scripts/scripts/utils/rustUtils.js  | 20 ++++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
index e0d5fa8add8..69c804aa231 100644
--- a/packages/react-scripts/package.json
+++ b/packages/react-scripts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-scripts-rust",
-  "version": "2.0.15",
+  "version": "2.0.16",
   "description": "Configuration and scripts for using Rust with Create React App",
   "repository": "thomashorrobin/create-react-app-rust",
   "license": "MIT",
@@ -32,6 +32,7 @@
     "bfj": "6.1.1",
     "case-sensitive-paths-webpack-plugin": "2.1.2",
     "chalk": "2.4.1",
+    "command-exists": "^1.2.8",
     "css-loader": "1.0.0",
     "dotenv": "6.0.0",
     "dotenv-expand": "4.2.0",
diff --git a/packages/react-scripts/scripts/utils/rustUtils.js b/packages/react-scripts/scripts/utils/rustUtils.js
index 964d042c107..a84328c88c0 100644
--- a/packages/react-scripts/scripts/utils/rustUtils.js
+++ b/packages/react-scripts/scripts/utils/rustUtils.js
@@ -1,5 +1,6 @@
 const execSync = require('child_process').execSync;
 const chalk = require('chalk');
+const commandExistsSync = require('command-exists').sync;
 
 module.exports = {
   build: () => {
@@ -13,19 +14,14 @@ module.exports = {
       console.log(chalk.bold.red('error compiling rust'));
     }
   },
-  isRustInstalled: () => {
-    try {
-      execSync('rustup show');
-      return true;
-    } catch (error) {
-      return false;
-    }
-  },
+  isRustInstalled: () => commandExistsSync('rustup'),
   installRustWebAssemblyTools: () => {
-    try {
-      execSync('cargo install wasm-gc', { stdio: 'inherit' });
-    } catch {
-      console.log(`${chalk.bold.red('error installing wasm-gc')} please install manually ${chalk.red('cargo install wasm-gc')}')`);
+    if (!commandExistsSync('wasm-gc')) {
+      try {
+        execSync('cargo install wasm-gc', { stdio: 'inherit' });
+      } catch {
+        console.log(`${chalk.bold.red('error installing wasm-gc')} please install manually ${chalk.red('cargo install wasm-gc')}')`);
+      }
     }
     execSync(
       'rustup target add wasm32-unknown-unknown --toolchain nightly',

From 82f6ac20e77355b4f03b39703a3f222f7de03f5e Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomasroberthorrobin@gmail.com>
Date: Sat, 27 Oct 2018 23:29:14 +0100
Subject: [PATCH 39/42] moved to using cargo init instead of copying Cargo.toml

---
 packages/react-scripts/package.json               |  3 ++-
 packages/react-scripts/scripts/utils/rustUtils.js | 13 +++++++++++++
 packages/react-scripts/template/Cargo.toml        | 11 -----------
 3 files changed, 15 insertions(+), 12 deletions(-)
 delete mode 100644 packages/react-scripts/template/Cargo.toml

diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json
index 69c804aa231..18b04855b59 100644
--- a/packages/react-scripts/package.json
+++ b/packages/react-scripts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-scripts-rust",
-  "version": "2.0.16",
+  "version": "2.0.17",
   "description": "Configuration and scripts for using Rust with Create React App",
   "repository": "thomashorrobin/create-react-app-rust",
   "license": "MIT",
@@ -65,6 +65,7 @@
     "sass-loader": "7.1.0",
     "style-loader": "0.23.0",
     "terser-webpack-plugin": "1.1.0",
+    "toml-js": "0.0.8",
     "url-loader": "1.1.1",
     "wasm-loader": "^1.3.0",
     "webpack": "4.19.1",
diff --git a/packages/react-scripts/scripts/utils/rustUtils.js b/packages/react-scripts/scripts/utils/rustUtils.js
index a84328c88c0..6bb33a8c70d 100644
--- a/packages/react-scripts/scripts/utils/rustUtils.js
+++ b/packages/react-scripts/scripts/utils/rustUtils.js
@@ -1,6 +1,8 @@
 const execSync = require('child_process').execSync;
 const chalk = require('chalk');
 const commandExistsSync = require('command-exists').sync;
+const fs = require('fs');
+const toml = require('toml-js');
 
 module.exports = {
   build: () => {
@@ -23,6 +25,17 @@ module.exports = {
         console.log(`${chalk.bold.red('error installing wasm-gc')} please install manually ${chalk.red('cargo install wasm-gc')}')`);
       }
     }
+    execSync(
+      'cargo init --lib',
+      { stdio: 'inherit' }
+    );
+    fs.readFile('Cargo.toml', function (err, data) {
+        var cargo = toml.parse(data);
+        cargo.lib = {};
+        cargo.lib['crate-type'] = ['cdylib'];
+        cargo.lib.path = 'src/App.rs';
+        fs.writeFile('Cargo.toml', toml.dump(cargo), err => console.log(err));
+    });
     execSync(
       'rustup target add wasm32-unknown-unknown --toolchain nightly',
       { stdio: 'inherit' }
diff --git a/packages/react-scripts/template/Cargo.toml b/packages/react-scripts/template/Cargo.toml
deleted file mode 100644
index 5e91c518759..00000000000
--- a/packages/react-scripts/template/Cargo.toml
+++ /dev/null
@@ -1,11 +0,0 @@
-[package]
-name = "add"
-version = "0.1.0"
-authors = ["Thomas Horrobin <thomas.horrobin@stepstone.com>"]
-edition = "2018"
-
-[lib]
-crate-type = ["cdylib"]
-path = "src/App.rs"
-
-[dependencies]

From 9c95c230dc78af7f87e438159a6500890d4f51ee Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomasroberthorrobin@gmail.com>
Date: Sat, 15 Dec 2018 10:05:10 +0000
Subject: [PATCH 40/42] modified logging

---
 packages/react-scripts/scripts/utils/rustUtils.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/react-scripts/scripts/utils/rustUtils.js b/packages/react-scripts/scripts/utils/rustUtils.js
index 6bb33a8c70d..046443cccd1 100644
--- a/packages/react-scripts/scripts/utils/rustUtils.js
+++ b/packages/react-scripts/scripts/utils/rustUtils.js
@@ -21,7 +21,8 @@ module.exports = {
     if (!commandExistsSync('wasm-gc')) {
       try {
         execSync('cargo install wasm-gc', { stdio: 'inherit' });
-      } catch {
+      } catch (e) {
+        console.log(e);
         console.log(`${chalk.bold.red('error installing wasm-gc')} please install manually ${chalk.red('cargo install wasm-gc')}')`);
       }
     }

From fa2bd5bc628d479abe0d0461996d147c586bb235 Mon Sep 17 00:00:00 2001
From: Terkwood <metaterkhorn@gmail.com>
Date: Wed, 20 Feb 2019 07:27:17 -0500
Subject: [PATCH 41/42] Move react default documentation to a separate file

---
 README.md | 188 ++++--------------------------------------------------
 react.md  | 179 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 190 insertions(+), 177 deletions(-)
 create mode 100644 react.md

diff --git a/README.md b/README.md
index d544fb52e5d..de64b5720fe 100644
--- a/README.md
+++ b/README.md
@@ -5,18 +5,21 @@ Create React apps with support for WebAssembly/Rust with no build configuration.
 - [Creating an App](#creating-an-app) – How to create a new app.
 - [User Guide](https://facebook.github.io/create-react-app/) – How to develop apps bootstrapped with Create React App.
 
-Create React App works on macOS, Windows, and Linux. However Rust tools may behave diferently on Windows in certain cercumstances.<br>
+Create React App works on macOS, Windows, and Linux. However Rust tools may behave diferently on Windows in certain cercumstances.
+
 If something doesn’t work, please [file an issue](https://github.com/facebook/create-react-app/issues/new).
 
 ## Quick Overview
 
 If you haven't already you'll need to install Rust and source it into your current context
+
 ```sh
 curl https://sh.rustup.rs -sSf | sh
 source $HOME/.cargo/env
 ```
 
 Then you can run the tool with `npx`
+
 ```sh
 npx create-react-app my-app --scripts-version react-scripts-rust
 cd my-app
@@ -25,187 +28,18 @@ npm start
 
 _([npx](https://medium.com/@maybekatz/introducing-npx-an-npm-package-runner-55f7d4bd282b) comes with npm 5.2+ and higher, see [instructions for older npm versions](https://gist.github.com/gaearon/4064d3c23a77c74a3614c498a8bb1c5f))_
 
-Then open [http://localhost:3000/](http://localhost:3000/) to see your app.<br>
+Then open [http://localhost:3000/](http://localhost:3000/) to see your app.
+
 When you’re ready to deploy to production, create a minified bundle with `npm run build`.
 
 <p align='center'>
 <img src='https://cdn.rawgit.com/facebook/create-react-app/27b42ac/screencast.svg' width='600' alt='npm start'>
 </p>
 
-### Get Started Immediately
-
-You **don’t** need to install or configure tools like Webpack or Babel.<br>
-They are preconfigured and hidden so that you can focus on the code.
-
-Just create a project, and you’re good to go.
-
-## Creating an App
-
-**You’ll need to have Node 8.10.0 or later on your local development machine** (but it’s not required on the server). You can use [nvm](https://github.com/creationix/nvm#installation) (macOS/Linux) or [nvm-windows](https://github.com/coreybutler/nvm-windows#node-version-manager-nvm-for-windows) to easily switch Node versions between different projects.
-
-To create a new app, you may choose one of the following methods:
-
-### npx
-
-```sh
-npx create-react-app my-app
-```
-
-_([npx](https://medium.com/@maybekatz/introducing-npx-an-npm-package-runner-55f7d4bd282b) comes with npm 5.2+ and higher, see [instructions for older npm versions](https://gist.github.com/gaearon/4064d3c23a77c74a3614c498a8bb1c5f))_
-
-### npm
-
-```sh
-npm init react-app my-app
-```
-
-_`npm init <initializer>` is available in npm 6+_
-
-### Yarn
-
-```sh
-yarn create react-app my-app
-```
-
-_`yarn create` is available in Yarn 0.25+_
-
-It will create a directory called `my-app` inside the current folder.<br>
-Inside that directory, it will generate the initial project structure and install the transitive dependencies:
-
-```
-my-app
-├── README.md
-├── node_modules
-├── package.json
-├── .gitignore
-├── public
-│   ├── favicon.ico
-│   ├── index.html
-│   └── manifest.json
-└── src
-    ├── App.css
-    ├── App.js
-    ├── App.test.js
-    ├── App.rs
-    ├── index.css
-    ├── index.js
-    ├── logo.svg
-    └── serviceWorker.js
-```
-
-No configuration or complicated folder structures, just the files you need to build your app.<br>
-Once the installation is done, you can open your project folder:
-
-```sh
-cd my-app
-```
-
-Inside the newly created project, you can run some built-in commands:
-
-### `npm start` or `yarn start`
-
-Runs the app in development mode.<br>
-Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
-
-The page will automatically reload if you make changes to the code.<br>
-You will see the build errors and lint warnings in the console.
-
-<p align='center'>
-<img src='https://cdn.rawgit.com/marionebl/create-react-app/9f62826/screencast-error.svg' width='600' alt='Build errors'>
-</p>
-
-### `npm test` or `yarn test`
-
-Runs the test watcher in an interactive mode.<br>
-By default, runs tests related to files changed since the last commit.
-
-[Read more about testing.](https://facebook.github.io/create-react-app/docs/running-tests)
-
-### `npm run build` or `yarn build`
-
-Builds the app for production to the `build` folder.<br>
-It correctly bundles React in production mode and optimizes the build for the best performance.
-
-The build is minified and the filenames include the hashes.<br>
-
-Your app is ready to be deployed.
-
-## User Guide
-
-You can find detailed instructions on using Create React App and many tips in [its documentation](https://facebook.github.io/create-react-app/).
-
-## How to Update to New Versions?
-
-Please refer to the [User Guide](https://facebook.github.io/create-react-app/docs/updating-to-new-releases) for this and other information.
-
-## Philosophy
-
-- **One Dependency:** There is just one build dependency. It uses Webpack, Babel, ESLint, and other amazing projects, but provides a cohesive curated experience on top of them.
-
-- **No Configuration Required:** You don't need to configure anything. A reasonably good configuration of both development and production builds is handled for you so you can focus on writing code.
-
-- **No Lock-In:** You can “eject” to a custom setup at any time. Run a single command, and all the configuration and build dependencies will be moved directly into your project, so you can pick up right where you left off.
-
-## What’s Included?
-
-Your environment will have everything you need to build a modern single-page React app:
-
-- React, JSX, ES6, TypeScript and Flow syntax support.
-- Language extras beyond ES6 like the object spread operator.
-- Autoprefixed CSS, so you don’t need `-webkit-` or other prefixes.
-- A fast interactive unit test runner with built-in support for coverage reporting.
-- A live development server that warns about common mistakes.
-- A build script to bundle JS, CSS, and images for production, with hashes and sourcemaps.
-- An offline-first [service worker](https://developers.google.com/web/fundamentals/getting-started/primers/service-workers) and a [web app manifest](https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/), meeting all the [Progressive Web App](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app) criteria. (_Note: Using the service worker is opt-in as of `react-scripts@2.0.0` and higher_)
-- Hassle-free updates for the above tools with a single dependency.
-
-Check out [this guide](https://github.com/nitishdayal/cra_closer_look) for an overview of how these tools fit together.
-
-The tradeoff is that **these tools are preconfigured to work in a specific way**. If your project needs more customization, you can ["eject"](https://facebook.github.io/create-react-app/docs/available-scripts#npm-run-eject) and customize it, but then you will need to maintain this configuration.
-
-## Popular Alternatives
-
-Create React App is a great fit for:
-
-- **Learning React** in a comfortable and feature-rich development environment.
-- **Starting new single-page React applications.**
-- **Creating examples** with React for your libraries and components.
-
-Here are few common cases where you might want to try something else:
-
-- If you want to **try React** without hundreds of transitive build tool dependencies, consider [using a single HTML file or an online sandbox instead](https://reactjs.org/docs/try-react.html).
-
-- If you need to **integrate React code with a server-side template framework** like Rails, Django or Symfony, or if you’re **not building a single-page app**, consider using [nwb](https://github.com/insin/nwb), or [Neutrino](https://neutrino.js.org/) which are more flexible. For Rails specifically, you can use [Rails Webpacker](https://github.com/rails/webpacker). For Symfony, try [Symfony's Webpack Encore](https://symfony.com/doc/current/frontend/encore/reactjs.html).
-
-- If you need to **publish a React component**, [nwb](https://github.com/insin/nwb) can [also do this](https://github.com/insin/nwb#react-components-and-libraries), as well as [Neutrino's react-components preset](https://neutrino.js.org/packages/react-components/).
-
-- If you want to do **server rendering** with React and Node.js, check out [Next.js](https://github.com/zeit/next.js/) or [Razzle](https://github.com/jaredpalmer/razzle). Create React App is agnostic of the backend, and just produces static HTML/JS/CSS bundles.
-
-- If your website is **mostly static** (for example, a portfolio or a blog), consider using [Gatsby](https://www.gatsbyjs.org/) instead. Unlike Create React App, it pre-renders the website into HTML at the build time.
-
-- Finally, if you need **more customization**, check out [Neutrino](https://neutrino.js.org/) and its [React preset](https://neutrino.js.org/packages/react/).
-
-All of the above tools can work with little to no configuration.
-
-If you prefer configuring the build yourself, [follow this guide](https://reactjs.org/docs/add-react-to-an-existing-app.html).
-
-## Contributing
-
-We'd love to have your helping hand on `create-react-app`! See [CONTRIBUTING.md](CONTRIBUTING.md) for more information on what we're looking for and how to get started.
-
-## React Native
-
-Looking for something similar, but for React Native?<br>
-Check out [Expo CLI](https://github.com/expo/expo-cli).
-
-## Acknowledgements
-
-We are grateful to the authors of existing related projects for their ideas and collaboration:
-
-- [@eanplatter](https://github.com/eanplatter)
-- [@insin](https://github.com/insin)
-- [@mxstbr](https://github.com/mxstbr)
+## Vision
 
-## License
+The following articles inspired the effort to combine rust, React, and WebAssembly:
 
-Create React App is open source software [licensed as MIT](https://github.com/facebook/create-react-app/blob/master/LICENSE).
+- https://users.rust-lang.org/t/native-webassembly-loader-for-webpack/14407
+- https://github.com/yamafaktory/rust-wasm-webpack
+- https://www.hellorust.com/demos/add/index.html
diff --git a/react.md b/react.md
new file mode 100644
index 00000000000..0010466c988
--- /dev/null
+++ b/react.md
@@ -0,0 +1,179 @@
+# React Default Documentation
+
+## Get Started Immediately
+
+You **don’t** need to install or configure tools like Webpack or Babel.<br>
+They are preconfigured and hidden so that you can focus on the code.
+
+Just create a project, and you’re good to go.
+
+## Creating an App
+
+**You’ll need to have Node 8.10.0 or later on your local development machine** (but it’s not required on the server). You can use [nvm](https://github.com/creationix/nvm#installation) (macOS/Linux) or [nvm-windows](https://github.com/coreybutler/nvm-windows#node-version-manager-nvm-for-windows) to easily switch Node versions between different projects.
+
+To create a new app, you may choose one of the following methods:
+
+### npx
+
+```sh
+npx create-react-app my-app
+```
+
+_([npx](https://medium.com/@maybekatz/introducing-npx-an-npm-package-runner-55f7d4bd282b) comes with npm 5.2+ and higher, see [instructions for older npm versions](https://gist.github.com/gaearon/4064d3c23a77c74a3614c498a8bb1c5f))_
+
+### npm
+
+```sh
+npm init react-app my-app
+```
+
+_`npm init <initializer>` is available in npm 6+_
+
+### Yarn
+
+```sh
+yarn create react-app my-app
+```
+
+_`yarn create` is available in Yarn 0.25+_
+
+It will create a directory called `my-app` inside the current folder.<br>
+Inside that directory, it will generate the initial project structure and install the transitive dependencies:
+
+```
+my-app
+├── README.md
+├── node_modules
+├── package.json
+├── .gitignore
+├── public
+│   ├── favicon.ico
+│   ├── index.html
+│   └── manifest.json
+└── src
+    ├── App.css
+    ├── App.js
+    ├── App.test.js
+    ├── App.rs
+    ├── index.css
+    ├── index.js
+    ├── logo.svg
+    └── serviceWorker.js
+```
+
+No configuration or complicated folder structures, just the files you need to build your app.<br>
+Once the installation is done, you can open your project folder:
+
+```sh
+cd my-app
+```
+
+Inside the newly created project, you can run some built-in commands:
+
+### `npm start` or `yarn start`
+
+Runs the app in development mode.<br>
+Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
+
+The page will automatically reload if you make changes to the code.<br>
+You will see the build errors and lint warnings in the console.
+
+<p align='center'>
+<img src='https://cdn.rawgit.com/marionebl/create-react-app/9f62826/screencast-error.svg' width='600' alt='Build errors'>
+</p>
+
+### `npm test` or `yarn test`
+
+Runs the test watcher in an interactive mode.<br>
+By default, runs tests related to files changed since the last commit.
+
+[Read more about testing.](https://facebook.github.io/create-react-app/docs/running-tests)
+
+### `npm run build` or `yarn build`
+
+Builds the app for production to the `build` folder.<br>
+It correctly bundles React in production mode and optimizes the build for the best performance.
+
+The build is minified and the filenames include the hashes.<br>
+
+Your app is ready to be deployed.
+
+## User Guide
+
+You can find detailed instructions on using Create React App and many tips in [its documentation](https://facebook.github.io/create-react-app/).
+
+## How to Update to New Versions?
+
+Please refer to the [User Guide](https://facebook.github.io/create-react-app/docs/updating-to-new-releases) for this and other information.
+
+## Philosophy
+
+- **One Dependency:** There is just one build dependency. It uses Webpack, Babel, ESLint, and other amazing projects, but provides a cohesive curated experience on top of them.
+
+- **No Configuration Required:** You don't need to configure anything. A reasonably good configuration of both development and production builds is handled for you so you can focus on writing code.
+
+- **No Lock-In:** You can “eject” to a custom setup at any time. Run a single command, and all the configuration and build dependencies will be moved directly into your project, so you can pick up right where you left off.
+
+## What’s Included?
+
+Your environment will have everything you need to build a modern single-page React app:
+
+- React, JSX, ES6, TypeScript and Flow syntax support.
+- Language extras beyond ES6 like the object spread operator.
+- Autoprefixed CSS, so you don’t need `-webkit-` or other prefixes.
+- A fast interactive unit test runner with built-in support for coverage reporting.
+- A live development server that warns about common mistakes.
+- A build script to bundle JS, CSS, and images for production, with hashes and sourcemaps.
+- An offline-first [service worker](https://developers.google.com/web/fundamentals/getting-started/primers/service-workers) and a [web app manifest](https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/), meeting all the [Progressive Web App](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app) criteria. (_Note: Using the service worker is opt-in as of `react-scripts@2.0.0` and higher_)
+- Hassle-free updates for the above tools with a single dependency.
+
+Check out [this guide](https://github.com/nitishdayal/cra_closer_look) for an overview of how these tools fit together.
+
+The tradeoff is that **these tools are preconfigured to work in a specific way**. If your project needs more customization, you can ["eject"](https://facebook.github.io/create-react-app/docs/available-scripts#npm-run-eject) and customize it, but then you will need to maintain this configuration.
+
+## Popular Alternatives
+
+Create React App is a great fit for:
+
+- **Learning React** in a comfortable and feature-rich development environment.
+- **Starting new single-page React applications.**
+- **Creating examples** with React for your libraries and components.
+
+Here are few common cases where you might want to try something else:
+
+- If you want to **try React** without hundreds of transitive build tool dependencies, consider [using a single HTML file or an online sandbox instead](https://reactjs.org/docs/try-react.html).
+
+- If you need to **integrate React code with a server-side template framework** like Rails, Django or Symfony, or if you’re **not building a single-page app**, consider using [nwb](https://github.com/insin/nwb), or [Neutrino](https://neutrino.js.org/) which are more flexible. For Rails specifically, you can use [Rails Webpacker](https://github.com/rails/webpacker). For Symfony, try [Symfony's Webpack Encore](https://symfony.com/doc/current/frontend/encore/reactjs.html).
+
+- If you need to **publish a React component**, [nwb](https://github.com/insin/nwb) can [also do this](https://github.com/insin/nwb#react-components-and-libraries), as well as [Neutrino's react-components preset](https://neutrino.js.org/packages/react-components/).
+
+- If you want to do **server rendering** with React and Node.js, check out [Next.js](https://github.com/zeit/next.js/) or [Razzle](https://github.com/jaredpalmer/razzle). Create React App is agnostic of the backend, and just produces static HTML/JS/CSS bundles.
+
+- If your website is **mostly static** (for example, a portfolio or a blog), consider using [Gatsby](https://www.gatsbyjs.org/) instead. Unlike Create React App, it pre-renders the website into HTML at the build time.
+
+- Finally, if you need **more customization**, check out [Neutrino](https://neutrino.js.org/) and its [React preset](https://neutrino.js.org/packages/react/).
+
+All of the above tools can work with little to no configuration.
+
+If you prefer configuring the build yourself, [follow this guide](https://reactjs.org/docs/add-react-to-an-existing-app.html).
+
+## Contributing
+
+We'd love to have your helping hand on `create-react-app`! See [CONTRIBUTING.md](CONTRIBUTING.md) for more information on what we're looking for and how to get started.
+
+## React Native
+
+Looking for something similar, but for React Native?<br>
+Check out [Expo CLI](https://github.com/expo/expo-cli).
+
+## Acknowledgements
+
+We are grateful to the authors of existing related projects for their ideas and collaboration:
+
+- [@eanplatter](https://github.com/eanplatter)
+- [@insin](https://github.com/insin)
+- [@mxstbr](https://github.com/mxstbr)
+
+## License
+
+Create React App is open source software [licensed as MIT](https://github.com/facebook/create-react-app/blob/master/LICENSE).

From 74592726cf7900c5ce5b4d05fa55e25dcd15802a Mon Sep 17 00:00:00 2001
From: Thomas Horrobin <thomasroberthorrobin@gmail.com>
Date: Wed, 20 Feb 2019 14:43:39 +0100
Subject: [PATCH 42/42] Update README.md

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index de64b5720fe..5b688f4f5cc 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
-# Create React App  (Rust) [![Build Status](https://travis-ci.org/facebook/create-react-app.svg?branch=master)](https://travis-ci.org/facebook/create-react-app) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-green.svg)](https://github.com/facebook/create-react-app/pulls)
+# create-react-app with support for Rust [![Build Status](https://travis-ci.org/facebook/create-react-app.svg?branch=master)](https://travis-ci.org/facebook/create-react-app) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-green.svg)](https://github.com/facebook/create-react-app/pulls)
 
-Create React apps with support for WebAssembly/Rust with no build configuration.
+This project is a fork of Facebook's [create-react-app](https://facebook.github.io/create-react-app/) with support for Rust that compiles to WebAssembly.
 
 - [Creating an App](#creating-an-app) – How to create a new app.
 - [User Guide](https://facebook.github.io/create-react-app/) – How to develop apps bootstrapped with Create React App.
 
-Create React App works on macOS, Windows, and Linux. However Rust tools may behave diferently on Windows in certain cercumstances.
+Create React App works on macOS, Windows, and Linux. However Rust tools may behave diferently on Windows in certain circumstances.
 
 If something doesn’t work, please [file an issue](https://github.com/facebook/create-react-app/issues/new).