mod-build 3.6.36 → 3.6.38

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 3.6.38
+
+- when we removed the mod-form-beta functionality in 3.6.37 — we needed to also remove the replace search in the function.
+
+## 3.6.37
+
+- removing the mod-form-beta functionality in `grab-shared-scripts` while we rename the files.
+
 ## 3.6.36
 
 - implementing fix needed for grabbing SVG sprites in our `grab-global-images` task. also removed consoles running in `grab-shared-scripts`

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

@@ -28,7 +28,7 @@ function replaceModalyticsSrc(gulp, gulpPlugins, siteSettings, siteData) {
 function replaceFootAssetScripts(gulp, gulpPlugins, siteSettings, siteData) {
   const resourcePath = isQuotePageOrUseRelativePath ? '{{#if this.nodeModulesPath}}{{this.nodeModulesPath}}{{/if}}resources/scripts' : '/resources/scripts';
   return gulp.src(siteSettings.srcFolder + '/shared-components/foot-assets/foot-assets.html')
-  .pipe(replace(/"(?:(?!"|js")[\s\S])+(modutils|mod-utils.*?)js"|"(?:(?!"|")[\s\S])+(footer\/footer-component.*?)js"|"(?:(?!"|")[\s\S])+(mod-form\/mod-form.*?)js"|"(?:(?!"|")[\s\S])+(qs-form.*?)js"|"(?:(?!"|")[\s\S])+(mod-form\/form\/mod-form.*?)js"/g, function(match) {
+  .pipe(replace(/"(?:(?!"|js")[\s\S])+(modutils|mod-utils.*?)js"|"(?:(?!"|")[\s\S])+(footer\/footer-component.*?)js"|"(?:(?!"|")[\s\S])+(mod-form\/mod-form.*?)js"|"(?:(?!"|")[\s\S])+(qs-form.*?)js"/g, function(match) {
       if (match.includes('mod-form')) {
         if (match.includes('mod-form/form')) {
           return `"${resourcePath}/mod-form/form/${fileNames.newModFormFileName}"`;
@@ -89,21 +89,18 @@ function getResource(url, config = {}, fn, fnArray) {
 
   return new Promise(resolve => {
     const file = getFileFromURL(url);
-    const doNotAddHash = ['mod-form-beta.min.js']
-    let stream = request(`${resourceURL}/${url}`)
+    request(`${resourceURL}/${url}`)
       .on('response', resp => {
         if (resp.statusCode !== 200) {
           throw new Error(`${resp.statusCode} Error while fetching ${file}`);
         }
       })
       .pipe(source(`${file}`))
-      if (!doNotAddHash.includes(file)) {
-        stream = stream.pipe(hash({
-          hashLength: 20,
-          template: file.replace(/^([^.]*)\.(.*)$/, '$1-<%= hash %>.$2')
-        }))
-      }
-      stream.pipe(tap(function(file, t) {
+      .pipe(hash({
+        hashLength: 20,
+        template: file.replace(/^([^.]*)\.(.*)$/, '$1-<%= hash %>.$2')
+      }))
+      .pipe(tap(function(file, t) {
         fileNames[config.fileName] = path.basename(file.path);
       }))
       .pipe(config.gulp.dest(`${config.siteSettings.srcFolder}/resources/${config.dest}`))
@@ -199,16 +196,6 @@ 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.36",
+  "version": "3.6.38",
   "description": "Share components for S3 sites.",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"