mod-build 3.6.1--beta.24 → 3.6.1--beta.25

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.
Files changed (3) hide show
  1. package/gulp-tasks/templates.js +3 -1
  2. package/package.json +1 -1
  3. package/src/data/seasons.js +0 -4
package/gulp-tasks/templates.js CHANGED
@@ -1,3 +1,5 @@
1
+ var merge = require('lodash.merge');
2
+
1
3
  module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
2
4
  // Merge site's data with shared data
3
5
  /* eslint brace-style: 0 */
@@ -17,7 +19,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
17
19
  const activeSeason = checkSeasonalVariations();
18
20
  if (activeSeason !== ''){
19
21
  if (activeSeason in siteData.seasonalVariations) {
20
- siteData = {...siteData, ...siteData.seasonalVariations[activeSeason]};
22
+ siteData = merge(siteData, siteData.seasonalVariations[activeSeason]);
21
23
  }
22
24
  }
23
25
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "mod-build",
3
- "version": "3.6.1--beta.24",
3
+ "version": "3.6.1--beta.25",
4
4
  "description": "Share components for S3 sites.",
5
5
  "scripts": {
6
6
  "test": "echo \"Error: no test specified\" && exit 1"
package/src/data/seasons.js CHANGED
@@ -2,10 +2,6 @@ var seasons = {
2
2
  "warmerWeather": {
3
3
  "firstDay": "03-14",
4
4
  "lastDay": "09-25"
5
- },
6
- "spookySeason": {
7
- "startDate": "10-01",
8
- "endDate": "10-31"
9
5
  }
10
6
  }
11
7