Update UniversalRouter to v4 (#1403)

.eslintrc.js

@@ -32,18 +32,6 @@ module.exports = {
   },
 
   rules: {
-    // `js` and `jsx` are common extensions
-    // `mjs` is for `universal-router` only, for now
-    'import/extensions': [
-      'error',
-      'always',
-      {
-        js: 'never',
-        jsx: 'never',
-        mjs: 'never',
-      },
-    ],
-
     // Not supporting nested package.json yet
     // https://github.com/benmosher/eslint-plugin-import/issues/458
     'import/no-extraneous-dependencies': 'off',

package.json

@@ -34,7 +34,7 @@
     "serialize-javascript": "^1.3.0",
     "source-map-support": "^0.4.15",
     "sqlite3": "^3.1.8",
-    "universal-router": "^3.2.0",
+    "universal-router": "^4.0.0",
     "whatwg-fetch": "^2.0.3"
   },
   "devDependencies": {

src/client.js

@@ -112,7 +112,7 @@ async function onLocationChange(location, action) {
     // and whose action method returns anything other than `undefined`.
     const route = await router.resolve({
       ...context,
-      path: location.pathname,
+      pathname: location.pathname,
       query: queryString.parse(location.search),
     });
 

src/router.js

@@ -7,10 +7,10 @@
  * LICENSE.txt file in the root directory of this source tree.
  */
 
-import Router from 'universal-router';
+import UniversalRouter from 'universal-router';
 import routes from './routes';
 
-export default new Router(routes, {
+export default new UniversalRouter(routes, {
   resolveRoute(context, params) {
     if (typeof context.route.load === 'function') {
       return context.route

src/routes/index.js

@@ -11,12 +11,12 @@
 
 // The top-level (parent) route
 const routes = {
-  path: '/',
+  path: '',
 
   // Keep in mind, routes are evaluated in order
   children: [
     {
-      path: '/',
+      path: '',
       load: () => import(/* webpackChunkName: 'home' */ './home'),
     },
     {
@@ -44,9 +44,9 @@ const routes = {
       load: () => import(/* webpackChunkName: 'admin' */ './admin'),
     },
 
-    // Wildcard routes, e.g. { path: '*', ... } (must go last)
+    // Wildcard routes, e.g. { path: '(.*)', ... } (must go last)
     {
-      path: '*',
+      path: '(.*)',
       load: () => import(/* webpackChunkName: 'not-found' */ './not-found'),
     },
   ],

src/server.js

@@ -132,7 +132,7 @@ app.get('*', async (req, res, next) => {
 
     const route = await router.resolve({
       ...context,
-      path: req.path,
+      pathname: req.path,
       query: req.query,
     });
 

tools/webpack.config.js

@@ -20,7 +20,7 @@ const isVerbose = process.argv.includes('--verbose');
 const isAnalyze =
   process.argv.includes('--analyze') || process.argv.includes('--analyse');
 
-const reScript = /\.jsx?$/;
+const reScript = /\.m?jsx?$/;
 const reStyle = /\.(css|less|scss|sss)$/;
 const reImage = /\.(bmp|gif|jpe?g|png|svg)$/;
 const staticAssetName = isDebug

yarn.lock

@@ -6035,6 +6035,10 @@ path-to-regexp@^1.7.0:
   dependencies:
     isarray "0.0.1"
 
+path-to-regexp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-2.0.0.tgz#b77a8168c2e78bc31f3d312d71b1ace97df23870"
+
 path-type@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
@@ -8170,11 +8174,11 @@ unique-string@^1.0.0:
   dependencies:
     crypto-random-string "^1.0.0"
 
-universal-router@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/universal-router/-/universal-router-3.2.0.tgz#4590ee42f55e2a08188c632070d90675bb2fa40f"
+universal-router@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/universal-router/-/universal-router-4.0.0.tgz#0768ae131d6b5f25245fe2e8d9daa382d71c4303"
   dependencies:
-    path-to-regexp "^1.7.0"
+    path-to-regexp "^2.0.0"
 
 universalify@^0.1.0:
   version "0.1.1"