mod-build 3.6.8--beta.2 → 3.6.8--beta.3

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 (2) hide show
  1. package/gulp-tasks/grab-shared-scripts.js +23 -28
  2. package/package.json +1 -2
package/gulp-tasks/grab-shared-scripts.js CHANGED
@@ -1,7 +1,6 @@
1
1
  var request = require('request');
2
2
  var source = require('vinyl-source-stream');
3
3
  var replace = require('gulp-replace');
4
- var debug = require('gulp-debug');
5
4
  var hash = require('gulp-hash');
6
5
  var tap = require('gulp-tap');
7
6
  var path = require('path');
@@ -51,28 +50,27 @@ function replaceFooterComponentJsSrc(gulp, gulpPlugins, siteSettings, siteData)
51
50
  function replaceFooterStylesReference(gulp, gulpPlugins, siteSettings, siteData) {
52
51
  if (siteData.siteData && siteData.siteData.isQuotePage === true || siteData.siteData && siteData.siteData.useRelativePathForResources === true) {
53
52
  return gulp.src(siteSettings.srcFolder + '/resources/scripts/footer/' + footerComponentJsFileName)
54
- // .pipe(replace(/\`(?:(?!\`|\`)[\s\S])+(components\/footer\/mod.*?)\`/, '`resources/styles/components/footer/' + modFooterStylesFileName + '`'))
55
- .pipe(replace(/\`(?:(?!\`|\`)[\s\S])+(components\/footer\/qs.*?)\`/, '`resources/styles/components/footer/' + qsFooterStylesFileName + '`'))
53
+ .pipe(replace(/concat\((?:(?!concat\(|\))[\s\S])+(components\/footer\/mod.*?)\)/, 'concat("resources/styles/components/footer/' + modFooterStylesFileName + '")'))
54
+ .pipe(replace(/concat\((?:(?!concat\(|\))[\s\S])+(components\/footer\/qs.*?)\)/, 'concat("resources/styles/components/footer/' + qsFooterStylesFileName + '")'))
56
55
  .pipe(gulp.dest(siteSettings.srcFolder + '/resources/scripts/footer'));
57
56
  } else {
58
57
  return gulp.src(siteSettings.srcFolder + '/resources/scripts/footer/' + footerComponentJsFileName)
59
- // .pipe(replace(/\`(?:(?!\`|\`)[\s\S])+(components\/footer\/mod.*?)\`/, '`/resources/styles/components/footer/' + modFooterStylesFileName + '`'))
60
- // .pipe(replace(/\`(?:(?!\`|\`)[\s\S])+(components\/footer\/qs.*?)\`/, '`/resources/styles/components/footer/' + qsFooterStylesFileName + '`'))
61
- // .pipe(gulp.dest(siteSettings.srcFolder + '/resources/scripts/footer'))
62
- .pipe(debug());
58
+ .pipe(replace(/concat\((?:(?!concat\(|\))[\s\S])+(components\/footer\/mod.*?)\)/, 'concat("/resources/styles/components/footer/' + modFooterStylesFileName + '")'))
59
+ .pipe(replace(/concat\((?:(?!concat\(|\))[\s\S])+(components\/footer\/qs.*?)\)/, 'concat("/resources/styles/components/footer/' + qsFooterStylesFileName + '")'))
60
+ .pipe(gulp.dest(siteSettings.srcFolder + '/resources/scripts/footer'))
63
61
  }
64
62
  }
65
63
 
66
64
  function replaceFooterStylesReferenceInMap(gulp, gulpPlugins, siteSettings, siteData) {
67
65
  if (siteData.siteData && siteData.siteData.isQuotePage === true || siteData.siteData && siteData.siteData.useRelativePathForResources === true) {
68
66
  return gulp.src(siteSettings.srcFolder + '/resources/scripts/footer/footer-component.min.js.map')
69
- .pipe(replace(/concat\((?:(?!concat\(|\))[\s\S])+(components\/footer\/mod.*?)\)/, 'concat("resources/styles/components/footer/' + modFooterStylesFileName + '")'))
70
- .pipe(replace(/concat\((?:(?!concat\(|\))[\s\S])+(components\/footer\/qs.*?)\)/, 'concat("resources/styles/components/footer/' + qsFooterStylesFileName + '")'))
67
+ .pipe(replace(/\`(?:(?!\`|\`)[\s\S])+(components\/footer\/mod.*?)\`/, '`resources/styles/components/footer/' + modFooterStylesFileName + '`'))
68
+ .pipe(replace(/\`(?:(?!\`|\`)[\s\S])+(components\/footer\/qs.*?)\`/, '`resources/styles/components/footer/' + qsFooterStylesFileName + '`'))
71
69
  .pipe(gulp.dest(siteSettings.srcFolder + '/resources/scripts/footer'));
72
70
  } else {
73
71
  return gulp.src(siteSettings.srcFolder + '/resources/scripts/footer/footer-component.min.js.map')
74
- .pipe(replace(/concat\((?:(?!concat\(|\))[\s\S])+(components\/footer\/mod.*?)\)/, 'concat("/resources/styles/components/footer/' + modFooterStylesFileName + '")'))
75
- .pipe(replace(/concat\((?:(?!concat\(|\))[\s\S])+(components\/footer\/qs.*?)\)/, 'concat("/resources/styles/components/footer/' + qsFooterStylesFileName + '")'))
72
+ .pipe(replace(/\`(?:(?!\`|\`)[\s\S])+(components\/footer\/mod.*?)\`/, '`/resources/styles/components/footer/' + modFooterStylesFileName + '`'))
73
+ .pipe(replace(/\`(?:(?!\`|\`)[\s\S])+(components\/footer\/mod.*?)\`/, '`/resources/styles/components/footer/' + qsFooterStylesFileName + '`'))
76
74
  .pipe(gulp.dest(siteSettings.srcFolder + '/resources/scripts/footer'));
77
75
  }
78
76
  }
@@ -187,50 +185,47 @@ function copyFooterComponentJs(gulp, gulpPlugins, siteSettings, siteData) {
187
185
 
188
186
  function copyFooterComponentStyles(gulp, gulpPlugins, siteSettings, siteData) {
189
187
  return new Promise(resolve => {
190
- request(`https://${siteSettings.nodeEnv}/quote/resources/shared-resources/styles/components/footer/qs-footer.min.css`)
188
+ request(`https://${siteSettings.nodeEnv}/quote/resources/shared-resources/styles/components/footer/mod-footer.min.css`)
191
189
  .on('response', resp => {
192
190
  if (resp.statusCode !== 200) {
193
- throw new Error(`${resp.statusCode} Error while fetching qs-footer.min.css`);
191
+ throw new Error(`${resp.statusCode} Error while fetching mod-footer.min.css`);
194
192
  }
195
193
  })
196
- .pipe(source('qs-footer.min.css'))
194
+ .pipe(source('mod-footer.min.css'))
197
195
  .pipe(hash({
198
196
  hashLength: 20,
199
- template: 'qs-footer-<%= hash %>.min.css'
197
+ template: 'mod-footer-<%= hash %>.min.css'
200
198
  }))
201
199
  .pipe(tap(function(file, t){
202
- qsFooterStylesFileName = path.basename(file.path);
200
+ modFooterStylesFileName = path.basename(file.path);
203
201
  }))
204
202
  .pipe(gulp.dest(`${siteSettings.srcFolder}/resources/styles/components/footer`))
205
203
  .on('finish', resolve);
206
204
  })
207
205
  .then(() => {
208
206
  return new Promise(resolve => {
209
- request(`https://${siteSettings.nodeEnv}/quote/resources/shared-resources/styles/components/footer/mod-footer.min.css`)
207
+ request(`https://${siteSettings.nodeEnv}/quote/resources/shared-resources/styles/components/footer/qs-footer.min.css`)
210
208
  .on('response', resp => {
211
209
  if (resp.statusCode !== 200) {
212
- throw new Error(`${resp.statusCode} Error while fetching mod-footer.min.css`);
213
- } else {
214
- console.log(qsFooterStylesFileName);
215
- replaceFooterStylesReference(gulp, gulpPlugins, siteSettings, siteData);
210
+ throw new Error(`${resp.statusCode} Error while fetching qs-footer.min.css`);
216
211
  }
217
212
  })
218
- .pipe(source('mod-footer.min.css'))
213
+ .pipe(source('qs-footer.min.css'))
219
214
  .pipe(hash({
220
215
  hashLength: 20,
221
- template: 'mod-footer-<%= hash %>.min.css'
216
+ template: 'qs-footer-<%= hash %>.min.css'
222
217
  }))
223
218
  .pipe(tap(function(file, t){
224
- modFooterStylesFileName = path.basename(file.path);
219
+ qsFooterStylesFileName = path.basename(file.path);
225
220
  }))
226
221
  .pipe(gulp.dest(`${siteSettings.srcFolder}/resources/styles/components/footer`))
227
222
  .on('finish', resolve);
228
223
  });
229
224
  })
230
- // .then(() => {
231
- // replaceFooterStylesReference(gulp, gulpPlugins, siteSettings, siteData);
232
- // replaceFooterStylesReferenceInMap(gulp, gulpPlugins, siteSettings, siteData);
233
- // });
225
+ .then(() => {
226
+ replaceFooterStylesReference(gulp, gulpPlugins, siteSettings, siteData);
227
+ replaceFooterStylesReferenceInMap(gulp, gulpPlugins, siteSettings, siteData);
228
+ });
234
229
  }
235
230
 
236
231
  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.8--beta.2",
3
+ "version": "3.6.8--beta.3",
4
4
  "description": "Share components for S3 sites.",
5
5
  "scripts": {
6
6
  "test": "echo \"Error: no test specified\" && exit 1"
@@ -21,7 +21,6 @@
21
21
  "gulp-concat": "^2.6.1",
22
22
  "gulp-cssmin": "^0.1.7",
23
23
  "gulp-csso": "^3.0.0",
24
- "gulp-debug": "^4.0.0",
25
24
  "gulp-eslint": "^5.0.0",
26
25
  "gulp-eslint-threshold": "^0.1.1",
27
26
  "gulp-filter": "^5.0.0",