amphora 8.4.2-dev.9.0 → 8.6.0

package/lib/render.js

@@ -123,16 +123,10 @@ function renderPage(uri, req, res, hrStart) {
   locals.query = req.query;
   locals.extension = extension;
 
-  log('INFO', '====INSIDE RENDER PAGE', { url: _.get(res, 'locals.url'), hostname: req.hostname });
-
   // look up page alias' component instance
   return getDBObject(uri)
-    .then(() => {
-      log('INFO', '====getdboject RESPONSE', { uri });
-      return formDataFromLayout(locals, uri)
-    })
+    .then(formDataFromLayout(locals, uri))
     .then(data => {
-      log('INFO', '====formDataFromLayout RESPONSE', { data });
       logTime(hrStart, uri);
       return data;
     })

package/lib/responses.js

@@ -364,7 +364,6 @@ function explicitError(err, res) {
  */
 function handleError(res) {
   return function (err) {
-    log('INFO', '====handleError function RESPONSE', { res, err });
     if (err.status && err.name !== 'NotFoundError') {
       // If we're in this block, the error has a defined `status` property and
       // the error should be directed out immediately

package/lib/routes.js

@@ -62,28 +62,23 @@ function addUri(req, res, next) {
  * @param {express.Router} router
  */
 function addControllerRoutes(router) {
-  try {
-    // load all controller routers
-    _.each(reservedRoutes, routeName => {
-      log('info', 'SETTING RESERVED ROUTES', { reservedRouteName: routeName });
-      let pathRouter,
-        filename = routeName + '.js',
-        controller = files.tryRequire([__dirname, routesPath, filename].join(path.sep));
+  // load all controller routers
+  _.each(reservedRoutes, routeName => {
+    let pathRouter,
+      filename = routeName + '.js',
+      controller = files.tryRequire([__dirname, routesPath, filename].join(path.sep));
 
-      // we're okay with an error occurring here because it means we're missing something important in a route
-      pathRouter = express.Router();
+    // we're okay with an error occurring here because it means we're missing something important in a route
+    pathRouter = express.Router();
 
-      // assume json or text for anything in request bodies
-      pathRouter.use(require('body-parser').json({ strict: true, type: 'application/json', limit: '50mb' }));
-      pathRouter.use(require('body-parser').text({ type: 'text/*' }));
+    // assume json or text for anything in request bodies
+    pathRouter.use(require('body-parser').json({ strict: true, type: 'application/json', limit: '50mb' }));
+    pathRouter.use(require('body-parser').text({ type: 'text/*' }));
 
-      controller(pathRouter);
+    controller(pathRouter);
 
-      router.use(`/${routeName}`, pathRouter);
-    });
-  } catch (error) {
-    log('error', 'CATCH CONTROLLER ROUTES', { error });
-  }
+    router.use(`/${routeName}`, pathRouter);
+  });
 }
 
 /**
@@ -127,7 +122,6 @@ function addCORS(site) {
 }
 
 function setRoutes(controller, router, site) {
-  log('info', 'SET ROUTES: ', { site });
   if (_.isFunction(controller.legacyController)) {
     controller.legacyController(router, render, site);
   }

package/lib/services/composer.js

@@ -55,7 +55,7 @@ function composePage(pageData, locals) {
   const layoutReference = pageData.layout,
     pageDataNoConf = references.omitPageConfiguration(pageData);
 
-  return components.get(layoutReference)
+  return components.get(layoutReference, locals)
     .then(layoutData => mapLayoutToPageData(pageDataNoConf, layoutData))
     .then(fullData => resolveComponentReferences(fullData, locals));
 }

package/lib/services/upgrade.js

@@ -189,6 +189,10 @@ function upgradeData(schemaVersion, dataVersion, ref, data, locals) {
  * @return {Promise}
  */
 function checkForUpgrade(ref, data, locals) {
+  if (locals && locals.disableUpgrades) {
+    return bluebird.resolve(data);
+  }
+
   return utils.getSchema(ref)
     .then(schema => {
       // If version does not match what's in the data

package/lib/services/upgrade.test.js

@@ -77,6 +77,19 @@ describe(_.startCase(filename), function () {
           expect(lib.upgradeData.calledOnce).to.be.true;
         });
     });
+
+    it('does not call upgradeData or getSchema if locals.disableUpgrades is true', function () {
+      let locals = {disableUpgrades: true};
+
+      sandbox.stub(lib, 'upgradeData');
+
+      return fn('site/_components/foo/instances/bar', {_version: 1, value: 'bar'}, locals)
+        .then(function () {
+          expect(lib.upgradeData.calledOnce).to.be.false;
+          expect(utils.getSchema.calledOnce).to.be.false;
+        });
+    });
+
   });
 
   describe('upgradeData', function () {

package/lib/setup.js

@@ -42,8 +42,6 @@ module.exports = function (options = {}) {
       eventBus = false
     } = options, router;
 
-    log('info', 'Testing logs setup line 45');
-
   if (sessionStore) {
     log('warn', 'Support for sessionStore will be dropped in Amphora v8');
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amphora",
-  "version": "8.4.2-dev.9.0",
+  "version": "8.6.0",
   "description": "An API mixin for Express that saves, publishes and composes data with the key-value store of your choice.",
   "main": "index.js",
   "scripts": {