Export format options, accept different import formats, fixes #63 #64
Conversation
| @@ -45,19 +47,26 @@ module.exports = function (content) { | |||
| .replace(new RegExp(escapeRegExp(pathSep) + '+', 'g'), pathSep); | |||
| var html; | |||
|
|
|||
| if (content.match(/^module\.exports/)) { | |||
| if (content.match(/(?:^module\.exports)|(?:^export\s+default)|(?:^exports.default)/)) { | |||
There was a problem hiding this comment.
/^(module\.exports|export\s+default|exports.default)/ is a bit easier to read.
| var firstQuote = findQuote(content, false); | ||
| var secondQuote = findQuote(content, true); | ||
| html = content.substr(firstQuote, secondQuote - firstQuote + 1); | ||
| } else { | ||
| html = content; | ||
| } | ||
|
|
||
| var exportsString = "module.exports = "; |
There was a problem hiding this comment.
Would a simpler solution be to just keep the same export expression of the content? That way only html-loader would need to be configured.
I'm thinking something like:
var exportExprMatch = content.match(/^(module\.exports\s+=|export\s+default|exports.default\s+=)\s+/);
var exportExpr;
if (exportExprMatch) {
var firstQuote = findQuote(content, false);
var secondQuote = findQuote(content, true);
html = content.substr(firstQuote, secondQuote - firstQuote + 1);
exportExpr = exportExprMatch[0];
} else {
html = content;
exportExpr = 'module.exports = ';
}
return "var path = '"+jsesc(filePath)+"';\n" +
"var html = " + html + ";\n" +
(requireAngular ? "var angular = require('angular');\n" : "window.") +
"angular.module('" + ngModule + "').run(['$templateCache', function(c) { c.put(path, html) }]);\n" +
exportExpr + "path;";
The README change would also then not be required.
There was a problem hiding this comment.
Works for me!
OTOH it feels more natural to me to specify the export format at that loader whose output is actually consumed by the app.
Also that would not work with raw-loader, because that loader is hard coded to commonjs exports.
I don't know how important that scenario is, because I am new at webpack. Are there valid reasons for chossing the raw-loader over the html-loader?
|
Also could you add a test please. |
|
About the test: How do they work? How do I test ES6 imports at all? |
|
Is this still not working? |
|
Anything happening here? I'm having to use @eekboom's fork, which is not as stable as an official release. |
|
@WearyMonkey hello? @eekboom why did you remove your repository? |
Options "exportAsEs6Default" and "exportAsDefault" work the same way as in html-loader.