mod-build 3.6.3--beta.9 → 3.6.3--beta.11

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 (5) hide show
  1. package/CHANGELOG.md +4 -0
  2. package/gulp-tasks/grab-shared-scripts.js +48 -22
  3. package/package.json +3 -2
  4. package/src/templates/_partials/scripts/analytics.html +9 -6
  5. package/src/templates/_partials/scripts/vwo-redirect-callback.html +12 -7
package/CHANGELOG.md CHANGED
@@ -1,5 +1,9 @@
1
1
  # Changelog
2
2
 
3
+ ## 3.6.5
4
+
5
+ - Adding a new `grab-shared-scripts` gulp task grab the most recent version from `mod-analytics`. It will copy this version into the site's `resources/scripts/mod-alytics` folder & then update the src in the `head` shared component. Also updated `cache-bust` to ignore this file on build.
6
+
3
7
  ## 3.6.3
4
8
 
5
9
  - Updating `cache-bust` gulp task to use dashes instead of a period. For example, cached files will now be `home-51fbcbac.js` instead of `home.51fbcbac.js`
package/gulp-tasks/grab-shared-scripts.js CHANGED
@@ -1,6 +1,8 @@
1
1
  var request = require('request');
2
2
  var source = require('vinyl-source-stream');
3
3
  var replace = require('gulp-replace');
4
+ var hash = require('gulp-hash');
5
+ var filenames = require("gulp-filenames");
4
6
 
