feat - #175 adds processSource option to the loader config to run han… #177
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| *.sublime-project | ||
| *.sublime-workspace | ||
| *.code-workspace | ||
| node_modules | ||
| example/dist/ | ||
| .ntvs_analysis.dat | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,6 +6,7 @@ var path = require("path"); | |
| var assign = require("object-assign"); | ||
| var fastreplace = require('./lib/fastreplace'); | ||
| var findNestedRequires = require('./lib/findNestedRequires'); | ||
| var minify = require('html-minifier').minify; | ||
|
There was a problem hiding this comment. Yes, this is an added dependency. I feel like it's probably better to add a known and tested library to do this sort of thing than writing my own regular expressions which will surely be buggy. Kudos to my colleague Clinton Bloodworth for the suggestion! |
||
|
|
||
| function versionCheck(hbCompiler, hbRuntime) { | ||
| return hbCompiler.COMPILER_REVISION === (hbRuntime["default"] || hbRuntime).COMPILER_REVISION; | ||
|
|
@@ -26,7 +27,23 @@ function getLoaderConfig(loaderContext) { | |
| return assign({}, config, query); | ||
| } | ||
|
|
||
| /** | ||
| * Returns the template source with newlines and multiple spaces removed | ||
| * based on the processSource config option. | ||
| * | ||
| * @param {String} source | ||
| * @returns {String} | ||
| */ | ||
| var processSource = function (source) { | ||
| return minify(source, { | ||
| collapseWhitespace: true, | ||
| conservativeCollapse: true, | ||
| removeComments: true, | ||
| removeAttributeQuotes: true | ||
|
There was a problem hiding this comment. These are fairly conservative options. More can be found here: |
||
| }); | ||
| }; | ||
|
|
||
| module.exports = function (source) { | ||
| if (this.cacheable) this.cacheable(); | ||
| var loaderApi = this; | ||
| var query = getLoaderConfig(loaderApi); | ||
|
|
@@ -42,8 +59,7 @@ module.exports = function(source) { | |
| var extensions = query.extensions; | ||
| if (!extensions) { | ||
| extensions = [".handlebars", ".hbs", ""]; | ||
| } else if (!Array.isArray(extensions)) { | ||
| extensions = extensions.split(/[ ,;]/g); | ||
| } | ||
|
|
||
|
|
@@ -57,7 +73,7 @@ module.exports = function(source) { | |
| var foundUnclearStuff = {}; | ||
| var knownHelpers = {}; | ||
|
|
||
| [].concat(query.knownHelpers, precompileOptions.knownHelpers).forEach(function (k) { | ||
| if (k && typeof k === 'string') { | ||
| knownHelpers[k] = true; | ||
| } | ||
|
|
@@ -77,12 +93,13 @@ module.exports = function(source) { | |
|
|
||
| var hb = handlebars.create(); | ||
| var JavaScriptCompiler = hb.JavaScriptCompiler; | ||
|
|
||
| function MyJavaScriptCompiler() { | ||
| JavaScriptCompiler.apply(this, arguments); | ||
| } | ||
| MyJavaScriptCompiler.prototype = Object.create(JavaScriptCompiler.prototype); | ||
| MyJavaScriptCompiler.prototype.compiler = MyJavaScriptCompiler; | ||
| MyJavaScriptCompiler.prototype.nameLookup = function (parent, name, type) { | ||
| if (debug) { | ||
| console.log("nameLookup %s %s %s", parent, name, type); | ||
| } | ||
|
|
@@ -96,26 +113,23 @@ module.exports = function(source) { | |
| } | ||
| foundPartials["$" + name] = null; | ||
| return JavaScriptCompiler.prototype.nameLookup.apply(this, arguments); | ||
| } else if (type === "helper") { | ||
| if (foundHelpers["$" + name]) { | ||
| return "__default(require(" + loaderUtils.stringifyRequest(loaderApi, foundHelpers["$" + name]) + "))"; | ||
| } | ||
| foundHelpers["$" + name] = null; | ||
| return JavaScriptCompiler.prototype.nameLookup.apply(this, arguments); | ||
| } else if (type === "context") { | ||
| // This could be a helper too, save it to check it later | ||
| if (!foundUnclearStuff["$" + name]) foundUnclearStuff["$" + name] = false; | ||
| return JavaScriptCompiler.prototype.nameLookup.apply(this, arguments); | ||
| } else { | ||
| return JavaScriptCompiler.prototype.nameLookup.apply(this, arguments); | ||
| } | ||
| }; | ||
|
|
||
| if (inlineRequires) { | ||
| MyJavaScriptCompiler.prototype.pushString = function (value) { | ||
| if (inlineRequires.test(value)) { | ||
| this.pushLiteral("require(" + loaderUtils.stringifyRequest(loaderApi, value) + ")"); | ||
| } else { | ||
|
|
@@ -138,17 +152,18 @@ module.exports = function(source) { | |
|
|
||
| // Define custom visitor for further template AST parsing | ||
| var Visitor = handlebars.Visitor; | ||
|
|
||
| function InternalBlocksVisitor() { | ||
| this.partialBlocks = []; | ||
| this.inlineBlocks = []; | ||
| } | ||
|
|
||
| InternalBlocksVisitor.prototype = new Visitor(); | ||
| InternalBlocksVisitor.prototype.PartialBlockStatement = function (partial) { | ||
| this.partialBlocks.push(partial.name.original); | ||
| Visitor.prototype.PartialBlockStatement.call(this, partial); | ||
| }; | ||
| InternalBlocksVisitor.prototype.DecoratorBlock = function (partial) { | ||
| if (partial.path.original === 'inline') { | ||
| this.inlineBlocks.push(partial.params[0].value); | ||
| } | ||
|
|
@@ -202,14 +217,17 @@ module.exports = function(source) { | |
|
|
||
| try { | ||
| if (source) { | ||
| if (query.processSource) { | ||
|
There was a problem hiding this comment. I got a lint error when I double banged this. Let me know if that's okay. |
||
| source = processSource(source); | ||
| } | ||
| ast = hb.parse(source, opts); | ||
| template = hb.precompile(ast, opts); | ||
| } | ||
| } catch (err) { | ||
| return loaderAsyncCallback(err); | ||
| } | ||
|
|
||
| var resolve = function (request, type, callback) { | ||
| var contexts = [loaderApi.context]; | ||
|
|
||
| // Any additional helper dirs will be added to the searchable contexts | ||
|
|
@@ -222,7 +240,7 @@ module.exports = function(source) { | |
| contexts = contexts.concat(query.partialDirs); | ||
| } | ||
|
|
||
| var resolveWithContexts = function () { | ||
| var context = contexts.shift(); | ||
|
|
||
| var traceMsg; | ||
|
|
@@ -232,28 +250,25 @@ module.exports = function(source) { | |
| console.log("request=%s", request); | ||
| } | ||
|
|
||
| var next = function (err) { | ||
| if (contexts.length > 0) { | ||
| resolveWithContexts(); | ||
| } else { | ||
| if (debug) console.log("Failed to resolve %s %s", type, traceMsg); | ||
| return callback(err); | ||
| } | ||
| }; | ||
|
|
||
| loaderApi.resolve(context, request, function (err, result) { | ||
| if (!err && result) { | ||
| if (exclude && exclude.test(result)) { | ||
| if (debug) console.log("Excluding %s %s", type, traceMsg); | ||
| return next(); | ||
| } else { | ||
| if (debug) console.log("Resolved %s %s", type, traceMsg); | ||
| return callback(err, result); | ||
| } | ||
| } else { | ||
| return next(err); | ||
| } | ||
| }); | ||
|
|
@@ -262,14 +277,14 @@ module.exports = function(source) { | |
| resolveWithContexts(); | ||
| }; | ||
|
|
||
| var resolveUnclearStuffIterator = function (stuff, unclearStuffCallback) { | ||
| if (foundUnclearStuff[stuff]) return unclearStuffCallback(); | ||
| var request = referenceToRequest(stuff.substr(1), 'unclearStuff'); | ||
|
|
||
| if (query.ignoreHelpers) { | ||
| unclearStuffCallback(); | ||
| } else { | ||
| resolve(request, 'unclearStuff', function (err, result) { | ||
| if (!err && result) { | ||
| knownHelpers[stuff.substr(1)] = true; | ||
| foundHelpers[stuff] = result; | ||
|
|
@@ -281,7 +296,7 @@ module.exports = function(source) { | |
| } | ||
| }; | ||
|
|
||
| var defaultPartialResolver = function defaultPartialResolver(request, callback) { | ||
| request = referenceToRequest(request, 'partial'); | ||
| // Try every extension for partials | ||
| var i = 0; | ||
|
|
@@ -292,7 +307,7 @@ module.exports = function(source) { | |
| } | ||
| var extension = extensions[i++]; | ||
|
|
||
| resolve(request + extension, 'partial', function (err, result) { | ||
| if (!err && result) { | ||
| return callback(null, result); | ||
| } | ||
|
|
@@ -301,18 +316,18 @@ module.exports = function(source) { | |
| }()); | ||
| }; | ||
|
|
||
| var resolvePartialsIterator = function (partial, partialCallback) { | ||
| if (foundPartials[partial]) return partialCallback(); | ||
| // Strip the # off of the partial name | ||
| var request = partial.substr(1); | ||
|
|
||
| var partialResolver = query.partialResolver || defaultPartialResolver; | ||
|
|
||
| if (query.ignorePartials) { | ||
| return partialCallback(); | ||
| } else { | ||
| partialResolver(request, function (err, resolved) { | ||
| if (err) { | ||
| var visitor = new InternalBlocksVisitor(); | ||
|
|
||
| visitor.accept(ast); | ||
|
|
@@ -334,20 +349,20 @@ module.exports = function(source) { | |
| } | ||
| }; | ||
|
|
||
| var resolveHelpersIterator = function (helper, helperCallback) { | ||
| if (foundHelpers[helper]) return helperCallback(); | ||
| var request = referenceToRequest(helper.substr(1), 'helper'); | ||
|
|
||
| if (query.ignoreHelpers) { | ||
| helperCallback(); | ||
| } else { | ||
| var defaultHelperResolver = function (request, callback) { | ||
| return resolve(request, 'helper', callback); | ||
| }; | ||
|
|
||
| var helperResolver = query.helperResolver || defaultHelperResolver; | ||
|
|
||
| helperResolver(request, function (err, result) { | ||
| if (!err && result) { | ||
| knownHelpers[helper.substr(1)] = true; | ||
| foundHelpers[helper] = result; | ||
|
|
@@ -363,7 +378,7 @@ module.exports = function(source) { | |
| } | ||
| }; | ||
|
|
||
| var doneResolving = function (err) { | ||
| if (err) return loaderAsyncCallback(err); | ||
|
|
||
| // Do another compiler pass if not everything was resolved | ||
|
|
@@ -374,15 +389,15 @@ module.exports = function(source) { | |
|
|
||
| // export as module if template is not blank | ||
| var slug = template ? | ||
| 'var Handlebars = require(' + loaderUtils.stringifyRequest(loaderApi, runtimePath) + ');\n' + | ||
| 'function __default(obj) { return obj && (obj.__esModule ? obj["default"] : obj); }\n' + | ||
| 'module.exports = (Handlebars["default"] || Handlebars).template(' + template + ');' : | ||
| 'module.exports = function(){return "";};'; | ||
|
|
||
| loaderAsyncCallback(null, slug); | ||
| }; | ||
|
|
||
| var resolveItems = function (err, type, items, iterator, callback) { | ||
| if (err) return callback(err); | ||
|
|
||
| var itemKeys = Object.keys(items); | ||
|
|
@@ -395,18 +410,18 @@ module.exports = function(source) { | |
| async.each(itemKeys, iterator, callback); | ||
| }; | ||
|
|
||
| var resolvePartials = function (err) { | ||
| resolveItems(err, 'partials', foundPartials, resolvePartialsIterator, doneResolving); | ||
| }; | ||
|
|
||
| var resolveUnclearStuff = function (err) { | ||
| resolveItems(err, 'unclearStuff', foundUnclearStuff, resolveUnclearStuffIterator, resolvePartials); | ||
| }; | ||
|
|
||
| var resolveHelpers = function (err) { | ||
| resolveItems(err, 'helpers', foundHelpers, resolveHelpersIterator, resolveUnclearStuff); | ||
| }; | ||
|
|
||
| resolveHelpers(); | ||
| }()); | ||
| }; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.