mod-build 3.7.21 → 3.7.22-beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,8 @@
1
1
  # Changelog
2
2
 
3
+ ## 3.7.22
4
+ - Added extra conditions for `addTcpaAboveCta` and `addTcpaBelowCta` helper functions to not break when required data is not passed.
5
+
3
6
  ## 3.7.21
4
7
 
5
8
  - Added `GUTTERS` & `GUTTER_COVERS` to the `addTcpaAboveCta` and `addTcpaBelowCta` configurations.
@@ -231,16 +231,32 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
231
231
  {
232
232
  name: 'addTcpaAboveCta',
233
233
  fn: function(page) {
234
+ <<<<<<< HEAD
235
+ if (!page || !page.primary_trade) {
236
+ return false;
237
+ }
238
+ const trade = page.primary_trade.toUpperCase();
239
+ return trade === 'SOLAR' || trade === 'HOME_SECURITY' || page.isBranded;
240
+ =======
234
241
  const trade = page.primary_trade.replace(/\s+/g, '_').toUpperCase();
235
242
  return tradesWithTcpaAboveCta.includes(trade) || page.isBranded;
243
+ >>>>>>> 3a2ee56c29b203a54e38fb68c0106607adcd0e2c
236
244
  }
237
245
  },
238
246
  {
239
247
  name: 'addTcpaBelowCta',
240
248
  fn: function(page) {
249
+ <<<<<<< HEAD
250
+ if (!page || !page.primary_trade) {
251
+ return false;
252
+ }
253
+ const trade = page.primary_trade.toUpperCase();
254
+ return trade !== 'SOLAR' && trade !== 'HOME_SECURITY' && !page.isBranded;
255
+ =======
241
256
  const trade = page.primary_trade.replace(/\s+/g, '_').toUpperCase();
242
257
 
243
258
  return !tradesWithTcpaAboveCta.includes(trade) && !page.isBranded;
259
+ >>>>>>> 3a2ee56c29b203a54e38fb68c0106607adcd0e2c
244
260
  }
245
261
  }
246
262
  ];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "mod-build",
3
- "version": "3.7.21",
3
+ "version": "3.7.22-beta.1",
4
4
  "description": "Share components for S3 sites.",
5
5
  "scripts": {
6
6
  "test": "echo \"Error: no test specified\" && exit 1",