Skip to content

Commit

Permalink
fix: Can't resolve 'fs' when bundle with webpack #447
Browse files Browse the repository at this point in the history
This is a webpack core level problem. Hackfixing for now.

Closes #447.
  • Loading branch information
bebraw committed Mar 10, 2017
1 parent 0eedd9f commit 75c6bee
Show file tree
Hide file tree
Showing 2 changed files with 144 additions and 1 deletion.
143 changes: 143 additions & 0 deletions lib/convert-source-map.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
/* eslint-disable */
'use strict';
// XXXXX: This file should not exist. Working around a core level bug
// that prevents using fs at loaders.
//var fs = require('fs'); // XXX
var path = require('path');

var commentRx = /^\s*\/(?:\/|\*)[@#]\s+sourceMappingURL=data:(?:application|text)\/json;(?:charset[:=]\S+?;)?base64,(?:.*)$/mg;
var mapFileCommentRx =
//Example (Extra space between slashes added to solve Safari bug. Exclude space in production):
// / /# sourceMappingURL=foo.js.map /*# sourceMappingURL=foo.js.map */
/(?:\/\/[@#][ \t]+sourceMappingURL=([^\s'"]+?)[ \t]*$)|(?:\/\*[@#][ \t]+sourceMappingURL=([^\*]+?)[ \t]*(?:\*\/){1}[ \t]*$)/mg

function decodeBase64(base64) {
return new Buffer(base64, 'base64').toString();
}

function stripComment(sm) {
return sm.split(',').pop();
}

function readFromFileMap(sm, dir) {
// NOTE: this will only work on the server since it attempts to read the map file

mapFileCommentRx.lastIndex = 0;
var r = mapFileCommentRx.exec(sm);

// for some odd reason //# .. captures in 1 and /* .. */ in 2
var filename = r[1] || r[2];
var filepath = path.resolve(dir, filename);

try {
return fs.readFileSync(filepath, 'utf8');
} catch (e) {
throw new Error('An error occurred while trying to read the map file at ' + filepath + '\n' + e);
}
}

function Converter (sm, opts) {
opts = opts || {};

if (opts.isFileComment) sm = readFromFileMap(sm, opts.commentFileDir);
if (opts.hasComment) sm = stripComment(sm);
if (opts.isEncoded) sm = decodeBase64(sm);
if (opts.isJSON || opts.isEncoded) sm = JSON.parse(sm);

this.sourcemap = sm;
}

Converter.prototype.toJSON = function (space) {
return JSON.stringify(this.sourcemap, null, space);
};

Converter.prototype.toBase64 = function () {
var json = this.toJSON();
return new Buffer(json).toString('base64');
};

Converter.prototype.toComment = function (options) {
var base64 = this.toBase64();
var data = 'sourceMappingURL=data:application/json;charset=utf-8;base64,' + base64;
return options && options.multiline ? '/*# ' + data + ' */' : '//# ' + data;
};

// returns copy instead of original
Converter.prototype.toObject = function () {
return JSON.parse(this.toJSON());
};

Converter.prototype.addProperty = function (key, value) {
if (this.sourcemap.hasOwnProperty(key)) throw new Error('property %s already exists on the sourcemap, use set property instead');
return this.setProperty(key, value);
};

Converter.prototype.setProperty = function (key, value) {
this.sourcemap[key] = value;
return this;
};

Converter.prototype.getProperty = function (key) {
return this.sourcemap[key];
};

exports.fromObject = function (obj) {
return new Converter(obj);
};

exports.fromJSON = function (json) {
return new Converter(json, { isJSON: true });
};

exports.fromBase64 = function (base64) {
return new Converter(base64, { isEncoded: true });
};

exports.fromComment = function (comment) {
comment = comment
.replace(/^\/\*/g, '//')
.replace(/\*\/$/g, '');

return new Converter(comment, { isEncoded: true, hasComment: true });
};

exports.fromMapFileComment = function (comment, dir) {
return new Converter(comment, { commentFileDir: dir, isFileComment: true, isJSON: true });
};

// Finds last sourcemap comment in file or returns null if none was found
exports.fromSource = function (content) {
var m = content.match(commentRx);
return m ? exports.fromComment(m.pop()) : null;
};

// Finds last sourcemap comment in file or returns null if none was found
exports.fromMapFileSource = function (content, dir) {
var m = content.match(mapFileCommentRx);
return m ? exports.fromMapFileComment(m.pop(), dir) : null;
};

exports.removeComments = function (src) {
return src.replace(commentRx, '');
};

exports.removeMapFileComments = function (src) {
return src.replace(mapFileCommentRx, '');
};

exports.generateMapFileComment = function (file, options) {
var data = 'sourceMappingURL=' + file;
return options && options.multiline ? '/*# ' + data + ' */' : '//# ' + data;
};

Object.defineProperty(exports, 'commentRegex', {
get: function getCommentRegex () {
return commentRx;
}
});

Object.defineProperty(exports, 'mapFileCommentRegex', {
get: function getMapFileCommentRegex () {
return mapFileCommentRx;
}
});
2 changes: 1 addition & 1 deletion lib/css-base.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ function cssWithMappingToString(item) {
if (!cssMapping) {
return content;
}
var convertSourceMap = require('convert-source-map');
var convertSourceMap = require('./convert-source-map');
var sourceMapping = convertSourceMap.fromObject(cssMapping).toComment({multiline: true});
var sourceURLs = cssMapping.sources.map(function (source) {
return '/*# sourceURL=' + cssMapping.sourceRoot + source + ' */'
Expand Down

0 comments on commit 75c6bee

Please sign in to comment.