Make updates

Author: mgattozzi

src/wasm-pack/initialize.md

@@ -3,7 +3,7 @@
 Now that we've installed all of our tools and setup our npm account we can actually start coding!
 We'll be writing up a small crate that adds two numbers and outputs the numbers. While this will
 be a simple example, we're really trying to focus on how to use wasm-pack. You'll be provided links
-to other resources so you can make more complicated code to package and ship to npm!
+to other resources so you can make more complicated code to package and ship them to npm!
 
 Let's get started then! First off run this command to create our project:
 

src/wasm-pack/introduction.md

@@ -1,9 +1,10 @@
 # Introduction
 
-`wasm-pack` is a brand new tool designed to make packaging up wasm binaries and distributing them
-on npm easy to do. We can't necessarily distribute Rust code to developers directly and expect them
-to build it from scratch. npm is about installing the packages and importing them, not also
-compiling them. With wasm though it's not a problem. Once it's compiled it's all good to go.
+`wasm-pack` is a brand new tool designed to make packaging up binaries that include wasm (that may
+or may not have JS in them) and make publishing them on npm easy to do. We can't necessarily
+distribute Rust code to developers directly and expect them
+to build it from scratch. npm is used to install packages for frontend work but it doesn't know how
+to compile Rust! With wasm though it's not a problem. Once it's compiled it's all good to go.
 However, getting it ready to be distributed, packaging it up properly for npm, and then sending it
 to npm can be a bit of a hassle. `wasm-pack` is here to make that easier.
 

src/wasm-pack/run-the-code.md

@@ -21,14 +21,17 @@ Now we need to create a `package.json` file that looks like this:
     "webpack": "^4.0.1",
     "webpack-cli": "^2.0.10",
     "webpack-dev-server": "^3.1.0"
+  }
 }
 ```
 
 where `MYSCOPE` is whatever you used before. You can expand this to be a more complete file but
 we're really just trying to verify that this works!
 
 Next up we'll need to create a small webpack configuration so that we can use the
-`webpack-dev-server` to serve the wasm file properly. Here's what it should look like:
+`webpack-dev-server` to serve the wasm file properly. It should be noted that webpack isn't
+a requirement. It's just what was chosen for this tutorial. You just need something to server the
+code! Here's what it should look like:
 
 ```javascript
 const path = require('path');
@@ -66,7 +69,8 @@ js.then(js => {
 });
 ```
 
-Since web pack can't load stuff synchronously yet we are using the import statement above followed
+Since web pack [can't load wasm synchronously yet](https://github.com/webpack/webpack/issues/6615)
+we are using the import statement above followed
 by the promise in order to load it properly. This is what lets us then call `alert_add`. We're
 importing from the `node_module` folder we haven't gotten yet so let's import all of our
 dependencies finally and run the example!

src/wasm-pack/rust-code.md

@@ -34,7 +34,10 @@ use wasm_bindgen::prelude::*;
 Let's step through this line by line. First up is the `proc_macro` feature. We're enabling this for
 the whole crate. What this means is that we will later tag code with an attribute and this will
 allow rust to generate code that we don't have to write by hand. In our case it'll use
-`wasm-bindgen.` This crate knows how to make code that works well with wasm so we don't have to
+`wasm-bindgen.` It should be noted that `#![feature(proc_macro)]` implies using the nightly
+compiler. This gated feature will hopefully be stabilized and landed soon so that you won't need it!
+
+`wasm-bindgen` knows how to make code that works well with wasm so we don't have to
 worry about it too much and just write rust code for the most part. If you want to know the full
 extent of it's capabilities check out the README on it's repo which can be found
 [here](https://github.com/alexcrichton/wasm-bindgen). For our purposes we need to know that if we
@@ -64,14 +67,12 @@ call `alert` to print out the results before returning the value.
 
 ```rust
 #[wasm_bindgen]
-#[no_mangle]
-pub extern fn add(a: i32, b: i32) -> i32 {
+pub fn add(a: i32, b: i32) -> i32 {
     a + b
 }
 
 #[wasm_bindgen]
-#[no_mangle]
-pub extern fn alert_add(a: i32, b: i32) -> i32 {
+pub fn alert_add(a: i32, b: i32) -> i32 {
     let c = add(a, b);
     alert(&format!("Hello from Rust! {} + {} = {}", a, b, c));
     c
@@ -106,14 +107,12 @@ extern {
 }
 
 #[wasm_bindgen]
-#[no_mangle]
-pub extern fn add(a: i32, b: i32) -> i32 {
+pub fn add(a: i32, b: i32) -> i32 {
     a + b
 }
 
 #[wasm_bindgen]
-#[no_mangle]
-pub extern fn alert_add(a: i32, b: i32) -> i32 {
+pub fn alert_add(a: i32, b: i32) -> i32 {
     let c = add(a, b);
     alert(&format!("Hello from Rust! {} + {} = {}", a, b, c));
     c

src/wasm-pack/setup.md

@@ -18,6 +18,14 @@ and make sure the binary is in your `$PATH` so you can run it.
 If you also have not installed npm already you'll need to do so! Follow the docs available on
 [npm](https://www.npmjs.com/get-npm) or install it through your package manager!
 
+To confirm you've succeeded run:
+
+```bash
+$ npm --version
+```
+
+You should see the version number pop out in your terminal if you installed it successfully!
+
 ## npm account
 
 After you have npm installed you'll need to sign up for an account on npm if you have not already