mod-build 3.6.31 → 3.6.32-beta.2

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/gulp-tasks/build.js +4 -4
  2. package/gulp-tasks/copy-resources-to-dist.js +6 -0
  3. package/gulp-tasks/grab-cdn.js +9 -0
  4. package/gulp-tasks/tasks.js +12 -0
  5. package/package.json +1 -1
package/gulp-tasks/build.js CHANGED
@@ -5,15 +5,15 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
5
5
  var sequenceOpts;
6
6
 
7
7
  if (siteData.useTypescript) {
8
- sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'templates', 'styles', 'compile-prod', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'brand', 'cache-bust', 'build-stat'];
8
+ sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'templates', 'styles', 'compile-prod', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'brand', 'cache-bust', 'copy-resources-to-dist', 'build-stat'];
9
9
  } else if (siteData.isWhiteLabel) {
10
10
  if (siteData.isQSPage) {
11
- sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'templates', 'styles', 'copy-videos', 'grab-theme-json', 'combine-files', 'grab-images', 'copy-json', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'brand', 'copy-files-to-build-path', 'cache-bust', 'grab-tooltips-json', 'build-stat'];
11
+ sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'templates', 'styles', 'copy-videos', 'grab-theme-json', 'combine-files', 'grab-images', 'copy-json', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'brand', 'copy-files-to-build-path', 'cache-bust', 'grab-tooltips-json', 'copy-resources-to-dist', 'build-stat'];
12
12
  } else {
13
- sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'templates', 'styles', 'copy-videos', 'combine-files', 'grab-images', 'js-lint', 'html-min','grab-global-images', 'css-min', 'js-min', 'img-min', 'extras', 'brand', 'cache-bust', 'grab-tooltips-json', 'build-stat'];
13
+ sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'templates', 'styles', 'copy-videos', 'combine-files', 'grab-images', 'js-lint', 'html-min','grab-global-images', 'css-min', 'js-min', 'img-min', 'extras', 'brand', 'cache-bust', 'grab-tooltips-json', 'copy-resources-to-dist', 'build-stat'];
14
14
  }
15
15
  } else {
16
- sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'templates', 'styles', 'copy-videos', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'brand', 'cache-bust', 'build-stat'];
16
+ sequenceOpts = ['clean', 'grab-cdn', 'grab-shared-components', 'grab-shared-scripts', 'templates', 'styles', 'copy-videos', 'js-lint', 'html-min', 'css-min', 'js-min', 'img-min', 'extras', 'brand', 'cache-bust', 'copy-resources-to-dist', 'build-stat'];
17
17
  }
18
18
 
19
19
  runSequence(...sequenceOpts, function() {
package/gulp-tasks/copy-resources-to-dist.js ADDED
@@ -0,0 +1,6 @@
1
+ module.exports = function (gulp, siteSettings) {
2
+ return function () {
3
+ return gulp.src(siteSettings.srcFolder + '/resources/**/')
4
+ .pipe(gulp.dest(siteSettings.distFolder + '/resources/'));
5
+ };
6
+ };
package/gulp-tasks/grab-cdn.js CHANGED
@@ -33,6 +33,15 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
33
33
  '/templates/scripts/trusted-form.html': ['/templates/scripts/', 'trusted-form.html']
34
34
  };
35
35
 
36
+ // grab footer modals and place under the resources
37
+ Object.assign(externalResources, {
38
+ '/templates/modals/about/': ['/resources/templates/modals/about/', 'index.html'],
39
+ '/templates/modals/privacy/': ['/resources/templates/modals/privacy/', 'index.html'],
40
+ '/templates/modals/terms/': ['/resources/templates/modals/terms/', 'index.html'],
41
+ '/templates/modals/contact-us/': ['/resources/templates/modals/contact-us/', 'index.html'],
42
+ '/templates/modals/faq/': ['/resources/templates/modals/faq/', 'index.html']
43
+ })
44
+
36
45
  Object.assign(externalResources, {'/templates/scripts/jornaya.html': ['/templates/scripts/', 'jornaya.html']});
37
46
 
38
47
  if (isModWhiteLabel || domainHasModernize) {
package/gulp-tasks/tasks.js CHANGED
@@ -418,6 +418,18 @@ module.exports = function() {
418
418
 
419
419
  return require(opts.gulpTasksFolderPath + '/grab-tooltips-json')(opts.gulp, opts.gulpPlugins, opts.gulpSettings, opts.siteData);
420
420
  }
421
+ },
422
+
423
+ // copy resources directory into dist
424
+ 'copy-resources-to-dist': {
425
+ subtasks: [],
426
+ func: function(opts) {
427
+ if ('undefined' === typeof opts.gulpTasksFolderPath) {
428
+ opts.gulpTasksFolderPath = '.';
429
+ }
430
+
431
+ return require(opts.gulpTasksFolderPath + '/copy-resources-to-dist')(opts.gulp, opts.gulpSettings);
432
+ }
421
433
  },
422
434
 
423
435
  // Create a build
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "mod-build",
3
- "version": "3.6.31",
3
+ "version": "3.6.32-beta.2",
4
4
  "description": "Share components for S3 sites.",
5
5
  "scripts": {
6
6
  "test": "echo \"Error: no test specified\" && exit 1"