Skip to content
This repository has been archived by the owner on Mar 26, 2018. It is now read-only.

Updated PR#68 to also change the file reference inside of a source map file to point to file revisioned source file; updates a test #69

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Updated PR#68 to also change the file reference inside of a source map file to point to file revisioned source file; updates a test #69

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
dcff1e5
updated ncthis's PR to use grunt file api methods, added tests
nelsonpecora Nov 21, 2014
cdbe055
add code that updates sourceMappingURL inside of minified javascript …
Nov 22, 2014
6c62c1d
add test to check if sourceMappingURL points to new file rev'd source…
Nov 22, 2014
40e32eb
update test to check that rev number matches between .js and .map files
Nov 22, 2014
b24d08b
add code to update a Javascript's source map's file property to point…
Nov 22, 2014
a875cd2
update test with proper assertion library method
Nov 24, 2014
cc7af46
fix(filerev.js): remove passing argument to grunt.file methods that h…
Nov 24, 2014
df07687
add regex for finding sourceMappingURL in file that supports absolute…
Nov 27, 2014
1e029d9
normalize indentation to 2 spaces
Nov 27, 2014
325c50d
fix(regex): regex would ignore non-releative paths to sourcemap files…
Nov 27, 2014
ff1bccb
fix sourcemap not rev'ing if not in the same directory as parent file
Nov 27, 2014
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
17 changes: 14 additions & 3 deletions tasks/filerev.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,24 @@ module.exports = function (grunt) {
var sourceMap = false;
if (ext === '.js' || ext === '.css') {
var map = file + '.map';
resultPath += '.map';
var resultPathMap = resultPath + '.map';
if (grunt.file.exists(map)) {
if (move) {
fs.renameSync(map, resultPath);
fs.renameSync(map, resultPathMap);
} else {
grunt.file.copy(map, resultPath);
grunt.file.copy(map, resultPathMap);
}

// rewrite the sourceMappingURL in files
var fileContents = grunt.file.read(resultPath, {encoding: 'utf8'});
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the default encoding is utf8, so the option here is moot. same with below.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was wondering about that, since the grunt.file docs aren't super clear. Good to know, thanks.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will update, thanks.

var newSrcMap = fileContents.replace('//# sourceMappingURL=' + path.basename(file) + '.map', '//# sourceMappingURL=' + path.basename(resultPathMap));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will fail when the sourceMappingURL is a relative path, not just a filename.

Use a regex to only replace the filename.

// update file reference inside source map file
var mapFileContents = grunt.file.readJSON(resultPathMap, { encoding: 'utf-8' });
mapFileContents.file = path.basename(resultPath) + '.map';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here about relative paths.


// write files
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

useless comment

grunt.file.write(resultPath, newSrcMap, {encoding: 'utf8'});
grunt.file.write(resultPathMap, JSON.stringify(mapFileContents), { encoding: 'utf-8' });
sourceMap = true;
}
}
Expand Down
12 changes: 10 additions & 2 deletions test/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
'use strict';
var fs = require('fs');
var path = require('path');
var assert = require('assert');

var hashes = {
Expand Down Expand Up @@ -40,11 +41,18 @@ it('should allow sources defined with expand', function () {

it('should use same revision as .js source for the .map', function () {
var file = 'test/fixtures/math.js.map';
var original = fs.statSync(file).size;
var revisioned = fs.statSync(hashes[file]).size;
var original = path.basename(hashes[file]);
var revisioned = path.basename(hashes[file] + '.map', '.map');
assert(revisioned === original);
});

it('should point the .js sourceMappingURL to the revisioned .map', function() {
var file = 'test/fixtures/math.js';
var map = 'math.2f56179e.js.map';
var revisioned = fs.readFileSync(hashes[file], {encoding: 'utf8'});
assert(revisioned.indexOf('//# sourceMappingURL=' + map) !== -1);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

assert.notStrictEqual

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, I wasn't aware of that. @sgnl would you mind making that change?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll add it.

});

it('should revision .js file ok without any .map', function () {
var file = 'test/fixtures/physics.js';
var original = fs.statSync(file).size;
Expand Down