@quintype/framework 7.34.2-refactor-dfns.0 → 7.34.2-test-jsembed.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quintype/framework",
-  "version": "7.34.2-refactor-dfns.0",
+  "version": "7.34.2-test-jsembed.0",
   "description": "Libraries to help build Quintype Node.js apps",
   "main": "index.js",
   "engines": {
@@ -33,7 +33,7 @@
     "@ampproject/toolbox-optimizer": "2.8.3",
     "@grpc/grpc-js": "^1.12.5",
     "@jsdoc/salty": "^0.2.9",
-    "@quintype/amp": "^2.21.1",
+    "@quintype/amp": "^2.21.2-test-jsembed.1",
     "@quintype/backend": "^2.7.0",
     "@quintype/components": "^3.5.0",
     "@quintype/prerender-node": "^3.2.26",

package/server/handlers/isomorphic-handler.js

@@ -204,7 +204,6 @@ function createStoreFromResult(url, result, opts = {}) {
     primaryHostUrl: result.primaryHostUrl,
     isBotRequest: isBotRequest,
     lazyLoadImageMargin: opts.lazyLoadImageMargin,
-    localeModule: _.get(opts, ['localeModule'])
   };
   return createBasicStore(result, qt, opts);
 }
@@ -472,7 +471,7 @@ exports.handleIsomorphicRoute = function handleIsomorphicRoute(
 ) {
   const url = urlLib.parse(req.url, true);
 
-  function writeResponse(result, opts) {
+  function writeResponse(result) {
     const statusCode = result.httpStatusCode || 200;
 
     if (statusCode == 301 && result.data && result.data.location) {
@@ -492,7 +491,6 @@ exports.handleIsomorphicRoute = function handleIsomorphicRoute(
     const store = createStoreFromResult(url, result, {
       disableIsomorphicComponent: statusCode != 200,
       lazyLoadImageMargin,
-      localeModule: _.get(opts, ['localeModule'])
     });
 
     if (lightPages) {
@@ -555,55 +553,20 @@ exports.handleIsomorphicRoute = function handleIsomorphicRoute(
       logError(e);
       return { httpStatusCode: 500, pageType: "error" };
     })
-    .then(async (result) => {
+    .then((result) => {
       if (!result) {
         return next();
       }
-      return getStoreOpts(config).then((opts) => {
-        return new Promise((resolve) => resolve(writeResponse(result, opts)))
-          .catch((e) => {
-            logError(e);
-            res.status(500);
-            res.send(e.message);
-          })
-          .finally(() => res.end());
-      });
-    })
+      return new Promise((resolve) => resolve(writeResponse(result)))
+        .catch((e) => {
+          logError(e);
+          res.status(500);
+          res.send(e.message);
+        })
+        .finally(() => res.end());
+    });
 };
 
-async function getStoreOpts(config) {
-  const opts = {};
-  const enableTimeTranslation = _.get(config, ['pbConfig', 'general', 'enableTimeTranslation'], false);
-  if (!enableTimeTranslation) {
-    return Promise.resolve(opts);
-  }
-  const languageCode = _.get(config, ['language', 'ietf-code']);
-  try {
-    let localeModule;
-    switch (languageCode) {
-      case 'hi':
-        localeModule = require('date-fns/locale/hi');
-        break;
-      case 'ta':
-        localeModule = require('date-fns/locale/ta');
-        break;
-      case 'de':
-        localeModule = require('date-fns/locale/de');
-        break;
-      default:
-        localeModule = require('date-fns/locale/en-US');
-        break;
-    }
-    opts.localeModule = localeModule.default || localeModule;
-    return Promise.resolve(opts);
-  } catch (err) {
-    console.warn(`Falling back to en-US due to error loading locale: ${languageCode}`, err);
-    const fallbackLocale = require('date-fns/locale/en-US');
-    opts.localeModule = fallbackLocale.default || fallbackLocale;
-    return Promise.resolve(opts);
-  }
-}
-
 exports.handleStaticRoute = function handleStaticRoute(
   req,
   res,