github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Stop using handlebars in the bundler.

Browse Source 
The dev bundle contains a copy of the handlebars NPM module solely for
creating app.html.  This is separate from the NPM module used by the
handlebars NPM package.

On the shark branch, we no longer use the handlebars NPM module for
Meteor template (it is being replaced by Spacebars), so in preparation
for that, we'll remove this barely-used build-time dependency on
handlebars.

A subsequent commit will remove it from the dev bundle.

Once the Spacebars API has fully settled (eg, it has been merged to
devel), we should get rid of this ad hoc templating and replace it with
Spacebars, either in webapp_server (driven entirely by program.json) or
by using unipackage.load in bundler.
This commit is contained in:
David Glasser
2013-12-02 15:57:09 -08:00
parent c066b90e1c
commit 8ab66ff255
2 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tools/app.html.in
View File

@@ -1,17 +0,0 @@
<!DOCTYPE html>
<html##HTML_ATTRIBUTES##>
<head>
{{#each stylesheets}} <link rel="stylesheet" href="##ROOT_URL_PATH_PREFIX##{{this}}">
{{/each}}
##RUNTIME_CONFIG##
{{#each scripts}} <script type="text/javascript" src="##ROOT_URL_PATH_PREFIX##{{this}}"></script>
{{/each}}
{{{head_extra}}}
</head>
<body>
{{{body_extra}}}
</body>
</html>

40
tools/bundler.js
View File

@@ -769,19 +769,39 @@ _.extend(ClientTarget.prototype, {
self.css[0].setUrlToHash(".css");
},
// XXX Instead of packaging the boilerplate in the client program, the
// template should be part of WebApp, and we should make sure that all
// information that it needs is in the manifest (ie, make sure to include head
// and body). Then it will just need to do one level of templating instead
// of two. Alternatively, use spacebars with unipackage.load here.
generateHtmlBoilerplate: function () {
var self = this;
var templatePath = path.join(__dirname, "app.html.in");
var template = watch.readAndWatchFile(self.watchSet, templatePath);
var f = require('handlebars').compile(template.toString());
return new Buffer(f({
scripts: _.pluck(self.js, 'url'),
stylesheets: _.pluck(self.css, 'url'),
head_extra: self.head.join('\n'),
body_extra: self.body.join('\n')
}), 'utf8');
var html = [];
html.push('<!DOCTYPE html>\n' +
'<html##HTML_ATTRIBUTES##>\n' +
'<head>\n');
_.each(self.css, function (css) {
html.push(' <link rel="stylesheet" href="##ROOT_URL_PATH_PREFIX##');
html.push(_.escape(css.url));
html.push('">\n');
});
html.push('\n\n##RUNTIME_CONFIG##\n\n');
_.each(self.js, function (js) {
html.push(' <script type="text/javascript" src="##ROOT_URL_PATH_PREFIX##');
html.push(_.escape(js.url));
html.push('"></script>\n');
});
html.push('\n\n');
html.push(self.head.join('\n')); // unescaped!
html.push('\n' +
'</head>\n' +
'<body>\n');
html.push(self.body.join('\n')); // unescaped!
html.push('\n' +
'</body>\n' +
'</html>\n');
return new Buffer(html.join(''), 'utf8');
},
// Output the finished target to disk