diff --git a/HISTORY.md b/HISTORY.md
index 5fd888ddd..6d323f422 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,19 @@
 ## vNEXT
 
+## v.2.4.0, 2021-March-26?
+
+* [#313](https://github.com/meteor/blaze/pull/313) Implemented HMR for Blaze
+
+* [#319](https://github.com/meteor/blaze/pull/319) Fixed a few situations where the template compiler wouldn't optimise it's output javascript. Should make rendering faster (if the initial optimisation reasoning holds true)
+
+* [#321](https://github.com/meteor/blaze/pull/321) Just source code modernisation, making it easier to read. Shouldn't change any API's; except may need explicit import if other packages are using directly.
+
+* [#324](https://github.com/meteor/blaze/pull/324) Add a whitespace="strip" option to templates, which removes any whitespace that crosses newlines.
+  
+* [#276](https://github.com/meteor/blaze/pull/276) [HTML.isArray](https://github.com/brucejo75/blaze/blob/release-2.4/packages/htmljs/README.md#htmlisarrayx) works across iFrames.  This supports running blaze in sandboxed iFrames.
+
+* [#326](https://github.com/meteor/blaze/pull/326) Remove old ui package code from this repository.
+
 ## v2.3.4, 2019-Dec-13
 
 * jquery 3 support
diff --git a/packages/blaze-hot/hot.js b/packages/blaze-hot/hot.js
new file mode 100644
index 000000000..5035e73ce
--- /dev/null
+++ b/packages/blaze-hot/hot.js
@@ -0,0 +1,140 @@
+import { Blaze } from 'meteor/blaze';
+import { Template as Templates} from 'meteor/templating-runtime';
+import { UpdateAll } from './update-templates.js';
+
+let importedTemplating = new WeakMap();
+let currentModule = {id: null};
+const SourceModule = Symbol();
+
+function patchTemplate(Template) {
+  const oldRegisterHelper = Template.registerHelper;
+  Template.registerHelper = function (name, func) {
+    func[SourceModule] = currentModule.id;
+    oldRegisterHelper(name, func);
+  }
+
+  const oldOnCreated = Template.prototype.onCreated;
+  Template.prototype.onCreated = function (cb) {
+    if (cb) {
+      cb[SourceModule] = currentModule.id;
+    }
+
+    return oldOnCreated.call(this, cb);
+  }
+
+  const oldOnRendered = Template.prototype.onRendered;
+  Template.prototype.onRendered = function (cb) {
+    if (cb) {
+      cb[SourceModule] = currentModule.id;
+    }
+
+    return oldOnRendered.call(this, cb);
+  }
+
+  const oldOnDestroyed = Template.prototype.onDestroyed;
+  Template.prototype.onDestroyed = function (cb) {
+    if (cb) {
+      cb[SourceModule] = currentModule.id;
+    }
+
+    return oldOnDestroyed.call(this, cb);
+  }
+
+  const oldHelpers = Template.prototype.helpers;
+  Template.prototype.helpers = function (dict) {
+    if (typeof dict === 'object') {
+      for (var k in dict) {
+        if (dict[k]) {
+          dict[k][SourceModule] = currentModule.id;
+        }
+      }
+    }
+
+    return oldHelpers.call(this, dict);
+  }
+
+  const oldEvents = Template.prototype.events;
+  Template.prototype.events = function (eventMap) {
+    const result = oldEvents.call(this, eventMap);
+    this.__eventMaps[this.__eventMaps.length - 1][SourceModule] = currentModule.id;
+    return result;
+  }
+}
+
+function cleanTemplate(template, moduleId) {
+  let usedModule = false
+  if (!template || !Blaze.isTemplate(template)) {
+    return usedModule;
+  }
+
+  function cleanArray(array) {
+    for (let i = array.length - 1; i >= 0; i--) {
+      let item = array[i];
+      if (item && item[SourceModule] === moduleId) {
+        usedModule = true
+        array.splice(i, 1);
+      }
+    }
+  }
+
+  cleanArray(template._callbacks.created);
+  cleanArray(template._callbacks.rendered);
+  cleanArray(template._callbacks.destroyed);
+  cleanArray(template.__eventMaps);
+
+  Object.keys(template.__helpers).forEach(key => {
+    if (template.__helpers[key] && template.__helpers[key][SourceModule] === moduleId) {
+      usedModule = true
+      delete template.__helpers[key];
+    }
+  });
+
+  return usedModule
+}
+
+function shouldAccept(module) {
+  if (!importedTemplating.get(module)) {
+    return false;
+  }
+  if (!module.exports) {
+    return true;
+  }
+
+  return Object.keys(module.exports).filter(key => key !== '__esModule').length === 0;
+}
+
+if (module.hot) {
+  patchTemplate(Blaze.Template);
+  module.hot.onRequire({
+    before(module) {
+      if (module.id === '/node_modules/meteor/blaze.js' || module.id === '/node_modules/meteor/templating.js') {
+        importedTemplating.set(currentModule, true);
+      }
+
+      let previousModule = currentModule;
+      currentModule = module;
+      return previousModule;
+    },
+    after(module, previousModule) {
+      if (shouldAccept(module)) {
+        module.hot.accept();
+        module.hot.dispose(() => {
+          Object.keys(Templates).forEach(templateName => {
+            let template = Templates[templateName]
+            let usedByModule = cleanTemplate(template, module.id);
+            if (usedByModule) {
+              Template._applyHmrChanges(templateName);
+            }
+          });
+
+          Object.values(Blaze._globalHelpers).forEach(helper => {
+            if (helper && helper[SourceModule] === module.id) {
+              Template._applyHmrChanges(UpdateAll);
+            }
+          });
+        });
+      }
+      currentModule = previousModule
+    }
+  });
+}
diff --git a/packages/blaze-hot/package.js b/packages/blaze-hot/package.js
new file mode 100644
index 000000000..1a5d5e8bb
--- /dev/null
+++ b/packages/blaze-hot/package.js
@@ -0,0 +1,20 @@
+Package.describe({
+  name: 'blaze-hot',
+  summary: "Update files using Blaze's API with HMR",
+  version: '1.0.0-beta.3',
+  git: 'https://github.com/meteor/blaze.git',
+  documentation: null,
+  debugOnly: true
+});
+
+Package.onUse(function (api) {
+  api.use('modules@0.15.0');
+  api.use('ecmascript@0.14.4');
+  api.use('blaze@2.4.0-beta.3');
+  api.use('underscore@1.0.9');
+  api.use('templating-runtime@1.4.0-beta.3');
+  api.use('hot-module-replacement@0.2.0', { weak: true });
+
+  api.addFiles('hot.js', 'client');
+  api.addFiles('update-templates.js', 'client');
+});
diff --git a/packages/blaze-hot/update-templates.js b/packages/blaze-hot/update-templates.js
new file mode 100644
index 000000000..caef9fb02
--- /dev/null
+++ b/packages/blaze-hot/update-templates.js
@@ -0,0 +1,164 @@
+export const UpdateAll = Symbol('update all templates')
+
+let renderedTemplates = {};
+let overrideTemplateContentBlock = null;
+let overrideTemplateElseBlock = null;
+
+const oldConstructView = Template.prototype.constructView;
+
+Template.prototype.constructView = function () {
+  let view = oldConstructView.apply(this, arguments);
+  let templateName = this.viewName;
+
+  view.onViewCreated(function () {
+    renderedTemplates[templateName] = renderedTemplates[templateName] || [];
+    renderedTemplates[templateName].push(view);
+  });
+
+  view.onViewDestroyed(function () {
+    const index = renderedTemplates[templateName].indexOf(view);
+    if (index > -1) {
+      renderedTemplates[templateName].splice(index, 1);
+    }
+  });
+
+  if (overrideTemplateContentBlock) {
+    view.templateContentBlock = overrideTemplateContentBlock;
+    overrideTemplateContentBlock = null;
+  }
+
+  if (overrideTemplateElseBlock) {
+    view.templateElseBlock = overrideTemplateElseBlock;
+    overrideTemplateElseBlock = null;
+  }
+
+  return view;
+}
+
+let updateRootViews = Template._applyHmrChanges;
+
+let timeout = null;
+let lastUpdateFailed = false;
+let modifiedTemplates = new Set();
+let templateViewPrefix = 'Template.';
+
+// Overrides the default _applyHmrChanges with one that updates the specific
+// views for modified templates instead of updating everything.
+Template._applyHmrChanges = function (templateName = UpdateAll) {
+  if (templateName === UpdateAll || lastUpdateFailed) {
+    lastUpdateFailed = false;
+    clearTimeout(timeout);
+    updateRootViews();
+    return;
+  } else {
+    modifiedTemplates.add(templateName);
+  }
+
+  if (timeout) {
+    return;
+  }
+
+  timeout = setTimeout(() => {
+    for (var i = 0; i < Template.__pendingReplacement.length; i++) {
+      delete Template[Template.__pendingReplacement[i]]
+    }
+
+    Template.__pendingReplacement = [];
+
+    timeout = null;
+    modifiedTemplates.forEach(templateName => {
+      modifiedTemplates.delete(templateName);
+      let viewName = templateName;
+
+      if (!(viewName in renderedTemplates)) {
+        viewName = templateViewPrefix + viewName;
+      } else {
+        console.error('[Blaze HMR] Error: view name does not start with Template');
+        return;
+      }
+
+      if (!(viewName in renderedTemplates)) {
+        return;
+      }
+
+      let views = renderedTemplates[viewName];
+      renderedTemplates[viewName] = [];
+      while (views.length > 0) {
+        let view = views.pop();
+
+        // find first parent template that isn't a content block
+        while (!view.template || view.templateContentBlock || view.templateElseBlock) {
+          if (!view.parentView) {
+            console.log('[Blaze HMR] Unable to update template', viewName);
+            return;
+          }
+
+          view = view.parentView;
+        }
+
+        if (!view.isRendered) {
+          continue;
+        }
+
+        // TODO: this can be removed if we don't update a view, and then update
+        // one of its children (we only need to update the parent).
+        Package.tracker.Tracker.flush();
+
+        let parent = view.parentView;
+        let parentElement = view._domrange.parentElement;
+        let next = view._domrange.lastNode().nextSibling;
+        let nextComment = null;
+
+        if (!next) {
+          // percolate:momentum requires a next node to show the new nodes
+          next = nextComment = document.createComment('Blaze HMR Placeholder');
+          parentElement.insertBefore(nextComment, null);
+        }
+
+        if (!parent) {
+          // TODO: we only need to update a single root view
+          return updateRootViews();
+        }
+
+        if (view.templateContentBlock) {
+          overrideTemplateContentBlock = view.templateContentBlock;
+        }
+        if (view.templateElseBlock) {
+          overrideTemplateElseBlock = view.templateElseBlock;
+        }
+
+        // Since there is a parent range, Blaze will not automatically
+        // detach the dom range.
+        view._domrange.detach();
+        view._domrange.destroy();
+        let newView;
+
+        try {
+          newView = Blaze.render(
+            Template[view.template.viewName.slice('Template.'.length)],
+            parentElement,
+            next,
+            parent
+          );
+        } catch (error) {
+          console.log('[Blaze HMR] Error re-rending template:');
+          console.error(error);
+          lastUpdateFailed = true;
+        }
+
+        let index = parent._domrange.members.findIndex(member => {
+          return member && member.view === view;
+        });
+        if (newView) {
+          parent._domrange.members.splice(index, 1, newView._domrange);
+        } else {
+          parent._domrange.members.splice(index, 1);
+        }
+
+        if (nextComment) {
+          parentElement.removeChild(nextComment);
+        }
+      }
+    });
+  });
+}
diff --git a/packages/blaze-html-templates/.versions b/packages/blaze-html-templates/.versions
index 30b46fabb..d293b1807 100644
--- a/packages/blaze-html-templates/.versions
+++ b/packages/blaze-html-templates/.versions
@@ -1,35 +1,41 @@
-babel-compiler@6.14.1
-babel-runtime@1.0.1
-base64@1.0.10
-blaze@2.3.2
-blaze-html-templates@1.1.2
-blaze-tools@1.0.10
-caching-compiler@1.1.9
-caching-html-compiler@1.1.2
-check@1.2.5
-diff-sequence@1.0.7
-ecmascript@0.6.3
-ecmascript-runtime@0.3.15
-ejson@1.0.13
-html-tools@1.0.11
-htmljs@1.0.11
-id-map@1.0.9
-jquery@1.11.10
-meteor@1.6.1
-modules@0.7.9
-modules-runtime@0.7.9
-mongo-id@1.0.6
+babel-compiler@7.6.0
+babel-runtime@1.5.0
+base64@1.0.12
+blaze@2.4.0-beta.3
+blaze-html-templates@1.2.0-beta.3
+blaze-tools@1.1.0-beta.3
+caching-compiler@1.2.2
+caching-html-compiler@1.2.0-beta.3
+check@1.3.1
+diff-sequence@1.1.1
+dynamic-import@0.6.0
+ecmascript@0.15.0
+ecmascript-runtime@0.7.0
+ecmascript-runtime-client@0.11.0
+ecmascript-runtime-server@0.10.0
+ejson@1.1.1
+fetch@0.1.1
+html-tools@1.1.0-beta.3
+htmljs@1.1.0-beta.3
+id-map@1.1.0
+inter-process-messaging@0.1.1
+meteor@1.9.3
+modern-browsers@0.1.5
+modules@0.16.0
+modules-runtime@0.12.0
+mongo-id@1.0.7
 observe-sequence@1.0.16
-ordered-dict@1.0.9
-promise@0.8.8
-random@1.0.10
+ordered-dict@1.1.0
+promise@0.11.2
+random@1.2.0
+react-fast-refresh@0.1.0
 reactive-var@1.0.11
-spacebars@1.0.15
-spacebars-compiler@1.1.2
-templating@1.3.2
-templating-compiler@1.3.2
-templating-runtime@1.3.2
-templating-tools@1.1.2
-tracker@1.1.2
-ui@1.0.12
+spacebars@1.1.0-beta.3
+spacebars-compiler@1.2.0-beta.3
+templating@1.4.0-beta.3
+templating-compiler@1.4.0-beta.3
+templating-runtime@1.4.0-beta.3
+templating-tools@1.2.0-beta.3
+tracker@1.2.0
+ui@1.0.13
 underscore@1.0.10
diff --git a/packages/blaze-html-templates/package.js b/packages/blaze-html-templates/package.js
index 10a0091a2..27188c2ce 100644
--- a/packages/blaze-html-templates/package.js
+++ b/packages/blaze-html-templates/package.js
@@ -1,22 +1,22 @@
 Package.describe({
   name: 'blaze-html-templates',
   summary: "Compile HTML templates into reactive UI with Meteor Blaze",
-  version: '1.1.2',
+  version: '1.2.0-beta.3',
   git: 'https://github.com/meteor/blaze.git'
 });
 
 Package.onUse(function(api) {
   api.imply([
     // A library for reactive user interfaces
-    'blaze@2.3.2',
+    'blaze@2.4.0-beta.3',
 
     // The following packages are basically empty shells that just exist to
     // satisfy code checking for the existence of a package. Rest assured that
     // they are not adding any bloat to your bundle.
-    'ui@1.0.12', // XXX COMPAT WITH PACKAGES BUILT FOR 0.9.0.
-    'spacebars@1.0.15', // XXX COMPAT WITH PACKAGES BUILT FOR 0.9.0
+    'ui@1.0.13', // XXX COMPAT WITH PACKAGES BUILT FOR 0.9.0.
+    'spacebars@1.1.0-beta.3', // XXX COMPAT WITH PACKAGES BUILT FOR 0.9.0
 
     // Compile .html files into Blaze reactive views
-    'templating@1.3.2'
+    'templating@1.4.0-beta.3'
   ]);
 });
diff --git a/packages/blaze-tools/.versions b/packages/blaze-tools/.versions
index ea0b17337..48f9fced0 100644
--- a/packages/blaze-tools/.versions
+++ b/packages/blaze-tools/.versions
@@ -1,47 +1,51 @@
-allow-deny@1.0.5
-babel-compiler@6.14.1
-babel-runtime@1.0.1
-base64@1.0.10
-binary-heap@1.0.10
-blaze@2.3.2
-blaze-tools@1.0.10
-boilerplate-generator@1.0.11
-callback-hook@1.0.10
-check@1.2.5
-ddp@1.2.5
-ddp-client@1.3.3
-ddp-common@1.2.8
-ddp-server@1.3.13
-diff-sequence@1.0.7
-ecmascript@0.6.3
-ecmascript-runtime@0.3.15
-ejson@1.0.13
+allow-deny@1.1.0
+babel-compiler@7.6.0
+babel-runtime@1.5.0
+base64@1.0.12
+binary-heap@1.0.11
+blaze-tools@1.1.0-beta.3
+boilerplate-generator@1.7.1
+callback-hook@1.3.0
+check@1.3.1
+ddp@1.4.0
+ddp-client@2.4.0
+ddp-common@1.4.0
+ddp-server@2.3.2
+diff-sequence@1.1.1
+dynamic-import@0.6.0
+ecmascript@0.15.0
+ecmascript-runtime@0.7.0
+ecmascript-runtime-client@0.11.0
+ecmascript-runtime-server@0.10.0
+ejson@1.1.1
+fetch@0.1.1
 geojson-utils@1.0.10
-html-tools@1.0.11
-htmljs@1.0.11
-id-map@1.0.9
-jquery@1.11.10
-local-test:blaze-tools@1.0.10
-logging@1.1.17
-meteor@1.6.1
-minimongo@1.0.21
-modules@0.7.9
-modules-runtime@0.7.9
-mongo@1.1.16
-mongo-id@1.0.6
-npm-mongo@2.2.24
-observe-sequence@1.0.16
-ordered-dict@1.0.9
-promise@0.8.8
-random@1.0.10
-reactive-var@1.0.11
-retry@1.0.9
-routepolicy@1.0.12
-spacebars@1.0.15
-spacebars-compiler@1.1.2
-tinytest@1.0.12
-tracker@1.1.2
-ui@1.0.12
+html-tools@1.1.0-beta.3
+htmljs@1.1.0-beta.3
+id-map@1.1.0
+inter-process-messaging@0.1.1
+local-test:blaze-tools@1.1.0-beta.3
+logging@1.2.0
+meteor@1.9.3
+minimongo@1.6.1
+modern-browsers@0.1.5
+modules@0.16.0
+modules-runtime@0.12.0
+mongo@1.10.1
+mongo-decimal@0.1.2
+mongo-dev-server@1.1.0
+mongo-id@1.0.7
+npm-mongo@3.8.1
+ordered-dict@1.1.0
+promise@0.11.2
+random@1.2.0
+react-fast-refresh@0.1.0
+reload@1.3.1
+retry@1.1.0
+routepolicy@1.1.0
+socket-stream-client@0.3.1
+tinytest@1.1.0
+tracker@1.2.0
 underscore@1.0.10
-webapp@1.3.14
-webapp-hashing@1.0.9
+webapp@1.10.0
+webapp-hashing@1.1.0
diff --git a/packages/blaze-tools/package.js b/packages/blaze-tools/package.js
index 77503f8e7..bca22bfcf 100644
--- a/packages/blaze-tools/package.js
+++ b/packages/blaze-tools/package.js
@@ -1,30 +1,23 @@
 Package.describe({
   name: 'blaze-tools',
   summary: "Compile-time tools for Blaze",
-  version: '1.0.10',
+  version: '1.1.0-beta.3',
   git: 'https://github.com/meteor/blaze.git'
 });
 
 Package.onUse(function (api) {
-  api.use('underscore@1.0.9');
+  api.use('ecmascript@0.14.4');
+  api.use('htmljs@1.1.0-beta.3');
 
-  api.export('BlazeTools');
-
-  api.use('htmljs@1.0.11');
-
-  api.addFiles([
-    'preamble.js',
-    'tokens.js',
-    'tojs.js'
-  ]);
+  api.mainModule('preamble.js');
 });
 
 Package.onTest(function (api) {
   api.use('tinytest@1.0.11');
-  api.use('underscore@1.0.9');
+  api.use('ecmascript');
 
   api.use('blaze-tools');
-  api.use('html-tools@1.0.11');
+  api.use('html-tools@1.1.0-beta.3');
 
   api.addFiles([
     'token_tests.js'
diff --git a/packages/blaze-tools/preamble.js b/packages/blaze-tools/preamble.js
index 2211e646a..0ea86ee21 100644
--- a/packages/blaze-tools/preamble.js
+++ b/packages/blaze-tools/preamble.js
@@ -1 +1,27 @@
-BlazeTools = {};
+
+import {
+  EmitCode,
+  toJSLiteral,
+  toObjectLiteralKey,
+  ToJSVisitor,
+  toJS
+} from './tojs';
+
+import {
+  parseNumber,
+  parseIdentifierName,
+  parseExtendedIdentifierName,
+  parseStringLiteral
+} from './tokens';
+
+export const BlazeTools = {
+  EmitCode,
+  toJSLiteral,
+  toObjectLiteralKey,
+  ToJSVisitor,
+  toJS,
+  parseNumber,
+  parseIdentifierName,
+  parseExtendedIdentifierName,
+  parseStringLiteral
+};
diff --git a/packages/blaze-tools/tojs.js b/packages/blaze-tools/tojs.js
index 730dc24d5..d50bce98c 100644
--- a/packages/blaze-tools/tojs.js
+++ b/packages/blaze-tools/tojs.js
@@ -1,50 +1,51 @@
+import { HTML } from 'meteor/htmljs';
 
-BlazeTools.EmitCode = function (value) {
-  if (! (this instanceof BlazeTools.EmitCode))
+
+export function EmitCode (value) {
+  if (! (this instanceof EmitCode))
     // called without `new`
-    return new BlazeTools.EmitCode(value);
+    return new EmitCode(value);
 
   if (typeof value !== 'string')
-    throw new Error('BlazeTools.EmitCode must be constructed with a string');
+    throw new Error('EmitCode must be constructed with a string');
 
   this.value = value;
-};
-BlazeTools.EmitCode.prototype.toJS = function (visitor) {
+}
+
+EmitCode.prototype.toJS = function (visitor) {
   return this.value;
 };
 
 // Turns any JSONable value into a JavaScript literal.
-toJSLiteral = function (obj) {
+export function toJSLiteral (obj) {
   // See <http://timelessrepo.com/json-isnt-a-javascript-subset> for `\u2028\u2029`.
   // Also escape Unicode surrogates.
   return (JSON.stringify(obj)
           .replace(/[\u2028\u2029\ud800-\udfff]/g, function (c) {
             return '\\u' + ('000' + c.charCodeAt(0).toString(16)).slice(-4);
           }));
-};
-BlazeTools.toJSLiteral = toJSLiteral;
+}
 
 
 
 var jsReservedWordSet = (function (set) {
-  _.each("abstract else instanceof super boolean enum int switch break export interface synchronized byte extends let this case false long throw catch final native throws char finally new transient class float null true const for package try continue function private typeof debugger goto protected var default if public void delete implements return volatile do import short while double in static with".split(' '), function (w) {
+  "abstract else instanceof super boolean enum int switch break export interface synchronized byte extends let this case false long throw catch final native throws char finally new transient class float null true const for package try continue function private typeof debugger goto protected var default if public void delete implements return volatile do import short while double in static with".split(' ').forEach(function (w) {
     set[w] = 1;
   });
   return set;
 })({});
 
-toObjectLiteralKey = function (k) {
+export function toObjectLiteralKey (k) {
   if (/^[a-zA-Z$_][a-zA-Z$0-9_]*$/.test(k) && jsReservedWordSet[k] !== 1)
     return k;
   return toJSLiteral(k);
-};
-BlazeTools.toObjectLiteralKey = toObjectLiteralKey;
+}
 
 var hasToJS = function (x) {
   return x.toJS && (typeof (x.toJS) === 'function');
 };
 
-ToJSVisitor = HTML.Visitor.extend();
+export const ToJSVisitor = HTML.Visitor.extend();
 ToJSVisitor.def({
   visitNull: function (nullOrUndefined) {
     return 'null';
@@ -149,8 +150,7 @@ ToJSVisitor.def({
     return null;
   }
 });
-BlazeTools.ToJSVisitor = ToJSVisitor;
 
-BlazeTools.toJS = function (content) {
+export function toJS (content) {
   return (new ToJSVisitor).visit(content);
-};
+}
diff --git a/packages/blaze-tools/token_tests.js b/packages/blaze-tools/token_tests.js
index 91aa8bd36..530be1dd3 100644
--- a/packages/blaze-tools/token_tests.js
+++ b/packages/blaze-tools/token_tests.js
@@ -1,3 +1,6 @@
+import { BlazeTools } from 'meteor/blaze-tools';
+import { HTMLTools } from 'meteor/html-tools';
+
 Tinytest.add("blaze-tools - token parsers", function (test) {
 
   var run = function (func, input, expected) {
@@ -40,7 +43,7 @@ Tinytest.add("blaze-tools - token parsers", function (test) {
   runValue(parseNumber, "-0xa", -10);
   runValue(parseNumber, "1e+1", 10);
 
-  _.each([parseIdentifierName, parseExtendedIdentifierName], function (f) {
+  [parseIdentifierName, parseExtendedIdentifierName].forEach(function (f) {
     run(f, "a", "a");
     run(f, "true", "true");
     run(f, "null", "null");
diff --git a/packages/blaze-tools/tokens.js b/packages/blaze-tools/tokens.js
index 441d070fb..3f13d6793 100644
--- a/packages/blaze-tools/tokens.js
+++ b/packages/blaze-tools/tokens.js
@@ -52,7 +52,7 @@ var rLineContinuation =
       /^\\(\r\n|[\u000A\u000D\u2028\u2029])/;
 
 
-BlazeTools.parseNumber = function (scanner) {
+export function parseNumber (scanner) {
   var startPos = scanner.pos;
 
   var isNegative = false;
@@ -75,9 +75,9 @@ BlazeTools.parseNumber = function (scanner) {
   var value = Number(matchText);
   value = (isNegative ? -value : value);
   return { text: text, value: value };
-};
+}
 
-BlazeTools.parseIdentifierName = function (scanner) {
+export function parseIdentifierName (scanner) {
   var startPos = scanner.pos;
   var rest = scanner.rest();
   var match = rIdentifierPrefix.exec(rest);
@@ -106,13 +106,13 @@ BlazeTools.parseIdentifierName = function (scanner) {
   }
 
   return scanner.input.substring(startPos, scanner.pos);
-};
+}
 
-BlazeTools.parseExtendedIdentifierName = function (scanner) {
+export function parseExtendedIdentifierName (scanner) {
   // parse an identifier name optionally preceded by '@'
   if (scanner.peek() === '@') {
     scanner.pos++;
-    var afterAt = BlazeTools.parseIdentifierName(scanner);
+    var afterAt = parseIdentifierName(scanner);
     if (afterAt) {
       return '@' + afterAt;
     } else {
@@ -120,11 +120,11 @@ BlazeTools.parseExtendedIdentifierName = function (scanner) {
       return null;
     }
   } else {
-    return BlazeTools.parseIdentifierName(scanner);
+    return parseIdentifierName(scanner);
   }
-};
+}
 
-BlazeTools.parseStringLiteral = function (scanner) {
+export function parseStringLiteral (scanner) {
   var startPos = scanner.pos;
   var rest = scanner.rest();
   var match = rStringQuote.exec(rest);
@@ -190,4 +190,4 @@ BlazeTools.parseStringLiteral = function (scanner) {
   var text = scanner.input.substring(startPos, scanner.pos);
   var value = JSON.parse(jsonLiteral);
   return { text: text, value: value };
-};
+}
diff --git a/packages/blaze/.versions b/packages/blaze/.versions
index 43143a22c..9c858935c 100644
--- a/packages/blaze/.versions
+++ b/packages/blaze/.versions
@@ -1,64 +1,64 @@
 allow-deny@1.1.0
-babel-compiler@7.4.1
-babel-runtime@1.4.0
+babel-compiler@7.6.0
+babel-runtime@1.5.0
 base64@1.0.12
 binary-heap@1.0.11
-blaze@2.3.4
-blaze-tools@1.0.10
-boilerplate-generator@1.6.0
-caching-compiler@1.2.1
+blaze@2.4.0-beta.3
+blaze-tools@1.1.0-beta.3
+boilerplate-generator@1.7.1
+caching-compiler@1.2.2
 caching-html-compiler@1.1.2
-callback-hook@1.2.0
+callback-hook@1.3.0
 check@1.3.1
 ddp@1.4.0
-ddp-client@2.3.3
+ddp-client@2.4.0
 ddp-common@1.4.0
-ddp-server@2.3.0
-deps@1.0.12
+ddp-server@2.3.2
 diff-sequence@1.1.1
-dynamic-import@0.5.1
-ecmascript@0.13.0
+dynamic-import@0.6.0
+ecmascript@0.15.0
 ecmascript-runtime@0.7.0
-ecmascript-runtime-client@0.9.0
-ecmascript-runtime-server@0.8.0
-ejson@1.1.0
+ecmascript-runtime-client@0.11.0
+ecmascript-runtime-server@0.10.0
+ejson@1.1.1
 fetch@0.1.1
 geojson-utils@1.0.10
-html-tools@1.0.11
-htmljs@1.0.11
+html-tools@1.1.0-beta.3
+htmljs@1.1.0-beta.3
 id-map@1.1.0
-inter-process-messaging@0.1.0
+inter-process-messaging@0.1.1
 jquery@1.11.10
-local-test:blaze@2.3.4
-logging@1.1.20
+local-test:blaze@2.4.0-beta.3
+logging@1.2.0
 meteor@1.9.3
-minimongo@1.4.5
-modern-browsers@0.1.4
-modules@0.14.0
-modules-runtime@0.11.0
-mongo@1.7.0
-mongo-decimal@0.1.1
+minimongo@1.6.1
+modern-browsers@0.1.5
+modules@0.16.0
+modules-runtime@0.12.0
+mongo@1.10.1
+mongo-decimal@0.1.2
 mongo-dev-server@1.1.0
 mongo-id@1.0.7
-npm-mongo@3.2.0
+npm-mongo@3.8.1
 observe-sequence@1.0.16
 ordered-dict@1.1.0
 promise@0.11.2
-random@1.1.0
+random@1.2.0
+react-fast-refresh@0.1.0
 reactive-var@1.0.11
-reload@1.3.0
+reload@1.3.1
 retry@1.1.0
 routepolicy@1.1.0
-socket-stream-client@0.2.2
+socket-stream-client@0.3.1
 spacebars@1.0.15
 spacebars-compiler@1.1.2
 templating@1.3.2
 templating-compiler@1.3.2
 templating-runtime@1.3.2
 templating-tools@1.1.2
-test-helpers@1.1.0
+test-helpers@1.2.0
 tinytest@1.1.0
 tracker@1.2.0
 underscore@1.0.10
-webapp@1.7.5
-webapp-hashing@1.0.9
+webapp@1.10.0
+webapp-hashing@1.1.0
diff --git a/packages/blaze/builtins.js b/packages/blaze/builtins.js
index 18e165c09..21fcd21eb 100644
--- a/packages/blaze/builtins.js
+++ b/packages/blaze/builtins.js
@@ -1,5 +1,5 @@
 Blaze._calculateCondition = function (cond) {
-  if (cond instanceof Array && cond.length === 0)
+  if (HTML.isArray(cond) && cond.length === 0)
     cond = false;
   return !! cond;
 };
diff --git a/packages/blaze/package.js b/packages/blaze/package.js
index 7c5d4be2f..39bfc6e35 100644
--- a/packages/blaze/package.js
+++ b/packages/blaze/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: 'blaze',
   summary: "Meteor Reactive Templating library",
-  version: '2.3.4',
+  version: '2.4.0-beta.3',
   git: 'https://github.com/meteor/blaze.git'
 });
 
@@ -13,7 +13,7 @@ Package.onUse(function (api) {
   api.use('observe-sequence@1.0.12');
   api.use('reactive-var@1.0.10');
   api.use('ordered-dict@1.0.9');
-  api.use('ecmascript@0.12.7');
+  api.use('ecmascript@0.14.4');
 
   api.export([
     'Blaze',
@@ -21,8 +21,8 @@ Package.onUse(function (api) {
     'Handlebars'
   ]);
 
-  api.use('htmljs@1.0.11');
-  api.imply('htmljs@1.0.11');
+  api.use('htmljs@1.1.0-beta.3');
+  api.imply('htmljs@1.1.0-beta.3');
 
   api.addFiles([
     'preamble.js'
@@ -49,6 +49,7 @@ Package.onUse(function (api) {
 });
 
 Package.onTest(function (api) {
+  api.use('ecmascript@0.14.4')
   api.use('tinytest@1.0.11');
   api.use('test-helpers@1.0.10');
   api.use('jquery@1.11.9 || 3.0.0'); // strong dependency, for testing jQuery backend
@@ -57,9 +58,9 @@ Package.onTest(function (api) {
   api.use('tracker@1.1.0');
 
   api.use('blaze');
-  api.use('blaze-tools@1.0.10'); // for BlazeTools.toJS
-  api.use('html-tools@1.0.11');
-  api.use('templating@1.3.2');
+  api.use('blaze-tools@1.1.0-beta.3'); // for BlazeTools.toJS
+  api.use('html-tools@1.1.0-beta.3');
+  api.use('templating');
 
   api.addFiles('view_tests.js');
   api.addFiles('render_tests.js', 'client');
diff --git a/packages/blaze/render_tests.js b/packages/blaze/render_tests.js
index b23bb06eb..0802d8e4d 100644
--- a/packages/blaze/render_tests.js
+++ b/packages/blaze/render_tests.js
@@ -1,3 +1,5 @@
+import { BlazeTools } from 'meteor/blaze-tools';
+
 var toCode = BlazeTools.toJS;
 
 var P = HTML.P;
diff --git a/packages/blaze/view.js b/packages/blaze/view.js
index 50d7712ce..4cbdea531 100644
--- a/packages/blaze/view.js
+++ b/packages/blaze/view.js
@@ -598,6 +598,8 @@ var contentAsFunc = function (content) {
   }
 };
 
+Blaze.__rootViews = [];
+
 /**
  * @summary Renders a template or View to DOM nodes and inserts it into the DOM, returning a rendered [View](#Blaze-View) which can be passed to [`Blaze.remove`](#Blaze-remove).
  * @locus Client
@@ -629,8 +631,22 @@ Blaze.render = function (content, parentElement, nextNode, parentView) {
   parentView = parentView || currentViewIfRendering();
 
   var view = contentAsView(content);
-  Blaze._materializeView(view, parentView);
 
+  // TODO: this is only needed in development
+  if (!parentView) {
+    view.onViewCreated(function () {
+      Blaze.__rootViews.push(view);
+    });
+
+    view.onViewDestroyed(function () {
+      var index = Blaze.__rootViews.indexOf(view);
+      if (index > -1) {
+        Blaze.__rootViews.splice(index, 1);
+      }
+    });
+  }
+
+  Blaze._materializeView(view, parentView);
   if (parentElement) {
     view._domrange.attach(parentElement, nextNode);
   }
diff --git a/packages/caching-html-compiler/.versions b/packages/caching-html-compiler/.versions
index 0df18c817..392f1632d 100644
--- a/packages/caching-html-compiler/.versions
+++ b/packages/caching-html-compiler/.versions
@@ -1,18 +1,24 @@
-babel-compiler@6.14.1
-babel-runtime@1.0.1
-blaze-tools@1.0.10
-caching-compiler@1.1.9
-caching-html-compiler@1.1.2
-ecmascript@0.6.3
-ecmascript-runtime@0.3.15
-html-tools@1.0.11
-htmljs@1.0.11
-meteor@1.6.1
-modules@0.7.9
-modules-runtime@0.7.9
-promise@0.8.8
-random@1.0.10
-spacebars-compiler@1.1.2
-templating-tools@1.1.2
-tracker@1.1.2
+babel-compiler@7.6.0
+babel-runtime@1.5.0
+blaze-tools@1.1.0-beta.3
+caching-compiler@1.2.2
+caching-html-compiler@1.2.0-beta.3
+dynamic-import@0.6.0
+ecmascript@0.15.0
+ecmascript-runtime@0.7.0
+ecmascript-runtime-client@0.11.0
+ecmascript-runtime-server@0.10.0
+fetch@0.1.1
+html-tools@1.1.0-beta.3
+htmljs@1.1.0-beta.3
+inter-process-messaging@0.1.1
+meteor@1.9.3
+modern-browsers@0.1.5
+modules@0.16.0
+modules-runtime@0.12.0
+promise@0.11.2
+random@1.2.0
+react-fast-refresh@0.1.0
+spacebars-compiler@1.2.0-beta.3
+templating-tools@1.2.0-beta.3
 underscore@1.0.10
diff --git a/packages/caching-html-compiler/caching-html-compiler.js b/packages/caching-html-compiler/caching-html-compiler.js
index f4819b324..e6e25c0a5 100644
--- a/packages/caching-html-compiler/caching-html-compiler.js
+++ b/packages/caching-html-compiler/caching-html-compiler.js
@@ -47,6 +47,7 @@ CachingHtmlCompiler = class CachingHtmlCompiler extends CachingCompiler {
     return [
       inputFile.getArch(),
       inputFile.getSourceHash(),
+      inputFile.hmrAvailable && inputFile.hmrAvailable()
     ];
   }
 
@@ -61,7 +62,7 @@ CachingHtmlCompiler = class CachingHtmlCompiler extends CachingCompiler {
         tagNames: ["body", "head", "template"]
       });
 
-      return this.tagHandlerFunc(tags);
+      return this.tagHandlerFunc(tags, inputFile.hmrAvailable && inputFile.hmrAvailable());
     } catch (e) {
       if (e instanceof TemplatingTools.CompileError) {
         inputFile.error({
diff --git a/packages/caching-html-compiler/package.js b/packages/caching-html-compiler/package.js
index 850a81def..583477dad 100644
--- a/packages/caching-html-compiler/package.js
+++ b/packages/caching-html-compiler/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: 'caching-html-compiler',
   summary: "Pluggable class for compiling HTML into templates",
-  version: '1.1.3',
+  version: '1.2.0-beta.3',
   git: 'https://github.com/meteor/blaze.git'
 });
 
@@ -9,13 +9,13 @@ Package.onUse(function(api) {
   api.use([
     'underscore@1.0.9',
     'caching-compiler@1.1.7',
-    'ecmascript@0.5.8'
+    'ecmascript@0.14.4'
   ]);
 
   api.export('CachingHtmlCompiler', 'server');
 
   api.use([
-    'templating-tools@1.1.2'
+    'templating-tools@1.2.0-beta.3'
   ]);
 
   api.addFiles([
diff --git a/packages/html-tools/.versions b/packages/html-tools/.versions
index a9238181e..c7b70b1c2 100644
--- a/packages/html-tools/.versions
+++ b/packages/html-tools/.versions
@@ -1,47 +1,51 @@
-allow-deny@1.0.5
-babel-compiler@6.14.1
-babel-runtime@1.0.1
-base64@1.0.10
-binary-heap@1.0.10
-blaze@2.3.2
+allow-deny@1.1.0
+babel-compiler@7.6.0
+babel-runtime@1.5.0
+base64@1.0.12
+binary-heap@1.0.11
 blaze-tools@1.0.10
-boilerplate-generator@1.0.11
-callback-hook@1.0.10
-check@1.2.5
-ddp@1.2.5
-ddp-client@1.3.3
-ddp-common@1.2.8
-ddp-server@1.3.13
-diff-sequence@1.0.7
-ecmascript@0.6.3
-ecmascript-runtime@0.3.15
-ejson@1.0.13
+boilerplate-generator@1.7.1
+callback-hook@1.3.0
+check@1.3.1
+ddp@1.4.0
+ddp-client@2.4.0
+ddp-common@1.4.0
+ddp-server@2.3.2
+diff-sequence@1.1.1
+dynamic-import@0.6.0
+ecmascript@0.15.0
+ecmascript-runtime@0.7.0
+ecmascript-runtime-client@0.11.0
+ecmascript-runtime-server@0.10.0
+ejson@1.1.1
+fetch@0.1.1
 geojson-utils@1.0.10
-html-tools@1.0.11
-htmljs@1.0.11
-id-map@1.0.9
-jquery@1.11.10
-local-test:html-tools@1.0.11
-logging@1.1.17
-meteor@1.6.1
-minimongo@1.0.21
-modules@0.7.9
-modules-runtime@0.7.9
-mongo@1.1.16
-mongo-id@1.0.6
-npm-mongo@2.2.24
-observe-sequence@1.0.16
-ordered-dict@1.0.9
-promise@0.8.8
-random@1.0.10
-reactive-var@1.0.11
-retry@1.0.9
-routepolicy@1.0.12
-spacebars@1.0.15
-spacebars-compiler@1.1.2
-tinytest@1.0.12
-tracker@1.1.2
-ui@1.0.12
+html-tools@1.1.0-beta.3
+htmljs@1.1.0-beta.3
+id-map@1.1.0
+inter-process-messaging@0.1.1
+local-test:html-tools@1.1.0-beta.3
+logging@1.2.0
+meteor@1.9.3
+minimongo@1.6.1
+modern-browsers@0.1.5
+modules@0.16.0
+modules-runtime@0.12.0
+mongo@1.10.1
+mongo-decimal@0.1.2
+mongo-dev-server@1.1.0
+mongo-id@1.0.7
+npm-mongo@3.8.1
+ordered-dict@1.1.0
+promise@0.11.2
+random@1.2.0
+react-fast-refresh@0.1.0
+reload@1.3.1
+retry@1.1.0
+routepolicy@1.1.0
+socket-stream-client@0.3.1
+tinytest@1.1.0
+tracker@1.2.0
 underscore@1.0.10
-webapp@1.3.14
-webapp-hashing@1.0.9
+webapp@1.10.0
+webapp-hashing@1.1.0
diff --git a/packages/html-tools/charref.js b/packages/html-tools/charref.js
index ff437ee8b..c0725abb0 100644
--- a/packages/html-tools/charref.js
+++ b/packages/html-tools/charref.js
@@ -1,3 +1,4 @@
+import { makeRegexMatcher } from './scanner';
 
 // http://www.whatwg.org/specs/web-apps/current-work/multipage/entities.json
 
@@ -2360,7 +2361,7 @@ var isLegalCodepoint = function (cp) {
 // either `"`, `'`, or `>` and is supplied when parsing attribute values.  NOTE: In the current spec, the
 // value of `allowedChar` doesn't actually seem to end up mattering, but there is still some debate about
 // the right approach to ampersands.
-getCharacterReference = HTMLTools.Parse.getCharacterReference = function (scanner, inAttribute, allowedChar) {
+export function getCharacterReference (scanner, inAttribute, allowedChar) {
   if (scanner.peek() !== '&')
     // no ampersand
     return null;
@@ -2411,4 +2412,4 @@ getCharacterReference = HTMLTools.Parse.getCharacterReference = function (scanne
       return null;
     }
   }
-};
+}
diff --git a/packages/html-tools/charref_tests.js b/packages/html-tools/charref_tests.js
index 35a991aeb..2c7d555ad 100644
--- a/packages/html-tools/charref_tests.js
+++ b/packages/html-tools/charref_tests.js
@@ -1,3 +1,5 @@
+import { HTMLTools } from 'meteor/html-tools';
+
 var Scanner = HTMLTools.Scanner;
 var getCharacterReference = HTMLTools.Parse.getCharacterReference;
 
@@ -19,7 +21,7 @@ Tinytest.add("html-tools - entities", function (test) {
     test.equal(result, {
       t: 'CharRef',
       v: match,
-      cp: _.map(codepoints,
+      cp: codepoints.map(
                 function (x) { return (typeof x === 'string' ?
                                        x.charCodeAt(0) : x); })
     });
diff --git a/packages/html-tools/main.js b/packages/html-tools/main.js
new file mode 100644
index 000000000..1221313c2
--- /dev/null
+++ b/packages/html-tools/main.js
@@ -0,0 +1,27 @@
+
+import { getCharacterReference } from './charref';
+import { asciiLowerCase, properCaseTagName, properCaseAttributeName} from "./utils";
+import { TemplateTag } from './templatetag'
+import { Scanner } from './scanner';
+import { parseFragment, codePointToString, getContent, getRCData } from './parse';
+import { getComment, getDoctype, getHTMLToken, getTagToken, TEMPLATE_TAG_POSITION } from './tokenize';
+
+export const HTMLTools = {
+  asciiLowerCase,
+  properCaseTagName,
+  properCaseAttributeName,
+  TemplateTag,
+  Scanner,
+  parseFragment,
+  codePointToString,
+  TEMPLATE_TAG_POSITION,
+  Parse: {
+    getCharacterReference,
+    getContent,
+    getRCData,
+    getComment,
+    getDoctype,
+    getHTMLToken,
+    getTagToken,
+  }
+};
diff --git a/packages/html-tools/package.js b/packages/html-tools/package.js
index 75f84bc1b..39565221f 100644
--- a/packages/html-tools/package.js
+++ b/packages/html-tools/package.js
@@ -1,33 +1,25 @@
 Package.describe({
   name: 'html-tools',
   summary: "Standards-compliant HTML tools",
-  version: '1.0.11',
+  version: '1.1.0-beta.3',
   git: 'https://github.com/meteor/blaze.git'
 });
 
 Package.onUse(function (api) {
-  api.export('HTMLTools');
+  api.use('ecmascript@0.14.4');
+  api.use('htmljs@1.1.0-beta.3');
+  api.imply('htmljs@1.1.0-beta.3');
 
-  api.use('htmljs@1.0.11');
-  api.imply('htmljs@1.0.11');
-
-  api.addFiles([
-    'utils.js',
-    'scanner.js',
-    'charref.js',
-    'tokenize.js',
-    'templatetag.js',
-    'parse.js'
-  ]);
+  api.mainModule('main.js');
 });
 
 Package.onTest(function (api) {
+  api.use('ecmascript');
   api.use('tinytest@1.0.11');
-  api.use('underscore@1.0.9');
 
   api.use('html-tools');
-  api.use('htmljs@1.0.11');
-  api.use('blaze-tools@1.0.10'); // for `toJS`
+  api.use('htmljs@1.1.0-beta.3');
+  api.use('blaze-tools'); // for `toJS`
 
   api.addFiles([
     'charref_tests.js',
diff --git a/packages/html-tools/parse.js b/packages/html-tools/parse.js
index 109e9fa2f..248b1ab3c 100644
--- a/packages/html-tools/parse.js
+++ b/packages/html-tools/parse.js
@@ -1,7 +1,11 @@
+import { HTML } from 'meteor/htmljs';
+import { Scanner } from './scanner';
+import { properCaseAttributeName } from './utils';
+import { getHTMLToken, isLookingAtEndTag } from './tokenize';
 
 // Parse a "fragment" of HTML, up to the end of the input or a particular
 // template tag (using the "shouldStop" option).
-HTMLTools.parseFragment = function (input, options) {
+export function parseFragment(input, options) {
   var scanner;
   if (typeof input === 'string')
     scanner = new Scanner(input);
@@ -69,14 +73,14 @@ HTMLTools.parseFragment = function (input, options) {
   }
 
   return result;
-};
+}
 
 // Take a numeric Unicode code point, which may be larger than 16 bits,
 // and encode it as a JavaScript UTF-16 string.
 //
 // Adapted from
 // http://stackoverflow.com/questions/7126384/expressing-utf-16-unicode-characters-in-javascript/7126661.
-codePointToString = HTMLTools.codePointToString = function(cp) {
+export function codePointToString(cp) {
   if (cp >= 0 && cp <= 0xD7FF || cp >= 0xE000 && cp <= 0xFFFF) {
     return String.fromCharCode(cp);
   } else if (cp >= 0x10000 && cp <= 0x10FFFF) {
@@ -97,9 +101,9 @@ codePointToString = HTMLTools.codePointToString = function(cp) {
   } else {
     return '';
   }
-};
+}
 
-getContent = HTMLTools.Parse.getContent = function (scanner, shouldStopFunc) {
+export function getContent (scanner, shouldStopFunc) {
   var items = [];
 
   while (! scanner.isEOF()) {
@@ -187,7 +191,7 @@ getContent = HTMLTools.Parse.getContent = function (scanner, shouldStopFunc) {
         // as in `FOO.apply(null, content)`.
         if (content == null)
           content = [];
-        else if (! (content instanceof Array))
+        else if (! HTML.isArray(content))
           content = [content];
 
         items.push(HTML.getTag(tagName).apply(
@@ -204,7 +208,7 @@ getContent = HTMLTools.Parse.getContent = function (scanner, shouldStopFunc) {
     return items[0];
   else
     return items;
-};
+}
 
 var pushOrAppendString = function (items, string) {
   if (items.length &&
@@ -215,7 +219,7 @@ var pushOrAppendString = function (items, string) {
 };
 
 // get RCDATA to go in the lowercase (or camel case) tagName (e.g. "textarea")
-getRCData = HTMLTools.Parse.getRCData = function (scanner, tagName, shouldStopFunc) {
+export function getRCData(scanner, tagName, shouldStopFunc) {
   var items = [];
 
   while (! scanner.isEOF()) {
@@ -250,7 +254,7 @@ getRCData = HTMLTools.Parse.getRCData = function (scanner, tagName, shouldStopFu
     return items[0];
   else
     return items;
-};
+}
 
 var getRawText = function (scanner, tagName, shouldStopFunc) {
   var items = [];
@@ -350,7 +354,7 @@ var parseAttrs = function (attrs) {
 
     var outValue = (inValue.length === 0 ? '' :
                     (outParts.length === 1 ? outParts[0] : outParts));
-    var properKey = HTMLTools.properCaseAttributeName(k);
+    var properKey = properCaseAttributeName(k);
     result[properKey] = outValue;
   }
 
diff --git a/packages/html-tools/parse_tests.js b/packages/html-tools/parse_tests.js
index 3bc69be8c..5029b6714 100644
--- a/packages/html-tools/parse_tests.js
+++ b/packages/html-tools/parse_tests.js
@@ -1,3 +1,7 @@
+import { HTML } from 'meteor/htmljs';
+import { HTMLTools } from 'meteor/html-tools';
+import { BlazeTools} from 'meteor/blaze-tools';
+
 var Scanner = HTMLTools.Scanner;
 var getContent = HTMLTools.Parse.getContent;
 
@@ -190,8 +194,8 @@ Tinytest.add("html-tools - parseFragment", function (test) {
   test.equal(BlazeTools.toJS(HTMLTools.parseFragment("<div><p id=foo>Hello</p></div>")),
              BlazeTools.toJS(DIV(P({id:'foo'}, 'Hello'))));
 
-  _.each(['asdf</br>', '{{!foo}}</br>', '{{!foo}} </br>',
-          'asdf</a>', '{{!foo}}</a>', '{{!foo}} </a>'], function (badFrag) {
+  ['asdf</br>', '{{!foo}}</br>', '{{!foo}} </br>',
+          'asdf</a>', '{{!foo}}</a>', '{{!foo}} </a>'].forEach(function (badFrag) {
             test.throws(function() {
               HTMLTools.parseFragment(badFrag);
             }, /Unexpected HTML close tag/);
diff --git a/packages/html-tools/scanner.js b/packages/html-tools/scanner.js
index d110a8a81..6f1b51726 100644
--- a/packages/html-tools/scanner.js
+++ b/packages/html-tools/scanner.js
@@ -9,10 +9,10 @@
 // * `scanner.isEOF()` - true if `pos` is at or beyond the end of `input`
 // * `scanner.fatal(msg)` - throw an error indicating a problem at `pos`
 
-Scanner = HTMLTools.Scanner = function (input) {
+export function Scanner (input) {
   this.input = input; // public, read-only
   this.pos = 0; // public, read-write
-};
+}
 
 Scanner.prototype.rest = function () {
   // Slicing a string is O(1) in modern JavaScript VMs (including old IE).
@@ -69,7 +69,7 @@ Scanner.prototype.peek = function () {
 // the current position of the scanner is advanced.  If it fails, the
 // current position is not advanced and a falsy value (typically null)
 // is returned.
-makeRegexMatcher = function (regex) {
+export function makeRegexMatcher(regex) {
   return function (scanner) {
     var match = regex.exec(scanner.rest());
 
@@ -79,4 +79,4 @@ makeRegexMatcher = function (regex) {
     scanner.pos += match[0].length;
     return match[1] || match[0];
   };
-};
+}
diff --git a/packages/html-tools/templatetag.js b/packages/html-tools/templatetag.js
index f94f9fd21..3bc952db7 100644
--- a/packages/html-tools/templatetag.js
+++ b/packages/html-tools/templatetag.js
@@ -11,17 +11,17 @@ var _assign = function (tgt, src) {
 };
 
 
-HTMLTools.TemplateTag = function (props) {
-  if (! (this instanceof HTMLTools.TemplateTag))
+export function TemplateTag (props) {
+  if (! (this instanceof TemplateTag))
     // called without `new`
-    return new HTMLTools.TemplateTag;
+    return new TemplateTag;
 
   if (props)
     _assign(this, props);
-};
+}
 
-_assign(HTMLTools.TemplateTag.prototype, {
-  constructorName: 'HTMLTools.TemplateTag',
+_assign(TemplateTag.prototype, {
+  constructorName: 'TemplateTag',
   toJS: function (visitor) {
     return visitor.generateCall(this.constructorName,
                                 _assign({}, this));
diff --git a/packages/html-tools/tokenize.js b/packages/html-tools/tokenize.js
index de0b9c066..55cbd3ecf 100644
--- a/packages/html-tools/tokenize.js
+++ b/packages/html-tools/tokenize.js
@@ -1,3 +1,8 @@
+import { asciiLowerCase, properCaseTagName, properCaseAttributeName } from './utils';
+import { TemplateTag } from './templatetag';
+import { getCharacterReference } from './charref';
+import { makeRegexMatcher } from './scanner';
+
 // Token types:
 //
 // { t: 'Doctype',
@@ -54,7 +59,7 @@ var convertCRLF = function (str) {
   return str.replace(/\r\n?/g, '\n');
 };
 
-getComment = HTMLTools.Parse.getComment = function (scanner) {
+export function getComment (scanner) {
   if (scanner.rest().slice(0, 4) !== '<!--')
     return null;
   scanner.pos += 4;
@@ -82,7 +87,7 @@ getComment = HTMLTools.Parse.getComment = function (scanner) {
 
   return { t: 'Comment',
            v: convertCRLF(commentContents) };
-};
+}
 
 var skipSpaces = function (scanner) {
   while (HTML_SPACE.test(scanner.peek()))
@@ -122,8 +127,8 @@ var getDoctypeQuotedString = function (scanner) {
 // See http://www.whatwg.org/specs/web-apps/current-work/multipage/syntax.html#the-doctype.
 //
 // If `getDocType` sees "<!DOCTYPE" (case-insensitive), it will match or fail fatally.
-getDoctype = HTMLTools.Parse.getDoctype = function (scanner) {
-  if (HTMLTools.asciiLowerCase(scanner.rest().slice(0, 9)) !== '<!doctype')
+export function getDoctype (scanner) {
+  if (asciiLowerCase(scanner.rest().slice(0, 9)) !== '<!doctype')
     return null;
   var start = scanner.pos;
   scanner.pos += 9;
@@ -142,7 +147,7 @@ getDoctype = HTMLTools.Parse.getDoctype = function (scanner) {
     name += ch;
     scanner.pos++;
   }
-  name = HTMLTools.asciiLowerCase(name);
+  name = asciiLowerCase(name);
 
   // Now we're looking at a space or a `>`.
   skipSpaces(scanner);
@@ -155,7 +160,7 @@ getDoctype = HTMLTools.Parse.getDoctype = function (scanner) {
     // but we're not looking at space or `>`.
 
     // this should be "public" or "system".
-    var publicOrSystem = HTMLTools.asciiLowerCase(scanner.rest().slice(0, 6));
+    var publicOrSystem = asciiLowerCase(scanner.rest().slice(0, 6));
 
     if (publicOrSystem === 'system') {
       scanner.pos += 6;
@@ -194,14 +199,14 @@ getDoctype = HTMLTools.Parse.getDoctype = function (scanner) {
     result.publicId = publicId;
 
   return result;
-};
+}
 
 // The special character `{` is only allowed as the first character
 // of a Chars, so that we have a chance to detect template tags.
 var getChars = makeRegexMatcher(/^[^&<\u0000][^&<\u0000{]*/);
 
 var assertIsTemplateTag = function (x) {
-  if (! (x instanceof HTMLTools.TemplateTag))
+  if (! (x instanceof TemplateTag))
     throw new Error("Expected an instance of HTMLTools.TemplateTag");
   return x;
 };
@@ -212,7 +217,7 @@ var assertIsTemplateTag = function (x) {
 // consumes characters and emits nothing (e.g. in the case of template
 // comments), we may go from not-at-EOF to at-EOF and return `null`,
 // while otherwise we always find some token to return.
-getHTMLToken = HTMLTools.Parse.getHTMLToken = function (scanner, dataMode) {
+export function getHTMLToken (scanner, dataMode) {
   var result = null;
   if (scanner.getTemplateTag) {
     // Try to parse a template tag by calling out to the provided
@@ -277,7 +282,7 @@ getHTMLToken = HTMLTools.Parse.getHTMLToken = function (scanner, dataMode) {
     return result;
 
   scanner.fatal("Unexpected `<!` directive.");
-};
+}
 
 var getTagName = makeRegexMatcher(/^[a-zA-Z][^\f\n\r\t />{]*/);
 var getClangle = makeRegexMatcher(/^>/);
@@ -355,7 +360,7 @@ var getAttributeValue = function (scanner, quote) {
 
 var hasOwnProperty = Object.prototype.hasOwnProperty;
 
-getTagToken = HTMLTools.Parse.getTagToken = function (scanner) {
+export function getTagToken(scanner) {
   if (! (scanner.peek() === '<' && scanner.rest().charAt(1) !== '!'))
     return null;
   scanner.pos++;
@@ -371,7 +376,7 @@ getTagToken = HTMLTools.Parse.getTagToken = function (scanner) {
   var tagName = getTagName(scanner);
   if (! tagName)
     scanner.fatal("Expected tag name after `<`");
-  tag.n = HTMLTools.properCaseTagName(tagName);
+  tag.n = properCaseTagName(tagName);
 
   if (scanner.peek() === '/' && tag.isEnd)
     scanner.fatal("End tag can't have trailing slash");
@@ -431,7 +436,7 @@ getTagToken = HTMLTools.Parse.getTagToken = function (scanner) {
       // allow it, so who cares.
       if (attributeName.indexOf('{') >= 0)
         scanner.fatal("Unexpected `{` in attribute name.");
-      attributeName = HTMLTools.properCaseAttributeName(attributeName);
+      attributeName = properCaseAttributeName(attributeName);
 
       if (hasOwnProperty.call(nondynamicAttrs, attributeName))
         scanner.fatal("Duplicate attribute in tag: " + attributeName);
@@ -485,9 +490,9 @@ getTagToken = HTMLTools.Parse.getTagToken = function (scanner) {
     if (handleEndOfTag(scanner, tag))
       return tag;
   }
-};
+}
 
-TEMPLATE_TAG_POSITION = HTMLTools.TEMPLATE_TAG_POSITION = {
+export const TEMPLATE_TAG_POSITION = {
   ELEMENT: 1,
   IN_START_TAG: 2,
   IN_ATTRIBUTE: 3,
@@ -496,12 +501,12 @@ TEMPLATE_TAG_POSITION = HTMLTools.TEMPLATE_TAG_POSITION = {
 };
 
 // tagName must be proper case
-isLookingAtEndTag = function (scanner, tagName) {
+export function isLookingAtEndTag (scanner, tagName) {
   var rest = scanner.rest();
   var pos = 0; // into rest
   var firstPart = /^<\/([a-zA-Z]+)/.exec(rest);
   if (firstPart &&
-      HTMLTools.properCaseTagName(firstPart[1]) === tagName) {
+      properCaseTagName(firstPart[1]) === tagName) {
     // we've seen `</foo`, now see if the end tag continues
     pos += firstPart[0].length;
     while (pos < rest.length && HTML_SPACE.test(rest.charAt(pos)))
@@ -510,4 +515,4 @@ isLookingAtEndTag = function (scanner, tagName) {
       return true;
   }
   return false;
-};
+}
diff --git a/packages/html-tools/tokenize_tests.js b/packages/html-tools/tokenize_tests.js
index 752eb2ee5..0fdc0ad34 100644
--- a/packages/html-tools/tokenize_tests.js
+++ b/packages/html-tools/tokenize_tests.js
@@ -1,3 +1,5 @@
+import { HTMLTools } from 'meteor/html-tools';
+
 var Scanner = HTMLTools.Scanner;
 var getComment = HTMLTools.Parse.getComment;
 var getDoctype = HTMLTools.Parse.getDoctype;
@@ -87,7 +89,7 @@ Tinytest.add("html-tools - doctype", function (test) {
     test.isTrue(result);
     test.equal(scanner.pos, result.v.length);
     test.equal(input.slice(0, result.v.length), result.v);
-    var actualProps = _.extend({}, result);
+    var actualProps = Object.assign({}, result);
     delete actualProps.t;
     delete actualProps.v;
     test.equal(actualProps, expectedProps);
diff --git a/packages/html-tools/utils.js b/packages/html-tools/utils.js
index 934bc09e0..195fa725a 100644
--- a/packages/html-tools/utils.js
+++ b/packages/html-tools/utils.js
@@ -1,12 +1,10 @@
+import { HTML } from 'meteor/htmljs';
 
-HTMLTools = {};
-HTMLTools.Parse = {};
-
-var asciiLowerCase = HTMLTools.asciiLowerCase = function (str) {
+export function asciiLowerCase (str) {
   return str.replace(/[A-Z]/g, function (c) {
     return String.fromCharCode(c.charCodeAt(0) + 32);
   });
-};
+}
 
 var svgCamelCaseAttributes = 'attributeName attributeType baseFrequency baseProfile calcMode clipPathUnits contentScriptType contentStyleType diffuseConstant edgeMode externalResourcesRequired filterRes filterUnits glyphRef glyphRef gradientTransform gradientTransform gradientUnits gradientUnits kernelMatrix kernelUnitLength kernelUnitLength kernelUnitLength keyPoints keySplines keyTimes lengthAdjust limitingConeAngle markerHeight markerUnits markerWidth maskContentUnits maskUnits numOctaves pathLength patternContentUnits patternTransform patternUnits pointsAtX pointsAtY pointsAtZ preserveAlpha preserveAspectRatio primitiveUnits refX refY repeatCount repeatDur requiredExtensions requiredFeatures specularConstant specularExponent specularExponent spreadMethod spreadMethod startOffset stdDeviation stitchTiles surfaceScale surfaceScale systemLanguage tableValues targetX targetY textLength textLength viewBox viewTarget xChannelSelector yChannelSelector zoomAndPan'.split(' ');
 
@@ -36,15 +34,15 @@ var properTagCaseMap = (function (map) {
 // and will fix the case for you, so if you write `<svg viewbox="...">`
 // you actually get a `"viewBox"` attribute.  Any HTML-parsing toolchain
 // must do the same.
-HTMLTools.properCaseTagName = function (name) {
+export function properCaseTagName (name) {
   var lowered = asciiLowerCase(name);
   return properTagCaseMap.hasOwnProperty(lowered) ?
     properTagCaseMap[lowered] : lowered;
-};
+}
 
 // See docs for properCaseTagName.
-HTMLTools.properCaseAttributeName = function (name) {
+export function properCaseAttributeName(name) {
   var lowered = asciiLowerCase(name);
   return properAttributeCaseMap.hasOwnProperty(lowered) ?
     properAttributeCaseMap[lowered] : lowered;
-};
+}
diff --git a/packages/htmljs/.versions b/packages/htmljs/.versions
index f355d844d..c8b2fc246 100644
--- a/packages/htmljs/.versions
+++ b/packages/htmljs/.versions
@@ -1,47 +1,49 @@
-allow-deny@1.0.5
-babel-compiler@6.14.1
-babel-runtime@1.0.1
-base64@1.0.10
-binary-heap@1.0.10
-blaze@2.3.2
-blaze-tools@1.0.10
-boilerplate-generator@1.0.11
-callback-hook@1.0.10
-check@1.2.5
-ddp@1.2.5
-ddp-client@1.3.3
-ddp-common@1.2.8
-ddp-server@1.3.13
-diff-sequence@1.0.7
-ecmascript@0.6.3
-ecmascript-runtime@0.3.15
-ejson@1.0.13
+allow-deny@1.1.0
+babel-compiler@7.6.0
+babel-runtime@1.5.0
+base64@1.0.12
+binary-heap@1.0.11
+boilerplate-generator@1.7.1
+callback-hook@1.3.0
+check@1.3.1
+ddp@1.4.0
+ddp-client@2.4.0
+ddp-common@1.4.0
+ddp-server@2.3.2
+diff-sequence@1.1.1
+dynamic-import@0.6.0
+ecmascript@0.15.0
+ecmascript-runtime@0.7.0
+ecmascript-runtime-client@0.11.0
+ecmascript-runtime-server@0.10.0
+ejson@1.1.1
+fetch@0.1.1
 geojson-utils@1.0.10
-html-tools@1.0.11
-htmljs@1.0.11
-id-map@1.0.9
-jquery@1.11.10
-local-test:htmljs@1.0.11
-logging@1.1.17
-meteor@1.6.1
-minimongo@1.0.21
-modules@0.7.9
-modules-runtime@0.7.9
-mongo@1.1.16
-mongo-id@1.0.6
-npm-mongo@2.2.24
-observe-sequence@1.0.16
-ordered-dict@1.0.9
-promise@0.8.8
-random@1.0.10
-reactive-var@1.0.11
-retry@1.0.9
-routepolicy@1.0.12
-spacebars@1.0.15
-spacebars-compiler@1.1.2
-tinytest@1.0.12
-tracker@1.1.2
-ui@1.0.12
+htmljs@1.1.0-beta.3
+id-map@1.1.0
+inter-process-messaging@0.1.1
+local-test:htmljs@1.1.0-beta.3
+logging@1.2.0
+meteor@1.9.3
+minimongo@1.6.1
+modern-browsers@0.1.5
+modules@0.16.0
+modules-runtime@0.12.0
+mongo@1.10.1
+mongo-decimal@0.1.2
+mongo-dev-server@1.1.0
+mongo-id@1.0.7
+npm-mongo@3.8.1
+ordered-dict@1.1.0
+promise@0.11.2
+random@1.2.0
+react-fast-refresh@0.1.0
+reload@1.3.1
+retry@1.1.0
+routepolicy@1.1.0
+socket-stream-client@0.3.1
+tinytest@1.1.0
+tracker@1.2.0
 underscore@1.0.10
-webapp@1.3.14
-webapp-hashing@1.0.9
+webapp@1.10.0
+webapp-hashing@1.1.0
diff --git a/packages/htmljs/html.js b/packages/htmljs/html.js
index ce758772d..db6ef3b99 100644
--- a/packages/htmljs/html.js
+++ b/packages/htmljs/html.js
@@ -1,28 +1,27 @@
 
-
-HTML.Tag = function () {};
-HTML.Tag.prototype.tagName = ''; // this will be set per Tag subclass
-HTML.Tag.prototype.attrs = null;
-HTML.Tag.prototype.children = Object.freeze ? Object.freeze([]) : [];
-HTML.Tag.prototype.htmljsType = HTML.Tag.htmljsType = ['Tag'];
+export const Tag = function () {};
+Tag.prototype.tagName = ''; // this will be set per Tag subclass
+Tag.prototype.attrs = null;
+Tag.prototype.children = Object.freeze ? Object.freeze([]) : [];
+Tag.prototype.htmljsType = Tag.htmljsType = ['Tag'];
 
 // Given "p" create the function `HTML.P`.
 var makeTagConstructor = function (tagName) {
-  // HTMLTag is the per-tagName constructor of a HTML.Tag subclass
-  var HTMLTag = function (/*arguments*/) {
+  // Tag is the per-tagName constructor of a HTML.Tag subclass
+  var HTMLTag = function (...args) {
     // Work with or without `new`.  If not called with `new`,
     // perform instantiation by recursively calling this constructor.
     // We can't pass varargs, so pass no args.
-    var instance = (this instanceof HTML.Tag) ? this : new HTMLTag;
+    var instance = (this instanceof Tag) ? this : new HTMLTag;
 
     var i = 0;
-    var attrs = arguments.length && arguments[0];
+    var attrs = args.length && args[0];
     if (attrs && (typeof attrs === 'object')) {
       // Treat vanilla JS object as an attributes dictionary.
-      if (! HTML.isConstructedObject(attrs)) {
+      if (! isConstructedObject(attrs)) {
         instance.attrs = attrs;
         i++;
-      } else if (attrs instanceof HTML.Attrs) {
+      } else if (attrs instanceof Attrs) {
         var array = attrs.value;
         if (array.length === 1) {
           instance.attrs = array[0];
@@ -38,12 +37,12 @@ var makeTagConstructor = function (tagName) {
     // (frozen, empty) array.  This way we don't create an empty array
     // every time someone creates a tag without `new` and this constructor
     // calls itself with no arguments (above).
-    if (i < arguments.length)
-      instance.children = SLICE.call(arguments, i);
+    if (i < args.length)
+      instance.children = args.slice(i);
 
     return instance;
   };
-  HTMLTag.prototype = new HTML.Tag;
+  HTMLTag.prototype = new Tag;
   HTMLTag.prototype.constructor = HTMLTag;
   HTMLTag.prototype.tagName = tagName;
 
@@ -52,84 +51,76 @@ var makeTagConstructor = function (tagName) {
 
 // Not an HTMLjs node, but a wrapper to pass multiple attrs dictionaries
 // to a tag (for the purpose of implementing dynamic attributes).
-var Attrs = HTML.Attrs = function (/*attrs dictionaries*/) {
+export function Attrs(...args) {
   // Work with or without `new`.  If not called with `new`,
   // perform instantiation by recursively calling this constructor.
   // We can't pass varargs, so pass no args.
   var instance = (this instanceof Attrs) ? this : new Attrs;
 
-  instance.value = SLICE.call(arguments);
+  instance.value = args;
 
   return instance;
-};
+}
 
 ////////////////////////////// KNOWN ELEMENTS
+export const HTMLTags = {};
 
-HTML.getTag = function (tagName) {
-  var symbolName = HTML.getSymbolName(tagName);
+export function getTag (tagName) {
+  var symbolName = getSymbolName(tagName);
   if (symbolName === tagName) // all-caps tagName
     throw new Error("Use the lowercase or camelCase form of '" + tagName + "' here");
 
-  if (! HTML[symbolName])
-    HTML[symbolName] = makeTagConstructor(tagName);
+  if (! HTMLTags[symbolName])
+    HTMLTags[symbolName] = makeTagConstructor(tagName);
 
-  return HTML[symbolName];
-};
+  return HTMLTags[symbolName];
+}
 
-HTML.ensureTag = function (tagName) {
-  HTML.getTag(tagName); // don't return it
-};
+export function ensureTag(tagName) {
+  getTag(tagName); // don't return it
+}
 
-HTML.isTagEnsured = function (tagName) {
-  return HTML.isKnownElement(tagName);
-};
+export function isTagEnsured (tagName) {
+  return isKnownElement(tagName);
+}
 
-HTML.getSymbolName = function (tagName) {
+export function getSymbolName (tagName) {
   // "foo-bar" -> "FOO_BAR"
   return tagName.toUpperCase().replace(/-/g, '_');
-};
+}
 
-HTML.knownElementNames = 'a abbr acronym address applet area article aside audio b base basefont bdi bdo big blockquote body br button canvas caption center cite code col colgroup command data datagrid datalist dd del details dfn dir div dl dt em embed eventsource fieldset figcaption figure font footer form frame frameset h1 h2 h3 h4 h5 h6 head header hgroup hr html i iframe img input ins isindex kbd keygen label legend li link main map mark menu meta meter nav noframes noscript object ol optgroup option output p param pre progress q rp rt ruby s samp script section select small source span strike strong style sub summary sup table tbody td textarea tfoot th thead time title tr track tt u ul var video wbr'.split(' ');
+export const knownHTMLElementNames = 'a abbr acronym address applet area article aside audio b base basefont bdi bdo big blockquote body br button canvas caption center cite code col colgroup command data datagrid datalist dd del details dfn dir div dl dt em embed eventsource fieldset figcaption figure font footer form frame frameset h1 h2 h3 h4 h5 h6 head header hgroup hr html i iframe img input ins isindex kbd keygen label legend li link main map mark menu meta meter nav noframes noscript object ol optgroup option output p param pre progress q rp rt ruby s samp script section select small source span strike strong style sub summary sup table tbody td textarea tfoot th thead time title tr track tt u ul var video wbr'.split(' ');
 // (we add the SVG ones below)
 
-HTML.knownSVGElementNames = 'altGlyph altGlyphDef altGlyphItem animate animateColor animateMotion animateTransform circle clipPath color-profile cursor defs desc ellipse feBlend feColorMatrix feComponentTransfer feComposite feConvolveMatrix feDiffuseLighting feDisplacementMap feDistantLight feFlood feFuncA feFuncB feFuncG feFuncR feGaussianBlur feImage feMerge feMergeNode feMorphology feOffset fePointLight feSpecularLighting feSpotLight feTile feTurbulence filter font font-face font-face-format font-face-name font-face-src font-face-uri foreignObject g glyph glyphRef hkern image line linearGradient marker mask metadata missing-glyph path pattern polygon polyline radialGradient rect set stop style svg switch symbol text textPath title tref tspan use view vkern'.split(' ');
+export const knownSVGElementNames = 'altGlyph altGlyphDef altGlyphItem animate animateColor animateMotion animateTransform circle clipPath color-profile cursor defs desc ellipse feBlend feColorMatrix feComponentTransfer feComposite feConvolveMatrix feDiffuseLighting feDisplacementMap feDistantLight feFlood feFuncA feFuncB feFuncG feFuncR feGaussianBlur feImage feMerge feMergeNode feMorphology feOffset fePointLight feSpecularLighting feSpotLight feTile feTurbulence filter font font-face font-face-format font-face-name font-face-src font-face-uri foreignObject g glyph glyphRef hkern image line linearGradient marker mask metadata missing-glyph path pattern polygon polyline radialGradient rect set stop style svg switch symbol text textPath title tref tspan use view vkern'.split(' ');
 // Append SVG element names to list of known element names
-HTML.knownElementNames = HTML.knownElementNames.concat(HTML.knownSVGElementNames);
-
-HTML.voidElementNames = 'area base br col command embed hr img input keygen link meta param source track wbr'.split(' ');
-
-// Speed up search through lists of known elements by creating internal "sets"
-// of strings.
-var YES = {yes:true};
-var makeSet = function (array) {
-  var set = {};
-  for (var i = 0; i < array.length; i++)
-    set[array[i]] = YES;
-  return set;
-};
-var voidElementSet = makeSet(HTML.voidElementNames);
-var knownElementSet = makeSet(HTML.knownElementNames);
-var knownSVGElementSet = makeSet(HTML.knownSVGElementNames);
+export const knownElementNames = knownHTMLElementNames.concat(knownSVGElementNames);
 
-HTML.isKnownElement = function (tagName) {
-  return knownElementSet[tagName] === YES;
-};
+export const voidElementNames = 'area base br col command embed hr img input keygen link meta param source track wbr'.split(' ');
 
-HTML.isKnownSVGElement = function (tagName) {
-  return knownSVGElementSet[tagName] === YES;
-};
 
-HTML.isVoidElement = function (tagName) {
-  return voidElementSet[tagName] === YES;
-};
+var voidElementSet = new Set(voidElementNames);
+var knownElementSet = new Set(knownElementNames);
+var knownSVGElementSet = new Set(knownSVGElementNames);
+
+export function isKnownElement(tagName) {
+  return knownElementSet.has(tagName);
+}
+
+export function isKnownSVGElement(tagName) {
+  return knownSVGElementSet.has(tagName);
+}
+
+export function isVoidElement(tagName) {
+  return voidElementSet.has(tagName);
+}
 
 
 // Ensure tags for all known elements
-for (var i = 0; i < HTML.knownElementNames.length; i++)
-  HTML.ensureTag(HTML.knownElementNames[i]);
+knownElementNames.forEach(ensureTag);
 
 
-var CharRef = HTML.CharRef = function (attrs) {
+export function CharRef(attrs) {
   if (! (this instanceof CharRef))
     // called without `new`
     return new CharRef(attrs);
@@ -140,10 +131,10 @@ var CharRef = HTML.CharRef = function (attrs) {
 
   this.html = attrs.html;
   this.str = attrs.str;
-};
+}
 CharRef.prototype.htmljsType = CharRef.htmljsType = ['CharRef'];
 
-var Comment = HTML.Comment = function (value) {
+export function Comment(value) {
   if (! (this instanceof Comment))
     // called without `new`
     return new Comment(value);
@@ -154,10 +145,10 @@ var Comment = HTML.Comment = function (value) {
   this.value = value;
   // Kill illegal hyphens in comment value (no way to escape them in HTML)
   this.sanitizedValue = value.replace(/^-|--+|-$/g, '');
-};
+}
 Comment.prototype.htmljsType = Comment.htmljsType = ['Comment'];
 
-var Raw = HTML.Raw = function (value) {
+export function Raw(value) {
   if (! (this instanceof Raw))
     // called without `new`
     return new Raw(value);
@@ -166,18 +157,15 @@ var Raw = HTML.Raw = function (value) {
     throw new Error('HTML.Raw must be constructed with a string');
 
   this.value = value;
-};
+}
 Raw.prototype.htmljsType = Raw.htmljsType = ['Raw'];
 
 
-HTML.isArray = function (x) {
-  // could change this to use the more convoluted Object.prototype.toString
-  // approach that works when objects are passed between frames, but does
-  // it matter?
-  return (x instanceof Array);
-};
+export function isArray (x) {
+  return x instanceof Array || Array.isArray(x);
+}
 
-HTML.isConstructedObject = function (x) {
+export function isConstructedObject (x) {
   // Figure out if `x` is "an instance of some class" or just a plain
   // object literal.  It correctly treats an object literal like
   // `{ constructor: ... }` as an object literal.  It won't detect
@@ -185,84 +173,68 @@ HTML.isConstructedObject = function (x) {
   // if you assign to a prototype when setting up the class as in:
   // `Foo = function () { ... }; Foo.prototype = { ... }`, then
   // `(new Foo).constructor` is `Object`, not `Foo`).
-  return (x && (typeof x === 'object') &&
-          (x.constructor !== Object) &&
-          (typeof x.constructor === 'function') &&
-          (x instanceof x.constructor));
-};
+  if(!x || (typeof x !== 'object')) return false;
+  // Is this a plain object?
+  let plain = false;
+  if(Object.getPrototypeOf(x) === null) {
+    plain = true;
+  } else {
+    let proto = x;
+    while(Object.getPrototypeOf(proto) !== null) {
+      proto = Object.getPrototypeOf(proto);
+    }
+    plain = Object.getPrototypeOf(x) === proto;
+  }
+
+  return !plain &&
+    (typeof x.constructor === 'function') &&
+    (x instanceof x.constructor);
+}
 
-HTML.isNully = function (node) {
+export function isNully (node) {
   if (node == null)
     // null or undefined
     return true;
 
-  if (HTML.isArray(node)) {
+  if (isArray(node)) {
     // is it an empty array or an array of all nully items?
     for (var i = 0; i < node.length; i++)
-      if (! HTML.isNully(node[i]))
+      if (! isNully(node[i]))
         return false;
     return true;
   }
 
   return false;
-};
+}
 
-HTML.isValidAttributeName = function (name) {
+export function isValidAttributeName (name) {
   return /^[:_A-Za-z][:_A-Za-z0-9.\-]*/.test(name);
-};
+}
 
 // If `attrs` is an array of attributes dictionaries, combines them
 // into one.  Removes attributes that are "nully."
-HTML.flattenAttributes = function (attrs) {
+export function flattenAttributes (attrs) {
   if (! attrs)
     return attrs;
 
-  var isArray = HTML.isArray(attrs);
-  if (isArray && attrs.length === 0)
+  var isList = isArray(attrs);
+  if (isList && attrs.length === 0)
     return null;
 
   var result = {};
-  for (var i = 0, N = (isArray ? attrs.length : 1); i < N; i++) {
-    var oneAttrs = (isArray ? attrs[i] : attrs);
+  for (var i = 0, N = (isList ? attrs.length : 1); i < N; i++) {
+    var oneAttrs = (isList ? attrs[i] : attrs);
     if ((typeof oneAttrs !== 'object') ||
-        HTML.isConstructedObject(oneAttrs))
+        isConstructedObject(oneAttrs))
       throw new Error("Expected plain JS object as attrs, found: " + oneAttrs);
     for (var name in oneAttrs) {
-      if (! HTML.isValidAttributeName(name))
+      if (! isValidAttributeName(name))
         throw new Error("Illegal HTML attribute name: " + name);
       var value = oneAttrs[name];
-      if (! HTML.isNully(value))
+      if (! isNully(value))
         result[name] = value;
     }
   }
 
   return result;
-};
-
-
-
-////////////////////////////// TOHTML
-
-HTML.toHTML = function (content) {
-  return (new HTML.ToHTMLVisitor).visit(content);
-};
-
-// Escaping modes for outputting text when generating HTML.
-HTML.TEXTMODE = {
-  STRING: 1,
-  RCDATA: 2,
-  ATTRIBUTE: 3
-};
-
-
-HTML.toText = function (content, textMode) {
-  if (! textMode)
-    throw new Error("textMode required for HTML.toText");
-  if (! (textMode === HTML.TEXTMODE.STRING ||
-         textMode === HTML.TEXTMODE.RCDATA ||
-         textMode === HTML.TEXTMODE.ATTRIBUTE))
-    throw new Error("Unknown textMode: " + textMode);
-
-  var visitor = new HTML.ToTextVisitor({textMode: textMode});;
-  return visitor.visit(content);
-};
+}
diff --git a/packages/htmljs/htmljs_test.js b/packages/htmljs/htmljs_test.js
index c0ef819fa..c20722ee5 100644
--- a/packages/htmljs/htmljs_test.js
+++ b/packages/htmljs/htmljs_test.js
@@ -1,3 +1,4 @@
+import { HTML } from 'meteor/htmljs';
 
 Tinytest.add("htmljs - getTag", function (test) {
   var FOO = HTML.getTag('foo');
@@ -69,12 +70,21 @@ Tinytest.add("htmljs - construction", function (test) {
   });
 });
 
+// copied from here https://github.com/meteor/blaze/blob/ed9299ea32afdd04f33124957f22ce2b18b7f3ff/packages/html-tools/utils.js#L3
+// to avoid circular dependency between htmljs and html-tools pacakge.
+// this circular dependency was blocking the publish process.
+var asciiLowerCase = function (str) {
+  return str.replace(/[A-Z]/g, function (c) {
+    return String.fromCharCode(c.charCodeAt(0) + 32);
+  });
+};
+
 Tinytest.add("htmljs - utils", function (test) {
 
   test.notEqual("\u00c9".toLowerCase(), "\u00c9");
-  test.equal(HTMLTools.asciiLowerCase("\u00c9"), "\u00c9");
+  test.equal(asciiLowerCase("\u00c9"), "\u00c9");
 
-  test.equal(HTMLTools.asciiLowerCase("Hello There"), "hello there");
+  test.equal(asciiLowerCase("Hello There"), "hello there");
 
   test.isTrue(HTML.isVoidElement("br"));
   test.isFalse(HTML.isVoidElement("div"));
diff --git a/packages/htmljs/package.js b/packages/htmljs/package.js
index b8131893b..bc368a8fa 100644
--- a/packages/htmljs/package.js
+++ b/packages/htmljs/package.js
@@ -1,28 +1,22 @@
 Package.describe({
   name: 'htmljs',
   summary: "Small library for expressing HTML trees",
-  version: '1.0.11',
+  version: '1.1.0-beta.3',
   git: 'https://github.com/meteor/blaze.git'
 });
 
 Package.onUse(function (api) {
-  api.use('tracker@1.1.0');
+  api.use('ecmascript@0.14.4');
 
   api.export('HTML');
-
-  api.addFiles([
-    'preamble.js',
-    'visitors.js',
-    'html.js'
-  ]);
+  api.mainModule('preamble.js');
 });
 
 Package.onTest(function (api) {
+  api.use('ecmascript');
   api.use('tinytest@1.0.11');
-  api.use('underscore@1.0.9');
 
   api.use('htmljs');
-  api.use('html-tools@1.0.11');
 
   api.addFiles([
     'htmljs_test.js'
diff --git a/packages/htmljs/preamble.js b/packages/htmljs/preamble.js
index 160e03804..7bff32886 100644
--- a/packages/htmljs/preamble.js
+++ b/packages/htmljs/preamble.js
@@ -1,4 +1,68 @@
-HTML = {};
+import {
+  HTMLTags,
+  Tag,
+  Attrs,
+  getTag,
+  ensureTag,
+  isTagEnsured,
+  getSymbolName,
+  knownHTMLElementNames,
+  knownSVGElementNames,
+  knownElementNames,
+  voidElementNames,
+  isKnownElement,
+  isKnownSVGElement,
+  isVoidElement,
+  CharRef,
+  Comment,
+  Raw,
+  isArray,
+  isConstructedObject,
+  isNully,
+  isValidAttributeName,
+  flattenAttributes,
+} from './html';
 
-IDENTITY = function (x) { return x; };
-SLICE = Array.prototype.slice;
+import {
+  Visitor,
+  TransformingVisitor,
+  ToHTMLVisitor,
+  ToTextVisitor,
+  toHTML,
+  TEXTMODE,
+  toText
+} from './visitors';
+
+
+// we're actually exporting the HTMLTags object.
+//  because it is dynamically altered by getTag/ensureTag
+export const HTML = Object.assign(HTMLTags, {
+  Tag,
+  Attrs,
+  getTag,
+  ensureTag,
+  isTagEnsured,
+  getSymbolName,
+  knownHTMLElementNames,
+  knownSVGElementNames,
+  knownElementNames,
+  voidElementNames,
+  isKnownElement,
+  isKnownSVGElement,
+  isVoidElement,
+  CharRef,
+  Comment,
+  Raw,
+  isArray,
+  isConstructedObject,
+  isNully,
+  isValidAttributeName,
+  flattenAttributes,
+  toHTML,
+  TEXTMODE,
+  toText,
+  Visitor,
+  TransformingVisitor,
+  ToHTMLVisitor,
+  ToTextVisitor,
+});
diff --git a/packages/htmljs/visitors.js b/packages/htmljs/visitors.js
index 15160e759..f5a94623d 100644
--- a/packages/htmljs/visitors.js
+++ b/packages/htmljs/visitors.js
@@ -1,4 +1,17 @@
-////////////////////////////// VISITORS
+import {
+  Tag,
+  CharRef,
+  Comment,
+  Raw,
+  isArray,
+  getTag,
+  isConstructedObject,
+  flattenAttributes,
+  isVoidElement,
+} from './html';
+
+
+var IDENTITY = function (x) { return x; };
 
 // _assign is like _.extend or the upcoming Object.assign.
 // Copy src's own, enumerable properties onto tgt and return
@@ -12,18 +25,18 @@ var _assign = function (tgt, src) {
   return tgt;
 };
 
-HTML.Visitor = function (props) {
+export const Visitor = function (props) {
   _assign(this, props);
 };
 
-HTML.Visitor.def = function (options) {
+Visitor.def = function (options) {
   _assign(this.prototype, options);
 };
 
-HTML.Visitor.extend = function (options) {
+Visitor.extend = function (options) {
   var curType = this;
   var subType = function HTMLVisitorSubtype(/*arguments*/) {
-    HTML.Visitor.apply(this, arguments);
+    Visitor.apply(this, arguments);
   };
   subType.prototype = new curType;
   subType.extend = curType.extend;
@@ -33,7 +46,7 @@ HTML.Visitor.extend = function (options) {
   return subType;
 };
 
-HTML.Visitor.def({
+Visitor.def({
   visit: function (content/*, ...*/) {
     if (content == null)
       // null or undefined.
@@ -42,20 +55,20 @@ HTML.Visitor.def({
     if (typeof content === 'object') {
       if (content.htmljsType) {
         switch (content.htmljsType) {
-        case HTML.Tag.htmljsType:
+        case Tag.htmljsType:
           return this.visitTag.apply(this, arguments);
-        case HTML.CharRef.htmljsType:
+        case CharRef.htmljsType:
           return this.visitCharRef.apply(this, arguments);
-        case HTML.Comment.htmljsType:
+        case Comment.htmljsType:
           return this.visitComment.apply(this, arguments);
-        case HTML.Raw.htmljsType:
+        case Raw.htmljsType:
           return this.visitRaw.apply(this, arguments);
         default:
           throw new Error("Unknown htmljs type: " + content.htmljsType);
         }
       }
 
-      if (HTML.isArray(content))
+      if (isArray(content))
         return this.visitArray.apply(this, arguments);
 
       return this.visitObject.apply(this, arguments);
@@ -87,17 +100,15 @@ HTML.Visitor.def({
   }
 });
 
-HTML.TransformingVisitor = HTML.Visitor.extend();
-HTML.TransformingVisitor.def({
+export const TransformingVisitor = Visitor.extend();
+TransformingVisitor.def({
   visitNull: IDENTITY,
   visitPrimitive: IDENTITY,
-  visitArray: function (array/*, ...*/) {
-    var argsCopy = SLICE.call(arguments);
+  visitArray: function (array, ...args) {
     var result = array;
     for (var i = 0; i < array.length; i++) {
       var oldItem = array[i];
-      argsCopy[0] = oldItem;
-      var newItem = this.visit.apply(this, argsCopy);
+      var newItem = this.visit(oldItem, ...args);
       if (newItem !== oldItem) {
         // copy `array` on write
         if (result === array)
@@ -110,39 +121,46 @@ HTML.TransformingVisitor.def({
   visitComment: IDENTITY,
   visitCharRef: IDENTITY,
   visitRaw: IDENTITY,
-  visitObject: IDENTITY,
+  visitObject: function(obj, ...args){
+    // Don't parse Markdown & RCData as HTML
+    if (obj.textMode != null){
+      return obj;
+    }
+    if ('content' in obj) {
+      obj.content = this.visit(obj.content, ...args);
+    }
+    if ('elseContent' in obj){
+      obj.elseContent = this.visit(obj.elseContent, ...args);
+    }
+    return obj;
+  },
   visitFunction: IDENTITY,
-  visitTag: function (tag/*, ...*/) {
+  visitTag: function (tag, ...args) {
     var oldChildren = tag.children;
-    var argsCopy = SLICE.call(arguments);
-    argsCopy[0] = oldChildren;
-    var newChildren = this.visitChildren.apply(this, argsCopy);
+    var newChildren = this.visitChildren(oldChildren, ...args);
 
     var oldAttrs = tag.attrs;
-    argsCopy[0] = oldAttrs;
-    var newAttrs = this.visitAttributes.apply(this, argsCopy);
+    var newAttrs = this.visitAttributes(oldAttrs, ...args);
 
     if (newAttrs === oldAttrs && newChildren === oldChildren)
       return tag;
 
-    var newTag = HTML.getTag(tag.tagName).apply(null, newChildren);
+    var newTag = getTag(tag.tagName).apply(null, newChildren);
     newTag.attrs = newAttrs;
     return newTag;
   },
-  visitChildren: function (children/*, ...*/) {
-    return this.visitArray.apply(this, arguments);
+  visitChildren: function (children, ...args) {
+    return this.visitArray(children, ...args);
   },
   // Transform the `.attrs` property of a tag, which may be a dictionary,
   // an array, or in some uses, a foreign object (such as
   // a template tag).
-  visitAttributes: function (attrs/*, ...*/) {
-    if (HTML.isArray(attrs)) {
-      var argsCopy = SLICE.call(arguments);
+  visitAttributes: function (attrs, ...args) {
+    if (isArray(attrs)) {
       var result = attrs;
       for (var i = 0; i < attrs.length; i++) {
         var oldItem = attrs[i];
-        argsCopy[0] = oldItem;
-        var newItem = this.visitAttributes.apply(this, argsCopy);
+        var newItem = this.visitAttributes(oldItem, ...args);
         if (newItem !== oldItem) {
           // copy on write
           if (result === attrs)
@@ -153,8 +171,8 @@ HTML.TransformingVisitor.def({
       return result;
     }
 
-    if (attrs && HTML.isConstructedObject(attrs)) {
-      throw new Error("The basic HTML.TransformingVisitor does not support " +
+    if (attrs && isConstructedObject(attrs)) {
+      throw new Error("The basic TransformingVisitor does not support " +
                       "foreign objects in attributes.  Define a custom " +
                       "visitAttributes for this case.");
     }
@@ -182,24 +200,22 @@ HTML.TransformingVisitor.def({
   },
   // Transform the value of one attribute name/value in an
   // attributes dictionary.
-  visitAttribute: function (name, value, tag/*, ...*/) {
-    var args = SLICE.call(arguments, 2);
-    args[0] = value;
-    return this.visit.apply(this, args);
+  visitAttribute: function (name, value, tag, ...args) {
+    return this.visit(value, ...args);
   }
 });
 
 
-HTML.ToTextVisitor = HTML.Visitor.extend();
-HTML.ToTextVisitor.def({
+export const ToTextVisitor = Visitor.extend();
+ToTextVisitor.def({
   visitNull: function (nullOrUndefined) {
     return '';
   },
   visitPrimitive: function (stringBooleanOrNumber) {
     var str = String(stringBooleanOrNumber);
-    if (this.textMode === HTML.TEXTMODE.RCDATA) {
+    if (this.textMode === TEXTMODE.RCDATA) {
       return str.replace(/&/g, '&amp;').replace(/</g, '&lt;');
-    } else if (this.textMode === HTML.TEXTMODE.ATTRIBUTE) {
+    } else if (this.textMode === TEXTMODE.ATTRIBUTE) {
       // escape `&` and `"` this time, not `&` and `<`
       return str.replace(/&/g, '&amp;').replace(/"/g, '&quot;');
     } else {
@@ -216,8 +232,8 @@ HTML.ToTextVisitor.def({
     throw new Error("Can't have a comment here");
   },
   visitCharRef: function (charRef) {
-    if (this.textMode === HTML.TEXTMODE.RCDATA ||
-        this.textMode === HTML.TEXTMODE.ATTRIBUTE) {
+    if (this.textMode === TEXTMODE.RCDATA ||
+        this.textMode === TEXTMODE.ATTRIBUTE) {
       return charRef.html;
     } else {
       return charRef.str;
@@ -240,14 +256,14 @@ HTML.ToTextVisitor.def({
     throw new Error("Unexpected object in htmljs in toText: " + x);
   },
   toHTML: function (node) {
-    return HTML.toHTML(node);
+    return toHTML(node);
   }
 });
 
 
 
-HTML.ToHTMLVisitor = HTML.Visitor.extend();
-HTML.ToHTMLVisitor.def({
+export const ToHTMLVisitor = Visitor.extend();
+ToHTMLVisitor.def({
   visitNull: function (nullOrUndefined) {
     return '';
   },
@@ -278,12 +294,12 @@ HTML.ToHTMLVisitor.def({
 
     var attrs = tag.attrs;
     if (attrs) {
-      attrs = HTML.flattenAttributes(attrs);
+      attrs = flattenAttributes(attrs);
       for (var k in attrs) {
         if (k === 'value' && tagName === 'textarea') {
           children = [attrs[k], children];
         } else {
-          var v = this.toText(attrs[k], HTML.TEXTMODE.ATTRIBUTE);
+          var v = this.toText(attrs[k], TEXTMODE.ATTRIBUTE);
           attrStrs.push(' ' + k + '="' + v + '"');
         }
       }
@@ -296,7 +312,7 @@ HTML.ToHTMLVisitor.def({
     if (tagName === 'textarea') {
 
       for (var i = 0; i < children.length; i++)
-        childStrs.push(this.toText(children[i], HTML.TEXTMODE.RCDATA));
+        childStrs.push(this.toText(children[i], TEXTMODE.RCDATA));
 
       content = childStrs.join('');
       if (content.slice(0, 1) === '\n')
@@ -313,7 +329,7 @@ HTML.ToHTMLVisitor.def({
 
     var result = startTag + content;
 
-    if (children.length || ! HTML.isVoidElement(tagName)) {
+    if (children.length || ! isVoidElement(tagName)) {
       // "Void" elements like BR are the only ones that don't get a close
       // tag in HTML5.  They shouldn't have contents, either, so we could
       // throw an error upon seeing contents here.
@@ -326,6 +342,34 @@ HTML.ToHTMLVisitor.def({
     throw new Error("Unexpected object in htmljs in toHTML: " + x);
   },
   toText: function (node, textMode) {
-    return HTML.toText(node, textMode);
+    return toText(node, textMode);
   }
 });
+
+
+
+////////////////////////////// TOHTML
+
+export function toHTML(content) {
+  return (new ToHTMLVisitor).visit(content);
+}
+
+// Escaping modes for outputting text when generating HTML.
+export const TEXTMODE = {
+  STRING: 1,
+  RCDATA: 2,
+  ATTRIBUTE: 3
+};
+
+
+export function toText(content, textMode) {
+  if (! textMode)
+    throw new Error("textMode required for HTML.toText");
+  if (! (textMode === TEXTMODE.STRING ||
+         textMode === TEXTMODE.RCDATA ||
+         textMode === TEXTMODE.ATTRIBUTE))
+    throw new Error("Unknown textMode: " + textMode);
+
+  var visitor = new ToTextVisitor({textMode: textMode});
+  return visitor.visit(content);
+}
diff --git a/packages/spacebars-compiler/.versions b/packages/spacebars-compiler/.versions
index a8096d9aa..93fc7b25d 100644
--- a/packages/spacebars-compiler/.versions
+++ b/packages/spacebars-compiler/.versions
@@ -1,49 +1,52 @@
-allow-deny@1.0.5
-babel-compiler@6.14.1
-babel-runtime@1.0.1
-base64@1.0.10
-binary-heap@1.0.10
-blaze@2.3.2
-blaze-tools@1.0.10
-boilerplate-generator@1.0.11
-caching-compiler@1.1.9
-callback-hook@1.0.10
-check@1.2.5
-coffeescript@1.11.1_3
-ddp@1.2.5
-ddp-client@1.3.3
-ddp-common@1.2.8
-ddp-server@1.3.13
-diff-sequence@1.0.7
-ecmascript@0.6.3
-ecmascript-runtime@0.3.15
-ejson@1.0.13
+allow-deny@1.1.0
+babel-compiler@7.6.0
+babel-runtime@1.5.0
+base64@1.0.12
+binary-heap@1.0.11
+blaze-tools@1.1.0-beta.3
+boilerplate-generator@1.7.1
+callback-hook@1.3.0
+check@1.3.1
+ddp@1.4.0
+ddp-client@2.4.0
+ddp-common@1.4.0
+ddp-server@2.3.2
+diff-sequence@1.1.1
+dynamic-import@0.6.0
+ecmascript@0.15.0
+ecmascript-runtime@0.7.0
+ecmascript-runtime-client@0.11.0
+ecmascript-runtime-server@0.10.0
+ejson@1.1.1
+fetch@0.1.1
 geojson-utils@1.0.10
-html-tools@1.0.11
-htmljs@1.0.11
-id-map@1.0.9
-jquery@1.11.10
-local-test:spacebars-compiler@1.1.2
-logging@1.1.17
-meteor@1.6.1
-minimongo@1.0.21
-modules@0.7.9
-modules-runtime@0.7.9
-mongo@1.1.16
-mongo-id@1.0.6
-npm-mongo@2.2.24
-observe-sequence@1.0.16
-ordered-dict@1.0.9
-promise@0.8.8
-random@1.0.10
-reactive-var@1.0.11
-retry@1.0.9
-routepolicy@1.0.12
-spacebars@1.0.15
-spacebars-compiler@1.1.2
-tinytest@1.0.12
-tracker@1.1.2
-ui@1.0.12
+html-tools@1.1.0-beta.3
+htmljs@1.1.0-beta.3
+id-map@1.1.0
+inter-process-messaging@0.1.1
+local-test:spacebars-compiler@1.2.0-beta.3
+logging@1.2.0
+meteor@1.9.3
+minimongo@1.6.1
+modern-browsers@0.1.5
+modules@0.16.0
+modules-runtime@0.12.0
+mongo@1.10.1
+mongo-decimal@0.1.2
+mongo-dev-server@1.1.0
+mongo-id@1.0.7
+npm-mongo@3.8.1
+ordered-dict@1.1.0
+promise@0.11.2
+random@1.2.0
+react-fast-refresh@0.1.0
+reload@1.3.1
+retry@1.1.0
+routepolicy@1.1.0
+socket-stream-client@0.3.1
+spacebars-compiler@1.2.0-beta.3
+tinytest@1.1.0
+tracker@1.2.0
 underscore@1.0.10
-webapp@1.3.14
-webapp-hashing@1.0.9
+webapp@1.10.0
+webapp-hashing@1.1.0
diff --git a/packages/spacebars-compiler/codegen.js b/packages/spacebars-compiler/codegen.js
index 3147a4a18..3394e148b 100644
--- a/packages/spacebars-compiler/codegen.js
+++ b/packages/spacebars-compiler/codegen.js
@@ -1,12 +1,18 @@
+import { HTMLTools } from 'meteor/html-tools';
+import { HTML } from 'meteor/htmljs';
+import { BlazeTools } from 'meteor/blaze-tools';
+import { codeGen } from './compiler';
+
+
 // ============================================================
 // Code-generation of template tags
 
 // The `CodeGen` class currently has no instance state, but in theory
 // it could be useful to track per-function state, like whether we
 // need to emit `var self = this` or not.
-var CodeGen = SpacebarsCompiler.CodeGen = function () {};
+export function CodeGen() {}
 
-var builtInBlockHelpers = SpacebarsCompiler._builtInBlockHelpers = {
+export const builtInBlockHelpers = {
   'if': 'Blaze.If',
   'unless': 'Blaze.Unless',
   'with': 'Spacebars.With',
@@ -37,7 +43,9 @@ var additionalReservedNames = ["body", "toString", "instance",  "constructor",
   "toString", "toLocaleString", "valueOf", "hasOwnProperty", "isPrototypeOf",
   "propertyIsEnumerable", "__defineGetter__", "__lookupGetter__",
   "__defineSetter__", "__lookupSetter__", "__proto__", "dynamic",
-  "registerHelper", "currentData", "parentData"];
+  "registerHelper", "currentData", "parentData", "_migrateTemplate",
+  "_applyHmrChanges", "__pendingReplacement"
+];
 
 // A "reserved name" can't be used as a <template> name.  This
 // function is used by the template file scanner.
@@ -45,11 +53,11 @@ var additionalReservedNames = ["body", "toString", "instance",  "constructor",
 // Note that the runtime imposes additional restrictions, for example
 // banning the name "body" and names of built-in object properties
 // like "toString".
-SpacebarsCompiler.isReservedName = function (name) {
+export function isReservedName(name) {
   return builtInBlockHelpers.hasOwnProperty(name) ||
     builtInTemplateMacros.hasOwnProperty(name) ||
     _.indexOf(additionalReservedNames, name) > -1;
-};
+}
 
 var makeObjectLiteral = function (obj) {
   var parts = [];
@@ -341,7 +349,7 @@ _.extend(CodeGen.prototype, {
   },
 
   codeGenBlock: function (content) {
-    return SpacebarsCompiler.codeGen(content);
+    return codeGen(content);
   },
 
   codeGenInclusionData: function (args) {
diff --git a/packages/spacebars-compiler/compile_tests.js b/packages/spacebars-compiler/compile_tests.js
index 0f04b9053..102d6500a 100644
--- a/packages/spacebars-compiler/compile_tests.js
+++ b/packages/spacebars-compiler/compile_tests.js
@@ -1,13 +1,20 @@
+import { HTMLTools } from 'meteor/html-tools';
+import { HTML } from 'meteor/htmljs';
+import { BlazeTools } from 'meteor/blaze-tools';
+import { SpacebarsCompiler } from 'meteor/spacebars-compiler';
+import { runCompilerOutputTests } from './compiler_output_tests';
+
+
 Tinytest.add("spacebars-compiler - compiler output", function (test) {
 
-  var run = function (input, expected) {
+  var run = function (input, expected, whitespace = '') {
     if (expected.fail) {
       var expectedMessage = expected.fail;
       // test for error starting with expectedMessage
       var msg = '';
       test.throws(function () {
         try {
-          SpacebarsCompiler.compile(input, {isTemplate: true});
+          SpacebarsCompiler.compile(input, {isTemplate: true, whitespace});
         } catch (e) {
           msg = e.message;
           throw e;
@@ -16,7 +23,7 @@ Tinytest.add("spacebars-compiler - compiler output", function (test) {
       test.equal(msg.slice(0, expectedMessage.length),
                  expectedMessage);
     } else {
-      var output = SpacebarsCompiler.compile(input, {isTemplate: true});
+      var output = SpacebarsCompiler.compile(input, {isTemplate: true, whitespace});
       var postProcess = function (string) {
         // remove initial and trailing parens
         string = string.replace(/^\(([\S\s]*)\)$/, '$1');
@@ -45,12 +52,9 @@ Tinytest.add("spacebars-compiler - compiler output", function (test) {
     }
   };
 
-  coffee.runCompilerOutputTests(run);
+  runCompilerOutputTests(run);
 });
 
-coffee = {
-  runCompilerOutputTests: null // implemented in compiler_output_tests.coffee
-};
 
 Tinytest.add("spacebars-compiler - compiler errors", function (test) {
 
diff --git a/packages/spacebars-compiler/compiler.js b/packages/spacebars-compiler/compiler.js
index 7301f8ad3..40adcfa25 100644
--- a/packages/spacebars-compiler/compiler.js
+++ b/packages/spacebars-compiler/compiler.js
@@ -1,24 +1,31 @@
+import { Meteor } from 'meteor/meteor';
+import { HTMLTools } from 'meteor/html-tools';
+import { HTML } from 'meteor/htmljs';
+import { BlazeTools } from 'meteor/blaze-tools';
+import { CodeGen } from './codegen';
+import { optimize } from './optimizer';
+import { ReactComponentSiblingForbidder} from './react';
+import { TemplateTag } from './templatetag';
+import { removeWhitespace } from './whitespace';
+
 var UglifyJSMinify = null;
 if (Meteor.isServer) {
   UglifyJSMinify = Npm.require('uglify-js').minify;
 }
 
-SpacebarsCompiler.parse = function (input) {
-
-  var tree = HTMLTools.parseFragment(
+export function parse(input) {
+  return HTMLTools.parseFragment(
     input,
     { getTemplateTag: TemplateTag.parseCompleteTag });
+}
 
-  return tree;
-};
-
-SpacebarsCompiler.compile = function (input, options) {
-  var tree = SpacebarsCompiler.parse(input);
-  return SpacebarsCompiler.codeGen(tree, options);
-};
+export function compile(input, options) {
+  var tree = parse(input);
+  return codeGen(tree, options);
+}
 
-SpacebarsCompiler._TemplateTagReplacer = HTML.TransformingVisitor.extend();
-SpacebarsCompiler._TemplateTagReplacer.def({
+export const TemplateTagReplacer = HTML.TransformingVisitor.extend();
+TemplateTagReplacer.def({
   visitObject: function (x) {
     if (x instanceof HTMLTools.TemplateTag) {
 
@@ -61,28 +68,32 @@ SpacebarsCompiler._TemplateTagReplacer.def({
   }
 });
 
-SpacebarsCompiler.codeGen = function (parseTree, options) {
+export function codeGen (parseTree, options) {
   // is this a template, rather than a block passed to
   // a block helper, say
   var isTemplate = (options && options.isTemplate);
   var isBody = (options && options.isBody);
+  var whitespace = (options && options.whitespace)
   var sourceName = (options && options.sourceName);
 
   var tree = parseTree;
 
   // The flags `isTemplate` and `isBody` are kind of a hack.
   if (isTemplate || isBody) {
+    if (typeof whitespace === 'string' && whitespace.toLowerCase() === 'strip') {
+      tree = removeWhitespace(tree);
+    }
     // optimizing fragments would require being smarter about whether we are
     // in a TEXTAREA, say.
-    tree = SpacebarsCompiler.optimize(tree);
+    tree = optimize(tree);
   }
 
   // throws an error if using `{{> React}}` with siblings
   new ReactComponentSiblingForbidder({sourceName: sourceName})
     .visit(tree);
 
-  var codegen = new SpacebarsCompiler.CodeGen;
-  tree = (new SpacebarsCompiler._TemplateTagReplacer(
+  var codegen = new CodeGen;
+  tree = (new TemplateTagReplacer(
     {codegen: codegen})).visit(tree);
 
   var code = '(function () { ';
@@ -93,30 +104,30 @@ SpacebarsCompiler.codeGen = function (parseTree, options) {
   code += BlazeTools.toJS(tree);
   code += '; })';
 
-  code = SpacebarsCompiler._beautify(code);
+  code = beautify(code);
 
   return code;
-};
+}
 
-SpacebarsCompiler._beautify = function (code) {
+export function beautify (code) {
   if (!UglifyJSMinify) {
     return code;
   }
 
-  var result = UglifyJSMinify(code, { 
+  var result = UglifyJSMinify(code, {
     fromString: true,
     mangle: false,
     compress: false,
-    output: { 
+    output: {
       beautify: true,
       indent_level: 2,
       width: 80
     }
   });
-  
+
   var output = result.code;
   // Uglify interprets our expression as a statement and may add a semicolon.
   // Strip trailing semicolon.
   output = output.replace(/;$/, '');
   return output;
-};
+}
diff --git a/packages/spacebars-compiler/compiler_output_tests.coffee b/packages/spacebars-compiler/compiler_output_tests.coffee
deleted file mode 100644
index 38ab9cd97..000000000
--- a/packages/spacebars-compiler/compiler_output_tests.coffee
+++ /dev/null
@@ -1,296 +0,0 @@
-coffee.runCompilerOutputTests = (run) ->
-  run "abc",
-  """
-  function () {
-    var view = this;
-    return "abc";
-  }
-  """
-
-  run "{{foo}}",
-  """
-  function() {
-    var view = this;
-    return Blaze.View("lookup:foo", function() {
-      return Spacebars.mustache(view.lookup("foo"));
-    });
-  }
-  """
-
-  run "{{foo bar}}",
-  """
-  function() {
-    var view = this;
-    return Blaze.View("lookup:foo", function() {
-      return Spacebars.mustache(view.lookup("foo"),
-                                view.lookup("bar"));
-    });
-  }
-  """
-
-  run "{{foo x=bar}}",
-  """
-  function() {
-    var view = this;
-    return Blaze.View("lookup:foo", function() {
-      return Spacebars.mustache(view.lookup("foo"), Spacebars.kw({
-        x: view.lookup("bar")
-      }));
-    });
-  }
-  """
-
-  run "{{foo.bar baz}}",
-  """
-  function() {
-    var view = this;
-    return Blaze.View("lookup:foo.bar", function() {
-      return Spacebars.mustache(Spacebars.dot(
-               view.lookup("foo"), "bar"),
-               view.lookup("baz"));
-    });
-  }
-  """
-
-  run "{{foo.bar (baz qux)}}",
-  """
-  function() {
-    var view = this;
-    return Blaze.View("lookup:foo.bar", function() {
-      return Spacebars.mustache(Spacebars.dot(
-               view.lookup("foo"), "bar"),
-               Spacebars.dataMustache(view.lookup("baz"), view.lookup("qux")));
-    });
-  }
-  """
-
-
-  run "{{foo bar.baz}}",
-  """
-  function() {
-    var view = this;
-    return Blaze.View("lookup:foo", function() {
-      return Spacebars.mustache(view.lookup("foo"),
-             Spacebars.dot(view.lookup("bar"), "baz"));
-    });
-  }
-  """
-
-  run "{{foo x=bar.baz}}",
-  """
-  function() {
-    var view = this;
-    return Blaze.View("lookup:foo", function() {
-      return Spacebars.mustache(view.lookup("foo"), Spacebars.kw({
-        x: Spacebars.dot(view.lookup("bar"), "baz")
-      }));
-    });
-  }
-  """
-
-  run "{{#foo}}abc{{/foo}}",
-  """
-  function() {
-    var view = this;
-    return Spacebars.include(view.lookupTemplate("foo"), (function() {
-      return "abc";
-    }));
-  }
-  """
-
-  run "{{#if cond}}aaa{{else}}bbb{{/if}}",
-  """
-  function() {
-    var view = this;
-    return Blaze.If(function () {
-      return Spacebars.call(view.lookup("cond"));
-    }, (function() {
-      return "aaa";
-    }), (function() {
-      return "bbb";
-    }));
-  }
-  """
-
-  run "{{!-- --}}{{#if cond}}aaa{{!\n}}{{else}}{{!}}bbb{{!-- --}}{{/if}}{{!}}",
-  """
-function() {
-  var view = this;
-  return Blaze.If(function () {
-    return Spacebars.call(view.lookup("cond"));
-  }, (function() {
-    return "aaa";
-  }), (function() {
-    return "bbb";
-  }));
-}
-  """
-
-  run "{{> foo bar}}",
-  """
-  function() {
-    var view = this;
-    return Blaze._TemplateWith(function() {
-      return Spacebars.call(view.lookup("bar"));
-    }, function() {
-      return Spacebars.include(view.lookupTemplate("foo"));
-    });
-  }
-  """
-
-  run "{{> foo x=bar}}",
-  """
-  function() {
-    var view = this;
-    return Blaze._TemplateWith(function() {
-      return {
-        x: Spacebars.call(view.lookup("bar"))
-      };
-    }, function() {
-      return Spacebars.include(view.lookupTemplate("foo"));
-    });
-  }
-
-  """
-
-  run "{{> foo bar.baz}}",
-  """
-  function() {
-    var view = this;
-    return Blaze._TemplateWith(function() {
-      return Spacebars.call(Spacebars.dot(view.lookup("bar"), "baz"));
-    }, function() {
-      return Spacebars.include(view.lookupTemplate("foo"));
-    });
-  }
-  """
-
-  run "{{> foo x=bar.baz}}",
-  """
-  function() {
-    var view = this;
-    return Blaze._TemplateWith(function() {
-      return {
-        x: Spacebars.call(Spacebars.dot(view.lookup("bar"), "baz"))
-      };
-    }, function() {
-      return Spacebars.include(view.lookupTemplate("foo"));
-    });
-  }
-  """
-
-  run "{{> foo bar baz}}",
-  """
-  function() {
-    var view = this;
-    return Blaze._TemplateWith(function() {
-      return Spacebars.dataMustache(view.lookup("bar"), view.lookup("baz"));
-    }, function() {
-      return Spacebars.include(view.lookupTemplate("foo"));
-    });
-  }
-
-  """
-
-  run "{{#foo bar baz}}aaa{{/foo}}",
-  """
-  function() {
-    var view = this;
-    return Blaze._TemplateWith(function() {
-      return Spacebars.dataMustache(view.lookup("bar"), view.lookup("baz"));
-    }, function() {
-      return Spacebars.include(view.lookupTemplate("foo"), (function() {
-        return "aaa";
-      }));
-    });
-  }
-  """
-
-  run "{{#foo p.q r.s}}aaa{{/foo}}",
-  """
-  function() {
-    var view = this;
-    return Blaze._TemplateWith(function() {
-      return Spacebars.dataMustache(Spacebars.dot(view.lookup("p"), "q"), Spacebars.dot(view.lookup("r"), "s"));
-    }, function() {
-      return Spacebars.include(view.lookupTemplate("foo"), (function() {
-        return "aaa";
-      }));
-    });
-  }
-  """
-
-  run "<a {{b}}></a>",
-  """
-  function() {
-    var view = this;
-    return HTML.A(HTML.Attrs(function() {
-      return Spacebars.attrMustache(view.lookup("b"));
-    }));
-  }
-  """
-
-  run "<a {{b}} c=d{{e}}f></a>",
-  """
-  function() {
-    var view = this;
-    return HTML.A(HTML.Attrs({
-      c: (function() { return [
-        "d",
-        Spacebars.mustache(view.lookup("e")),
-        "f" ]; })
-    }, function() {
-      return Spacebars.attrMustache(view.lookup("b"));
-    }));
-  }
-  """
-
-  run "<asdf>{{foo}}</asdf>",
-  """
-  function() {
-    var view = this;
-    return HTML.getTag("asdf")(Blaze.View("lookup:foo", function() {
-      return Spacebars.mustache(view.lookup("foo"));
-    }));
-  }
-  """
-
-  run "<textarea>{{foo}}</textarea>",
-  """
-  function() {
-    var view = this;
-    return HTML.TEXTAREA({value: (function () {
-      return Spacebars.mustache(view.lookup("foo"));
-    }) });
-  }
-  """
-
-  run "<textarea>{{{{|{{|foo}}</textarea>",
-  """
-  function() {
-    var view = this;
-    return HTML.TEXTAREA({value: (function () {
-      return [ "{{{{", "{{", "foo}}" ];
-    }) });
-  }
-  """
-
-  run "{{|foo}}",
-  """
-  function() {
-    var view = this;
-    return [ "{{", "foo}}" ];
-  }
-  """
-
-  run "<a b={{{|></a>",
-  """
-  function() {
-    var view = this;
-    return HTML.A({
-      b: (function () {
-        return "{{{";
-      })
-    });
-  }
-  """
diff --git a/packages/spacebars-compiler/compiler_output_tests.js b/packages/spacebars-compiler/compiler_output_tests.js
new file mode 100644
index 000000000..fe5e1a2ec
--- /dev/null
+++ b/packages/spacebars-compiler/compiler_output_tests.js
@@ -0,0 +1,256 @@
+export function runCompilerOutputTests(run) {
+  run("abc", `function () {
+  var view = this;
+  return "abc";
+}`);
+  run("{{foo}}", `function() {
+  var view = this;
+  return Blaze.View("lookup:foo", function() {
+    return Spacebars.mustache(view.lookup("foo"));
+  });
+}`);
+  run("{{foo bar}}", `function() {
+  var view = this;
+  return Blaze.View("lookup:foo", function() {
+    return Spacebars.mustache(view.lookup("foo"),
+                              view.lookup("bar"));
+  });
+}`);
+  run("{{foo x=bar}}", `function() {
+  var view = this;
+  return Blaze.View("lookup:foo", function() {
+    return Spacebars.mustache(view.lookup("foo"), Spacebars.kw({
+      x: view.lookup("bar")
+    }));
+  });
+}`);
+  run("{{foo.bar baz}}", `function() {
+  var view = this;
+  return Blaze.View("lookup:foo.bar", function() {
+    return Spacebars.mustache(Spacebars.dot(
+             view.lookup("foo"), "bar"),
+             view.lookup("baz"));
+  });
+}`);
+  run("{{foo.bar (baz qux)}}", `function() {
+  var view = this;
+  return Blaze.View("lookup:foo.bar", function() {
+    return Spacebars.mustache(Spacebars.dot(
+             view.lookup("foo"), "bar"),
+             Spacebars.dataMustache(view.lookup("baz"), view.lookup("qux")));
+  });
+}`);
+  run("{{foo bar.baz}}", `function() {
+  var view = this;
+  return Blaze.View("lookup:foo", function() {
+    return Spacebars.mustache(view.lookup("foo"),
+           Spacebars.dot(view.lookup("bar"), "baz"));
+  });
+}`);
+  run("{{foo x=bar.baz}}", `function() {
+  var view = this;
+  return Blaze.View("lookup:foo", function() {
+    return Spacebars.mustache(view.lookup("foo"), Spacebars.kw({
+      x: Spacebars.dot(view.lookup("bar"), "baz")
+    }));
+  });
+}`);
+  run("{{#foo}}abc{{/foo}}", `function() {
+  var view = this;
+  return Spacebars.include(view.lookupTemplate("foo"), (function() {
+    return "abc";
+  }));
+}`);
+  run("{{#if cond}}aaa{{else}}bbb{{/if}}", `function() {
+  var view = this;
+  return Blaze.If(function () {
+    return Spacebars.call(view.lookup("cond"));
+  }, (function() {
+    return "aaa";
+  }), (function() {
+    return "bbb";
+  }));
+}`);
+  run("{{!-- --}}{{#if cond}}aaa{{!\n}}{{else}}{{!}}bbb{{!-- --}}{{/if}}{{!}}", `function() {
+  var view = this;
+  return Blaze.If(function () {
+    return Spacebars.call(view.lookup("cond"));
+  }, (function() {
+    return "aaa";
+  }), (function() {
+    return "bbb";
+  }));
+}`);
+  run("{{!-- --}}{{#if cond}}<p>aaa</p><p>ppp</p>{{!\n}}{{else}}{{!}}<p>{{bbb}}</p>{{!-- --}}{{/if}}{{!}}", `function() {
+  var view = this;
+  return Blaze.If(function () {
+    return Spacebars.call(view.lookup("cond"));
+  }, (function() {
+    return HTML.Raw("<p>aaa</p><p>ppp</p>");
+  }), (function() {
+    return HTML.P(Blaze.View("lookup:bbb", function() {
+      return Spacebars.mustache(view.lookup("bbb"));
+    }));
+  }));
+}`);
+  run("{{> foo bar}}", `function() {
+  var view = this;
+  return Blaze._TemplateWith(function() {
+    return Spacebars.call(view.lookup("bar"));
+  }, function() {
+    return Spacebars.include(view.lookupTemplate("foo"));
+  });
+}`);
+  run("{{> foo x=bar}}", `function() {
+  var view = this;
+  return Blaze._TemplateWith(function() {
+    return {
+      x: Spacebars.call(view.lookup("bar"))
+    };
+  }, function() {
+    return Spacebars.include(view.lookupTemplate("foo"));
+  });
+}
+`);
+  run("{{> foo bar.baz}}", `function() {
+  var view = this;
+  return Blaze._TemplateWith(function() {
+    return Spacebars.call(Spacebars.dot(view.lookup("bar"), "baz"));
+  }, function() {
+    return Spacebars.include(view.lookupTemplate("foo"));
+  });
+}`);
+  run("{{> foo x=bar.baz}}", `function() {
+  var view = this;
+  return Blaze._TemplateWith(function() {
+    return {
+      x: Spacebars.call(Spacebars.dot(view.lookup("bar"), "baz"))
+    };
+  }, function() {
+    return Spacebars.include(view.lookupTemplate("foo"));
+  });
+}`);
+  run("{{> foo bar baz}}", `function() {
+  var view = this;
+  return Blaze._TemplateWith(function() {
+    return Spacebars.dataMustache(view.lookup("bar"), view.lookup("baz"));
+  }, function() {
+    return Spacebars.include(view.lookupTemplate("foo"));
+  });
+}
+`);
+  run("{{#foo bar baz}}aaa{{/foo}}", `function() {
+  var view = this;
+  return Blaze._TemplateWith(function() {
+    return Spacebars.dataMustache(view.lookup("bar"), view.lookup("baz"));
+  }, function() {
+    return Spacebars.include(view.lookupTemplate("foo"), (function() {
+      return "aaa";
+    }));
+  });
+}`);
+  run("{{#foo p.q r.s}}aaa{{/foo}}", `function() {
+  var view = this;
+  return Blaze._TemplateWith(function() {
+    return Spacebars.dataMustache(Spacebars.dot(view.lookup("p"), "q"), Spacebars.dot(view.lookup("r"), "s"));
+  }, function() {
+    return Spacebars.include(view.lookupTemplate("foo"), (function() {
+      return "aaa";
+    }));
+  });
+}`);
+  run("<a {{b}}></a>", `function() {
+  var view = this;
+  return HTML.A(HTML.Attrs(function() {
+    return Spacebars.attrMustache(view.lookup("b"));
+  }));
+}`);
+  run("<a {{b}} c=d{{e}}f></a>", `function() {
+  var view = this;
+  return HTML.A(HTML.Attrs({
+    c: (function() { return [
+      "d",
+      Spacebars.mustache(view.lookup("e")),
+      "f" ]; })
+  }, function() {
+    return Spacebars.attrMustache(view.lookup("b"));
+  }));
+}`);
+  run("<asdf>{{foo}}</asdf>", `function() {
+  var view = this;
+  return HTML.getTag("asdf")(Blaze.View("lookup:foo", function() {
+    return Spacebars.mustache(view.lookup("foo"));
+  }));
+}`);
+  run("<textarea>{{foo}}</textarea>", `function() {
+  var view = this;
+  return HTML.TEXTAREA({value: (function () {
+    return Spacebars.mustache(view.lookup("foo"));
+  }) });
+}`);
+  run("<textarea>{{{{|{{|foo}}</textarea>", `function() {
+  var view = this;
+  return HTML.TEXTAREA({value: (function () {
+    return [ "{{{{", "{{", "foo}}" ];
+  }) });
+}`);
+  run("{{|foo}}", `function() {
+  var view = this;
+  return [ "{{", "foo}}" ];
+}`);
+  run("<a b={{{|></a>", `function() {
+  var view = this;
+  return HTML.A({
+    b: (function () {
+      return "{{{";
+    })
+  });
+}`);
+  run("<div><div>{{helper}}<div>a</div><div>b</div></div></div>", `function() {
+  var view = this;
+  return HTML.DIV(HTML.DIV(Blaze.View("lookup:helper",function(){
+      return Spacebars.mustache(view.lookup("helper"));
+  }), HTML.Raw("<div>a</div><div>b</div>")));
+}`);
+  run("<table><colgroup><col></colgroup><tr><td>aaa</td><td>bbb</td></tr></table>", `function() {
+  var view = this;
+  return HTML.TABLE(
+    HTML.Raw("<colgroup><col></colgroup>"),
+    HTML.TR(HTML.Raw("<td>aaa</td><td>bbb</td>"))
+  );
+}`);
+  run(`<div>
+    {{helper}}
+</div>`, `function() {
+  var view = this;
+  return HTML.DIV(
+    "\\n    ",
+    Blaze.View("lookup:helper",function(){
+      return Spacebars.mustache(view.lookup("helper"));
+    }),
+    "\\n"
+  );
+}`);
+  run(`<div>
+    {{helper}}
+</div>`, `function() {
+  var view = this;
+  return HTML.DIV(
+    Blaze.View("lookup:helper",function(){
+      return Spacebars.mustache(view.lookup("helper"));
+    })
+  );
+}`, 'strip');
+  run(`<div>
+    {{helper}}
+    <span>Test</span> <span>Spaces</span>
+</div>`, `function() {
+  var view = this;
+  return HTML.DIV(
+    Blaze.View("lookup:helper",function(){
+      return Spacebars.mustache(view.lookup("helper"));
+    }),
+    HTML.Raw("<span>Test</span> <span>Spaces</span>")
+  );
+}`, 'strip');
+}
diff --git a/packages/spacebars-compiler/optimizer.js b/packages/spacebars-compiler/optimizer.js
index cdf93b247..9186c1cb9 100644
--- a/packages/spacebars-compiler/optimizer.js
+++ b/packages/spacebars-compiler/optimizer.js
@@ -1,3 +1,6 @@
+import { HTMLTools } from 'meteor/html-tools';
+import { HTML } from 'meteor/htmljs';
+
 // Optimize parts of an HTMLjs tree into raw HTML strings when they don't
 // contain template tags.
 
@@ -55,7 +58,9 @@ CanOptimizeVisitor.def({
       // browser will insert a TBODY.  If we just `createElement("table")` and
       // `createElement("tr")`, on the other hand, no TBODY is necessary
       // (assuming IE 8+).
-      return OPTIMIZABLE.NONE;
+      return OPTIMIZABLE.PARTS;
+    } else if (tagName === 'tr'){
+      return OPTIMIZABLE.PARTS;
     }
 
     var children = tag.children;
@@ -88,11 +93,11 @@ var getOptimizability = function (content) {
   return (new CanOptimizeVisitor).visit(content);
 };
 
-var toRaw = function (x) {
+export function toRaw(x) {
   return HTML.Raw(HTML.toHTML(x));
-};
+}
 
-var TreeTransformer = HTML.TransformingVisitor.extend();
+export const TreeTransformer = HTML.TransformingVisitor.extend();
 TreeTransformer.def({
   visitAttributes: function (attrs/*, ...*/) {
     // pass template tags through by default
@@ -160,7 +165,7 @@ RawCompactingVisitor.def({
             result[result.length - 1].value + item.value);
         }
       } else {
-        result.push(item);
+        result.push(this.visit(item));
       }
     }
     return result;
@@ -181,9 +186,9 @@ RawReplacingVisitor.def({
   }
 });
 
-SpacebarsCompiler.optimize = function (tree) {
+export function optimize (tree) {
   tree = (new OptimizingVisitor).visit(tree);
   tree = (new RawCompactingVisitor).visit(tree);
   tree = (new RawReplacingVisitor).visit(tree);
   return tree;
-};
+}
diff --git a/packages/spacebars-compiler/package.js b/packages/spacebars-compiler/package.js
index d2e534894..70db85a53 100644
--- a/packages/spacebars-compiler/package.js
+++ b/packages/spacebars-compiler/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: 'spacebars-compiler',
   summary: "Compiler for Spacebars template language",
-  version: '1.1.3',
+  version: '1.2.0-beta.3',
   git: 'https://github.com/meteor/blaze.git'
 });
 
@@ -10,28 +10,21 @@ Npm.depends({
 });
 
 Package.onUse(function (api) {
+  api.use('ecmascript@0.14.4');
   api.use('underscore@1.0.9');
 
-  api.export('SpacebarsCompiler');
+  api.use('htmljs@1.1.0-beta.3');
+  api.use('html-tools@1.1.0-beta.3');
+  api.use('blaze-tools@1.1.0-beta.3');
 
-  api.use('htmljs@1.0.11');
-  api.use('html-tools@1.0.11');
-  api.use('blaze-tools@1.0.10');
-
-  api.addFiles([
-    'templatetag.js',
-    'optimizer.js',
-    'react.js',
-    'codegen.js',
-    'compiler.js'
-  ]);
+  api.mainModule('preamble.js');
 });
 
 Package.onTest(function (api) {
   api.use([
     'underscore',
+    'ecmascript',
     'tinytest',
-    'coffeescript',
     'spacebars-compiler',
     'blaze-tools'
   ]);
@@ -39,6 +32,5 @@ Package.onTest(function (api) {
   api.addFiles([
     'spacebars_tests.js',
     'compile_tests.js',
-    'compiler_output_tests.coffee'
   ]);
 });
diff --git a/packages/spacebars-compiler/preamble.js b/packages/spacebars-compiler/preamble.js
new file mode 100644
index 000000000..053d6c3d3
--- /dev/null
+++ b/packages/spacebars-compiler/preamble.js
@@ -0,0 +1,17 @@
+import { CodeGen, builtInBlockHelpers, isReservedName } from './codegen';
+import { optimize } from './optimizer';
+import { parse, compile, codeGen, TemplateTagReplacer, beautify } from './compiler';
+import { TemplateTag } from './templatetag';
+
+export const SpacebarsCompiler = {
+  CodeGen,
+  _builtInBlockHelpers: builtInBlockHelpers,
+  isReservedName,
+  optimize,
+  parse,
+  compile,
+  codeGen,
+  _TemplateTagReplacer: TemplateTagReplacer,
+  _beautify: beautify,
+  TemplateTag,
+};
diff --git a/packages/spacebars-compiler/react.js b/packages/spacebars-compiler/react.js
index f119aac2b..0dd84a83c 100644
--- a/packages/spacebars-compiler/react.js
+++ b/packages/spacebars-compiler/react.js
@@ -1,3 +1,7 @@
+import { HTMLTools } from 'meteor/html-tools';
+import { HTML } from 'meteor/htmljs';
+import { BlazeTools } from 'meteor/blaze-tools';
+
 // A visitor to ensure that React components included via the `{{>
 // React}}` template defined in the react-template-helper package are
 // the only child in their parent component. Otherwise `React.render`
@@ -6,7 +10,7 @@
 // It's a little strange that this logic is in spacebars-compiler if
 // it's only relevant to a specific package but there's no way to have
 // a package hook into a build plugin.
-ReactComponentSiblingForbidder = HTML.Visitor.extend();
+export const ReactComponentSiblingForbidder = HTML.Visitor.extend();
 ReactComponentSiblingForbidder.def({
   visitArray: function (array, parentTag) {
     for (var i = 0; i < array.length; i++) {
diff --git a/packages/spacebars-compiler/spacebars_tests.js b/packages/spacebars-compiler/spacebars_tests.js
index c5099dd8e..481936b81 100644
--- a/packages/spacebars-compiler/spacebars_tests.js
+++ b/packages/spacebars-compiler/spacebars_tests.js
@@ -1,3 +1,8 @@
+import { HTMLTools } from 'meteor/html-tools';
+import { HTML } from 'meteor/htmljs';
+import { BlazeTools } from 'meteor/blaze-tools';
+import { SpacebarsCompiler } from 'meteor/spacebars-compiler';
+
 Tinytest.add("spacebars-compiler - stache tags", function (test) {
 
   var run = function (input, expected) {
diff --git a/packages/spacebars-compiler/templatetag.js b/packages/spacebars-compiler/templatetag.js
index 9c624c4e4..2593cd700 100644
--- a/packages/spacebars-compiler/templatetag.js
+++ b/packages/spacebars-compiler/templatetag.js
@@ -1,4 +1,6 @@
-SpacebarsCompiler = {};
+import { HTMLTools } from 'meteor/html-tools';
+import { HTML } from 'meteor/htmljs';
+import { BlazeTools } from 'meteor/blaze-tools';
 
 // A TemplateTag is the result of parsing a single `{{...}}` tag.
 //
@@ -43,9 +45,10 @@ SpacebarsCompiler = {};
 
 var TEMPLATE_TAG_POSITION = HTMLTools.TEMPLATE_TAG_POSITION;
 
-TemplateTag = SpacebarsCompiler.TemplateTag = function () {
+export function TemplateTag () {
   HTMLTools.TemplateTag.apply(this, arguments);
-};
+}
+
 TemplateTag.prototype = new HTMLTools.TemplateTag;
 TemplateTag.prototype.constructorName = 'SpacebarsCompiler.TemplateTag';
 
@@ -401,6 +404,7 @@ TemplateTag.parseCompleteTag = function (scannerOrString, position) {
         shouldStop: isAtBlockCloseOrElse,
         textMode: textMode
       };
+    result.textMode = textMode;
     result.content = HTMLTools.parseFragment(scanner, parserOptions);
 
     if (scanner.rest().slice(0, 2) !== '{{')
@@ -420,6 +424,7 @@ TemplateTag.parseCompleteTag = function (scannerOrString, position) {
         lastElseContentTag.elseContent.type = 'BLOCKOPEN';
         lastElseContentTag.elseContent.path = tmplTag.path;
         lastElseContentTag.elseContent.args = tmplTag.args;
+        lastElseContentTag.elseContent.textMode = textMode;
         lastElseContentTag.elseContent.content = HTMLTools.parseFragment(scanner, parserOptions);
 
         lastElseContentTag = lastElseContentTag.elseContent;
diff --git a/packages/spacebars-compiler/whitespace.js b/packages/spacebars-compiler/whitespace.js
new file mode 100644
index 000000000..68026bf92
--- /dev/null
+++ b/packages/spacebars-compiler/whitespace.js
@@ -0,0 +1,81 @@
+import { HTML } from 'meteor/htmljs';
+import { TreeTransformer, toRaw } from './optimizer';
+
+function compactRaw(array){
+  var result = [];
+  for (var i = 0; i < array.length; i++) {
+    var item = array[i];
+    if (item instanceof HTML.Raw) {
+      if (!item.value) {
+        continue;
+      }
+      if (result.length &&
+          (result[result.length - 1] instanceof HTML.Raw)){
+        result[result.length - 1] = HTML.Raw(
+          result[result.length - 1].value + item.value);
+        continue
+      }
+    }
+    result.push(item);
+  }
+  return result;
+}
+
+function replaceIfContainsNewline(match) {
+  if (match.indexOf('\n') >= 0) {
+    return ''
+  }
+  return match;
+}
+
+function stripWhitespace(array){
+  var result = [];
+  for (var i = 0; i < array.length; i++) {
+    var item = array[i];
+    if (item instanceof HTML.Raw) {
+      // remove nodes that contain only whitespace & a newline
+      if (item.value.indexOf('\n') !== -1 && !/\S/.test(item.value)) {
+        continue;
+      }
+      // Trim any preceding whitespace, if it contains a newline
+      var newStr = item.value;
+      newStr = newStr.replace(/^\s+/, replaceIfContainsNewline);
+      newStr = newStr.replace(/\s+$/, replaceIfContainsNewline);
+      item.value = newStr;
+    }
+    result.push(item)
+  }
+  return result;
+}
+
+var WhitespaceRemovingVisitor = TreeTransformer.extend();
+WhitespaceRemovingVisitor.def({
+  visitNull: toRaw,
+  visitPrimitive: toRaw,
+  visitCharRef: toRaw,
+  visitArray: function(array){
+    // this.super(array)
+    var result = TreeTransformer.prototype.visitArray.call(this, array);
+    result = compactRaw(result);
+    result = stripWhitespace(result);
+    return result;
+  },
+  visitTag: function (tag) {
+    var tagName = tag.tagName;
+    // TODO - List tags that we don't want to strip whitespace for.
+    if (tagName === 'textarea' || tagName === 'script' || tagName === 'pre'
+      || !HTML.isKnownElement(tagName) || HTML.isKnownSVGElement(tagName)) {
+      return tag;
+    }
+    return TreeTransformer.prototype.visitTag.call(this, tag)
+  },
+  visitAttributes: function (attrs) {
+    return attrs;
+  }
+});
+
+
+export function removeWhitespace(tree) {
+  tree = (new WhitespaceRemovingVisitor).visit(tree);
+  return tree;
+}
diff --git a/packages/spacebars-tests/.versions b/packages/spacebars-tests/.versions
index e0e1f8292..e3d0b3afb 100644
--- a/packages/spacebars-tests/.versions
+++ b/packages/spacebars-tests/.versions
@@ -1,59 +1,69 @@
-allow-deny@1.0.5
-babel-compiler@6.14.1
-babel-runtime@1.0.1
-base64@1.0.10
-binary-heap@1.0.10
-blaze@2.3.2
-blaze-tools@1.0.10
-boilerplate-generator@1.0.11
-caching-compiler@1.1.9
-caching-html-compiler@1.1.2
-callback-hook@1.0.10
-check@1.2.5
-ddp@1.2.5
-ddp-client@1.3.3
-ddp-common@1.2.8
-ddp-server@1.3.13
-diff-sequence@1.0.7
-ecmascript@0.6.3
-ecmascript-runtime@0.3.15
-ejson@1.0.13
-es5-shim@4.6.15
+allow-deny@1.1.0
+babel-compiler@7.6.0
+babel-runtime@1.5.0
+base64@1.0.12
+binary-heap@1.0.11
+blaze@2.4.0-beta.3
+blaze-tools@1.1.0-beta.3
+boilerplate-generator@1.7.1
+caching-compiler@1.2.2
+caching-html-compiler@1.2.0-beta.3
+callback-hook@1.3.0
+check@1.3.1
+ddp@1.4.0
+ddp-client@2.4.0
+ddp-common@1.4.0
+ddp-server@2.3.2
+diff-sequence@1.1.1
+dynamic-import@0.6.0
+ecmascript@0.15.0
+ecmascript-runtime@0.7.0
+ecmascript-runtime-client@0.11.0
+ecmascript-runtime-server@0.10.0
+ejson@1.1.1
+es5-shim@4.8.0
+fetch@0.1.1
 geojson-utils@1.0.10
-html-tools@1.0.11
-htmljs@1.0.11
-id-map@1.0.9
+html-tools@1.1.0-beta.3
+htmljs@1.1.0-beta.3
+id-map@1.1.0
+inter-process-messaging@0.1.1
 jquery@1.11.10
-local-test:spacebars-tests@1.1.2
-logging@1.1.17
+local-test:spacebars-tests@1.2.0-beta.3
+logging@1.2.0
 markdown@1.0.12
-meteor@1.6.1
-minimongo@1.0.21
-modules@0.7.9
-modules-runtime@0.7.9
-mongo@1.1.16
-mongo-id@1.0.6
-npm-mongo@2.2.24
+meteor@1.9.3
+minimongo@1.6.1
+modern-browsers@0.1.5
+modules@0.16.0
+modules-runtime@0.12.0
+mongo@1.10.1
+mongo-decimal@0.1.2
+mongo-dev-server@1.1.0
+mongo-id@1.0.7
+npm-mongo@3.8.1
 observe-sequence@1.0.16
-ordered-dict@1.0.9
-promise@0.8.8
-random@1.0.10
-reactive-dict@1.1.8
+ordered-dict@1.1.0
+promise@0.11.2
+random@1.2.0
+react-fast-refresh@0.1.0
+reactive-dict@1.3.0
 reactive-var@1.0.11
-retry@1.0.9
-routepolicy@1.0.12
-session@1.1.7
-spacebars@1.0.15
-spacebars-compiler@1.1.2
-spacebars-tests@1.1.2
-templating@1.3.2
-templating-compiler@1.3.2
-templating-runtime@1.3.2
-templating-tools@1.1.2
-test-helpers@1.0.11
-tinytest@1.0.12
-tracker@1.1.2
-ui@1.0.12
+reload@1.3.1
+retry@1.1.0
+routepolicy@1.1.0
+session@1.2.0
+socket-stream-client@0.3.1
+spacebars@1.1.0-beta.3
+spacebars-compiler@1.2.0-beta.3
+spacebars-tests@1.2.0-beta.3
+templating@1.4.0-beta.3
+templating-compiler@1.4.0-beta.3
+templating-runtime@1.4.0-beta.3
+templating-tools@1.2.0-beta.3
+test-helpers@1.2.0
+tinytest@1.1.0
+tracker@1.2.0
 underscore@1.0.10
-webapp@1.3.14
-webapp-hashing@1.0.9
+webapp@1.10.0
+webapp-hashing@1.1.0
diff --git a/packages/spacebars-tests/package.js b/packages/spacebars-tests/package.js
index c0bfd5fd1..c16990b4b 100644
--- a/packages/spacebars-tests/package.js
+++ b/packages/spacebars-tests/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: 'spacebars-tests',
   summary: "Additional tests for Spacebars",
-  version: '1.1.2',
+  version: '1.2.0-beta.3',
   git: 'https://github.com/meteor/blaze.git'
 });
 
@@ -24,10 +24,10 @@ Package.onTest(function (api) {
   ]);
 
   api.use([
-    'spacebars@1.0.15',
-    'blaze@2.3.2'
+    'spacebars@1.1.0-beta.3',
+    'blaze@2.4.0-beta.3'
   ]);
-  api.use('templating@1.3.2', 'client');
+  api.use('templating@1.4.0-beta.3', 'client');
 
   api.addFiles([
     'template_tests.html',
diff --git a/packages/spacebars/.versions b/packages/spacebars/.versions
index 5c8c64c9c..d368d67f2 100644
--- a/packages/spacebars/.versions
+++ b/packages/spacebars/.versions
@@ -1,47 +1,53 @@
-allow-deny@1.0.5
-babel-compiler@6.14.1
-babel-runtime@1.0.1
-base64@1.0.10
-binary-heap@1.0.10
-blaze@2.3.2
-blaze-tools@1.0.10
-boilerplate-generator@1.0.11
-callback-hook@1.0.10
-check@1.2.5
-ddp@1.2.5
-ddp-client@1.3.3
-ddp-common@1.2.8
-ddp-server@1.3.13
-diff-sequence@1.0.7
-ecmascript@0.6.3
-ecmascript-runtime@0.3.15
-ejson@1.0.13
+allow-deny@1.1.0
+babel-compiler@7.6.0
+babel-runtime@1.5.0
+base64@1.0.12
+binary-heap@1.0.11
+blaze@2.4.0-beta.3
+boilerplate-generator@1.7.1
+callback-hook@1.3.0
+check@1.3.1
+ddp@1.4.0
+ddp-client@2.4.0
+ddp-common@1.4.0
+ddp-server@2.3.2
+diff-sequence@1.1.1
+dynamic-import@0.6.0
+ecmascript@0.15.0
+ecmascript-runtime@0.7.0
+ecmascript-runtime-client@0.11.0
+ecmascript-runtime-server@0.10.0
+ejson@1.1.1
+fetch@0.1.1
 geojson-utils@1.0.10
-html-tools@1.0.11
-htmljs@1.0.11
-id-map@1.0.9
-jquery@1.11.10
-local-test:spacebars@1.0.15
-logging@1.1.17
-meteor@1.6.1
-minimongo@1.0.21
-modules@0.7.9
-modules-runtime@0.7.9
-mongo@1.1.16
-mongo-id@1.0.6
-npm-mongo@2.2.24
+htmljs@1.1.0-beta.3
+id-map@1.1.0
+inter-process-messaging@0.1.1
+local-test:spacebars@1.1.0-beta.3
+logging@1.2.0
+meteor@1.9.3
+minimongo@1.6.1
+modern-browsers@0.1.5
+modules@0.16.0
+modules-runtime@0.12.0
+mongo@1.10.1
+mongo-decimal@0.1.2
+mongo-dev-server@1.1.0
+mongo-id@1.0.7
+npm-mongo@3.8.1
 observe-sequence@1.0.16
-ordered-dict@1.0.9
-promise@0.8.8
-random@1.0.10
+ordered-dict@1.1.0
+promise@0.11.2
+random@1.2.0
+react-fast-refresh@0.1.0
 reactive-var@1.0.11
-retry@1.0.9
-routepolicy@1.0.12
-spacebars@1.0.15
-spacebars-compiler@1.1.2
-tinytest@1.0.12
-tracker@1.1.2
-ui@1.0.12
+reload@1.3.1
+retry@1.1.0
+routepolicy@1.1.0
+socket-stream-client@0.3.1
+spacebars@1.1.0-beta.3
+tinytest@1.1.0
+tracker@1.2.0
 underscore@1.0.10
-webapp@1.3.14
-webapp-hashing@1.0.9
+webapp@1.10.0
+webapp-hashing@1.1.0
diff --git a/packages/spacebars/package.js b/packages/spacebars/package.js
index 32a31efc3..63c2c24ab 100644
--- a/packages/spacebars/package.js
+++ b/packages/spacebars/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: 'spacebars',
   summary: "Handlebars-like template language for Meteor",
-  version: '1.0.15',
+  version: '1.1.0-beta.3',
   git: 'https://github.com/meteor/blaze.git'
 });
 
@@ -20,8 +20,8 @@ Package.onUse(function (api) {
 
   api.export('Spacebars');
 
-  api.use('htmljs@1.0.11');
-  api.use('blaze@2.3.2');
+  api.use('htmljs@1.1.0-beta.3');
+  api.use('blaze@2.4.0-beta.3');
 
   api.addFiles([
     'spacebars-runtime.js'
diff --git a/packages/static-html/.versions b/packages/static-html/.versions
index 7a9ecfa74..882fe2414 100644
--- a/packages/static-html/.versions
+++ b/packages/static-html/.versions
@@ -1,19 +1,25 @@
-babel-compiler@6.14.1
-babel-runtime@1.0.1
-blaze-tools@1.0.10
-caching-compiler@1.1.9
-caching-html-compiler@1.1.2
-ecmascript@0.6.3
-ecmascript-runtime@0.3.15
-html-tools@1.0.11
-htmljs@1.0.11
-meteor@1.6.1
-modules@0.7.9
-modules-runtime@0.7.9
-promise@0.8.8
-random@1.0.10
-spacebars-compiler@1.1.2
-static-html@1.2.2
-templating-tools@1.1.2
-tracker@1.1.2
+babel-compiler@7.6.0
+babel-runtime@1.5.0
+blaze-tools@1.1.0-beta.3
+caching-compiler@1.2.2
+caching-html-compiler@1.2.0-beta.3
+dynamic-import@0.6.0
+ecmascript@0.15.0
+ecmascript-runtime@0.7.0
+ecmascript-runtime-client@0.11.0
+ecmascript-runtime-server@0.10.0
+fetch@0.1.1
+html-tools@1.1.0-beta.3
+htmljs@1.1.0-beta.3
+inter-process-messaging@0.1.1
+meteor@1.9.3
+modern-browsers@0.1.5
+modules@0.16.0
+modules-runtime@0.12.0
+promise@0.11.2
+random@1.2.0
+react-fast-refresh@0.1.0
+spacebars-compiler@1.2.0-beta.3
+static-html@1.3.0-beta.3
+templating-tools@1.2.0-beta.3
 underscore@1.0.10
diff --git a/packages/static-html/package.js b/packages/static-html/package.js
index 386aab1e1..9e92896ac 100644
--- a/packages/static-html/package.js
+++ b/packages/static-html/package.js
@@ -1,17 +1,17 @@
 Package.describe({
   name: 'static-html',
   summary: "Define static page content in .html files",
-  version: '1.2.2',
+  version: '1.3.0-beta.3',
   git: 'https://github.com/meteor/blaze.git'
 });
 
 Package.registerBuildPlugin({
   name: "compileStaticHtmlBatch",
   use: [
-    'ecmascript@0.5.8',
+    'ecmascript@0.14.4',
     'underscore@1.0.9',
-    'caching-html-compiler@1.1.2',
-    'templating-tools@1.1.2'
+    'caching-html-compiler@1.2.0-beta.3',
+    'templating-tools@1.2.0-beta.3'
   ],
   sources: [
     'static-html.js'
diff --git a/packages/templating-compiler/.versions b/packages/templating-compiler/.versions
index 5a61422bf..2579abf78 100644
--- a/packages/templating-compiler/.versions
+++ b/packages/templating-compiler/.versions
@@ -1,22 +1,25 @@
-babel-compiler@6.20.0
-babel-runtime@1.0.1
-blaze-tools@1.0.10
-caching-compiler@1.1.9
-caching-html-compiler@1.1.2
-deps@1.0.12
-ecmascript@0.8.2
-ecmascript-runtime@0.4.1
-ecmascript-runtime-client@0.4.3
-ecmascript-runtime-server@0.4.1
-html-tools@1.0.11
-htmljs@1.0.11
-meteor@1.7.1
-modules@0.10.0
-modules-runtime@0.8.0
-promise@0.9.0
-random@1.0.10
-spacebars-compiler@1.1.2
-templating-compiler@1.3.3
-templating-tools@1.1.2
-tracker@1.1.3
+babel-compiler@7.6.0
+babel-runtime@1.5.0
+blaze-tools@1.1.0-beta.3
+caching-compiler@1.2.2
+caching-html-compiler@1.2.0-beta.3
+dynamic-import@0.6.0
+ecmascript@0.15.0
+ecmascript-runtime@0.7.0
+ecmascript-runtime-client@0.11.0
+ecmascript-runtime-server@0.10.0
+fetch@0.1.1
+html-tools@1.1.0-beta.3
+htmljs@1.1.0-beta.3
+inter-process-messaging@0.1.1
+meteor@1.9.3
+modern-browsers@0.1.5
+modules@0.16.0
+modules-runtime@0.12.0
+promise@0.11.2
+random@1.2.0
+react-fast-refresh@0.1.0
+spacebars-compiler@1.2.0-beta.3
+templating-compiler@1.4.0-beta.3
+templating-tools@1.2.0-beta.3
 underscore@1.0.10
diff --git a/packages/templating-compiler/package.js b/packages/templating-compiler/package.js
index 970e8920e..96204ecf3 100644
--- a/packages/templating-compiler/package.js
+++ b/packages/templating-compiler/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: 'templating-compiler',
   summary: "Compile templates in .html files",
-  version: '1.3.3',
+  version: '1.4.0-beta.3',
   git: 'https://github.com/meteor/blaze.git',
   documentation: null
 });
@@ -9,9 +9,9 @@ Package.describe({
 Package.registerBuildPlugin({
   name: "compileTemplatesBatch",
   use: [
-    'ecmascript@0.5.8',
-    'caching-html-compiler@1.1.2',
-    'templating-tools@1.1.2'
+    'ecmascript@0.14.4',
+    'caching-html-compiler@1.2.0-beta.3',
+    'templating-tools@1.2.0-beta.3'
   ],
   sources: [
     'compile-templates.js'
diff --git a/packages/templating-runtime/.versions b/packages/templating-runtime/.versions
index f1fc311eb..c2a32e917 100644
--- a/packages/templating-runtime/.versions
+++ b/packages/templating-runtime/.versions
@@ -1,53 +1,62 @@
-allow-deny@1.0.5
-babel-compiler@6.14.1
-babel-runtime@1.0.1
-base64@1.0.10
-binary-heap@1.0.10
-blaze@2.3.2
-blaze-tools@1.0.10
-boilerplate-generator@1.0.11
-caching-compiler@1.1.9
-caching-html-compiler@1.1.2
-callback-hook@1.0.10
-check@1.2.5
-ddp@1.2.5
-ddp-client@1.3.3
-ddp-common@1.2.8
-ddp-server@1.3.13
-diff-sequence@1.0.7
-ecmascript@0.6.3
-ecmascript-runtime@0.3.15
-ejson@1.0.13
+allow-deny@1.1.0
+babel-compiler@7.6.0
+babel-runtime@1.5.0
+base64@1.0.12
+binary-heap@1.0.11
+blaze@2.4.0-beta.3
+blaze-tools@1.1.0-beta.3
+boilerplate-generator@1.7.1
+caching-compiler@1.2.2
+caching-html-compiler@1.2.0-beta.3
+callback-hook@1.3.0
+check@1.3.1
+ddp@1.4.0
+ddp-client@2.4.0
+ddp-common@1.4.0
+ddp-server@2.3.2
+diff-sequence@1.1.1
+dynamic-import@0.6.0
+ecmascript@0.15.0
+ecmascript-runtime@0.7.0
+ecmascript-runtime-client@0.11.0
+ecmascript-runtime-server@0.10.0
+ejson@1.1.1
+fetch@0.1.1
 geojson-utils@1.0.10
-html-tools@1.0.11
-htmljs@1.0.11
-id-map@1.0.9
-jquery@1.11.10
-local-test:templating-runtime@1.3.2
-logging@1.1.17
-meteor@1.6.1
-minimongo@1.0.21
-modules@0.7.9
-modules-runtime@0.7.9
-mongo@1.1.16
-mongo-id@1.0.6
-npm-mongo@2.2.24
+html-tools@1.1.0-beta.3
+htmljs@1.1.0-beta.3
+id-map@1.1.0
+inter-process-messaging@0.1.1
+local-test:templating-runtime@1.4.0-beta.3
+logging@1.2.0
+meteor@1.9.3
+minimongo@1.6.1
+modern-browsers@0.1.5
+modules@0.16.0
+modules-runtime@0.12.0
+mongo@1.10.1
+mongo-decimal@0.1.2
+mongo-dev-server@1.1.0
+mongo-id@1.0.7
+npm-mongo@3.8.1
 observe-sequence@1.0.16
-ordered-dict@1.0.9
-promise@0.8.8
-random@1.0.10
+ordered-dict@1.1.0
+promise@0.11.2
+random@1.2.0
+react-fast-refresh@0.1.0
 reactive-var@1.0.11
-retry@1.0.9
-routepolicy@1.0.12
-spacebars@1.0.15
-spacebars-compiler@1.1.2
-templating-compiler@1.3.2
-templating-runtime@1.3.2
-templating-tools@1.1.2
-test-helpers@1.0.11
-tinytest@1.0.12
-tracker@1.1.2
-ui@1.0.12
+reload@1.3.1
+retry@1.1.0
+routepolicy@1.1.0
+socket-stream-client@0.3.1
+spacebars@1.1.0-beta.3
+spacebars-compiler@1.2.0-beta.3
+templating-compiler@1.4.0-beta.3
+templating-runtime@1.4.0-beta.3
+templating-tools@1.2.0-beta.3
+test-helpers@1.2.0
+tinytest@1.1.0
+tracker@1.2.0
 underscore@1.0.10
-webapp@1.3.14
-webapp-hashing@1.0.9
+webapp@1.10.0
+webapp-hashing@1.1.0
diff --git a/packages/templating-runtime/package.js b/packages/templating-runtime/package.js
index 8216f2826..04fe9385e 100644
--- a/packages/templating-runtime/package.js
+++ b/packages/templating-runtime/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: 'templating-runtime',
   summary: "Runtime for compiled .html files",
-  version: '1.3.2',
+  version: '1.4.0-beta.3',
   git: 'https://github.com/meteor/blaze.git',
   documentation: null
 });
@@ -20,19 +20,19 @@ Package.onUse(function (api) {
   // Blaze, so anybody using templating (eg apps) need to implicitly use
   // 'meteor' and 'blaze'.
   api.use([
-    'blaze@2.3.2',
-    'spacebars@1.0.15'
+    'blaze@2.4.0-beta.3',
+    'spacebars@1.1.0-beta.3'
   ]);
   api.imply([
     'meteor@1.2.17',
-    'blaze@2.3.2',
-    'spacebars@1.0.15'
+    'blaze@2.4.0-beta.3',
+    'spacebars@1.1.0-beta.3'
   ], 'client');
 
   // to be able to compile dynamic.html. this compiler is used
   // only inside this package and it should not be implied to not
   // conflict with other packages providing .html compilers.
-  api.use('templating-compiler@1.3.2');
+  api.use('templating-compiler@1.4.0-beta.3');
 
   api.addFiles([
     'dynamic.html',
@@ -50,7 +50,7 @@ Package.onTest(function (api) {
 
   api.use([
     'templating-runtime',
-    'templating-compiler@1.3.2'
+    'templating-compiler@1.4.0-beta.3'
   ]);
 
   api.addFiles([
diff --git a/packages/templating-runtime/templating.js b/packages/templating-runtime/templating.js
index e00646cd8..b621c7409 100644
--- a/packages/templating-runtime/templating.js
+++ b/packages/templating-runtime/templating.js
@@ -68,6 +68,112 @@ Template.body.renderToDocument = function () {
   Template.body.view = view;
 };
 
+Template.__pendingReplacement = []
+
+var updateTimeout = null;
+
+// Simple HMR integration to re-render all of the root views
+// when a template is modified. This function can be overridden to provide
+// an alternative method of applying changes from HMR.
+Template._applyHmrChanges = function (templateName) {
+  if (updateTimeout) {
+    return;
+  }
+
+  // debounce so we only re-render once per rebuild
+  updateTimeout = setTimeout(function () {
+    updateTimeout = null;
+
+    for (var i = 0; i < Template.__pendingReplacement.length; i++) {
+      delete Template[Template.__pendingReplacement[i]]
+    }
+
+    Template.__pendingReplacement = [];
+
+    var views = Blaze.__rootViews.slice();
+    for(var i = 0; i < views.length; i++) {
+      var view = views[i];
+      if (view.destroyed) {
+        continue;
+      }
+
+      var renderFunc = view._render;
+      var parentEl;
+      if (view._domrange && view._domrange.parentElement) {
+        parentEl = view._domrange.parentElement;
+      } else if (view._hmrParent) {
+        parentEl = view._hmrParent;
+      }
+
+      var comment;
+      if (view._hmrAfter) {
+        comment = view._hmrAfter;
+      } else {
+        var first = view._domrange.firstNode();
+        comment = document.createComment('Blaze HMR PLaceholder');
+        parentEl.insertBefore(comment, first);
+      }
+
+      view._hmrAfter = null;
+      view._hmrParent = null;
+
+      if (view._domrange) {
+        Blaze.remove(view);
+      }
+
+      try {
+        if (view === Template.body.view) {
+          var newView = Blaze.render(Template.body, document.body, comment);
+          Template.body.view = newView;
+        } else if (view.dataVar) {
+          Blaze.renderWithData(renderFunc, view.dataVar.curValue, parentEl, comment);
+        } else {
+          Blaze.render(renderFunc, parentEl, comment);
+        }
+
+        parentEl.removeChild(comment);
+      } catch (e) {
+        console.log('[Blaze HMR] Error re-rending template:');
+        console.error(e);
+
+        // Record where the view should have been so we can still render it
+        // during the next update
+        var newestRoot = Blaze.__rootViews[Blaze.__rootViews.length - 1];
+        if (newestRoot && newestRoot.isCreated && !newestRoot.isRendered) {
+          newestRoot._hmrAfter = comment;
+          newestRoot._hmrParent = parentEl;
+        }
+      }
+    }
+  });
+}
+
+Template._migrateTemplate = function (templateName, newTemplate, migrate) {
+  var oldTemplate = Template[templateName];
+  var migrate = Template.__pendingReplacement.indexOf(templateName) > -1
+
+  if (oldTemplate && migrate) {
+    newTemplate.__helpers = oldTemplate.__helpers;
+    newTemplate.__eventMaps = oldTemplate.__eventMaps;
+    newTemplate._callbacks.created = oldTemplate._callbacks.created;
+    newTemplate._callbacks.rendered = oldTemplate._callbacks.rendered;
+    newTemplate._callbacks.destroyed = oldTemplate._callbacks.destroyed;
+    delete Template[templateName];
+    Template._applyHmrChanges(templateName);
+  }
+
+
+  if (migrate) {
+    Template.__pendingReplacement.splice(
+      Template.__pendingReplacement.indexOf(templateName),
+      1
+    )
+  }
+
+  Template.__checkName(templateName);
+  Template[templateName] = newTemplate;
+};
+
 // XXX COMPAT WITH 0.9.0
 UI.body = Template.body;
 
diff --git a/packages/templating-tools/.versions b/packages/templating-tools/.versions
index 799c7b6ff..3497b4df1 100644
--- a/packages/templating-tools/.versions
+++ b/packages/templating-tools/.versions
@@ -1,48 +1,53 @@
-allow-deny@1.0.5
-babel-compiler@6.14.1
-babel-runtime@1.0.1
-base64@1.0.10
-binary-heap@1.0.10
-blaze@2.3.2
-blaze-tools@1.0.10
-boilerplate-generator@1.0.11
-callback-hook@1.0.10
-check@1.2.5
-ddp@1.2.5
-ddp-client@1.3.3
-ddp-common@1.2.8
-ddp-server@1.3.13
-diff-sequence@1.0.7
-ecmascript@0.6.3
-ecmascript-runtime@0.3.15
-ejson@1.0.13
+allow-deny@1.1.0
+babel-compiler@7.6.0
+babel-runtime@1.5.0
+base64@1.0.12
+binary-heap@1.0.11
+blaze-tools@1.1.0-beta.3
+boilerplate-generator@1.7.1
+callback-hook@1.3.0
+check@1.3.1
+ddp@1.4.0
+ddp-client@2.4.0
+ddp-common@1.4.0
+ddp-server@2.3.2
+diff-sequence@1.1.1
+dynamic-import@0.6.0
+ecmascript@0.15.0
+ecmascript-runtime@0.7.0
+ecmascript-runtime-client@0.11.0
+ecmascript-runtime-server@0.10.0
+ejson@1.1.1
+fetch@0.1.1
 geojson-utils@1.0.10
-html-tools@1.0.11
-htmljs@1.0.11
-id-map@1.0.9
-jquery@1.11.10
-local-test:templating-tools@1.1.2
-logging@1.1.17
-meteor@1.6.1
-minimongo@1.0.21
-modules@0.7.9
-modules-runtime@0.7.9
-mongo@1.1.16
-mongo-id@1.0.6
-npm-mongo@2.2.24
-observe-sequence@1.0.16
-ordered-dict@1.0.9
-promise@0.8.8
-random@1.0.10
-reactive-var@1.0.11
-retry@1.0.9
-routepolicy@1.0.12
-spacebars@1.0.15
-spacebars-compiler@1.1.2
-templating-tools@1.1.2
-tinytest@1.0.12
-tracker@1.1.2
-ui@1.0.12
+html-tools@1.1.0-beta.3
+htmljs@1.1.0-beta.3
+id-map@1.1.0
+inter-process-messaging@0.1.1
+local-test:templating-tools@1.2.0-beta.3
+logging@1.2.0
+meteor@1.9.3
+minimongo@1.6.1
+modern-browsers@0.1.5
+modules@0.16.0
+modules-runtime@0.12.0
+mongo@1.10.1
+mongo-decimal@0.1.2
+mongo-dev-server@1.1.0
+mongo-id@1.0.7
+npm-mongo@3.8.1
+ordered-dict@1.1.0
+promise@0.11.2
+random@1.2.0
+react-fast-refresh@0.1.0
+reload@1.3.1
+retry@1.1.0
+routepolicy@1.1.0
+socket-stream-client@0.3.1
+spacebars-compiler@1.2.0-beta.3
+templating-tools@1.2.0-beta.3
+tinytest@1.1.0
+tracker@1.2.0
 underscore@1.0.10
-webapp@1.3.14
-webapp-hashing@1.0.9
+webapp@1.10.0
+webapp-hashing@1.1.0
diff --git a/packages/templating-tools/code-generation.js b/packages/templating-tools/code-generation.js
index 6a7f8695b..b3eec518c 100644
--- a/packages/templating-tools/code-generation.js
+++ b/packages/templating-tools/code-generation.js
@@ -1,16 +1,50 @@
-TemplatingTools.generateTemplateJS =
-function generateTemplateJS(name, renderFuncCode) {
+export function generateTemplateJS(name, renderFuncCode, useHMR) {
   const nameLiteral = JSON.stringify(name);
   const templateDotNameLiteral = JSON.stringify(`Template.${name}`);
 
+  if (useHMR) {
+    // module.hot.data is used to make sure Template.__checkName can still
+    // detect duplicates
+    return `
+Template._migrateTemplate(
+  ${nameLiteral},
+  new Template(${templateDotNameLiteral}, ${renderFuncCode}),
+);
+if (typeof module === "object" && module.hot) {
+  module.hot.accept();
+  module.hot.dispose(function () {
+    Template.__pendingReplacement.push(${nameLiteral});
+    Template._applyHmrChanges(${nameLiteral});
+  });
+}
+`
+  }
+
   return `
 Template.__checkName(${nameLiteral});
 Template[${nameLiteral}] = new Template(${templateDotNameLiteral}, ${renderFuncCode});
 `;
 }
 
-TemplatingTools.generateBodyJS =
-function generateBodyJS(renderFuncCode) {
+export function generateBodyJS(renderFuncCode, useHMR) {
+  if (useHMR) {
+    return `
+(function () {
+  var renderFunc = ${renderFuncCode};
+  Template.body.addContent(renderFunc);
+  Meteor.startup(Template.body.renderToDocument);
+  if (typeof module === "object" && module.hot) {
+    module.hot.accept();
+    module.hot.dispose(function () {
+      var index = Template.body.contentRenderFuncs.indexOf(renderFunc)
+      Template.body.contentRenderFuncs.splice(index, 1);
+      Template._applyHmrChanges();
+    });
+  }
+})();
+`
+  }
+
   return `
 Template.body.addContent(${renderFuncCode});
 Meteor.startup(Template.body.renderToDocument);
diff --git a/packages/templating-tools/compile-tags-with-spacebars.js b/packages/templating-tools/compile-tags-with-spacebars.js
index 7c3e2d67c..18ef905ee 100644
--- a/packages/templating-tools/compile-tags-with-spacebars.js
+++ b/packages/templating-tools/compile-tags-with-spacebars.js
@@ -1,12 +1,16 @@
-TemplatingTools.compileTagsWithSpacebars = function compileTagsWithSpacebars(tags) {
+import { SpacebarsCompiler } from 'meteor/spacebars-compiler';
+import { generateBodyJS, generateTemplateJS } from './code-generation';
+import { throwCompileError } from './throw-compile-error';
+
+export function compileTagsWithSpacebars(tags, hmrAvailable) {
   var handler = new SpacebarsTagCompiler();
 
   tags.forEach((tag) => {
-    handler.addTagToResults(tag);
+    handler.addTagToResults(tag, hmrAvailable);
   });
 
   return handler.getResults();
-};
+}
 
 class SpacebarsTagCompiler {
   constructor() {
@@ -22,7 +26,7 @@ class SpacebarsTagCompiler {
     return this.results;
   }
 
-  addTagToResults(tag) {
+  addTagToResults(tag, hmrAvailable) {
     this.tag = tag;
 
     // do we have 1 or more attributes?
@@ -52,23 +56,28 @@ class SpacebarsTagCompiler {
           this.throwCompileError(`Template can't be named "${name}"`);
         }
 
+        const whitespace = this.tag.attribs.whitespace || '';
+
         const renderFuncCode = SpacebarsCompiler.compile(this.tag.contents, {
+          whitespace,
           isTemplate: true,
           sourceName: `Template "${name}"`
         });
 
-        this.results.js += TemplatingTools.generateTemplateJS(
-          name, renderFuncCode);
+        this.results.js += generateTemplateJS(
+          name, renderFuncCode, hmrAvailable);
       } else if (this.tag.tagName === "body") {
-        this.addBodyAttrs(this.tag.attribs);
+        const { whitespace = '', ...attribs } = this.tag.attribs;
+        this.addBodyAttrs(attribs);
 
         const renderFuncCode = SpacebarsCompiler.compile(this.tag.contents, {
+          whitespace,
           isBody: true,
           sourceName: "<body>"
         });
 
         // We may be one of many `<body>` tags.
-        this.results.js += TemplatingTools.generateBodyJS(renderFuncCode);
+        this.results.js += generateBodyJS(renderFuncCode, hmrAvailable);
       } else {
         this.throwCompileError("Expected <template>, <head>, or <body> tag in template file", tagStartIndex);
       }
@@ -99,6 +108,6 @@ class SpacebarsTagCompiler {
   }
 
   throwCompileError(message, overrideIndex) {
-    TemplatingTools.throwCompileError(this.tag, message, overrideIndex);
+    throwCompileError(this.tag, message, overrideIndex);
   }
 }
diff --git a/packages/templating-tools/html-scanner-tests.js b/packages/templating-tools/html-scanner-tests.js
index 51066e81d..f7bdde10f 100644
--- a/packages/templating-tools/html-scanner-tests.js
+++ b/packages/templating-tools/html-scanner-tests.js
@@ -1,3 +1,5 @@
+import { TemplatingTools } from 'meteor/templating-tools';
+
 Tinytest.add("templating-tools - html scanner", function (test) {
   var testInString = function(actualStr, wantedContents) {
     if (actualStr.indexOf(wantedContents) >= 0)
diff --git a/packages/templating-tools/html-scanner.js b/packages/templating-tools/html-scanner.js
index dc39da7b3..1dc9425ce 100644
--- a/packages/templating-tools/html-scanner.js
+++ b/packages/templating-tools/html-scanner.js
@@ -1,13 +1,15 @@
-TemplatingTools.scanHtmlForTags = function scanHtmlForTags(options) {
+import { CompileError } from './throw-compile-error';
+
+export function scanHtmlForTags(options) {
   const scan = new HtmlScan(options);
   return scan.getTags();
-};
+}
 
 /**
  * Scan an HTML file for top-level tags and extract their contents. Pass them to
  * a tag handler (an object with a handleTag method)
  *
- * This is a primitive, regex-based scanner.  It scans 
+ * This is a primitive, regex-based scanner.  It scans
  * top-level tags, which are allowed to have attributes,
  * and ignores top-level HTML comments.
  */
@@ -33,7 +35,7 @@ class HtmlScan {
 
     this.tags = [];
 
-    tagNameRegex = this.tagNames.join("|");
+    const tagNameRegex = this.tagNames.join("|");
     const openTagRegex = new RegExp(`^((<(${tagNameRegex})\\b)|(<!--)|(<!DOCTYPE|{{!)|$)`, "i");
 
     while (this.rest) {
@@ -154,7 +156,7 @@ class HtmlScan {
   throwCompileError(msg, overrideIndex) {
     const finalIndex = (typeof overrideIndex === 'number' ? overrideIndex : this.index);
 
-    const err = new TemplatingTools.CompileError();
+    const err = new CompileError();
     err.message = msg || "bad formatting in template file";
     err.file = this.sourceName;
     err.line = this.contents.substring(0, finalIndex).split('\n').length;
diff --git a/packages/templating-tools/package.js b/packages/templating-tools/package.js
index bb9de073d..0b723ef3d 100644
--- a/packages/templating-tools/package.js
+++ b/packages/templating-tools/package.js
@@ -1,35 +1,29 @@
 Package.describe({
   name: 'templating-tools',
   summary: "Tools to scan HTML and compile tags when building a templating package",
-  version: '1.1.2',
+  version: '1.2.0-beta.3',
   git: 'https://github.com/meteor/blaze.git'
 });
 
 Package.onUse(function(api) {
   api.use([
     'underscore@1.0.9',
-    'ecmascript@0.5.8'
+    'ecmascript@0.14.4'
   ]);
 
   api.export('TemplatingTools');
 
   api.use([
-    'spacebars-compiler@1.1.2'
+    'spacebars-compiler@1.2.0-beta.3'
   ]);
 
-  api.addFiles([
-    'templating-tools.js',
-    'html-scanner.js',
-    'compile-tags-with-spacebars.js',
-    'throw-compile-error.js',
-    'code-generation.js'
-  ]);
+  api.mainModule('templating-tools.js')
 });
 
 Package.onTest(function(api) {
   api.use([
     'tinytest@1.0.11',
-    'ecmascript@0.5.8'
+    'ecmascript@0.14.4'
   ]);
 
   api.use([
diff --git a/packages/templating-tools/templating-tools.js b/packages/templating-tools/templating-tools.js
index 8d6c3db6b..486277fdb 100644
--- a/packages/templating-tools/templating-tools.js
+++ b/packages/templating-tools/templating-tools.js
@@ -1,4 +1,13 @@
-TemplatingTools = {
-  // This type of error should be thrown during compilation
-  CompileError: class CompileError {}
+import { scanHtmlForTags } from './html-scanner';
+import { compileTagsWithSpacebars } from './compile-tags-with-spacebars';
+import { generateTemplateJS, generateBodyJS } from './code-generation'
+import { CompileError, throwCompileError} from './throw-compile-error';
+
+export const TemplatingTools  = {
+  scanHtmlForTags,
+  compileTagsWithSpacebars,
+  generateTemplateJS,
+  generateBodyJS,
+  CompileError,
+  throwCompileError
 };
diff --git a/packages/templating-tools/throw-compile-error.js b/packages/templating-tools/throw-compile-error.js
index 8bf983325..f1586e4fd 100644
--- a/packages/templating-tools/throw-compile-error.js
+++ b/packages/templating-tools/throw-compile-error.js
@@ -1,9 +1,10 @@
-TemplatingTools.throwCompileError =
-function throwCompileError(tag, message, overrideIndex) {
+export class CompileError {}
+
+export function throwCompileError(tag, message, overrideIndex) {
   const finalIndex = (typeof overrideIndex === 'number' ?
     overrideIndex : tag.tagStartIndex);
 
-  const err = new TemplatingTools.CompileError();
+  const err = new CompileError();
   err.message = message || "bad formatting in template file";
   err.file = tag.sourceName;
   err.line = tag.fileContents.substring(0, finalIndex).split('\n').length;
diff --git a/packages/templating/.versions b/packages/templating/.versions
index e95dce95f..1d683fd95 100644
--- a/packages/templating/.versions
+++ b/packages/templating/.versions
@@ -1,33 +1,39 @@
-babel-compiler@6.14.1
-babel-runtime@1.0.1
-base64@1.0.10
-blaze@2.3.2
-blaze-tools@1.0.10
-caching-compiler@1.1.9
-caching-html-compiler@1.1.2
-check@1.2.5
-diff-sequence@1.0.7
-ecmascript@0.6.3
-ecmascript-runtime@0.3.15
-ejson@1.0.13
-html-tools@1.0.11
-htmljs@1.0.11
-id-map@1.0.9
-jquery@1.11.10
-meteor@1.6.1
-modules@0.7.9
-modules-runtime@0.7.9
-mongo-id@1.0.6
+babel-compiler@7.6.0
+babel-runtime@1.5.0
+base64@1.0.12
+blaze@2.4.0-beta.3
+blaze-tools@1.1.0-beta.3
+caching-compiler@1.2.2
+caching-html-compiler@1.2.0-beta.3
+check@1.3.1
+diff-sequence@1.1.1
+dynamic-import@0.6.0
+ecmascript@0.15.0
+ecmascript-runtime@0.7.0
+ecmascript-runtime-client@0.11.0
+ecmascript-runtime-server@0.10.0
+ejson@1.1.1
+fetch@0.1.1
+html-tools@1.1.0-beta.3
+htmljs@1.1.0-beta.3
+id-map@1.1.0
+inter-process-messaging@0.1.1
+meteor@1.9.3
+modern-browsers@0.1.5
+modules@0.16.0
+modules-runtime@0.12.0
+mongo-id@1.0.7
 observe-sequence@1.0.16
-ordered-dict@1.0.9
-promise@0.8.8
-random@1.0.10
+ordered-dict@1.1.0
+promise@0.11.2
+random@1.2.0
+react-fast-refresh@0.1.0
 reactive-var@1.0.11
-spacebars@1.0.15
-spacebars-compiler@1.1.2
-templating@1.3.2
-templating-compiler@1.3.2
-templating-runtime@1.3.2
-templating-tools@1.1.2
-tracker@1.1.2
+spacebars@1.1.0-beta.3
+spacebars-compiler@1.2.0-beta.3
+templating@1.4.0-beta.3
+templating-compiler@1.4.0-beta.3
+templating-runtime@1.4.0-beta.3
+templating-tools@1.2.0-beta.3
+tracker@1.2.0
 underscore@1.0.10
diff --git a/packages/templating/package.js b/packages/templating/package.js
index 87fc3d922..6f459fcf7 100644
--- a/packages/templating/package.js
+++ b/packages/templating/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: 'templating',
   summary: "Allows templates to be defined in .html files",
-  version: '1.3.2',
+  version: '1.4.0-beta.3',
   git: 'https://github.com/meteor/blaze.git'
 });
 
@@ -13,8 +13,8 @@ Package.describe({
 Package.onUse(function (api) {
   api.export('Template', 'client');
 
-  api.use('templating-runtime@1.3.2');
+  api.use('templating-runtime@1.4.0-beta.3');
   api.imply('templating-runtime');
 
-  api.imply('templating-compiler@1.3.2');
+  api.imply('templating-compiler@1.4.0-beta.3');
 });
diff --git a/packages/ui/.gitignore b/packages/ui/.gitignore
deleted file mode 100644
index 677a6fc26..000000000
--- a/packages/ui/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.build*
diff --git a/packages/ui/.versions b/packages/ui/.versions
deleted file mode 100644
index edff46f34..000000000
--- a/packages/ui/.versions
+++ /dev/null
@@ -1,24 +0,0 @@
-babel-compiler@6.14.1
-babel-runtime@1.0.1
-base64@1.0.10
-blaze@2.3.2
-check@1.2.5
-diff-sequence@1.0.7
-ecmascript@0.6.3
-ecmascript-runtime@0.3.15
-ejson@1.0.13
-htmljs@1.0.11
-id-map@1.0.9
-jquery@1.11.10
-meteor@1.6.1
-modules@0.7.9
-modules-runtime@0.7.9
-mongo-id@1.0.6
-observe-sequence@1.0.16
-ordered-dict@1.0.9
-promise@0.8.8
-random@1.0.10
-reactive-var@1.0.11
-tracker@1.1.2
-ui@1.0.13
-underscore@1.0.10
diff --git a/packages/ui/README.md b/packages/ui/README.md
deleted file mode 100644
index 33120c7c5..000000000
--- a/packages/ui/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# ui
-[Source code of released version](https://github.com/meteor/meteor/tree/master/packages/ui) | [Source code of development version](https://github.com/meteor/meteor/tree/devel/packages/ui)
-***
-
-This is an internal Meteor package.
\ No newline at end of file
diff --git a/packages/ui/package.js b/packages/ui/package.js
deleted file mode 100644
index f7c7a0f11..000000000
--- a/packages/ui/package.js
+++ /dev/null
@@ -1,22 +0,0 @@
-Package.describe({
-  name: 'ui',
-  summary: "Deprecated: Use the 'blaze' package",
-  version: '1.0.13',
-  git: 'https://github.com/meteor/blaze.git'
-});
-
-Package.onUse(function (api) {
-  api.use('blaze@2.3.2');
-  api.imply('blaze');
-
-  // XXX COMPAT WITH PACKAGES BUILT FOR 0.9.0.
-  //
-  // (in particular, packages that have a weak dependency on this
-  // package, since then exported symbols live on the
-  // `Package.ui` object)
-  api.export([
-    'Blaze',
-    'UI',
-    'Handlebars'
-  ]);
-});
diff --git a/publish-all.sh b/publish-all.sh
index 9076c682c..afe09173f 100755
--- a/publish-all.sh
+++ b/publish-all.sh
@@ -1,6 +1,10 @@
 #!/bin/bash
 
-for package in htmljs html-tools blaze-tools spacebars-compiler templating-tools caching-html-compiler static-html blaze spacebars templating-compiler templating-runtime templating spacebars-tests ui blaze-html-templates ; do
+set -e
+set -u
+
+# the order is important
+for package in htmljs html-tools blaze-tools spacebars-compiler templating-tools caching-html-compiler static-html blaze spacebars templating-compiler templating-runtime blaze-hot templating spacebars-tests blaze-html-templates ; do
   echo "Publishing $package"
   (cd packages/$package && meteor publish)
 done