mod-build 3.6.22-beta.6 → 3.6.23--beta.1

package/gulp-tasks/grab-global-images.js

@@ -42,7 +42,7 @@ function replaceImagePath(gulp, siteSettings) {
 
 	if (images.length) {
 		images.forEach(function(image) {
-			stream = stream.pipe(replace(new RegExp(`"(?:(?!"|")[\\s\\S])+(${image})"`, 'gm'), '"/resources/images/' + image + '"'))
+			stream = stream.pipe(replace(new RegExp(`"(?:(?!"|")[\\s\\S])+(\/${image})"`, 'gm'), '"/resources/images/' + image + '"'))
 		});
 	}
 	return stream.pipe(gulp.dest(finalDestination))

package/gulp-tasks/grab-shared-scripts.js

@@ -28,13 +28,16 @@ function replaceFootAssetScripts(gulp, gulpPlugins, siteSettings, siteData) {
     .pipe(replace(/"(?:(?!"|js")[\s\S])+(modutils|mod-utils.*?)js"/, resourcePath + '/mod-utils/' + fileNames.modUtilsFileName))
     .pipe(replace(/"(?:(?!"|")[\s\S])+(footer\/footer-component.*?)js"/, resourcePath + '/footer/' + fileNames.footerComponentJsFileName))
     .pipe(replace(/"(?:(?!"|")[\s\S])+(mod-form\/mod-form.*?)js"/, resourcePath + '/mod-form/' + fileNames.modFormFileName))
+    .pipe(replace(/"(?:(?!"|")[\s\S])+(mod-form\/form\/mod-form.*?)js"/, resourcePath + '/mod-form/form/' + fileNames.newModFormFileName))
     .pipe(replace(/"(?:(?!"|")[\s\S])+(qs-form.*?)js"/, resourcePath + '/mod-form/' + fileNames.qsFormFileName))
     .pipe(gulp.dest(siteSettings.srcFolder + '/shared-components/foot-assets'));
 }
-function replaceAbandonmentJsSrc(gulp, gulpPlugins, siteSettings, siteData) {
-  const resourcePath = isQuotePageOrUseRelativePath ? 'resources/scripts/abandonment/' : '/resources/scripts/abandonment/';
+function replaceAbandonmentJsCssSrc(gulp, gulpPlugins, siteSettings, siteData) {
+  const jsResourcePath = isQuotePageOrUseRelativePath ? 'resources/scripts/abandonment/' : '/resources/scripts/abandonment/';
+  const cssResourcePath = isQuotePageOrUseRelativePath ? 'resources/styles/components/abandonment/' : '/resources/styles/components/abandonment/';
   return gulp.src(siteSettings.srcFolder + '/templates/abandonment/*.html')
-    .pipe(replace(/"(?:(?!"|")[\s\S])+(abandonment\/abandonment.*?)js"/, resourcePath + fileNames.abandonmentJsFileName))
+    .pipe(replace(/"(?:(?!"|")[\s\S])+(abandonment\/abandonment.*?)js"/, jsResourcePath + fileNames.abandonmentJsFileName))
+    .pipe(replace(/"(?:(?!"|")[\s\S])+(components\/abandonment\/abandonment.*?)css"/, cssResourcePath + fileNames.abandonmentStylesFileName))
     .pipe(gulp.dest(siteSettings.srcFolder + '/templates/abandonment'));
 }
 function replaceFooterStylesReference(gulp, gulpPlugins, siteSettings, siteData) {
@@ -73,18 +76,21 @@ function getResource(url, config = {}, fn, fnArray) {
 
   return new Promise(resolve => {
     const file = getFileFromURL(url);
-    request(`${resourceURL}/${url}`)
+    const doNotAddHash = ['mod-form-beta.min.js']
+    let stream = request(`${resourceURL}/${url}`)
       .on('response', resp => {
         if (resp.statusCode !== 200) {
           throw new Error(`${resp.statusCode} Error while fetching ${file}`);
         }
       })
       .pipe(source(`${file}`))
-      .pipe(hash({
-        hashLength: 20,
-        template: file.replace(/^([^.]*)\.(.*)$/, '$1-<%= hash %>.$2')
-      }))
-      .pipe(tap(function(file, t) {
+      if (!doNotAddHash.includes(file)) {
+        stream = stream.pipe(hash({
+          hashLength: 20,
+          template: file.replace(/^([^.]*)\.(.*)$/, '$1-<%= hash %>.$2')
+        }))
+      }
+      stream.pipe(tap(function(file, t) {
         fileNames[config.fileName] = path.basename(file.path);
       }))
       .pipe(config.gulp.dest(`${config.siteSettings.srcFolder}/resources/${config.dest}`))
@@ -140,6 +146,16 @@ const TASKS = {
     srcReplaceFn: null,
     additionalSrcReplaceFns: []
   },
+  copyAbandonmentComponentStyles: {
+    url: `shared-resources/styles/components/abandonment/abandonment.min.css`,
+    config: {
+      fileName: 'abandonmentStylesFileName',
+      dest: 'styles/components/abandonment',
+      mapUrl: null,
+    },
+    srcReplaceFn: null,
+    additionalSrcReplaceFns: []
+  },
   copyAbandonmentJs: {
     url: `shared-resources/scripts/abandonment/abandonment.min.js`,
     config: {
@@ -147,7 +163,7 @@ const TASKS = {
       dest: 'scripts/abandonment',
       mapUrl: `shared-resources/scripts/abandonment/abandonment.min.js.map`,
     },
-    srcReplaceFn: replaceAbandonmentJsSrc,
+    srcReplaceFn: replaceAbandonmentJsCssSrc,
     additionalSrcReplaceFns: []
   },
   copyFooterComponentJs: {
@@ -170,6 +186,16 @@ const TASKS = {
     srcReplaceFn: null,
     additionalSrcReplaceFns: []
   },
+  copyNewModForm: {
+    url: `mod-form/form/mod-form-beta.min.js`,
+    mapUrl: `mod-form/form/mod-form-beta.min.js.map`,
+    config: {
+      fileName: 'newModFormFileName',
+      dest: 'scripts/mod-form/form'
+    },
+    srcReplaceFn: null,
+    additionalSrcReplaceFns: []
+  },
   copyQsForm: {
     url: `mod-form/qs-form.min.js`,
     config: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mod-build",
-  "version": "3.6.22-beta.6",
+  "version": "3.6.23--beta.1",
   "description": "Share components for S3 sites.",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"