Skip to content

fixed path issues for windows when trying to bust for subfolders #247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pankaj-arunsingh wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fixed path issues for windows when trying to bust for subfolders #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f3b39c
fixed path issue for windows
pankaj-arunsingh Nov 9, 2018
7955914
Merge pull request #1 from pankaj-arunsingh/hotfix/fix_filepath_not_r…
pankaj-arunsingh Nov 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 18 additions & 17 deletions tasks/cachebust.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ var DEFAULT_OPTIONS = {
urlPrefixes: []
};

module.exports = function(grunt) {
var isUsingQueryString = function(opts) {
module.exports = function (grunt) {
var isUsingQueryString = function (opts) {
return opts.queryString;
};
grunt.registerMultiTask('cacheBust', 'Bust static assets from the cache using content hashing', function() {
grunt.registerMultiTask('cacheBust', 'Bust static assets from the cache using content hashing', function () {
var opts = this.options(DEFAULT_OPTIONS);
if( opts.baseDir.substr(-1) !== '/' ) {
if (opts.baseDir.substr(-1) !== '/') {
opts.baseDir += '/';
}

Expand All @@ -39,7 +39,7 @@ module.exports = function(grunt) {

//clear output dir if it was set
if (opts.clearOutputDir && opts.outputDir.length > 0) {
fs.removeSync(path.resolve((discoveryOpts.cwd ? discoveryOpts.cwd + '/' +opts.outputDir : opts.outputDir)));
fs.removeSync(path.resolve((discoveryOpts.cwd ? discoveryOpts.cwd + '/' + opts.outputDir : opts.outputDir)));
}

// Generate an asset map
Expand Down Expand Up @@ -80,7 +80,7 @@ module.exports = function(grunt) {

// add urlPrefixes to enclosing scenarios
if (opts.urlPrefixes && Array.isArray(opts.urlPrefixes) && opts.urlPrefixes.length > 0) {
opts.urlPrefixes.forEach(function(urlPrefix) {
opts.urlPrefixes.forEach(function (urlPrefix) {
replaceEnclosedBy.push([urlPrefix, '"']);
replaceEnclosedBy.push([urlPrefix, "'"]);
replaceEnclosedBy.push([urlPrefix, ")"]);
Expand All @@ -90,7 +90,7 @@ module.exports = function(grunt) {
}
// don't replace references that are already cache busted
if (!isUsingQueryString(opts)) {
replaceEnclosedBy = replaceEnclosedBy.concat(replaceEnclosedBy.map(function(reb) {
replaceEnclosedBy = replaceEnclosedBy.concat(replaceEnclosedBy.map(function (reb) {
return [reb[0], '?'];
}));
}
Expand All @@ -102,6 +102,7 @@ module.exports = function(grunt) {
grunt.log.ok(files.length + ' file' + (files.length !== 1 ? 's ' : ' ') + 'busted.');

function replaceInFile(filepath) {
filepath = filepath.replace(/\\/g, '/'); //Fix for windows paths use backspace when you use the code node js pathmodules
var markup = grunt.file.read(filepath);
var baseDir = discoveryOpts.cwd + '/';
var relativeFileDir = path.dirname(filepath).substr(baseDir.length);
Expand All @@ -113,7 +114,7 @@ module.exports = function(grunt) {

var baseDirs = filepath.substr(baseDir.length).split('/');

_.each(assetMap, function(hashed, original) {
_.each(assetMap, function (hashed, original) {
var replace = [
// abs path
['/' + original, '/' + hashed],
Expand All @@ -135,10 +136,10 @@ module.exports = function(grunt) {
replace.push([dir + originalFilename, dir + hashedFilename]);
}
}
_.each(replace, function(r) {
_.each(replace, function (r) {
var original = r[0];
var hashed = r[1];
_.each(replaceEnclosedBy, function(reb) {
_.each(replaceEnclosedBy, function (reb) {
markup = markup.split(reb[0] + original + reb[1]).join(reb[0] + hashed + reb[1]);
});
});
Expand Down Expand Up @@ -190,25 +191,25 @@ module.exports = function(grunt) {
// check if fully specified filenames have been busted and replace with busted file
var baseDirResolved = path.resolve(baseDir) + '/';
var cwd = process.cwd() + '/';
originalConfig.src = originalConfig.src.map(function(file) {
if( assetMap ) {
originalConfig.src = originalConfig.src.map(function (file) {
if (assetMap) {
var files = [file];
if(path.resolve(cwd + file).substr(0, baseDirResolved.length) === baseDirResolved) {
if (path.resolve(cwd + file).substr(0, baseDirResolved.length) === baseDirResolved) {
files.push(path.resolve(cwd + file).substr(baseDirResolved.length));
}
var result;
files.forEach(function(file2) {
files.forEach(function (file2) {
var fileResolved = path.resolve(baseDirResolved + file2);
if (!result && fileResolved.substr(0, baseDirResolved.length) === baseDirResolved && (fileResolved.substr(baseDirResolved.length)) in assetMap) {
result = assetMap[fileResolved.substr(baseDirResolved.length)];
// if original file had baseDir at the start, make sure it's there now
var baseDirNormalized = path.normalize(baseDir);
if(path.normalize(file).substr(0, baseDirNormalized.length) === baseDirNormalized) {
if (path.normalize(file).substr(0, baseDirNormalized.length) === baseDirNormalized) {
result = baseDir + result;
}
}
});
if(result) {
if (result) {
return result;
}
}
Expand All @@ -217,7 +218,7 @@ module.exports = function(grunt) {

return grunt.file
.expand(originalConfig, originalConfig.src)
.map(function(file) {
.map(function (file) {

// if the file is hashed, then the hashed file should be
// used instead of the original for replacement. This will
Expand Down