✨ Add events

Author: Anthony Du Pont

dist/highway.js

@@ -342,7 +342,7 @@ var HighwayRenderer = function () {
     this.view = view;
     this.page = _helpers2.default.getDOM(page);
     this.title = _helpers2.default.getTitle(page);
-    this.transition = new transition(view); // eslint-disable-line
+    this.transition = transition ? new transition(view) : null; // eslint-disable-line
 
     if (this.title && document.title !== this.title) {
       document.title = this.title;
@@ -898,11 +898,7 @@ var HighwayCore = function (_Emitter) {
       // An event is emitted and can be used outside of the router to run
       // additionnal code when the navigation starts. It expose the `from` and `to`
       // [router-view] elements to the user and the router state.
-      var to = this.to.view;
-      var from = this.from.view;
-      var title = this.to.title; // eslint-disable-line
-
-      this.emit('NAVIGATE_START', from, to, title, this.state);
+      this.emit('NAVIGATE_START', this.from, this.to, this.state);
 
       // We select the right method based on the mode provided in the options.
       // If no mode is provided then the `out-in` method is chosen.
@@ -913,6 +909,9 @@ var HighwayCore = function (_Emitter) {
         this[method]().then(function () {
           _this5.navigating = false;
 
+          // Same as the `NAVIGATE_START` event
+          _this5.emit('NAVIGATE_END', _this5.from, _this5.to, _this5.state);
+
           // We prepare the next navigation by replacing the `from` renderer by
           // the `to` renderer now that the pages have been swapped successfully.
           _this5.from = _this5.to;
@@ -924,9 +923,6 @@ var HighwayCore = function (_Emitter) {
             // Now scroll to anchor!
             _this5.scrollTo(_helpers2.default.getAnchor(_this5.state.url));
           }
-
-          // Same as the `NAVIGATE_START` event
-          _this5.emit('NAVIGATE_END', from, to, title, _this5.state);
         });
       }
     }
@@ -942,11 +938,17 @@ var HighwayCore = function (_Emitter) {
     value: function outIn() {
       var _this6 = this;
 
+      // Same as the `NAVIGATE_START` event
+      this.emit('NAVIGATE_OUT', this.from, this.to, this.state);
+
       // Call `out` transition
       return this.from.hide().then(function () {
         // Reset scroll position
         window.scrollTo(0, 0);
       }).then(function () {
+        // Same as the `NAVIGATE_START` event
+        _this6.emit('NAVIGATE_IN', _this6.from, _this6.to, _this6.state);
+
         // Call `in` transition
         _this6.to.show();
       });
@@ -963,11 +965,17 @@ var HighwayCore = function (_Emitter) {
     value: function inOut() {
       var _this7 = this;
 
+      // Same as the `NAVIGATE_START` event
+      this.emit('NAVIGATE_IN', this.from, this.to, this.state);
+
       // Call the `in` transition
       return this.to.show().then(function () {
         // Reset scroll position
         window.scrollTo(0, 0);
       }).then(function () {
+        // Same as the `NAVIGATE_START` event
+        _this7.emit('NAVIGATE_OUT', _this7.from, _this7.to, _this7.state);
+
         // Call the `out` transition
         _this7.from.hide();
       });
@@ -982,6 +990,10 @@ var HighwayCore = function (_Emitter) {
   }, {
     key: 'both',
     value: function both() {
+      // Same as the `NAVIGATE_START` event
+      this.emit('NAVIGATE_IN', this.from, this.to, this.state);
+      this.emit('NAVIGATE_OUT', this.from, this.to, this.state);
+
       return Promise.all([this.to.show(), this.from.hide()]).then(function () {
         // Reset scroll position
         window.scrollTo(0, 0);

dist/highway.min.js

@@ -1,7 +1,7 @@
 {
   "name": "@dogstudio/highway",
   "license": "MIT",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "main": "dist/index.js",
   "scripts": {
     "build": "webpack",
@@ -14,8 +14,5 @@
     "babel-preset-env": "^1.6.1",
     "webpack": "^4.1.1",
     "webpack-cli": "^2.0.12"
-  },
-  "dependencies": {
-    "@dogstudio/highway": "^1.1.1"
   }
 }

dist/highway.min.js.gz

@@ -1,9 +1,9 @@
 // Import Highway
-import Highway from '@dogstudio/highway';
+import Highway from 'dist/highway';
 
 // Import Renderers
-import Home from './renderers/home';
-import Page from './renderers/page';
+import Home from 'renderers/home';
+import Page from 'renderers/page';
 
 (() => {
   // Instanciate `Highway.Core` and send your custom renderers through the options.
@@ -23,12 +23,12 @@ import Page from './renderers/page';
   // In this example we listen to the `NAVIGATE_START` event from Highway that
   // occurs when a navigation starts and send a new `pageview` to Google Analytics
   // based on the `state` of Highway.
-  H.on('NAVIGATE_START', (from, to, title, state) => {
+  H.on('NAVIGATE_START', (from, to, state) => {
     if (typeof gtag !== 'undefined') {
       // eslint-disable-next-line
       gtag('config', 'GA_TRACKING_ID', {
         'page_path': state.pathname,
-        'page_title': title,
+        'page_title': to.title,
         'page_location': state.url
       });
     }

examples/basic-google-analytics/dist/index.js

@@ -1,5 +1,5 @@
 // Import Highway
-import Highway from '@dogstudio/highway';
+import Highway from 'dist/highway';
 
 // To create your custom renderer you have to extend the `Highway.Renderer` to
 // access all the required methods and to be able to call the "state" methods

examples/basic-google-analytics/package.json

@@ -1,5 +1,5 @@
 // Import Highway
-import Highway from '@dogstudio/highway';
+import Highway from 'dist/highway';
 
 // To create your custom renderer you have to extend the `Highway.Renderer` to
 // access all the required methods and to be able to call the "state" methods

examples/basic-google-analytics/src/index.js

@@ -27,6 +27,7 @@ module.exports = {
     ]
   },
   resolve: {
-    modules: ['node_modules']
+    modules: ['.', 'node_modules'],
+    extensions: ['.js']
   }
 };

examples/basic-google-analytics/src/renderers/home.js

@@ -2,10 +2,6 @@
 # yarn lockfile v1
 
 
-"@dogstudio/highway@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@dogstudio/highway/-/highway-1.1.1.tgz#cf813223a4365e8ca1e58320949c107b7c7d7155"
-
 "@sindresorhus/is@^0.7.0":
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
@@ -36,8 +32,8 @@ ajv@^4.9.1:
     json-stable-stringify "^1.0.1"
 
 ajv@^6.1.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.2.1.tgz#28a6abc493a2abe0fb4c8507acaedb43fa550671"
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.3.0.tgz#1650a41114ef00574cac10b8032d8f4c14812da7"
   dependencies:
     fast-deep-equal "^1.0.0"
     fast-json-stable-stringify "^2.0.0"
@@ -991,6 +987,10 @@ browserslist@^2.1.2:
     caniuse-lite "^1.0.30000792"
     electron-to-chromium "^1.3.30"
 
+buffer-from@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.0.0.tgz#4cb8832d23612589b0406e9e2956c17f06fdf531"
+
 buffer-xor@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
@@ -1060,8 +1060,8 @@ camelcase@^4.1.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
 
 caniuse-lite@^1.0.30000792:
-  version "1.0.30000815"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000815.tgz#3a4258e6850362185adb11b0d754a48402d35bf6"
+  version "1.0.30000819"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000819.tgz#aabee5fd15a080febab6ae5d30c9ea15f4c6d4e2"
 
 caseless@~0.12.0:
   version "0.12.0"
@@ -1199,12 +1199,12 @@ clone-stats@^1.0.0:
   resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680"
 
 clone@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.3.tgz#298d7e2231660f40c003c2ed3140decf3f53085f"
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
 
 clone@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb"
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
 
 cloneable-readable@^1.0.0:
   version "1.1.2"
@@ -1270,9 +1270,10 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
 concat-stream@^1.5.0:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.1.tgz#261b8f518301f1d834e36342b9fea095d2620a26"
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   dependencies:
+    buffer-from "^1.0.0"
     inherits "^2.0.3"
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
@@ -1533,8 +1534,8 @@ ejs@^2.3.1:
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a"
 
 electron-to-chromium@^1.3.30:
-  version "1.3.39"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.39.tgz#d7a4696409ca0995e2750156da612c221afad84d"
+  version "1.3.40"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.40.tgz#1fbd6d97befd72b8a6f921dc38d22413d2f6fddf"
 
 elegant-spinner@^1.0.1:
   version "1.0.1"
@@ -1796,8 +1797,8 @@ flow-parser@^0.*:
   resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.68.0.tgz#9cc96620a102e316a314b6bcd56205ceace862d8"
 
 flush-write-stream@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.2.tgz#c81b90d8746766f1a609a46809946c45dd8ae417"
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd"
   dependencies:
     inherits "^2.0.1"
     readable-stream "^2.0.4"
@@ -2184,8 +2185,8 @@ iconv-lite@^0.4.17:
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
 
 ieee754@^1.1.4:
-  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.9.tgz#13acbc76462de80959be14b2d4ac93b96761b195"
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.10.tgz#719a6f7b026831e64bdb838b0de1bb0029bbf716"
 
 iferr@^0.1.5:
   version "0.1.5"
@@ -2850,8 +2851,8 @@ micromatch@^2.3.7:
     regex-cache "^0.4.2"
 
 micromatch@^3.1.4, micromatch@^3.1.8:
-  version "3.1.9"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.9.tgz#15dc93175ae39e52e93087847096effc73efcf89"
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -2865,7 +2866,7 @@ micromatch@^3.1.4, micromatch@^3.1.8:
     object.pick "^1.3.0"
     regex-not "^1.0.0"
     snapdragon "^0.8.1"
-    to-regex "^3.0.1"
+    to-regex "^3.0.2"
 
 miller-rabin@^4.0.0:
   version "4.0.1"
@@ -3554,8 +3555,8 @@ recast@^0.12.5:
     source-map "~0.6.1"
 
 recast@^0.14.1:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/recast/-/recast-0.14.5.tgz#53f1f6edf7810bdfb39a25d0ff97d315bad7c314"
+  version "0.14.6"
+  resolved "https://registry.yarnpkg.com/recast/-/recast-0.14.6.tgz#11f171a3fdd09155c9156b8becc5ed2f0a68bd18"
   dependencies:
     ast-types "0.11.3"
     esprima "~4.0.0"
@@ -3698,8 +3699,8 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
 
 resolve@^1.1.6:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.6.0.tgz#0fbd21278b27b4004481c395349e7aba60a9ff5c"
   dependencies:
     path-parse "^1.0.5"
 
@@ -3832,8 +3833,8 @@ setimmediate@^1.0.4:
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
 
 sha.js@^2.4.0, sha.js@^2.4.8:
-  version "2.4.10"
-  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.10.tgz#b1fde5cd7d11a5626638a07c604ab909cfa31f9b"
+  version "2.4.11"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
@@ -4218,7 +4219,7 @@ to-regex-range@^2.1.0:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
 
-to-regex@^3.0.1:
+to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
   dependencies:
@@ -4436,8 +4437,8 @@ webpack-addons@^1.1.5:
     jscodeshift "^0.4.0"
 
 webpack-cli@^2.0.12:
-  version "2.0.12"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-2.0.12.tgz#64db876d044f03d8d6544281854b71a3a3c77dd3"
+  version "2.0.13"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-2.0.13.tgz#6e2bd9ef91345344737217e22e29001ad8537518"
   dependencies:
     chalk "^2.3.2"
     cross-spawn "^6.0.5"
@@ -4473,8 +4474,8 @@ webpack-sources@^1.0.1, webpack-sources@^1.1.0:
     source-map "~0.6.1"
 
 webpack@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.1.1.tgz#44e4d6a869dd36fdfc0b227f9bd865a4bccfd81c"
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.2.0.tgz#a4f80807651a0e611bb09609600dc266262efcc1"
   dependencies:
     acorn "^5.0.0"
     acorn-dynamic-import "^3.0.0"