delete unnecessary optimize-wasm.js script, minor changes, disabled hints

MartinKavik · MartinKavik · commit 50f64b11df18 · 2020-02-10T12:36:49.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 [UNRELEASED]
 
+- Delete unnecessary `optimize-wasm.js` script.
+- [BREAKING] `wasm-pack` > `0.9.0` required.
+- `Seed` updated to `0.6.0`.
+- Minor `lib.rs` changes - removed `Clone` constraint on `Msg` and `prerendered` variable is replaced with a `Model`'s property.
+- Added `wasm_bindgen_test_configure!(run_in_browser);` into `test.rs`.
+- Disabled performance hints in `webpack.config.js`.
+
 [0.4.1]
 
 - Ignore `clippy` lint rule `must_use_candidate`.
diff --git a/README.md b/README.md
@@ -55,7 +55,7 @@ I want to show you how to create, build and host your website for free, so we wi
 
    - [wasm-pack](https://rustwasm.github.io/wasm-pack/)
 
-     - Check: `$ wasm-pack -V` => `wasm-pack 0.8.1`
+     - Check: `$ wasm-pack -V` => `wasm-pack 0.9.1`
      - Install: `$ cargo install --force wasm-pack`
 
    - [cargo-make](https://sagiegurari.github.io/cargo-make/)
diff --git a/configs/webpack.config.js b/configs/webpack.config.js
@@ -11,6 +11,10 @@ const MiniCssExtractPlugin = require("mini-css-extract-plugin");
 
 module.exports = (env, argv) => {
   return {
+    performance: {
+        // Don't break compilation because of WASM file bigger than 244 KB.
+        hints: false
+    },
     entry: {
       // Bundle root with name `app.js`.
       app: path.resolve(__dirname, "../entries/index.ts")
diff --git a/crate/Cargo.lock b/crate/Cargo.lock
diff --git a/crate/Cargo.toml b/crate/Cargo.toml
@@ -17,7 +17,7 @@ wasm-bindgen-test = "^0.3.8"
 
 [dependencies]
 wasm-bindgen = "^0.2.58"
-seed = "0.5.1"
+seed = "0.6.0"
 fixed-vec-deque = "0.1.8"
 
 [dependencies.web-sys]
@@ -31,3 +31,6 @@ features = [
 lto = true
 opt-level = 'z'
 codegen-units = 1
+
+[package.metadata.wasm-pack.profile.release]
+wasm-opt = ['-Os']
diff --git a/crate/src/lib.rs b/crate/src/lib.rs
@@ -130,8 +130,8 @@ pub fn routes(url: Url) -> Option<Msg> {
 // Window Events
 // ------ ------
 
-pub fn window_events(_: &Model) -> Vec<Listener<Msg>> {
-    vec![raw_ev(Ev::Scroll, |_| {
+pub fn window_events(_: &Model) -> Vec<EventHandler<Msg>> {
+    vec![ev(Ev::Scroll, |_| {
         // Some browsers use `document.body.scrollTop`
         // and other ones `document.documentElement.scrollTop`.
         let mut position = body().scroll_top();
@@ -149,7 +149,6 @@ pub fn window_events(_: &Model) -> Vec<Listener<Msg>> {
 //    Update
 // ------ ------
 
-#[derive(Clone)]
 pub enum Msg {
     RouteChanged(Url),
     UpdatePageTitle,
@@ -198,11 +197,9 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
 //   - https://codepoints.net/U+FE0E
 
 pub fn view(model: &Model) -> impl View<Msg> {
-    // @TODO: Setup `prerendered` properly once https://github.com/David-OConnor/seed/issues/223 is resolved
-    let prerendered = true;
     div![
         class![
-            C.fade_in => !prerendered,
+            C.fade_in => !model.in_prerendering,
             C.min_h_screen,
             C.flex,
             C.flex_col,
diff --git a/crate/src/page/home.rs b/crate/src/page/home.rs
@@ -1570,7 +1570,7 @@ pub fn view() -> impl View<Msg> {
                             C.lg__mb_48,
                             C.lg__text_50,
                         ],
-                        simple_ev(Ev::Click, Msg::ScrollToTop),
+                        ev(Ev::Click, |_| Msg::ScrollToTop),
                         span![
                             class![
                                 C.font_semibold
diff --git a/crate/src/page/partial/footer.rs b/crate/src/page/partial/footer.rs
@@ -71,7 +71,7 @@ pub fn view() -> impl View<Msg> {
             ],
             div![
                 class![C.cursor_pointer, C.h_full, C.flex, C.items_center,],
-                simple_ev(Ev::Click, Msg::ScrollToTop),
+                ev(Ev::Click, |_| Msg::ScrollToTop),
                 img![
                     class![
                         C.mt_1, C.w_12, // sm__
diff --git a/crate/src/page/partial/header.rs b/crate/src/page/partial/header.rs
@@ -169,8 +169,8 @@ pub fn view(model: &Model) -> impl View<Msg> {
                                 attrs! {
                                     At::Href => Page::Home.to_href()
                                 },
-                                simple_ev(Ev::Click, Msg::ScrollToTop),
-                                simple_ev(Ev::Click, Msg::HideMenu),
+                                ev(Ev::Click, |_| Msg::ScrollToTop),
+                                ev(Ev::Click, |_| Msg::HideMenu),
                                 "Home & Projects"
                             ]
                         ],
@@ -202,8 +202,8 @@ pub fn view(model: &Model) -> impl View<Msg> {
                                 attrs! {
                                     At::Href => Page::About.to_href()
                                 },
-                                simple_ev(Ev::Click, Msg::ScrollToTop),
-                                simple_ev(Ev::Click, Msg::HideMenu),
+                                ev(Ev::Click, |_| Msg::ScrollToTop),
+                                ev(Ev::Click, |_| Msg::HideMenu),
                                 "About"
                             ]
                         ],
@@ -225,7 +225,7 @@ pub fn view(model: &Model) -> impl View<Msg> {
                                 attrs! {
                                     At::Href => asset_path("Martin_Kavik_resume.pdf")
                                 },
-                                simple_ev(Ev::Click, Msg::HideMenu),
+                                ev(Ev::Click, |_| Msg::HideMenu),
                                 "Resume",
                                 span![class![C.text_gray_5,], ".pdf"]
                             ]
@@ -248,7 +248,7 @@ pub fn view(model: &Model) -> impl View<Msg> {
                                 attrs! {
                                     At::Href => "https://github.com/MartinKavik"
                                 },
-                                simple_ev(Ev::Click, Msg::HideMenu),
+                                ev(Ev::Click, |_| Msg::HideMenu),
                                 "GitHub",
                                 img![
                                     class![
@@ -296,8 +296,8 @@ pub fn view(model: &Model) -> impl View<Msg> {
                         attrs! {
                             At::Href => Page::Home.to_href()
                         },
-                        simple_ev(Ev::Click, Msg::ScrollToTop),
-                        simple_ev(Ev::Click, Msg::HideMenu),
+                        ev(Ev::Click, |_| Msg::ScrollToTop),
+                        ev(Ev::Click, |_| Msg::HideMenu),
                         img![
                             class![
                                 C.h_6,
@@ -341,8 +341,8 @@ pub fn view(model: &Model) -> impl View<Msg> {
                                 attrs! {
                                     At::Href => Page::Home.to_href()
                                 },
-                                simple_ev(Ev::Click, Msg::ScrollToTop),
-                                simple_ev(Ev::Click, Msg::HideMenu),
+                                ev(Ev::Click, |_| Msg::ScrollToTop),
+                                ev(Ev::Click, |_| Msg::HideMenu),
                                 "Home & Projects"
                             ]
                         ],
@@ -365,8 +365,8 @@ pub fn view(model: &Model) -> impl View<Msg> {
                                 attrs! {
                                     At::Href => Page::About.to_href()
                                 },
-                                simple_ev(Ev::Click, Msg::ScrollToTop),
-                                simple_ev(Ev::Click, Msg::HideMenu),
+                                ev(Ev::Click, |_| Msg::ScrollToTop),
+                                ev(Ev::Click, |_| Msg::HideMenu),
                                 "About"
                             ]
                         ],
@@ -441,7 +441,7 @@ pub fn view(model: &Model) -> impl View<Msg> {
                             // md__
                             C.md__hidden,
                         ],
-                        simple_ev(Ev::Click, Msg::ToggleMenu),
+                        ev(Ev::Click, |_| Msg::ToggleMenu),
                         img![
                             id!("hamburger"),
                             class![
diff --git a/crate/tests/test.rs b/crate/tests/test.rs
@@ -1,6 +1,8 @@
 extern crate wasm_bindgen_test;
 use wasm_bindgen_test::*;
 
+wasm_bindgen_test_configure!(run_in_browser);
+
 #[wasm_bindgen_test]
 fn pass() {
     assert_eq!(1, 1);
diff --git a/package.json b/package.json
@@ -8,11 +8,10 @@
     "start": "yarn generate:css_classes && webpack-dev-server --config configs/webpack.config.js -d",
     "start:release": "yarn generate:css_classes && webpack-dev-server --config configs/webpack.config.js --mode=production",
     "build": "yarn generate:css_classes && webpack --config configs/webpack.config --mode=development",
-    "build:release": "yarn generate:css_classes && webpack --config configs/webpack.config --mode=production && yarn optimize_wasm",
+    "build:release": "yarn generate:css_classes && webpack --config configs/webpack.config --mode=production",
     "build:prerender": "yarn build:release && yarn prerender",
     "serve:dist": "yarn serve -s -l 8000 dist",
     "prerender": "yarn concurrently -k -s first \"yarn serve:dist\" \"wait-on http://localhost:8000/ && react-snap\"",
-    "optimize_wasm": "node scripts/optimize_wasm.js",
     "generate:css_classes": "webpack --config configs/webpack.css_classes.config --mode=development"
   },
   "reactSnap": {
@@ -22,7 +21,6 @@
   },
   "devDependencies": {
     "@wasm-tool/wasm-pack-plugin": "1.0.1",
-    "binaryen": "^90.0.0",
     "clean-webpack-plugin": "^3.0.0",
     "concurrently": "^5.0.2",
     "copy-webpack-plugin": "^5.1.1",
diff --git a/scripts/optimize_wasm.js b/scripts/optimize_wasm.js
diff --git a/yarn.lock b/yarn.lock