5
7
  function replaceModalyticsSrcInHead(gulp, gulpPlugins, siteSettings, siteData, result) {
6
8
  if (siteData.siteData && siteData.siteData.isQuotePage === true) {
@@ -16,29 +18,53 @@ function replaceModalyticsSrcInHead(gulp, gulpPlugins, siteSettings, siteData, r
16
18
 
17
19
  function copyCurrentModalytics(gulp, gulpPlugins, siteSettings, siteData) {
18
20
  return new Promise(resolve => {
19
- request(`https://${siteSettings.nodeEnv}/quote/resources/mod-alytics/mod-alytics-version.txt`, function(err, resp, body) {
20
- if (resp.statusCode !== 200) {
21
- throw new Error(`${resp.statusCode}: Error while fetching mod-alytics-version.txt`);
22
- }
23
- resolve(body.replace(/\s+/g, ''));
24
- })
25
-
21
+ request(`https://${siteSettings.nodeEnv}/quote/resources/mod-alytics/modalytics.min.js`)
22
+ .on('response', resp => {
23
+ if (resp.statusCode !== 200) {
24
+ throw new Error(`${resp.statusCode} Error while fetching modalytics.min.js`);
25
+ }
26
+ })
27
+ .pipe(source('modalytics.min.js'))
28
+ .pipe(hash({
29
+ hashLength: 20,
30
+ template: 'modalytics-<%= hash %>.min.js'
31
+ }))
32
+ // .pipe(gulp.dest(`${siteSettings.srcFolder}/resources/scripts/mod-alytics`))
33
+ .on('finish', function(e){
34
+
35
+ console.log('finished!');
36
+ });
26
37
  })
27
- .then((result) => {
28
- return new Promise(resolve => {
29
- request(`https://${siteSettings.nodeEnv}/quote/resources/mod-alytics/${result}`)
30
- .on('response', resp => {
31
- if (resp.statusCode !== 200) {
32
- throw new Error(`${resp.statusCode} Error while fetching ${result}`);
33
- } else {
34
- replaceModalyticsSrcInHead(gulp, gulpPlugins, siteSettings, siteData, result);
35
- }
36
- })
37
- .pipe(source(result))
38
- .pipe(gulp.dest(`${siteSettings.srcFolder}/resources/scripts/mod-alytics`))
39
- .on('finish', resolve);
40
- });
41
- });
38
+ // .then((result) => {
39
+ // // copy over main file
40
+ // return new Promise(resolve => {
41
+ // request(`https://${siteSettings.nodeEnv}/quote/resources/mod-alytics/${result}`)
42
+ // .on('response', resp => {
43
+ // if (resp.statusCode !== 200) {
44
+ // throw new Error(`${resp.statusCode} Error while fetching ${result}`);
45
+ // } else {
46
+ // replaceModalyticsSrcInHead(gulp, gulpPlugins, siteSettings, siteData, result);
47
+ // }
48
+ // })
49
+ // .pipe(source(result))
50
+ // .pipe(gulp.dest(`${siteSettings.srcFolder}/resources/scripts/mod-alytics`))
51
+ // resolve(result)
52
+ // });
53
+ // })
54
+ // .then((result) => {
55
+ // // copy over source map
56
+ // return new Promise(resolve => {
57
+ // request(`https://${siteSettings.nodeEnv}/quote/resources/mod-alytics/${result}.map`)
58
+ // .on('response', resp => {
59
+ // if (resp.statusCode !== 200) {
60
+ // throw new Error(`${resp.statusCode} Error while fetching ${result}`);
61
+ // }
62
+ // })
63
+ // .pipe(source(`${result}.map`))
64
+ // .pipe(gulp.dest(`${siteSettings.srcFolder}/resources/scripts/mod-alytics`))
65
+ // .on('finish', resolve);
66
+ // });
67
+ // });
42
68
  }
43
69
 
44
70
  module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "mod-build",
3
- "version": "3.6.3--beta.9",
3
+ "version": "3.6.3--beta.11",
4
4
  "description": "Share components for S3 sites.",
5
5
  "scripts": {
6
6
  "test": "echo \"Error: no test specified\" && exit 1"
@@ -23,8 +23,10 @@
23
23
  "gulp-csso": "^3.0.0",
24
24
  "gulp-eslint": "^5.0.0",
25
25
  "gulp-eslint-threshold": "^0.1.1",
26
+ "gulp-filenames": "^4.0.1",
26
27
  "gulp-filter": "^5.0.0",
27
28
  "gulp-handlebars-file-include": "^1.0.0",
29
+ "gulp-hash": "^4.2.2",
28
30
  "gulp-htmlmin": "^3.0.0",
29
31
  "gulp-if": "^2.0.2",
30
32
  "gulp-imagemin": "^3.2.0",
@@ -52,7 +54,6 @@
52
54
  "jquery": "^3.2.1",
53
55
  "lodash": "^4.17.15",
54
56
  "lodash.merge": "^4.6.2",
55
- "node-fetch": "^2.6.7",
56
57
  "nouislider": "^10.1.0",
57
58
  "path": "^0.12.7",
58
59
  "request": "^2.88.0",
package/src/templates/_partials/scripts/analytics.html CHANGED
@@ -1,12 +1,15 @@
1
1
  <script>
2
2
  {{ fileInclude 'node_modules/mod-build/src/scripts/has-qs-params.js' }}
3
3
  {{ fileInclude 'node_modules/mod-build/src/scripts/url-cleaner.js' }}
4
- {{ fileInclude 'node_modules/mod-build/src/scripts/vendor/heap-tracking.js' }}
5
- if(window.Modalytics) {
6
- Modalytics.init();
7
- } else {
8
- {{ fileInclude 'node_modules/mod-build/src/scripts/vendor/heap-addeventproperties-identify.js' }}
9
- }
4
+ {{#unless noheap}}
5
+ {{ fileInclude 'node_modules/mod-build/src/scripts/vendor/heap-tracking.js' }}
6
+ if(window.Modalytics) {
7
+ Modalytics.init();
8
+ } else {
9
+ {{ fileInclude 'node_modules/mod-build/src/scripts/vendor/heap-addeventproperties-identify.js' }}
10
+ }
11
+ {{/unless}}
12
+
10
13
  {{#unless nogtm}}
11
14
  {{ fileInclude 'node_modules/mod-build/src/scripts/vendor/google-tag-manager-head.js' }}
12
15
  {{/unless}}
package/src/templates/_partials/scripts/vwo-redirect-callback.html CHANGED
@@ -30,13 +30,18 @@
30
30
  if (!window.willRedirectionOccurByVWO) {
31
31
  clearTimeout(hardLimitTimer);
32
32
  try {
33
- {{ fileInclude 'node_modules/mod-build/src/scripts/vendor/heap-tracking.js' }}
34
- {{ fileInclude 'node_modules/mod-build/src/scripts/vendor/heap-vwo.js' }}
35
- if(window.Modalytics) {
36
- Modalytics.init();
37
- } else {
38
- {{ fileInclude 'node_modules/mod-build/src/scripts/vendor/heap-addeventproperties-identify.js' }}
39
- }
33
+ // flag to call Modalytics.initHeapVwo() method in site level js
34
+ window.initHeapVwo = true;
35
+
36
+ {{#unless noheap}}
37
+ {{ fileInclude 'node_modules/mod-build/src/scripts/vendor/heap-tracking.js' }}
38
+ {{ fileInclude 'node_modules/mod-build/src/scripts/vendor/heap-vwo.js' }}
39
+ if(window.Modalytics) {
40
+ Modalytics.init();
41
+ } else {
42
+ {{ fileInclude 'node_modules/mod-build/src/scripts/vendor/heap-addeventproperties-identify.js' }}
43
+ }
44
+ {{/unless}}
40
45
  {{#unless nogtm}}
41
46
  {{ fileInclude 'node_modules/mod-build/src/scripts/vendor/google-tag-manager-head.js' }}
42
47
  {{/unless}}