Skip to content

Commit

Permalink
Merge pull request #550 from robbiepitts/parse
Browse files Browse the repository at this point in the history
Fix handlebars `parse` error
  • Loading branch information
rwjblue committed Jun 16, 2017
2 parents e03fa54 + 5ed5b7e commit 4a257a3
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 25 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import builders from "../builders";
import traverse from "../traversal/traverse";
import print from "../generation/print";
import Walker from "../traversal/walker";
import { parse } from "handlebars";
import * as handlebars from "handlebars";

const voidMap: {
[tagName: string]: boolean
Expand Down Expand Up @@ -327,7 +327,7 @@ export interface PreprocessOptions {
}

export function preprocess(html: string, options?: PreprocessOptions): AST.Program {
let ast = (typeof html === 'object') ? html : parse(html);
let ast = (typeof html === 'object') ? html : handlebars.parse(html);
let combined = new TokenizerEventHandlers(html, options).acceptNode(ast);

if (options && options.plugins && options.plugins.ast) {
Expand Down
34 changes: 11 additions & 23 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1891,11 +1891,11 @@ dashdash@^1.12.0:
dependencies:
assert-plus "^1.0.0"

debug@2, debug@2.6.3, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.4.0:
version "2.6.3"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.3.tgz#0f7eb8c30965ec08c72accfa0130c8b79984141d"
debug@2, debug@2.6.8:
version "2.6.8"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
dependencies:
ms "0.7.2"
ms "2.0.0"

debug@2.2.0, debug@~2.2.0:
version "2.2.0"
Expand All @@ -1915,11 +1915,11 @@ debug@2.6.1:
dependencies:
ms "0.7.2"

debug@2.6.8:
version "2.6.8"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
debug@2.6.3, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.4.0:
version "2.6.3"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.3.tgz#0f7eb8c30965ec08c72accfa0130c8b79984141d"
dependencies:
ms "2.0.0"
ms "0.7.2"

debuglog@^1.0.1:
version "1.0.1"
Expand Down Expand Up @@ -5017,15 +5017,7 @@ qs@~6.3.0:
version "6.3.2"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"

quick-temp@^0.1.0, quick-temp@^0.1.2, quick-temp@^0.1.3:
version "0.1.6"
resolved "https://registry.yarnpkg.com/quick-temp/-/quick-temp-0.1.6.tgz#a6242a15cba9f9cdbd341287b5c569e318eec307"
dependencies:
mktemp "~0.4.0"
rimraf "~2.2.6"
underscore.string "~2.3.3"

quick-temp@^0.1.5, quick-temp@^0.1.8:
quick-temp@^0.1.0, quick-temp@^0.1.2, quick-temp@^0.1.3, quick-temp@^0.1.5, quick-temp@^0.1.8:
version "0.1.8"
resolved "https://registry.yarnpkg.com/quick-temp/-/quick-temp-0.1.8.tgz#bab02a242ab8fb0dd758a3c9776b32f9a5d94408"
dependencies:
Expand Down Expand Up @@ -5429,11 +5421,11 @@ rsvp@3.0.14:
version "3.0.14"
resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.0.14.tgz#9d2968cf36d878d3bb9a9a5a4b8e1ff55a76dd31"

rsvp@^3.0.14, rsvp@^3.0.16, rsvp@^3.0.21, rsvp@^3.0.6, rsvp@^3.1.0, rsvp@^3.2.1, rsvp@^3.3.3:
rsvp@^3.0.14, rsvp@^3.0.16, rsvp@^3.0.17, rsvp@^3.0.21, rsvp@^3.0.6, rsvp@^3.1.0, rsvp@^3.2.1, rsvp@^3.3.3:
version "3.5.0"
resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.5.0.tgz#a62c573a4ae4e1dfd0697ebc6242e79c681eaa34"

rsvp@^3.0.17, rsvp@^3.0.18, rsvp@~3.0.6:
rsvp@^3.0.18, rsvp@~3.0.6:
version "3.0.21"
resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.0.21.tgz#49c588fe18ef293bcd0ab9f4e6756e6ac433359f"

Expand Down Expand Up @@ -6187,10 +6179,6 @@ underscore.string@3.3.4, underscore.string@^3.2.2, underscore.string@^3.3.4, und
sprintf-js "^1.0.3"
util-deprecate "^1.0.2"

underscore.string@~2.3.3:
version "2.3.3"
resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-2.3.3.tgz#71c08bf6b428b1133f37e78fa3a21c82f7329b0d"

underscore@>=1.8.3:
version "1.8.3"
resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"
Expand Down

0 comments on commit 4a257a3

Please sign in to comment.