refactor to modern js

smhg · Mar 21, 2019 · f0c9409 · f0c9409
1 parent 4f160a0
commit f0c9409
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/src/index.js b/src/index.js
@@ -30,18 +30,19 @@ function isLanguageOrLocale (locale) {
 }
 
 function createLocaleMiddleware (options = {}) {
-  options = Object.assign({
+  options = {
     priority: ['accept-language', 'default'],
-    requestProperty: 'locale'
-  }, options);
+    requestProperty: 'locale',
+    ...options
+  };
 
-  const lookups = Object.assign(
-    Object.keys(LOOKUP_CREATORS).reduce((result, lookup) => {
+  const lookups = {
+    ...Object.keys(LOOKUP_CREATORS).reduce((result, lookup) => {
       result[lookup] = LOOKUP_CREATORS[lookup](options[lookup]);
       return result;
     }, {}),
-    options.lookups || {}
-  );
+    ...(options.lookups || {})
+  };
 
   if (typeof options.priority === 'string') {
     options.priority = options.priority.split(/ *, */g);

diff --git a/src/lookup/default.js b/src/lookup/default.js
@@ -11,9 +11,7 @@ const createDefaultLookup = (locale = 'en_GB') => {
     throw invalidLocaleError;
   }
 
-  return () => {
-    return locale;
-  };
+  return () => locale;
 };
 
 export default createDefaultLookup;